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

package/modern/TreeItem/TreeItem.js

@@ -9,6 +9,7 @@ import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import Collapse from '@mui/material/Collapse';
 import { resolveComponentProps, useSlotProps } from '@mui/base/utils';
+import useForkRef from '@mui/utils/useForkRef';
 import { alpha, styled, useThemeProps } from '@mui/material/styles';
 import unsupportedProp from '@mui/utils/unsupportedProp';
 import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef';
@@ -17,6 +18,7 @@ import { TreeItemContent } from './TreeItemContent';
 import { treeItemClasses, getTreeItemUtilityClass } from './treeItemClasses';
 import { useTreeViewContext } from '../internals/TreeViewProvider/useTreeViewContext';
 import { TreeViewCollapseIcon, TreeViewExpandIcon } from '../icons';
+import { TreeItem2Provider } from '../TreeItem2Provider';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
@@ -144,18 +146,10 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
     disabledItemsFocusable,
     instance
   } = useTreeViewContext();
-  const inPropsWithTheme = useThemeProps({
+  const props = useThemeProps({
     props: inProps,
     name: 'MuiTreeItem'
   });
-  const {
-    props,
-    ref,
-    wrapItem
-  } = runItemPlugins({
-    props: inPropsWithTheme,
-    ref: inRef
-  });
   const {
       children,
       className,
@@ -170,6 +164,12 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
       onMouseDown
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
+  const {
+    contentRef,
+    rootRef
+  } = runItemPlugins(props);
+  const handleRootRef = useForkRef(inRef, rootRef);
+  const handleContentRef = useForkRef(ContentProps?.ref, contentRef);
   const slots = {
     expandIcon: inSlots?.expandIcon ?? contextIcons.slots.expandIcon ?? TreeViewExpandIcon,
     collapseIcon: inSlots?.collapseIcon ?? contextIcons.slots.collapseIcon ?? TreeViewCollapseIcon,
@@ -261,50 +261,54 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
     }
     const canBeFocused = !disabled || disabledItemsFocusable;
     if (!focused && canBeFocused && event.currentTarget === event.target) {
-      instance.focusNode(event, nodeId);
+      instance.focusItem(event, nodeId);
     }
   }
   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: idAttribute,
-    tabIndex: -1
-  }, other, {
-    ownerState: ownerState,
-    onFocus: handleFocus,
-    ref: ref,
-    children: [/*#__PURE__*/_jsx(StyledTreeItemContent, _extends({
-      as: ContentComponent,
-      classes: {
-        root: classes.content,
-        expanded: classes.expanded,
-        selected: classes.selected,
-        focused: classes.focused,
-        disabled: classes.disabled,
-        iconContainer: classes.iconContainer,
-        label: classes.label
-      },
-      label: label,
-      nodeId: nodeId,
-      onClick: onClick,
-      onMouseDown: onMouseDown,
-      icon: icon,
-      expansionIcon: expansionIcon,
-      displayIcon: displayIcon,
-      ownerState: ownerState
-    }, ContentProps)), children && /*#__PURE__*/_jsx(TreeItemGroup, _extends({
-      as: GroupTransition
-    }, groupTransitionProps, {
-      children: children
-    }))]
-  }));
-  return wrapItem(item);
+  return /*#__PURE__*/_jsx(TreeItem2Provider, {
+    nodeId: nodeId,
+    children: /*#__PURE__*/_jsxs(TreeItemRoot, _extends({
+      className: clsx(classes.root, className),
+      role: "treeitem",
+      "aria-expanded": expandable ? expanded : undefined,
+      "aria-selected": ariaSelected,
+      "aria-disabled": disabled || undefined,
+      id: idAttribute,
+      tabIndex: -1
+    }, other, {
+      ownerState: ownerState,
+      onFocus: handleFocus,
+      ref: handleRootRef,
+      children: [/*#__PURE__*/_jsx(StyledTreeItemContent, _extends({
+        as: ContentComponent,
+        classes: {
+          root: classes.content,
+          expanded: classes.expanded,
+          selected: classes.selected,
+          focused: classes.focused,
+          disabled: classes.disabled,
+          iconContainer: classes.iconContainer,
+          label: classes.label
+        },
+        label: label,
+        nodeId: nodeId,
+        onClick: onClick,
+        onMouseDown: onMouseDown,
+        icon: icon,
+        expansionIcon: expansionIcon,
+        displayIcon: displayIcon,
+        ownerState: ownerState
+      }, ContentProps, {
+        ref: handleContentRef
+      })), children && /*#__PURE__*/_jsx(TreeItemGroup, _extends({
+        as: GroupTransition
+      }, groupTransitionProps, {
+        children: children
+      }))]
+    }))
+  });
 });
-TreeItem.propTypes = {
+process.env.NODE_ENV !== "production" ? TreeItem.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
@@ -328,12 +332,12 @@ TreeItem.propTypes = {
    */
   ContentProps: PropTypes.object,
   /**
-   * If `true`, the node is disabled.
+   * If `true`, the item is disabled.
    * @default false
    */
   disabled: PropTypes.bool,
   /**
-   * The tree node label.
+   * The tree item label.
    */
   label: PropTypes.node,
   /**
@@ -342,7 +346,7 @@ TreeItem.propTypes = {
   nodeId: PropTypes.string.isRequired,
   /**
    * This prop isn't supported.
-   * Use the `onNodeFocus` callback on the tree if you need to monitor a node's focus.
+   * Use the `onItemFocus` callback on the tree if you need to monitor a item's focus.
    */
   onFocus: unsupportedProp,
   /**
@@ -359,4 +363,4 @@ TreeItem.propTypes = {
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */
   sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
-};
+} : void 0;

package/modern/TreeItem/useTreeItemState.js

@@ -14,7 +14,7 @@ export function useTreeItemState(nodeId) {
   const handleExpansion = event => {
     if (!disabled) {
       if (!focused) {
-        instance.focusNode(event, nodeId);
+        instance.focusItem(event, nodeId);
       }
       const multiple = multiSelect && (event.shiftKey || event.ctrlKey || event.metaKey);
 
@@ -27,7 +27,7 @@ export function useTreeItemState(nodeId) {
   const handleSelection = event => {
     if (!disabled) {
       if (!focused) {
-        instance.focusNode(event, nodeId);
+        instance.focusItem(event, nodeId);
       }
       const multiple = multiSelect && (event.shiftKey || event.ctrlKey || event.metaKey);
       if (multiple) {

package/modern/TreeItem2/TreeItem2.js

@@ -0,0 +1,300 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import _extends from "@babel/runtime/helpers/esm/extends";
+const _excluded = ["id", "nodeId", "label", "disabled", "children", "slots", "slotProps"];
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import clsx from 'clsx';
+import unsupportedProp from '@mui/utils/unsupportedProp';
+import { alpha, styled, useThemeProps } from '@mui/material/styles';
+import Collapse from '@mui/material/Collapse';
+import { useSlotProps } from '@mui/base/utils';
+import { shouldForwardProp } from '@mui/system';
+import composeClasses from '@mui/utils/composeClasses';
+import { unstable_useTreeItem2 as useTreeItem2 } from '../useTreeItem2';
+import { getTreeItemUtilityClass, treeItemClasses } from '../TreeItem';
+import { TreeItem2Icon } from '../TreeItem2Icon';
+import { TreeItem2Provider } from '../TreeItem2Provider';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export const TreeItem2Root = styled('li', {
+  name: 'MuiTreeItem2',
+  slot: 'Root',
+  overridesResolver: (props, styles) => styles.root
+})({
+  listStyle: 'none',
+  margin: 0,
+  padding: 0,
+  outline: 0
+});
+export const TreeItem2Content = styled('div', {
+  name: 'MuiTreeItem2',
+  slot: 'Content',
+  overridesResolver: (props, styles) => styles.content,
+  shouldForwardProp: prop => shouldForwardProp(prop) && prop !== 'status'
+})(({
+  theme
+}) => ({
+  padding: theme.spacing(0.5, 1),
+  borderRadius: theme.shape.borderRadius,
+  width: '100%',
+  boxSizing: 'border-box',
+  // prevent width + padding to overflow
+  display: 'flex',
+  alignItems: 'center',
+  gap: theme.spacing(1),
+  cursor: 'pointer',
+  WebkitTapHighlightColor: 'transparent',
+  '&:hover': {
+    backgroundColor: (theme.vars || theme).palette.action.hover,
+    // Reset on touch devices, it doesn't add specificity
+    '@media (hover: none)': {
+      backgroundColor: 'transparent'
+    }
+  },
+  [`& .${treeItemClasses.groupTransition}`]: {
+    margin: 0,
+    padding: 0,
+    paddingLeft: 12
+  },
+  variants: [{
+    props: ({
+      status
+    }) => status.disabled,
+    style: {
+      opacity: (theme.vars || theme).palette.action.disabledOpacity,
+      backgroundColor: 'transparent'
+    }
+  }, {
+    props: ({
+      status
+    }) => status.focused,
+    style: {
+      backgroundColor: (theme.vars || theme).palette.action.focus
+    }
+  }, {
+    props: ({
+      status
+    }) => status.selected,
+    style: {
+      backgroundColor: theme.vars ? `rgba(${theme.vars.palette.primary.mainChannel} / ${theme.vars.palette.action.selectedOpacity})` : alpha(theme.palette.primary.main, theme.palette.action.selectedOpacity),
+      '&:hover': {
+        backgroundColor: theme.vars ? `rgba(${theme.vars.palette.primary.mainChannel} / calc(${theme.vars.palette.action.selectedOpacity} + ${theme.vars.palette.action.hoverOpacity}))` : alpha(theme.palette.primary.main, theme.palette.action.selectedOpacity + theme.palette.action.hoverOpacity),
+        // Reset on touch devices, it doesn't add specificity
+        '@media (hover: none)': {
+          backgroundColor: theme.vars ? `rgba(${theme.vars.palette.primary.mainChannel} / ${theme.vars.palette.action.selectedOpacity})` : alpha(theme.palette.primary.main, theme.palette.action.selectedOpacity)
+        }
+      }
+    }
+  }, {
+    props: ({
+      status
+    }) => status.selected && status.focused,
+    style: {
+      backgroundColor: theme.vars ? `rgba(${theme.vars.palette.primary.mainChannel} / calc(${theme.vars.palette.action.selectedOpacity} + ${theme.vars.palette.action.focusOpacity}))` : alpha(theme.palette.primary.main, theme.palette.action.selectedOpacity + theme.palette.action.focusOpacity)
+    }
+  }]
+}));
+export const TreeItem2Label = styled('div', {
+  name: 'MuiTreeItem2',
+  slot: 'Label',
+  overridesResolver: (props, styles) => styles.label
+})(({
+  theme
+}) => _extends({
+  width: '100%',
+  boxSizing: 'border-box',
+  // prevent width + padding to overflow
+  // fixes overflow - see https://github.com/mui/material-ui/issues/27372
+  minWidth: 0,
+  position: 'relative'
+}, theme.typography.body1));
+export const TreeItem2IconContainer = styled('div', {
+  name: 'MuiTreeItem2',
+  slot: 'IconContainer',
+  overridesResolver: (props, styles) => styles.iconContainer
+})({
+  width: 16,
+  display: 'flex',
+  flexShrink: 0,
+  justifyContent: 'center',
+  '& svg': {
+    fontSize: 18
+  }
+});
+export const TreeItem2GroupTransition = styled(Collapse, {
+  name: 'MuiTreeItem2GroupTransition',
+  slot: 'GroupTransition',
+  overridesResolver: (props, styles) => styles.groupTransition
+})({
+  margin: 0,
+  padding: 0,
+  paddingLeft: 12
+});
+const useUtilityClasses = ownerState => {
+  const {
+    classes
+  } = ownerState;
+  const slots = {
+    root: ['root'],
+    content: ['content'],
+    expanded: ['expanded'],
+    selected: ['selected'],
+    focused: ['focused'],
+    disabled: ['disabled'],
+    iconContainer: ['iconContainer'],
+    label: ['label'],
+    groupTransition: ['groupTransition']
+  };
+  return composeClasses(slots, getTreeItemUtilityClass, classes);
+};
+
+/**
+ *
+ * Demos:
+ *
+ * - [Tree View](https://mui.com/x/react-tree-view/)
+ *
+ * API:
+ *
+ * - [TreeItem2 API](https://mui.com/x/api/tree-view/tree-item-2/)
+ */
+export const TreeItem2 = /*#__PURE__*/React.forwardRef(function TreeItem2(inProps, forwardedRef) {
+  const props = useThemeProps({
+    props: inProps,
+    name: 'MuiTreeItem2'
+  });
+  const {
+      id,
+      nodeId,
+      label,
+      disabled,
+      children,
+      slots = {},
+      slotProps = {}
+    } = props,
+    other = _objectWithoutPropertiesLoose(props, _excluded);
+  const {
+    getRootProps,
+    getContentProps,
+    getIconContainerProps,
+    getLabelProps,
+    getGroupTransitionProps,
+    status
+  } = useTreeItem2({
+    id,
+    nodeId,
+    children,
+    label,
+    disabled
+  });
+  const ownerState = _extends({}, props, status);
+  const classes = useUtilityClasses(ownerState);
+  const Root = slots.root ?? TreeItem2Root;
+  const rootProps = useSlotProps({
+    elementType: Root,
+    getSlotProps: getRootProps,
+    externalForwardedProps: other,
+    externalSlotProps: slotProps.root,
+    additionalProps: {
+      ref: forwardedRef
+    },
+    ownerState: {},
+    className: classes.root
+  });
+  const Content = slots.content ?? TreeItem2Content;
+  const contentProps = useSlotProps({
+    elementType: Content,
+    getSlotProps: getContentProps,
+    externalSlotProps: slotProps.content,
+    ownerState: {},
+    className: clsx(classes.content, status.expanded && classes.expanded, status.selected && classes.selected, status.focused && classes.focused, status.disabled && classes.disabled)
+  });
+  const IconContainer = slots.iconContainer ?? TreeItem2IconContainer;
+  const iconContainerProps = useSlotProps({
+    elementType: IconContainer,
+    getSlotProps: getIconContainerProps,
+    externalSlotProps: slotProps.iconContainer,
+    ownerState: {},
+    className: classes.iconContainer
+  });
+  const Label = slots.label ?? TreeItem2Label;
+  const labelProps = useSlotProps({
+    elementType: Label,
+    getSlotProps: getLabelProps,
+    externalSlotProps: slotProps.label,
+    ownerState: {},
+    className: classes.label
+  });
+  const GroupTransition = slots.groupTransition ?? undefined;
+  const groupTransitionProps = useSlotProps({
+    elementType: GroupTransition,
+    getSlotProps: getGroupTransitionProps,
+    externalSlotProps: slotProps.groupTransition,
+    ownerState: {},
+    className: classes.groupTransition
+  });
+  return /*#__PURE__*/_jsx(TreeItem2Provider, {
+    nodeId: nodeId,
+    children: /*#__PURE__*/_jsxs(Root, _extends({}, rootProps, {
+      children: [/*#__PURE__*/_jsxs(Content, _extends({}, contentProps, {
+        children: [/*#__PURE__*/_jsx(IconContainer, _extends({}, iconContainerProps, {
+          children: /*#__PURE__*/_jsx(TreeItem2Icon, {
+            status: status,
+            slots: slots,
+            slotProps: slotProps
+          })
+        })), /*#__PURE__*/_jsx(Label, _extends({}, labelProps))]
+      })), children && /*#__PURE__*/_jsx(TreeItem2GroupTransition, _extends({
+        as: GroupTransition
+      }, groupTransitionProps))]
+    }))
+  });
+});
+process.env.NODE_ENV !== "production" ? TreeItem2.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * The content of the component.
+   */
+  children: PropTypes.node,
+  /**
+   * Override or extend the styles applied to the component.
+   */
+  classes: PropTypes.object,
+  className: PropTypes.string,
+  /**
+   * If `true`, the node is disabled.
+   * @default false
+   */
+  disabled: PropTypes.bool,
+  /**
+   * The id attribute of the node. If not provided, it will be generated.
+   */
+  id: PropTypes.string,
+  /**
+   * The label of the node.
+   */
+  label: PropTypes.node,
+  /**
+   * The id of the node.
+   * Must be unique.
+   */
+  nodeId: PropTypes.string.isRequired,
+  /**
+   * This prop isn't supported.
+   * Use the `onItemFocus` callback on the tree if you need to monitor a item's focus.
+   */
+  onFocus: unsupportedProp,
+  /**
+   * The props used for each component slot.
+   * @default {}
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overridable component slots.
+   * @default {}
+   */
+  slots: PropTypes.object
+} : void 0;

package/modern/TreeItem2/TreeItem2.types.js

@@ -0,0 +1 @@
+export {};

package/modern/TreeItem2/index.js

@@ -0,0 +1 @@
+export { TreeItem2, TreeItem2Root, TreeItem2Content, TreeItem2IconContainer, TreeItem2GroupTransition, TreeItem2Label } from './TreeItem2';

package/modern/TreeItem2Icon/TreeItem2Icon.js

@@ -0,0 +1,67 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import { resolveComponentProps, useSlotProps } from '@mui/base/utils';
+import { useTreeViewContext } from '../internals/TreeViewProvider/useTreeViewContext';
+import { TreeViewCollapseIcon, TreeViewExpandIcon } from '../icons';
+import { jsx as _jsx } from "react/jsx-runtime";
+function TreeItem2Icon(props) {
+  const {
+    slots,
+    slotProps,
+    status
+  } = props;
+  const context = useTreeViewContext();
+  const contextIcons = _extends({}, context.icons.slots, {
+    expandIcon: context.icons.slots.expandIcon ?? TreeViewExpandIcon,
+    collapseIcon: context.icons.slots.collapseIcon ?? TreeViewCollapseIcon
+  });
+  const contextIconProps = context.icons.slotProps;
+  let iconName;
+  if (slots?.icon) {
+    iconName = 'icon';
+  } else if (status.expandable) {
+    if (status.expanded) {
+      iconName = 'collapseIcon';
+    } else {
+      iconName = 'expandIcon';
+    }
+  } else {
+    iconName = 'endIcon';
+  }
+  const Icon = slots?.[iconName] ?? contextIcons[iconName];
+  const iconProps = useSlotProps({
+    elementType: Icon,
+    externalSlotProps: tempOwnerState => _extends({}, resolveComponentProps(contextIconProps[iconName], tempOwnerState), resolveComponentProps(slotProps?.[iconName], tempOwnerState)),
+    // TODO: Add proper ownerState
+    ownerState: {}
+  });
+  if (!Icon) {
+    return null;
+  }
+  return /*#__PURE__*/_jsx(Icon, _extends({}, iconProps));
+}
+process.env.NODE_ENV !== "production" ? TreeItem2Icon.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * The props used for each component slot.
+   * @default {}
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overridable component slots.
+   * @default {}
+   */
+  slots: PropTypes.object,
+  status: PropTypes.shape({
+    disabled: PropTypes.bool.isRequired,
+    expandable: PropTypes.bool.isRequired,
+    expanded: PropTypes.bool.isRequired,
+    focused: PropTypes.bool.isRequired,
+    selected: PropTypes.bool.isRequired
+  }).isRequired
+} : void 0;
+export { TreeItem2Icon };

package/modern/TreeItem2Icon/TreeItem2Icon.types.js

@@ -0,0 +1 @@
+export {};

package/modern/TreeItem2Icon/index.js

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

package/modern/TreeItem2Provider/TreeItem2Provider.js

@@ -0,0 +1,24 @@
+import PropTypes from 'prop-types';
+import { useTreeViewContext } from '../internals/TreeViewProvider/useTreeViewContext';
+function TreeItem2Provider(props) {
+  const {
+    children,
+    nodeId
+  } = props;
+  const {
+    wrapItem
+  } = useTreeViewContext();
+  return wrapItem({
+    children,
+    nodeId
+  });
+}
+TreeItem2Provider.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  children: PropTypes.node,
+  nodeId: PropTypes.string.isRequired
+};
+export { TreeItem2Provider };

package/modern/TreeItem2Provider/TreeItem2Provider.types.js

@@ -0,0 +1 @@
+export {};

package/modern/TreeItem2Provider/index.js

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