From f45899a9b4460bd251cc0d425408d1d28653a532 Mon Sep 17 00:00:00 2001 From: Flawid DSouza Date: Wed, 6 Mar 2024 11:33:43 +0530 Subject: [PATCH] fix(ui): Socket Panel > payload edit box does not allow scrolling and does not line wrap anymore --- packages/ui/src/components/CodeMirrorSingleLine.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/ui/src/components/CodeMirrorSingleLine.vue b/packages/ui/src/components/CodeMirrorSingleLine.vue index 0dc37525..ad03b9c4 100644 --- a/packages/ui/src/components/CodeMirrorSingleLine.vue +++ b/packages/ui/src/components/CodeMirrorSingleLine.vue @@ -10,6 +10,7 @@ import { envVarDecoration } from '@/utils/codemirror-extensions' function getExtensions(vueInstance) { const singleLineEnforcers = [] + const multiLineEnforcers = [] if(!vueInstance.allowMultipleLines) { // From: https://discuss.codemirror.net/t/codemirror-6-single-line-and-or-avoid-carriage-return/2979/2 @@ -27,8 +28,12 @@ function getExtensions(vueInstance) { view.update([update]) } } - }) + }), ].forEach(enforcer => singleLineEnforcers.push(enforcer)) + } else { + [ + EditorView.lineWrapping, + ].forEach(enforcer => multiLineEnforcers.push(enforcer)) } const extensions = [ @@ -40,6 +45,7 @@ function getExtensions(vueInstance) { } }), ...singleLineEnforcers, + ...multiLineEnforcers, keymap.of([ ...historyKeymap ]), @@ -142,7 +148,7 @@ export default { font-family: inherit !important; margin-left: v-bind('inputTextCompatible ? "2px" : "0.2rem"'); margin-right: v-bind('inputTextCompatible ? "2px" : "0.5rem"'); - overflow: hidden; + overflow: v-bind('allowMultipleLines ? "visible" : "hidden"'); line-height: v-bind('inputTextCompatible ? "1.3" : "1.4"'); }