@mui/x-tree-view 8.0.0-alpha.0 → 8.0.0-alpha.10

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 (164) hide show
  1. package/CHANGELOG.md +2215 -119
  2. package/README.md +3 -3
  3. package/RichTreeView/RichTreeView.js +2 -4
  4. package/RichTreeView/RichTreeView.types.d.ts +6 -19
  5. package/SimpleTreeView/SimpleTreeView.types.d.ts +3 -3
  6. package/TreeItem/TreeItem.d.ts +1 -1
  7. package/TreeItem/TreeItem.js +4 -4
  8. package/TreeItem/TreeItem.types.d.ts +4 -2
  9. package/TreeItemDragAndDropOverlay/TreeItemDragAndDropOverlay.js +1 -1
  10. package/TreeItemIcon/TreeItemIcon.types.d.ts +1 -1
  11. package/TreeItemProvider/TreeItemProvider.d.ts +2 -4
  12. package/TreeItemProvider/TreeItemProvider.js +26 -11
  13. package/TreeItemProvider/TreeItemProvider.types.d.ts +1 -0
  14. package/hooks/index.d.ts +1 -0
  15. package/hooks/index.js +2 -1
  16. package/hooks/useTreeItemModel.d.ts +2 -0
  17. package/hooks/useTreeItemModel.js +11 -0
  18. package/hooks/useTreeItemUtils/useTreeItemUtils.d.ts +6 -5
  19. package/hooks/useTreeItemUtils/useTreeItemUtils.js +31 -15
  20. package/hooks/useTreeViewApiRef.d.ts +2 -1
  21. package/index.js +1 -1
  22. package/internals/TreeViewItemDepthContext/TreeViewItemDepthContext.d.ts +3 -1
  23. package/internals/TreeViewProvider/TreeViewChildrenItemProvider.d.ts +2 -1
  24. package/internals/TreeViewProvider/TreeViewChildrenItemProvider.js +6 -22
  25. package/internals/TreeViewProvider/TreeViewProvider.js +1 -2
  26. package/internals/TreeViewProvider/TreeViewProvider.types.d.ts +5 -3
  27. package/internals/components/RichTreeViewItems.d.ts +3 -5
  28. package/internals/components/RichTreeViewItems.js +42 -30
  29. package/internals/corePlugins/useTreeViewId/useTreeViewId.js +10 -11
  30. package/internals/corePlugins/useTreeViewId/useTreeViewId.selectors.d.ts +36 -0
  31. package/internals/corePlugins/useTreeViewId/useTreeViewId.selectors.js +9 -0
  32. package/internals/corePlugins/useTreeViewId/useTreeViewId.types.d.ts +1 -5
  33. package/internals/hooks/useInstanceEventHandler.js +1 -1
  34. package/internals/hooks/useSelector.d.ts +4 -0
  35. package/internals/hooks/useSelector.js +6 -0
  36. package/internals/index.d.ts +6 -1
  37. package/internals/index.js +5 -1
  38. package/internals/models/itemPlugin.d.ts +7 -7
  39. package/internals/models/plugin.d.ts +22 -10
  40. package/internals/models/treeView.d.ts +6 -0
  41. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +41 -30
  42. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.selectors.d.ts +180 -0
  43. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.selectors.js +24 -0
  44. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.types.d.ts +6 -18
  45. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.utils.d.ts +4 -0
  46. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.utils.js +19 -0
  47. package/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +62 -40
  48. package/internals/plugins/useTreeViewFocus/useTreeViewFocus.selectors.d.ts +182 -0
  49. package/internals/plugins/useTreeViewFocus/useTreeViewFocus.selectors.js +34 -0
  50. package/internals/plugins/useTreeViewFocus/useTreeViewFocus.types.d.ts +4 -16
  51. package/internals/plugins/useTreeViewIcons/useTreeViewIcons.js +15 -13
  52. package/internals/plugins/useTreeViewIcons/useTreeViewIcons.types.d.ts +1 -1
  53. package/internals/plugins/useTreeViewItems/index.d.ts +1 -1
  54. package/internals/plugins/useTreeViewItems/useTreeViewItems.js +58 -98
  55. package/internals/plugins/useTreeViewItems/useTreeViewItems.selectors.d.ts +886 -0
  56. package/internals/plugins/useTreeViewItems/useTreeViewItems.selectors.js +103 -0
  57. package/internals/plugins/useTreeViewItems/useTreeViewItems.types.d.ts +36 -55
  58. package/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js +29 -26
  59. package/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +27 -18
  60. package/internals/plugins/useTreeViewLabel/useTreeViewLabel.itemPlugin.js +13 -5
  61. package/internals/plugins/useTreeViewLabel/useTreeViewLabel.js +19 -30
  62. package/internals/plugins/useTreeViewLabel/useTreeViewLabel.selectors.d.ts +74 -0
  63. package/internals/plugins/useTreeViewLabel/useTreeViewLabel.selectors.js +26 -0
  64. package/internals/plugins/useTreeViewLabel/useTreeViewLabel.types.d.ts +7 -24
  65. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.itemPlugin.js +16 -17
  66. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +45 -34
  67. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.selectors.d.ts +32 -0
  68. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.selectors.js +9 -0
  69. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.types.d.ts +6 -6
  70. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.d.ts +6 -6
  71. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.js +23 -13
  72. package/internals/useTreeView/useTreeView.d.ts +1 -1
  73. package/internals/useTreeView/useTreeView.js +30 -17
  74. package/internals/useTreeView/useTreeView.types.d.ts +3 -4
  75. package/internals/useTreeView/useTreeViewBuildContext.d.ts +4 -2
  76. package/internals/useTreeView/useTreeViewBuildContext.js +24 -18
  77. package/internals/utils/TreeViewStore.d.ts +12 -0
  78. package/internals/utils/TreeViewStore.js +24 -0
  79. package/internals/utils/selectors.d.ts +9 -0
  80. package/internals/utils/selectors.js +37 -0
  81. package/internals/utils/tree.d.ts +8 -8
  82. package/internals/utils/tree.js +51 -43
  83. package/models/items.d.ts +3 -2
  84. package/modern/RichTreeView/RichTreeView.js +2 -4
  85. package/modern/TreeItem/TreeItem.js +4 -4
  86. package/modern/TreeItemDragAndDropOverlay/TreeItemDragAndDropOverlay.js +1 -1
  87. package/modern/TreeItemProvider/TreeItemProvider.js +26 -11
  88. package/modern/hooks/index.js +2 -1
  89. package/modern/hooks/useTreeItemModel.js +11 -0
  90. package/modern/hooks/useTreeItemUtils/useTreeItemUtils.js +31 -15
  91. package/modern/index.js +1 -1
  92. package/modern/internals/TreeViewProvider/TreeViewChildrenItemProvider.js +6 -22
  93. package/modern/internals/TreeViewProvider/TreeViewProvider.js +1 -2
  94. package/modern/internals/components/RichTreeViewItems.js +42 -30
  95. package/modern/internals/corePlugins/useTreeViewId/useTreeViewId.js +10 -11
  96. package/modern/internals/corePlugins/useTreeViewId/useTreeViewId.selectors.js +9 -0
  97. package/modern/internals/hooks/useInstanceEventHandler.js +1 -1
  98. package/modern/internals/hooks/useSelector.js +6 -0
  99. package/modern/internals/index.js +5 -1
  100. package/modern/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +41 -30
  101. package/modern/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.selectors.js +24 -0
  102. package/modern/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.utils.js +19 -0
  103. package/modern/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +62 -40
  104. package/modern/internals/plugins/useTreeViewFocus/useTreeViewFocus.selectors.js +34 -0
  105. package/modern/internals/plugins/useTreeViewIcons/useTreeViewIcons.js +15 -13
  106. package/modern/internals/plugins/useTreeViewItems/useTreeViewItems.js +58 -98
  107. package/modern/internals/plugins/useTreeViewItems/useTreeViewItems.selectors.js +103 -0
  108. package/modern/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js +29 -26
  109. package/modern/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +27 -18
  110. package/modern/internals/plugins/useTreeViewLabel/useTreeViewLabel.itemPlugin.js +13 -5
  111. package/modern/internals/plugins/useTreeViewLabel/useTreeViewLabel.js +19 -30
  112. package/modern/internals/plugins/useTreeViewLabel/useTreeViewLabel.selectors.js +26 -0
  113. package/modern/internals/plugins/useTreeViewSelection/useTreeViewSelection.itemPlugin.js +16 -17
  114. package/modern/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +45 -34
  115. package/modern/internals/plugins/useTreeViewSelection/useTreeViewSelection.selectors.js +9 -0
  116. package/modern/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.js +23 -13
  117. package/modern/internals/useTreeView/useTreeView.js +30 -17
  118. package/modern/internals/useTreeView/useTreeViewBuildContext.js +24 -18
  119. package/modern/internals/utils/TreeViewStore.js +24 -0
  120. package/modern/internals/utils/selectors.js +37 -0
  121. package/modern/internals/utils/tree.js +51 -43
  122. package/modern/useTreeItem/useTreeItem.js +29 -16
  123. package/node/RichTreeView/RichTreeView.js +2 -4
  124. package/node/TreeItem/TreeItem.js +4 -4
  125. package/node/TreeItemDragAndDropOverlay/TreeItemDragAndDropOverlay.js +2 -2
  126. package/node/TreeItemProvider/TreeItemProvider.js +26 -10
  127. package/node/hooks/index.js +8 -1
  128. package/node/hooks/useTreeItemModel.js +17 -0
  129. package/node/hooks/useTreeItemUtils/useTreeItemUtils.js +32 -15
  130. package/node/index.js +1 -1
  131. package/node/internals/TreeViewProvider/TreeViewChildrenItemProvider.js +6 -22
  132. package/node/internals/TreeViewProvider/TreeViewProvider.js +1 -2
  133. package/node/internals/components/RichTreeViewItems.js +42 -30
  134. package/node/internals/corePlugins/useTreeViewId/useTreeViewId.js +12 -13
  135. package/node/internals/corePlugins/useTreeViewId/useTreeViewId.selectors.js +15 -0
  136. package/node/internals/hooks/useInstanceEventHandler.js +1 -1
  137. package/node/internals/hooks/useSelector.js +13 -0
  138. package/node/internals/index.js +47 -1
  139. package/node/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +41 -31
  140. package/node/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.selectors.js +30 -0
  141. package/node/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.utils.js +27 -0
  142. package/node/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +62 -40
  143. package/node/internals/plugins/useTreeViewFocus/useTreeViewFocus.selectors.js +40 -0
  144. package/node/internals/plugins/useTreeViewIcons/useTreeViewIcons.js +16 -13
  145. package/node/internals/plugins/useTreeViewItems/useTreeViewItems.js +60 -100
  146. package/node/internals/plugins/useTreeViewItems/useTreeViewItems.selectors.js +109 -0
  147. package/node/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js +30 -27
  148. package/node/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +27 -18
  149. package/node/internals/plugins/useTreeViewLabel/useTreeViewLabel.itemPlugin.js +13 -5
  150. package/node/internals/plugins/useTreeViewLabel/useTreeViewLabel.js +19 -30
  151. package/node/internals/plugins/useTreeViewLabel/useTreeViewLabel.selectors.js +32 -0
  152. package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.itemPlugin.js +16 -17
  153. package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +46 -35
  154. package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.selectors.js +15 -0
  155. package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.js +24 -14
  156. package/node/internals/useTreeView/useTreeView.js +30 -17
  157. package/node/internals/useTreeView/useTreeViewBuildContext.js +25 -18
  158. package/node/internals/utils/TreeViewStore.js +31 -0
  159. package/node/internals/utils/selectors.js +44 -0
  160. package/node/internals/utils/tree.js +51 -43
  161. package/node/useTreeItem/useTreeItem.js +29 -16
  162. package/package.json +8 -6
  163. package/useTreeItem/useTreeItem.js +29 -16
  164. package/useTreeItem/useTreeItem.types.d.ts +10 -1
@@ -17,42 +17,45 @@ var _TreeViewChildrenItemProvider = require("../../TreeViewProvider/TreeViewChil
17
17
  var _useTreeViewItems = require("../useTreeViewItems/useTreeViewItems.utils");
18
18
  var _TreeViewItemDepthContext = require("../../TreeViewItemDepthContext");
19
19
  var _useTreeViewId = require("../../corePlugins/useTreeViewId/useTreeViewId.utils");
20
+ var _useTreeItemUtils = require("../../../hooks/useTreeItemUtils/useTreeItemUtils");
21
+ var _useSelector = require("../../hooks/useSelector");
22
+ var _useTreeViewId2 = require("../../corePlugins/useTreeViewId/useTreeViewId.selectors");
20
23
  var _jsxRuntime = require("react/jsx-runtime");
21
24
  const useTreeViewJSXItems = ({
22
25
  instance,
23
- setState
26
+ store
24
27
  }) => {
25
28
  instance.preventItemUpdates();
26
29
  const insertJSXItem = (0, _useEventCallback.default)(item => {
27
- setState(prevState => {
28
- if (prevState.items.itemMetaMap[item.id] != null) {
30
+ store.update(prevState => {
31
+ if (prevState.items.itemMetaLookup[item.id] != null) {
29
32
  throw new Error(['MUI X: The Tree View component requires all items to have a unique `id` property.', 'Alternatively, you can use the `getItemId` prop to specify a custom id for each item.', `Two items were provided with the same id in the \`items\` prop: "${item.id}"`].join('\n'));
30
33
  }
31
34
  return (0, _extends2.default)({}, prevState, {
32
35
  items: (0, _extends2.default)({}, prevState.items, {
33
- itemMetaMap: (0, _extends2.default)({}, prevState.items.itemMetaMap, {
36
+ itemMetaLookup: (0, _extends2.default)({}, prevState.items.itemMetaLookup, {
34
37
  [item.id]: item
35
38
  }),
36
39
  // For Simple Tree View, we don't have a proper `item` object, so we create a very basic one.
37
- itemMap: (0, _extends2.default)({}, prevState.items.itemMap, {
40
+ itemModelLookup: (0, _extends2.default)({}, prevState.items.itemModelLookup, {
38
41
  [item.id]: {
39
42
  id: item.id,
40
- label: item.label
43
+ label: item.label ?? ''
41
44
  }
42
45
  })
43
46
  })
44
47
  });
45
48
  });
46
49
  return () => {
47
- setState(prevState => {
48
- const newItemMetaMap = (0, _extends2.default)({}, prevState.items.itemMetaMap);
49
- const newItemMap = (0, _extends2.default)({}, prevState.items.itemMap);
50
- delete newItemMetaMap[item.id];
51
- delete newItemMap[item.id];
50
+ store.update(prevState => {
51
+ const newItemMetaLookup = (0, _extends2.default)({}, prevState.items.itemMetaLookup);
52
+ const newItemModelLookup = (0, _extends2.default)({}, prevState.items.itemModelLookup);
53
+ delete newItemMetaLookup[item.id];
54
+ delete newItemModelLookup[item.id];
52
55
  return (0, _extends2.default)({}, prevState, {
53
56
  items: (0, _extends2.default)({}, prevState.items, {
54
- itemMetaMap: newItemMetaMap,
55
- itemMap: newItemMap
57
+ itemMetaLookup: newItemMetaLookup,
58
+ itemModelLookup: newItemModelLookup
56
59
  })
57
60
  });
58
61
  });
@@ -63,12 +66,12 @@ const useTreeViewJSXItems = ({
63
66
  });
64
67
  const setJSXItemsOrderedChildrenIds = (parentId, orderedChildrenIds) => {
65
68
  const parentIdWithDefault = parentId ?? _useTreeViewItems.TREE_VIEW_ROOT_PARENT_ID;
66
- setState(prevState => (0, _extends2.default)({}, prevState, {
69
+ store.update(prevState => (0, _extends2.default)({}, prevState, {
67
70
  items: (0, _extends2.default)({}, prevState.items, {
68
- itemOrderedChildrenIds: (0, _extends2.default)({}, prevState.items.itemOrderedChildrenIds, {
71
+ itemOrderedChildrenIdsLookup: (0, _extends2.default)({}, prevState.items.itemOrderedChildrenIdsLookup, {
69
72
  [parentIdWithDefault]: orderedChildrenIds
70
73
  }),
71
- itemChildrenIndexes: (0, _extends2.default)({}, prevState.items.itemChildrenIndexes, {
74
+ itemChildrenIndexesLookup: (0, _extends2.default)({}, prevState.items.itemChildrenIndexesLookup, {
72
75
  [parentIdWithDefault]: (0, _useTreeViewItems.buildSiblingIndexes)(orderedChildrenIds)
73
76
  })
74
77
  })
@@ -96,12 +99,6 @@ const useTreeViewJSXItems = ({
96
99
  };
97
100
  };
98
101
  exports.useTreeViewJSXItems = useTreeViewJSXItems;
99
- const isItemExpandable = reactChildren => {
100
- if (Array.isArray(reactChildren)) {
101
- return reactChildren.length > 0 && reactChildren.some(isItemExpandable);
102
- }
103
- return Boolean(reactChildren);
104
- };
105
102
  const useTreeViewJSXItemsItemPlugin = ({
106
103
  props,
107
104
  rootRef,
@@ -109,7 +106,7 @@ const useTreeViewJSXItemsItemPlugin = ({
109
106
  }) => {
110
107
  const {
111
108
  instance,
112
- treeId
109
+ store
113
110
  } = (0, _TreeViewProvider.useTreeViewContext)();
114
111
  const {
115
112
  children,
@@ -127,9 +124,10 @@ const useTreeViewJSXItemsItemPlugin = ({
127
124
  unregisterChild,
128
125
  parentId
129
126
  } = parentContext;
130
- const expandable = isItemExpandable(children);
127
+ const expandable = (0, _useTreeItemUtils.isItemExpandable)(children);
131
128
  const pluginContentRef = React.useRef(null);
132
129
  const handleContentRef = (0, _useForkRef.default)(pluginContentRef, contentRef);
130
+ const treeId = (0, _useSelector.useSelector)(store, _useTreeViewId2.selectorTreeViewId);
133
131
 
134
132
  // Prevent any flashing
135
133
  (0, _useEnhancedEffect.default)(() => {
@@ -141,9 +139,10 @@ const useTreeViewJSXItemsItemPlugin = ({
141
139
  registerChild(idAttribute, itemId);
142
140
  return () => {
143
141
  unregisterChild(idAttribute);
142
+ unregisterChild(idAttribute);
144
143
  };
145
- }, [registerChild, unregisterChild, itemId, id, treeId]);
146
- React.useEffect(() => {
144
+ }, [store, instance, registerChild, unregisterChild, itemId, id, treeId]);
145
+ (0, _useEnhancedEffect.default)(() => {
147
146
  return instance.insertJSXItem({
148
147
  id: itemId,
149
148
  idAttribute: id,
@@ -166,12 +165,14 @@ const useTreeViewJSXItemsItemPlugin = ({
166
165
  useTreeViewJSXItems.itemPlugin = useTreeViewJSXItemsItemPlugin;
167
166
  useTreeViewJSXItems.wrapItem = ({
168
167
  children,
169
- itemId
168
+ itemId,
169
+ idAttribute
170
170
  }) => {
171
171
  // eslint-disable-next-line react-hooks/rules-of-hooks
172
172
  const depthContext = React.useContext(_TreeViewItemDepthContext.TreeViewItemDepthContext);
173
173
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeViewChildrenItemProvider.TreeViewChildrenItemProvider, {
174
174
  itemId: itemId,
175
+ idAttribute: idAttribute,
175
176
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeViewItemDepthContext.TreeViewItemDepthContext.Provider, {
176
177
  value: depthContext + 1,
177
178
  children: children
@@ -181,6 +182,8 @@ useTreeViewJSXItems.wrapItem = ({
181
182
  useTreeViewJSXItems.wrapRoot = ({
182
183
  children
183
184
  }) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeViewChildrenItemProvider.TreeViewChildrenItemProvider, {
185
+ itemId: null,
186
+ idAttribute: null,
184
187
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeViewItemDepthContext.TreeViewItemDepthContext.Provider, {
185
188
  value: 0,
186
189
  children: children
@@ -12,19 +12,25 @@ var _useEventCallback = _interopRequireDefault(require("@mui/utils/useEventCallb
12
12
  var _tree = require("../../utils/tree");
13
13
  var _plugins = require("../../utils/plugins");
14
14
  var _useTreeViewLabel = require("../useTreeViewLabel");
15
+ var _useSelector = require("../../hooks/useSelector");
16
+ var _useTreeViewItems = require("../useTreeViewItems/useTreeViewItems.selectors");
17
+ var _useTreeViewLabel2 = require("../useTreeViewLabel/useTreeViewLabel.selectors");
18
+ var _useTreeViewSelection = require("../useTreeViewSelection/useTreeViewSelection.selectors");
19
+ var _useTreeViewExpansion = require("../useTreeViewExpansion/useTreeViewExpansion.selectors");
15
20
  function isPrintableKey(string) {
16
21
  return !!string && string.length === 1 && !!string.match(/\S/);
17
22
  }
18
23
  const useTreeViewKeyboardNavigation = ({
19
24
  instance,
20
- params,
21
- state
25
+ store,
26
+ params
22
27
  }) => {
23
28
  const isRtl = (0, _RtlProvider.useRtl)();
24
29
  const firstCharMap = React.useRef({});
25
30
  const updateFirstCharMap = (0, _useEventCallback.default)(callback => {
26
31
  firstCharMap.current = callback(firstCharMap.current);
27
32
  });
33
+ const itemMetaLookup = (0, _useSelector.useSelector)(store, _useTreeViewItems.selectorItemMetaLookup);
28
34
  React.useEffect(() => {
29
35
  if (instance.areItemUpdatesPrevented()) {
30
36
  return;
@@ -33,16 +39,16 @@ const useTreeViewKeyboardNavigation = ({
33
39
  const processItem = item => {
34
40
  newFirstCharMap[item.id] = item.label.substring(0, 1).toLowerCase();
35
41
  };
36
- Object.values(state.items.itemMetaMap).forEach(processItem);
42
+ Object.values(itemMetaLookup).forEach(processItem);
37
43
  firstCharMap.current = newFirstCharMap;
38
- }, [state.items.itemMetaMap, params.getItemId, instance]);
44
+ }, [itemMetaLookup, params.getItemId, instance]);
39
45
  const getFirstMatchingItem = (itemId, query) => {
40
46
  const cleanQuery = query.toLowerCase();
41
47
  const getNextItem = itemIdToCheck => {
42
- const nextItemId = (0, _tree.getNextNavigableItem)(instance, itemIdToCheck);
48
+ const nextItemId = (0, _tree.getNextNavigableItem)(store.value, itemIdToCheck);
43
49
  // We reached the end of the tree, check from the beginning
44
50
  if (nextItemId === null) {
45
- return (0, _tree.getFirstNavigableItem)(instance);
51
+ return (0, _tree.getFirstNavigableItem)(store.value);
46
52
  }
47
53
  return nextItemId;
48
54
  };
@@ -60,9 +66,9 @@ const useTreeViewKeyboardNavigation = ({
60
66
  }
61
67
  return matchingItemId;
62
68
  };
63
- const canToggleItemSelection = itemId => !params.disableSelection && !instance.isItemDisabled(itemId);
69
+ const canToggleItemSelection = itemId => !params.disableSelection && !(0, _useTreeViewItems.selectorIsItemDisabled)(store.value, itemId);
64
70
  const canToggleItemExpansion = itemId => {
65
- return !instance.isItemDisabled(itemId) && instance.isItemExpandable(itemId);
71
+ return !(0, _useTreeViewItems.selectorIsItemDisabled)(store.value, itemId) && (0, _useTreeViewExpansion.selectorIsItemExpandable)(store.value, itemId);
66
72
  };
67
73
 
68
74
  // ARIA specification: https://www.w3.org/WAI/ARIA/apg/patterns/treeview/#keyboardinteraction
@@ -99,7 +105,10 @@ const useTreeViewKeyboardNavigation = ({
99
105
  // If the focused item has no children, we select it.
100
106
  case key === 'Enter':
101
107
  {
102
- if ((0, _plugins.hasPlugin)(instance, _useTreeViewLabel.useTreeViewLabel) && instance.isItemEditable(itemId) && !instance.isItemBeingEdited(itemId)) {
108
+ if ((0, _plugins.hasPlugin)(instance, _useTreeViewLabel.useTreeViewLabel) && (0, _useTreeViewLabel2.selectorIsItemEditable)(store.value, {
109
+ itemId,
110
+ isItemEditable: params.isItemEditable
111
+ }) && !(0, _useTreeViewLabel2.selectorIsItemBeingEdited)(store.value, itemId)) {
103
112
  instance.setEditedItemId(itemId);
104
113
  } else if (canToggleItemExpansion(itemId)) {
105
114
  instance.toggleItemExpansion(event, itemId);
@@ -112,7 +121,7 @@ const useTreeViewKeyboardNavigation = ({
112
121
  itemId,
113
122
  keepExistingSelection: true
114
123
  });
115
- } else if (!instance.isItemSelected(itemId)) {
124
+ } else if (!(0, _useTreeViewSelection.selectorIsItemSelected)(store.value, itemId)) {
116
125
  instance.selectItem({
117
126
  event,
118
127
  itemId
@@ -126,7 +135,7 @@ const useTreeViewKeyboardNavigation = ({
126
135
  // Focus the next focusable item
127
136
  case key === 'ArrowDown':
128
137
  {
129
- const nextItem = (0, _tree.getNextNavigableItem)(instance, itemId);
138
+ const nextItem = (0, _tree.getNextNavigableItem)(store.value, itemId);
130
139
  if (nextItem) {
131
140
  event.preventDefault();
132
141
  instance.focusItem(event, nextItem);
@@ -143,7 +152,7 @@ const useTreeViewKeyboardNavigation = ({
143
152
  // Focuses the previous focusable item
144
153
  case key === 'ArrowUp':
145
154
  {
146
- const previousItem = (0, _tree.getPreviousNavigableItem)(instance, itemId);
155
+ const previousItem = (0, _tree.getPreviousNavigableItem)(store.value, itemId);
147
156
  if (previousItem) {
148
157
  event.preventDefault();
149
158
  instance.focusItem(event, previousItem);
@@ -164,8 +173,8 @@ const useTreeViewKeyboardNavigation = ({
164
173
  if (ctrlPressed) {
165
174
  return;
166
175
  }
167
- if (instance.isItemExpanded(itemId)) {
168
- const nextItemId = (0, _tree.getNextNavigableItem)(instance, itemId);
176
+ if ((0, _useTreeViewExpansion.selectorIsItemExpanded)(store.value, itemId)) {
177
+ const nextItemId = (0, _tree.getNextNavigableItem)(store.value, itemId);
169
178
  if (nextItemId) {
170
179
  instance.focusItem(event, nextItemId);
171
180
  event.preventDefault();
@@ -184,11 +193,11 @@ const useTreeViewKeyboardNavigation = ({
184
193
  if (ctrlPressed) {
185
194
  return;
186
195
  }
187
- if (canToggleItemExpansion(itemId) && instance.isItemExpanded(itemId)) {
196
+ if (canToggleItemExpansion(itemId) && (0, _useTreeViewExpansion.selectorIsItemExpanded)(store.value, itemId)) {
188
197
  instance.toggleItemExpansion(event, itemId);
189
198
  event.preventDefault();
190
199
  } else {
191
- const parent = instance.getItemMeta(itemId).parentId;
200
+ const parent = (0, _useTreeViewItems.selectorItemParentId)(store.value, itemId);
192
201
  if (parent) {
193
202
  instance.focusItem(event, parent);
194
203
  event.preventDefault();
@@ -205,7 +214,7 @@ const useTreeViewKeyboardNavigation = ({
205
214
  if (canToggleItemSelection(itemId) && params.multiSelect && ctrlPressed && event.shiftKey) {
206
215
  instance.selectRangeFromStartToItem(event, itemId);
207
216
  } else {
208
- instance.focusItem(event, (0, _tree.getFirstNavigableItem)(instance));
217
+ instance.focusItem(event, (0, _tree.getFirstNavigableItem)(store.value));
209
218
  }
210
219
  event.preventDefault();
211
220
  break;
@@ -219,7 +228,7 @@ const useTreeViewKeyboardNavigation = ({
219
228
  if (canToggleItemSelection(itemId) && params.multiSelect && ctrlPressed && event.shiftKey) {
220
229
  instance.selectRangeFromItemToEnd(event, itemId);
221
230
  } else {
222
- instance.focusItem(event, (0, _tree.getLastNavigableItem)(instance));
231
+ instance.focusItem(event, (0, _tree.getLastNavigableItem)(store.value));
223
232
  }
224
233
  event.preventDefault();
225
234
  break;
@@ -7,30 +7,38 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.useTreeViewLabelItemPlugin = void 0;
8
8
  var React = _interopRequireWildcard(require("react"));
9
9
  var _TreeViewProvider = require("../../TreeViewProvider");
10
+ var _useSelector = require("../../hooks/useSelector");
11
+ var _useTreeViewLabel = require("./useTreeViewLabel.selectors");
10
12
  const useTreeViewLabelItemPlugin = ({
11
13
  props
12
14
  }) => {
13
15
  const {
14
- instance
16
+ store,
17
+ label: {
18
+ isItemEditable
19
+ }
15
20
  } = (0, _TreeViewProvider.useTreeViewContext)();
16
21
  const {
17
22
  label,
18
23
  itemId
19
24
  } = props;
20
25
  const [labelInputValue, setLabelInputValue] = React.useState(label);
21
- const isItemBeingEdited = instance.isItemBeingEdited(itemId);
26
+ const editable = (0, _useSelector.useSelector)(store, _useTreeViewLabel.selectorIsItemEditable, {
27
+ itemId,
28
+ isItemEditable
29
+ });
30
+ const editing = (0, _useSelector.useSelector)(store, _useTreeViewLabel.selectorIsItemBeingEdited, itemId);
22
31
  React.useEffect(() => {
23
- if (!isItemBeingEdited) {
32
+ if (!editing) {
24
33
  setLabelInputValue(label);
25
34
  }
26
- }, [isItemBeingEdited, label]);
35
+ }, [editing, label]);
27
36
  return {
28
37
  propsEnhancers: {
29
38
  labelInput: ({
30
39
  externalEventHandlers,
31
40
  interactions
32
41
  }) => {
33
- const editable = instance.isItemEditable(itemId);
34
42
  if (!editable) {
35
43
  return {};
36
44
  }
@@ -11,41 +11,26 @@ var React = _interopRequireWildcard(require("react"));
11
11
  var _warning = require("@mui/x-internals/warning");
12
12
  var _useTreeViewLabel = require("./useTreeViewLabel.itemPlugin");
13
13
  const useTreeViewLabel = ({
14
- instance,
15
- state,
16
- setState,
14
+ store,
17
15
  params
18
16
  }) => {
19
- const editedItemRef = React.useRef(state.editedItemId);
20
- const isItemBeingEditedRef = itemId => editedItemRef.current === itemId;
21
17
  const setEditedItemId = editedItemId => {
22
- setState(prevState => (0, _extends2.default)({}, prevState, {
23
- editedItemId
18
+ store.update(prevState => (0, _extends2.default)({}, prevState, {
19
+ label: {
20
+ editedItemId
21
+ }
24
22
  }));
25
- editedItemRef.current = editedItemId;
26
- };
27
- const isItemBeingEdited = itemId => itemId === state.editedItemId;
28
- const isTreeViewEditable = Boolean(params.isItemEditable);
29
- const isItemEditable = itemId => {
30
- if (itemId == null || !isTreeViewEditable) {
31
- return false;
32
- }
33
- const item = instance.getItem(itemId);
34
- if (!item) {
35
- return false;
36
- }
37
- return typeof params.isItemEditable === 'function' ? params.isItemEditable(item) : Boolean(params.isItemEditable);
38
23
  };
39
24
  const updateItemLabel = (itemId, label) => {
40
25
  if (!label) {
41
26
  throw new Error(['MUI X: The Tree View component requires all items to have a `label` property.', 'The label of an item cannot be empty.', itemId].join('\n'));
42
27
  }
43
- setState(prevState => {
44
- const item = prevState.items.itemMetaMap[itemId];
28
+ store.update(prevState => {
29
+ const item = prevState.items.itemMetaLookup[itemId];
45
30
  if (item.label !== label) {
46
31
  return (0, _extends2.default)({}, prevState, {
47
32
  items: (0, _extends2.default)({}, prevState.items, {
48
- itemMetaMap: (0, _extends2.default)({}, prevState.items.itemMetaMap, {
33
+ itemMetaLookup: (0, _extends2.default)({}, prevState.items.itemMetaLookup, {
49
34
  [itemId]: (0, _extends2.default)({}, item, {
50
35
  label
51
36
  })
@@ -59,18 +44,20 @@ const useTreeViewLabel = ({
59
44
  params.onItemLabelChange(itemId, label);
60
45
  }
61
46
  };
47
+ const pluginContextValue = React.useMemo(() => ({
48
+ label: {
49
+ isItemEditable: params.isItemEditable
50
+ }
51
+ }), [params.isItemEditable]);
62
52
  return {
63
53
  instance: {
64
54
  setEditedItemId,
65
- isItemBeingEdited,
66
- updateItemLabel,
67
- isItemEditable,
68
- isTreeViewEditable,
69
- isItemBeingEditedRef
55
+ updateItemLabel
70
56
  },
71
57
  publicAPI: {
72
58
  updateItemLabel
73
- }
59
+ },
60
+ contextValue: pluginContextValue
74
61
  };
75
62
  };
76
63
  exports.useTreeViewLabel = useTreeViewLabel;
@@ -90,7 +77,9 @@ useTreeViewLabel.getDefaultizedParams = ({
90
77
  });
91
78
  };
92
79
  useTreeViewLabel.getInitialState = () => ({
93
- editedItemId: null
80
+ label: {
81
+ editedItemId: null
82
+ }
94
83
  });
95
84
  useTreeViewLabel.params = {
96
85
  onItemLabelChange: true,
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.selectorIsItemEditable = exports.selectorIsItemBeingEdited = void 0;
7
+ var _selectors = require("../../utils/selectors");
8
+ var _useTreeViewItems = require("../useTreeViewItems/useTreeViewItems.selectors");
9
+ const selectorTreeViewLabelState = state => state.label;
10
+
11
+ /**
12
+ * Check if an item is editable.
13
+ * @param {TreeViewState<[UseTreeViewItemsSignature]>} state The state of the tree view.
14
+ * @param {object} params The parameters.
15
+ * @param {TreeViewItemId} params.itemId The id of the item to check.
16
+ * @param {((item: any) => boolean) | boolean} params.isItemEditable The function to determine if an item is editable.
17
+ * @returns {boolean} `true` if the item is editable, `false` otherwise.
18
+ */
19
+ const selectorIsItemEditable = exports.selectorIsItemEditable = (0, _selectors.createSelector)([(_, args) => args, (state, args) => (0, _useTreeViewItems.selectorItemModel)(state, args.itemId)], (args, itemModel) => {
20
+ if (!itemModel || !args.isItemEditable) {
21
+ return false;
22
+ }
23
+ return typeof args.isItemEditable === 'function' ? args.isItemEditable(itemModel) : true;
24
+ });
25
+
26
+ /**
27
+ * Check if an item is being edited.
28
+ * @param {TreeViewState<[UseTreeViewLabelSignature]>} state The state of the tree view.
29
+ * @param {TreeViewItemId} itemId The id of the item to check.
30
+ * @returns {boolean} `true` if the item is being edited, `false` otherwise.
31
+ */
32
+ const selectorIsItemBeingEdited = exports.selectorIsItemBeingEdited = (0, _selectors.createSelector)([selectorTreeViewLabelState, (_, itemId) => itemId], (labelState, itemId) => labelState.editedItemId === itemId);
@@ -7,19 +7,20 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.useTreeViewSelectionItemPlugin = void 0;
8
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
  var _TreeViewProvider = require("../../TreeViewProvider");
10
- function getCheckboxStatus({
10
+ var _useTreeViewItems = require("../useTreeViewItems/useTreeViewItems.selectors");
11
+ var _useTreeViewSelection = require("./useTreeViewSelection.selectors");
12
+ var _useSelector = require("../../hooks/useSelector");
13
+ function selectorItemCheckboxStatus(state, {
11
14
  itemId,
12
- instance,
13
- selectionPropagation,
14
- selected
15
+ selectionPropagation
15
16
  }) {
16
- if (selected) {
17
+ if ((0, _useTreeViewSelection.selectorIsItemSelected)(state, itemId)) {
17
18
  return {
18
19
  indeterminate: false,
19
20
  checked: true
20
21
  };
21
22
  }
22
- const children = instance.getItemOrderedChildrenIds(itemId);
23
+ const children = (0, _useTreeViewItems.selectorItemOrderedChildrenIds)(state, itemId);
23
24
  if (children.length === 0) {
24
25
  return {
25
26
  indeterminate: false,
@@ -30,18 +31,18 @@ function getCheckboxStatus({
30
31
  let hasUnSelectedDescendant = false;
31
32
  const traverseDescendants = itemToTraverseId => {
32
33
  if (itemToTraverseId !== itemId) {
33
- if (instance.isItemSelected(itemToTraverseId)) {
34
+ if ((0, _useTreeViewSelection.selectorIsItemSelected)(state, itemToTraverseId)) {
34
35
  hasSelectedDescendant = true;
35
36
  } else {
36
37
  hasUnSelectedDescendant = true;
37
38
  }
38
39
  }
39
- instance.getItemOrderedChildrenIds(itemToTraverseId).forEach(traverseDescendants);
40
+ (0, _useTreeViewItems.selectorItemOrderedChildrenIds)(state, itemToTraverseId).forEach(traverseDescendants);
40
41
  };
41
42
  traverseDescendants(itemId);
42
43
  return {
43
- indeterminate: hasSelectedDescendant && hasUnSelectedDescendant || !hasUnSelectedDescendant && !selected,
44
- checked: selectionPropagation.parents ? hasSelectedDescendant : selected
44
+ indeterminate: hasSelectedDescendant && hasUnSelectedDescendant || !hasUnSelectedDescendant,
45
+ checked: selectionPropagation.parents ? hasSelectedDescendant : false
45
46
  };
46
47
  }
47
48
  const useTreeViewSelectionItemPlugin = ({
@@ -51,13 +52,17 @@ const useTreeViewSelectionItemPlugin = ({
51
52
  itemId
52
53
  } = props;
53
54
  const {
54
- instance,
55
+ store,
55
56
  selection: {
56
57
  disableSelection,
57
58
  checkboxSelection,
58
59
  selectionPropagation
59
60
  }
60
61
  } = (0, _TreeViewProvider.useTreeViewContext)();
62
+ const checkboxStatus = (0, _useSelector.useSelector)(store, selectorItemCheckboxStatus, {
63
+ itemId,
64
+ selectionPropagation
65
+ }, (a, b) => a.checked === b.checked && a.indeterminate === b.indeterminate);
61
66
  return {
62
67
  propsEnhancers: {
63
68
  checkbox: ({
@@ -75,12 +80,6 @@ const useTreeViewSelectionItemPlugin = ({
75
80
  }
76
81
  interactions.handleCheckboxSelection(event);
77
82
  };
78
- const checkboxStatus = getCheckboxStatus({
79
- instance,
80
- itemId,
81
- selectionPropagation,
82
- selected: status.selected
83
- });
84
83
  return (0, _extends2.default)({
85
84
  visible: checkboxSelection,
86
85
  disabled: disableSelection || status.disabled,