@mui/x-tree-view 7.0.0 → 7.1.0

package/modern/internals/plugins/useTreeViewFocus/useTreeViewFocus.js

@@ -8,7 +8,7 @@ import { getActiveElement } from '../../utils/utils';
 const useTabbableItemId = (instance, selectedItems) => {
   const isItemVisible = itemId => {
     const node = instance.getNode(itemId);
-    return node && (node.parentId == null || instance.isNodeExpanded(node.parentId));
+    return node && (node.parentId == null || instance.isItemExpanded(node.parentId));
   };
   let tabbableItemId;
   if (Array.isArray(selectedItems)) {
@@ -32,18 +32,18 @@ export const useTreeViewFocus = ({
 }) => {
   const tabbableItemId = useTabbableItemId(instance, models.selectedItems.value);
   const setFocusedItemId = useEventCallback(itemId => {
-    const cleanItemId = typeof itemId === 'function' ? itemId(state.focusedNodeId) : itemId;
-    if (state.focusedNodeId !== cleanItemId) {
+    const cleanItemId = typeof itemId === 'function' ? itemId(state.focusedItemId) : itemId;
+    if (state.focusedItemId !== cleanItemId) {
       setState(prevState => _extends({}, prevState, {
-        focusedNodeId: cleanItemId
+        focusedItemId: cleanItemId
       }));
     }
   });
   const isTreeViewFocused = React.useCallback(() => !!rootRef.current && rootRef.current.contains(getActiveElement(ownerDocument(rootRef.current))), [rootRef]);
-  const isNodeFocused = React.useCallback(itemId => state.focusedNodeId === itemId && isTreeViewFocused(), [state.focusedNodeId, isTreeViewFocused]);
-  const isNodeVisible = itemId => {
+  const isItemFocused = React.useCallback(itemId => state.focusedItemId === itemId && isTreeViewFocused(), [state.focusedItemId, isTreeViewFocused]);
+  const isItemVisible = itemId => {
     const node = instance.getNode(itemId);
-    return node && (node.parentId == null || instance.isNodeExpanded(node.parentId));
+    return node && (node.parentId == null || instance.isItemExpanded(node.parentId));
   };
   const innerFocusItem = (event, itemId) => {
     const node = instance.getNode(itemId);
@@ -56,62 +56,64 @@ export const useTreeViewFocus = ({
       params.onItemFocus(event, itemId);
     }
   };
-  const focusItem = useEventCallback((event, nodeId) => {
-    // If we receive a nodeId, and it is visible, the focus will be set to it
-    if (isNodeVisible(nodeId)) {
-      innerFocusItem(event, nodeId);
+  const focusItem = useEventCallback((event, itemId) => {
+    // If we receive an itemId, and it is visible, the focus will be set to it
+    if (isItemVisible(itemId)) {
+      innerFocusItem(event, itemId);
     }
   });
-  const focusDefaultNode = useEventCallback(event => {
-    let nodeToFocusId;
+  const focusDefaultItem = useEventCallback(event => {
+    let itemToFocusId;
     if (Array.isArray(models.selectedItems.value)) {
-      nodeToFocusId = models.selectedItems.value.find(isNodeVisible);
-    } else if (models.selectedItems.value != null && isNodeVisible(models.selectedItems.value)) {
-      nodeToFocusId = models.selectedItems.value;
+      itemToFocusId = models.selectedItems.value.find(isItemVisible);
+    } else if (models.selectedItems.value != null && isItemVisible(models.selectedItems.value)) {
+      itemToFocusId = models.selectedItems.value;
     }
-    if (nodeToFocusId == null) {
-      nodeToFocusId = instance.getNavigableChildrenIds(null)[0];
+    if (itemToFocusId == null) {
+      itemToFocusId = instance.getNavigableChildrenIds(null)[0];
     }
-    innerFocusItem(event, nodeToFocusId);
+    innerFocusItem(event, itemToFocusId);
   });
   const removeFocusedItem = useEventCallback(() => {
-    if (state.focusedNodeId == null) {
+    if (state.focusedItemId == null) {
       return;
     }
-    const node = instance.getNode(state.focusedNodeId);
-    const itemElement = document.getElementById(instance.getTreeItemId(state.focusedNodeId, node.idAttribute));
-    if (itemElement) {
-      itemElement.blur();
+    const node = instance.getNode(state.focusedItemId);
+    if (node) {
+      const itemElement = document.getElementById(instance.getTreeItemId(state.focusedItemId, node.idAttribute));
+      if (itemElement) {
+        itemElement.blur();
+      }
     }
     setFocusedItemId(null);
   });
   const canItemBeTabbed = itemId => itemId === tabbableItemId;
   populateInstance(instance, {
-    isNodeFocused,
+    isItemFocused,
     canItemBeTabbed,
     focusItem,
-    focusDefaultNode,
+    focusDefaultItem,
     removeFocusedItem
   });
   populatePublicAPI(publicAPI, {
     focusItem
   });
-  useInstanceEventHandler(instance, 'removeNode', ({
+  useInstanceEventHandler(instance, 'removeItem', ({
     id
   }) => {
-    if (state.focusedNodeId === id) {
-      instance.focusDefaultNode(null);
+    if (state.focusedItemId === id) {
+      instance.focusDefaultItem(null);
     }
   });
   const createHandleFocus = otherHandlers => event => {
     otherHandlers.onFocus?.(event);
     // if the event bubbled (which is React specific) we don't want to steal focus
     if (event.target === event.currentTarget) {
-      instance.focusDefaultNode(event);
+      instance.focusDefaultItem(event);
     }
   };
-  const focusedNode = instance.getNode(state.focusedNodeId);
-  const activeDescendant = focusedNode ? instance.getTreeItemId(focusedNode.id, focusedNode.idAttribute) : null;
+  const focusedItem = instance.getNode(state.focusedItemId);
+  const activeDescendant = focusedItem ? instance.getTreeItemId(focusedItem.id, focusedItem.idAttribute) : null;
   return {
     getRootProps: otherHandlers => ({
       onFocus: createHandleFocus(otherHandlers),
@@ -120,7 +122,7 @@ export const useTreeViewFocus = ({
   };
 };
 useTreeViewFocus.getInitialState = () => ({
-  focusedNodeId: null
+  focusedItemId: null
 });
 useTreeViewFocus.params = {
   onItemFocus: true

package/modern/internals/plugins/useTreeViewItems/index.js

@@ -0,0 +1 @@
+export { useTreeViewItems } from './useTreeViewItems';

package/modern/internals/plugins/{useTreeViewNodes/useTreeViewNodes.js → useTreeViewItems/useTreeViewItems.js}

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { populateInstance, populatePublicAPI } from '../../useTreeView/useTreeView.utils';
 import { publishTreeViewEvent } from '../../utils/publishTreeViewEvent';
-const updateNodesState = ({
+const updateItemsState = ({
   items,
   isItemDisabled,
   getItemLabel,
@@ -44,86 +44,96 @@ const updateNodesState = ({
     itemMap
   };
 };
-export const useTreeViewNodes = ({
+export const useTreeViewItems = ({
   instance,
   publicAPI,
   params,
   state,
   setState
 }) => {
-  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 => {
+  const getNode = React.useCallback(itemId => state.items.nodeMap[itemId], [state.items.nodeMap]);
+  const getItem = React.useCallback(itemId => state.items.itemMap[itemId], [state.items.itemMap]);
+  const isItemDisabled = React.useCallback(itemId => {
     if (itemId == null) {
       return false;
     }
-    let item = instance.getNode(itemId);
+    let node = instance.getNode(itemId);
 
-    // This can be called before the item has been added to the node map.
-    if (!item) {
+    // This can be called before the item has been added to the item map.
+    if (!node) {
       return false;
     }
-    if (item.disabled) {
+    if (node.disabled) {
       return true;
     }
-    while (item.parentId != null) {
-      item = instance.getNode(item.parentId);
-      if (item.disabled) {
+    while (node.parentId != null) {
+      node = instance.getNode(node.parentId);
+      if (node.disabled) {
         return true;
       }
     }
     return false;
   }, [instance]);
-  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 getChildrenIds = React.useCallback(itemId => Object.values(state.items.nodeMap).filter(item => item.parentId === itemId).sort((a, b) => a.index - b.index).map(child => child.id), [state.items.nodeMap]);
   const getNavigableChildrenIds = itemId => {
     let childrenIds = instance.getChildrenIds(itemId);
     if (!params.disabledItemsFocusable) {
-      childrenIds = childrenIds.filter(item => !instance.isNodeDisabled(item));
+      childrenIds = childrenIds.filter(item => !instance.isItemDisabled(item));
     }
     return childrenIds;
   };
+  const areItemUpdatesPreventedRef = React.useRef(false);
+  const preventItemUpdates = React.useCallback(() => {
+    areItemUpdatesPreventedRef.current = true;
+  }, []);
+  const areItemUpdatesPrevented = React.useCallback(() => areItemUpdatesPreventedRef.current, []);
   React.useEffect(() => {
+    if (instance.areItemUpdatesPrevented()) {
+      return;
+    }
     setState(prevState => {
-      const newState = updateNodesState({
+      const newState = updateItemsState({
         items: params.items,
         isItemDisabled: params.isItemDisabled,
         getItemId: params.getItemId,
         getItemLabel: params.getItemLabel
       });
-      Object.values(prevState.nodes.nodeMap).forEach(node => {
-        if (!newState.nodeMap[node.id]) {
-          publishTreeViewEvent(instance, 'removeNode', {
-            id: node.id
+      Object.values(prevState.items.nodeMap).forEach(item => {
+        if (!newState.nodeMap[item.id]) {
+          publishTreeViewEvent(instance, 'removeItem', {
+            id: item.id
           });
         }
       });
       return _extends({}, prevState, {
-        nodes: newState
+        items: newState
       });
     });
   }, [instance, setState, params.items, params.isItemDisabled, params.getItemId, params.getItemLabel]);
-  const getNodesToRender = () => {
+  const getItemsToRender = () => {
     const getPropsFromItemId = ({
       id,
       children
     }) => {
-      const node = state.nodes.nodeMap[id];
+      const item = state.items.nodeMap[id];
       return {
-        label: node.label,
-        itemId: node.id,
-        id: node.idAttribute,
+        label: item.label,
+        itemId: item.id,
+        id: item.idAttribute,
         children: children?.map(getPropsFromItemId)
       };
     };
-    return state.nodes.nodeTree.map(getPropsFromItemId);
+    return state.items.nodeTree.map(getPropsFromItemId);
   };
   populateInstance(instance, {
     getNode,
     getItem,
-    getNodesToRender,
+    getItemsToRender,
     getChildrenIds,
     getNavigableChildrenIds,
-    isNodeDisabled
+    isItemDisabled,
+    preventItemUpdates,
+    areItemUpdatesPrevented
   });
   populatePublicAPI(publicAPI, {
     getItem
@@ -134,18 +144,18 @@ export const useTreeViewNodes = ({
     }
   };
 };
-useTreeViewNodes.getInitialState = params => ({
-  nodes: updateNodesState({
+useTreeViewItems.getInitialState = params => ({
+  items: updateItemsState({
     items: params.items,
     isItemDisabled: params.isItemDisabled,
     getItemId: params.getItemId,
     getItemLabel: params.getItemLabel
   })
 });
-useTreeViewNodes.getDefaultizedParams = params => _extends({}, params, {
+useTreeViewItems.getDefaultizedParams = params => _extends({}, params, {
   disabledItemsFocusable: params.disabledItemsFocusable ?? false
 });
-useTreeViewNodes.params = {
+useTreeViewItems.params = {
   disabledItemsFocusable: true,
   items: true,
   isItemDisabled: true,

package/modern/internals/plugins/useTreeViewJSXItems/index.js

@@ -0,0 +1 @@
+export { useTreeViewJSXItems } from './useTreeViewJSXItems';

package/{internals/plugins/useTreeViewJSXNodes/useTreeViewJSXNodes.js → modern/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js}

@@ -7,45 +7,46 @@ import { publishTreeViewEvent } from '../../utils/publishTreeViewEvent';
 import { useTreeViewContext } from '../../TreeViewProvider/useTreeViewContext';
 import { DescendantProvider, useDescendant } from '../../TreeViewProvider/DescendantProvider';
 import { jsx as _jsx } from "react/jsx-runtime";
-export const useTreeViewJSXNodes = ({
+export const useTreeViewJSXItems = ({
   instance,
   setState
 }) => {
-  const insertJSXNode = useEventCallback(node => {
+  instance.preventItemUpdates();
+  const insertJSXItem = useEventCallback(item => {
     setState(prevState => {
-      if (prevState.nodes.nodeMap[node.id] != null) {
-        throw new Error(['MUI X: The Tree View component requires all items to have a unique `id` property.', 'Alternatively, you can use the `getItemId` prop to specify a custom id for each item.', `Tow items were provided with the same id in the \`items\` prop: "${node.id}"`].join('\n'));
+      if (prevState.items.nodeMap[item.id] != null) {
+        throw new Error(['MUI X: The Tree View component requires all items to have a unique `id` property.', 'Alternatively, you can use the `getItemId` prop to specify a custom id for each item.', `Tow items were provided with the same id in the \`items\` prop: "${item.id}"`].join('\n'));
       }
       return _extends({}, prevState, {
-        nodes: _extends({}, prevState.nodes, {
-          nodeMap: _extends({}, prevState.nodes.nodeMap, {
-            [node.id]: node
+        items: _extends({}, prevState.items, {
+          nodeMap: _extends({}, prevState.items.nodeMap, {
+            [item.id]: item
           }),
           // For `SimpleTreeView`, we don't have a proper `item` object, so we create a very basic one.
-          itemMap: _extends({}, prevState.nodes.itemMap, {
-            [node.id]: {
-              id: node.id,
-              label: node.label
+          itemMap: _extends({}, prevState.items.itemMap, {
+            [item.id]: {
+              id: item.id,
+              label: item.label
             }
           })
         })
       });
     });
   });
-  const removeJSXNode = useEventCallback(itemId => {
+  const removeJSXItem = useEventCallback(itemId => {
     setState(prevState => {
-      const newNodeMap = _extends({}, prevState.nodes.nodeMap);
-      const newItemMap = _extends({}, prevState.nodes.itemMap);
+      const newNodeMap = _extends({}, prevState.items.nodeMap);
+      const newItemMap = _extends({}, prevState.items.itemMap);
       delete newNodeMap[itemId];
       delete newItemMap[itemId];
       return _extends({}, prevState, {
-        nodes: _extends({}, prevState.nodes, {
+        items: _extends({}, prevState.items, {
           nodeMap: newNodeMap,
           itemMap: newItemMap
         })
       });
     });
-    publishTreeViewEvent(instance, 'removeNode', {
+    publishTreeViewEvent(instance, 'removeItem', {
       id: itemId
     });
   });
@@ -63,12 +64,12 @@ export const useTreeViewJSXNodes = ({
     };
   });
   populateInstance(instance, {
-    insertJSXNode,
-    removeJSXNode,
+    insertJSXItem,
+    removeJSXItem,
     mapFirstCharFromJSX
   });
 };
-const useTreeViewJSXNodesItemPlugin = ({
+const useTreeViewJSXItemsItemPlugin = ({
   props,
   rootRef,
   contentRef
@@ -103,9 +104,9 @@ const useTreeViewJSXNodesItemPlugin = ({
     parentId
   } = useDescendant(descendant);
   React.useEffect(() => {
-    // On the first render a node's index will be -1. We want to wait for the real index.
+    // On the first render a item's index will be -1. We want to wait for the real index.
     if (index !== -1) {
-      instance.insertJSXNode({
+      instance.insertJSXItem({
         id: itemId,
         idAttribute: id,
         index,
@@ -113,7 +114,7 @@ const useTreeViewJSXNodesItemPlugin = ({
         expandable,
         disabled
       });
-      return () => instance.removeJSXNode(itemId);
+      return () => instance.removeJSXItem(itemId);
     }
     return undefined;
   }, [instance, parentId, index, itemId, expandable, disabled, id]);
@@ -128,12 +129,12 @@ const useTreeViewJSXNodesItemPlugin = ({
     rootRef: handleRootRef
   };
 };
-useTreeViewJSXNodes.itemPlugin = useTreeViewJSXNodesItemPlugin;
-useTreeViewJSXNodes.wrapItem = ({
+useTreeViewJSXItems.itemPlugin = useTreeViewJSXItemsItemPlugin;
+useTreeViewJSXItems.wrapItem = ({
   children,
   itemId
 }) => /*#__PURE__*/_jsx(DescendantProvider, {
   id: itemId,
   children: children
 });
-useTreeViewJSXNodes.params = {};
+useTreeViewJSXItems.params = {};

package/modern/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useTheme } from '@mui/material/styles';
 import useEventCallback from '@mui/utils/useEventCallback';
-import { getFirstNode, getLastNode, getNextNode, getPreviousNode, populateInstance } from '../../useTreeView/useTreeView.utils';
+import { getFirstItem, getLastItem, getNextItem, getPreviousItem, populateInstance } from '../../useTreeView/useTreeView.utils';
 function isPrintableCharacter(string) {
   return !!string && string.length === 1 && !!string.match(/\S/);
 }
@@ -15,30 +15,26 @@ function findNextFirstChar(firstChars, startIndex, char) {
 }
 export const useTreeViewKeyboardNavigation = ({
   instance,
-  params
+  params,
+  state
 }) => {
   const theme = useTheme();
   const isRTL = theme.direction === 'rtl';
   const firstCharMap = React.useRef({});
-  const hasFirstCharMapBeenUpdatedImperatively = React.useRef(false);
   const updateFirstCharMap = useEventCallback(callback => {
-    hasFirstCharMapBeenUpdatedImperatively.current = true;
     firstCharMap.current = callback(firstCharMap.current);
   });
   React.useEffect(() => {
-    if (hasFirstCharMapBeenUpdatedImperatively.current) {
+    if (instance.areItemUpdatesPrevented()) {
       return;
     }
     const newFirstCharMap = {};
-    const processItem = item => {
-      const getItemId = params.getItemId;
-      const itemId = getItemId ? getItemId(item) : item.id;
-      newFirstCharMap[itemId] = instance.getNode(itemId).label.substring(0, 1).toLowerCase();
-      item.children?.forEach(processItem);
+    const processItem = node => {
+      newFirstCharMap[node.id] = node.label.substring(0, 1).toLowerCase();
     };
-    params.items.forEach(processItem);
+    Object.values(state.items.nodeMap).forEach(processItem);
     firstCharMap.current = newFirstCharMap;
-  }, [params.items, params.getItemId, instance]);
+  }, [state.items.nodeMap, params.getItemId, instance]);
   const getFirstMatchingItem = (itemId, firstChar) => {
     let start;
     let index;
@@ -48,8 +44,8 @@ export const useTreeViewKeyboardNavigation = ({
     // This really only works since the ids are strings
     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(mapItemId);
+      const visible = map.parentId ? instance.isItemExpanded(map.parentId) : true;
+      const shouldBeSkipped = params.disabledItemsFocusable ? false : instance.isItemDisabled(mapItemId);
       if (visible && !shouldBeSkipped) {
         firstCharIds.push(mapItemId);
         firstChars.push(firstCharMap.current[mapItemId]);
@@ -76,9 +72,9 @@ export const useTreeViewKeyboardNavigation = ({
     }
     return null;
   };
-  const canToggleItemSelection = itemId => !params.disableSelection && !instance.isNodeDisabled(itemId);
+  const canToggleItemSelection = itemId => !params.disableSelection && !instance.isItemDisabled(itemId);
   const canToggleItemExpansion = itemId => {
-    return !instance.isNodeDisabled(itemId) && instance.isNodeExpandable(itemId);
+    return !instance.isItemDisabled(itemId) && instance.isItemExpandable(itemId);
   };
 
   // ARIA specification: https://www.w3.org/WAI/ARIA/apg/patterns/treeview/#keyboardinteraction
@@ -94,7 +90,7 @@ export const useTreeViewKeyboardNavigation = ({
 
     // eslint-disable-next-line default-case
     switch (true) {
-      // Select the node when pressing "Space"
+      // Select the item when pressing "Space"
       case key === ' ' && canToggleItemSelection(itemId):
         {
           event.preventDefault();
@@ -103,26 +99,26 @@ export const useTreeViewKeyboardNavigation = ({
               end: itemId
             });
           } else if (params.multiSelect) {
-            instance.selectNode(event, itemId, true);
+            instance.selectItem(event, itemId, true);
           } else {
-            instance.selectNode(event, itemId);
+            instance.selectItem(event, itemId);
           }
           break;
         }
 
-      // If the focused node has children, we expand it.
-      // If the focused node has no children, we select it.
+      // If the focused item has children, we expand it.
+      // If the focused item has no children, we select it.
       case key === 'Enter':
         {
           if (canToggleItemExpansion(itemId)) {
-            instance.toggleNodeExpansion(event, itemId);
+            instance.toggleItemExpansion(event, itemId);
             event.preventDefault();
           } else if (canToggleItemSelection(itemId)) {
             if (params.multiSelect) {
               event.preventDefault();
-              instance.selectNode(event, itemId, true);
-            } else if (!instance.isNodeSelected(itemId)) {
-              instance.selectNode(event, itemId);
+              instance.selectItem(event, itemId, true);
+            } else if (!instance.isItemSelected(itemId)) {
+              instance.selectItem(event, itemId);
               event.preventDefault();
             }
           }
@@ -132,7 +128,7 @@ export const useTreeViewKeyboardNavigation = ({
       // Focus the next focusable item
       case key === 'ArrowDown':
         {
-          const nextItem = getNextNode(instance, itemId);
+          const nextItem = getNextItem(instance, itemId);
           if (nextItem) {
             event.preventDefault();
             instance.focusItem(event, nextItem);
@@ -152,7 +148,7 @@ export const useTreeViewKeyboardNavigation = ({
       // Focuses the previous focusable item
       case key === 'ArrowUp':
         {
-          const previousItem = getPreviousNode(instance, itemId);
+          const previousItem = getPreviousItem(instance, itemId);
           if (previousItem) {
             event.preventDefault();
             instance.focusItem(event, previousItem);
@@ -173,14 +169,14 @@ export const useTreeViewKeyboardNavigation = ({
       // If the focused item is collapsed and has children, we expand it
       case key === 'ArrowRight' && !isRTL || key === 'ArrowLeft' && isRTL:
         {
-          if (instance.isNodeExpanded(itemId)) {
-            const nextNodeId = getNextNode(instance, itemId);
-            if (nextNodeId) {
-              instance.focusItem(event, nextNodeId);
+          if (instance.isItemExpanded(itemId)) {
+            const nextItemId = getNextItem(instance, itemId);
+            if (nextItemId) {
+              instance.focusItem(event, nextItemId);
               event.preventDefault();
             }
           } else if (canToggleItemExpansion(itemId)) {
-            instance.toggleNodeExpansion(event, itemId);
+            instance.toggleItemExpansion(event, itemId);
             event.preventDefault();
           }
           break;
@@ -190,8 +186,8 @@ export const useTreeViewKeyboardNavigation = ({
       // 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 (canToggleItemExpansion(itemId) && instance.isNodeExpanded(itemId)) {
-            instance.toggleNodeExpansion(event, itemId);
+          if (canToggleItemExpansion(itemId) && instance.isItemExpanded(itemId)) {
+            instance.toggleItemExpansion(event, itemId);
             event.preventDefault();
           } else {
             const parent = instance.getNode(itemId).parentId;
@@ -203,13 +199,13 @@ export const useTreeViewKeyboardNavigation = ({
           break;
         }
 
-      // Focuses the first node in the tree
+      // Focuses the first item in the tree
       case key === 'Home':
         {
-          instance.focusItem(event, getFirstNode(instance));
+          instance.focusItem(event, getFirstItem(instance));
 
           // Multi select behavior when pressing Ctrl + Shift + Home
-          // Selects the focused node and all nodes up to the first node.
+          // Selects the focused item and all items up to the first item.
           if (canToggleItemSelection(itemId) && params.multiSelect && ctrlPressed && event.shiftKey) {
             instance.rangeSelectToFirst(event, itemId);
           }
@@ -220,7 +216,7 @@ export const useTreeViewKeyboardNavigation = ({
       // Focuses the last item in the tree
       case key === 'End':
         {
-          instance.focusItem(event, getLastNode(instance));
+          instance.focusItem(event, getLastItem(instance));
 
           // Multi select behavior when pressing Ctrl + Shirt + End
           // Selects the focused item and all the items down to the last item.
@@ -240,12 +236,12 @@ export const useTreeViewKeyboardNavigation = ({
         }
 
       // Multi select behavior when pressing Ctrl + a
-      // Selects all the nodes
+      // Selects all the items
       case key === 'a' && ctrlPressed && params.multiSelect && !params.disableSelection:
         {
           instance.selectRange(event, {
-            start: getFirstNode(instance),
-            end: getLastNode(instance)
+            start: getFirstItem(instance),
+            end: getLastItem(instance)
           });
           event.preventDefault();
           break;
@@ -255,9 +251,9 @@ export const useTreeViewKeyboardNavigation = ({
       // TODO: Support typing multiple characters
       case !ctrlPressed && !event.shiftKey && isPrintableCharacter(key):
         {
-          const matchingNode = getFirstMatchingItem(itemId, key);
-          if (matchingNode != null) {
-            instance.focusItem(event, matchingNode);
+          const matchingItem = getFirstMatchingItem(itemId, key);
+          if (matchingItem != null) {
+            instance.focusItem(event, matchingItem);
             event.preventDefault();
           }
           break;