fix: #315 cannot paste text in the search box input field in tree mode

josdejong · Sep 28, 2023 · a9a2dc3 · a9a2dc3
1 parent f00acd6
commit a9a2dc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/lib/components/modes/tablemode/TableMode.svelte b/src/lib/components/modes/tablemode/TableMode.svelte
@@ -730,7 +730,7 @@
     setTimeout(() => {
       setTimeout(() => {
         // for example when clicking on the empty area in the main menu
-        if (!hasFocus && !isChildOfNodeName(event.target as Element, 'BUTTON')) {
+        if ((!hasFocus && !isChildOfNodeName(event.target, 'BUTTON')) || event.target.nodeName === 'DIV') {
           focus()
         }
       })
@@ -1708,7 +1708,6 @@
   class:no-main-menu={!mainMenuBar}
   on:mousedown={handleMouseDown}
   on:keydown={handleKeyDown}
-  on:paste={handlePaste}
   on:contextmenu={handleContextMenu}
   bind:this={refJsonEditor}
 >
@@ -1730,10 +1729,11 @@
     <label class="jse-hidden-input-label">
       <input
         type="text"
-        readonly="readonly"
+        readonly={true}
         tabindex="-1"
         class="jse-hidden-input"
         bind:this={refHiddenInput}
+        on:paste={handlePaste}
       />
     </label>
     {#if containsValidArray}

diff --git a/src/lib/components/modes/treemode/TreeMode.svelte b/src/lib/components/modes/treemode/TreeMode.svelte
@@ -1820,7 +1820,7 @@
     // TODO: ugly to have two setTimeout here. Without it, hiddenInput will blur
     setTimeout(() => {
       setTimeout(() => {
-        if (!hasFocus && !isChildOfNodeName(event.target, 'BUTTON')) {
+        if ((!hasFocus && !isChildOfNodeName(event.target, 'BUTTON')) || event.target.nodeName === 'DIV') {
           // for example when clicking on the empty area in the main menu
           focus()
 
@@ -2106,7 +2106,6 @@
   class:no-main-menu={!mainMenuBar}
   on:keydown={handleKeyDown}
   on:mousedown={handleMouseDown}
-  on:paste={handlePaste}
   on:contextmenu={handleContextMenu}
   bind:this={refJsonEditor}
 >
@@ -2147,6 +2146,7 @@
         tabindex="-1"
         class="jse-hidden-input"
         bind:this={refHiddenInput}
+        on:paste={handlePaste}
       />
     </label>
     {#if json === undefined}