@mui/x-tree-view 7.0.0 → 7.1.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 (95) hide show
  1. package/CHANGELOG.md +71 -0
  2. package/RichTreeView/RichTreeView.js +4 -4
  3. package/SimpleTreeView/SimpleTreeView.plugins.d.ts +1 -1
  4. package/SimpleTreeView/SimpleTreeView.plugins.js +2 -2
  5. package/TreeItem/TreeItem.js +4 -4
  6. package/TreeItem/treeItemClasses.d.ts +1 -1
  7. package/TreeItem/useTreeItemState.js +9 -9
  8. package/TreeItem2Icon/TreeItem2Icon.types.d.ts +4 -4
  9. package/hooks/useTreeItem2Utils/useTreeItem2Utils.js +8 -8
  10. package/hooks/useTreeViewApiRef.d.ts +1 -1
  11. package/index.js +1 -1
  12. package/internals/TreeViewProvider/DescendantProvider.d.ts +1 -1
  13. package/internals/TreeViewProvider/DescendantProvider.js +1 -1
  14. package/internals/index.d.ts +2 -2
  15. package/internals/plugins/defaultPlugins.d.ts +3 -3
  16. package/internals/plugins/defaultPlugins.js +2 -2
  17. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +9 -9
  18. package/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.types.d.ts +5 -5
  19. package/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +35 -33
  20. package/internals/plugins/useTreeViewFocus/useTreeViewFocus.types.d.ts +6 -6
  21. package/internals/plugins/useTreeViewIcons/useTreeViewIcons.types.d.ts +6 -6
  22. package/internals/plugins/useTreeViewId/useTreeViewId.types.d.ts +1 -1
  23. package/internals/plugins/useTreeViewItems/index.d.ts +2 -0
  24. package/internals/plugins/useTreeViewItems/index.js +1 -0
  25. package/internals/plugins/useTreeViewItems/useTreeViewItems.d.ts +3 -0
  26. package/internals/plugins/{useTreeViewNodes/useTreeViewNodes.js → useTreeViewItems/useTreeViewItems.js} +42 -32
  27. package/internals/plugins/{useTreeViewNodes/useTreeViewNodes.types.d.ts → useTreeViewItems/useTreeViewItems.types.d.ts} +32 -21
  28. package/internals/plugins/useTreeViewJSXItems/index.d.ts +2 -0
  29. package/internals/plugins/useTreeViewJSXItems/index.js +1 -0
  30. package/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.d.ts +3 -0
  31. package/{modern/internals/plugins/useTreeViewJSXNodes/useTreeViewJSXNodes.js → internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js} +26 -25
  32. package/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.types.d.ts +18 -0
  33. package/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +40 -44
  34. package/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.types.d.ts +2 -2
  35. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +34 -34
  36. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.types.d.ts +6 -6
  37. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.d.ts +7 -7
  38. package/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.js +5 -5
  39. package/internals/useTreeView/useTreeView.utils.d.ts +5 -5
  40. package/internals/useTreeView/useTreeView.utils.js +15 -15
  41. package/modern/RichTreeView/RichTreeView.js +4 -4
  42. package/modern/SimpleTreeView/SimpleTreeView.plugins.js +2 -2
  43. package/modern/TreeItem/TreeItem.js +4 -4
  44. package/modern/TreeItem/useTreeItemState.js +9 -9
  45. package/modern/hooks/useTreeItem2Utils/useTreeItem2Utils.js +8 -8
  46. package/modern/index.js +1 -1
  47. package/modern/internals/TreeViewProvider/DescendantProvider.js +1 -1
  48. package/modern/internals/plugins/defaultPlugins.js +2 -2
  49. package/modern/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +9 -9
  50. package/modern/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +35 -33
  51. package/modern/internals/plugins/useTreeViewItems/index.js +1 -0
  52. package/modern/internals/plugins/{useTreeViewNodes/useTreeViewNodes.js → useTreeViewItems/useTreeViewItems.js} +42 -32
  53. package/modern/internals/plugins/useTreeViewJSXItems/index.js +1 -0
  54. package/{internals/plugins/useTreeViewJSXNodes/useTreeViewJSXNodes.js → modern/internals/plugins/useTreeViewJSXItems/useTreeViewJSXItems.js} +26 -25
  55. package/modern/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +40 -44
  56. package/modern/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +34 -34
  57. package/modern/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.js +5 -5
  58. package/modern/internals/useTreeView/useTreeView.utils.js +15 -15
  59. package/node/RichTreeView/RichTreeView.js +4 -4
  60. package/node/SimpleTreeView/SimpleTreeView.plugins.js +2 -2
  61. package/node/TreeItem/TreeItem.js +4 -4
  62. package/node/TreeItem/useTreeItemState.js +9 -9
  63. package/node/hooks/useTreeItem2Utils/useTreeItem2Utils.js +8 -8
  64. package/node/index.js +1 -1
  65. package/node/internals/TreeViewProvider/DescendantProvider.js +1 -1
  66. package/node/internals/plugins/defaultPlugins.js +2 -2
  67. package/node/internals/plugins/useTreeViewExpansion/useTreeViewExpansion.js +9 -9
  68. package/node/internals/plugins/useTreeViewFocus/useTreeViewFocus.js +35 -33
  69. package/node/internals/plugins/useTreeViewItems/index.js +12 -0
  70. package/node/internals/plugins/{useTreeViewNodes/useTreeViewNodes.js → useTreeViewItems/useTreeViewItems.js} +44 -34
  71. package/node/internals/plugins/useTreeViewJSXItems/index.js +12 -0
  72. package/node/internals/plugins/{useTreeViewJSXNodes/useTreeViewJSXNodes.js → useTreeViewJSXItems/useTreeViewJSXItems.js} +28 -27
  73. package/node/internals/plugins/useTreeViewKeyboardNavigation/useTreeViewKeyboardNavigation.js +39 -43
  74. package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.js +33 -33
  75. package/node/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.js +5 -5
  76. package/node/internals/useTreeView/useTreeView.utils.js +20 -20
  77. package/package.json +1 -1
  78. package/useTreeItem2/useTreeItem2.d.ts +1 -1
  79. package/internals/plugins/useTreeViewJSXNodes/index.d.ts +0 -2
  80. package/internals/plugins/useTreeViewJSXNodes/index.js +0 -1
  81. package/internals/plugins/useTreeViewJSXNodes/useTreeViewJSXNodes.d.ts +0 -3
  82. package/internals/plugins/useTreeViewJSXNodes/useTreeViewJSXNodes.types.d.ts +0 -18
  83. package/internals/plugins/useTreeViewNodes/index.d.ts +0 -2
  84. package/internals/plugins/useTreeViewNodes/index.js +0 -1
  85. package/internals/plugins/useTreeViewNodes/useTreeViewNodes.d.ts +0 -3
  86. package/modern/internals/plugins/useTreeViewJSXNodes/index.js +0 -1
  87. package/modern/internals/plugins/useTreeViewNodes/index.js +0 -1
  88. package/node/internals/plugins/useTreeViewJSXNodes/index.js +0 -12
  89. package/node/internals/plugins/useTreeViewNodes/index.js +0 -12
  90. /package/internals/plugins/{useTreeViewJSXNodes/useTreeViewJSXNodes.types.js → useTreeViewItems/useTreeViewItems.types.js} +0 -0
  91. /package/internals/plugins/{useTreeViewNodes/useTreeViewNodes.types.js → useTreeViewJSXItems/useTreeViewJSXItems.types.js} +0 -0
  92. /package/modern/internals/plugins/{useTreeViewJSXNodes/useTreeViewJSXNodes.types.js → useTreeViewItems/useTreeViewItems.types.js} +0 -0
  93. /package/modern/internals/plugins/{useTreeViewNodes/useTreeViewNodes.types.js → useTreeViewJSXItems/useTreeViewJSXItems.types.js} +0 -0
  94. /package/node/internals/plugins/{useTreeViewJSXNodes/useTreeViewJSXNodes.types.js → useTreeViewItems/useTreeViewItems.types.js} +0 -0
  95. /package/node/internals/plugins/{useTreeViewNodes/useTreeViewNodes.types.js → useTreeViewJSXItems/useTreeViewJSXItems.types.js} +0 -0
@@ -1,19 +1,19 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import * as React from 'react';
3
- import { populateInstance, getNextNode, getFirstNode, getLastNode } from '../../useTreeView/useTreeView.utils';
3
+ import { populateInstance, getNextItem, getFirstItem, getLastItem } from '../../useTreeView/useTreeView.utils';
4
4
  import { findOrderInTremauxTree } from './useTreeViewSelection.utils';
5
5
  export const useTreeViewSelection = ({
6
6
  instance,
7
7
  params,
8
8
  models
9
9
  }) => {
10
- const lastSelectedNode = React.useRef(null);
10
+ const lastSelectedItem = React.useRef(null);
11
11
  const lastSelectionWasRange = React.useRef(false);
12
12
  const currentRangeSelection = React.useRef([]);
13
13
  const setSelectedItems = (event, newSelectedItems) => {
14
14
  if (params.onItemSelectionToggle) {
15
15
  if (params.multiSelect) {
16
- const addedItems = newSelectedItems.filter(itemId => !instance.isNodeSelected(itemId));
16
+ const addedItems = newSelectedItems.filter(itemId => !instance.isItemSelected(itemId));
17
17
  const removedItems = models.selectedItems.value.filter(itemId => !newSelectedItems.includes(itemId));
18
18
  addedItems.forEach(itemId => {
19
19
  params.onItemSelectionToggle(event, itemId, true);
@@ -35,8 +35,8 @@ export const useTreeViewSelection = ({
35
35
  }
36
36
  models.selectedItems.setControlledValue(newSelectedItems);
37
37
  };
38
- const isNodeSelected = itemId => Array.isArray(models.selectedItems.value) ? models.selectedItems.value.indexOf(itemId) !== -1 : models.selectedItems.value === itemId;
39
- const selectNode = (event, itemId, multiple = false) => {
38
+ const isItemSelected = itemId => Array.isArray(models.selectedItems.value) ? models.selectedItems.value.indexOf(itemId) !== -1 : models.selectedItems.value === itemId;
39
+ const selectItem = (event, itemId, multiple = false) => {
40
40
  if (params.disableSelection) {
41
41
  return;
42
42
  }
@@ -54,27 +54,27 @@ export const useTreeViewSelection = ({
54
54
  const newSelected = params.multiSelect ? [itemId] : itemId;
55
55
  setSelectedItems(event, newSelected);
56
56
  }
57
- lastSelectedNode.current = itemId;
57
+ lastSelectedItem.current = itemId;
58
58
  lastSelectionWasRange.current = false;
59
59
  currentRangeSelection.current = [];
60
60
  };
61
- const getNodesInRange = (nodeAId, nodeBId) => {
62
- const [first, last] = findOrderInTremauxTree(instance, nodeAId, nodeBId);
63
- const nodes = [first];
61
+ const getItemsInRange = (itemAId, itemBId) => {
62
+ const [first, last] = findOrderInTremauxTree(instance, itemAId, itemBId);
63
+ const items = [first];
64
64
  let current = first;
65
65
  while (current !== last) {
66
- current = getNextNode(instance, current);
67
- nodes.push(current);
66
+ current = getNextItem(instance, current);
67
+ items.push(current);
68
68
  }
69
- return nodes;
69
+ return items;
70
70
  };
71
- const handleRangeArrowSelect = (event, nodes) => {
71
+ const handleRangeArrowSelect = (event, items) => {
72
72
  let base = models.selectedItems.value.slice();
73
73
  const {
74
74
  start,
75
75
  next,
76
76
  current
77
- } = nodes;
77
+ } = items;
78
78
  if (!next || !current) {
79
79
  return;
80
80
  }
@@ -95,32 +95,32 @@ export const useTreeViewSelection = ({
95
95
  }
96
96
  setSelectedItems(event, base);
97
97
  };
98
- const handleRangeSelect = (event, nodes) => {
98
+ const handleRangeSelect = (event, items) => {
99
99
  let base = models.selectedItems.value.slice();
100
100
  const {
101
101
  start,
102
102
  end
103
- } = nodes;
104
- // If last selection was a range selection ignore nodes that were selected.
103
+ } = items;
104
+ // If last selection was a range selection ignore items that were selected.
105
105
  if (lastSelectionWasRange.current) {
106
106
  base = base.filter(id => currentRangeSelection.current.indexOf(id) === -1);
107
107
  }
108
- let range = getNodesInRange(start, end);
109
- range = range.filter(node => !instance.isNodeDisabled(node));
108
+ let range = getItemsInRange(start, end);
109
+ range = range.filter(item => !instance.isItemDisabled(item));
110
110
  currentRangeSelection.current = range;
111
111
  let newSelected = base.concat(range);
112
112
  newSelected = newSelected.filter((id, i) => newSelected.indexOf(id) === i);
113
113
  setSelectedItems(event, newSelected);
114
114
  };
115
- const selectRange = (event, nodes, stacked = false) => {
115
+ const selectRange = (event, items, stacked = false) => {
116
116
  if (params.disableSelection) {
117
117
  return;
118
118
  }
119
119
  const {
120
- start = lastSelectedNode.current,
120
+ start = lastSelectedItem.current,
121
121
  end,
122
122
  current
123
- } = nodes;
123
+ } = items;
124
124
  if (stacked) {
125
125
  handleRangeArrowSelect(event, {
126
126
  start,
@@ -136,28 +136,28 @@ export const useTreeViewSelection = ({
136
136
  lastSelectionWasRange.current = true;
137
137
  };
138
138
  const rangeSelectToFirst = (event, itemId) => {
139
- if (!lastSelectedNode.current) {
140
- lastSelectedNode.current = itemId;
139
+ if (!lastSelectedItem.current) {
140
+ lastSelectedItem.current = itemId;
141
141
  }
142
- const start = lastSelectionWasRange.current ? lastSelectedNode.current : itemId;
142
+ const start = lastSelectionWasRange.current ? lastSelectedItem.current : itemId;
143
143
  instance.selectRange(event, {
144
144
  start,
145
- end: getFirstNode(instance)
145
+ end: getFirstItem(instance)
146
146
  });
147
147
  };
148
148
  const rangeSelectToLast = (event, itemId) => {
149
- if (!lastSelectedNode.current) {
150
- lastSelectedNode.current = itemId;
149
+ if (!lastSelectedItem.current) {
150
+ lastSelectedItem.current = itemId;
151
151
  }
152
- const start = lastSelectionWasRange.current ? lastSelectedNode.current : itemId;
152
+ const start = lastSelectionWasRange.current ? lastSelectedItem.current : itemId;
153
153
  instance.selectRange(event, {
154
154
  start,
155
- end: getLastNode(instance)
155
+ end: getLastItem(instance)
156
156
  });
157
157
  };
158
158
  populateInstance(instance, {
159
- isNodeSelected,
160
- selectNode,
159
+ isItemSelected,
160
+ selectItem,
161
161
  selectRange,
162
162
  rangeSelectToLast,
163
163
  rangeSelectToFirst
@@ -178,11 +178,11 @@ useTreeViewSelection.models = {
178
178
  getDefaultValue: params => params.defaultSelectedItems
179
179
  }
180
180
  };
181
- const DEFAULT_SELECTED_NODES = [];
181
+ const DEFAULT_SELECTED_ITEMS = [];
182
182
  useTreeViewSelection.getDefaultizedParams = params => _extends({}, params, {
183
183
  disableSelection: params.disableSelection ?? false,
184
184
  multiSelect: params.multiSelect ?? false,
185
- defaultSelectedItems: params.defaultSelectedItems ?? (params.multiSelect ? DEFAULT_SELECTED_NODES : null)
185
+ defaultSelectedItems: params.defaultSelectedItems ?? (params.multiSelect ? DEFAULT_SELECTED_ITEMS : null)
186
186
  });
187
187
  useTreeViewSelection.params = {
188
188
  disableSelection: true,
@@ -1,11 +1,11 @@
1
1
  import * as React from 'react';
2
2
  import type { DefaultizedProps, TreeViewItemRange, TreeViewPluginSignature } from '../../models';
3
- import { UseTreeViewNodesSignature } from '../useTreeViewNodes';
3
+ import { UseTreeViewItemsSignature } from '../useTreeViewItems';
4
4
  import { UseTreeViewExpansionSignature } from '../useTreeViewExpansion';
5
5
  export interface UseTreeViewSelectionInstance {
6
- isNodeSelected: (itemId: string) => boolean;
7
- selectNode: (event: React.SyntheticEvent, itemId: string, multiple?: boolean) => void;
8
- selectRange: (event: React.SyntheticEvent, nodes: TreeViewItemRange, stacked?: boolean) => void;
6
+ isItemSelected: (itemId: string) => boolean;
7
+ selectItem: (event: React.SyntheticEvent, itemId: string, multiple?: boolean) => void;
8
+ selectRange: (event: React.SyntheticEvent, items: TreeViewItemRange, stacked?: boolean) => void;
9
9
  rangeSelectToFirst: (event: React.KeyboardEvent, itemId: string) => void;
10
10
  rangeSelectToLast: (event: React.KeyboardEvent, itemId: string) => void;
11
11
  }
@@ -58,9 +58,9 @@ export type UseTreeViewSelectionSignature = TreeViewPluginSignature<{
58
58
  contextValue: UseTreeViewSelectionContextValue;
59
59
  modelNames: 'selectedItems';
60
60
  dependantPlugins: [
61
- UseTreeViewNodesSignature,
61
+ UseTreeViewItemsSignature,
62
62
  UseTreeViewExpansionSignature,
63
- UseTreeViewNodesSignature
63
+ UseTreeViewItemsSignature
64
64
  ];
65
65
  }>;
66
66
  export {};
@@ -1,17 +1,17 @@
1
1
  import { TreeViewInstance } from '../../models';
2
- import { UseTreeViewNodesSignature } from '../useTreeViewNodes';
2
+ import { UseTreeViewItemsSignature } from '../useTreeViewItems';
3
3
  /**
4
4
  * This is used to determine the start and end of a selection range so
5
- * we can get the nodes between the two border nodes.
5
+ * we can get the items between the two border items.
6
6
  *
7
- * It finds the nodes' common ancestor using
7
+ * It finds the items' common ancestor using
8
8
  * a naive implementation of a lowest common ancestor algorithm
9
9
  * (https://en.wikipedia.org/wiki/Lowest_common_ancestor).
10
- * Then compares the ancestor's 2 children that are ancestors of nodeA and NodeB
11
- * so we can compare their indexes to work out which node comes first in a depth first search.
10
+ * Then compares the ancestor's 2 children that are ancestors of itemA and ItemB
11
+ * so we can compare their indexes to work out which item comes first in a depth first search.
12
12
  * (https://en.wikipedia.org/wiki/Depth-first_search)
13
13
  *
14
- * Another way to put it is which node is shallower in a trémaux tree
14
+ * Another way to put it is which item is shallower in a trémaux tree
15
15
  * https://en.wikipedia.org/wiki/Tr%C3%A9maux_tree
16
16
  */
17
- export declare const findOrderInTremauxTree: (instance: TreeViewInstance<[UseTreeViewNodesSignature]>, nodeAId: string, nodeBId: string) => string[];
17
+ export declare const findOrderInTremauxTree: (instance: TreeViewInstance<[UseTreeViewItemsSignature]>, nodeAId: string, nodeBId: string) => string[];
@@ -1,15 +1,15 @@
1
1
  /**
2
2
  * This is used to determine the start and end of a selection range so
3
- * we can get the nodes between the two border nodes.
3
+ * we can get the items between the two border items.
4
4
  *
5
- * It finds the nodes' common ancestor using
5
+ * It finds the items' common ancestor using
6
6
  * a naive implementation of a lowest common ancestor algorithm
7
7
  * (https://en.wikipedia.org/wiki/Lowest_common_ancestor).
8
- * Then compares the ancestor's 2 children that are ancestors of nodeA and NodeB
9
- * so we can compare their indexes to work out which node comes first in a depth first search.
8
+ * Then compares the ancestor's 2 children that are ancestors of itemA and ItemB
9
+ * so we can compare their indexes to work out which item comes first in a depth first search.
10
10
  * (https://en.wikipedia.org/wiki/Depth-first_search)
11
11
  *
12
- * Another way to put it is which node is shallower in a trémaux tree
12
+ * Another way to put it is which item is shallower in a trémaux tree
13
13
  * https://en.wikipedia.org/wiki/Tr%C3%A9maux_tree
14
14
  */
15
15
  export const findOrderInTremauxTree = (instance, nodeAId, nodeBId) => {
@@ -1,9 +1,9 @@
1
1
  import { TreeViewAnyPluginSignature, TreeViewInstance, TreeViewUsedInstance, TreeViewUsedPublicAPI } from '../models';
2
2
  import type { UseTreeViewExpansionSignature } from '../plugins/useTreeViewExpansion';
3
- import type { UseTreeViewNodesSignature } from '../plugins/useTreeViewNodes';
4
- export declare const getPreviousNode: (instance: TreeViewInstance<[UseTreeViewNodesSignature, UseTreeViewExpansionSignature]>, itemId: string) => string | null;
5
- export declare const getNextNode: (instance: TreeViewInstance<[UseTreeViewExpansionSignature, UseTreeViewNodesSignature]>, itemId: string) => string | null;
6
- export declare const getLastNode: (instance: TreeViewInstance<[UseTreeViewExpansionSignature, UseTreeViewNodesSignature]>) => string;
7
- export declare const getFirstNode: (instance: TreeViewInstance<[UseTreeViewNodesSignature]>) => string;
3
+ import type { UseTreeViewItemsSignature } from '../plugins/useTreeViewItems';
4
+ export declare const getPreviousItem: (instance: TreeViewInstance<[UseTreeViewItemsSignature, UseTreeViewExpansionSignature]>, itemId: string) => string | null;
5
+ export declare const getNextItem: (instance: TreeViewInstance<[UseTreeViewExpansionSignature, UseTreeViewItemsSignature]>, itemId: string) => string | null;
6
+ export declare const getLastItem: (instance: TreeViewInstance<[UseTreeViewExpansionSignature, UseTreeViewItemsSignature]>) => string;
7
+ export declare const getFirstItem: (instance: TreeViewInstance<[UseTreeViewItemsSignature]>) => string;
8
8
  export declare const populateInstance: <T extends TreeViewAnyPluginSignature>(instance: TreeViewUsedInstance<T>, methods: T["instance"]) => void;
9
9
  export declare const populatePublicAPI: <T extends TreeViewAnyPluginSignature>(publicAPI: TreeViewUsedPublicAPI<T>, methods: T["publicAPI"]) => void;
@@ -1,43 +1,43 @@
1
- export const getPreviousNode = (instance, itemId) => {
2
- const item = instance.getNode(itemId);
3
- const siblings = instance.getNavigableChildrenIds(item.parentId);
1
+ export const getPreviousItem = (instance, itemId) => {
2
+ const node = instance.getNode(itemId);
3
+ const siblings = instance.getNavigableChildrenIds(node.parentId);
4
4
  const itemIndex = siblings.indexOf(itemId);
5
5
  if (itemIndex === 0) {
6
- return item.parentId;
6
+ return node.parentId;
7
7
  }
8
8
  let currentItem = siblings[itemIndex - 1];
9
- while (instance.isNodeExpanded(currentItem) && instance.getNavigableChildrenIds(currentItem).length > 0) {
9
+ while (instance.isItemExpanded(currentItem) && instance.getNavigableChildrenIds(currentItem).length > 0) {
10
10
  currentItem = instance.getNavigableChildrenIds(currentItem).pop();
11
11
  }
12
12
  return currentItem;
13
13
  };
14
- export const getNextNode = (instance, itemId) => {
14
+ export const getNextItem = (instance, itemId) => {
15
15
  // If expanded get first child
16
- if (instance.isNodeExpanded(itemId) && instance.getNavigableChildrenIds(itemId).length > 0) {
16
+ if (instance.isItemExpanded(itemId) && instance.getNavigableChildrenIds(itemId).length > 0) {
17
17
  return instance.getNavigableChildrenIds(itemId)[0];
18
18
  }
19
- let item = instance.getNode(itemId);
20
- while (item != null) {
19
+ let node = instance.getNode(itemId);
20
+ while (node != null) {
21
21
  // Try to get next sibling
22
- const siblings = instance.getNavigableChildrenIds(item.parentId);
23
- const nextSibling = siblings[siblings.indexOf(item.id) + 1];
22
+ const siblings = instance.getNavigableChildrenIds(node.parentId);
23
+ const nextSibling = siblings[siblings.indexOf(node.id) + 1];
24
24
  if (nextSibling) {
25
25
  return nextSibling;
26
26
  }
27
27
 
28
28
  // If the sibling does not exist, go up a level to the parent and try again.
29
- item = instance.getNode(item.parentId);
29
+ node = instance.getNode(node.parentId);
30
30
  }
31
31
  return null;
32
32
  };
33
- export const getLastNode = instance => {
33
+ export const getLastItem = instance => {
34
34
  let lastItem = instance.getNavigableChildrenIds(null).pop();
35
- while (instance.isNodeExpanded(lastItem)) {
35
+ while (instance.isItemExpanded(lastItem)) {
36
36
  lastItem = instance.getNavigableChildrenIds(lastItem).pop();
37
37
  }
38
38
  return lastItem;
39
39
  };
40
- export const getFirstNode = instance => instance.getNavigableChildrenIds(null)[0];
40
+ export const getFirstItem = instance => instance.getNavigableChildrenIds(null)[0];
41
41
  export const populateInstance = (instance, methods) => {
42
42
  Object.assign(instance, methods);
43
43
  };
@@ -104,8 +104,8 @@ const RichTreeView = /*#__PURE__*/React.forwardRef(function RichTreeView(inProps
104
104
  getSlotProps: getRootProps,
105
105
  ownerState: props
106
106
  });
107
- const nodesToRender = instance.getNodesToRender();
108
- const renderNode = ({
107
+ const itemsToRender = instance.getItemsToRender();
108
+ const renderItem = ({
109
109
  label,
110
110
  itemId,
111
111
  id,
@@ -117,13 +117,13 @@ const RichTreeView = /*#__PURE__*/React.forwardRef(function RichTreeView(inProps
117
117
  label: label,
118
118
  id: id,
119
119
  itemId: itemId,
120
- children: children?.map(renderNode)
120
+ children: children?.map(renderItem)
121
121
  }, itemId);
122
122
  };
123
123
  return /*#__PURE__*/_jsx(TreeViewProvider, {
124
124
  value: contextValue,
125
125
  children: /*#__PURE__*/_jsx(Root, _extends({}, rootProps, {
126
- children: nodesToRender.map(renderNode)
126
+ children: itemsToRender.map(renderItem)
127
127
  }))
128
128
  });
129
129
  });
@@ -1,5 +1,5 @@
1
1
  import { DEFAULT_TREE_VIEW_PLUGINS } from '../internals/plugins/defaultPlugins';
2
- import { useTreeViewJSXNodes } from '../internals/plugins/useTreeViewJSXNodes';
3
- export const SIMPLE_TREE_VIEW_PLUGINS = [...DEFAULT_TREE_VIEW_PLUGINS, useTreeViewJSXNodes];
2
+ import { useTreeViewJSXItems } from '../internals/plugins/useTreeViewJSXItems';
3
+ export const SIMPLE_TREE_VIEW_PLUGINS = [...DEFAULT_TREE_VIEW_PLUGINS, useTreeViewJSXItems];
4
4
 
5
5
  // We can't infer this type from the plugin, otherwise we would lose the generics.
@@ -186,10 +186,10 @@ export const TreeItem = /*#__PURE__*/React.forwardRef(function TreeItem(inProps,
186
186
  return Boolean(reactChildren);
187
187
  };
188
188
  const expandable = isExpandable(children);
189
- const expanded = instance.isNodeExpanded(itemId);
190
- const focused = instance.isNodeFocused(itemId);
191
- const selected = instance.isNodeSelected(itemId);
192
- const disabled = instance.isNodeDisabled(itemId);
189
+ const expanded = instance.isItemExpanded(itemId);
190
+ const focused = instance.isItemFocused(itemId);
191
+ const selected = instance.isItemSelected(itemId);
192
+ const disabled = instance.isItemDisabled(itemId);
193
193
  const ownerState = _extends({}, props, {
194
194
  expanded,
195
195
  focused,
@@ -6,11 +6,11 @@ export function useTreeItemState(itemId) {
6
6
  multiSelect
7
7
  }
8
8
  } = useTreeViewContext();
9
- const expandable = instance.isNodeExpandable(itemId);
10
- const expanded = instance.isNodeExpanded(itemId);
11
- const focused = instance.isNodeFocused(itemId);
12
- const selected = instance.isNodeSelected(itemId);
13
- const disabled = instance.isNodeDisabled(itemId);
9
+ const expandable = instance.isItemExpandable(itemId);
10
+ const expanded = instance.isItemExpanded(itemId);
11
+ const focused = instance.isItemFocused(itemId);
12
+ const selected = instance.isItemSelected(itemId);
13
+ const disabled = instance.isItemDisabled(itemId);
14
14
  const handleExpansion = event => {
15
15
  if (!disabled) {
16
16
  if (!focused) {
@@ -19,8 +19,8 @@ export function useTreeItemState(itemId) {
19
19
  const multiple = multiSelect && (event.shiftKey || event.ctrlKey || event.metaKey);
20
20
 
21
21
  // If already expanded and trying to toggle selection don't close
22
- if (expandable && !(multiple && instance.isNodeExpanded(itemId))) {
23
- instance.toggleNodeExpansion(event, itemId);
22
+ if (expandable && !(multiple && instance.isItemExpanded(itemId))) {
23
+ instance.toggleItemExpansion(event, itemId);
24
24
  }
25
25
  }
26
26
  };
@@ -36,10 +36,10 @@ export function useTreeItemState(itemId) {
36
36
  end: itemId
37
37
  });
38
38
  } else {
39
- instance.selectNode(event, itemId, true);
39
+ instance.selectItem(event, itemId, true);
40
40
  }
41
41
  } else {
42
- instance.selectNode(event, itemId);
42
+ instance.selectItem(event, itemId);
43
43
  }
44
44
  }
45
45
  };
@@ -11,10 +11,10 @@ export const useTreeItem2Utils = ({
11
11
  } = useTreeViewContext();
12
12
  const status = {
13
13
  expandable: Boolean(Array.isArray(children) ? children.length : children),
14
- expanded: instance.isNodeExpanded(itemId),
15
- focused: instance.isNodeFocused(itemId),
16
- selected: instance.isNodeSelected(itemId),
17
- disabled: instance.isNodeDisabled(itemId)
14
+ expanded: instance.isItemExpanded(itemId),
15
+ focused: instance.isItemFocused(itemId),
16
+ selected: instance.isItemSelected(itemId),
17
+ disabled: instance.isItemDisabled(itemId)
18
18
  };
19
19
  const handleExpansion = event => {
20
20
  if (status.disabled) {
@@ -26,8 +26,8 @@ export const useTreeItem2Utils = ({
26
26
  const multiple = multiSelect && (event.shiftKey || event.ctrlKey || event.metaKey);
27
27
 
28
28
  // If already expanded and trying to toggle selection don't close
29
- if (status.expandable && !(multiple && instance.isNodeExpanded(itemId))) {
30
- instance.toggleNodeExpansion(event, itemId);
29
+ if (status.expandable && !(multiple && instance.isItemExpanded(itemId))) {
30
+ instance.toggleItemExpansion(event, itemId);
31
31
  }
32
32
  };
33
33
  const handleSelection = event => {
@@ -44,10 +44,10 @@ export const useTreeItem2Utils = ({
44
44
  end: itemId
45
45
  });
46
46
  } else {
47
- instance.selectNode(event, itemId, true);
47
+ instance.selectItem(event, itemId, true);
48
48
  }
49
49
  } else {
50
- instance.selectNode(event, itemId);
50
+ instance.selectItem(event, itemId);
51
51
  }
52
52
  };
53
53
  const interactions = {
package/modern/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/x-tree-view v7.0.0
2
+ * @mui/x-tree-view v7.1.0
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
@@ -46,7 +46,7 @@ const noop = () => {};
46
46
  * We use this for focus management, keyboard navigation, and typeahead
47
47
  * functionality for some components.
48
48
  *
49
- * The hook accepts the element node
49
+ * The hook accepts the element item
50
50
  *
51
51
  * Our main goals with this are:
52
52
  * 1) maximum composability,
@@ -1,10 +1,10 @@
1
1
  import { useTreeViewId } from './useTreeViewId';
2
- import { useTreeViewNodes } from './useTreeViewNodes';
2
+ import { useTreeViewItems } from './useTreeViewItems';
3
3
  import { useTreeViewExpansion } from './useTreeViewExpansion';
4
4
  import { useTreeViewSelection } from './useTreeViewSelection';
5
5
  import { useTreeViewFocus } from './useTreeViewFocus';
6
6
  import { useTreeViewKeyboardNavigation } from './useTreeViewKeyboardNavigation';
7
7
  import { useTreeViewIcons } from './useTreeViewIcons';
8
- export const DEFAULT_TREE_VIEW_PLUGINS = [useTreeViewId, useTreeViewNodes, useTreeViewExpansion, useTreeViewSelection, useTreeViewFocus, useTreeViewKeyboardNavigation, useTreeViewIcons];
8
+ export const DEFAULT_TREE_VIEW_PLUGINS = [useTreeViewId, useTreeViewItems, useTreeViewExpansion, useTreeViewSelection, useTreeViewFocus, useTreeViewKeyboardNavigation, useTreeViewIcons];
9
9
 
10
10
  // We can't infer this type from the plugin, otherwise we would lose the generics.
@@ -11,11 +11,11 @@ export const useTreeViewExpansion = ({
11
11
  params.onExpandedItemsChange?.(event, value);
12
12
  models.expandedItems.setControlledValue(value);
13
13
  };
14
- const isNodeExpanded = React.useCallback(itemId => {
14
+ const isItemExpanded = React.useCallback(itemId => {
15
15
  return Array.isArray(models.expandedItems.value) ? models.expandedItems.value.indexOf(itemId) !== -1 : false;
16
16
  }, [models.expandedItems.value]);
17
- const isNodeExpandable = React.useCallback(itemId => !!instance.getNode(itemId)?.expandable, [instance]);
18
- const toggleNodeExpansion = useEventCallback((event, itemId) => {
17
+ const isItemExpandable = React.useCallback(itemId => !!instance.getNode(itemId)?.expandable, [instance]);
18
+ const toggleItemExpansion = useEventCallback((event, itemId) => {
19
19
  if (itemId == null) {
20
20
  return;
21
21
  }
@@ -34,7 +34,7 @@ export const useTreeViewExpansion = ({
34
34
  const expandAllSiblings = (event, itemId) => {
35
35
  const node = instance.getNode(itemId);
36
36
  const siblings = instance.getChildrenIds(node.parentId);
37
- const diff = siblings.filter(child => instance.isNodeExpandable(child) && !instance.isNodeExpanded(child));
37
+ const diff = siblings.filter(child => instance.isItemExpandable(child) && !instance.isItemExpanded(child));
38
38
  const newExpanded = models.expandedItems.value.concat(diff);
39
39
  if (diff.length > 0) {
40
40
  if (params.onItemExpansionToggle) {
@@ -46,9 +46,9 @@ export const useTreeViewExpansion = ({
46
46
  }
47
47
  };
48
48
  populateInstance(instance, {
49
- isNodeExpanded,
50
- isNodeExpandable,
51
- toggleNodeExpansion,
49
+ isItemExpanded,
50
+ isItemExpandable,
51
+ toggleItemExpansion,
52
52
  expandAllSiblings
53
53
  });
54
54
  };
@@ -57,9 +57,9 @@ useTreeViewExpansion.models = {
57
57
  getDefaultValue: params => params.defaultExpandedItems
58
58
  }
59
59
  };
60
- const DEFAULT_EXPANDED_NODES = [];
60
+ const DEFAULT_EXPANDED_ITEMS = [];
61
61
  useTreeViewExpansion.getDefaultizedParams = params => _extends({}, params, {
62
- defaultExpandedItems: params.defaultExpandedItems ?? DEFAULT_EXPANDED_NODES
62
+ defaultExpandedItems: params.defaultExpandedItems ?? DEFAULT_EXPANDED_ITEMS
63
63
  });
64
64
  useTreeViewExpansion.params = {
65
65
  expandedItems: true,