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

package/internals/plugins/useTreeViewLabel/useTreeViewLabel.selectors.d.ts

@@ -0,0 +1,74 @@
+import { UseTreeViewLabelSignature } from './useTreeViewLabel.types';
+import { TreeViewRootSelector } from '../../utils/selectors';
+/**
+ * Check if an item is editable.
+ * @param {TreeViewState<[UseTreeViewItemsSignature]>} state The state of the tree view.
+ * @param {object} params The parameters.
+ * @param {TreeViewItemId} params.itemId The id of the item to check.
+ * @param {((item: any) => boolean) | boolean} params.isItemEditable The function to determine if an item is editable.
+ * @returns {boolean} `true` if the item is editable, `false` otherwise.
+ */
+export declare const selectorIsItemEditable: ((state: any, args: any) => boolean) & {
+    clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: {
+        itemId: string;
+        isItemEditable: ((item: any) => boolean) | boolean;
+    }, resultFuncArgs_1: import("../../..").TreeViewBaseItem<import("../../..").TreeViewDefaultItemModelProperties>) => boolean;
+    memoizedResultFunc: ((resultFuncArgs_0: {
+        itemId: string;
+        isItemEditable: ((item: any) => boolean) | boolean;
+    }, resultFuncArgs_1: import("../../..").TreeViewBaseItem<import("../../..").TreeViewDefaultItemModelProperties>) => boolean) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => boolean;
+    dependencies: [(_: any, args: {
+        itemId: string;
+        isItemEditable: ((item: any) => boolean) | boolean;
+    }) => {
+        itemId: string;
+        isItemEditable: ((item: any) => boolean) | boolean;
+    }, (state: any, args: any) => import("../../..").TreeViewBaseItem<import("../../..").TreeViewDefaultItemModelProperties>];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
+};
+/**
+ * Check if an item is being edited.
+ * @param {TreeViewState<[UseTreeViewLabelSignature]>} state The state of the tree view.
+ * @param {TreeViewItemId} itemId The id of the item to check.
+ * @returns {boolean} `true` if the item is being edited, `false` otherwise.
+ */
+export declare const selectorIsItemBeingEdited: ((state: any, itemId: string) => boolean) & {
+    clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: {
+        editedItemId: string | null;
+    }, resultFuncArgs_1: string) => boolean;
+    memoizedResultFunc: ((resultFuncArgs_0: {
+        editedItemId: string | null;
+    }, resultFuncArgs_1: string) => boolean) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => boolean;
+    dependencies: [TreeViewRootSelector<UseTreeViewLabelSignature>, (_: any, itemId: string) => string];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
+};

package/internals/plugins/useTreeViewLabel/useTreeViewLabel.selectors.js

@@ -0,0 +1,26 @@
+import { createSelector } from "../../utils/selectors.js";
+import { selectorItemModel } from "../useTreeViewItems/useTreeViewItems.selectors.js";
+const selectorTreeViewLabelState = state => state.label;
+
+/**
+ * Check if an item is editable.
+ * @param {TreeViewState<[UseTreeViewItemsSignature]>} state The state of the tree view.
+ * @param {object} params The parameters.
+ * @param {TreeViewItemId} params.itemId The id of the item to check.
+ * @param {((item: any) => boolean) | boolean} params.isItemEditable The function to determine if an item is editable.
+ * @returns {boolean} `true` if the item is editable, `false` otherwise.
+ */
+export const selectorIsItemEditable = createSelector([(_, args) => args, (state, args) => selectorItemModel(state, args.itemId)], (args, itemModel) => {
+  if (!itemModel || !args.isItemEditable) {
+    return false;
+  }
+  return typeof args.isItemEditable === 'function' ? args.isItemEditable(itemModel) : true;
+});
+
+/**
+ * Check if an item is being edited.
+ * @param {TreeViewState<[UseTreeViewLabelSignature]>} state The state of the tree view.
+ * @param {TreeViewItemId} itemId The id of the item to check.
+ * @returns {boolean} `true` if the item is being edited, `false` otherwise.
+ */
+export const selectorIsItemBeingEdited = createSelector([selectorTreeViewLabelState, (_, itemId) => itemId], (labelState, itemId) => labelState.editedItemId === itemId);

package/internals/plugins/useTreeViewLabel/useTreeViewLabel.types.d.ts

@@ -18,29 +18,6 @@ export interface UseTreeViewLabelInstance extends UseTreeViewLabelPublicAPI {
      * @returns {void}.
      */
     setEditedItemId: (itemId: TreeViewItemId | null) => void;
-    /**
-     * Checks if an item is being edited or not.
-     * @param {TreeViewItemId} itemId The id of the item to check.
-     * @returns {boolean}.
-     */
-    isItemBeingEdited: (itemId: TreeViewItemId) => boolean;
-    /**
-     * Checks if an item is being edited or not.
-     * Purely internal use, used to avoid unnecessarily calling `updateItemLabel` twice.
-     * @param {TreeViewItemId} itemId The id of the item to check.
-     * @returns {boolean}.
-     */
-    isItemBeingEditedRef: (itemId: TreeViewItemId) => boolean;
-    /**
-     * Determines if a given item is editable.
-     * @param {TreeViewItemId} itemId The id of the item to check.
-     * @returns {boolean} `true` if the item is editable.
-     */
-    isItemEditable: (itemId: TreeViewItemId) => boolean;
-    /**
-     * Set to `true` if the Tree View is editable.
-     */
-    isTreeViewEditable: boolean;
 }
 export interface UseTreeViewLabelParameters<R extends {}> {
     /**
@@ -62,7 +39,12 @@ export interface UseTreeViewLabelParameters<R extends {}> {
 }
 export type UseTreeViewLabelDefaultizedParameters<R extends {}> = DefaultizedProps<UseTreeViewLabelParameters<R>, 'isItemEditable'>;
 export interface UseTreeViewLabelState {
-    editedItemId: string | null;
+    label: {
+        editedItemId: string | null;
+    };
+}
+export interface UseTreeViewLabelContextValue {
+    label: Pick<UseTreeViewLabelDefaultizedParameters<any>, 'isItemEditable'>;
 }
 export type UseTreeViewLabelSignature = TreeViewPluginSignature<{
     params: UseTreeViewLabelParameters<any>;
@@ -70,6 +52,7 @@ export type UseTreeViewLabelSignature = TreeViewPluginSignature<{
     publicAPI: UseTreeViewLabelPublicAPI;
     instance: UseTreeViewLabelInstance;
     state: UseTreeViewLabelState;
+    contextValue: UseTreeViewLabelContextValue;
     experimentalFeatures: 'labelEditing';
     dependencies: [UseTreeViewItemsSignature];
 }>;

package/internals/plugins/useTreeViewSelection/useTreeViewSelection.itemPlugin.js

@@ -1,8 +1,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { useTreeViewContext } from "../../TreeViewProvider/index.js";
+import { selectorItemOrderedChildrenIds } from "../useTreeViewItems/useTreeViewItems.selectors.js";
+import { selectorIsItemSelected } from "./useTreeViewSelection.selectors.js";
 function getCheckboxStatus({
   itemId,
-  instance,
+  store,
   selectionPropagation,
   selected
 }) {
@@ -12,7 +14,7 @@ function getCheckboxStatus({
       checked: true
     };
   }
-  const children = instance.getItemOrderedChildrenIds(itemId);
+  const children = selectorItemOrderedChildrenIds(store.value, itemId);
   if (children.length === 0) {
     return {
       indeterminate: false,
@@ -23,13 +25,13 @@ function getCheckboxStatus({
   let hasUnSelectedDescendant = false;
   const traverseDescendants = itemToTraverseId => {
     if (itemToTraverseId !== itemId) {
-      if (instance.isItemSelected(itemToTraverseId)) {
+      if (selectorIsItemSelected(store.value, itemToTraverseId)) {
         hasSelectedDescendant = true;
       } else {
         hasUnSelectedDescendant = true;
       }
     }
-    instance.getItemOrderedChildrenIds(itemToTraverseId).forEach(traverseDescendants);
+    selectorItemOrderedChildrenIds(store.value, itemToTraverseId).forEach(traverseDescendants);
   };
   traverseDescendants(itemId);
   return {
@@ -44,7 +46,7 @@ export const useTreeViewSelectionItemPlugin = ({
     itemId
   } = props;
   const {
-    instance,
+    store,
     selection: {
       disableSelection,
       checkboxSelection,
@@ -69,7 +71,7 @@ export const useTreeViewSelectionItemPlugin = ({
           interactions.handleCheckboxSelection(event);
         };
         const checkboxStatus = getCheckboxStatus({
-          instance,
+          store,
           itemId,
           selectionPropagation,
           selected: status.selected

package/internals/plugins/useTreeViewSelection/useTreeViewSelection.js

@@ -1,31 +1,29 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
+import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import { findOrderInTremauxTree, getAllNavigableItems, getFirstNavigableItem, getLastNavigableItem, getNonDisabledItemsInRange } from "../../utils/tree.js";
-import { convertSelectedItemsToArray, propagateSelection, getAddedAndRemovedItems, getLookupFromArray } from "./useTreeViewSelection.utils.js";
+import { convertSelectedItemsToArray, propagateSelection, getAddedAndRemovedItems, getLookupFromArray, createSelectedItemsMap } from "./useTreeViewSelection.utils.js";
+import { selectorIsItemSelected } from "./useTreeViewSelection.selectors.js";
 import { useTreeViewSelectionItemPlugin } from "./useTreeViewSelection.itemPlugin.js";
 export const useTreeViewSelection = ({
-  instance,
+  store,
   params,
   models
 }) => {
   const lastSelectedItem = React.useRef(null);
   const lastSelectedRange = React.useRef({});
-  const selectedItemsMap = React.useMemo(() => {
-    const temp = new Map();
-    if (Array.isArray(models.selectedItems.value)) {
-      models.selectedItems.value.forEach(id => {
-        temp.set(id, true);
-      });
-    } else if (models.selectedItems.value != null) {
-      temp.set(models.selectedItems.value, true);
-    }
-    return temp;
-  }, [models.selectedItems.value]);
+  useEnhancedEffect(() => {
+    store.update(prevState => _extends({}, prevState, {
+      selection: {
+        selectedItemsMap: createSelectedItemsMap(models.selectedItems.value)
+      }
+    }));
+  }, [store, models.selectedItems.value]);
   const setSelectedItems = (event, newModel, additionalItemsToPropagate) => {
     let cleanModel;
     if (params.multiSelect && (params.selectionPropagation.descendants || params.selectionPropagation.parents)) {
       cleanModel = propagateSelection({
-        instance,
+        store,
         selectionPropagation: params.selectionPropagation,
         newModel: newModel,
         oldModel: models.selectedItems.value,
@@ -37,7 +35,7 @@ export const useTreeViewSelection = ({
     if (params.onItemSelectionToggle) {
       if (params.multiSelect) {
         const changes = getAddedAndRemovedItems({
-          instance,
+          store,
           newModel: cleanModel,
           oldModel: models.selectedItems.value
         });
@@ -63,7 +61,6 @@ export const useTreeViewSelection = ({
     }
     models.selectedItems.setControlledValue(cleanModel);
   };
-  const isItemSelected = itemId => selectedItemsMap.has(itemId);
   const selectItem = ({
     event,
     itemId,
@@ -76,7 +73,7 @@ export const useTreeViewSelection = ({
     let newSelected;
     if (keepExistingSelection) {
       const cleanSelectedItems = convertSelectedItemsToArray(models.selectedItems.value);
-      const isSelectedBefore = instance.isItemSelected(itemId);
+      const isSelectedBefore = selectorIsItemSelected(store.value, itemId);
       if (isSelectedBefore && (shouldBeSelected === false || shouldBeSelected == null)) {
         newSelected = cleanSelectedItems.filter(id => id !== itemId);
       } else if (!isSelectedBefore && (shouldBeSelected === true || shouldBeSelected == null)) {
@@ -86,14 +83,14 @@ export const useTreeViewSelection = ({
       }
     } else {
       // eslint-disable-next-line no-lonely-if
-      if (shouldBeSelected === false || shouldBeSelected == null && instance.isItemSelected(itemId)) {
+      if (shouldBeSelected === false || shouldBeSelected == null && selectorIsItemSelected(store.value, itemId)) {
         newSelected = params.multiSelect ? [] : null;
       } else {
         newSelected = params.multiSelect ? [itemId] : itemId;
       }
     }
     setSelectedItems(event, newSelected,
-    // If shouldBeSelected === instance.isItemSelect(itemId), we still want to propagate the select.
+    // If shouldBeSelected === selectorIsItemSelected(store, itemId), we still want to propagate the select.
     // This is useful when the element is in an indeterminate state.
     [itemId]);
     lastSelectedItem.current = itemId;
@@ -113,7 +110,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(instance, start, end);
+    const range = getNonDisabledItemsInRange(store.value, start, end);
     const itemsToAddToModel = range.filter(id => !selectedItemsLookup[id]);
     newSelectedItems = newSelectedItems.concat(itemsToAddToModel);
     setSelectedItems(event, newSelectedItems);
@@ -121,21 +118,21 @@ export const useTreeViewSelection = ({
   };
   const expandSelectionRange = (event, itemId) => {
     if (lastSelectedItem.current != null) {
-      const [start, end] = findOrderInTremauxTree(instance, itemId, lastSelectedItem.current);
+      const [start, end] = findOrderInTremauxTree(store.value, itemId, lastSelectedItem.current);
       selectRange(event, [start, end]);
     }
   };
   const selectRangeFromStartToItem = (event, itemId) => {
-    selectRange(event, [getFirstNavigableItem(instance), itemId]);
+    selectRange(event, [getFirstNavigableItem(store.value), itemId]);
   };
   const selectRangeFromItemToEnd = (event, itemId) => {
-    selectRange(event, [itemId, getLastNavigableItem(instance)]);
+    selectRange(event, [itemId, getLastNavigableItem(store.value)]);
   };
   const selectAllNavigableItems = event => {
     if (params.disableSelection || !params.multiSelect) {
       return;
     }
-    const navigableItems = getAllNavigableItems(instance);
+    const navigableItems = getAllNavigableItems(store.value);
     setSelectedItems(event, navigableItems);
     lastSelectedRange.current = getLookupFromArray(navigableItems);
   };
@@ -164,6 +161,17 @@ export const useTreeViewSelection = ({
     }
     setSelectedItems(event, newSelectedItems);
   };
+  const pluginContextValue = React.useMemo(() => ({
+    selection: {
+      multiSelect: params.multiSelect,
+      checkboxSelection: params.checkboxSelection,
+      disableSelection: params.disableSelection,
+      selectionPropagation: {
+        descendants: params.selectionPropagation.descendants,
+        parents: params.selectionPropagation.parents
+      }
+    }
+  }), [params.multiSelect, params.checkboxSelection, params.disableSelection, params.selectionPropagation.descendants, params.selectionPropagation.parents]);
   return {
     getRootProps: () => ({
       'aria-multiselectable': params.multiSelect
@@ -172,7 +180,6 @@ export const useTreeViewSelection = ({
       selectItem
     },
     instance: {
-      isItemSelected,
       selectItem,
       selectAllNavigableItems,
       expandSelectionRange,
@@ -180,14 +187,7 @@ export const useTreeViewSelection = ({
       selectRangeFromItemToEnd,
       selectItemFromArrowNavigation
     },
-    contextValue: {
-      selection: {
-        multiSelect: params.multiSelect,
-        checkboxSelection: params.checkboxSelection,
-        disableSelection: params.disableSelection,
-        selectionPropagation: params.selectionPropagation
-      }
-    }
+    contextValue: pluginContextValue
   };
 };
 useTreeViewSelection.itemPlugin = useTreeViewSelectionItemPlugin;
@@ -197,6 +197,7 @@ useTreeViewSelection.models = {
   }
 };
 const DEFAULT_SELECTED_ITEMS = [];
+const EMPTY_SELECTION_PROPAGATION = {};
 useTreeViewSelection.getDefaultizedParams = ({
   params
 }) => _extends({}, params, {
@@ -204,7 +205,17 @@ useTreeViewSelection.getDefaultizedParams = ({
   multiSelect: params.multiSelect ?? false,
   checkboxSelection: params.checkboxSelection ?? false,
   defaultSelectedItems: params.defaultSelectedItems ?? (params.multiSelect ? DEFAULT_SELECTED_ITEMS : null),
-  selectionPropagation: params.selectionPropagation ?? {}
+  selectionPropagation: params.selectionPropagation ?? EMPTY_SELECTION_PROPAGATION
+});
+useTreeViewSelection.getInitialState = params => ({
+  selection: {
+    selectedItemsMap: createSelectedItemsMap(params.selectedItems === undefined ? params.defaultSelectedItems : params.selectedItems)
+  }
+});
+useTreeViewSelection.getInitialState = params => ({
+  selection: {
+    selectedItemsMap: createSelectedItemsMap(params.selectedItems === undefined ? params.defaultSelectedItems : params.selectedItems)
+  }
 });
 useTreeViewSelection.params = {
   disableSelection: true,

package/internals/plugins/useTreeViewSelection/useTreeViewSelection.selectors.d.ts

@@ -0,0 +1,32 @@
+import { TreeViewRootSelector } from '../../utils/selectors';
+import { UseTreeViewSelectionSignature } from './useTreeViewSelection.types';
+/**
+ * Check if an item is selected.
+ * @param {TreeViewState<[UseTreeViewSelectionSignature]>} state The state of the tree view.
+ * @returns {boolean} `true` if the item is selected, `false` otherwise.
+ */
+export declare const selectorIsItemSelected: ((state: any, itemId: string) => boolean) & {
+    clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: {
+        selectedItemsMap: Map<string, true>;
+    }, resultFuncArgs_1: string) => boolean;
+    memoizedResultFunc: ((resultFuncArgs_0: {
+        selectedItemsMap: Map<string, true>;
+    }, resultFuncArgs_1: string) => boolean) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => boolean;
+    dependencies: [TreeViewRootSelector<UseTreeViewSelectionSignature>, (_: any, itemId: string) => string];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import("reselect").weakMapMemoize;
+    memoize: typeof import("reselect").weakMapMemoize;
+};

package/internals/plugins/useTreeViewSelection/useTreeViewSelection.selectors.js

@@ -0,0 +1,9 @@
+import { createSelector } from "../../utils/selectors.js";
+const selectorTreeViewSelectionState = state => state.selection;
+
+/**
+ * Check if an item is selected.
+ * @param {TreeViewState<[UseTreeViewSelectionSignature]>} state The state of the tree view.
+ * @returns {boolean} `true` if the item is selected, `false` otherwise.
+ */
+export const selectorIsItemSelected = createSelector([selectorTreeViewSelectionState, (_, itemId) => itemId], (selectionState, itemId) => selectionState.selectedItemsMap.has(itemId));

package/internals/plugins/useTreeViewSelection/useTreeViewSelection.types.d.ts

@@ -21,12 +21,6 @@ export interface UseTreeViewSelectionPublicAPI {
     }) => void;
 }
 export interface UseTreeViewSelectionInstance extends UseTreeViewSelectionPublicAPI {
-    /**
-     * Check if an item is selected.
-     * @param {TreeViewItemId} itemId The id of the item to check.
-     * @returns {boolean} `true` if the item is selected, `false` otherwise.
-     */
-    isItemSelected: (itemId: string) => boolean;
     /**
      * Select all the navigable items in the tree.
      * @param {React.SyntheticEvent} event The DOM event that triggered the change.
@@ -119,6 +113,11 @@ export interface UseTreeViewSelectionParameters<Multiple extends boolean | undef
     onItemSelectionToggle?: (event: React.SyntheticEvent, itemId: string, isSelected: boolean) => void;
 }
 export type UseTreeViewSelectionDefaultizedParameters<Multiple extends boolean> = DefaultizedProps<UseTreeViewSelectionParameters<Multiple>, 'disableSelection' | 'defaultSelectedItems' | 'multiSelect' | 'checkboxSelection' | 'selectionPropagation'>;
+export interface UseTreeViewSelectionState {
+    selection: {
+        selectedItemsMap: Map<string, true>;
+    };
+}
 interface UseTreeViewSelectionContextValue {
     selection: Pick<UseTreeViewSelectionDefaultizedParameters<boolean>, 'multiSelect' | 'checkboxSelection' | 'disableSelection' | 'selectionPropagation'>;
 }
@@ -129,6 +128,7 @@ export type UseTreeViewSelectionSignature = TreeViewPluginSignature<{
     publicAPI: UseTreeViewSelectionPublicAPI;
     contextValue: UseTreeViewSelectionContextValue;
     modelNames: 'selectedItems';
+    state: UseTreeViewSelectionState;
     dependencies: [
         UseTreeViewItemsSignature,
         UseTreeViewExpansionSignature,

package/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.d.ts

@@ -1,6 +1,5 @@
 import { TreeViewItemId, TreeViewSelectionPropagation } from '../../../models';
-import { TreeViewInstance } from '../../models';
-import { UseTreeViewItemsSignature } from '../useTreeViewItems';
+import { TreeViewUsedStore } from '../../models';
 import { UseTreeViewSelectionSignature } from './useTreeViewSelection.types';
 /**
  * Transform the `selectedItems` model to be an array if it was a string or null.
@@ -8,19 +7,20 @@ import { UseTreeViewSelectionSignature } from './useTreeViewSelection.types';
  * @returns {string[]} The converted model.
  */
 export declare const convertSelectedItemsToArray: (model: string[] | string | null) => string[];
+export declare const createSelectedItemsMap: (selectedItems: string | string[] | null) => Map<string, true>;
 export declare const getLookupFromArray: (array: string[]) => {
     [itemId: string]: true;
 };
-export declare const getAddedAndRemovedItems: ({ instance, oldModel, newModel, }: {
-    instance: TreeViewInstance<[UseTreeViewSelectionSignature]>;
+export declare const getAddedAndRemovedItems: ({ store, oldModel, newModel, }: {
+    store: TreeViewUsedStore<UseTreeViewSelectionSignature>;
     oldModel: TreeViewItemId[];
     newModel: TreeViewItemId[];
 }) => {
     added: string[];
     removed: string[];
 };
-export declare const propagateSelection: ({ instance, selectionPropagation, newModel, oldModel, additionalItemsToPropagate, }: {
-    instance: TreeViewInstance<[UseTreeViewItemsSignature, UseTreeViewSelectionSignature]>;
+export declare const propagateSelection: ({ store, selectionPropagation, newModel, oldModel, additionalItemsToPropagate, }: {
+    store: TreeViewUsedStore<UseTreeViewSelectionSignature>;
     selectionPropagation: TreeViewSelectionPropagation;
     newModel: TreeViewItemId[];
     oldModel: TreeViewItemId[];

package/internals/plugins/useTreeViewSelection/useTreeViewSelection.utils.js

@@ -1,3 +1,6 @@
+import { selectorIsItemSelected } from "./useTreeViewSelection.selectors.js";
+import { selectorItemOrderedChildrenIds, selectorItemParentId } from "../useTreeViewItems/useTreeViewItems.selectors.js";
+
 /**
  * Transform the `selectedItems` model to be an array if it was a string or null.
  * @param {string[] | string | null} model The raw model.
@@ -12,6 +15,13 @@ export const convertSelectedItemsToArray = model => {
   }
   return [];
 };
+export const createSelectedItemsMap = selectedItems => {
+  const selectedItemsMap = new Map();
+  convertSelectedItemsToArray(selectedItems).forEach(id => {
+    selectedItemsMap.set(id, true);
+  });
+  return selectedItemsMap;
+};
 export const getLookupFromArray = array => {
   const lookup = {};
   array.forEach(itemId => {
@@ -20,18 +30,18 @@ export const getLookupFromArray = array => {
   return lookup;
 };
 export const getAddedAndRemovedItems = ({
-  instance,
+  store,
   oldModel,
   newModel
 }) => {
-  const newModelLookup = getLookupFromArray(newModel);
+  const newModelLookup = createSelectedItemsMap(newModel);
   return {
-    added: newModel.filter(itemId => !instance.isItemSelected(itemId)),
-    removed: oldModel.filter(itemId => !newModelLookup[itemId])
+    added: newModel.filter(itemId => !selectorIsItemSelected(store.value, itemId)),
+    removed: oldModel.filter(itemId => !newModelLookup.has(itemId))
   };
 };
 export const propagateSelection = ({
-  instance,
+  store,
   selectionPropagation,
   newModel,
   oldModel,
@@ -43,7 +53,7 @@ export const propagateSelection = ({
   let shouldRegenerateModel = false;
   const newModelLookup = getLookupFromArray(newModel);
   const changes = getAddedAndRemovedItems({
-    instance,
+    store,
     newModel,
     oldModel
   });
@@ -63,7 +73,7 @@ export const propagateSelection = ({
           shouldRegenerateModel = true;
           newModelLookup[itemId] = true;
         }
-        instance.getItemOrderedChildrenIds(itemId).forEach(selectDescendants);
+        selectorItemOrderedChildrenIds(store.value, itemId).forEach(selectDescendants);
       };
       selectDescendants(addedItemId);
     }
@@ -72,15 +82,15 @@ export const propagateSelection = ({
         if (!newModelLookup[itemId]) {
           return false;
         }
-        const children = instance.getItemOrderedChildrenIds(itemId);
+        const children = selectorItemOrderedChildrenIds(store.value, itemId);
         return children.every(checkAllDescendantsSelected);
       };
       const selectParents = itemId => {
-        const parentId = instance.getItemMeta(itemId).parentId;
+        const parentId = selectorItemParentId(store.value, itemId);
         if (parentId == null) {
           return;
         }
-        const siblings = instance.getItemOrderedChildrenIds(parentId);
+        const siblings = selectorItemOrderedChildrenIds(store.value, parentId);
         if (siblings.every(checkAllDescendantsSelected)) {
           shouldRegenerateModel = true;
           newModelLookup[parentId] = true;
@@ -92,13 +102,13 @@ export const propagateSelection = ({
   });
   changes.removed.forEach(removedItemId => {
     if (selectionPropagation.parents) {
-      let parentId = instance.getItemMeta(removedItemId).parentId;
+      let parentId = selectorItemParentId(store.value, removedItemId);
       while (parentId != null) {
         if (newModelLookup[parentId]) {
           shouldRegenerateModel = true;
           delete newModelLookup[parentId];
         }
-        parentId = instance.getItemMeta(parentId).parentId;
+        parentId = selectorItemParentId(store.value, parentId);
       }
     }
     if (selectionPropagation.descendants) {
@@ -107,7 +117,7 @@ export const propagateSelection = ({
           shouldRegenerateModel = true;
           delete newModelLookup[itemId];
         }
-        instance.getItemOrderedChildrenIds(itemId).forEach(deSelectDescendants);
+        selectorItemOrderedChildrenIds(store.value, itemId).forEach(deSelectDescendants);
       };
       deSelectDescendants(removedItemId);
     }