chore: fix Apply button in JSONEditorModal not working

josdejong · Jul 15, 2024 · 222af37 · 222af37
1 parent b1fd963
commit 222af37
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/src/lib/components/modals/JSONEditorModal.svelte b/src/lib/components/modals/JSONEditorModal.svelte
@@ -167,34 +167,22 @@
 
   function handleChange(updatedContent: Content) {
     debug('handleChange', updatedContent)
-
-    const updatedState = {
-      ...currentState,
-      content: updatedContent
-    }
-
-    stack = [...initial(stack), updatedState]
+    updateState((state) => ({ ...state, content: updatedContent }))
   }
 
   function handleChangeSelection(newSelection: JSONEditorSelection | undefined) {
     debug('handleChangeSelection', newSelection)
-
-    const updatedState = {
-      ...currentState,
-      selection: newSelection
-    }
-
-    stack = [...initial(stack), updatedState]
+    updateState((state) => ({ ...state, selection: newSelection }))
   }
 
   function handleChangeMode(newMode: Mode) {
     debug('handleChangeMode', newMode)
+    updateState((state) => ({ ...state, mode: newMode }))
+  }
 
-    const updatedState = {
-      ...currentState,
-      mode: newMode
-    }
-
+  function updateState(callback: (state: ModalState) => ModalState) {
+    const state = last(stack) as ModalState
+    const updatedState = callback(state)
     stack = [...initial(stack), updatedState]
   }