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

package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.js

@@ -19,30 +19,49 @@ const useTreeViewSelection = ({
   const lastSelectedNode = React.useRef(null);
   const lastSelectionWasRange = React.useRef(false);
   const currentRangeSelection = React.useRef([]);
-  const isNodeSelected = nodeId => Array.isArray(models.selected.value) ? models.selected.value.indexOf(nodeId) !== -1 : models.selected.value === nodeId;
+  const isNodeSelected = nodeId => Array.isArray(models.selectedNodes.value) ? models.selectedNodes.value.indexOf(nodeId) !== -1 : models.selectedNodes.value === nodeId;
+  const setSelectedNodes = (event, newSelectedNodes) => {
+    if (params.onNodeSelectionToggle) {
+      if (params.multiSelect) {
+        const addedNodes = newSelectedNodes.filter(nodeId => !instance.isNodeSelected(nodeId));
+        const removedNodes = models.selectedNodes.value.filter(nodeId => !newSelectedNodes.includes(nodeId));
+        addedNodes.forEach(nodeId => {
+          params.onNodeSelectionToggle(event, nodeId, true);
+        });
+        removedNodes.forEach(nodeId => {
+          params.onNodeSelectionToggle(event, nodeId, false);
+        });
+      } else if (newSelectedNodes !== models.selectedNodes.value) {
+        if (models.selectedNodes.value != null) {
+          params.onNodeSelectionToggle(event, models.selectedNodes.value, false);
+        }
+        if (newSelectedNodes != null) {
+          params.onNodeSelectionToggle(event, newSelectedNodes, true);
+        }
+      }
+    }
+    if (params.onSelectedNodesChange) {
+      params.onSelectedNodesChange(event, newSelectedNodes);
+    }
+    models.selectedNodes.setValue(newSelectedNodes);
+  };
   const selectNode = (event, nodeId, multiple = false) => {
     if (params.disableSelection) {
       return;
     }
     if (multiple) {
-      if (Array.isArray(models.selected.value)) {
+      if (Array.isArray(models.selectedNodes.value)) {
         let newSelected;
-        if (models.selected.value.indexOf(nodeId) !== -1) {
-          newSelected = models.selected.value.filter(id => id !== nodeId);
+        if (models.selectedNodes.value.indexOf(nodeId) !== -1) {
+          newSelected = models.selectedNodes.value.filter(id => id !== nodeId);
         } else {
-          newSelected = [nodeId].concat(models.selected.value);
-        }
-        if (params.onNodeSelect) {
-          params.onNodeSelect(event, newSelected);
+          newSelected = [nodeId].concat(models.selectedNodes.value);
         }
-        models.selected.setValue(newSelected);
+        setSelectedNodes(event, newSelected);
       }
     } else {
       const newSelected = params.multiSelect ? [nodeId] : nodeId;
-      if (params.onNodeSelect) {
-        params.onNodeSelect(event, newSelected);
-      }
-      models.selected.setValue(newSelected);
+      setSelectedNodes(event, newSelected);
     }
     lastSelectedNode.current = nodeId;
     lastSelectionWasRange.current = false;
@@ -59,7 +78,7 @@ const useTreeViewSelection = ({
     return nodes;
   };
   const handleRangeArrowSelect = (event, nodes) => {
-    let base = models.selected.value.slice();
+    let base = models.selectedNodes.value.slice();
     const {
       start,
       next,
@@ -83,13 +102,10 @@ const useTreeViewSelection = ({
       base.push(next);
       currentRangeSelection.current.push(current, next);
     }
-    if (params.onNodeSelect) {
-      params.onNodeSelect(event, base);
-    }
-    models.selected.setValue(base);
+    setSelectedNodes(event, base);
   };
   const handleRangeSelect = (event, nodes) => {
-    let base = models.selected.value.slice();
+    let base = models.selectedNodes.value.slice();
     const {
       start,
       end
@@ -103,10 +119,7 @@ const useTreeViewSelection = ({
     currentRangeSelection.current = range;
     let newSelected = base.concat(range);
     newSelected = newSelected.filter((id, i) => newSelected.indexOf(id) === i);
-    if (params.onNodeSelect) {
-      params.onNodeSelect(event, newSelected);
-    }
-    models.selected.setValue(newSelected);
+    setSelectedNodes(event, newSelected);
   };
   const selectRange = (event, nodes, stacked = false) => {
     if (params.disableSelection) {
@@ -166,14 +179,14 @@ const useTreeViewSelection = ({
 };
 exports.useTreeViewSelection = useTreeViewSelection;
 useTreeViewSelection.models = {
-  selected: {
-    controlledProp: 'selected',
-    defaultProp: 'defaultSelected'
+  selectedNodes: {
+    controlledProp: 'selectedNodes',
+    defaultProp: 'defaultSelectedNodes'
   }
 };
-const DEFAULT_SELECTED = [];
+const DEFAULT_SELECTED_NODES = [];
 useTreeViewSelection.getDefaultizedParams = params => (0, _extends2.default)({}, params, {
   disableSelection: params.disableSelection ?? false,
   multiSelect: params.multiSelect ?? false,
-  defaultSelected: params.defaultSelected ?? (params.multiSelect ? DEFAULT_SELECTED : null)
+  defaultSelectedNodes: params.defaultSelectedNodes ?? (params.multiSelect ? DEFAULT_SELECTED_NODES : null)
 });

package/node/internals/useTreeView/useTreeView.js

@@ -8,7 +8,6 @@ exports.useTreeView = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _useForkRef = _interopRequireDefault(require("@mui/utils/useForkRef"));
-var _TreeViewContext = require("../TreeViewProvider/TreeViewContext");
 var _useTreeViewModels = require("./useTreeViewModels");
 var _corePlugins = require("../corePlugins");
 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); }
@@ -36,7 +35,7 @@ const useTreeView = inParams => {
     return temp;
   });
   const rootPropsGetters = [];
-  let contextValue = _TreeViewContext.DEFAULT_TREE_VIEW_CONTEXT_VALUE;
+  let contextValue = {};
   const runPlugin = plugin => {
     const pluginResponse = plugin({
       instance,
@@ -54,6 +53,43 @@ const useTreeView = inParams => {
     }
   };
   plugins.forEach(runPlugin);
+  contextValue.runItemPlugins = ({
+    props,
+    ref
+  }) => {
+    let finalProps = props;
+    let finalRef = ref;
+    const itemWrappers = [];
+    plugins.forEach(plugin => {
+      if (!plugin.itemPlugin) {
+        return;
+      }
+      const itemPluginResponse = plugin.itemPlugin({
+        props: finalProps,
+        ref: finalRef
+      });
+      if (itemPluginResponse?.props) {
+        finalProps = itemPluginResponse.props;
+      }
+      if (itemPluginResponse?.ref) {
+        finalRef = itemPluginResponse.ref;
+      }
+      if (itemPluginResponse?.wrapItem) {
+        itemWrappers.push(itemPluginResponse.wrapItem);
+      }
+    });
+    return {
+      props: finalProps,
+      ref: finalRef,
+      wrapItem: children => {
+        let finalChildren = children;
+        itemWrappers.forEach(itemWrapper => {
+          finalChildren = itemWrapper(finalChildren);
+        });
+        return finalChildren;
+      }
+    };
+  };
   const getRootProps = (otherHandlers = {}) => {
     const rootProps = (0, _extends2.default)({
       role: 'tree',
@@ -69,7 +105,8 @@ const useTreeView = inParams => {
   return {
     getRootProps,
     rootRef: handleRootRef,
-    contextValue
+    contextValue,
+    instance: instance
   };
 };
 exports.useTreeView = useTreeView;

package/node/internals/utils/warning.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildWarning = void 0;
+const buildWarning = (message, gravity = 'warning') => {
+  let alreadyWarned = false;
+  const cleanMessage = Array.isArray(message) ? message.join('\n') : message;
+  return () => {
+    if (!alreadyWarned) {
+      alreadyWarned = true;
+      if (gravity === 'error') {
+        console.error(cleanMessage);
+      } else {
+        console.warn(cleanMessage);
+      }
+    }
+  };
+};
+exports.buildWarning = buildWarning;

package/node/models/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _items = require("./items");
+Object.keys(_items).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _items[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _items[key];
+    }
+  });
+});

package/node/models/items.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-tree-view",
-  "version": "6.17.0",
+  "version": "7.0.0-alpha.7",
   "description": "The community edition of the tree view components (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -11,7 +11,7 @@
   "homepage": "https://mui.com/x/react-tree-view/",
   "funding": {
     "type": "opencollective",
-    "url": "https://opencollective.com/mui"
+    "url": "https://opencollective.com/mui-org"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -21,6 +21,7 @@
     "react",
     "react-component",
     "mui",
+    "mui-x",
     "material-ui",
     "material design",
     "treeview"
@@ -31,10 +32,11 @@
     "directory": "packages/x-tree-view"
   },
   "dependencies": {
-    "@babel/runtime": "^7.23.2",
-    "@mui/base": "^5.0.0-beta.20",
-    "@mui/utils": "^5.14.14",
-    "@types/react-transition-group": "^4.4.8",
+    "@babel/runtime": "^7.23.7",
+    "@mui/base": "^5.0.0-beta.29",
+    "@mui/system": "^5.15.2",
+    "@mui/utils": "^5.15.2",
+    "@types/react-transition-group": "^4.4.10",
     "clsx": "^2.0.0",
     "prop-types": "^15.8.1",
     "react-transition-group": "^4.4.5"
@@ -43,7 +45,6 @@
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
     "@mui/material": "^5.8.6",
-    "@mui/system": "^5.8.0",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },

package/themeAugmentation/components.d.ts

@@ -1,16 +1,26 @@
 import { ComponentsProps, ComponentsOverrides, ComponentsVariants } from '@mui/material/styles';
 
 export interface TreeViewComponents<Theme = unknown> {
-  MuiTreeItem?: {
-    defaultProps?: ComponentsProps['MuiTreeItem'];
-    styleOverrides?: ComponentsOverrides<Theme>['MuiTreeItem'];
-    variants?: ComponentsVariants['MuiTreeItem'];
+  MuiSimpleTreeView?: {
+    defaultProps?: ComponentsProps['MuiSimpleTreeView'];
+    styleOverrides?: ComponentsOverrides<Theme>['MuiSimpleTreeView'];
+    variants?: ComponentsVariants['MuiSimpleTreeView'];
+  };
+  MuiRichTreeView?: {
+    defaultProps?: ComponentsProps['MuiRichTreeView'];
+    styleOverrides?: ComponentsOverrides<Theme>['MuiRichTreeView'];
+    variants?: ComponentsVariants['MuiRichTreeView'];
   };
   MuiTreeView?: {
     defaultProps?: ComponentsProps['MuiTreeView'];
     styleOverrides?: ComponentsOverrides<Theme>['MuiTreeView'];
     variants?: ComponentsVariants['MuiTreeView'];
   };
+  MuiTreeItem?: {
+    defaultProps?: ComponentsProps['MuiTreeItem'];
+    styleOverrides?: ComponentsOverrides<Theme>['MuiTreeItem'];
+    variants?: ComponentsVariants['MuiTreeItem'];
+  };
 }
 
 declare module '@mui/material/styles' {

package/themeAugmentation/overrides.d.ts

@@ -1,14 +1,18 @@
-import { TreeItemClassKey } from '../TreeItem';
+import { RichTreeViewClassKey } from '../RichTreeView';
+import { SimpleTreeViewClassKey } from '../SimpleTreeView';
 import { TreeViewClassKey } from '../TreeView';
+import { TreeItemClassKey } from '../TreeItem';
 
 // prettier-ignore
-export interface PickersComponentNameToClassKey {
-  MuiTreeItem: TreeItemClassKey;
+export interface TreeViewComponentNameToClassKey {
+  MuiSimpleTreeView: SimpleTreeViewClassKey;
+  MuiRichTreeView: RichTreeViewClassKey;
   MuiTreeView: TreeViewClassKey;
+  MuiTreeItem: TreeItemClassKey;
 }
 
 declare module '@mui/material/styles' {
-  interface ComponentNameToClassKey extends PickersComponentNameToClassKey {}
+  interface ComponentNameToClassKey extends TreeViewComponentNameToClassKey {}
 }
 
 // disable automatic export

package/themeAugmentation/props.d.ts

@@ -1,13 +1,17 @@
 import { TreeItemProps } from '../TreeItem';
 import { TreeViewProps } from '../TreeView';
+import { SimpleTreeViewProps } from '../SimpleTreeView';
+import { RichTreeViewProps } from '../RichTreeView';
 
-export interface PickersComponentsPropsList {
-  MuiTreeItem: TreeItemProps;
+export interface TreeViewComponentsPropsList {
+  MuiSimpleTreeView: SimpleTreeViewProps<any>;
+  MuiRichTreeView: RichTreeViewProps<any, any>;
   MuiTreeView: TreeViewProps<any>;
+  MuiTreeItem: TreeItemProps;
 }
 
 declare module '@mui/material/styles' {
-  interface ComponentsPropsList extends PickersComponentsPropsList {}
+  interface ComponentsPropsList extends TreeViewComponentsPropsList {}
 }
 
 // disable automatic export