@mui/x-tree-view 8.10.2 → 8.11.1

package/esm/internals/plugins/useTreeViewSelection/useTreeViewSelection.js

@@ -4,7 +4,7 @@ import { useAssertModelConsistency } from '@mui/x-internals/useAssertModelConsis
 import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import { findOrderInTremauxTree, getAllNavigableItems, getFirstNavigableItem, getLastNavigableItem, getNonDisabledItemsInRange } from "../../utils/tree.js";
 import { propagateSelection, getAddedAndRemovedItems, getLookupFromArray } from "./useTreeViewSelection.utils.js";
-import { selectorIsItemSelected, selectorIsMultiSelectEnabled, selectorIsSelectionEnabled, selectorSelectionModel, selectorSelectionModelArray } from "./useTreeViewSelection.selectors.js";
+import { selectionSelectors } from "./useTreeViewSelection.selectors.js";
 import { useTreeViewSelectionItemPlugin } from "./useTreeViewSelection.itemPlugin.js";
 export const useTreeViewSelection = ({
   store,
@@ -19,9 +19,9 @@ export const useTreeViewSelection = ({
   const lastSelectedItem = React.useRef(null);
   const lastSelectedRange = React.useRef({});
   const setSelectedItems = (event, newModel, additionalItemsToPropagate) => {
-    const oldModel = selectorSelectionModel(store.value);
+    const oldModel = selectionSelectors.selectedItemsRaw(store.state);
     let cleanModel;
-    const isMultiSelectEnabled = selectorIsMultiSelectEnabled(store.value);
+    const isMultiSelectEnabled = selectionSelectors.isMultiSelectEnabled(store.state);
     if (isMultiSelectEnabled && (params.selectionPropagation.descendants || params.selectionPropagation.parents)) {
       cleanModel = propagateSelection({
         store,
@@ -58,10 +58,8 @@ export const useTreeViewSelection = ({
       }
     }
     if (params.selectedItems === undefined) {
-      store.update(prevState => _extends({}, prevState, {
-        selection: _extends({}, prevState.selection, {
-          selectedItems: cleanModel
-        })
+      store.set('selection', _extends({}, store.state.selection, {
+        selectedItems: cleanModel
       }));
     }
     params.onSelectedItemsChange?.(event, cleanModel);
@@ -72,14 +70,14 @@ export const useTreeViewSelection = ({
     keepExistingSelection = false,
     shouldBeSelected
   }) => {
-    if (!selectorIsSelectionEnabled(store.value)) {
+    if (!selectionSelectors.enabled(store.state)) {
       return;
     }
     let newSelected;
-    const isMultiSelectEnabled = selectorIsMultiSelectEnabled(store.value);
+    const isMultiSelectEnabled = selectionSelectors.isMultiSelectEnabled(store.state);
     if (keepExistingSelection) {
-      const oldSelected = selectorSelectionModelArray(store.value);
-      const isSelectedBefore = selectorIsItemSelected(store.value, itemId);
+      const oldSelected = selectionSelectors.selectedItems(store.state);
+      const isSelectedBefore = selectionSelectors.isItemSelected(store.state, itemId);
       if (isSelectedBefore && (shouldBeSelected === false || shouldBeSelected == null)) {
         newSelected = oldSelected.filter(id => id !== itemId);
       } else if (!isSelectedBefore && (shouldBeSelected === true || shouldBeSelected == null)) {
@@ -89,25 +87,25 @@ export const useTreeViewSelection = ({
       }
     } else {
       // eslint-disable-next-line no-lonely-if
-      if (shouldBeSelected === false || shouldBeSelected == null && selectorIsItemSelected(store.value, itemId)) {
+      if (shouldBeSelected === false || shouldBeSelected == null && selectionSelectors.isItemSelected(store.state, itemId)) {
         newSelected = isMultiSelectEnabled ? [] : null;
       } else {
         newSelected = isMultiSelectEnabled ? [itemId] : itemId;
       }
     }
     setSelectedItems(event, newSelected,
-    // If shouldBeSelected === selectorIsItemSelected(store, itemId), we still want to propagate the select.
+    // If shouldBeSelected === selectionSelectors.isItemSelected(store, itemId), we still want to propagate the select.
     // This is useful when the element is in an indeterminate state.
     [itemId]);
     lastSelectedItem.current = itemId;
     lastSelectedRange.current = {};
   };
   const selectRange = (event, [start, end]) => {
-    const isMultiSelectEnabled = selectorIsMultiSelectEnabled(store.value);
+    const isMultiSelectEnabled = selectionSelectors.isMultiSelectEnabled(store.state);
     if (!isMultiSelectEnabled) {
       return;
     }
-    let newSelectedItems = selectorSelectionModelArray(store.value).slice();
+    let newSelectedItems = selectionSelectors.selectedItems(store.state).slice();
 
     // If the last selection was a range selection,
     // remove the items that were part of the last range from the model
@@ -117,7 +115,7 @@ export const useTreeViewSelection = ({
 
     // Add to the model the items that are part of the new range and not already part of the model.
     const selectedItemsLookup = getLookupFromArray(newSelectedItems);
-    const range = getNonDisabledItemsInRange(store.value, start, end);
+    const range = getNonDisabledItemsInRange(store.state, start, end);
     const itemsToAddToModel = range.filter(id => !selectedItemsLookup[id]);
     newSelectedItems = newSelectedItems.concat(itemsToAddToModel);
     setSelectedItems(event, newSelectedItems);
@@ -125,31 +123,31 @@ export const useTreeViewSelection = ({
   };
   const expandSelectionRange = (event, itemId) => {
     if (lastSelectedItem.current != null) {
-      const [start, end] = findOrderInTremauxTree(store.value, itemId, lastSelectedItem.current);
+      const [start, end] = findOrderInTremauxTree(store.state, itemId, lastSelectedItem.current);
       selectRange(event, [start, end]);
     }
   };
   const selectRangeFromStartToItem = (event, itemId) => {
-    selectRange(event, [getFirstNavigableItem(store.value), itemId]);
+    selectRange(event, [getFirstNavigableItem(store.state), itemId]);
   };
   const selectRangeFromItemToEnd = (event, itemId) => {
-    selectRange(event, [itemId, getLastNavigableItem(store.value)]);
+    selectRange(event, [itemId, getLastNavigableItem(store.state)]);
   };
   const selectAllNavigableItems = event => {
-    const isMultiSelectEnabled = selectorIsMultiSelectEnabled(store.value);
+    const isMultiSelectEnabled = selectionSelectors.isMultiSelectEnabled(store.state);
     if (!isMultiSelectEnabled) {
       return;
     }
-    const navigableItems = getAllNavigableItems(store.value);
+    const navigableItems = getAllNavigableItems(store.state);
     setSelectedItems(event, navigableItems);
     lastSelectedRange.current = getLookupFromArray(navigableItems);
   };
   const selectItemFromArrowNavigation = (event, currentItem, nextItem) => {
-    const isMultiSelectEnabled = selectorIsMultiSelectEnabled(store.value);
+    const isMultiSelectEnabled = selectionSelectors.isMultiSelectEnabled(store.state);
     if (!isMultiSelectEnabled) {
       return;
     }
-    let newSelectedItems = selectorSelectionModelArray(store.value).slice();
+    let newSelectedItems = selectionSelectors.selectedItems(store.state).slice();
     if (Object.keys(lastSelectedRange.current).length === 0) {
       newSelectedItems.push(nextItem);
       lastSelectedRange.current = {
@@ -171,18 +169,16 @@ export const useTreeViewSelection = ({
     setSelectedItems(event, newSelectedItems);
   };
   useEnhancedEffect(() => {
-    store.update(prevState => _extends({}, prevState, {
-      selection: {
-        selectedItems: params.selectedItems === undefined ? prevState.selection.selectedItems : params.selectedItems,
-        isEnabled: !params.disableSelection,
-        isMultiSelectEnabled: params.multiSelect,
-        isCheckboxSelectionEnabled: params.checkboxSelection,
-        selectionPropagation: {
-          descendants: params.selectionPropagation.descendants,
-          parents: params.selectionPropagation.parents
-        }
+    store.set('selection', {
+      selectedItems: params.selectedItems === undefined ? store.state.selection.selectedItems : params.selectedItems,
+      isEnabled: !params.disableSelection,
+      isMultiSelectEnabled: params.multiSelect,
+      isCheckboxSelectionEnabled: params.checkboxSelection,
+      selectionPropagation: {
+        descendants: params.selectionPropagation.descendants,
+        parents: params.selectionPropagation.parents
       }
-    }));
+    });
   }, [store, params.selectedItems, params.multiSelect, params.checkboxSelection, params.disableSelection, params.selectionPropagation.descendants, params.selectionPropagation.parents]);
   return {
     getRootProps: () => ({