chore: bundle previous state in an object

josdejong · Jun 14, 2024 · f0bd08b · f0bd08b
1 parent 7c8f2ed
commit f0bd08b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/src/lib/components/modes/tablemode/TableMode.svelte b/src/lib/components/modes/tablemode/TableMode.svelte
@@ -560,10 +560,14 @@
     }
 
     const previousJson = json
-    const previousState = documentState
-    const previousSelection = selection
-    const previousSortedColumn = sortedColumn
-    const previousTextIsRepaired = textIsRepaired
+    const previousState: PreviousState = {
+      json: undefined, // not needed: we use patch to reconstruct the json
+      text,
+      documentState,
+      selection: removeEditModeFromSelection(selection),
+      sortedColumn,
+      textIsRepaired
+    }
 
     // execute the patch operations
     const undo: JSONPatchDocument = revertJSONPatchWithMoveOperations(
@@ -599,12 +603,7 @@
     history.add({
       undo: {
         patch: undo,
-        json: undefined, // not needed: we use patch to reconstruct the json
-        text: undefined,
-        documentState,
-        selection: removeEditModeFromSelection(previousSelection),
-        sortedColumn: previousSortedColumn,
-        textIsRepaired: previousTextIsRepaired
+        ...previousState
       },
       redo: {
         patch: operations,

diff --git a/src/lib/components/modes/treemode/TreeMode.svelte b/src/lib/components/modes/treemode/TreeMode.svelte
@@ -586,10 +586,14 @@
     }
 
     const previousJson = json
-    const previousState = documentState
-    const previousSelection = selection
-    const previousText = text
-    const previousTextIsRepaired = textIsRepaired
+    const previousState = {
+      json: undefined, // not needed: we use patch to reconstruct the json
+      text,
+      documentState,
+      selection: removeEditModeFromSelection(selection),
+      textIsRepaired,
+      sortedColumn: null
+    }
 
     // execute the patch operations
     const undo: JSONPatchDocument = revertJSONPatchWithMoveOperations(
@@ -620,12 +624,7 @@
     history.add({
       undo: {
         patch: undo,
-        json: undefined, // not needed, we use patch to reconstruct
-        text: previousText,
-        documentState: previousState,
-        selection: removeEditModeFromSelection(previousSelection),
-        sortedColumn: null,
-        textIsRepaired: previousTextIsRepaired
+        ...previousState
       },
       redo: {
         patch: operations,