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

package/legacy/internals/plugins/useTreeViewSelection/useTreeViewSelection.js

@@ -10,9 +10,6 @@ export var useTreeViewSelection = function useTreeViewSelection(_ref) {
   var lastSelectedNode = React.useRef(null);
   var lastSelectionWasRange = React.useRef(false);
   var currentRangeSelection = React.useRef([]);
-  var isNodeSelected = function isNodeSelected(nodeId) {
-    return Array.isArray(models.selectedNodes.value) ? models.selectedNodes.value.indexOf(nodeId) !== -1 : models.selectedNodes.value === nodeId;
-  };
   var setSelectedNodes = function setSelectedNodes(event, newSelectedNodes) {
     if (params.onNodeSelectionToggle) {
       if (params.multiSelect) {
@@ -40,7 +37,10 @@ export var useTreeViewSelection = function useTreeViewSelection(_ref) {
     if (params.onSelectedNodesChange) {
       params.onSelectedNodesChange(event, newSelectedNodes);
     }
-    models.selectedNodes.setValue(newSelectedNodes);
+    models.selectedNodes.setControlledValue(newSelectedNodes);
+  };
+  var isNodeSelected = function isNodeSelected(nodeId) {
+    return Array.isArray(models.selectedNodes.value) ? models.selectedNodes.value.indexOf(nodeId) !== -1 : models.selectedNodes.value === nodeId;
   };
   var selectNode = function selectNode(event, nodeId) {
     var multiple = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -185,13 +185,19 @@ export var useTreeViewSelection = function useTreeViewSelection(_ref) {
       return {
         'aria-multiselectable': params.multiSelect
       };
+    },
+    contextValue: {
+      selection: {
+        multiSelect: params.multiSelect
+      }
     }
   };
 };
 useTreeViewSelection.models = {
   selectedNodes: {
-    controlledProp: 'selectedNodes',
-    defaultProp: 'defaultSelectedNodes'
+    getDefaultValue: function getDefaultValue(params) {
+      return params.defaultSelectedNodes;
+    }
   }
 };
 var DEFAULT_SELECTED_NODES = [];
@@ -202,4 +208,12 @@ useTreeViewSelection.getDefaultizedParams = function (params) {
     multiSelect: (_params$multiSelect = params.multiSelect) != null ? _params$multiSelect : false,
     defaultSelectedNodes: (_params$defaultSelect = params.defaultSelectedNodes) != null ? _params$defaultSelect : params.multiSelect ? DEFAULT_SELECTED_NODES : null
   });
+};
+useTreeViewSelection.params = {
+  disableSelection: true,
+  multiSelect: true,
+  defaultSelectedNodes: true,
+  selectedNodes: true,
+  onSelectedNodesChange: true,
+  onNodeSelectionToggle: true
 };

package/legacy/internals/useTreeView/useTreeView.js

@@ -31,11 +31,15 @@ export var useTreeView = function useTreeView(inParams) {
     state = _React$useState2[0],
     setState = _React$useState2[1];
   var rootPropsGetters = [];
-  var contextValue = {};
+  var contextValue = {
+    instance: instance
+  };
   var runPlugin = function runPlugin(plugin) {
     var pluginResponse = plugin({
       instance: instance,
       params: params,
+      slots: params.slots,
+      slotProps: params.slotProps,
       state: state,
       setState: setState,
       rootRef: innerRootRef,
@@ -45,7 +49,7 @@ export var useTreeView = function useTreeView(inParams) {
       rootPropsGetters.push(pluginResponse.getRootProps);
     }
     if (pluginResponse.contextValue) {
-      contextValue = pluginResponse.contextValue;
+      _extends(contextValue, pluginResponse.contextValue);
     }
   };
   plugins.forEach(runPlugin);

package/legacy/internals/useTreeView/useTreeViewModels.js

@@ -15,13 +15,12 @@ export var useTreeViewModels = function useTreeViewModels(plugins, props) {
           Object.entries(plugin.models).forEach(function (_ref) {
             var _ref2 = _slicedToArray(_ref, 2),
               modelName = _ref2[0],
-              model = _ref2[1];
+              modelInitializer = _ref2[1];
             modelsRef.current[modelName] = {
-              controlledProp: model.controlledProp,
-              defaultProp: model.defaultProp,
-              isControlled: props[model.controlledProp] !== undefined
+              isControlled: props[modelName] !== undefined,
+              getDefaultValue: modelInitializer.getDefaultValue
             };
-            initialState[modelName] = props[model.defaultProp];
+            initialState[modelName] = modelInitializer.getDefaultValue(props);
           });
         }
       });
@@ -34,10 +33,10 @@ export var useTreeViewModels = function useTreeViewModels(plugins, props) {
     var _ref4 = _slicedToArray(_ref3, 2),
       modelName = _ref4[0],
       model = _ref4[1];
-    var value = model.isControlled ? props[model.controlledProp] : modelsState[modelName];
+    var value = model.isControlled ? props[modelName] : modelsState[modelName];
     return [modelName, {
       value: value,
-      setValue: function setValue(newValue) {
+      setControlledValue: function setControlledValue(newValue) {
         if (!model.isControlled) {
           setModelsState(function (prevState) {
             return _extends({}, prevState, _defineProperty({}, modelName, newValue));
@@ -54,18 +53,18 @@ export var useTreeViewModels = function useTreeViewModels(plugins, props) {
       var _ref6 = _slicedToArray(_ref5, 2),
         modelName = _ref6[0],
         model = _ref6[1];
-      var controlled = props[model.controlledProp];
-      var defaultProp = props[model.defaultProp];
+      var controlled = props[modelName];
+      var newDefaultValue = model.getDefaultValue(props);
       React.useEffect(function () {
         if (model.isControlled !== (controlled !== undefined)) {
-          console.error(["MUI: A component is changing the ".concat(model.isControlled ? '' : 'un', "controlled ").concat(modelName, " state of TreeView to be ").concat(model.isControlled ? 'un' : '', "controlled."), 'Elements should not switch from uncontrolled to controlled (or vice versa).', "Decide between using a controlled or uncontrolled ".concat(modelName, " ") + 'element for the lifetime of the component.', "The nature of the state is determined during the first render. It's considered controlled if the value is not `undefined`.", 'More info: https://fb.me/react-controlled-components'].join('\n'));
+          console.error(["MUI X: A component is changing the ".concat(model.isControlled ? '' : 'un', "controlled ").concat(modelName, " state of TreeView to be ").concat(model.isControlled ? 'un' : '', "controlled."), 'Elements should not switch from uncontrolled to controlled (or vice versa).', "Decide between using a controlled or uncontrolled ".concat(modelName, " ") + 'element for the lifetime of the component.', "The nature of the state is determined during the first render. It's considered controlled if the value is not `undefined`.", 'More info: https://fb.me/react-controlled-components'].join('\n'));
         }
       }, [controlled]);
-      var _React$useRef = React.useRef(defaultProp),
+      var _React$useRef = React.useRef(newDefaultValue),
         defaultValue = _React$useRef.current;
       React.useEffect(function () {
-        if (!model.isControlled && defaultValue !== defaultProp) {
-          console.error(["MUI: A component is changing the default ".concat(modelName, " state of an uncontrolled TreeView after being initialized. ") + "To suppress this warning opt to use a controlled TreeView."].join('\n'));
+        if (!model.isControlled && defaultValue !== newDefaultValue) {
+          console.error(["MUI X: A component is changing the default ".concat(modelName, " state of an uncontrolled TreeView after being initialized. ") + "To suppress this warning opt to use a controlled TreeView."].join('\n'));
         }
       }, [JSON.stringify(defaultValue)]);
     });

package/legacy/internals/utils/extractPluginParamsFromProps.js

@@ -0,0 +1,36 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["slots", "slotProps"];
+export var extractPluginParamsFromProps = function extractPluginParamsFromProps(_ref) {
+  var _ref$props = _ref.props,
+    slots = _ref$props.slots,
+    slotProps = _ref$props.slotProps,
+    props = _objectWithoutProperties(_ref$props, _excluded),
+    plugins = _ref.plugins,
+    rootRef = _ref.rootRef;
+  var paramsLookup = {};
+  plugins.forEach(function (plugin) {
+    _extends(paramsLookup, plugin.params);
+  });
+  var pluginParams = {
+    plugins: plugins,
+    rootRef: rootRef,
+    slots: slots != null ? slots : {},
+    slotProps: slotProps != null ? slotProps : {}
+  };
+  var otherProps = {};
+  Object.keys(props).forEach(function (propName) {
+    var prop = props[propName];
+    if (paramsLookup[propName]) {
+      pluginParams[propName] = prop;
+    } else {
+      otherProps[propName] = prop;
+    }
+  });
+  return {
+    pluginParams: pluginParams,
+    slots: slots,
+    slotProps: slotProps,
+    otherProps: otherProps
+  };
+};

package/modern/RichTreeView/RichTreeView.js

@@ -1,6 +1,4 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["disabledItemsFocusable", "expandedNodes", "defaultExpandedNodes", "onExpandedNodesChange", "onNodeExpansionToggle", "onNodeFocus", "disableSelection", "defaultSelectedNodes", "selectedNodes", "multiSelect", "onSelectedNodesChange", "onNodeSelectionToggle", "id", "defaultCollapseIcon", "defaultEndIcon", "defaultExpandIcon", "defaultParentIcon", "items", "getItemId", "getItemLabel", "isItemDisabled", "slots", "slotProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled, useThemeProps } from '@mui/material/styles';
@@ -12,6 +10,7 @@ import { TreeViewProvider } from '../internals/TreeViewProvider';
 import { DEFAULT_TREE_VIEW_PLUGINS } from '../internals/plugins';
 import { TreeItem } from '../TreeItem';
 import { buildWarning } from '../internals/utils/warning';
+import { extractPluginParamsFromProps } from '../internals/utils/extractPluginParamsFromProps';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -58,7 +57,7 @@ function WrappedTreeItem({
     children: children
   }));
 }
-const childrenWarning = buildWarning(['MUI: The `RichTreeView` component does not support JSX children.', 'If you want to add items, you need to use the `items` prop', 'Check the documentation for more details: https://next.mui.com/x/react-tree-view/rich-tree-view/items/']);
+const childrenWarning = buildWarning(['MUI X: The `RichTreeView` component does not support JSX children.', 'If you want to add items, you need to use the `items` prop', 'Check the documentation for more details: https://next.mui.com/x/react-tree-view/rich-tree-view/items/']);
 
 /**
  *
@@ -75,75 +74,32 @@ const RichTreeView = /*#__PURE__*/React.forwardRef(function RichTreeView(inProps
     props: inProps,
     name: 'MuiRichTreeView'
   });
-  const _ref = props,
-    {
-      // Headless implementation
-      disabledItemsFocusable,
-      expandedNodes,
-      defaultExpandedNodes,
-      onExpandedNodesChange,
-      onNodeExpansionToggle,
-      onNodeFocus,
-      disableSelection,
-      defaultSelectedNodes,
-      selectedNodes,
-      multiSelect,
-      onSelectedNodesChange,
-      onNodeSelectionToggle,
-      id: treeId,
-      defaultCollapseIcon,
-      defaultEndIcon,
-      defaultExpandIcon,
-      defaultParentIcon,
-      items,
-      getItemId,
-      getItemLabel,
-      isItemDisabled,
-      // Component implementation
-      slots,
-      slotProps
-    } = _ref,
-    other = _objectWithoutPropertiesLoose(_ref, _excluded);
   if (process.env.NODE_ENV !== 'production') {
     if (props.children != null) {
       childrenWarning();
     }
   }
   const {
-    getRootProps,
-    contextValue,
-    instance
-  } = useTreeView({
-    disabledItemsFocusable,
-    expandedNodes,
-    defaultExpandedNodes,
-    onExpandedNodesChange,
-    onNodeExpansionToggle,
-    onNodeFocus,
-    disableSelection,
-    defaultSelectedNodes,
-    selectedNodes,
-    multiSelect,
-    onSelectedNodesChange,
-    onNodeSelectionToggle,
-    id: treeId,
-    defaultCollapseIcon,
-    defaultEndIcon,
-    defaultExpandIcon,
-    defaultParentIcon,
-    items,
-    getItemId,
-    getItemLabel,
-    isItemDisabled,
+    pluginParams,
+    slots,
+    slotProps,
+    otherProps
+  } = extractPluginParamsFromProps({
+    props,
     plugins: DEFAULT_TREE_VIEW_PLUGINS,
     rootRef: ref
   });
+  const {
+    getRootProps,
+    contextValue,
+    instance
+  } = useTreeView(pluginParams);
   const classes = useUtilityClasses(props);
   const Root = slots?.root ?? RichTreeViewRoot;
   const rootProps = useSlotProps({
     elementType: Root,
     externalSlotProps: slotProps?.root,
-    externalForwardedProps: other,
+    externalForwardedProps: otherProps,
     className: classes.root,
     getSlotProps: getRootProps,
     ownerState: props
@@ -180,34 +136,13 @@ process.env.NODE_ENV !== "production" ? RichTreeView.propTypes = {
    * Override or extend the styles applied to the component.
    */
   classes: PropTypes.object,
-  /**
-   * className applied to the root element.
-   */
   className: PropTypes.string,
-  /**
-   * The default icon used to collapse the node.
-   */
-  defaultCollapseIcon: PropTypes.node,
-  /**
-   * The default icon displayed next to a end node. This is applied to all
-   * tree nodes and can be overridden by the TreeItem `icon` prop.
-   */
-  defaultEndIcon: PropTypes.node,
   /**
    * Expanded node ids.
    * Used when the item's expansion is not controlled.
    * @default []
    */
   defaultExpandedNodes: PropTypes.arrayOf(PropTypes.string),
-  /**
-   * The default icon used to expand the node.
-   */
-  defaultExpandIcon: PropTypes.node,
-  /**
-   * The default icon displayed next to a parent node. This is applied to all
-   * parent nodes and can be overridden by the TreeItem `icon` prop.
-   */
-  defaultParentIcon: PropTypes.node,
   /**
    * Selected node ids. (Uncontrolled)
    * When `multiSelect` is true this takes an array of strings; when false (default) a string.

package/modern/SimpleTreeView/SimpleTreeView.js

@@ -1,6 +1,4 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["disabledItemsFocusable", "expandedNodes", "defaultExpandedNodes", "onExpandedNodesChange", "onNodeExpansionToggle", "onNodeFocus", "disableSelection", "defaultSelectedNodes", "selectedNodes", "multiSelect", "onSelectedNodesChange", "onNodeSelectionToggle", "id", "defaultCollapseIcon", "defaultEndIcon", "defaultExpandIcon", "defaultParentIcon", "children", "slots", "slotProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled, useThemeProps } from '@mui/material/styles';
@@ -11,6 +9,7 @@ import { useTreeView } from '../internals/useTreeView';
 import { TreeViewProvider } from '../internals/TreeViewProvider';
 import { SIMPLE_TREE_VIEW_PLUGINS } from './SimpleTreeView.plugins';
 import { buildWarning } from '../internals/utils/warning';
+import { extractPluginParamsFromProps } from '../internals/utils/extractPluginParamsFromProps';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -32,7 +31,7 @@ export const SimpleTreeViewRoot = styled('ul', {
   outline: 0
 });
 const EMPTY_ITEMS = [];
-const itemsPropWarning = buildWarning(['MUI: The `SimpleTreeView` component does not support the `items` prop.', 'If you want to add items, you need to pass them as JSX children.', 'Check the documentation for more details: https://next.mui.com/x/react-tree-view/simple-tree-view/items/']);
+const itemsPropWarning = buildWarning(['MUI X: The `SimpleTreeView` component does not support the `items` prop.', 'If you want to add items, you need to pass them as JSX children.', 'Check the documentation for more details: https://next.mui.com/x/react-tree-view/simple-tree-view/items/']);
 
 /**
  *
@@ -50,76 +49,40 @@ const SimpleTreeView = /*#__PURE__*/React.forwardRef(function SimpleTreeView(inP
     name: 'MuiSimpleTreeView'
   });
   const ownerState = props;
-  const _ref = props,
-    {
-      // Headless implementation
-      disabledItemsFocusable,
-      expandedNodes,
-      defaultExpandedNodes,
-      onExpandedNodesChange,
-      onNodeExpansionToggle,
-      onNodeFocus,
-      disableSelection,
-      defaultSelectedNodes,
-      selectedNodes,
-      multiSelect,
-      onSelectedNodesChange,
-      onNodeSelectionToggle,
-      id,
-      defaultCollapseIcon,
-      defaultEndIcon,
-      defaultExpandIcon,
-      defaultParentIcon,
-      // Component implementation
-      children,
-      slots
-    } = _ref,
-    other = _objectWithoutPropertiesLoose(_ref, _excluded);
   if (process.env.NODE_ENV !== 'production') {
     if (props.items != null) {
       itemsPropWarning();
     }
   }
   const {
-    getRootProps,
-    contextValue
-  } = useTreeView({
-    disabledItemsFocusable,
-    expandedNodes,
-    defaultExpandedNodes,
-    onExpandedNodesChange,
-    onNodeExpansionToggle,
-    onNodeFocus,
-    disableSelection,
-    defaultSelectedNodes,
-    selectedNodes,
-    multiSelect,
-    onSelectedNodesChange,
-    onNodeSelectionToggle,
-    id,
-    defaultCollapseIcon,
-    defaultEndIcon,
-    defaultExpandIcon,
-    defaultParentIcon,
-    items: EMPTY_ITEMS,
+    pluginParams,
+    slots,
+    slotProps,
+    otherProps
+  } = extractPluginParamsFromProps({
+    props: _extends({}, props, {
+      items: EMPTY_ITEMS
+    }),
     plugins: SIMPLE_TREE_VIEW_PLUGINS,
     rootRef: ref
   });
+  const {
+    getRootProps,
+    contextValue
+  } = useTreeView(pluginParams);
   const classes = useUtilityClasses(props);
   const Root = slots?.root ?? SimpleTreeViewRoot;
   const rootProps = useSlotProps({
     elementType: Root,
-    externalSlotProps: {},
-    externalForwardedProps: other,
+    externalSlotProps: slotProps?.root,
+    externalForwardedProps: otherProps,
     className: classes.root,
     getSlotProps: getRootProps,
     ownerState
   });
   return /*#__PURE__*/_jsx(TreeViewProvider, {
     value: contextValue,
-    children: /*#__PURE__*/_jsx(Root, _extends({}, rootProps, {
-      children: children
-    }))
+    children: /*#__PURE__*/_jsx(Root, _extends({}, rootProps))
   });
 });
 process.env.NODE_ENV !== "production" ? SimpleTreeView.propTypes = {
@@ -135,34 +98,13 @@ process.env.NODE_ENV !== "production" ? SimpleTreeView.propTypes = {
    * Override or extend the styles applied to the component.
    */
   classes: PropTypes.object,
-  /**
-   * className applied to the root element.
-   */
   className: PropTypes.string,
-  /**
-   * The default icon used to collapse the node.
-   */
-  defaultCollapseIcon: PropTypes.node,
-  /**
-   * The default icon displayed next to a end node. This is applied to all
-   * tree nodes and can be overridden by the TreeItem `icon` prop.
-   */
-  defaultEndIcon: PropTypes.node,
   /**
    * Expanded node ids.
    * Used when the item's expansion is not controlled.
    * @default []
    */
   defaultExpandedNodes: PropTypes.arrayOf(PropTypes.string),
-  /**
-   * The default icon used to expand the node.
-   */
-  defaultExpandIcon: PropTypes.node,
-  /**
-   * The default icon displayed next to a parent node. This is applied to all
-   * parent nodes and can be overridden by the TreeItem `icon` prop.
-   */
-  defaultParentIcon: PropTypes.node,
   /**
    * Selected node ids. (Uncontrolled)
    * When `multiSelect` is true this takes an array of strings; when false (default) a string.

package/modern/TreeItem/TreeItem.js

@@ -1,10 +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", "icon", "nodeId", "id", "label", "onClick", "onMouseDown", "TransitionComponent", "TransitionProps"];
+const _excluded = ["children", "className", "slots", "slotProps", "ContentComponent", "ContentProps", "nodeId", "id", "label", "onClick", "onMouseDown", "TransitionComponent", "TransitionProps"],
+  _excluded2 = ["ownerState"],
+  _excluded3 = ["ownerState"],
+  _excluded4 = ["ownerState"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import Collapse from '@mui/material/Collapse';
+import { resolveComponentProps, useSlotProps } from '@mui/base/utils';
 import { alpha, styled, useThemeProps } from '@mui/material/styles';
 import unsupportedProp from '@mui/utils/unsupportedProp';
 import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef';
@@ -12,6 +16,7 @@ import { unstable_composeClasses as composeClasses } from '@mui/base';
 import { TreeItemContent } from './TreeItemContent';
 import { treeItemClasses, getTreeItemUtilityClass } from './treeItemClasses';
 import { useTreeViewContext } from '../internals/TreeViewProvider/useTreeViewContext';
+import { TreeViewCollapseIcon, TreeViewExpandIcon } from '../icons';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
@@ -133,7 +138,9 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
   const {
     icons: contextIcons,
     runItemPlugins,
-    multiSelect,
+    selection: {
+      multiSelect
+    },
     disabledItemsFocusable,
     instance
   } = useTreeViewContext();
@@ -152,12 +159,10 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
   const {
       children,
       className,
-      collapseIcon,
+      slots: inSlots,
+      slotProps: inSlotProps,
       ContentComponent = TreeItemContent,
       ContentProps,
-      endIcon,
-      expandIcon,
-      icon,
       nodeId,
       id,
       label,
@@ -167,6 +172,12 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
       TransitionProps
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
+  const slots = {
+    expandIcon: inSlots?.expandIcon ?? contextIcons.slots.expandIcon ?? TreeViewExpandIcon,
+    collapseIcon: inSlots?.collapseIcon ?? contextIcons.slots.collapseIcon ?? TreeViewCollapseIcon,
+    endIcon: inSlots?.endIcon ?? contextIcons.slots.endIcon,
+    icon: inSlots?.icon
+  };
   const expandable = Boolean(Array.isArray(children) ? children.length : children);
   const expanded = instance.isNodeExpanded(nodeId);
   const focused = instance.isNodeFocused(nodeId);
@@ -179,20 +190,40 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
     disabled
   });
   const classes = useUtilityClasses(ownerState);
-  let displayIcon;
-  let expansionIcon;
-  if (expandable) {
-    if (!expanded) {
-      expansionIcon = expandIcon || contextIcons.defaultExpandIcon;
-    } else {
-      expansionIcon = collapseIcon || contextIcons.defaultCollapseIcon;
-    }
-  }
-  if (expandable) {
-    displayIcon = contextIcons.defaultParentIcon;
-  } else {
-    displayIcon = endIcon || contextIcons.defaultEndIcon;
-  }
+  const ExpansionIcon = expanded ? slots.collapseIcon : slots.expandIcon;
+  const _useSlotProps = useSlotProps({
+      elementType: ExpansionIcon,
+      ownerState: {},
+      externalSlotProps: tempOwnerState => {
+        if (expanded) {
+          return _extends({}, resolveComponentProps(contextIcons.slotProps.collapseIcon, tempOwnerState), resolveComponentProps(inSlotProps?.collapseIcon, tempOwnerState));
+        }
+        return _extends({}, resolveComponentProps(contextIcons.slotProps.expandIcon, tempOwnerState), resolveComponentProps(inSlotProps?.expandIcon, tempOwnerState));
+      }
+    }),
+    expansionIconProps = _objectWithoutPropertiesLoose(_useSlotProps, _excluded2);
+  const expansionIcon = expandable && !!ExpansionIcon ? /*#__PURE__*/_jsx(ExpansionIcon, _extends({}, expansionIconProps)) : null;
+  const DisplayIcon = expandable ? undefined : slots.endIcon;
+  const _useSlotProps2 = useSlotProps({
+      elementType: DisplayIcon,
+      ownerState: {},
+      externalSlotProps: tempOwnerState => {
+        if (expandable) {
+          return {};
+        }
+        return _extends({}, resolveComponentProps(contextIcons.slotProps.endIcon, tempOwnerState), resolveComponentProps(inSlotProps?.endIcon, tempOwnerState));
+      }
+    }),
+    displayIconProps = _objectWithoutPropertiesLoose(_useSlotProps2, _excluded3);
+  const displayIcon = DisplayIcon ? /*#__PURE__*/_jsx(DisplayIcon, _extends({}, displayIconProps)) : null;
+  const Icon = slots.icon;
+  const _useSlotProps3 = useSlotProps({
+      elementType: Icon,
+      ownerState: {},
+      externalSlotProps: inSlotProps?.icon
+    }),
+    iconProps = _objectWithoutPropertiesLoose(_useSlotProps3, _excluded4);
+  const icon = Icon ? /*#__PURE__*/_jsx(Icon, _extends({}, iconProps)) : null;
   let ariaSelected;
   if (multiSelect) {
     ariaSelected = selected;
@@ -273,14 +304,7 @@ TreeItem.propTypes = {
    * Override or extend the styles applied to the component.
    */
   classes: PropTypes.object,
-  /**
-   * className applied to the root element.
-   */
   className: PropTypes.string,
-  /**
-   * The icon used to collapse the node.
-   */
-  collapseIcon: PropTypes.node,
   /**
    * The component used for the content node.
    * @default TreeItemContent
@@ -295,18 +319,6 @@ TreeItem.propTypes = {
    * @default false
    */
   disabled: PropTypes.bool,
-  /**
-   * The icon displayed next to an end node.
-   */
-  endIcon: PropTypes.node,
-  /**
-   * The icon used to expand the node.
-   */
-  expandIcon: PropTypes.node,
-  /**
-   * The icon to display next to the tree node's label.
-   */
-  icon: PropTypes.node,
   /**
    * The tree node label.
    */
@@ -320,6 +332,16 @@ TreeItem.propTypes = {
    * Use the `onNodeFocus` callback on the tree if you need to monitor a node's focus.
    */
   onFocus: unsupportedProp,
+  /**
+   * The props used for each component slot.
+   * @default {}
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overridable component slots.
+   * @default {}
+   */
+  slots: PropTypes.object,
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */

package/modern/TreeItem/TreeItemContent.js

@@ -4,7 +4,7 @@ const _excluded = ["classes", "className", "displayIcon", "expansionIcon", "icon
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { useTreeItem } from './useTreeItem';
+import { useTreeItemState } from './useTreeItemState';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 /**
@@ -31,7 +31,7 @@ const TreeItemContent = /*#__PURE__*/React.forwardRef(function TreeItemContent(p
     handleExpansion,
     handleSelection,
     preventSelection
-  } = useTreeItem(nodeId);
+  } = useTreeItemState(nodeId);
   const icon = iconProp || expansionIcon || displayIcon;
   const handleMouseDown = event => {
     preventSelection(event);
@@ -73,9 +73,6 @@ process.env.NODE_ENV !== "production" ? TreeItemContent.propTypes = {
    * Override or extend the styles applied to the component.
    */
   classes: PropTypes.object.isRequired,
-  /**
-   * className applied to the root element.
-   */
   className: PropTypes.string,
   /**
    * The icon to display next to the tree node's label. Either a parent or end icon.

package/modern/TreeItem/index.js

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