@mui/x-tree-view 7.0.0-beta.7 → 7.0.0

package/node/internals/plugins/useTreeViewJSXNodes/useTreeViewJSXNodes.js

@@ -41,12 +41,12 @@ const useTreeViewJSXNodes = ({
       });
     });
   });
-  const removeJSXNode = (0, _useEventCallback.default)(nodeId => {
+  const removeJSXNode = (0, _useEventCallback.default)(itemId => {
     setState(prevState => {
       const newNodeMap = (0, _extends2.default)({}, prevState.nodes.nodeMap);
       const newItemMap = (0, _extends2.default)({}, prevState.nodes.itemMap);
-      delete newNodeMap[nodeId];
-      delete newItemMap[nodeId];
+      delete newNodeMap[itemId];
+      delete newItemMap[itemId];
       return (0, _extends2.default)({}, prevState, {
         nodes: (0, _extends2.default)({}, prevState.nodes, {
           nodeMap: newNodeMap,
@@ -55,18 +55,18 @@ const useTreeViewJSXNodes = ({
       });
     });
     (0, _publishTreeViewEvent.publishTreeViewEvent)(instance, 'removeNode', {
-      id: nodeId
+      id: itemId
     });
   });
-  const mapFirstCharFromJSX = (0, _useEventCallback.default)((nodeId, firstChar) => {
+  const mapFirstCharFromJSX = (0, _useEventCallback.default)((itemId, firstChar) => {
     instance.updateFirstCharMap(firstCharMap => {
-      firstCharMap[nodeId] = firstChar;
+      firstCharMap[itemId] = firstChar;
       return firstCharMap;
     });
     return () => {
       instance.updateFirstCharMap(firstCharMap => {
         const newMap = (0, _extends2.default)({}, firstCharMap);
-        delete newMap[nodeId];
+        delete newMap[itemId];
         return newMap;
       });
     };
@@ -87,7 +87,7 @@ const useTreeViewJSXNodesItemPlugin = ({
     children,
     disabled = false,
     label,
-    nodeId,
+    itemId,
     id
   } = props;
   const {
@@ -106,8 +106,8 @@ const useTreeViewJSXNodesItemPlugin = ({
   const handleContentRef = (0, _useForkRef.default)(pluginContentRef, contentRef);
   const descendant = React.useMemo(() => ({
     element: treeItemElement,
-    id: nodeId
-  }), [nodeId, treeItemElement]);
+    id: itemId
+  }), [itemId, treeItemElement]);
   const {
     index,
     parentId
@@ -116,23 +116,23 @@ const useTreeViewJSXNodesItemPlugin = ({
     // On the first render a node's index will be -1. We want to wait for the real index.
     if (index !== -1) {
       instance.insertJSXNode({
-        id: nodeId,
+        id: itemId,
         idAttribute: id,
         index,
         parentId,
         expandable,
         disabled
       });
-      return () => instance.removeJSXNode(nodeId);
+      return () => instance.removeJSXNode(itemId);
     }
     return undefined;
-  }, [instance, parentId, index, nodeId, expandable, disabled, id]);
+  }, [instance, parentId, index, itemId, expandable, disabled, id]);
   React.useEffect(() => {
     if (label) {
-      return instance.mapFirstCharFromJSX(nodeId, (pluginContentRef.current?.textContent ?? '').substring(0, 1).toLowerCase());
+      return instance.mapFirstCharFromJSX(itemId, (pluginContentRef.current?.textContent ?? '').substring(0, 1).toLowerCase());
     }
     return undefined;
-  }, [instance, nodeId, label]);
+  }, [instance, itemId, label]);
   return {
     contentRef: handleContentRef,
     rootRef: handleRootRef
@@ -141,9 +141,9 @@ const useTreeViewJSXNodesItemPlugin = ({
 useTreeViewJSXNodes.itemPlugin = useTreeViewJSXNodesItemPlugin;
 useTreeViewJSXNodes.wrapItem = ({
   children,
-  nodeId
+  itemId
 }) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_DescendantProvider.DescendantProvider, {
-  id: nodeId,
+  id: itemId,
   children: children
 });
 useTreeViewJSXNodes.params = {};

package/node/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js

@@ -24,8 +24,7 @@ function findNextFirstChar(firstChars, startIndex, char) {
 }
 const useTreeViewKeyboardNavigation = ({
   instance,
-  params,
-  state
+  params
 }) => {
   const theme = (0, _styles.useTheme)();
   const isRTL = theme.direction === 'rtl';
@@ -42,35 +41,32 @@ const useTreeViewKeyboardNavigation = ({
     const newFirstCharMap = {};
     const processItem = item => {
       const getItemId = params.getItemId;
-      const nodeId = getItemId ? getItemId(item) : item.id;
-      newFirstCharMap[nodeId] = instance.getNode(nodeId).label.substring(0, 1).toLowerCase();
+      const itemId = getItemId ? getItemId(item) : item.id;
+      newFirstCharMap[itemId] = instance.getNode(itemId).label.substring(0, 1).toLowerCase();
       item.children?.forEach(processItem);
     };
     params.items.forEach(processItem);
     firstCharMap.current = newFirstCharMap;
   }, [params.items, params.getItemId, instance]);
-  (0, _useTreeView.populateInstance)(instance, {
-    updateFirstCharMap
-  });
-  const getFirstMatchingNode = (nodeId, firstChar) => {
+  const getFirstMatchingItem = (itemId, firstChar) => {
     let start;
     let index;
     const lowercaseChar = firstChar.toLowerCase();
     const firstCharIds = [];
     const firstChars = [];
     // This really only works since the ids are strings
-    Object.keys(firstCharMap.current).forEach(mapNodeId => {
-      const map = instance.getNode(mapNodeId);
+    Object.keys(firstCharMap.current).forEach(mapItemId => {
+      const map = instance.getNode(mapItemId);
       const visible = map.parentId ? instance.isNodeExpanded(map.parentId) : true;
-      const shouldBeSkipped = params.disabledItemsFocusable ? false : instance.isNodeDisabled(mapNodeId);
+      const shouldBeSkipped = params.disabledItemsFocusable ? false : instance.isNodeDisabled(mapItemId);
       if (visible && !shouldBeSkipped) {
-        firstCharIds.push(mapNodeId);
-        firstChars.push(firstCharMap.current[mapNodeId]);
+        firstCharIds.push(mapItemId);
+        firstChars.push(firstCharMap.current[mapItemId]);
       }
     });
 
     // Get start index for search based on position of currentItem
-    start = firstCharIds.indexOf(nodeId) + 1;
+    start = firstCharIds.indexOf(itemId) + 1;
     if (start >= firstCharIds.length) {
       start = 0;
     }
@@ -89,20 +85,17 @@ const useTreeViewKeyboardNavigation = ({
     }
     return null;
   };
-  const canToggleNodeSelection = nodeId => !params.disableSelection && !instance.isNodeDisabled(nodeId);
-  const canToggleNodeExpansion = nodeId => {
-    return !instance.isNodeDisabled(nodeId) && instance.isNodeExpandable(nodeId);
+  const canToggleItemSelection = itemId => !params.disableSelection && !instance.isNodeDisabled(itemId);
+  const canToggleItemExpansion = itemId => {
+    return !instance.isNodeDisabled(itemId) && instance.isNodeExpandable(itemId);
   };
 
   // ARIA specification: https://www.w3.org/WAI/ARIA/apg/patterns/treeview/#keyboardinteraction
-  const createHandleKeyDown = otherHandlers => event => {
-    otherHandlers.onKeyDown?.(event);
+  const handleItemKeyDown = (event, itemId) => {
     if (event.defaultMuiPrevented) {
       return;
     }
-
-    // If the tree is empty, there will be no focused node
-    if (event.altKey || event.currentTarget !== event.target || state.focusedNodeId == null) {
+    if (event.altKey || event.currentTarget !== event.target) {
       return;
     }
     const ctrlPressed = event.ctrlKey || event.metaKey;
@@ -111,17 +104,17 @@ const useTreeViewKeyboardNavigation = ({
     // eslint-disable-next-line default-case
     switch (true) {
       // Select the node when pressing "Space"
-      case key === ' ' && canToggleNodeSelection(state.focusedNodeId):
+      case key === ' ' && canToggleItemSelection(itemId):
         {
           event.preventDefault();
           if (params.multiSelect && event.shiftKey) {
             instance.selectRange(event, {
-              end: state.focusedNodeId
+              end: itemId
             });
           } else if (params.multiSelect) {
-            instance.selectNode(event, state.focusedNodeId, true);
+            instance.selectNode(event, itemId, true);
           } else {
-            instance.selectNode(event, state.focusedNodeId);
+            instance.selectNode(event, itemId);
           }
           break;
         }
@@ -130,84 +123,87 @@ const useTreeViewKeyboardNavigation = ({
       // If the focused node has no children, we select it.
       case key === 'Enter':
         {
-          if (canToggleNodeExpansion(state.focusedNodeId)) {
-            instance.toggleNodeExpansion(event, state.focusedNodeId);
+          if (canToggleItemExpansion(itemId)) {
+            instance.toggleNodeExpansion(event, itemId);
             event.preventDefault();
-          } else if (canToggleNodeSelection(state.focusedNodeId)) {
+          } else if (canToggleItemSelection(itemId)) {
             if (params.multiSelect) {
               event.preventDefault();
-              instance.selectNode(event, state.focusedNodeId, true);
-            } else if (!instance.isNodeSelected(state.focusedNodeId)) {
-              instance.selectNode(event, state.focusedNodeId);
+              instance.selectNode(event, itemId, true);
+            } else if (!instance.isNodeSelected(itemId)) {
+              instance.selectNode(event, itemId);
               event.preventDefault();
             }
           }
           break;
         }
 
-      // Focus the next focusable node
+      // Focus the next focusable item
       case key === 'ArrowDown':
         {
-          const nextNode = (0, _useTreeView.getNextNode)(instance, state.focusedNodeId);
-          if (nextNode) {
+          const nextItem = (0, _useTreeView.getNextNode)(instance, itemId);
+          if (nextItem) {
             event.preventDefault();
-            instance.focusItem(event, nextNode);
+            instance.focusItem(event, nextItem);
 
             // Multi select behavior when pressing Shift + ArrowDown
-            // Toggles the selection state of the next node
-            if (params.multiSelect && event.shiftKey && canToggleNodeSelection(nextNode)) {
+            // Toggles the selection state of the next item
+            if (params.multiSelect && event.shiftKey && canToggleItemSelection(nextItem)) {
               instance.selectRange(event, {
-                end: nextNode,
-                current: state.focusedNodeId
+                end: nextItem,
+                current: itemId
               }, true);
             }
           }
           break;
         }
 
-      // Focuses the previous focusable node
+      // Focuses the previous focusable item
       case key === 'ArrowUp':
         {
-          const previousNode = (0, _useTreeView.getPreviousNode)(instance, state.focusedNodeId);
-          if (previousNode) {
+          const previousItem = (0, _useTreeView.getPreviousNode)(instance, itemId);
+          if (previousItem) {
             event.preventDefault();
-            instance.focusItem(event, previousNode);
+            instance.focusItem(event, previousItem);
 
             // Multi select behavior when pressing Shift + ArrowUp
-            // Toggles the selection state of the previous node
-            if (params.multiSelect && event.shiftKey && canToggleNodeSelection(previousNode)) {
+            // Toggles the selection state of the previous item
+            if (params.multiSelect && event.shiftKey && canToggleItemSelection(previousItem)) {
               instance.selectRange(event, {
-                end: previousNode,
-                current: state.focusedNodeId
+                end: previousItem,
+                current: itemId
               }, true);
             }
           }
           break;
         }
 
-      // If the focused node is expanded, we move the focus to its first child
-      // If the focused node is collapsed and has children, we expand it
+      // If the focused item is expanded, we move the focus to its first child
+      // If the focused item is collapsed and has children, we expand it
       case key === 'ArrowRight' && !isRTL || key === 'ArrowLeft' && isRTL:
         {
-          if (instance.isNodeExpanded(state.focusedNodeId)) {
-            instance.focusItem(event, (0, _useTreeView.getNextNode)(instance, state.focusedNodeId));
-            event.preventDefault();
-          } else if (canToggleNodeExpansion(state.focusedNodeId)) {
-            instance.toggleNodeExpansion(event, state.focusedNodeId);
+          if (instance.isNodeExpanded(itemId)) {
+            const nextNodeId = (0, _useTreeView.getNextNode)(instance, itemId);
+            if (nextNodeId) {
+              instance.focusItem(event, nextNodeId);
+              event.preventDefault();
+            }
+          } else if (canToggleItemExpansion(itemId)) {
+            instance.toggleNodeExpansion(event, itemId);
             event.preventDefault();
           }
           break;
         }
 
-      // If the focused node is expanded, we collapse it
-      // If the focused node is collapsed and has a parent, we move the focus to this parent
+      // If the focused item is expanded, we collapse it
+      // If the focused item is collapsed and has a parent, we move the focus to this parent
       case key === 'ArrowLeft' && !isRTL || key === 'ArrowRight' && isRTL:
         {
-          if (canToggleNodeExpansion(state.focusedNodeId) && instance.isNodeExpanded(state.focusedNodeId)) {
-            instance.toggleNodeExpansion(event, state.focusedNodeId);
+          if (canToggleItemExpansion(itemId) && instance.isNodeExpanded(itemId)) {
+            instance.toggleNodeExpansion(event, itemId);
             event.preventDefault();
           } else {
-            const parent = instance.getNode(state.focusedNodeId).parentId;
+            const parent = instance.getNode(itemId).parentId;
             if (parent) {
               instance.focusItem(event, parent);
               event.preventDefault();
@@ -223,31 +219,31 @@ const useTreeViewKeyboardNavigation = ({
 
           // Multi select behavior when pressing Ctrl + Shift + Home
           // Selects the focused node and all nodes up to the first node.
-          if (canToggleNodeSelection(state.focusedNodeId) && params.multiSelect && ctrlPressed && event.shiftKey) {
-            instance.rangeSelectToFirst(event, state.focusedNodeId);
+          if (canToggleItemSelection(itemId) && params.multiSelect && ctrlPressed && event.shiftKey) {
+            instance.rangeSelectToFirst(event, itemId);
           }
           event.preventDefault();
           break;
         }
 
-      // Focuses the last node in the tree
+      // Focuses the last item in the tree
       case key === 'End':
         {
           instance.focusItem(event, (0, _useTreeView.getLastNode)(instance));
 
           // Multi select behavior when pressing Ctrl + Shirt + End
-          // Selects the focused node and all the nodes down to the last node.
-          if (canToggleNodeSelection(state.focusedNodeId) && params.multiSelect && ctrlPressed && event.shiftKey) {
-            instance.rangeSelectToLast(event, state.focusedNodeId);
+          // Selects the focused item and all the items down to the last item.
+          if (canToggleItemSelection(itemId) && params.multiSelect && ctrlPressed && event.shiftKey) {
+            instance.rangeSelectToLast(event, itemId);
           }
           event.preventDefault();
           break;
         }
 
-      // Expand all siblings that are at the same level as the focused node
+      // Expand all siblings that are at the same level as the focused item
       case key === '*':
         {
-          instance.expandAllSiblings(event, state.focusedNodeId);
+          instance.expandAllSiblings(event, itemId);
           event.preventDefault();
           break;
         }
@@ -268,7 +264,7 @@ const useTreeViewKeyboardNavigation = ({
       // TODO: Support typing multiple characters
       case !ctrlPressed && !event.shiftKey && isPrintableCharacter(key):
         {
-          const matchingNode = getFirstMatchingNode(state.focusedNodeId, key);
+          const matchingNode = getFirstMatchingItem(itemId, key);
           if (matchingNode != null) {
             instance.focusItem(event, matchingNode);
             event.preventDefault();
@@ -277,11 +273,10 @@ const useTreeViewKeyboardNavigation = ({
         }
     }
   };
-  return {
-    getRootProps: otherHandlers => ({
-      onKeyDown: createHandleKeyDown(otherHandlers)
-    })
-  };
+  (0, _useTreeView.populateInstance)(instance, {
+    updateFirstCharMap,
+    handleItemKeyDown
+  });
 };
 exports.useTreeViewKeyboardNavigation = useTreeViewKeyboardNavigation;
 useTreeViewKeyboardNavigation.params = {};

package/node/internals/plugins/useTreeViewNodes/useTreeViewNodes.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.useTreeViewNodes = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
-var _useEventCallback = _interopRequireDefault(require("@mui/utils/useEventCallback"));
 var _useTreeView = require("../../useTreeView/useTreeView.utils");
 var _publishTreeViewEvent = require("../../utils/publishTreeViewEvent");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -61,34 +60,34 @@ const useTreeViewNodes = ({
   state,
   setState
 }) => {
-  const getNode = React.useCallback(nodeId => state.nodes.nodeMap[nodeId], [state.nodes.nodeMap]);
-  const getItem = React.useCallback(nodeId => state.nodes.itemMap[nodeId], [state.nodes.itemMap]);
-  const isNodeDisabled = React.useCallback(nodeId => {
-    if (nodeId == null) {
+  const getNode = React.useCallback(itemId => state.nodes.nodeMap[itemId], [state.nodes.nodeMap]);
+  const getItem = React.useCallback(itemId => state.nodes.itemMap[itemId], [state.nodes.itemMap]);
+  const isNodeDisabled = React.useCallback(itemId => {
+    if (itemId == null) {
       return false;
     }
-    let node = instance.getNode(nodeId);
+    let item = instance.getNode(itemId);
 
-    // This can be called before the node has been added to the node map.
-    if (!node) {
+    // This can be called before the item has been added to the node map.
+    if (!item) {
       return false;
     }
-    if (node.disabled) {
+    if (item.disabled) {
       return true;
     }
-    while (node.parentId != null) {
-      node = instance.getNode(node.parentId);
-      if (node.disabled) {
+    while (item.parentId != null) {
+      item = instance.getNode(item.parentId);
+      if (item.disabled) {
         return true;
       }
     }
     return false;
   }, [instance]);
-  const getChildrenIds = (0, _useEventCallback.default)(nodeId => Object.values(state.nodes.nodeMap).filter(node => node.parentId === nodeId).sort((a, b) => a.index - b.index).map(child => child.id));
-  const getNavigableChildrenIds = nodeId => {
-    let childrenIds = instance.getChildrenIds(nodeId);
+  const getChildrenIds = React.useCallback(itemId => Object.values(state.nodes.nodeMap).filter(item => item.parentId === itemId).sort((a, b) => a.index - b.index).map(child => child.id), [state.nodes.nodeMap]);
+  const getNavigableChildrenIds = itemId => {
+    let childrenIds = instance.getChildrenIds(itemId);
     if (!params.disabledItemsFocusable) {
-      childrenIds = childrenIds.filter(node => !instance.isNodeDisabled(node));
+      childrenIds = childrenIds.filter(item => !instance.isNodeDisabled(item));
     }
     return childrenIds;
   };
@@ -113,19 +112,19 @@ const useTreeViewNodes = ({
     });
   }, [instance, setState, params.items, params.isItemDisabled, params.getItemId, params.getItemLabel]);
   const getNodesToRender = () => {
-    const getPropsFromNodeId = ({
+    const getPropsFromItemId = ({
       id,
       children
     }) => {
       const node = state.nodes.nodeMap[id];
       return {
         label: node.label,
-        nodeId: node.id,
+        itemId: node.id,
         id: node.idAttribute,
-        children: children?.map(getPropsFromNodeId)
+        children: children?.map(getPropsFromItemId)
       };
     };
-    return state.nodes.nodeTree.map(getPropsFromNodeId);
+    return state.nodes.nodeTree.map(getPropsFromItemId);
   };
   (0, _useTreeView.populateInstance)(instance, {
     getNode,

package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.js

@@ -44,26 +44,26 @@ const useTreeViewSelection = ({
     }
     models.selectedItems.setControlledValue(newSelectedItems);
   };
-  const isNodeSelected = nodeId => Array.isArray(models.selectedItems.value) ? models.selectedItems.value.indexOf(nodeId) !== -1 : models.selectedItems.value === nodeId;
-  const selectNode = (event, nodeId, multiple = false) => {
+  const isNodeSelected = itemId => Array.isArray(models.selectedItems.value) ? models.selectedItems.value.indexOf(itemId) !== -1 : models.selectedItems.value === itemId;
+  const selectNode = (event, itemId, multiple = false) => {
     if (params.disableSelection) {
       return;
     }
     if (multiple) {
       if (Array.isArray(models.selectedItems.value)) {
         let newSelected;
-        if (models.selectedItems.value.indexOf(nodeId) !== -1) {
-          newSelected = models.selectedItems.value.filter(id => id !== nodeId);
+        if (models.selectedItems.value.indexOf(itemId) !== -1) {
+          newSelected = models.selectedItems.value.filter(id => id !== itemId);
         } else {
-          newSelected = [nodeId].concat(models.selectedItems.value);
+          newSelected = [itemId].concat(models.selectedItems.value);
         }
         setSelectedItems(event, newSelected);
       }
     } else {
-      const newSelected = params.multiSelect ? [nodeId] : nodeId;
+      const newSelected = params.multiSelect ? [itemId] : itemId;
       setSelectedItems(event, newSelected);
     }
-    lastSelectedNode.current = nodeId;
+    lastSelectedNode.current = itemId;
     lastSelectionWasRange.current = false;
     currentRangeSelection.current = [];
   };
@@ -144,21 +144,21 @@ const useTreeViewSelection = ({
     }
     lastSelectionWasRange.current = true;
   };
-  const rangeSelectToFirst = (event, nodeId) => {
+  const rangeSelectToFirst = (event, itemId) => {
     if (!lastSelectedNode.current) {
-      lastSelectedNode.current = nodeId;
+      lastSelectedNode.current = itemId;
     }
-    const start = lastSelectionWasRange.current ? lastSelectedNode.current : nodeId;
+    const start = lastSelectionWasRange.current ? lastSelectedNode.current : itemId;
     instance.selectRange(event, {
       start,
       end: (0, _useTreeView.getFirstNode)(instance)
     });
   };
-  const rangeSelectToLast = (event, nodeId) => {
+  const rangeSelectToLast = (event, itemId) => {
     if (!lastSelectedNode.current) {
-      lastSelectedNode.current = nodeId;
+      lastSelectedNode.current = itemId;
     }
-    const start = lastSelectionWasRange.current ? lastSelectedNode.current : nodeId;
+    const start = lastSelectionWasRange.current ? lastSelectedNode.current : itemId;
     instance.selectRange(event, {
       start,
       end: (0, _useTreeView.getLastNode)(instance)

package/node/internals/useTreeView/useTreeView.js

@@ -97,13 +97,13 @@ const useTreeView = inParams => {
   };
   const itemWrappers = plugins.map(plugin => plugin.wrapItem).filter(wrapItem => !!wrapItem);
   contextValue.wrapItem = ({
-    nodeId,
+    itemId,
     children
   }) => {
     let finalChildren = children;
     itemWrappers.forEach(itemWrapper => {
       finalChildren = itemWrapper({
-        nodeId,
+        itemId,
         children: finalChildren
       });
     });
@@ -111,8 +111,7 @@ const useTreeView = inParams => {
   };
   const getRootProps = (otherHandlers = {}) => {
     const rootProps = (0, _extends2.default)({
-      role: 'tree',
-      tabIndex: 0
+      role: 'tree'
     }, otherHandlers, {
       ref: handleRootRef
     });

package/node/internals/useTreeView/useTreeView.utils.js

@@ -4,46 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.populatePublicAPI = exports.populateInstance = exports.getPreviousNode = exports.getNextNode = exports.getLastNode = exports.getFirstNode = void 0;
-const getPreviousNode = (instance, nodeId) => {
-  const node = instance.getNode(nodeId);
-  const siblings = instance.getNavigableChildrenIds(node.parentId);
-  const nodeIndex = siblings.indexOf(nodeId);
-  if (nodeIndex === 0) {
-    return node.parentId;
+const getPreviousNode = (instance, itemId) => {
+  const item = instance.getNode(itemId);
+  const siblings = instance.getNavigableChildrenIds(item.parentId);
+  const itemIndex = siblings.indexOf(itemId);
+  if (itemIndex === 0) {
+    return item.parentId;
   }
-  let currentNode = siblings[nodeIndex - 1];
-  while (instance.isNodeExpanded(currentNode) && instance.getNavigableChildrenIds(currentNode).length > 0) {
-    currentNode = instance.getNavigableChildrenIds(currentNode).pop();
+  let currentItem = siblings[itemIndex - 1];
+  while (instance.isNodeExpanded(currentItem) && instance.getNavigableChildrenIds(currentItem).length > 0) {
+    currentItem = instance.getNavigableChildrenIds(currentItem).pop();
   }
-  return currentNode;
+  return currentItem;
 };
 exports.getPreviousNode = getPreviousNode;
-const getNextNode = (instance, nodeId) => {
+const getNextNode = (instance, itemId) => {
   // If expanded get first child
-  if (instance.isNodeExpanded(nodeId) && instance.getNavigableChildrenIds(nodeId).length > 0) {
-    return instance.getNavigableChildrenIds(nodeId)[0];
+  if (instance.isNodeExpanded(itemId) && instance.getNavigableChildrenIds(itemId).length > 0) {
+    return instance.getNavigableChildrenIds(itemId)[0];
   }
-  let node = instance.getNode(nodeId);
-  while (node != null) {
+  let item = instance.getNode(itemId);
+  while (item != null) {
     // Try to get next sibling
-    const siblings = instance.getNavigableChildrenIds(node.parentId);
-    const nextSibling = siblings[siblings.indexOf(node.id) + 1];
+    const siblings = instance.getNavigableChildrenIds(item.parentId);
+    const nextSibling = siblings[siblings.indexOf(item.id) + 1];
     if (nextSibling) {
       return nextSibling;
     }
 
     // If the sibling does not exist, go up a level to the parent and try again.
-    node = instance.getNode(node.parentId);
+    item = instance.getNode(item.parentId);
   }
   return null;
 };
 exports.getNextNode = getNextNode;
 const getLastNode = instance => {
-  let lastNode = instance.getNavigableChildrenIds(null).pop();
-  while (instance.isNodeExpanded(lastNode)) {
-    lastNode = instance.getNavigableChildrenIds(lastNode).pop();
+  let lastItem = instance.getNavigableChildrenIds(null).pop();
+  while (instance.isNodeExpanded(lastItem)) {
+    lastItem = instance.getNavigableChildrenIds(lastItem).pop();
   }
-  return lastNode;
+  return lastItem;
 };
 exports.getLastNode = getLastNode;
 const getFirstNode = instance => instance.getNavigableChildrenIds(null)[0];

package/node/internals/utils/utils.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getActiveElement = void 0;
+// https://www.abeautifulsite.net/posts/finding-the-active-element-in-a-shadow-root/
 const getActiveElement = (root = document) => {
   const activeEl = root.activeElement;
   if (!activeEl) {