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

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,17 +53,17 @@ 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 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) {
+        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

@@ -1,6 +1,11 @@
 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 props = _ref.props,
+  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 = {};
@@ -9,7 +14,9 @@ export var extractPluginParamsFromProps = function extractPluginParamsFromProps(
   });
   var pluginParams = {
     plugins: plugins,
-    rootRef: rootRef
+    rootRef: rootRef,
+    slots: slots != null ? slots : {},
+    slotProps: slotProps != null ? slotProps : {}
   };
   var otherProps = {};
   Object.keys(props).forEach(function (propName) {
@@ -22,6 +29,8 @@ export var extractPluginParamsFromProps = function extractPluginParamsFromProps(
   });
   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 = ["slots", "slotProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled, useThemeProps } from '@mui/material/styles';
@@ -81,19 +79,16 @@ const RichTreeView = /*#__PURE__*/React.forwardRef(function RichTreeView(inProps
       childrenWarning();
     }
   }
-  const _extractPluginParamsF = extractPluginParamsFromProps({
-      props,
-      plugins: DEFAULT_TREE_VIEW_PLUGINS,
-      rootRef: ref
-    }),
-    {
-      pluginParams,
-      otherProps: {
-        slots,
-        slotProps
-      }
-    } = _extractPluginParamsF,
-    otherProps = _objectWithoutPropertiesLoose(_extractPluginParamsF.otherProps, _excluded);
+  const {
+    pluginParams,
+    slots,
+    slotProps,
+    otherProps
+  } = extractPluginParamsFromProps({
+    props,
+    plugins: DEFAULT_TREE_VIEW_PLUGINS,
+    rootRef: ref
+  });
   const {
     getRootProps,
     contextValue,
@@ -141,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 = ["slots", "slotProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled, useThemeProps } from '@mui/material/styles';
@@ -56,20 +54,18 @@ const SimpleTreeView = /*#__PURE__*/React.forwardRef(function SimpleTreeView(inP
       itemsPropWarning();
     }
   }
-  const _extractPluginParamsF = extractPluginParamsFromProps({
-      props: _extends({}, props, {
-        items: EMPTY_ITEMS
-      }),
-      plugins: SIMPLE_TREE_VIEW_PLUGINS,
-      rootRef: ref
+  const {
+    pluginParams,
+    slots,
+    slotProps,
+    otherProps
+  } = extractPluginParamsFromProps({
+    props: _extends({}, props, {
+      items: EMPTY_ITEMS
     }),
-    {
-      pluginParams,
-      otherProps: {
-        slots
-      }
-    } = _extractPluginParamsF,
-    otherProps = _objectWithoutPropertiesLoose(_extractPluginParamsF.otherProps, _excluded);
+    plugins: SIMPLE_TREE_VIEW_PLUGINS,
+    rootRef: ref
+  });
   const {
     getRootProps,
     contextValue
@@ -78,7 +74,7 @@ const SimpleTreeView = /*#__PURE__*/React.forwardRef(function SimpleTreeView(inP
   const Root = slots?.root ?? SimpleTreeViewRoot;
   const rootProps = useSlotProps({
     elementType: Root,
-    externalSlotProps: {},
+    externalSlotProps: slotProps?.root,
     externalForwardedProps: otherProps,
     className: classes.root,
     getSlotProps: getRootProps,
@@ -102,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';

package/{TreeItem/useTreeItem.js → modern/TreeItem/useTreeItemState.js}

@@ -1,8 +1,10 @@
 import { useTreeViewContext } from '../internals/TreeViewProvider/useTreeViewContext';
-export function useTreeItem(nodeId) {
+export function useTreeItemState(nodeId) {
   const {
     instance,
-    multiSelect
+    selection: {
+      multiSelect
+    }
   } = useTreeViewContext();
   const expandable = instance.isNodeExpandable(nodeId);
   const expanded = instance.isNodeExpanded(nodeId);

package/modern/TreeView/TreeView.js

@@ -72,34 +72,13 @@ process.env.NODE_ENV !== "production" ? TreeView.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/icons/icons.js

@@ -0,0 +1,9 @@
+import { createSvgIcon } from '@mui/material/utils';
+import * as React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+export const TreeViewExpandIcon = createSvgIcon( /*#__PURE__*/_jsx("path", {
+  d: "M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"
+}), 'TreeViewExpandIcon');
+export const TreeViewCollapseIcon = createSvgIcon( /*#__PURE__*/_jsx("path", {
+  d: "M16.59 8.59 12 13.17 7.41 8.59 6 10l6 6 6-6z"
+}), 'TreeViewCollapseIcon');

package/modern/icons/index.js

@@ -0,0 +1 @@
+export * from './icons';

package/modern/index.js

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

package/modern/internals/index.js

@@ -0,0 +1,4 @@
+export { useTreeView } from './useTreeView';
+export { TreeViewProvider } from './TreeViewProvider';
+export { DEFAULT_TREE_VIEW_PLUGINS } from './plugins/defaultPlugins';
+export { extractPluginParamsFromProps } from './utils/extractPluginParamsFromProps';

package/modern/internals/plugins/defaultPlugins.js

@@ -4,7 +4,7 @@ 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 = [useTreeViewId, useTreeViewNodes, useTreeViewExpansion, useTreeViewSelection, useTreeViewFocus, useTreeViewKeyboardNavigation, useTreeViewContextValueBuilder];
+import { useTreeViewIcons } from './useTreeViewIcons';
+export const DEFAULT_TREE_VIEW_PLUGINS = [useTreeViewId, useTreeViewNodes, useTreeViewExpansion, useTreeViewSelection, useTreeViewFocus, useTreeViewKeyboardNavigation, useTreeViewIcons];
 
 // We can't infer this type from the plugin, otherwise we would lose the generics.

package/modern/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js

@@ -7,6 +7,10 @@ export const useTreeViewExpansion = ({
   params,
   models
 }) => {
+  const setExpandedNodes = (event, value) => {
+    params.onExpandedNodesChange?.(event, value);
+    models.expandedNodes.setControlledValue(value);
+  };
   const isNodeExpanded = React.useCallback(nodeId => {
     return Array.isArray(models.expandedNodes.value) ? models.expandedNodes.value.indexOf(nodeId) !== -1 : false;
   }, [models.expandedNodes.value]);
@@ -25,10 +29,7 @@ export const useTreeViewExpansion = ({
     if (params.onNodeExpansionToggle) {
       params.onNodeExpansionToggle(event, nodeId, !isExpandedBefore);
     }
-    if (params.onExpandedNodesChange) {
-      params.onExpandedNodesChange(event, newExpanded);
-    }
-    models.expandedNodes.setValue(newExpanded);
+    setExpandedNodes(event, newExpanded);
   });
   const expandAllSiblings = (event, nodeId) => {
     const node = instance.getNode(nodeId);
@@ -41,10 +42,7 @@ export const useTreeViewExpansion = ({
           params.onNodeExpansionToggle(event, newlyExpandedNodeId, true);
         });
       }
-      if (params.onExpandedNodesChange) {
-        params.onExpandedNodesChange(event, newExpanded);
-      }
-      models.expandedNodes.setValue(newExpanded);
+      setExpandedNodes(event, newExpanded);
     }
   };
   populateInstance(instance, {
@@ -56,8 +54,7 @@ export const useTreeViewExpansion = ({
 };
 useTreeViewExpansion.models = {
   expandedNodes: {
-    controlledProp: 'expandedNodes',
-    defaultProp: 'defaultExpandedNodes'
+    getDefaultValue: params => params.defaultExpandedNodes
   }
 };
 const DEFAULT_EXPANDED_NODES = [];

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

@@ -85,9 +85,6 @@ export const useTreeViewFocus = ({
 useTreeViewFocus.getInitialState = () => ({
   focusedNodeId: null
 });
-useTreeViewFocus.getDefaultizedParams = params => _extends({}, params, {
-  disabledItemsFocusable: params.disabledItemsFocusable ?? false
-});
 useTreeViewFocus.params = {
   onNodeFocus: true
 };

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

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

package/modern/internals/plugins/useTreeViewIcons/useTreeViewIcons.js

@@ -0,0 +1,22 @@
+export const useTreeViewIcons = ({
+  slots,
+  slotProps
+}) => {
+  return {
+    contextValue: {
+      icons: {
+        slots: {
+          collapseIcon: slots.collapseIcon,
+          expandIcon: slots.expandIcon,
+          endIcon: slots.endIcon
+        },
+        slotProps: {
+          collapseIcon: slotProps.collapseIcon,
+          expandIcon: slotProps.expandIcon,
+          endIcon: slotProps.endIcon
+        }
+      }
+    }
+  };
+};
+useTreeViewIcons.params = {};