fix: selection and expanded state not always stored correctly in hist…

…ory (#73)
josdejong · Apr 28, 2022 · 702fba1 · 702fba1
1 parent 89771a6
commit 702fba1
Show file tree

Hide file tree

Showing 9 changed files with 245 additions and 167 deletions.
diff --git a/README.md b/README.md
@@ -344,7 +344,7 @@ type RenderValueProps = {
   isSelected: boolean
   isEditing: boolean
   normalization: ValueNormalization
-  onPatch: (patch: JSONPatchDocument, newSelection: Selection | null) => void
+  onPatch: (patch: JSONPatchDocument) => void
   onPasteJson: (pastedJson: { path: Path; contents: JSON }) => void
   onSelect: (selection: Selection) => void
   onFind: (findAndReplace: boolean) => void

diff --git a/src/lib/components/JSONEditor.svelte b/src/lib/components/JSONEditor.svelte
@@ -120,7 +120,7 @@
     content = updatedContent
   }
 
-  export function patch(operations, newSelection) {
+  export function patch(operations) {
     if (content.json === undefined) {
       try {
         content = {
@@ -133,7 +133,9 @@
     }
 
     if (refTreeMode) {
-      return refTreeMode.patch(operations, newSelection)
+      // Note that tree mode has an optional afterPatch callback.
+      // right now we don's support this in the public API.
+      return refTreeMode.patch(operations)
     }
 
     if (refCodeMode) {

diff --git a/src/lib/components/modes/treemode/JSONNode.svelte b/src/lib/components/modes/treemode/JSONNode.svelte
@@ -331,7 +331,9 @@
       })
 
       if (operations) {
-        context.onPatch(operations, updatedFullSelection || context.getFullSelection())
+        context.onPatch(operations, () => ({
+          selection: updatedFullSelection || context.getFullSelection()
+        }))
       } else {
         // the user did click inside the selection and no contents have been dragged,
         // select the clicked item