fix: selected nodes should reset when active node changes

ycnmhd · ycnmhd · commit 94d27ee6f270 · 2025-02-01T18:12:34.000+01:00
diff --git a/src/stores/view/reducers/document/helpers/update-selection-state.ts b/src/stores/view/reducers/document/helpers/update-selection-state.ts
@@ -1,25 +1,20 @@
 import { DocumentViewState } from 'src/stores/view/view-state-type';
-import { ChangeActiveNodeAction } from 'src/stores/view/reducers/document/navigate-using-keyboard';
 import { findNodeColumn } from 'src/lib/tree-utils/find/find-node-column';
 import invariant from 'tiny-invariant';
 import { updateSelectedNodes } from 'src/stores/view/reducers/document/helpers/update-selected-nodes';
-import { JumpToNodeAction } from 'src/stores/view/reducers/document/jump-to-node';
 import { resetSelectionState } from 'src/stores/view/reducers/document/helpers/reset-selection-state';
+import { Column } from 'src/stores/document/document-state-type';
 
 export const updateSelectionState = (
+    columns: Column[],
     documentState: DocumentViewState,
     nextNode: string,
-    action: ChangeActiveNodeAction | JumpToNodeAction,
+    isVertical: boolean,
+    shiftKey: boolean,
 ) => {
-    const isJump = action.type === 'DOCUMENT/JUMP_TO_NODE';
-    const isVerticalStep =
-        action.type === 'DOCUMENT/NAVIGATE_USING_KEYBOARD' &&
-        (action.payload.direction === 'up' ||
-            action.payload.direction === 'down');
-
-    if (action.context?.shiftKey && (isJump || isVerticalStep)) {
-        const columnIndex = findNodeColumn(action.payload.columns, nextNode);
-        const column = action.payload.columns[columnIndex];
+    if (shiftKey && isVertical) {
+        const columnIndex = findNodeColumn(columns, nextNode);
+        const column = columns[columnIndex];
         invariant(column);
         updateSelectedNodes(
             column,
diff --git a/src/stores/view/reducers/document/jump-to-node.ts b/src/stores/view/reducers/document/jump-to-node.ts
@@ -13,7 +13,6 @@ export type JumpToNodeAction = {
     type: 'DOCUMENT/JUMP_TO_NODE';
     payload: {
         target: JumpTarget;
-        columns: Column[];
     };
     context?: {
         shiftKey: boolean;
@@ -24,14 +23,21 @@ export const jumpToNode = (
     documentViewState: DocumentViewState,
     state: Pick<ViewState, 'navigationHistory'>,
     action: JumpToNodeAction,
+    columns: Column[],
 ) => {
     const nextNode = findNextActiveNode(
-        action.payload.columns,
+        columns,
         documentViewState.activeNode,
         action,
     );
     if (nextNode) {
-        updateSelectionState(documentViewState, nextNode, action);
+        updateSelectionState(
+            columns,
+            documentViewState,
+            nextNode,
+            true,
+            Boolean(action.context?.shiftKey),
+        );
         updateActiveNode(documentViewState, nextNode, state);
     }
 };
diff --git a/src/stores/view/reducers/document/navigate-using-keyboard.ts b/src/stores/view/reducers/document/navigate-using-keyboard.ts
@@ -9,7 +9,6 @@ export type ChangeActiveNodeAction = {
     type: 'DOCUMENT/NAVIGATE_USING_KEYBOARD';
     payload: {
         direction: AllDirections;
-        columns: Column[];
     };
     context: {
         shiftKey?: boolean;
@@ -21,17 +20,25 @@ export const navigateUsingKeyboard = (
     documentState: DocumentViewState,
     state: Pick<ViewState, 'navigationHistory' | 'outline'>,
     action: ChangeActiveNodeAction,
+    columns: Column[],
 ) => {
     const nextNode = findNextActiveNodeOnKeyboardNavigation(
-        action.payload.columns,
+        columns,
         documentState.activeNode,
         action.payload.direction,
         documentState.activeNodesOfColumn,
         action.context.outlineMode ? state.outline.collapsedParents : null,
         action.context.shiftKey,
     );
     if (nextNode) {
-        updateSelectionState(documentState, nextNode, action);
+        updateSelectionState(
+            columns,
+            documentState,
+            nextNode,
+            action.payload.direction === 'up' ||
+                action.payload.direction === 'down',
+            Boolean(action.context.shiftKey),
+        );
         updateActiveNode(documentState, nextNode, state);
     }
 };
diff --git a/src/stores/view/reducers/ui/navigate-active-node-history.ts b/src/stores/view/reducers/ui/navigate-active-node-history.ts
@@ -3,6 +3,7 @@ import { updateNavigationState } from 'src/stores/document/reducers/history/help
 import { DocumentViewState, ViewState } from 'src/stores/view/view-state-type';
 
 import { RemoveObsoleteNavigationItemsAction } from 'src/stores/view/reducers/ui/helpers/remove-deleted-navigation-items';
+import { resetSelectionState } from 'src/stores/view/reducers/document/helpers/reset-selection-state';
 
 export type NodeHistoryNavigationAction =
     | {
@@ -24,5 +25,6 @@ export const navigateActiveNodeHistory = (
         state.navigationHistory = { ...state.navigationHistory };
         updateActiveNode(documentState, newItem, null);
         state.recentNodes.activeNode = newItem;
+        resetSelectionState(documentState);
     }
 };
diff --git a/src/stores/view/reducers/ui/navigate-active-node.ts b/src/stores/view/reducers/ui/navigate-active-node.ts
@@ -2,6 +2,7 @@ import { updateActiveNode } from 'src/stores/view/reducers/document/helpers/upda
 import { DocumentViewState, ViewState } from 'src/stores/view/view-state-type';
 import { Sections } from 'src/stores/document/document-state-type';
 import { findNextNode } from 'src/lib/tree-utils/find/find-next-node';
+import { resetSelectionState } from 'src/stores/view/reducers/document/helpers/reset-selection-state';
 
 export type NodeNavigationAction = {
     type: 'NAVIGATION/SELECT_NEXT_NODE';
@@ -25,6 +26,8 @@ export const navigateActiveNode = (
         action.payload.direction,
         action.context.outlineMode ? state.outline.hiddenNodes : null,
     );
-    if (nextNode && nextNode !== documentState.activeNode)
+    if (nextNode && nextNode !== documentState.activeNode) {
         updateActiveNode(documentState, nextNode, state);
+        resetSelectionState(documentState);
+    }
 };
diff --git a/src/stores/view/subscriptions/actions/view/set-initial-active-node.ts b/src/stores/view/subscriptions/actions/view/set-initial-active-node.ts
@@ -8,15 +8,18 @@ export const setInitialActiveNode = (view: LineageView) => {
     const settings = view.plugin.settings.getValue();
     const path = view.file!.path;
     const persistedSection = settings.documents[path]?.activeSection;
-    const sections = documentState.sections;
     if (persistedSection) {
-        id = maybeGetIdOfSection(sections, persistedSection);
+        id = maybeGetIdOfSection(documentState.sections, persistedSection);
     }
     const mostRecentActiveSection = documentState.history.context.activeSection;
     if (!id && mostRecentActiveSection) {
-        id = maybeGetIdOfSection(sections, mostRecentActiveSection);
+        id = maybeGetIdOfSection(
+            documentState.sections,
+            mostRecentActiveSection,
+        );
     }
     if (!id) return;
+    viewStore.setContext(documentState.document);
     viewStore.dispatch({
         type: 'view/set-active-node/document',
         payload: {
diff --git a/src/stores/view/subscriptions/effects/align-branch/create-align-branch-actions/lazy-vertical-scrolling-mode.spec.ts b/src/stores/view/subscriptions/effects/align-branch/create-align-branch-actions/lazy-vertical-scrolling-mode.spec.ts
@@ -4,17 +4,17 @@ import { PluginAction } from 'src/stores/view/subscriptions/effects/align-branch
 
 describe('lazy vertical scrolling', () => {
     test('should not align parent when moving left', () => {
-        const n2 = 'nBBzDYZaD';
-        const n3 = 'nx3_ci_kX';
-        const n0 = 'rk1LyHnoM';
-        const c1 = 'c5SOvC488';
+        // const n2 = 'nBBzDYZaD';
+        // const n3 = 'nx3_ci_kX';
+        // const n0 = 'rk1LyHnoM';
+        // const c1 = 'c5SOvC488';
         const c2 = 'c2hxRIVJi';
         const c3 = 'cxym9-Tob';
-        const c4 = 'cdXjrMGq1';
+        // const c4 = 'cdXjrMGq1';
         const n_1 = 'nBefxOMaM';
         const n1_1 = 'nixEcLX-z';
         const n1_1_1 = 'ncJjgXCQy';
-        const n1_1_1_1 = 'nPjS2fJCU';
+        // const n1_1_1_1 = 'nPjS2fJCU';
         const context = {
             previousActiveBranch: {
                 childGroups: new Set([n1_1_1]),
@@ -32,33 +32,33 @@ describe('lazy vertical scrolling', () => {
             },
         };
 
+     /*   const columns = [
+            {
+                id: c1,
+                groups: [
+                    {
+                        nodes: [n_1, n2, n3],
+                        parentId: n0,
+                    },
+                ],
+            },
+            {
+                id: c2,
+                groups: [{ nodes: [n1_1], parentId: n_1 }],
+            },
+            {
+                id: c3,
+                groups: [{ nodes: [n1_1_1], parentId: n1_1 }],
+            },
+            {
+                id: c4,
+                groups: [{ nodes: [n1_1_1_1], parentId: n1_1_1 }],
+            },
+        ];*/
         const action = {
             type: 'DOCUMENT/NAVIGATE_USING_KEYBOARD',
             payload: {
                 direction: 'left',
-                columns: [
-                    {
-                        id: c1,
-                        groups: [
-                            {
-                                nodes: [n_1, n2, n3],
-                                parentId: n0,
-                            },
-                        ],
-                    },
-                    {
-                        id: c2,
-                        groups: [{ nodes: [n1_1], parentId: n_1 }],
-                    },
-                    {
-                        id: c3,
-                        groups: [{ nodes: [n1_1_1], parentId: n1_1 }],
-                    },
-                    {
-                        id: c4,
-                        groups: [{ nodes: [n1_1_1_1], parentId: n1_1_1 }],
-                    },
-                ],
             },
             context: { outlineMode: false },
         } satisfies PluginAction;
diff --git a/src/stores/view/view-reducer.ts b/src/stores/view/view-reducer.ts
@@ -42,7 +42,7 @@ const updateDocumentState = (
     ) {
         updateActiveNode(state.document, action.payload.id, state);
     } else if (action.type === 'DOCUMENT/NAVIGATE_USING_KEYBOARD') {
-        navigateUsingKeyboard(state.document, state, action);
+        navigateUsingKeyboard(state.document, state, action, context.columns);
     } else if (action.type === 'SEARCH/SET_QUERY') {
         setSearchQuery(state, action.payload.query);
     } else if (action.type === 'SEARCH/SET_RESULTS') {
@@ -140,7 +140,7 @@ const updateDocumentState = (
     } else if (action.type === 'NAVIGATION/NAVIGATE_BACK') {
         navigateActiveNodeHistory(state.document, state);
     } else if (action.type === 'DOCUMENT/JUMP_TO_NODE') {
-        jumpToNode(state.document, state, action);
+        jumpToNode(state.document, state, action, context.columns);
     } else if (action.type === 'NAVIGATION/REMOVE_OBSOLETE') {
         removeDeletedNavigationItems(state, action.payload.content);
     } else if (action.type === 'SEARCH/TOGGLE_FUZZY_MODE') {
diff --git a/src/view/actions/keyboard-shortcuts/helpers/commands/commands/navigate-commands.ts b/src/view/actions/keyboard-shortcuts/helpers/commands/commands/navigate-commands.ts
@@ -30,7 +30,6 @@ const spatialNavigation = (view: LineageView, direction: AllDirections) => {
         type: 'DOCUMENT/NAVIGATE_USING_KEYBOARD',
         payload: {
             direction: direction,
-            columns: view.documentStore.getValue().document.columns,
         },
         context: {
             outlineMode: outlineModeSelector(view),
@@ -61,7 +60,6 @@ const jump = (view: LineageView, target: JumpTarget) => {
         type: 'DOCUMENT/JUMP_TO_NODE',
         payload: {
             target,
-            columns: view.documentStore.getValue().document.columns,
         },
     });
 };
diff --git a/src/view/actions/keyboard-shortcuts/helpers/commands/commands/selection-commands.ts b/src/view/actions/keyboard-shortcuts/helpers/commands/commands/selection-commands.ts
@@ -11,7 +11,6 @@ export const selectionCommands = () => {
                     type: 'DOCUMENT/NAVIGATE_USING_KEYBOARD',
                     payload: {
                         direction: 'up',
-                        columns: view.documentStore.getValue().document.columns,
                     },
                     context: {
                         shiftKey: true,
@@ -37,7 +36,6 @@ export const selectionCommands = () => {
                     type: 'DOCUMENT/NAVIGATE_USING_KEYBOARD',
                     payload: {
                         direction: 'down',
-                        columns: view.documentStore.getValue().document.columns,
                     },
                     context: {
                         shiftKey: true,
@@ -64,7 +62,6 @@ export const selectionCommands = () => {
                     type: 'DOCUMENT/JUMP_TO_NODE',
                     payload: {
                         target: 'end-of-column',
-                        columns: view.documentStore.getValue().document.columns,
                     },
                     context: {
                         shiftKey: true,
@@ -84,7 +81,6 @@ export const selectionCommands = () => {
                     type: 'DOCUMENT/JUMP_TO_NODE',
                     payload: {
                         target: 'start-of-column',
-                        columns: view.documentStore.getValue().document.columns,
                     },
                     context: {
                         shiftKey: true,
@@ -108,7 +104,6 @@ export const selectionCommands = () => {
                     type: 'DOCUMENT/JUMP_TO_NODE',
                     payload: {
                         target: 'end-of-group',
-                        columns: view.documentStore.getValue().document.columns,
                     },
                     context: {
                         shiftKey: true,
@@ -132,7 +127,6 @@ export const selectionCommands = () => {
                     type: 'DOCUMENT/JUMP_TO_NODE',
                     payload: {
                         target: 'start-of-group',
-                        columns: view.documentStore.getValue().document.columns,
                     },
                     context: {
                         shiftKey: true,
