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

package/hooks/useTreeItem2Utils/useTreeItem2Utils.js

@@ -1,6 +1,6 @@
 import { useTreeViewContext } from '../../internals/TreeViewProvider/useTreeViewContext';
 export const useTreeItem2Utils = ({
-  nodeId,
+  itemId,
   children
 }) => {
   const {
@@ -11,23 +11,23 @@ export const useTreeItem2Utils = ({
   } = useTreeViewContext();
   const status = {
     expandable: Boolean(Array.isArray(children) ? children.length : children),
-    expanded: instance.isNodeExpanded(nodeId),
-    focused: instance.isNodeFocused(nodeId),
-    selected: instance.isNodeSelected(nodeId),
-    disabled: instance.isNodeDisabled(nodeId)
+    expanded: instance.isItemExpanded(itemId),
+    focused: instance.isItemFocused(itemId),
+    selected: instance.isItemSelected(itemId),
+    disabled: instance.isItemDisabled(itemId)
   };
   const handleExpansion = event => {
     if (status.disabled) {
       return;
     }
     if (!status.focused) {
-      instance.focusItem(event, nodeId);
+      instance.focusItem(event, itemId);
     }
     const multiple = multiSelect && (event.shiftKey || event.ctrlKey || event.metaKey);
 
     // If already expanded and trying to toggle selection don't close
-    if (status.expandable && !(multiple && instance.isNodeExpanded(nodeId))) {
-      instance.toggleNodeExpansion(event, nodeId);
+    if (status.expandable && !(multiple && instance.isItemExpanded(itemId))) {
+      instance.toggleItemExpansion(event, itemId);
     }
   };
   const handleSelection = event => {
@@ -35,19 +35,19 @@ export const useTreeItem2Utils = ({
       return;
     }
     if (!status.focused) {
-      instance.focusItem(event, nodeId);
+      instance.focusItem(event, itemId);
     }
     const multiple = multiSelect && (event.shiftKey || event.ctrlKey || event.metaKey);
     if (multiple) {
       if (event.shiftKey) {
         instance.selectRange(event, {
-          end: nodeId
+          end: itemId
         });
       } else {
-        instance.selectNode(event, nodeId, true);
+        instance.selectItem(event, itemId, true);
       }
     } else {
-      instance.selectNode(event, nodeId);
+      instance.selectItem(event, itemId);
     }
   };
   const interactions = {

package/hooks/useTreeViewApiRef.d.ts

@@ -3,4 +3,4 @@ import { TreeViewAnyPluginSignature, TreeViewPublicAPI } from '../internals/mode
 /**
  * Hook that instantiates a [[TreeViewApiRef]].
  */
-export declare const useTreeViewApiRef: <TPlugins extends readonly TreeViewAnyPluginSignature[] = [import("../internals").UseTreeViewIdSignature, import("../internals").UseTreeViewNodesSignature, import("../internals").UseTreeViewExpansionSignature, import("../internals").UseTreeViewSelectionSignature, import("../internals").UseTreeViewFocusSignature, import("../internals").UseTreeViewKeyboardNavigationSignature, import("../internals").UseTreeViewIconsSignature]>() => React.MutableRefObject<TreeViewPublicAPI<TPlugins> | undefined>;
+export declare const useTreeViewApiRef: <TPlugins extends readonly TreeViewAnyPluginSignature[] = [import("../internals").UseTreeViewIdSignature, import("../internals").UseTreeViewItemsSignature, import("../internals").UseTreeViewExpansionSignature, import("../internals").UseTreeViewSelectionSignature, import("../internals").UseTreeViewFocusSignature, import("../internals").UseTreeViewKeyboardNavigationSignature, import("../internals").UseTreeViewIconsSignature]>() => React.MutableRefObject<TreeViewPublicAPI<TPlugins> | undefined>;

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-tree-view v7.0.0-beta.7
+ * @mui/x-tree-view v7.1.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/internals/TreeViewProvider/DescendantProvider.d.ts

@@ -5,7 +5,7 @@ import * as React from 'react';
  * We use this for focus management, keyboard navigation, and typeahead
  * functionality for some components.
  *
- * The hook accepts the element node
+ * The hook accepts the element item
  *
  * Our main goals with this are:
  *   1) maximum composability,

package/internals/TreeViewProvider/DescendantProvider.js

@@ -46,7 +46,7 @@ const noop = () => {};
  * We use this for focus management, keyboard navigation, and typeahead
  * functionality for some components.
  *
- * The hook accepts the element node
+ * The hook accepts the element item
  *
  * Our main goals with this are:
  *   1) maximum composability,

package/internals/hooks/useInstanceEventHandler.js

@@ -20,8 +20,7 @@ export function createUseInstanceEventHandler(registryContainer) {
     if (!subscription.current && handlerRef.current) {
       const enhancedHandler = (params, event) => {
         if (!event.defaultMuiPrevented) {
-          var _handlerRef$current;
-          (_handlerRef$current = handlerRef.current) == null || _handlerRef$current.call(handlerRef, params, event);
+          handlerRef.current?.(params, event);
         }
       };
       subscription.current = instance.$$subscribeEvent(eventName, enhancedHandler);
@@ -32,8 +31,7 @@ export function createUseInstanceEventHandler(registryContainer) {
       registryContainer.registry.register(objectRetainedByReact,
       // The callback below will be called once this reference stops being retained
       () => {
-        var _subscription$current;
-        (_subscription$current = subscription.current) == null || _subscription$current.call(subscription);
+        subscription.current?.();
         subscription.current = null;
         cleanupTokenRef.current = null;
       }, cleanupTokenRef.current);
@@ -49,8 +47,7 @@ export function createUseInstanceEventHandler(registryContainer) {
       if (!subscription.current && handlerRef.current) {
         const enhancedHandler = (params, event) => {
           if (!event.defaultMuiPrevented) {
-            var _handlerRef$current2;
-            (_handlerRef$current2 = handlerRef.current) == null || _handlerRef$current2.call(handlerRef, params, event);
+            handlerRef.current?.(params, event);
           }
         };
         subscription.current = instance.$$subscribeEvent(eventName, enhancedHandler);
@@ -62,8 +59,7 @@ export function createUseInstanceEventHandler(registryContainer) {
         cleanupTokenRef.current = null;
       }
       return () => {
-        var _subscription$current2;
-        (_subscription$current2 = subscription.current) == null || _subscription$current2.call(subscription);
+        subscription.current?.();
         subscription.current = null;
       };
     }, [instance, eventName]);
@@ -75,8 +71,7 @@ const registryContainer = {
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const unstable_resetCleanupTracking = () => {
-  var _registryContainer$re;
-  (_registryContainer$re = registryContainer.registry) == null || _registryContainer$re.reset();
+  registryContainer.registry?.reset();
   registryContainer.registry = null;
 };
 export const useInstanceEventHandler = createUseInstanceEventHandler(registryContainer);

package/internals/index.d.ts

@@ -10,6 +10,6 @@ export type { UseTreeViewFocusSignature } from './plugins/useTreeViewFocus';
 export type { UseTreeViewKeyboardNavigationSignature } from './plugins/useTreeViewKeyboardNavigation';
 export type { UseTreeViewIdSignature } from './plugins/useTreeViewId';
 export type { UseTreeViewIconsSignature } from './plugins/useTreeViewIcons';
-export type { UseTreeViewNodesSignature } from './plugins/useTreeViewNodes';
-export type { UseTreeViewJSXNodesSignature } from './plugins/useTreeViewJSXNodes';
+export type { UseTreeViewItemsSignature } from './plugins/useTreeViewItems';
+export type { UseTreeViewJSXItemsSignature } from './plugins/useTreeViewJSXItems';
 export { extractPluginParamsFromProps } from './utils/extractPluginParamsFromProps';

package/internals/models/plugin.d.ts

@@ -132,7 +132,7 @@ export interface TreeViewItemPluginResponse {
 }
 export type TreeViewItemPlugin<TProps extends {}> = (options: TreeViewItemPluginOptions<TProps>) => void | TreeViewItemPluginResponse;
 export type TreeItemWrapper = (params: {
-    nodeId: TreeViewItemId;
+    itemId: TreeViewItemId;
     children: React.ReactNode;
 }) => React.ReactNode;
 export type TreeViewPlugin<TSignature extends TreeViewAnyPluginSignature> = {

package/internals/plugins/defaultPlugins.d.ts

@@ -1,13 +1,13 @@
 import { UseTreeViewIdParameters } from './useTreeViewId';
-import { UseTreeViewNodesParameters } from './useTreeViewNodes';
+import { UseTreeViewItemsParameters } from './useTreeViewItems';
 import { UseTreeViewExpansionParameters } from './useTreeViewExpansion';
 import { UseTreeViewSelectionParameters } from './useTreeViewSelection';
 import { UseTreeViewFocusParameters } from './useTreeViewFocus';
 import { UseTreeViewIconsParameters } from './useTreeViewIcons';
 import { ConvertPluginsIntoSignatures, MergePluginsProperty } from '../models';
-export declare const DEFAULT_TREE_VIEW_PLUGINS: readonly [import("../models").TreeViewPlugin<import("./useTreeViewId").UseTreeViewIdSignature>, import("../models").TreeViewPlugin<import("./useTreeViewNodes").UseTreeViewNodesSignature>, import("../models").TreeViewPlugin<import("./useTreeViewExpansion").UseTreeViewExpansionSignature>, import("../models").TreeViewPlugin<import("./useTreeViewSelection").UseTreeViewSelectionSignature>, import("../models").TreeViewPlugin<import("./useTreeViewFocus").UseTreeViewFocusSignature>, import("../models").TreeViewPlugin<import("./useTreeViewKeyboardNavigation").UseTreeViewKeyboardNavigationSignature>, import("../models").TreeViewPlugin<import("./useTreeViewIcons").UseTreeViewIconsSignature>];
+export declare const DEFAULT_TREE_VIEW_PLUGINS: readonly [import("../models").TreeViewPlugin<import("./useTreeViewId").UseTreeViewIdSignature>, import("../models").TreeViewPlugin<import("./useTreeViewItems").UseTreeViewItemsSignature>, import("../models").TreeViewPlugin<import("./useTreeViewExpansion").UseTreeViewExpansionSignature>, import("../models").TreeViewPlugin<import("./useTreeViewSelection").UseTreeViewSelectionSignature>, import("../models").TreeViewPlugin<import("./useTreeViewFocus").UseTreeViewFocusSignature>, import("../models").TreeViewPlugin<import("./useTreeViewKeyboardNavigation").UseTreeViewKeyboardNavigationSignature>, import("../models").TreeViewPlugin<import("./useTreeViewIcons").UseTreeViewIconsSignature>];
 export type DefaultTreeViewPlugins = ConvertPluginsIntoSignatures<typeof DEFAULT_TREE_VIEW_PLUGINS>;
 export type DefaultTreeViewPluginSlots = MergePluginsProperty<DefaultTreeViewPlugins, 'slots'>;
 export type DefaultTreeViewPluginSlotProps = MergePluginsProperty<DefaultTreeViewPlugins, 'slotProps'>;
-export interface DefaultTreeViewPluginParameters<R extends {}, Multiple extends boolean | undefined> extends UseTreeViewIdParameters, UseTreeViewNodesParameters<R>, UseTreeViewExpansionParameters, UseTreeViewFocusParameters, UseTreeViewSelectionParameters<Multiple>, UseTreeViewIconsParameters {
+export interface DefaultTreeViewPluginParameters<R extends {}, Multiple extends boolean | undefined> extends UseTreeViewIdParameters, UseTreeViewItemsParameters<R>, UseTreeViewExpansionParameters, UseTreeViewFocusParameters, UseTreeViewSelectionParameters<Multiple>, UseTreeViewIconsParameters {
 }

package/internals/plugins/defaultPlugins.js

@@ -1,10 +1,10 @@
 import { useTreeViewId } from './useTreeViewId';
-import { useTreeViewNodes } from './useTreeViewNodes';
+import { useTreeViewItems } from './useTreeViewItems';
 import { useTreeViewExpansion } from './useTreeViewExpansion';
 import { useTreeViewSelection } from './useTreeViewSelection';
 import { useTreeViewFocus } from './useTreeViewFocus';
 import { useTreeViewKeyboardNavigation } from './useTreeViewKeyboardNavigation';
 import { useTreeViewIcons } from './useTreeViewIcons';
-export const DEFAULT_TREE_VIEW_PLUGINS = [useTreeViewId, useTreeViewNodes, useTreeViewExpansion, useTreeViewSelection, useTreeViewFocus, useTreeViewKeyboardNavigation, useTreeViewIcons];
+export const DEFAULT_TREE_VIEW_PLUGINS = [useTreeViewId, useTreeViewItems, useTreeViewExpansion, useTreeViewSelection, useTreeViewFocus, useTreeViewKeyboardNavigation, useTreeViewIcons];
 
 // We can't infer this type from the plugin, otherwise we would lose the generics.

package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js

@@ -8,18 +8,14 @@ export const useTreeViewExpansion = ({
   models
 }) => {
   const setExpandedItems = (event, value) => {
-    var _params$onExpandedIte;
-    (_params$onExpandedIte = params.onExpandedItemsChange) == null || _params$onExpandedIte.call(params, event, value);
+    params.onExpandedItemsChange?.(event, value);
     models.expandedItems.setControlledValue(value);
   };
-  const isNodeExpanded = React.useCallback(nodeId => {
-    return Array.isArray(models.expandedItems.value) ? models.expandedItems.value.indexOf(nodeId) !== -1 : false;
+  const isItemExpanded = React.useCallback(itemId => {
+    return Array.isArray(models.expandedItems.value) ? models.expandedItems.value.indexOf(itemId) !== -1 : false;
   }, [models.expandedItems.value]);
-  const isNodeExpandable = React.useCallback(nodeId => {
-    var _instance$getNode;
-    return !!((_instance$getNode = instance.getNode(nodeId)) != null && _instance$getNode.expandable);
-  }, [instance]);
-  const toggleNodeExpansion = useEventCallback((event, itemId) => {
+  const isItemExpandable = React.useCallback(itemId => !!instance.getNode(itemId)?.expandable, [instance]);
+  const toggleItemExpansion = useEventCallback((event, itemId) => {
     if (itemId == null) {
       return;
     }
@@ -35,24 +31,24 @@ export const useTreeViewExpansion = ({
     }
     setExpandedItems(event, newExpanded);
   });
-  const expandAllSiblings = (event, nodeId) => {
-    const node = instance.getNode(nodeId);
+  const expandAllSiblings = (event, itemId) => {
+    const node = instance.getNode(itemId);
     const siblings = instance.getChildrenIds(node.parentId);
-    const diff = siblings.filter(child => instance.isNodeExpandable(child) && !instance.isNodeExpanded(child));
+    const diff = siblings.filter(child => instance.isItemExpandable(child) && !instance.isItemExpanded(child));
     const newExpanded = models.expandedItems.value.concat(diff);
     if (diff.length > 0) {
       if (params.onItemExpansionToggle) {
-        diff.forEach(newlyExpandedNodeId => {
-          params.onItemExpansionToggle(event, newlyExpandedNodeId, true);
+        diff.forEach(newlyExpandedItemId => {
+          params.onItemExpansionToggle(event, newlyExpandedItemId, true);
         });
       }
       setExpandedItems(event, newExpanded);
     }
   };
   populateInstance(instance, {
-    isNodeExpanded,
-    isNodeExpandable,
-    toggleNodeExpansion,
+    isItemExpanded,
+    isItemExpandable,
+    toggleItemExpansion,
     expandAllSiblings
   });
 };
@@ -61,13 +57,10 @@ useTreeViewExpansion.models = {
     getDefaultValue: params => params.defaultExpandedItems
   }
 };
-const DEFAULT_EXPANDED_NODES = [];
-useTreeViewExpansion.getDefaultizedParams = params => {
-  var _params$defaultExpand;
-  return _extends({}, params, {
-    defaultExpandedItems: (_params$defaultExpand = params.defaultExpandedItems) != null ? _params$defaultExpand : DEFAULT_EXPANDED_NODES
-  });
-};
+const DEFAULT_EXPANDED_ITEMS = [];
+useTreeViewExpansion.getDefaultizedParams = params => _extends({}, params, {
+  defaultExpandedItems: params.defaultExpandedItems ?? DEFAULT_EXPANDED_ITEMS
+});
 useTreeViewExpansion.params = {
   expandedItems: true,
   defaultExpandedItems: true,

package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.types.d.ts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { DefaultizedProps, TreeViewPluginSignature } from '../../models';
-import { UseTreeViewNodesSignature } from '../useTreeViewNodes';
+import { UseTreeViewItemsSignature } from '../useTreeViewItems';
 export interface UseTreeViewExpansionInstance {
-    isNodeExpanded: (nodeId: string) => boolean;
-    isNodeExpandable: (nodeId: string) => boolean;
-    toggleNodeExpansion: (event: React.SyntheticEvent, value: string) => void;
-    expandAllSiblings: (event: React.KeyboardEvent<HTMLUListElement>, nodeId: string) => void;
+    isItemExpanded: (itemId: string) => boolean;
+    isItemExpandable: (itemId: string) => boolean;
+    toggleItemExpansion: (event: React.SyntheticEvent, value: string) => void;
+    expandAllSiblings: (event: React.KeyboardEvent, itemId: string) => void;
 }
 export interface UseTreeViewExpansionParameters {
     /**
@@ -39,5 +39,5 @@ export type UseTreeViewExpansionSignature = TreeViewPluginSignature<{
     defaultizedParams: UseTreeViewExpansionDefaultizedParameters;
     instance: UseTreeViewExpansionInstance;
     modelNames: 'expandedItems';
-    dependantPlugins: [UseTreeViewNodesSignature];
+    dependantPlugins: [UseTreeViewItemsSignature];
 }>;

package/internals/plugins/useTreeViewFocus/useTreeViewFocus.js

@@ -5,6 +5,22 @@ import ownerDocument from '@mui/utils/ownerDocument';
 import { populateInstance, populatePublicAPI } from '../../useTreeView/useTreeView.utils';
 import { useInstanceEventHandler } from '../../hooks/useInstanceEventHandler';
 import { getActiveElement } from '../../utils/utils';
+const useTabbableItemId = (instance, selectedItems) => {
+  const isItemVisible = itemId => {
+    const node = instance.getNode(itemId);
+    return node && (node.parentId == null || instance.isItemExpanded(node.parentId));
+  };
+  let tabbableItemId;
+  if (Array.isArray(selectedItems)) {
+    tabbableItemId = selectedItems.find(isItemVisible);
+  } else if (selectedItems != null && isItemVisible(selectedItems)) {
+    tabbableItemId = selectedItems;
+  }
+  if (tabbableItemId == null) {
+    tabbableItemId = instance.getNavigableChildrenIds(null)[0];
+  }
+  return tabbableItemId;
+};
 export const useTreeViewFocus = ({
   instance,
   publicAPI,
@@ -14,97 +30,99 @@ export const useTreeViewFocus = ({
   models,
   rootRef
 }) => {
-  const setFocusedNodeId = useEventCallback(nodeId => {
-    const cleanNodeId = typeof nodeId === 'function' ? nodeId(state.focusedNodeId) : nodeId;
-    if (state.focusedNodeId !== cleanNodeId) {
+  const tabbableItemId = useTabbableItemId(instance, models.selectedItems.value);
+  const setFocusedItemId = useEventCallback(itemId => {
+    const cleanItemId = typeof itemId === 'function' ? itemId(state.focusedItemId) : itemId;
+    if (state.focusedItemId !== cleanItemId) {
       setState(prevState => _extends({}, prevState, {
-        focusedNodeId: cleanNodeId
+        focusedItemId: cleanItemId
       }));
     }
   });
-  const isTreeViewFocused = React.useCallback(() => !!rootRef.current && rootRef.current === getActiveElement(ownerDocument(rootRef.current)), [rootRef]);
-  const isNodeFocused = React.useCallback(nodeId => state.focusedNodeId === nodeId && isTreeViewFocused(), [state.focusedNodeId, isTreeViewFocused]);
-  const isNodeVisible = nodeId => {
-    const node = instance.getNode(nodeId);
-    return node && (node.parentId == null || instance.isNodeExpanded(node.parentId));
+  const isTreeViewFocused = React.useCallback(() => !!rootRef.current && rootRef.current.contains(getActiveElement(ownerDocument(rootRef.current))), [rootRef]);
+  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.isItemExpanded(node.parentId));
   };
-  const focusItem = useEventCallback((event, nodeId) => {
-    // if we receive a nodeId, and it is visible, the focus will be set to it
-    if (nodeId && isNodeVisible(nodeId)) {
-      if (!isTreeViewFocused()) {
-        instance.focusRoot();
-      }
-      setFocusedNodeId(nodeId);
-      if (params.onItemFocus) {
-        params.onItemFocus(event, nodeId);
-      }
+  const innerFocusItem = (event, itemId) => {
+    const node = instance.getNode(itemId);
+    const itemElement = document.getElementById(instance.getTreeItemId(itemId, node.idAttribute));
+    if (itemElement) {
+      itemElement.focus();
+    }
+    setFocusedItemId(itemId);
+    if (params.onItemFocus) {
+      params.onItemFocus(event, itemId);
+    }
+  };
+  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];
-    }
-    setFocusedNodeId(nodeToFocusId);
-    if (params.onItemFocus) {
-      params.onItemFocus(event, nodeToFocusId);
+    if (itemToFocusId == null) {
+      itemToFocusId = instance.getNavigableChildrenIds(null)[0];
     }
+    innerFocusItem(event, itemToFocusId);
   });
-  const focusRoot = useEventCallback(() => {
-    var _rootRef$current;
-    (_rootRef$current = rootRef.current) == null || _rootRef$current.focus({
-      preventScroll: true
-    });
+  const removeFocusedItem = useEventCallback(() => {
+    if (state.focusedItemId == null) {
+      return;
+    }
+    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,
-    focusRoot,
-    focusDefaultNode
+    focusDefaultItem,
+    removeFocusedItem
   });
   populatePublicAPI(publicAPI, {
     focusItem
   });
-  useInstanceEventHandler(instance, 'removeNode', ({
+  useInstanceEventHandler(instance, 'removeItem', ({
     id
   }) => {
-    setFocusedNodeId(oldFocusedNodeId => {
-      if (oldFocusedNodeId === id && rootRef.current === ownerDocument(rootRef.current).activeElement) {
-        return instance.getChildrenIds(null)[0];
-      }
-      return oldFocusedNodeId;
-    });
+    if (state.focusedItemId === id) {
+      instance.focusDefaultItem(null);
+    }
   });
   const createHandleFocus = otherHandlers => event => {
-    var _otherHandlers$onFocu;
-    (_otherHandlers$onFocu = otherHandlers.onFocus) == null || _otherHandlers$onFocu.call(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 createHandleBlur = otherHandlers => event => {
-    var _otherHandlers$onBlur;
-    (_otherHandlers$onBlur = otherHandlers.onBlur) == null || _otherHandlers$onBlur.call(otherHandlers, event);
-    setFocusedNodeId(null);
-  };
-  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),
-      onBlur: createHandleBlur(otherHandlers),
-      'aria-activedescendant': activeDescendant != null ? activeDescendant : undefined
+      'aria-activedescendant': activeDescendant ?? undefined
     })
   };
 };
 useTreeViewFocus.getInitialState = () => ({
-  focusedNodeId: null
+  focusedItemId: null
 });
 useTreeViewFocus.params = {
   onItemFocus: true

package/internals/plugins/useTreeViewFocus/useTreeViewFocus.types.d.ts

@@ -1,14 +1,15 @@
 import * as React from 'react';
 import { TreeViewPluginSignature } from '../../models';
 import { UseTreeViewIdSignature } from '../useTreeViewId/useTreeViewId.types';
-import type { UseTreeViewNodesSignature } from '../useTreeViewNodes';
+import type { UseTreeViewItemsSignature } from '../useTreeViewItems';
 import type { UseTreeViewSelectionSignature } from '../useTreeViewSelection';
 import { UseTreeViewExpansionSignature } from '../useTreeViewExpansion';
 export interface UseTreeViewFocusInstance {
-    isNodeFocused: (nodeId: string) => boolean;
-    focusItem: (event: React.SyntheticEvent, itemId: string | null) => void;
-    focusDefaultNode: (event: React.SyntheticEvent) => void;
-    focusRoot: () => void;
+    isItemFocused: (itemId: string) => boolean;
+    canItemBeTabbed: (itemId: string) => boolean;
+    focusItem: (event: React.SyntheticEvent, itemId: string) => void;
+    focusDefaultItem: (event: React.SyntheticEvent | null) => void;
+    removeFocusedItem: () => void;
 }
 export interface UseTreeViewFocusPublicAPI extends Pick<UseTreeViewFocusInstance, 'focusItem'> {
 }
@@ -19,11 +20,11 @@ export interface UseTreeViewFocusParameters {
      * @param {string} itemId The id of the focused item.
      * @param {string} value of the focused item.
      */
-    onItemFocus?: (event: React.SyntheticEvent, itemId: string) => void;
+    onItemFocus?: (event: React.SyntheticEvent | null, itemId: string) => void;
 }
 export type UseTreeViewFocusDefaultizedParameters = UseTreeViewFocusParameters;
 export interface UseTreeViewFocusState {
-    focusedNodeId: string | null;
+    focusedItemId: string | null;
 }
 export type UseTreeViewFocusSignature = TreeViewPluginSignature<{
     params: UseTreeViewFocusParameters;
@@ -33,7 +34,7 @@ export type UseTreeViewFocusSignature = TreeViewPluginSignature<{
     state: UseTreeViewFocusState;
     dependantPlugins: [
         UseTreeViewIdSignature,
-        UseTreeViewNodesSignature,
+        UseTreeViewItemsSignature,
         UseTreeViewSelectionSignature,
         UseTreeViewExpansionSignature
     ];

package/internals/plugins/useTreeViewIcons/useTreeViewIcons.types.d.ts

@@ -1,23 +1,23 @@
 import * as React from 'react';
 import { SlotComponentProps } from '@mui/base/utils';
 import { TreeViewPluginSignature } from '../../models';
-import { UseTreeViewNodesSignature } from '../useTreeViewNodes';
+import { UseTreeViewItemsSignature } from '../useTreeViewItems';
 import { UseTreeViewSelectionSignature } from '../useTreeViewSelection';
 export interface UseTreeViewIconsParameters {
 }
 export type UseTreeViewIconsDefaultizedParameters = UseTreeViewIconsParameters;
 interface UseTreeViewIconsSlots {
     /**
-     * The default icon used to collapse the node.
+     * The default icon used to collapse the item.
      */
     collapseIcon?: React.ElementType;
     /**
-     * The default icon used to expand the node.
+     * The default icon used to expand the item.
      */
     expandIcon?: React.ElementType;
     /**
-     * The default icon displayed next to an end node.
-     * This is applied to all tree nodes and can be overridden by the TreeItem `icon` slot prop.
+     * The default icon displayed next to an end item.
+     * This is applied to all tree items and can be overridden by the TreeItem `icon` slot prop.
      */
     endIcon?: React.ElementType;
 }
@@ -38,6 +38,6 @@ export type UseTreeViewIconsSignature = TreeViewPluginSignature<{
     contextValue: UseTreeViewIconsContextValue;
     slots: UseTreeViewIconsSlots;
     slotProps: UseTreeViewIconsSlotProps;
-    dependantPlugins: [UseTreeViewNodesSignature, UseTreeViewSelectionSignature];
+    dependantPlugins: [UseTreeViewItemsSignature, UseTreeViewSelectionSignature];
 }>;
 export {};

package/internals/plugins/useTreeViewId/useTreeViewId.js

@@ -6,7 +6,7 @@ export const useTreeViewId = ({
   params
 }) => {
   const treeId = useId(params.id);
-  const getTreeItemId = React.useCallback((nodeId, idAttribute) => idAttribute != null ? idAttribute : `${treeId}-${nodeId}`, [treeId]);
+  const getTreeItemId = React.useCallback((itemId, idAttribute) => idAttribute ?? `${treeId}-${itemId}`, [treeId]);
   populateInstance(instance, {
     getTreeItemId
   });

package/internals/plugins/useTreeViewId/useTreeViewId.types.d.ts

@@ -1,6 +1,6 @@
 import { TreeViewPluginSignature } from '../../models';
 export interface UseTreeViewIdInstance {
-    getTreeItemId: (nodeId: string, idAttribute: string | undefined) => string;
+    getTreeItemId: (itemId: string, idAttribute: string | undefined) => string;
 }
 export interface UseTreeViewIdParameters {
     /**
@@ -11,7 +11,7 @@ export interface UseTreeViewIdParameters {
 }
 export type UseTreeViewIdDefaultizedParameters = UseTreeViewIdParameters;
 export interface UseTreeViewIdState {
-    focusedNodeId: string | null;
+    focusedItemId: string | null;
 }
 export type UseTreeViewIdSignature = TreeViewPluginSignature<{
     params: UseTreeViewIdParameters;

package/internals/plugins/useTreeViewItems/index.d.ts

@@ -0,0 +1,2 @@
+export { useTreeViewItems } from './useTreeViewItems';
+export type { UseTreeViewItemsSignature, UseTreeViewItemsParameters, UseTreeViewItemsDefaultizedParameters, } from './useTreeViewItems.types';

package/internals/plugins/useTreeViewItems/index.js

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

package/internals/plugins/useTreeViewItems/useTreeViewItems.d.ts

@@ -0,0 +1,3 @@
+import { TreeViewPlugin } from '../../models';
+import { UseTreeViewItemsSignature } from './useTreeViewItems.types';
+export declare const useTreeViewItems: TreeViewPlugin<UseTreeViewItemsSignature>;