Fix issue allowing multi selection of events from different paths in …

…conditionals
chrismaltby · Apr 30, 2024 · a8f27c7 · a8f27c7
1 parent ddff6ab
commit a8f27c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/store/features/editor/editorState.ts b/src/store/features/editor/editorState.ts
@@ -244,14 +244,15 @@ const toggleScriptEventSelectedId =
     );
     const selectionIds = state.editor.scriptEventSelectionIds.slice();
     const selectionParentId = state.editor.scriptEventSelectionParentId;
+    const parentId = `${action.parentType}_${action.parentId}_${action.parentKey}`;
 
     if (siblingIds) {
-      if (selectionParentId !== action.parentId) {
+      if (selectionParentId !== parentId) {
         // Selected from new parent, change selection to just this script event
         dispatch(
-          actions.setScriptEventSelectedId({
+          actions.setScriptEventSelectedIds({
             scriptEventIds: [action.scriptEventId],
-            parentId: action.parentId,
+            parentId,
           })
         );
       } else {
@@ -271,9 +272,9 @@ const toggleScriptEventSelectedId =
           return indexA - indexB;
         });
         dispatch(
-          actions.setScriptEventSelectedId({
+          actions.setScriptEventSelectedIds({
             scriptEventIds: sortedIds,
-            parentId: action.parentId,
+            parentId,
           })
         );
       }
@@ -820,7 +821,7 @@ const editorSlice = createSlice({
       state.sceneSelectionIds = [];
     },
 
-    setScriptEventSelectedId: (
+    setScriptEventSelectedIds: (
       state,
       action: PayloadAction<{ scriptEventIds: string[]; parentId: string }>
     ) => {

diff --git a/test/store/features/editor/editorState.test.ts b/test/store/features/editor/editorState.test.ts
@@ -409,7 +409,7 @@ test("Should allow setting selected script events", () => {
     scriptEventSelectionIds: [],
     scriptEventSelectionParentId: "",
   };
-  const action = actions.setScriptEventSelectedId({
+  const action = actions.setScriptEventSelectedIds({
     scriptEventIds: ["b", "c", "d"],
     parentId: "a",
   });