update to update tabbableId for halfSelect

dgreene1 · Jun 16, 2023 · 1b5edc7 · 1b5edc7
1 parent 72a0bf8
commit 1b5edc7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/TreeView/index.tsx b/src/TreeView/index.tsx
@@ -350,6 +350,8 @@ const useTree = ({
             type: treeTypes.halfSelect,
             id,
             lastInteractedWith,
+            keepFocus: true,
+            NotUserAction: true,
           });
       }
       for (const id of none) {

diff --git a/src/TreeView/reducer.ts b/src/TreeView/reducer.ts
@@ -30,6 +30,8 @@ export type TreeViewAction =
       type: "HALF_SELECT";
       id: NodeId;
       lastInteractedWith?: NodeId | null;
+      keepFocus?: boolean;
+      NotUserAction?: boolean;
     }
   | {
       type: "SELECT";
@@ -186,8 +188,10 @@ export const treeReducer = (
         ...state,
         selectedIds,
         halfSelectedIds,
+        tabbableId: action.keepFocus ? state.tabbableId : action.id,
         lastAction: action.type,
         lastInteractedWith: action.lastInteractedWith,
+        lastUserSelect: action.NotUserAction ? state.lastUserSelect : action.id,
       };
     }
     case treeTypes.select: {
@@ -233,9 +237,7 @@ export const treeReducer = (
         ...state,
         selectedIds,
         halfSelectedIds,
-        tabbableId: action.keepFocus
-          ? action.lastInteractedWith || state.tabbableId
-          : action.id,
+        tabbableId: action.keepFocus ? state.tabbableId : action.id,
         isFocused: true,
         lastUserSelect: action.NotUserAction ? state.lastUserSelect : action.id,
         lastAction: action.type,