@mui/x-tree-view 7.11.0 → 7.12.0

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

@@ -4,7 +4,7 @@ import useEventCallback from '@mui/utils/useEventCallback';
 import useForkRef from '@mui/utils/useForkRef';
 import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import { publishTreeViewEvent } from '../../utils/publishTreeViewEvent';
-import { useTreeViewContext } from '../../TreeViewProvider/useTreeViewContext';
+import { useTreeViewContext } from '../../TreeViewProvider';
 import { TreeViewChildrenItemContext, TreeViewChildrenItemProvider } from '../../TreeViewProvider/TreeViewChildrenItemProvider';
 import { buildSiblingIndexes, TREE_VIEW_ROOT_PARENT_ID } from '../useTreeViewItems/useTreeViewItems.utils';
 import { TreeViewItemDepthContext } from '../../TreeViewItemDepthContext';

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useRtl } from '@mui/system/RtlProvider';
 import useEventCallback from '@mui/utils/useEventCallback';
-import { getFirstNavigableItem, getLastNavigableItem, getNextNavigableItem, getPreviousNavigableItem } from '../../utils/tree';
+import { getFirstNavigableItem, getLastNavigableItem, getNextNavigableItem, getPreviousNavigableItem, isTargetInDescendants } from '../../utils/tree';
 function isPrintableCharacter(string) {
   return !!string && string.length === 1 && !!string.match(/\S/);
 }
@@ -60,7 +60,7 @@ export const useTreeViewKeyboardNavigation = ({
     if (event.defaultMuiPrevented) {
       return;
     }
-    if (event.altKey || event.currentTarget !== event.target.closest('*[role="treeitem"]')) {
+    if (event.altKey || isTargetInDescendants(event.target, event.currentTarget)) {
       return;
     }
     const ctrlPressed = event.ctrlKey || event.metaKey;

package/modern/internals/useTreeView/useTreeViewBuildContext.js

@@ -7,6 +7,8 @@ export const useTreeViewBuildContext = ({
   const runItemPlugins = itemPluginProps => {
     let finalRootRef = null;
     let finalContentRef = null;
+    const pluginPropEnhancers = [];
+    const pluginPropEnhancersNames = {};
     plugins.forEach(plugin => {
       if (!plugin.itemPlugin) {
         return;
@@ -22,10 +24,30 @@ export const useTreeViewBuildContext = ({
       if (itemPluginResponse?.contentRef) {
         finalContentRef = itemPluginResponse.contentRef;
       }
+      if (itemPluginResponse?.propsEnhancers) {
+        pluginPropEnhancers.push(itemPluginResponse.propsEnhancers);
+
+        // Prepare a list of all the slots which are enhanced by at least one plugin
+        Object.keys(itemPluginResponse.propsEnhancers).forEach(propsEnhancerName => {
+          pluginPropEnhancersNames[propsEnhancerName] = true;
+        });
+      }
     });
+    const resolvePropsEnhancer = currentSlotName => currentSlotParams => {
+      const enhancedProps = {};
+      pluginPropEnhancers.forEach(propsEnhancersForCurrentPlugin => {
+        const propsEnhancerForCurrentPluginAndSlot = propsEnhancersForCurrentPlugin[currentSlotName];
+        if (propsEnhancerForCurrentPluginAndSlot != null) {
+          Object.assign(enhancedProps, propsEnhancerForCurrentPluginAndSlot(currentSlotParams));
+        }
+      });
+      return enhancedProps;
+    };
+    const propsEnhancers = Object.fromEntries(Object.keys(pluginPropEnhancersNames).map(propEnhancerName => [propEnhancerName, resolvePropsEnhancer(propEnhancerName)]));
     return {
       contentRef: finalContentRef,
-      rootRef: finalRootRef
+      rootRef: finalRootRef,
+      propsEnhancers
     };
   };
   const wrapItem = ({

package/modern/internals/utils/tree.js

@@ -181,4 +181,15 @@ export const getAllNavigableItems = instance => {
     item = getNextNavigableItem(instance, item);
   }
   return navigableItems;
+};
+
+/**
+ * Checks if the target is in a descendant of this item.
+ * This can prevent from firing some logic on the ancestors on the interacted item when the event handler is on the root.
+ * @param {HTMLElement} target The target to check
+ * @param {HTMLElement | null} itemRoot The root of the item to check if the event target is in its descendants
+ * @returns {boolean} Whether the target is in a descendant of this item
+ */
+export const isTargetInDescendants = (target, itemRoot) => {
+  return itemRoot !== target.closest('*[role="treeitem"]');
 };

package/modern/internals/utils/warning.js

@@ -1,14 +1,21 @@
-export const buildWarning = (message, gravity = 'warning') => {
-  let alreadyWarned = false;
+const warnedOnceCache = new Set();
+
+// TODO move to @mui/x-internals
+// TODO eventually move to @base_ui/internals. Base UI, etc. too need this helper.
+export function warnOnce(message, gravity = 'warning') {
+  if (process.env.NODE_ENV === 'production') {
+    return;
+  }
   const cleanMessage = Array.isArray(message) ? message.join('\n') : message;
-  return () => {
-    if (!alreadyWarned) {
-      alreadyWarned = true;
-      if (gravity === 'error') {
-        console.error(cleanMessage);
-      } else {
-        console.warn(cleanMessage);
-      }
+  if (!warnedOnceCache.has(cleanMessage)) {
+    warnedOnceCache.add(cleanMessage);
+    if (gravity === 'error') {
+      console.error(cleanMessage);
+    } else {
+      console.warn(cleanMessage);
     }
-  };
-};
+  }
+}
+export function clearWarningsCache() {
+  warnedOnceCache.clear();
+}

package/modern/useTreeItem2/useTreeItem2.js

@@ -1,13 +1,18 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { extractEventHandlers } from '@mui/base/utils';
+import extractEventHandlers from '@mui/utils/extractEventHandlers';
 import useForkRef from '@mui/utils/useForkRef';
-import { useTreeViewContext } from '../internals/TreeViewProvider/useTreeViewContext';
+import { useTreeViewContext } from '../internals/TreeViewProvider';
 import { useTreeItem2Utils } from '../hooks/useTreeItem2Utils';
 import { TreeViewItemDepthContext } from '../internals/TreeViewItemDepthContext';
 export const useTreeItem2 = parameters => {
   const {
     runItemPlugins,
+    items: {
+      onItemClick,
+      disabledItemsFocusable,
+      indentationAtItemLevel
+    },
     selection: {
       multiSelect,
       disableSelection,
@@ -16,8 +21,6 @@ export const useTreeItem2 = parameters => {
     expansion: {
       expansionTrigger
     },
-    disabledItemsFocusable,
-    indentationAtItemLevel,
     instance,
     publicAPI
   } = useTreeViewContext();
@@ -31,7 +34,8 @@ export const useTreeItem2 = parameters => {
   } = parameters;
   const {
     rootRef: pluginRootRef,
-    contentRef
+    contentRef,
+    propsEnhancers
   } = runItemPlugins(parameters);
   const {
     interactions,
@@ -40,8 +44,11 @@ export const useTreeItem2 = parameters => {
     itemId,
     children
   });
+  const rootRefObject = React.useRef(null);
+  const contentRefObject = React.useRef(null);
   const idAttribute = instance.getTreeItemIdAttribute(itemId, id);
-  const handleRootRef = useForkRef(rootRef, pluginRootRef);
+  const handleRootRef = useForkRef(rootRef, pluginRootRef, rootRefObject);
+  const handleContentRef = useForkRef(contentRef, contentRefObject);
   const checkboxRef = React.useRef(null);
   const createRootHandleFocus = otherHandlers => event => {
     otherHandlers.onFocus?.(event);
@@ -69,6 +76,7 @@ export const useTreeItem2 = parameters => {
   };
   const createContentHandleClick = otherHandlers => event => {
     otherHandlers.onClick?.(event);
+    onItemClick?.(event, itemId);
     if (event.defaultMuiPrevented || checkboxRef.current?.contains(event.target)) {
       return;
     }
@@ -123,7 +131,7 @@ export const useTreeItem2 = parameters => {
        */
       ariaSelected = true;
     }
-    const response = _extends({}, externalEventHandlers, {
+    const props = _extends({}, externalEventHandlers, {
       ref: handleRootRef,
       role: 'treeitem',
       tabIndex: instance.canItemBeTabbed(itemId) ? 0 : -1,
@@ -137,24 +145,34 @@ export const useTreeItem2 = parameters => {
       onKeyDown: createRootHandleKeyDown(externalEventHandlers)
     });
     if (indentationAtItemLevel) {
-      response.style = {
+      props.style = {
         '--TreeView-itemDepth': typeof depthContext === 'function' ? depthContext(itemId) : depthContext
       };
     }
-    return response;
+    const enhancedRootProps = propsEnhancers.root?.({
+      rootRefObject,
+      contentRefObject,
+      externalEventHandlers
+    }) ?? {};
+    return _extends({}, props, enhancedRootProps);
   };
   const getContentProps = (externalProps = {}) => {
     const externalEventHandlers = extractEventHandlers(externalProps);
-    const response = _extends({}, externalEventHandlers, externalProps, {
-      ref: contentRef,
+    const props = _extends({}, externalEventHandlers, externalProps, {
+      ref: handleContentRef,
       onClick: createContentHandleClick(externalEventHandlers),
       onMouseDown: createContentHandleMouseDown(externalEventHandlers),
       status
     });
     if (indentationAtItemLevel) {
-      response.indentationAtItemLevel = true;
-    }
-    return response;
+      props.indentationAtItemLevel = true;
+    }
+    const enhancedContentProps = propsEnhancers.content?.({
+      rootRefObject,
+      contentRefObject,
+      externalEventHandlers
+    }) ?? {};
+    return _extends({}, props, enhancedContentProps);
   };
   const getCheckboxProps = (externalProps = {}) => {
     const externalEventHandlers = extractEventHandlers(externalProps);
@@ -169,7 +187,7 @@ export const useTreeItem2 = parameters => {
     });
   };
   const getLabelProps = (externalProps = {}) => {
-    const externalEventHandlers = _extends({}, extractEventHandlers(parameters), extractEventHandlers(externalProps));
+    const externalEventHandlers = _extends({}, extractEventHandlers(externalProps));
     return _extends({}, externalEventHandlers, {
       children: label
     }, externalProps);
@@ -194,6 +212,15 @@ export const useTreeItem2 = parameters => {
     }
     return response;
   };
+  const getDragAndDropOverlayProps = (externalProps = {}) => {
+    const externalEventHandlers = _extends({}, extractEventHandlers(externalProps));
+    const enhancedDragAndDropOverlayProps = propsEnhancers.dragAndDropOverlay?.({
+      rootRefObject,
+      contentRefObject,
+      externalEventHandlers
+    }) ?? {};
+    return _extends({}, externalProps, enhancedDragAndDropOverlayProps);
+  };
   return {
     getRootProps,
     getContentProps,
@@ -201,6 +228,7 @@ export const useTreeItem2 = parameters => {
     getIconContainerProps,
     getCheckboxProps,
     getLabelProps,
+    getDragAndDropOverlayProps,
     rootRef: handleRootRef,
     status,
     publicAPI

package/node/RichTreeView/RichTreeView.js

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
-var _utils = require("@mui/base/utils");
+var _useSlotProps = _interopRequireDefault(require("@mui/utils/useSlotProps"));
 var _richTreeViewClasses = require("./richTreeViewClasses");
 var _zeroStyled = require("../internals/zero-styled");
 var _useTreeView = require("../internals/useTreeView");
@@ -50,7 +50,7 @@ function WrappedTreeItem({
   children
 }) {
   const Item = slots?.item ?? _TreeItem.TreeItem;
-  const itemProps = (0, _utils.useSlotProps)({
+  const itemProps = (0, _useSlotProps.default)({
     elementType: Item,
     externalSlotProps: slotProps?.item,
     additionalProps: {
@@ -67,7 +67,6 @@ function WrappedTreeItem({
     children: children
   }));
 }
-const childrenWarning = (0, _warning.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://mui.com/x/react-tree-view/rich-tree-view/items/']);
 
 /**
  *
@@ -86,7 +85,7 @@ const RichTreeView = exports.RichTreeView = /*#__PURE__*/React.forwardRef(functi
   });
   if (process.env.NODE_ENV !== 'production') {
     if (props.children != null) {
-      childrenWarning();
+      (0, _warning.warnOnce)(['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://mui.com/x/react-tree-view/rich-tree-view/items/.']);
     }
   }
   const {
@@ -104,7 +103,7 @@ const RichTreeView = exports.RichTreeView = /*#__PURE__*/React.forwardRef(functi
   } = props;
   const classes = useUtilityClasses(props);
   const Root = slots?.root ?? RichTreeViewRoot;
-  const rootProps = (0, _utils.useSlotProps)({
+  const rootProps = (0, _useSlotProps.default)({
     elementType: Root,
     externalSlotProps: slotProps?.root,
     className: classes.root,
@@ -251,6 +250,12 @@ process.env.NODE_ENV !== "production" ? RichTreeView.propTypes = {
    * @param {array} itemIds The ids of the expanded items.
    */
   onExpandedItemsChange: _propTypes.default.func,
+  /**
+   * Callback fired when the `content` slot of a given tree item is clicked.
+   * @param {React.MouseEvent} event The DOM event that triggered the change.
+   * @param {string} itemId The id of the focused item.
+   */
+  onItemClick: _propTypes.default.func,
   /**
    * Callback fired when a tree item is expanded or collapsed.
    * @param {React.SyntheticEvent} event The DOM event that triggered the change.
@@ -259,10 +264,9 @@ process.env.NODE_ENV !== "production" ? RichTreeView.propTypes = {
    */
   onItemExpansionToggle: _propTypes.default.func,
   /**
-   * Callback fired when tree items are focused.
-   * @param {React.SyntheticEvent} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
+   * Callback fired when a given tree item is focused.
+   * @param {React.SyntheticEvent | null} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
    * @param {string} itemId The id of the focused item.
-   * @param {string} value of the focused item.
    */
   onItemFocus: _propTypes.default.func,
   /**

package/node/SimpleTreeView/SimpleTreeView.js

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
-var _utils = require("@mui/base/utils");
+var _useSlotProps = _interopRequireDefault(require("@mui/utils/useSlotProps"));
 var _zeroStyled = require("../internals/zero-styled");
 var _simpleTreeViewClasses = require("./simpleTreeViewClasses");
 var _useTreeView = require("../internals/useTreeView");
@@ -41,7 +41,6 @@ const SimpleTreeViewRoot = exports.SimpleTreeViewRoot = (0, _zeroStyled.styled)(
   position: 'relative'
 });
 const EMPTY_ITEMS = [];
-const itemsPropWarning = (0, _warning.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://mui.com/x/react-tree-view/simple-tree-view/items/']);
 
 /**
  *
@@ -61,7 +60,7 @@ const SimpleTreeView = exports.SimpleTreeView = /*#__PURE__*/React.forwardRef(fu
   const ownerState = props;
   if (process.env.NODE_ENV !== 'production') {
     if (props.items != null) {
-      itemsPropWarning();
+      (0, _warning.warnOnce)(['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://mui.com/x/react-tree-view/simple-tree-view/items/.']);
     }
   }
   const {
@@ -80,7 +79,7 @@ const SimpleTreeView = exports.SimpleTreeView = /*#__PURE__*/React.forwardRef(fu
   } = props;
   const classes = useUtilityClasses(props);
   const Root = slots?.root ?? SimpleTreeViewRoot;
-  const rootProps = (0, _utils.useSlotProps)({
+  const rootProps = (0, _useSlotProps.default)({
     elementType: Root,
     externalSlotProps: slotProps?.root,
     className: classes.root,
@@ -187,6 +186,12 @@ process.env.NODE_ENV !== "production" ? SimpleTreeView.propTypes = {
    * @param {array} itemIds The ids of the expanded items.
    */
   onExpandedItemsChange: _propTypes.default.func,
+  /**
+   * Callback fired when the `content` slot of a given tree item is clicked.
+   * @param {React.MouseEvent} event The DOM event that triggered the change.
+   * @param {string} itemId The id of the focused item.
+   */
+  onItemClick: _propTypes.default.func,
   /**
    * Callback fired when a tree item is expanded or collapsed.
    * @param {React.SyntheticEvent} event The DOM event that triggered the change.
@@ -195,10 +200,9 @@ process.env.NODE_ENV !== "production" ? SimpleTreeView.propTypes = {
    */
   onItemExpansionToggle: _propTypes.default.func,
   /**
-   * Callback fired when tree items are focused.
-   * @param {React.SyntheticEvent} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
+   * Callback fired when a given tree item is focused.
+   * @param {React.SyntheticEvent | null} event The DOM event that triggered the change. **Warning**: This is a generic event not a focus event.
    * @param {string} itemId The id of the focused item.
-   * @param {string} value of the focused item.
    */
   onItemFocus: _propTypes.default.func,
   /**

package/node/TreeItem/TreeItem.js

@@ -11,17 +11,19 @@ var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _Collapse = _interopRequireDefault(require("@mui/material/Collapse"));
-var _utils = require("@mui/base/utils");
 var _useForkRef = _interopRequireDefault(require("@mui/utils/useForkRef"));
 var _createStyled = require("@mui/system/createStyled");
 var _styles = require("@mui/material/styles");
+var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
+var _extractEventHandlers = _interopRequireDefault(require("@mui/utils/extractEventHandlers"));
+var _resolveComponentProps = _interopRequireDefault(require("@mui/utils/resolveComponentProps"));
+var _useSlotProps4 = _interopRequireDefault(require("@mui/utils/useSlotProps"));
 var _unsupportedProp = _interopRequireDefault(require("@mui/utils/unsupportedProp"));
 var _elementTypeAcceptingRef = _interopRequireDefault(require("@mui/utils/elementTypeAcceptingRef"));
-var _base = require("@mui/base");
 var _zeroStyled = require("../internals/zero-styled");
 var _TreeItemContent = require("./TreeItemContent");
 var _treeItemClasses = require("./treeItemClasses");
-var _useTreeViewContext = require("../internals/TreeViewProvider/useTreeViewContext");
+var _TreeViewProvider = require("../internals/TreeViewProvider");
 var _icons = require("../icons");
 var _TreeItem2Provider = require("../TreeItem2Provider");
 var _TreeViewItemDepthContext = require("../internals/TreeViewItemDepthContext");
@@ -50,7 +52,7 @@ const useUtilityClasses = ownerState => {
     label: ['label'],
     groupTransition: ['groupTransition']
   };
-  return (0, _base.unstable_composeClasses)(slots, _treeItemClasses.getTreeItemUtilityClass, classes);
+  return (0, _composeClasses.default)(slots, _treeItemClasses.getTreeItemUtilityClass, classes);
 };
 const TreeItemRoot = (0, _zeroStyled.styled)('li', {
   name: 'MuiTreeItem',
@@ -81,6 +83,7 @@ const StyledTreeItemContent = (0, _zeroStyled.styled)(_TreeItemContent.TreeItemC
   width: '100%',
   boxSizing: 'border-box',
   // prevent width + padding to overflow
+  position: 'relative',
   display: 'flex',
   alignItems: 'center',
   gap: theme.spacing(1),
@@ -175,16 +178,18 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
   const {
     icons: contextIcons,
     runItemPlugins,
+    items: {
+      disabledItemsFocusable,
+      indentationAtItemLevel
+    },
     selection: {
       multiSelect
     },
     expansion: {
       expansionTrigger
     },
-    disabledItemsFocusable,
-    indentationAtItemLevel,
     instance
-  } = (0, _useTreeViewContext.useTreeViewContext)();
+  } = (0, _TreeViewProvider.useTreeViewContext)();
   const depthContext = React.useContext(_TreeViewItemDepthContext.TreeViewItemDepthContext);
   const props = useThemeProps({
     props: inProps,
@@ -215,10 +220,13 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
   } = (0, _useTreeItemState.useTreeItemState)(itemId);
   const {
     contentRef,
-    rootRef
+    rootRef,
+    propsEnhancers
   } = runItemPlugins(props);
-  const handleRootRef = (0, _useForkRef.default)(inRef, rootRef);
-  const handleContentRef = (0, _useForkRef.default)(ContentProps?.ref, contentRef);
+  const rootRefObject = React.useRef(null);
+  const contentRefObject = React.useRef(null);
+  const handleRootRef = (0, _useForkRef.default)(inRef, rootRef, rootRefObject);
+  const handleContentRef = (0, _useForkRef.default)(ContentProps?.ref, contentRef, contentRefObject);
   const slots = {
     expandIcon: inSlots?.expandIcon ?? contextIcons.slots.expandIcon ?? _icons.TreeViewExpandIcon,
     collapseIcon: inSlots?.collapseIcon ?? contextIcons.slots.collapseIcon ?? _icons.TreeViewCollapseIcon,
@@ -242,7 +250,7 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
   });
   const classes = useUtilityClasses(ownerState);
   const GroupTransition = slots.groupTransition ?? undefined;
-  const groupTransitionProps = (0, _utils.useSlotProps)({
+  const groupTransitionProps = (0, _useSlotProps4.default)({
     elementType: GroupTransition,
     ownerState: {},
     externalSlotProps: inSlotProps?.groupTransition,
@@ -262,14 +270,14 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
     }
   };
   const ExpansionIcon = expanded ? slots.collapseIcon : slots.expandIcon;
-  const _useSlotProps = (0, _utils.useSlotProps)({
+  const _useSlotProps = (0, _useSlotProps4.default)({
       elementType: ExpansionIcon,
       ownerState: {},
       externalSlotProps: tempOwnerState => {
         if (expanded) {
-          return (0, _extends2.default)({}, (0, _utils.resolveComponentProps)(contextIcons.slotProps.collapseIcon, tempOwnerState), (0, _utils.resolveComponentProps)(inSlotProps?.collapseIcon, tempOwnerState));
+          return (0, _extends2.default)({}, (0, _resolveComponentProps.default)(contextIcons.slotProps.collapseIcon, tempOwnerState), (0, _resolveComponentProps.default)(inSlotProps?.collapseIcon, tempOwnerState));
         }
-        return (0, _extends2.default)({}, (0, _utils.resolveComponentProps)(contextIcons.slotProps.expandIcon, tempOwnerState), (0, _utils.resolveComponentProps)(inSlotProps?.expandIcon, tempOwnerState));
+        return (0, _extends2.default)({}, (0, _resolveComponentProps.default)(contextIcons.slotProps.expandIcon, tempOwnerState), (0, _resolveComponentProps.default)(inSlotProps?.expandIcon, tempOwnerState));
       },
       additionalProps: {
         onClick: handleIconContainerClick
@@ -278,20 +286,20 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
     expansionIconProps = (0, _objectWithoutPropertiesLoose2.default)(_useSlotProps, _excluded2);
   const expansionIcon = expandable && !!ExpansionIcon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ExpansionIcon, (0, _extends2.default)({}, expansionIconProps)) : null;
   const DisplayIcon = expandable ? undefined : slots.endIcon;
-  const _useSlotProps2 = (0, _utils.useSlotProps)({
+  const _useSlotProps2 = (0, _useSlotProps4.default)({
       elementType: DisplayIcon,
       ownerState: {},
       externalSlotProps: tempOwnerState => {
         if (expandable) {
           return {};
         }
-        return (0, _extends2.default)({}, (0, _utils.resolveComponentProps)(contextIcons.slotProps.endIcon, tempOwnerState), (0, _utils.resolveComponentProps)(inSlotProps?.endIcon, tempOwnerState));
+        return (0, _extends2.default)({}, (0, _resolveComponentProps.default)(contextIcons.slotProps.endIcon, tempOwnerState), (0, _resolveComponentProps.default)(inSlotProps?.endIcon, tempOwnerState));
       }
     }),
     displayIconProps = (0, _objectWithoutPropertiesLoose2.default)(_useSlotProps2, _excluded3);
   const displayIcon = DisplayIcon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(DisplayIcon, (0, _extends2.default)({}, displayIconProps)) : null;
   const Icon = slots.icon;
-  const _useSlotProps3 = (0, _utils.useSlotProps)({
+  const _useSlotProps3 = (0, _useSlotProps4.default)({
       elementType: Icon,
       ownerState: {},
       externalSlotProps: inSlotProps?.icon
@@ -326,6 +334,21 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
   };
   const idAttribute = instance.getTreeItemIdAttribute(itemId, id);
   const tabIndex = instance.canItemBeTabbed(itemId) ? 0 : -1;
+  const enhancedRootProps = propsEnhancers.root?.({
+    rootRefObject,
+    contentRefObject,
+    externalEventHandlers: (0, _extractEventHandlers.default)(other)
+  }) ?? {};
+  const enhancedContentProps = propsEnhancers.content?.({
+    rootRefObject,
+    contentRefObject,
+    externalEventHandlers: (0, _extractEventHandlers.default)(ContentProps)
+  }) ?? {};
+  const enhancedDragAndDropOverlayProps = propsEnhancers.dragAndDropOverlay?.({
+    rootRefObject,
+    contentRefObject,
+    externalEventHandlers: {}
+  }) ?? {};
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeItem2Provider.TreeItem2Provider, {
     itemId: itemId,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(TreeItemRoot, (0, _extends2.default)({
@@ -344,7 +367,8 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
       ref: handleRootRef,
       style: indentationAtItemLevel ? (0, _extends2.default)({}, other.style, {
         '--TreeView-itemDepth': typeof depthContext === 'function' ? depthContext(itemId) : depthContext
-      }) : other.style,
+      }) : other.style
+    }, enhancedRootProps, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(StyledTreeItemContent, (0, _extends2.default)({
         as: ContentComponent,
         classes: {
@@ -365,7 +389,9 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
         expansionIcon: expansionIcon,
         displayIcon: displayIcon,
         ownerState: ownerState
-      }, ContentProps, {
+      }, ContentProps, enhancedContentProps, enhancedDragAndDropOverlayProps.action == null ? {} : {
+        dragAndDropOverlayProps: enhancedDragAndDropOverlayProps
+      }, {
         ref: handleContentRef
       })), children && /*#__PURE__*/(0, _jsxRuntime.jsx)(TreeItemGroup, (0, _extends2.default)({
         as: GroupTransition

package/node/TreeItem/TreeItemContent.js

@@ -12,8 +12,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
 var _useTreeItemState = require("./useTreeItemState");
+var _TreeItem2DragAndDropOverlay = require("../TreeItem2DragAndDropOverlay");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["classes", "className", "displayIcon", "expansionIcon", "icon", "label", "itemId", "onClick", "onMouseDown"];
+const _excluded = ["classes", "className", "displayIcon", "expansionIcon", "icon", "label", "itemId", "onClick", "onMouseDown", "dragAndDropOverlayProps"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
@@ -29,7 +30,8 @@ const TreeItemContent = exports.TreeItemContent = /*#__PURE__*/React.forwardRef(
       label,
       itemId,
       onClick,
-      onMouseDown
+      onMouseDown,
+      dragAndDropOverlayProps
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const {
@@ -42,6 +44,7 @@ const TreeItemContent = exports.TreeItemContent = /*#__PURE__*/React.forwardRef(
     handleExpansion,
     handleSelection,
     handleCheckboxSelection,
+    handleContentClick,
     preventSelection,
     expansionTrigger
   } = (0, _useTreeItemState.useTreeItemState)(itemId);
@@ -54,6 +57,7 @@ const TreeItemContent = exports.TreeItemContent = /*#__PURE__*/React.forwardRef(
     }
   };
   const handleClick = event => {
+    handleContentClick?.(event, itemId);
     if (checkboxRef.current?.contains(event.target)) {
       return;
     }
@@ -88,7 +92,7 @@ const TreeItemContent = exports.TreeItemContent = /*#__PURE__*/React.forwardRef(
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: classes.label,
         children: label
-      })]
+      }), dragAndDropOverlayProps && /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeItem2DragAndDropOverlay.TreeItem2DragAndDropOverlay, (0, _extends2.default)({}, dragAndDropOverlayProps))]
     }))
   );
 });
@@ -106,6 +110,10 @@ process.env.NODE_ENV !== "production" ? TreeItemContent.propTypes = {
    * The icon to display next to the tree item's label. Either a parent or end icon.
    */
   displayIcon: _propTypes.default.node,
+  dragAndDropOverlayProps: _propTypes.default.shape({
+    action: _propTypes.default.oneOf(['make-child', 'move-to-parent', 'reorder-above', 'reorder-below']),
+    style: _propTypes.default.object
+  }),
   /**
    * The icon to display next to the tree item's label. Either an expansion or collapse icon.
    */

package/node/TreeItem/treeItemClasses.js

@@ -11,4 +11,4 @@ var _generateUtilityClasses = _interopRequireDefault(require("@mui/utils/generat
 function getTreeItemUtilityClass(slot) {
   return (0, _generateUtilityClass.default)('MuiTreeItem', slot);
 }
-const treeItemClasses = exports.treeItemClasses = (0, _generateUtilityClasses.default)('MuiTreeItem', ['root', 'groupTransition', 'content', 'expanded', 'selected', 'focused', 'disabled', 'iconContainer', 'label', 'checkbox']);
+const treeItemClasses = exports.treeItemClasses = (0, _generateUtilityClasses.default)('MuiTreeItem', ['root', 'groupTransition', 'content', 'expanded', 'selected', 'focused', 'disabled', 'iconContainer', 'label', 'checkbox', 'dragAndDropOverlay']);

package/node/TreeItem/useTreeItemState.js

@@ -4,10 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useTreeItemState = useTreeItemState;
-var _useTreeViewContext = require("../internals/TreeViewProvider/useTreeViewContext");
+var _TreeViewProvider = require("../internals/TreeViewProvider");
 function useTreeItemState(itemId) {
   const {
     instance,
+    items: {
+      onItemClick
+    },
     selection: {
       multiSelect,
       checkboxSelection,
@@ -16,7 +19,7 @@ function useTreeItemState(itemId) {
     expansion: {
       expansionTrigger
     }
-  } = (0, _useTreeViewContext.useTreeViewContext)();
+  } = (0, _TreeViewProvider.useTreeViewContext)();
   const expandable = instance.isItemExpandable(itemId);
   const expanded = instance.isItemExpanded(itemId);
   const focused = instance.isItemFocused(itemId);
@@ -92,6 +95,7 @@ function useTreeItemState(itemId) {
     handleExpansion,
     handleSelection,
     handleCheckboxSelection,
+    handleContentClick: onItemClick,
     preventSelection,
     expansionTrigger
   };