@mui/x-tree-view 7.17.0 → 7.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. package/CHANGELOG.md +208 -5
  2. package/RichTreeView/RichTreeView.js +2 -0
  3. package/RichTreeView/RichTreeView.plugins.d.ts +1 -1
  4. package/SimpleTreeView/SimpleTreeView.js +2 -0
  5. package/SimpleTreeView/SimpleTreeView.plugins.d.ts +1 -1
  6. package/TreeItem/TreeItem.js +9 -1
  7. package/TreeItem/TreeItemContent.js +1 -1
  8. package/TreeItem/useTreeItemState.js +2 -0
  9. package/TreeItem2/TreeItem2.d.ts +6 -6
  10. package/TreeItem2/TreeItem2.js +2 -0
  11. package/TreeView/TreeView.js +2 -0
  12. package/hooks/useTreeItem2Utils/useTreeItem2Utils.d.ts +24 -6
  13. package/hooks/useTreeItem2Utils/useTreeItem2Utils.js +10 -8
  14. package/hooks/useTreeViewApiRef.js +2 -0
  15. package/index.js +1 -1
  16. package/internals/TreeViewProvider/TreeViewChildrenItemProvider.js +7 -1
  17. package/internals/TreeViewProvider/TreeViewProvider.js +2 -1
  18. package/internals/TreeViewProvider/TreeViewProvider.types.d.ts +2 -1
  19. package/internals/TreeViewProvider/useTreeViewContext.d.ts +1 -1
  20. package/internals/corePlugins/corePlugins.d.ts +1 -1
  21. package/internals/corePlugins/useTreeViewId/useTreeViewId.js +28 -7
  22. package/internals/corePlugins/useTreeViewId/useTreeViewId.types.d.ts +11 -13
  23. package/internals/corePlugins/useTreeViewId/useTreeViewId.utils.d.ts +17 -0
  24. package/internals/corePlugins/useTreeViewId/useTreeViewId.utils.js +26 -0
  25. package/internals/models/plugin.d.ts +4 -1
  26. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +3 -1
  27. package/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +1 -1
  28. package/internals/plugins/useTreeViewItems/useTreeViewItems.js +9 -2
  29. package/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js +11 -5
  30. package/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +6 -0
  31. package/internals/plugins/useTreeViewLabel/useTreeViewLabel.js +16 -8
  32. package/internals/plugins/useTreeViewLabel/useTreeViewLabel.types.d.ts +3 -2
  33. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +3 -1
  34. package/internals/useTreeView/extractPluginParamsFromProps.d.ts +1 -1
  35. package/internals/useTreeView/extractPluginParamsFromProps.js +7 -3
  36. package/modern/RichTreeView/RichTreeView.js +2 -0
  37. package/modern/SimpleTreeView/SimpleTreeView.js +2 -0
  38. package/modern/TreeItem/TreeItem.js +9 -1
  39. package/modern/TreeItem/TreeItemContent.js +1 -1
  40. package/modern/TreeItem/useTreeItemState.js +2 -0
  41. package/modern/TreeItem2/TreeItem2.js +2 -0
  42. package/modern/TreeView/TreeView.js +2 -0
  43. package/modern/hooks/useTreeItem2Utils/useTreeItem2Utils.js +10 -8
  44. package/modern/hooks/useTreeViewApiRef.js +2 -0
  45. package/modern/index.js +1 -1
  46. package/modern/internals/TreeViewProvider/TreeViewChildrenItemProvider.js +7 -1
  47. package/modern/internals/TreeViewProvider/TreeViewProvider.js +2 -1
  48. package/modern/internals/corePlugins/useTreeViewId/useTreeViewId.js +28 -7
  49. package/modern/internals/corePlugins/useTreeViewId/useTreeViewId.utils.js +26 -0
  50. package/modern/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +3 -1
  51. package/modern/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +1 -1
  52. package/modern/internals/plugins/useTreeViewItems/useTreeViewItems.js +9 -2
  53. package/modern/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js +11 -5
  54. package/modern/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +6 -0
  55. package/modern/internals/plugins/useTreeViewLabel/useTreeViewLabel.js +16 -8
  56. package/modern/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +3 -1
  57. package/modern/internals/useTreeView/extractPluginParamsFromProps.js +7 -3
  58. package/modern/useTreeItem2/useTreeItem2.js +7 -1
  59. package/node/RichTreeView/RichTreeView.js +1 -0
  60. package/node/SimpleTreeView/SimpleTreeView.js +1 -0
  61. package/node/TreeItem/TreeItem.js +8 -1
  62. package/node/TreeItem/TreeItemContent.js +1 -1
  63. package/node/TreeItem/useTreeItemState.js +1 -0
  64. package/node/TreeItem2/TreeItem2.js +1 -0
  65. package/node/TreeView/TreeView.js +1 -0
  66. package/node/hooks/useTreeItem2Utils/useTreeItem2Utils.js +10 -9
  67. package/node/hooks/useTreeViewApiRef.js +1 -0
  68. package/node/index.js +1 -1
  69. package/node/internals/TreeViewProvider/TreeViewChildrenItemProvider.js +7 -1
  70. package/node/internals/TreeViewProvider/TreeViewProvider.js +2 -1
  71. package/node/internals/corePlugins/useTreeViewId/useTreeViewId.js +29 -8
  72. package/node/internals/corePlugins/useTreeViewId/useTreeViewId.utils.js +34 -0
  73. package/node/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +3 -1
  74. package/node/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +1 -1
  75. package/node/internals/plugins/useTreeViewItems/useTreeViewItems.js +9 -2
  76. package/node/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js +11 -5
  77. package/node/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +6 -0
  78. package/node/internals/plugins/useTreeViewLabel/useTreeViewLabel.js +16 -8
  79. package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +3 -1
  80. package/node/internals/useTreeView/extractPluginParamsFromProps.js +7 -3
  81. package/node/useTreeItem2/useTreeItem2.js +7 -1
  82. package/package.json +3 -3
  83. package/useTreeItem2/index.d.ts +2 -2
  84. package/useTreeItem2/useTreeItem2.js +7 -1
@@ -64,7 +64,7 @@ export const useTreeViewFocus = ({
64
64
  }
65
65
  const itemMeta = instance.getItemMeta(state.focusedItemId);
66
66
  if (itemMeta) {
67
- const itemElement = document.getElementById(instance.getTreeItemIdAttribute(state.focusedItemId, itemMeta.idAttribute));
67
+ const itemElement = instance.getItemDOMElement(state.focusedItemId);
68
68
  if (itemElement) {
69
69
  itemElement.blur();
70
70
  }
@@ -5,6 +5,7 @@ import * as React from 'react';
5
5
  import { publishTreeViewEvent } from "../../utils/publishTreeViewEvent.js";
6
6
  import { buildSiblingIndexes, TREE_VIEW_ROOT_PARENT_ID } from "./useTreeViewItems.utils.js";
7
7
  import { TreeViewItemDepthContext } from "../../TreeViewItemDepthContext/index.js";
8
+ import { generateTreeItemIdAttribute } from "../../corePlugins/useTreeViewId/useTreeViewId.utils.js";
8
9
  import { jsx as _jsx } from "react/jsx-runtime";
9
10
  const updateItemsState = ({
10
11
  items,
@@ -110,7 +111,11 @@ export const useTreeViewItems = ({
110
111
  if (itemMeta == null) {
111
112
  return null;
112
113
  }
113
- return document.getElementById(instance.getTreeItemIdAttribute(itemId, itemMeta.idAttribute));
114
+ return document.getElementById(generateTreeItemIdAttribute({
115
+ treeId: state.id.treeId,
116
+ itemId,
117
+ id: itemMeta.idAttribute
118
+ }));
114
119
  };
115
120
  const isItemNavigable = itemId => {
116
121
  if (params.disabledItemsFocusable) {
@@ -200,7 +205,9 @@ useTreeViewItems.getInitialState = params => ({
200
205
  getItemLabel: params.getItemLabel
201
206
  })
202
207
  });
203
- useTreeViewItems.getDefaultizedParams = params => _extends({}, params, {
208
+ useTreeViewItems.getDefaultizedParams = ({
209
+ params
210
+ }) => _extends({}, params, {
204
211
  disabledItemsFocusable: params.disabledItemsFocusable ?? false,
205
212
  itemChildrenIndentation: params.itemChildrenIndentation ?? '12px'
206
213
  });
@@ -8,6 +8,7 @@ import { useTreeViewContext } from "../../TreeViewProvider/index.js";
8
8
  import { TreeViewChildrenItemContext, TreeViewChildrenItemProvider } from "../../TreeViewProvider/TreeViewChildrenItemProvider.js";
9
9
  import { buildSiblingIndexes, TREE_VIEW_ROOT_PARENT_ID } from "../useTreeViewItems/useTreeViewItems.utils.js";
10
10
  import { TreeViewItemDepthContext } from "../../TreeViewItemDepthContext/index.js";
11
+ import { generateTreeItemIdAttribute } from "../../corePlugins/useTreeViewId/useTreeViewId.utils.js";
11
12
  import { jsx as _jsx } from "react/jsx-runtime";
12
13
  export const useTreeViewJSXItems = ({
13
14
  instance,
@@ -98,7 +99,8 @@ const useTreeViewJSXItemsItemPlugin = ({
98
99
  contentRef
99
100
  }) => {
100
101
  const {
101
- instance
102
+ instance,
103
+ treeId
102
104
  } = useTreeViewContext();
103
105
  const {
104
106
  children,
@@ -122,12 +124,16 @@ const useTreeViewJSXItemsItemPlugin = ({
122
124
 
123
125
  // Prevent any flashing
124
126
  useEnhancedEffect(() => {
125
- const idAttributeWithDefault = instance.getTreeItemIdAttribute(itemId, id);
126
- registerChild(idAttributeWithDefault, itemId);
127
+ const idAttribute = generateTreeItemIdAttribute({
128
+ itemId,
129
+ treeId,
130
+ id
131
+ });
132
+ registerChild(idAttribute, itemId);
127
133
  return () => {
128
- unregisterChild(idAttributeWithDefault);
134
+ unregisterChild(idAttribute);
129
135
  };
130
- }, [instance, registerChild, unregisterChild, itemId, id]);
136
+ }, [registerChild, unregisterChild, itemId, id, treeId]);
131
137
  React.useEffect(() => {
132
138
  return instance.insertJSXItem({
133
139
  id: itemId,
@@ -153,6 +153,9 @@ export const useTreeViewKeyboardNavigation = ({
153
153
  // If the focused item is collapsed and has children, we expand it
154
154
  case key === 'ArrowRight' && !isRtl || key === 'ArrowLeft' && isRtl:
155
155
  {
156
+ if (ctrlPressed) {
157
+ return;
158
+ }
156
159
  if (instance.isItemExpanded(itemId)) {
157
160
  const nextItemId = getNextNavigableItem(instance, itemId);
158
161
  if (nextItemId) {
@@ -170,6 +173,9 @@ export const useTreeViewKeyboardNavigation = ({
170
173
  // If the focused item is collapsed and has a parent, we move the focus to this parent
171
174
  case key === 'ArrowLeft' && !isRtl || key === 'ArrowRight' && isRtl:
172
175
  {
176
+ if (ctrlPressed) {
177
+ return;
178
+ }
173
179
  if (canToggleItemExpansion(itemId) && instance.isItemExpanded(itemId)) {
174
180
  instance.toggleItemExpansion(event, itemId);
175
181
  event.preventDefault();
@@ -6,14 +6,8 @@ export const useTreeViewLabel = ({
6
6
  instance,
7
7
  state,
8
8
  setState,
9
- params,
10
- experimentalFeatures
9
+ params
11
10
  }) => {
12
- if (process.env.NODE_ENV !== 'production') {
13
- if (params.isItemEditable && !experimentalFeatures?.labelEditing) {
14
- warnOnce(['MUI X: The label editing feature requires the `labelEditing` experimental feature to be enabled.', 'You can do it by passing `experimentalFeatures={{ labelEditing: true}}` to the `RichTreeViewPro` component.', 'Check the documentation for more details: https://mui.com/x/react-tree-view/rich-tree-view/editing/']);
15
- }
16
- }
17
11
  const editedItemRef = React.useRef(state.editedItemId);
18
12
  const isItemBeingEditedRef = itemId => editedItemRef.current === itemId;
19
13
  const setEditedItemId = editedItemId => {
@@ -23,7 +17,7 @@ export const useTreeViewLabel = ({
23
17
  editedItemRef.current = editedItemId;
24
18
  };
25
19
  const isItemBeingEdited = itemId => itemId === state.editedItemId;
26
- const isTreeViewEditable = Boolean(params.isItemEditable) && !!experimentalFeatures.labelEditing;
20
+ const isTreeViewEditable = Boolean(params.isItemEditable);
27
21
  const isItemEditable = itemId => {
28
22
  if (itemId == null || !isTreeViewEditable) {
29
23
  return false;
@@ -72,6 +66,20 @@ export const useTreeViewLabel = ({
72
66
  };
73
67
  };
74
68
  useTreeViewLabel.itemPlugin = useTreeViewLabelItemPlugin;
69
+ useTreeViewLabel.getDefaultizedParams = ({
70
+ params,
71
+ experimentalFeatures
72
+ }) => {
73
+ const canUseFeature = experimentalFeatures?.labelEditing;
74
+ if (process.env.NODE_ENV !== 'production') {
75
+ if (params.isItemEditable && !canUseFeature) {
76
+ warnOnce(['MUI X: The label editing feature requires the `labelEditing` experimental feature to be enabled.', 'You can do it by passing `experimentalFeatures={{ labelEditing: true}}` to the `RichTreeViewPro` component.', 'Check the documentation for more details: https://mui.com/x/react-tree-view/rich-tree-view/editing/']);
77
+ }
78
+ }
79
+ return _extends({}, params, {
80
+ isItemEditable: canUseFeature ? params.isItemEditable ?? false : false
81
+ });
82
+ };
75
83
  useTreeViewLabel.getInitialState = () => ({
76
84
  editedItemId: null
77
85
  });
@@ -174,7 +174,9 @@ useTreeViewSelection.models = {
174
174
  }
175
175
  };
176
176
  const DEFAULT_SELECTED_ITEMS = [];
177
- useTreeViewSelection.getDefaultizedParams = params => _extends({}, params, {
177
+ useTreeViewSelection.getDefaultizedParams = ({
178
+ params
179
+ }) => _extends({}, params, {
178
180
  disableSelection: params.disableSelection ?? false,
179
181
  multiSelect: params.multiSelect ?? false,
180
182
  checkboxSelection: params.checkboxSelection ?? false,
@@ -6,7 +6,7 @@ export const extractPluginParamsFromProps = _ref => {
6
6
  slots,
7
7
  slotProps,
8
8
  apiRef,
9
- experimentalFeatures
9
+ experimentalFeatures: inExperimentalFeatures
10
10
  },
11
11
  plugins
12
12
  } = _ref,
@@ -25,9 +25,13 @@ export const extractPluginParamsFromProps = _ref => {
25
25
  forwardedProps[propName] = prop;
26
26
  }
27
27
  });
28
+ const experimentalFeatures = inExperimentalFeatures ?? {};
28
29
  const defaultizedPluginParams = plugins.reduce((acc, plugin) => {
29
30
  if (plugin.getDefaultizedParams) {
30
- return plugin.getDefaultizedParams(acc);
31
+ return plugin.getDefaultizedParams({
32
+ params: acc,
33
+ experimentalFeatures
34
+ });
31
35
  }
32
36
  return acc;
33
37
  }, pluginParams);
@@ -37,6 +41,6 @@ export const extractPluginParamsFromProps = _ref => {
37
41
  pluginParams: defaultizedPluginParams,
38
42
  slots: slots ?? {},
39
43
  slotProps: slotProps ?? {},
40
- experimentalFeatures: experimentalFeatures ?? {}
44
+ experimentalFeatures
41
45
  };
42
46
  };
@@ -6,6 +6,7 @@ import { useTreeViewContext } from "../internals/TreeViewProvider/index.js";
6
6
  import { useTreeItem2Utils } from "../hooks/useTreeItem2Utils/index.js";
7
7
  import { TreeViewItemDepthContext } from "../internals/TreeViewItemDepthContext/index.js";
8
8
  import { isTargetInDescendants } from "../internals/utils/tree.js";
9
+ import { generateTreeItemIdAttribute } from "../internals/corePlugins/useTreeViewId/useTreeViewId.utils.js";
9
10
  export const useTreeItem2 = parameters => {
10
11
  const {
11
12
  runItemPlugins,
@@ -22,6 +23,7 @@ export const useTreeItem2 = parameters => {
22
23
  expansion: {
23
24
  expansionTrigger
24
25
  },
26
+ treeId,
25
27
  instance,
26
28
  publicAPI
27
29
  } = useTreeViewContext();
@@ -47,10 +49,14 @@ export const useTreeItem2 = parameters => {
47
49
  });
48
50
  const rootRefObject = React.useRef(null);
49
51
  const contentRefObject = React.useRef(null);
50
- const idAttribute = instance.getTreeItemIdAttribute(itemId, id);
51
52
  const handleRootRef = useForkRef(rootRef, pluginRootRef, rootRefObject);
52
53
  const handleContentRef = useForkRef(contentRef, contentRefObject);
53
54
  const checkboxRef = React.useRef(null);
55
+ const idAttribute = generateTreeItemIdAttribute({
56
+ itemId,
57
+ treeId,
58
+ id
59
+ });
54
60
  const rootTabIndex = instance.canItemBeTabbed(itemId) ? 0 : -1;
55
61
  const sharedPropsEnhancerParams = {
56
62
  rootRefObject,
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ 'use client';
2
3
 
3
4
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
5
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ 'use client';
2
3
 
3
4
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
5
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ 'use client';
2
3
 
3
4
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
5
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
@@ -30,6 +31,7 @@ var _TreeItem2Provider = require("../TreeItem2Provider");
30
31
  var _TreeViewItemDepthContext = require("../internals/TreeViewItemDepthContext");
31
32
  var _useTreeItemState = require("./useTreeItemState");
32
33
  var _tree = require("../internals/utils/tree");
34
+ var _useTreeViewId = require("../internals/corePlugins/useTreeViewId/useTreeViewId.utils");
33
35
  var _jsxRuntime = require("react/jsx-runtime");
34
36
  const _excluded = ["children", "className", "slots", "slotProps", "ContentComponent", "ContentProps", "itemId", "id", "label", "onClick", "onMouseDown", "onFocus", "onBlur", "onKeyDown"],
35
37
  _excluded2 = ["ownerState"],
@@ -191,6 +193,7 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
191
193
  expansion: {
192
194
  expansionTrigger
193
195
  },
196
+ treeId,
194
197
  instance
195
198
  } = (0, _TreeViewProvider.useTreeViewContext)();
196
199
  const depthContext = React.useContext(_TreeViewItemDepthContext.TreeViewItemDepthContext);
@@ -347,7 +350,11 @@ const TreeItem = exports.TreeItem = /*#__PURE__*/React.forwardRef(function TreeI
347
350
  }
348
351
  instance.handleItemKeyDown(event, itemId);
349
352
  };
350
- const idAttribute = instance.getTreeItemIdAttribute(itemId, id);
353
+ const idAttribute = (0, _useTreeViewId.generateTreeItemIdAttribute)({
354
+ itemId,
355
+ treeId,
356
+ id
357
+ });
351
358
  const tabIndex = instance.canItemBeTabbed(itemId) ? 0 : -1;
352
359
  const sharedPropsEnhancerParams = {
353
360
  rootRefObject,
@@ -85,7 +85,7 @@ const TreeItemContent = exports.TreeItemContent = /*#__PURE__*/React.forwardRef(
85
85
  /*#__PURE__*/
86
86
  /* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions -- Key event is handled by the TreeView */
87
87
  (0, _jsxRuntime.jsxs)("div", (0, _extends2.default)({}, other, {
88
- className: (0, _clsx.default)(className, classes.root, expanded && classes.expanded, selected && classes.selected, focused && classes.focused, disabled && classes.disabled, editing && classes.editing, editable && classes.editable),
88
+ className: (0, _clsx.default)(classes.root, className, expanded && classes.expanded, selected && classes.selected, focused && classes.focused, disabled && classes.disabled, editing && classes.editing, editable && classes.editable),
89
89
  onClick: handleClick,
90
90
  onMouseDown: handleMouseDown,
91
91
  ref: ref,
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ 'use client';
2
3
 
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ 'use client';
2
3
 
3
4
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
5
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ 'use client';
2
3
 
3
4
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
5
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
@@ -7,13 +7,6 @@ exports.useTreeItem2Utils = void 0;
7
7
  var _TreeViewProvider = require("../../internals/TreeViewProvider");
8
8
  var _useTreeViewLabel = require("../../internals/plugins/useTreeViewLabel");
9
9
  var _plugins = require("../../internals/utils/plugins");
10
- const isItemExpandable = reactChildren => {
11
- if (Array.isArray(reactChildren)) {
12
- return reactChildren.length > 0 && reactChildren.some(isItemExpandable);
13
- }
14
- return Boolean(reactChildren);
15
- };
16
-
17
10
  /**
18
11
  * Plugins that need to be present in the Tree View in order for `useTreeItem2Utils` to work correctly.
19
12
  */
@@ -22,6 +15,12 @@ const isItemExpandable = reactChildren => {
22
15
  * Plugins that `useTreeItem2Utils` can use if they are present, but are not required.
23
16
  */
24
17
 
18
+ const isItemExpandable = reactChildren => {
19
+ if (Array.isArray(reactChildren)) {
20
+ return reactChildren.length > 0 && reactChildren.some(isItemExpandable);
21
+ }
22
+ return Boolean(reactChildren);
23
+ };
25
24
  const useTreeItem2Utils = ({
26
25
  itemId,
27
26
  children
@@ -30,7 +29,8 @@ const useTreeItem2Utils = ({
30
29
  instance,
31
30
  selection: {
32
31
  multiSelect
33
- }
32
+ },
33
+ publicAPI
34
34
  } = (0, _TreeViewProvider.useTreeViewContext)();
35
35
  const status = {
36
36
  expandable: isItemExpandable(children),
@@ -140,7 +140,8 @@ const useTreeItem2Utils = ({
140
140
  };
141
141
  return {
142
142
  interactions,
143
- status
143
+ status,
144
+ publicAPI
144
145
  };
145
146
  };
146
147
  exports.useTreeItem2Utils = useTreeItem2Utils;
@@ -1,4 +1,5 @@
1
1
  "use strict";
2
+ 'use client';
2
3
 
3
4
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
5
  Object.defineProperty(exports, "__esModule", {
package/node/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/x-tree-view v7.17.0
2
+ * @mui/x-tree-view v7.19.0
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
@@ -11,6 +11,7 @@ var React = _interopRequireWildcard(require("react"));
11
11
  var _propTypes = _interopRequireDefault(require("prop-types"));
12
12
  var _useTreeViewContext = require("./useTreeViewContext");
13
13
  var _utils = require("../utils/utils");
14
+ var _useTreeViewId = require("../corePlugins/useTreeViewId/useTreeViewId.utils");
14
15
  var _jsxRuntime = require("react/jsx-runtime");
15
16
  const TreeViewChildrenItemContext = exports.TreeViewChildrenItemContext = /*#__PURE__*/React.createContext(null);
16
17
  if (process.env.NODE_ENV !== 'production') {
@@ -23,6 +24,7 @@ function TreeViewChildrenItemProvider(props) {
23
24
  } = props;
24
25
  const {
25
26
  instance,
27
+ treeId,
26
28
  rootRef
27
29
  } = (0, _useTreeViewContext.useTreeViewContext)();
28
30
  const childrenIdAttrToIdRef = React.useRef(new Map());
@@ -37,7 +39,11 @@ function TreeViewChildrenItemProvider(props) {
37
39
  // Undefined during 1st render
38
40
  const itemMeta = instance.getItemMeta(itemId);
39
41
  if (itemMeta !== undefined) {
40
- idAttr = instance.getTreeItemIdAttribute(itemId, itemMeta.idAttribute);
42
+ idAttr = (0, _useTreeViewId.generateTreeItemIdAttribute)({
43
+ itemId,
44
+ treeId,
45
+ id: itemMeta.idAttribute
46
+ });
41
47
  }
42
48
  }
43
49
  if (idAttr == null) {
@@ -21,7 +21,8 @@ function TreeViewProvider(props) {
21
21
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeViewContext.TreeViewContext.Provider, {
22
22
  value: value,
23
23
  children: value.wrapRoot({
24
- children
24
+ children,
25
+ instance: value.instance
25
26
  })
26
27
  });
27
28
  }
@@ -1,28 +1,49 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
3
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports.useTreeViewId = void 0;
9
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
10
  var React = _interopRequireWildcard(require("react"));
10
- var _useId = _interopRequireDefault(require("@mui/utils/useId"));
11
+ var _useTreeViewId = require("./useTreeViewId.utils");
11
12
  const useTreeViewId = ({
12
- params
13
+ params,
14
+ state,
15
+ setState
13
16
  }) => {
14
- const treeId = (0, _useId.default)(params.id);
15
- const getTreeItemIdAttribute = React.useCallback((itemId, idAttribute) => idAttribute ?? `${treeId}-${itemId}`, [treeId]);
17
+ const treeId = state.id.treeId;
18
+ React.useEffect(() => {
19
+ setState(prevState => {
20
+ if (prevState.id.treeId === params.id) {
21
+ return prevState;
22
+ }
23
+ return (0, _extends2.default)({}, prevState, {
24
+ id: (0, _extends2.default)({}, prevState.id, {
25
+ treeId: params.id ?? (0, _useTreeViewId.createTreeViewDefaultId)()
26
+ })
27
+ });
28
+ });
29
+ }, [setState, params.id]);
16
30
  return {
17
31
  getRootProps: () => ({
18
32
  id: treeId
19
33
  }),
20
- instance: {
21
- getTreeItemIdAttribute
34
+ contextValue: {
35
+ treeId
22
36
  }
23
37
  };
24
38
  };
25
39
  exports.useTreeViewId = useTreeViewId;
26
40
  useTreeViewId.params = {
27
41
  id: true
28
- };
42
+ };
43
+ useTreeViewId.getInitialState = ({
44
+ id
45
+ }) => ({
46
+ id: {
47
+ treeId: id ?? (0, _useTreeViewId.createTreeViewDefaultId)()
48
+ }
49
+ });
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.generateTreeItemIdAttribute = exports.createTreeViewDefaultId = void 0;
7
+ let globalTreeViewDefaultId = 0;
8
+ const createTreeViewDefaultId = () => {
9
+ globalTreeViewDefaultId += 1;
10
+ return `mui-tree-view-${globalTreeViewDefaultId}`;
11
+ };
12
+
13
+ /**
14
+ * Generate the id attribute (i.e.: the `id` attribute passed to the DOM element) of a tree item.
15
+ * If the user explicitly defined an id attribute, it will be returned.
16
+ * Otherwise, the method creates a unique id for the item based on the Tree View id attribute and the item `itemId`
17
+ * @param {object} params The parameters to determine the id attribute of the item.
18
+ * @param {TreeViewItemId} params.itemId The id of the item to get the id attribute of.
19
+ * @param {string | undefined} params.idAttribute The id attribute of the item if explicitly defined by the user.
20
+ * @param {string} params.treeId The id attribute of the Tree View.
21
+ * @returns {string} The id attribute of the item.
22
+ */
23
+ exports.createTreeViewDefaultId = createTreeViewDefaultId;
24
+ const generateTreeItemIdAttribute = ({
25
+ id,
26
+ treeId = '',
27
+ itemId
28
+ }) => {
29
+ if (id != null) {
30
+ return id;
31
+ }
32
+ return `${treeId}-${itemId}`;
33
+ };
34
+ exports.generateTreeItemIdAttribute = generateTreeItemIdAttribute;
@@ -95,7 +95,9 @@ useTreeViewExpansion.models = {
95
95
  }
96
96
  };
97
97
  const DEFAULT_EXPANDED_ITEMS = [];
98
- useTreeViewExpansion.getDefaultizedParams = params => (0, _extends2.default)({}, params, {
98
+ useTreeViewExpansion.getDefaultizedParams = ({
99
+ params
100
+ }) => (0, _extends2.default)({}, params, {
99
101
  defaultExpandedItems: params.defaultExpandedItems ?? DEFAULT_EXPANDED_ITEMS
100
102
  });
101
103
  useTreeViewExpansion.params = {
@@ -72,7 +72,7 @@ const useTreeViewFocus = ({
72
72
  }
73
73
  const itemMeta = instance.getItemMeta(state.focusedItemId);
74
74
  if (itemMeta) {
75
- const itemElement = document.getElementById(instance.getTreeItemIdAttribute(state.focusedItemId, itemMeta.idAttribute));
75
+ const itemElement = instance.getItemDOMElement(state.focusedItemId);
76
76
  if (itemElement) {
77
77
  itemElement.blur();
78
78
  }
@@ -12,6 +12,7 @@ var React = _interopRequireWildcard(require("react"));
12
12
  var _publishTreeViewEvent = require("../../utils/publishTreeViewEvent");
13
13
  var _useTreeViewItems = require("./useTreeViewItems.utils");
14
14
  var _TreeViewItemDepthContext = require("../../TreeViewItemDepthContext");
15
+ var _useTreeViewId = require("../../corePlugins/useTreeViewId/useTreeViewId.utils");
15
16
  var _jsxRuntime = require("react/jsx-runtime");
16
17
  const _excluded = ["children"];
17
18
  const updateItemsState = ({
@@ -118,7 +119,11 @@ const useTreeViewItems = ({
118
119
  if (itemMeta == null) {
119
120
  return null;
120
121
  }
121
- return document.getElementById(instance.getTreeItemIdAttribute(itemId, itemMeta.idAttribute));
122
+ return document.getElementById((0, _useTreeViewId.generateTreeItemIdAttribute)({
123
+ treeId: state.id.treeId,
124
+ itemId,
125
+ id: itemMeta.idAttribute
126
+ }));
122
127
  };
123
128
  const isItemNavigable = itemId => {
124
129
  if (params.disabledItemsFocusable) {
@@ -209,7 +214,9 @@ useTreeViewItems.getInitialState = params => ({
209
214
  getItemLabel: params.getItemLabel
210
215
  })
211
216
  });
212
- useTreeViewItems.getDefaultizedParams = params => (0, _extends2.default)({}, params, {
217
+ useTreeViewItems.getDefaultizedParams = ({
218
+ params
219
+ }) => (0, _extends2.default)({}, params, {
213
220
  disabledItemsFocusable: params.disabledItemsFocusable ?? false,
214
221
  itemChildrenIndentation: params.itemChildrenIndentation ?? '12px'
215
222
  });
@@ -16,6 +16,7 @@ var _TreeViewProvider = require("../../TreeViewProvider");
16
16
  var _TreeViewChildrenItemProvider = require("../../TreeViewProvider/TreeViewChildrenItemProvider");
17
17
  var _useTreeViewItems = require("../useTreeViewItems/useTreeViewItems.utils");
18
18
  var _TreeViewItemDepthContext = require("../../TreeViewItemDepthContext");
19
+ var _useTreeViewId = require("../../corePlugins/useTreeViewId/useTreeViewId.utils");
19
20
  var _jsxRuntime = require("react/jsx-runtime");
20
21
  const useTreeViewJSXItems = ({
21
22
  instance,
@@ -107,7 +108,8 @@ const useTreeViewJSXItemsItemPlugin = ({
107
108
  contentRef
108
109
  }) => {
109
110
  const {
110
- instance
111
+ instance,
112
+ treeId
111
113
  } = (0, _TreeViewProvider.useTreeViewContext)();
112
114
  const {
113
115
  children,
@@ -131,12 +133,16 @@ const useTreeViewJSXItemsItemPlugin = ({
131
133
 
132
134
  // Prevent any flashing
133
135
  (0, _useEnhancedEffect.default)(() => {
134
- const idAttributeWithDefault = instance.getTreeItemIdAttribute(itemId, id);
135
- registerChild(idAttributeWithDefault, itemId);
136
+ const idAttribute = (0, _useTreeViewId.generateTreeItemIdAttribute)({
137
+ itemId,
138
+ treeId,
139
+ id
140
+ });
141
+ registerChild(idAttribute, itemId);
136
142
  return () => {
137
- unregisterChild(idAttributeWithDefault);
143
+ unregisterChild(idAttribute);
138
144
  };
139
- }, [instance, registerChild, unregisterChild, itemId, id]);
145
+ }, [registerChild, unregisterChild, itemId, id, treeId]);
140
146
  React.useEffect(() => {
141
147
  return instance.insertJSXItem({
142
148
  id: itemId,
@@ -161,6 +161,9 @@ const useTreeViewKeyboardNavigation = ({
161
161
  // If the focused item is collapsed and has children, we expand it
162
162
  case key === 'ArrowRight' && !isRtl || key === 'ArrowLeft' && isRtl:
163
163
  {
164
+ if (ctrlPressed) {
165
+ return;
166
+ }
164
167
  if (instance.isItemExpanded(itemId)) {
165
168
  const nextItemId = (0, _tree.getNextNavigableItem)(instance, itemId);
166
169
  if (nextItemId) {
@@ -178,6 +181,9 @@ const useTreeViewKeyboardNavigation = ({
178
181
  // If the focused item is collapsed and has a parent, we move the focus to this parent
179
182
  case key === 'ArrowLeft' && !isRtl || key === 'ArrowRight' && isRtl:
180
183
  {
184
+ if (ctrlPressed) {
185
+ return;
186
+ }
181
187
  if (canToggleItemExpansion(itemId) && instance.isItemExpanded(itemId)) {
182
188
  instance.toggleItemExpansion(event, itemId);
183
189
  event.preventDefault();