fix: shift-click to select multiple items broken

josdejong · Jan 8, 2022 · a28bbdf · a28bbdf
1 parent a3c8021
commit a28bbdf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/lib/components/modes/treemode/JSONNode.svelte b/src/lib/components/modes/treemode/JSONNode.svelte
@@ -62,6 +62,7 @@
   export let onExpandSection
 
   export let selection
+  export let getFullSelection
 
   // TODO: it is ugly to have to translate selection into selectionObj, and not accidentally use the wrong one. Is there an other way?
   $: selectionObj = selection && selection[STATE_SELECTION]
@@ -139,11 +140,14 @@
 
     if (event.shiftKey) {
       // Shift+Click will select multiple entries
-      onSelect({
-        type: SELECTION_TYPE.MULTI,
-        anchorPath: selectionObj.anchorPath,
-        focusPath: path
-      })
+      const fullSelection = getFullSelection()
+      if (fullSelection) {
+        onSelect({
+          type: SELECTION_TYPE.MULTI,
+          anchorPath: fullSelection.anchorPath,
+          focusPath: path
+        })
+      }
     } else {
       switch (anchorType) {
         case SELECTION_TYPE.KEY:
@@ -366,6 +370,7 @@
                 : undefined}
               {readOnly}
               {normalization}
+              {getFullSelection}
               {onPatch}
               {onInsert}
               {onExpand}
@@ -490,6 +495,7 @@
             validationErrors={validationErrors ? validationErrors[key] : undefined}
             {readOnly}
             {normalization}
+            {getFullSelection}
             {onPatch}
             {onInsert}
             {onExpand}

diff --git a/src/lib/components/modes/treemode/TreeMode.svelte b/src/lib/components/modes/treemode/TreeMode.svelte
@@ -1900,6 +1900,10 @@
     }
   }
 
+  function getFullSelection() {
+    return selection
+  }
+
   $: autoScrollHandler = createAutoScrollHandler(refContents)
 </script>
 
@@ -1986,6 +1990,7 @@
           {validationErrors}
           {readOnly}
           {normalization}
+          {getFullSelection}
           onPatch={handlePatch}
           onInsert={handleInsert}
           onExpand={handleExpand}