@mui/x-tree-view 7.0.0-alpha.1 → 7.0.0-alpha.7

package/modern/TreeItem/TreeItem.js

@@ -1,17 +1,14 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["children", "className", "collapseIcon", "ContentComponent", "ContentProps", "endIcon", "expandIcon", "disabled", "icon", "id", "label", "nodeId", "onClick", "onMouseDown", "TransitionComponent", "TransitionProps"];
+const _excluded = ["children", "className", "collapseIcon", "ContentComponent", "ContentProps", "endIcon", "expandIcon", "icon", "nodeId", "id", "label", "onClick", "onMouseDown", "TransitionComponent", "TransitionProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import Collapse from '@mui/material/Collapse';
 import { alpha, styled, useThemeProps } from '@mui/material/styles';
-import ownerDocument from '@mui/utils/ownerDocument';
-import useForkRef from '@mui/utils/useForkRef';
 import unsupportedProp from '@mui/utils/unsupportedProp';
 import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef';
 import { unstable_composeClasses as composeClasses } from '@mui/base';
-import { DescendantProvider, useDescendant } from '../internals/TreeViewProvider/DescendantProvider';
 import { TreeItemContent } from './TreeItemContent';
 import { treeItemClasses, getTreeItemUtilityClass } from './treeItemClasses';
 import { useTreeViewContext } from '../internals/TreeViewProvider/useTreeViewContext';
@@ -132,11 +129,26 @@ const TreeItemGroup = styled(Collapse, {
  *
  * - [TreeItem API](https://mui.com/x/api/tree-view/tree-item/)
  */
-export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps, ref) {
-  const props = useThemeProps({
+export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps, inRef) {
+  const {
+    icons: contextIcons,
+    runItemPlugins,
+    multiSelect,
+    disabledItemsFocusable,
+    instance
+  } = useTreeViewContext();
+  const inPropsWithTheme = useThemeProps({
     props: inProps,
     name: 'MuiTreeItem'
   });
+  const {
+    props,
+    ref,
+    wrapItem
+  } = runItemPlugins({
+    props: inPropsWithTheme,
+    ref: inRef
+  });
   const {
       children,
       className,
@@ -145,46 +157,21 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
       ContentProps,
       endIcon,
       expandIcon,
-      disabled: disabledProp,
       icon,
-      id: idProp,
-      label,
       nodeId,
+      id,
+      label,
       onClick,
       onMouseDown,
       TransitionComponent = Collapse,
       TransitionProps
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const {
-    icons: contextIcons,
-    multiSelect,
-    disabledItemsFocusable,
-    treeId,
-    instance
-  } = useTreeViewContext();
-  let id;
-  if (idProp != null) {
-    id = idProp;
-  } else if (treeId && nodeId) {
-    id = `${treeId}-${nodeId}`;
-  }
-  const [treeItemElement, setTreeItemElement] = React.useState(null);
-  const contentRef = React.useRef(null);
-  const handleRef = useForkRef(setTreeItemElement, ref);
-  const descendant = React.useMemo(() => ({
-    element: treeItemElement,
-    id: nodeId
-  }), [nodeId, treeItemElement]);
-  const {
-    index,
-    parentId
-  } = useDescendant(descendant);
   const expandable = Boolean(Array.isArray(children) ? children.length : children);
-  const expanded = instance ? instance.isNodeExpanded(nodeId) : false;
-  const focused = instance ? instance.isNodeFocused(nodeId) : false;
-  const selected = instance ? instance.isNodeSelected(nodeId) : false;
-  const disabled = instance ? instance.isNodeDisabled(nodeId) : false;
+  const expanded = instance.isNodeExpanded(nodeId);
+  const focused = instance.isNodeFocused(nodeId);
+  const selected = instance.isNodeSelected(nodeId);
+  const disabled = instance.isNodeDisabled(nodeId);
   const ownerState = _extends({}, props, {
     expanded,
     focused,
@@ -206,27 +193,6 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
   } else {
     displayIcon = endIcon || contextIcons.defaultEndIcon;
   }
-  React.useEffect(() => {
-    // On the first render a node's index will be -1. We want to wait for the real index.
-    if (instance && index !== -1) {
-      instance.updateNode({
-        id: nodeId,
-        idAttribute: id,
-        index,
-        parentId,
-        expandable,
-        disabled: disabledProp
-      });
-      return () => instance.removeNode(nodeId);
-    }
-    return undefined;
-  }, [instance, parentId, index, nodeId, expandable, disabledProp, id]);
-  React.useEffect(() => {
-    if (instance && label) {
-      return instance.mapFirstChar(nodeId, (contentRef.current?.textContent ?? '').substring(0, 1).toLowerCase());
-    }
-    return undefined;
-  }, [instance, nodeId, label]);
   let ariaSelected;
   if (multiSelect) {
     ariaSelected = selected;
@@ -242,36 +208,28 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
   function handleFocus(event) {
     // DOM focus stays on the tree which manages focus with aria-activedescendant
     if (event.target === event.currentTarget) {
-      let rootElement;
-      if (typeof event.target.getRootNode === 'function') {
-        rootElement = event.target.getRootNode();
-      } else {
-        rootElement = ownerDocument(event.target);
-      }
-      rootElement.getElementById(treeId).focus({
-        preventScroll: true
-      });
+      instance.focusRoot();
     }
-    const unfocusable = !disabledItemsFocusable && disabled;
-    if (instance && !focused && event.currentTarget === event.target && !unfocusable) {
+    const canBeFocused = !disabled || disabledItemsFocusable;
+    if (!focused && canBeFocused && event.currentTarget === event.target) {
       instance.focusNode(event, nodeId);
     }
   }
-  return /*#__PURE__*/_jsxs(TreeItemRoot, _extends({
+  const idAttribute = instance.getTreeItemId(nodeId, id);
+  const item = /*#__PURE__*/_jsxs(TreeItemRoot, _extends({
     className: clsx(classes.root, className),
     role: "treeitem",
     "aria-expanded": expandable ? expanded : undefined,
     "aria-selected": ariaSelected,
     "aria-disabled": disabled || undefined,
-    id: id,
+    id: idAttribute,
     tabIndex: -1
   }, other, {
     ownerState: ownerState,
     onFocus: handleFocus,
-    ref: handleRef,
+    ref: ref,
     children: [/*#__PURE__*/_jsx(StyledTreeItemContent, _extends({
       as: ContentComponent,
-      ref: contentRef,
       classes: {
         root: classes.content,
         expanded: classes.expanded,
@@ -289,22 +247,20 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
       expansionIcon: expansionIcon,
       displayIcon: displayIcon,
       ownerState: ownerState
-    }, ContentProps)), children && /*#__PURE__*/_jsx(DescendantProvider, {
-      id: nodeId,
-      children: /*#__PURE__*/_jsx(TreeItemGroup, _extends({
-        as: TransitionComponent,
-        unmountOnExit: true,
-        className: classes.group,
-        in: expanded,
-        component: "ul",
-        role: "group"
-      }, TransitionProps, {
-        children: children
-      }))
-    })]
+    }, ContentProps)), children && /*#__PURE__*/_jsx(TreeItemGroup, _extends({
+      as: TransitionComponent,
+      unmountOnExit: true,
+      className: classes.group,
+      in: expanded,
+      component: "ul",
+      role: "group"
+    }, TransitionProps, {
+      children: children
+    }))]
   }));
+  return wrapItem(item);
 });
-process.env.NODE_ENV !== "production" ? TreeItem.propTypes = {
+TreeItem.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
@@ -379,4 +335,4 @@ process.env.NODE_ENV !== "production" ? TreeItem.propTypes = {
    * By default, the element is based on this [`Transition`](http://reactcommunity.org/react-transition-group/transition/) component.
    */
   TransitionProps: PropTypes.object
-} : void 0;
+};

package/modern/TreeItem/index.js

@@ -1,4 +1,4 @@
-export * from './TreeItem';
-export * from './useTreeItem';
+export { TreeItem } from './TreeItem';
 export * from './treeItemClasses';
+export * from './useTreeItem';
 export { TreeItemContent } from './TreeItemContent';

package/modern/TreeItem/useTreeItem.js

@@ -4,11 +4,11 @@ export function useTreeItem(nodeId) {
     instance,
     multiSelect
   } = useTreeViewContext();
-  const expandable = instance ? instance.isNodeExpandable(nodeId) : false;
-  const expanded = instance ? instance.isNodeExpanded(nodeId) : false;
-  const focused = instance ? instance.isNodeFocused(nodeId) : false;
-  const selected = instance ? instance.isNodeSelected(nodeId) : false;
-  const disabled = instance ? instance.isNodeDisabled(nodeId) : false;
+  const expandable = instance.isNodeExpandable(nodeId);
+  const expanded = instance.isNodeExpanded(nodeId);
+  const focused = instance.isNodeFocused(nodeId);
+  const selected = instance.isNodeSelected(nodeId);
+  const disabled = instance.isNodeDisabled(nodeId);
   const handleExpansion = event => {
     if (instance && !disabled) {
       if (!focused) {

package/modern/TreeView/TreeView.js

@@ -1,15 +1,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["disabledItemsFocusable", "expanded", "defaultExpanded", "onNodeToggle", "onNodeFocus", "disableSelection", "defaultSelected", "selected", "multiSelect", "onNodeSelect", "id", "defaultCollapseIcon", "defaultEndIcon", "defaultExpandIcon", "defaultParentIcon", "children"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled, useThemeProps } from '@mui/material/styles';
 import composeClasses from '@mui/utils/composeClasses';
-import { useSlotProps } from '@mui/base/utils';
 import { getTreeViewUtilityClass } from './treeViewClasses';
-import { useTreeView } from '../internals/useTreeView';
-import { TreeViewProvider } from '../internals/TreeViewProvider';
-import { DEFAULT_TREE_VIEW_PLUGINS } from '../internals/plugins';
+import { SimpleTreeView, SimpleTreeViewRoot } from '../SimpleTreeView';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -20,17 +15,22 @@ const useUtilityClasses = ownerState => {
   };
   return composeClasses(slots, getTreeViewUtilityClass, classes);
 };
-const TreeViewRoot = styled('ul', {
+const TreeViewRoot = styled(SimpleTreeViewRoot, {
   name: 'MuiTreeView',
   slot: 'Root',
   overridesResolver: (props, styles) => styles.root
-})({
-  padding: 0,
-  margin: 0,
-  listStyle: 'none',
-  outline: 0
-});
+})({});
+let warnedOnce = false;
+const warn = () => {
+  if (!warnedOnce) {
+    console.warn(['MUI: The TreeView component was renamed SimpleTreeView.', 'The component with the old naming will be removed in the version v8.0.0.', '', "You should use `import { SimpleTreeView } from '@mui/x-tree-view'`", "or `import { SimpleTreeView } from '@mui/x-tree-view/TreeView'`"].join('\n'));
+    warnedOnce = true;
+  }
+};
+
 /**
+ * This component has been deprecated in favor of the new `SimpleTreeView` component.
+ * You can have a look at how to migrate to the new component in the v7 [migration guide](https://next.mui.com/x/migration/migration-tree-view-v6/#use-simpletreeview-instead-of-treeview)
  *
  * Demos:
  *
@@ -39,72 +39,25 @@ const TreeViewRoot = styled('ul', {
  * API:
  *
  * - [TreeView API](https://mui.com/x/api/tree-view/tree-view/)
+ *
+ * @deprecated
  */
 const TreeView = /*#__PURE__*/React.forwardRef(function TreeView(inProps, ref) {
-  const themeProps = useThemeProps({
+  if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
+    warn();
+  }
+  const props = useThemeProps({
     props: inProps,
     name: 'MuiTreeView'
   });
-  const ownerState = themeProps;
-  const _ref = themeProps,
-    {
-      // Headless implementation
-      disabledItemsFocusable,
-      expanded,
-      defaultExpanded,
-      onNodeToggle,
-      onNodeFocus,
-      disableSelection,
-      defaultSelected,
-      selected,
-      multiSelect,
-      onNodeSelect,
-      id,
-      defaultCollapseIcon,
-      defaultEndIcon,
-      defaultExpandIcon,
-      defaultParentIcon,
-      // Component implementation
-      children
-    } = _ref,
-    other = _objectWithoutPropertiesLoose(_ref, _excluded);
-  const {
-    getRootProps,
-    contextValue
-  } = useTreeView({
-    disabledItemsFocusable,
-    expanded,
-    defaultExpanded,
-    onNodeToggle,
-    onNodeFocus,
-    disableSelection,
-    defaultSelected,
-    selected,
-    multiSelect,
-    onNodeSelect,
-    id,
-    defaultCollapseIcon,
-    defaultEndIcon,
-    defaultExpandIcon,
-    defaultParentIcon,
-    plugins: DEFAULT_TREE_VIEW_PLUGINS,
-    rootRef: ref
-  });
-  const classes = useUtilityClasses(themeProps);
-  const rootProps = useSlotProps({
-    elementType: TreeViewRoot,
-    externalSlotProps: {},
-    externalForwardedProps: other,
-    className: classes.root,
-    getSlotProps: getRootProps,
-    ownerState
-  });
-  return /*#__PURE__*/_jsx(TreeViewProvider, {
-    value: contextValue,
-    children: /*#__PURE__*/_jsx(TreeViewRoot, _extends({}, rootProps, {
-      children: children
-    }))
-  });
+  const classes = useUtilityClasses(props);
+  return /*#__PURE__*/_jsx(SimpleTreeView, _extends({}, props, {
+    ref: ref,
+    classes: classes,
+    slots: _extends({
+      root: TreeViewRoot
+    }, props.slots)
+  }));
 });
 process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
   // ----------------------------- Warning --------------------------------
@@ -137,7 +90,7 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
    * Used when the item's expansion is not controlled.
    * @default []
    */
-  defaultExpanded: PropTypes.arrayOf(PropTypes.string),
+  defaultExpandedNodes: PropTypes.arrayOf(PropTypes.string),
   /**
    * The default icon used to expand the node.
    */
@@ -152,7 +105,7 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
    * When `multiSelect` is true this takes an array of strings; when false (default) a string.
    * @default []
    */
-  defaultSelected: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.arrayOf(PropTypes.string), PropTypes.string]),
+  defaultSelectedNodes: PropTypes.any,
   /**
    * If `true`, will allow focus on disabled items.
    * @default false
@@ -167,7 +120,25 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
    * Expanded node ids.
    * Used when the item's expansion is controlled.
    */
-  expanded: PropTypes.arrayOf(PropTypes.string),
+  expandedNodes: PropTypes.arrayOf(PropTypes.string),
+  /**
+   * Used to determine the string label for a given item.
+   *
+   * @template R
+   * @param {R} item The item to check.
+   * @returns {string} The id of the item.
+   * @default `(item) => item.id`
+   */
+  getItemId: PropTypes.func,
+  /**
+   * Used to determine the string label for a given item.
+   *
+   * @template R
+   * @param {R} item The item to check.
+   * @returns {string} The label of the item.
+   * @default `(item) => item.label`
+   */
+  getItemLabel: PropTypes.func,
   /**
    * This prop is used to help implement the accessibility logic.
    * If you don't provide this prop. It falls back to a randomly generated id.
@@ -178,6 +149,19 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
    * @default false
    */
   multiSelect: PropTypes.bool,
+  /**
+   * Callback fired when tree items are expanded/collapsed.
+   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {array} nodeIds The ids of the expanded nodes.
+   */
+  onExpandedNodesChange: PropTypes.func,
+  /**
+   * Callback fired when a tree item is expanded or collapsed.
+   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {array} nodeId The nodeId of the modified node.
+   * @param {array} isExpanded `true` if the node has just been expanded, `false` if it has just been collapsed.
+   */
+  onNodeExpansionToggle: PropTypes.func,
   /**
    * Callback fired when tree items are focused.
    * @param {React.SyntheticEvent} event The event source of the callback **Warning**: This is a generic event not a focus event.
@@ -186,23 +170,32 @@ process.env.NODE_ENV !== "production" ? TreeView.propTypes = {
    */
   onNodeFocus: PropTypes.func,
   /**
-   * Callback fired when tree items are selected/unselected.
-   * @param {React.SyntheticEvent} event The event source of the callback
-   * @param {string[] | string} nodeIds Ids of the selected nodes. When `multiSelect` is true
-   * this is an array of strings; when false (default) a string.
+   * Callback fired when a tree item is selected or deselected.
+   * @param {React.SyntheticEvent} event The event source of the callback.
+   * @param {array} nodeId The nodeId of the modified node.
+   * @param {array} isSelected `true` if the node has just been selected, `false` if it has just been deselected.
    */
-  onNodeSelect: PropTypes.func,
+  onNodeSelectionToggle: PropTypes.func,
   /**
-   * Callback fired when tree items are expanded/collapsed.
-   * @param {React.SyntheticEvent} event The event source of the callback.
-   * @param {array} nodeIds The ids of the expanded nodes.
+   * Callback fired when tree items are selected/deselected.
+   * @param {React.SyntheticEvent} event The event source of the callback
+   * @param {string[] | string} nodeIds The ids of the selected nodes.
+   * When `multiSelect` is `true`, this is an array of strings; when false (default) a string.
    */
-  onNodeToggle: PropTypes.func,
+  onSelectedNodesChange: PropTypes.func,
   /**
    * Selected node ids. (Controlled)
    * When `multiSelect` is true this takes an array of strings; when false (default) a string.
    */
-  selected: PropTypes.any,
+  selectedNodes: PropTypes.any,
+  /**
+   * The props used for each component slot.
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overridable component slots.
+   */
+  slots: PropTypes.object,
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-tree-view v7.0.0-alpha.1
+ * @mui/x-tree-view v7.0.0-alpha.7
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the
@@ -7,4 +7,7 @@
  */
 export * from './TreeItem';
 export * from './TreeView';
-export { unstable_resetCleanupTracking } from './internals/hooks/useInstanceEventHandler';
+export * from './SimpleTreeView';
+export * from './RichTreeView';
+export { unstable_resetCleanupTracking } from './internals/hooks/useInstanceEventHandler';
+export * from './models';

package/modern/internals/TreeViewProvider/TreeViewContext.js

@@ -1,21 +1,8 @@
 import * as React from 'react';
-export const DEFAULT_TREE_VIEW_CONTEXT_VALUE = {
-  instance: null,
-  multiSelect: false,
-  disabledItemsFocusable: false,
-  treeId: undefined,
-  icons: {
-    defaultCollapseIcon: null,
-    defaultExpandIcon: null,
-    defaultParentIcon: null,
-    defaultEndIcon: null
-  }
-};
-
 /**
  * @ignore - internal component.
  */
-export const TreeViewContext = /*#__PURE__*/React.createContext(DEFAULT_TREE_VIEW_CONTEXT_VALUE);
+export const TreeViewContext = /*#__PURE__*/React.createContext(null);
 if (process.env.NODE_ENV !== 'production') {
   TreeViewContext.displayName = 'TreeViewContext';
 }

package/modern/internals/TreeViewProvider/useTreeViewContext.js

@@ -1,3 +1,9 @@
 import * as React from 'react';
 import { TreeViewContext } from './TreeViewContext';
-export const useTreeViewContext = () => React.useContext(TreeViewContext);
+export const useTreeViewContext = () => {
+  const context = React.useContext(TreeViewContext);
+  if (context == null) {
+    throw new Error(['MUI: Could not find the Tree View context.', 'It looks like you rendered your component outside of a SimpleTreeView or RichTreeView parent component.', 'This can also happen if you are bundling multiple versions of the Tree View.'].join('\n'));
+  }
+  return context;
+};

package/modern/internals/corePlugins/corePlugins.js

@@ -1,6 +1,6 @@
 import { useTreeViewInstanceEvents } from './useTreeViewInstanceEvents';
 /**
- * Internal plugins that creates the tools used by the other plugins.
+ * Internal plugins that create the tools used by the other plugins.
  * These plugins are used by the tree view components.
  */
 export const TREE_VIEW_CORE_PLUGINS = [useTreeViewInstanceEvents];

package/modern/internals/corePlugins/useTreeViewInstanceEvents/useTreeViewInstanceEvents.js

@@ -4,12 +4,6 @@ import { populateInstance } from '../../useTreeView/useTreeView.utils';
 const isSyntheticEvent = event => {
   return event.isPropagationStopped !== undefined;
 };
-
-/**
- * Plugin responsible for the registration of the nodes defined as JSX children of the TreeView.
- * When we will have both a SimpleTreeView using JSX children and a TreeView using a data prop,
- * this plugin will only be used by SimpleTreeView.
- */
 export const useTreeViewInstanceEvents = ({
   instance
 }) => {

package/modern/internals/hooks/useLazyRef.js

@@ -0,0 +1,11 @@
+import * as React from 'react';
+const UNINITIALIZED = {};
+
+// See https://github.com/facebook/react/issues/14490 for when to use this.
+export function useLazyRef(init, initArg) {
+  const ref = React.useRef(UNINITIALIZED);
+  if (ref.current === UNINITIALIZED) {
+    ref.current = init(initArg);
+  }
+  return ref;
+}

package/modern/internals/hooks/useOnMount.js

@@ -0,0 +1,7 @@
+import * as React from 'react';
+const EMPTY = [];
+export function useOnMount(fn) {
+  /* eslint-disable react-hooks/exhaustive-deps */
+  React.useEffect(fn, EMPTY);
+  /* eslint-enable react-hooks/exhaustive-deps */
+}

package/modern/internals/hooks/useTimeout.js

@@ -0,0 +1,28 @@
+import { useLazyRef } from './useLazyRef';
+import { useOnMount } from './useOnMount';
+class Timeout {
+  constructor() {
+    this.currentId = 0;
+    this.clear = () => {
+      if (this.currentId !== 0) {
+        clearTimeout(this.currentId);
+        this.currentId = 0;
+      }
+    };
+    this.disposeEffect = () => {
+      return this.clear;
+    };
+  }
+  static create() {
+    return new Timeout();
+  }
+  start(delay, fn) {
+    this.clear();
+    this.currentId = setTimeout(fn, delay);
+  }
+}
+export function useTimeout() {
+  const timeout = useLazyRef(Timeout.create).current;
+  useOnMount(timeout.disposeEffect);
+  return timeout;
+}

package/modern/internals/plugins/defaultPlugins.js

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

package/modern/internals/plugins/useTreeViewContextValueBuilder/useTreeViewContextValueBuilder.js

@@ -1,17 +1,19 @@
-import useId from '@mui/utils/useId';
 export const useTreeViewContextValueBuilder = ({
   instance,
   params
 }) => {
-  const treeId = useId(params.id);
   return {
-    getRootProps: () => ({
-      id: treeId
-    }),
     contextValue: {
-      treeId,
       instance: instance,
       multiSelect: params.multiSelect,
+      runItemPlugins: ({
+        props,
+        ref
+      }) => ({
+        props,
+        ref,
+        wrapItem: children => children
+      }),
       disabledItemsFocusable: params.disabledItemsFocusable,
       icons: {
         defaultCollapseIcon: params.defaultCollapseIcon,