Merge pull request #88 from jamesplease/root-fixes

Fix issue when mounting node tree with disabled node
jamesplease · Feb 11, 2022 · 91c96e6 · 91c96e6
2 parents 703755b + c8547b4
commit 91c96e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/tests/disabled-nodes.test.js b/src/tests/disabled-nodes.test.js
@@ -65,4 +65,17 @@ describe('disabled FocusNodes', () => {
 
     expect(warning).toHaveBeenCalledTimes(0);
   });
+
+  it('does not warn when a focus tree mounts with a disabled child (gh-78)', () => {
+    render(
+      <FocusRoot>
+        <FocusNode focusId="parent">
+          <FocusNode focusId="A" disabled />
+          <FocusNode focusId="B" />
+        </FocusNode>
+      </FocusRoot>
+    );
+
+    expect(console.error).toHaveBeenCalledTimes(0);
+  });
 });
diff --git a/src/utils/enforce-state-structure.ts b/src/utils/enforce-state-structure.ts
@@ -1,9 +1,10 @@
 import { FocusState, Node, NodeMap, Id } from '../types';
+import nodeCanReceiveIndirectFocus from './node-can-receive-indirect-focus';
 
-function validateNode(node: Node, nodes: NodeMap) {
+function validateNode(node: Node, nodes: NodeMap, focusState: FocusState) {
   const enabledNodeChildren = node.children.filter((childId) => {
     const node = nodes[childId];
-    return node && !node.disabled && !node.isExiting;
+    return nodeCanReceiveIndirectFocus(focusState, node);
   });
 
   if (enabledNodeChildren.length > 0 && node.isFocusedLeaf) {
@@ -74,7 +75,7 @@ export default function enforceStateStructure(focusState: FocusState) {
 
   Object.values(focusState.nodes).forEach((node) => {
     if (node) {
-      validateNode(node, focusState.nodes);
+      validateNode(node, focusState.nodes, focusState);
     }
   });
 }