fix(component): only focus on TreeItem when focus within Tree component

packages/big-design/src/components/StatefulTree/spec.tsx

@@ -1,7 +1,8 @@
 import { theme } from '@bigcommerce/big-design-theme';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { fireEvent, render } from '@test/utils';
+import { fireEvent, render, screen } from '@test/utils';
 
 import { StatefulTree, StatefulTreeProps, TreeNodeProps } from '.';
 
@@ -182,3 +183,20 @@ describe('selectable = radio', () => {
     }
   });
 });
+
+test('should focus on TreeItem on arrow down', async () => {
+  render(getSimpleTree());
+
+  const node0 = await screen.findByRole('treeitem', { name: 'Test Node 0' });
+  const node1 = await screen.findByRole('treeitem', { name: 'Test Node 1' });
+
+  await userEvent.tab();
+
+  expect(node0).toHaveFocus();
+  expect(node1).not.toHaveFocus();
+
+  await userEvent.keyboard('{ArrowDown}');
+
+  expect(node0).not.toHaveFocus();
+  expect(node1).toHaveFocus();
+});

packages/big-design/src/components/Tree/Tree.tsx

@@ -1,4 +1,4 @@
-import React, { createContext, useMemo } from 'react';
+import React, { createContext, useMemo, useRef } from 'react';
 
 import { StyledUl } from './styled';
 import { TreeNode } from './TreeNode';
@@ -14,6 +14,7 @@ export const TreeContext = createContext<TreeContextState<any>>({
     onFocus: () => null,
   },
   onKeyDown: () => null,
+  treeRef: { current: null },
 });
 
 export const Tree = <T,>({
@@ -27,6 +28,8 @@ export const Tree = <T,>({
   onNodeClick,
   selectable,
 }: TreeProps<T>): React.ReactElement<TreeProps<T>> => {
+  const treeRef = useRef<HTMLUListElement>(null);
+
   const initialTreeContext: TreeContextState<T> = {
     disabledNodes,
     expandable,
@@ -35,6 +38,7 @@ export const Tree = <T,>({
     onKeyDown,
     onNodeClick,
     selectable,
+    treeRef,
   };
 
   const renderedItems = useMemo(
@@ -47,6 +51,7 @@ export const Tree = <T,>({
       <StyledUl
         aria-multiselectable={selectable?.type === 'multi'}
         id={id}
+        ref={treeRef}
         role="tree"
         style={{ overflow: 'hidden' }}
       >

packages/big-design/src/components/Tree/TreeNode/TreeNode.tsx

@@ -29,8 +29,16 @@ const InternalTreeNode = <T,>({
   value,
   id,
 }: TreeNodeProps<T>): React.ReactElement<TreeNodeProps<T>> => {
-  const { disabledNodes, expandable, focusable, iconless, onKeyDown, onNodeClick, selectable } =
-    useContext(TreeContext);
+  const {
+    disabledNodes,
+    expandable,
+    focusable,
+    iconless,
+    onKeyDown,
+    onNodeClick,
+    selectable,
+    treeRef,
+  } = useContext(TreeContext);
   const nodeRef = useRef<HTMLLIElement | null>(null);
   const selectableRef = useRef<HTMLLabelElement | null>(null);
   const isExpanded = expandable.expandedNodes.includes(id);
@@ -46,11 +54,12 @@ const InternalTreeNode = <T,>({
     if (
       focusable.focusedNode === id &&
       nodeRef.current !== document.activeElement &&
-      document.activeElement !== document.body
+      document.activeElement !== document.body &&
+      treeRef.current?.contains(document.activeElement)
     ) {
       nodeRef.current?.focus();
     }
-  }, [focusable, id]);
+  }, [focusable, id, treeRef]);
 
   // Could be multiple elements in which are clicked.
   // Typing to generic Element type since all other elements extend from it.