@hh.ru/magritte-ui-tree-selector 1.3.1 → 1.4.0

package/TreeSelectorDummy.js

@@ -0,0 +1,129 @@
+import './index.css';
+import { jsx, Fragment } from 'react/jsx-runtime';
+import { forwardRef, useState, useRef, useEffect, useCallback } from 'react';
+import { match } from '@hh.ru/magritte-common-fuzzy-search';
+import { useBreakpoint } from '@hh.ru/magritte-ui-breakpoint';
+import { VSpacingContainer } from '@hh.ru/magritte-ui-spacing';
+import { ItemsList } from './ItemsList.js';
+import { MobileItemsList } from './MobileItemsList.js';
+import { filterWithParents } from './collection/treeCollectionHelper.js';
+import { useExpanded } from './useExpanded.js';
+import { useIndeterminate } from './useIndeterminate.js';
+import { useRenderInput } from './useRenderInput.js';
+import './Item.js';
+import 'classnames';
+import './ItemContent-f98f0b9a.js';
+import '@hh.ru/magritte-ui-cell';
+import '@hh.ru/magritte-ui-icon/icon';
+import './Action.js';
+import '@hh.ru/magritte-ui-checkbox-radio';
+import '@hh.ru/magritte-ui-typography';
+import '@hh.ru/magritte-ui-checkable-card/CheckableCardElement';
+import './MobileItem.js';
+import './MobileParentItem.js';
+import '@hh.ru/magritte-ui-card';
+import './collection/treeCollection.js';
+import '@hh.ru/magritte-ui-input';
+
+const defaultCheckSelectable = () => true;
+const defaultArray = [];
+const needToApply = (query) => {
+    return !!(query && query.length);
+};
+const TreeSelectorDummy = forwardRef(({ collection: initialCollection, checkSelectable = defaultCheckSelectable, initialExpanded = defaultArray, value: selected, leavesOnly, singleChoice, expanded, disabled = defaultArray, treeFilter = filterWithParents, suggestedNotFound = defaultArray, constantlySuggested = defaultArray, onExpand, onChange, onChangeFilterQuery, children, }, ref) => {
+    const [collection, setCollection] = useState(initialCollection);
+    const currentQuery = useRef('');
+    const suggestedNotFoundModels = useRef(initialCollection.getExistModels(suggestedNotFound));
+    const constantlySuggestedModels = useRef(initialCollection.getExistModels(constantlySuggested));
+    const { indeterminate } = useIndeterminate({ collection: initialCollection, selected });
+    const { expanded: currentExpanded, setExpanded, handleExpansion, } = useExpanded({
+        initialValue: expanded ? expanded.slice() : initialExpanded.slice(),
+        controlledExpanded: expanded,
+        onExpand,
+    });
+    const { isMobile } = useBreakpoint();
+    const { contentFilterQuery, setInputValue, handleChangeInput, renderInput } = useRenderInput();
+    useEffect(() => {
+        const contentFilterQueryTrimmed = contentFilterQuery.trim();
+        const queryWasChanged = contentFilterQueryTrimmed !== currentQuery.current.trim();
+        if (queryWasChanged && needToApply(contentFilterQueryTrimmed)) {
+            const newExpanded = [];
+            const newCollection = treeFilter(initialCollection, (item) => match(contentFilterQueryTrimmed, item.text), isMobile);
+            newCollection.toList().forEach((item) => {
+                if (newCollection.hasChildren(item.id)) {
+                    // Если есть в отфильтрованной коллекции есть дочерние элементы,
+                    // значит они заматчились, и нужно открыть родителя.
+                    newExpanded.push(item.id);
+                }
+                else {
+                    // Если заматчился только сам родитель, показываем его
+                    // схлопнутым => нужно добавить его ветку в коллекцию.
+                    initialCollection.walkChildren(item.id, (child, parents) => {
+                        newCollection.addModel({ ...child }, parents[0].id);
+                    });
+                }
+            });
+            const filteredIds = newCollection.toList().map((model) => model.id);
+            // Если в отфильтрованной коллекции нет моделей, но заданы предложенные,
+            // то показываем их
+            // Если в отфильтрованной коллекции модели есть, то пробуем добавить к ним
+            // всегда показывающиеся модели, если их ещё нет в коллекции
+            if (!filteredIds.length && suggestedNotFoundModels.current.length) {
+                suggestedNotFoundModels.current.forEach((model) => newCollection.addModel({ ...model }));
+            }
+            else {
+                constantlySuggestedModels.current.forEach((model) => {
+                    if (!filteredIds.includes(model.id)) {
+                        newCollection.addModel({ ...model });
+                    }
+                });
+            }
+            setCollection(newCollection);
+            currentQuery.current = contentFilterQuery;
+            onChangeFilterQuery?.(filteredIds, contentFilterQueryTrimmed);
+            setExpanded(newExpanded);
+        }
+        else if (queryWasChanged) {
+            // Запрос не годится для поиска.
+            const newExpanded = initialExpanded.slice();
+            setCollection(initialCollection);
+            onChangeFilterQuery?.(initialCollection.toList().map((model) => model.id), contentFilterQueryTrimmed);
+            currentQuery.current = contentFilterQuery;
+            setExpanded(newExpanded);
+        }
+    }, [
+        initialCollection,
+        contentFilterQuery,
+        treeFilter,
+        selected,
+        initialExpanded,
+        setExpanded,
+        isMobile,
+        onChangeFilterQuery,
+    ]);
+    const renderTreeSelector = useCallback(() => {
+        return (jsx(VSpacingContainer, { default: 12, gteM: 0, children: isMobile ? (jsx(MobileItemsList, { getSearchItemOrder: (model) => initialCollection.getModelLevel(model.id), collection: collection, selected: selected, disabled: disabled, onChange: onChange, leavesOnly: leavesOnly, checkSelectable: checkSelectable, singleChoice: singleChoice, ref: ref, setInputValue: setInputValue, handleChangeInput: handleChangeInput, contentFilterQuery: contentFilterQuery.trim() })) : (jsx(ItemsList, { collection: collection, items: collection.getTopLevel(), leavesOnly: leavesOnly, checkSelectable: checkSelectable, expanded: currentExpanded, onExpansion: handleExpansion, selected: selected, onChange: onChange, disabled: disabled, singleChoice: singleChoice, indeterminate: indeterminate })) }));
+    }, [
+        isMobile,
+        collection,
+        selected,
+        disabled,
+        onChange,
+        leavesOnly,
+        checkSelectable,
+        singleChoice,
+        ref,
+        setInputValue,
+        handleChangeInput,
+        contentFilterQuery,
+        currentExpanded,
+        handleExpansion,
+        indeterminate,
+        initialCollection,
+    ]);
+    return jsx(Fragment, { children: children({ renderTreeSelector, renderInput }) });
+});
+TreeSelectorDummy.displayName = 'TreeSelectorDummy';
+
+export { TreeSelectorDummy };
+//# sourceMappingURL=TreeSelectorDummy.js.map

package/TreeSelectorDummy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TreeSelectorDummy.js","sources":["../src/TreeSelectorDummy.tsx"],"sourcesContent":["import { ReactElement, forwardRef, ForwardedRef, useCallback, useEffect, useRef, useState } from 'react';\n\nimport { match } from '@hh.ru/magritte-common-fuzzy-search';\nimport { useBreakpoint } from '@hh.ru/magritte-ui-breakpoint';\nimport { VSpacingContainer } from '@hh.ru/magritte-ui-spacing';\nimport { ItemsList } from '@hh.ru/magritte-ui-tree-selector/ItemsList';\nimport { MobileItemsList } from '@hh.ru/magritte-ui-tree-selector/MobileItemsList';\nimport { filterWithParents } from '@hh.ru/magritte-ui-tree-selector/collection/treeCollectionHelper';\nimport { AdditionalDefault } from '@hh.ru/magritte-ui-tree-selector/collection/types';\nimport { ListControls, TreeSelectorDummyProps } from '@hh.ru/magritte-ui-tree-selector/types';\nimport { useExpanded } from '@hh.ru/magritte-ui-tree-selector/useExpanded';\nimport { useIndeterminate } from '@hh.ru/magritte-ui-tree-selector/useIndeterminate';\nimport { useRenderInput } from '@hh.ru/magritte-ui-tree-selector/useRenderInput';\n\nconst defaultCheckSelectable = () => true;\nconst defaultArray: string[] = [];\n\nconst needToApply = (query: string): boolean => {\n    return !!(query && query.length);\n};\n\nexport const TreeSelectorDummy = forwardRef(\n    <A extends AdditionalDefault>(\n        {\n            collection: initialCollection,\n            checkSelectable = defaultCheckSelectable,\n            initialExpanded = defaultArray,\n            value: selected,\n            leavesOnly,\n            singleChoice,\n            expanded,\n            disabled = defaultArray,\n            treeFilter = filterWithParents,\n            suggestedNotFound = defaultArray,\n            constantlySuggested = defaultArray,\n            onExpand,\n            onChange,\n            onChangeFilterQuery,\n            children,\n        }: TreeSelectorDummyProps<A>,\n        ref: ForwardedRef<ListControls>\n    ): ReactElement => {\n        const [collection, setCollection] = useState(initialCollection);\n        const currentQuery = useRef('');\n        const suggestedNotFoundModels = useRef(initialCollection.getExistModels(suggestedNotFound));\n        const constantlySuggestedModels = useRef(initialCollection.getExistModels(constantlySuggested));\n\n        const { indeterminate } = useIndeterminate({ collection: initialCollection, selected });\n        const {\n            expanded: currentExpanded,\n            setExpanded,\n            handleExpansion,\n        } = useExpanded({\n            initialValue: expanded ? expanded.slice() : initialExpanded.slice(),\n            controlledExpanded: expanded,\n            onExpand,\n        });\n        const { isMobile } = useBreakpoint();\n\n        const { contentFilterQuery, setInputValue, handleChangeInput, renderInput } = useRenderInput();\n\n        useEffect(() => {\n            const contentFilterQueryTrimmed = contentFilterQuery.trim();\n            const queryWasChanged = contentFilterQueryTrimmed !== currentQuery.current.trim();\n\n            if (queryWasChanged && needToApply(contentFilterQueryTrimmed)) {\n                const newExpanded: string[] = [];\n                const newCollection = treeFilter(\n                    initialCollection,\n                    (item) => match(contentFilterQueryTrimmed, item.text),\n                    isMobile\n                );\n                newCollection.toList().forEach((item) => {\n                    if (newCollection.hasChildren(item.id)) {\n                        // Если есть в отфильтрованной коллекции есть дочерние элементы,\n                        // значит они заматчились, и нужно открыть родителя.\n                        newExpanded.push(item.id);\n                    } else {\n                        // Если заматчился только сам родитель, показываем его\n                        // схлопнутым => нужно добавить его ветку в коллекцию.\n                        initialCollection.walkChildren(item.id, (child, parents) => {\n                            newCollection.addModel({ ...child }, parents[0].id);\n                        });\n                    }\n                });\n\n                const filteredIds = newCollection.toList().map((model) => model.id);\n\n                // Если в отфильтрованной коллекции нет моделей, но заданы предложенные,\n                // то показываем их\n                // Если в отфильтрованной коллекции модели есть, то пробуем добавить к ним\n                // всегда показывающиеся модели, если их ещё нет в коллекции\n                if (!filteredIds.length && suggestedNotFoundModels.current.length) {\n                    suggestedNotFoundModels.current.forEach((model) => newCollection.addModel({ ...model }));\n                } else {\n                    constantlySuggestedModels.current.forEach((model) => {\n                        if (!filteredIds.includes(model.id)) {\n                            newCollection.addModel({ ...model });\n                        }\n                    });\n                }\n\n                setCollection(newCollection);\n                currentQuery.current = contentFilterQuery;\n                onChangeFilterQuery?.(filteredIds, contentFilterQueryTrimmed);\n                setExpanded(newExpanded);\n            } else if (queryWasChanged) {\n                // Запрос не годится для поиска.\n                const newExpanded = initialExpanded.slice();\n                setCollection(initialCollection);\n\n                onChangeFilterQuery?.(\n                    initialCollection.toList().map((model) => model.id),\n                    contentFilterQueryTrimmed\n                );\n                currentQuery.current = contentFilterQuery;\n                setExpanded(newExpanded);\n            }\n        }, [\n            initialCollection,\n            contentFilterQuery,\n            treeFilter,\n            selected,\n            initialExpanded,\n            setExpanded,\n            isMobile,\n            onChangeFilterQuery,\n        ]);\n\n        const renderTreeSelector = useCallback(() => {\n            return (\n                <VSpacingContainer default={12} gteM={0}>\n                    {isMobile ? (\n                        <MobileItemsList\n                            getSearchItemOrder={(model) => initialCollection.getModelLevel(model.id)}\n                            collection={collection}\n                            selected={selected}\n                            disabled={disabled}\n                            onChange={onChange}\n                            leavesOnly={leavesOnly}\n                            checkSelectable={checkSelectable}\n                            singleChoice={singleChoice}\n                            ref={ref}\n                            setInputValue={setInputValue}\n                            handleChangeInput={handleChangeInput}\n                            contentFilterQuery={contentFilterQuery.trim()}\n                        />\n                    ) : (\n                        <ItemsList\n                            collection={collection}\n                            items={collection.getTopLevel()}\n                            leavesOnly={leavesOnly}\n                            checkSelectable={checkSelectable}\n                            expanded={currentExpanded}\n                            onExpansion={handleExpansion}\n                            selected={selected}\n                            onChange={onChange}\n                            disabled={disabled}\n                            singleChoice={singleChoice}\n                            indeterminate={indeterminate}\n                        />\n                    )}\n                </VSpacingContainer>\n            );\n        }, [\n            isMobile,\n            collection,\n            selected,\n            disabled,\n            onChange,\n            leavesOnly,\n            checkSelectable,\n            singleChoice,\n            ref,\n            setInputValue,\n            handleChangeInput,\n            contentFilterQuery,\n            currentExpanded,\n            handleExpansion,\n            indeterminate,\n            initialCollection,\n        ]);\n\n        return <>{children({ renderTreeSelector, renderInput })}</>;\n    }\n);\n\nTreeSelectorDummy.displayName = 'TreeSelectorDummy';\n"],"names":["_jsx","_Fragment"],"mappings":"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"}

package/collection/treeCollectionHelper.d.ts

@@ -30,3 +30,9 @@ export declare const filterWithParents: TreeFilter;
  * для которых `filterFunction` вернула true (плоский список).
  */
 export declare const filterUniqueLeavesOnly: TreeFilter;
+/**
+ * Возвращает элементы из списка, родители которых отсутствуют в этом же списке.
+ * Полезно для определения минимального набора выбранных элементов (если выбран родитель
+ * целиком, игнорируем его дочерние элементы)
+ */
+export declare const getIdsWithNoParentsInSameList: <A extends AdditionalDefault>(collection: TreeCollection<A>, ids: string[]) => string[];

package/collection/treeCollectionHelper.js

@@ -103,6 +103,21 @@ const filterUniqueLeavesOnly = (collection, filterFunction) => {
     });
     return filteredCollection;
 };
+/**
+ * Возвращает элементы из списка, родители которых отсутствуют в этом же списке.
+ * Полезно для определения минимального набора выбранных элементов (если выбран родитель
+ * целиком, игнорируем его дочерние элементы)
+ */
+const getIdsWithNoParentsInSameList = (collection, ids) => {
+    const hasChildrenHash = ids.reduce((result, id) => {
+        result[id] = collection.getChildren(id).length > 0;
+        return result;
+    }, {});
+    return ids.filter((id) => {
+        const parentIds = collection.getParentIdsDuplicates(id);
+        return !parentIds.some((id) => hasChildrenHash.hasOwnProperty(id) && hasChildrenHash[id]);
+    });
+};
 
-export { filterMissingIds, filterParents, filterUniqueLeavesOnly, filterWithParents, fromTree, walk };
+export { filterMissingIds, filterParents, filterUniqueLeavesOnly, filterWithParents, fromTree, getIdsWithNoParentsInSameList, walk };
 //# sourceMappingURL=treeCollectionHelper.js.map

package/collection/treeCollectionHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"treeCollectionHelper.js","sources":["../../src/collection/treeCollectionHelper.ts"],"sourcesContent":["import TreeCollection from '@hh.ru/magritte-ui-tree-selector/collection/treeCollection';\nimport {\n    AdditionalDefault,\n    WalkCallback,\n    ModelData,\n    TreeFilter,\n    TreeModel,\n} from '@hh.ru/magritte-ui-tree-selector/collection/types';\n\n/**\n * Рекурсивно проходит по списку моделей, применяет к каждой модели переданную функцию.\n */\nexport const walk = <A extends AdditionalDefault>(\n    /** Дерево для обработки. */\n    tree: ModelData<A>[],\n    /** Вызываемая функция. */\n    callback: WalkCallback<A>,\n    /** Массив моделей родителей от ближнего к дальнему. */\n    parents?: ModelData<A>[]\n): void => {\n    const currentParents = parents ? parents.slice() : [];\n    tree.forEach((item) => {\n        callback(item, currentParents);\n        if (item.items && item.items.length) {\n            walk(item.items, callback, [item].concat(currentParents));\n        }\n    });\n};\n\n/**\n * Возвращает коллекцию, созданную из дерева.\n * @param tree\n * @param [callback] Функция, вызываемая на каждом элементе.\n */\nexport const fromTree = <A extends AdditionalDefault = never>(\n    tree: ModelData<A>[],\n    callback?: WalkCallback<A>\n): TreeCollection<A> => {\n    const collection = new TreeCollection<A>();\n    walk(tree, (item, parents): void => {\n        if (typeof callback === 'function') {\n            callback(item, parents);\n        }\n        collection.addModel(item, parents.length ? parents[0].id : undefined);\n    });\n    return collection;\n};\n\n/**\n * Возвращает только те ID, которые присутствуют в коллекции\n */\nexport const filterMissingIds = <A extends AdditionalDefault>(\n    collection: TreeCollection<A>,\n    ids: string[]\n): string[] => {\n    const filteredIds: string[] = [];\n    ids.forEach((id) => {\n        if (collection.getModel(id)) {\n            filteredIds.push(id);\n        }\n    });\n    return filteredIds;\n};\n\n/**\n * Возвращает ID только тех элементов, у которых нет потомков.\n */\nexport const filterParents = <A extends AdditionalDefault>(collection: TreeCollection<A>, ids: string[]): string[] => {\n    return ids.filter((id) => {\n        return collection.getChildrenIds(id).length === 0;\n    });\n};\n\n/**\n * Возвращает новую коллекцию, содержащую элементы, для которых `filterFunction` вернула true.\n * Если заматчился дочерний элемент, к результатам добавляются его родители до самого верха.\n * Если заматчился родитель, к результатам НЕ добавляются его дочерние элементы (кроме тех,\n * что тоже заматчились).\n */\nexport const filterWithParents: TreeFilter = (collection, filterFunction, isMobile) => {\n    const filteredCollection: typeof collection = new (collection.constructor as typeof TreeCollection)();\n    const ids = new Set<TreeModel['id']>();\n    collection.walk((model, parents) => {\n        if (filterFunction(model)) {\n            ids.add(model.id);\n            if (!isMobile) {\n                parents.forEach((parent) => {\n                    ids.add(parent.id);\n                });\n            }\n        }\n    });\n    ids.forEach((id) => {\n        const model = collection.getModel(id);\n        if (model) {\n            // В модели с дубликатами у элемента может быть несколько родителей\n            const parentIds = collection.getParentIdsDuplicates(model.id);\n            if (parentIds.length && !isMobile) {\n                parentIds.forEach((parendId) => {\n                    filteredCollection.addModel({ ...model }, parendId);\n                });\n            } else {\n                filteredCollection.addModel({ ...model });\n            }\n        }\n    });\n    return filteredCollection;\n};\n\n/**\n * Возвращает новую коллекцию, содержащую уникальные элементы самого нижнего уровня,\n * для которых `filterFunction` вернула true (плоский список).\n */\nexport const filterUniqueLeavesOnly: TreeFilter = (collection, filterFunction) => {\n    const filteredCollection: typeof collection = new TreeCollection();\n    collection.walk((model) => {\n        if (!filteredCollection.getModel(model.id) && !collection.hasChildren(model.id) && filterFunction(model)) {\n            filteredCollection.addModel({ ...model });\n        }\n    });\n    return filteredCollection;\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"treeCollectionHelper.js","sources":["../../src/collection/treeCollectionHelper.ts"],"sourcesContent":["import TreeCollection from '@hh.ru/magritte-ui-tree-selector/collection/treeCollection';\nimport {\n    AdditionalDefault,\n    WalkCallback,\n    ModelData,\n    TreeFilter,\n    TreeModel,\n} from '@hh.ru/magritte-ui-tree-selector/collection/types';\n\n/**\n * Рекурсивно проходит по списку моделей, применяет к каждой модели переданную функцию.\n */\nexport const walk = <A extends AdditionalDefault>(\n    /** Дерево для обработки. */\n    tree: ModelData<A>[],\n    /** Вызываемая функция. */\n    callback: WalkCallback<A>,\n    /** Массив моделей родителей от ближнего к дальнему. */\n    parents?: ModelData<A>[]\n): void => {\n    const currentParents = parents ? parents.slice() : [];\n    tree.forEach((item) => {\n        callback(item, currentParents);\n        if (item.items && item.items.length) {\n            walk(item.items, callback, [item].concat(currentParents));\n        }\n    });\n};\n\n/**\n * Возвращает коллекцию, созданную из дерева.\n * @param tree\n * @param [callback] Функция, вызываемая на каждом элементе.\n */\nexport const fromTree = <A extends AdditionalDefault = never>(\n    tree: ModelData<A>[],\n    callback?: WalkCallback<A>\n): TreeCollection<A> => {\n    const collection = new TreeCollection<A>();\n    walk(tree, (item, parents): void => {\n        if (typeof callback === 'function') {\n            callback(item, parents);\n        }\n        collection.addModel(item, parents.length ? parents[0].id : undefined);\n    });\n    return collection;\n};\n\n/**\n * Возвращает только те ID, которые присутствуют в коллекции\n */\nexport const filterMissingIds = <A extends AdditionalDefault>(\n    collection: TreeCollection<A>,\n    ids: string[]\n): string[] => {\n    const filteredIds: string[] = [];\n    ids.forEach((id) => {\n        if (collection.getModel(id)) {\n            filteredIds.push(id);\n        }\n    });\n    return filteredIds;\n};\n\n/**\n * Возвращает ID только тех элементов, у которых нет потомков.\n */\nexport const filterParents = <A extends AdditionalDefault>(collection: TreeCollection<A>, ids: string[]): string[] => {\n    return ids.filter((id) => {\n        return collection.getChildrenIds(id).length === 0;\n    });\n};\n\n/**\n * Возвращает новую коллекцию, содержащую элементы, для которых `filterFunction` вернула true.\n * Если заматчился дочерний элемент, к результатам добавляются его родители до самого верха.\n * Если заматчился родитель, к результатам НЕ добавляются его дочерние элементы (кроме тех,\n * что тоже заматчились).\n */\nexport const filterWithParents: TreeFilter = (collection, filterFunction, isMobile) => {\n    const filteredCollection: typeof collection = new (collection.constructor as typeof TreeCollection)();\n    const ids = new Set<TreeModel['id']>();\n    collection.walk((model, parents) => {\n        if (filterFunction(model)) {\n            ids.add(model.id);\n            if (!isMobile) {\n                parents.forEach((parent) => {\n                    ids.add(parent.id);\n                });\n            }\n        }\n    });\n    ids.forEach((id) => {\n        const model = collection.getModel(id);\n        if (model) {\n            // В модели с дубликатами у элемента может быть несколько родителей\n            const parentIds = collection.getParentIdsDuplicates(model.id);\n            if (parentIds.length && !isMobile) {\n                parentIds.forEach((parendId) => {\n                    filteredCollection.addModel({ ...model }, parendId);\n                });\n            } else {\n                filteredCollection.addModel({ ...model });\n            }\n        }\n    });\n    return filteredCollection;\n};\n\n/**\n * Возвращает новую коллекцию, содержащую уникальные элементы самого нижнего уровня,\n * для которых `filterFunction` вернула true (плоский список).\n */\nexport const filterUniqueLeavesOnly: TreeFilter = (collection, filterFunction) => {\n    const filteredCollection: typeof collection = new TreeCollection();\n    collection.walk((model) => {\n        if (!filteredCollection.getModel(model.id) && !collection.hasChildren(model.id) && filterFunction(model)) {\n            filteredCollection.addModel({ ...model });\n        }\n    });\n    return filteredCollection;\n};\n\n/**\n * Возвращает элементы из списка, родители которых отсутствуют в этом же списке.\n * Полезно для определения минимального набора выбранных элементов (если выбран родитель\n * целиком, игнорируем его дочерние элементы)\n */\nexport const getIdsWithNoParentsInSameList = <A extends AdditionalDefault>(\n    collection: TreeCollection<A>,\n    ids: string[]\n): string[] => {\n    const hasChildrenHash = ids.reduce((result: Record<string, boolean>, id) => {\n        result[id] = collection.getChildren(id).length > 0;\n        return result;\n    }, {});\n\n    return ids.filter((id) => {\n        const parentIds = collection.getParentIdsDuplicates(id);\n        return !parentIds.some((id) => hasChildrenHash.hasOwnProperty(id) && hasChildrenHash[id]);\n    });\n};\n"],"names":[],"mappings":"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"}

package/index.css

@@ -1,38 +1,38 @@
-.magritte-wrapper___GHKV6_1-3-1{
+.magritte-wrapper___GHKV6_1-4-0{
   display:flex;
   padding:12px 0;
   gap:12px;
   align-items:center;
 }
-.magritte-letter___yZOCU_1-3-1{
+.magritte-letter___yZOCU_1-4-0{
   width:24px;
   flex-shrink:0;
   text-align:center;
 }
-.magritte-icon___kO3Fj_1-3-1,
-.magritte-space___xTO79_1-3-1{
+.magritte-icon___kO3Fj_1-4-0,
+.magritte-space___xTO79_1-4-0{
   flex-shrink:0;
   line-height:0;
   width:24px;
 }
-.magritte-iconActive___4yrG5_1-3-1{
+.magritte-iconActive___4yrG5_1-4-0{
   cursor:pointer;
 }
-.magritte-content___ZRc6R_1-3-1{
+.magritte-content___ZRc6R_1-4-0{
   flex-grow:1;
 }
-.magritte-with-shift___ZErxZ_1-3-1{
+.magritte-with-shift___ZErxZ_1-4-0{
   margin-left:-36px;
 }
-.magritte-with-indent___MH9Vy_1-3-1{
+.magritte-with-indent___MH9Vy_1-4-0{
   margin-left:36px;
 }
-.magritte-item___2LtOL_1-3-1 > .magritte-children___kq-eq_1-3-1{
+.magritte-item___2LtOL_1-4-0 > .magritte-children___kq-eq_1-4-0{
   padding-left:36px;
 }
-.magritte-item___2LtOL_1-3-1.magritte-with-two-boxes___LWOy2_1-3-1 > .magritte-children___kq-eq_1-3-1{
+.magritte-item___2LtOL_1-4-0.magritte-with-two-boxes___LWOy2_1-4-0 > .magritte-children___kq-eq_1-4-0{
   padding-left:72px;
 }
-.magritte-item___2LtOL_1-3-1.magritte-with-three-boxes___cyVao_1-3-1 > .magritte-children___kq-eq_1-3-1{
+.magritte-item___2LtOL_1-4-0.magritte-with-three-boxes___cyVao_1-4-0 > .magritte-children___kq-eq_1-4-0{
   padding-left:108px;
 }

package/index.d.ts

@@ -1,3 +1,3 @@
 export * from './TreeSelector';
-export * from './UncontrolledTreeSelector';
+export * from './TreeSelectorDummy';
 export * from './types';

package/index.js

@@ -1,15 +1,24 @@
 import './index.css';
 export { TreeSelector } from './TreeSelector.js';
-export { UncontrolledTreeSelector } from './UncontrolledTreeSelector.js';
+export { TreeSelectorDummy } from './TreeSelectorDummy.js';
 import 'react/jsx-runtime';
 import 'react';
+import './strategy/immutableSelectionStrategy.js';
+import './strategy/selectionStrategy.js';
+import './collection/treeCollectionHelper.js';
+import './collection/treeCollection.js';
+import './strategy/createSingleValueToggler.js';
+import './strategy/createTreeCollectionToggler.js';
+import './strategy/dummyToggle.js';
+import './useDisabled.js';
+import './useSelected.js';
 import '@hh.ru/magritte-common-fuzzy-search';
 import '@hh.ru/magritte-ui-breakpoint';
 import '@hh.ru/magritte-ui-spacing';
 import './ItemsList.js';
 import './Item.js';
 import 'classnames';
-import './ItemContent-74eb482b.js';
+import './ItemContent-f98f0b9a.js';
 import '@hh.ru/magritte-ui-cell';
 import '@hh.ru/magritte-ui-icon/icon';
 import './Action.js';
@@ -20,16 +29,8 @@ import '@hh.ru/magritte-ui-checkable-card/CheckableCardElement';
 import './MobileItem.js';
 import './MobileParentItem.js';
 import '@hh.ru/magritte-ui-card';
-import './collection/treeCollectionHelper.js';
-import './collection/treeCollection.js';
 import './useExpanded.js';
 import './useIndeterminate.js';
 import './useRenderInput.js';
 import '@hh.ru/magritte-ui-input';
-import './strategy/immutableSelectionStrategy.js';
-import './strategy/selectionStrategy.js';
-import './strategy/createSingleValueToggler.js';
-import './strategy/createTreeCollectionToggler.js';
-import './strategy/dummyToggle.js';
-import './useSelected.js';
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hh.ru/magritte-ui-tree-selector",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "main": "index.js",
   "types": "index.d.ts",
   "sideEffects": [
@@ -21,9 +21,9 @@
   "dependencies": {
     "@hh.ru/magritte-common-fuzzy-search": "1.0.4",
     "@hh.ru/magritte-ui-breakpoint": "4.0.2",
-    "@hh.ru/magritte-ui-card": "6.0.5",
+    "@hh.ru/magritte-ui-card": "6.0.6",
     "@hh.ru/magritte-ui-cell": "2.2.12",
-    "@hh.ru/magritte-ui-checkable-card": "3.0.8",
+    "@hh.ru/magritte-ui-checkable-card": "3.0.9",
     "@hh.ru/magritte-ui-checkbox-radio": "3.0.3",
     "@hh.ru/magritte-ui-icon": "7.1.7",
     "@hh.ru/magritte-ui-input": "5.0.21",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "98a8e09926b544aea2b9255436cf0605ad12e3f1"
+  "gitHead": "079f9054662c714de59315a0d7652297c5817647"
 }

package/types.d.ts

@@ -8,12 +8,13 @@ interface ChildrenProps {
 interface Children {
     (props: ChildrenProps): ReactNode;
 }
-export interface TreeSelectorProps<A extends AdditionalDefault> {
+export interface BaseTreeSelectorProps<A extends AdditionalDefault> {
     collection: TreeCollection<A>;
     singleChoice?: boolean;
     leavesOnly?: boolean;
     checkSelectable?: IdCollectionPredicate;
     initialExpanded?: string[];
+    disabled?: string[];
     expanded?: string[];
     onExpand?: (expanded: string[]) => void;
     children: Children;
@@ -23,16 +24,25 @@ export interface TreeSelectorProps<A extends AdditionalDefault> {
     constantlySuggested?: string[];
     onChangeFilterQuery?: (ids: string[], query: string) => void;
 }
-export interface ControlledProps {
+export interface DummyProps {
     value: string[];
     onChange: (id: string, isSelected: boolean) => void;
+    collapseToParentId?: never;
+    maxSelected?: never;
 }
-type UncontrolledProps = {
-    value?: string[];
+type NonDummyProps = {
     onChange?: (id: string, isSelected: boolean, allSelected: string[]) => void;
-};
-export type ControlledTreeSelectorProps<A extends AdditionalDefault> = TreeSelectorProps<A> & ControlledProps;
-export type UncontrolledTreeSelectorProps<A extends AdditionalDefault> = TreeSelectorProps<A> & UncontrolledProps;
+    collapseToParentId?: boolean;
+    maxSelected?: number;
+} & ({
+    value: string[];
+    initialValue?: never;
+} | {
+    value?: never;
+    initialValue: string[];
+});
+export type TreeSelectorDummyProps<A extends AdditionalDefault> = BaseTreeSelectorProps<A> & DummyProps;
+export type TreeSelectorProps<A extends AdditionalDefault> = BaseTreeSelectorProps<A> & NonDummyProps;
 export interface ListControls {
     back: () => void;
 }

package/useDisabled.d.ts

@@ -0,0 +1,13 @@
+import TreeCollection from './collection/treeCollection';
+import { AdditionalDefault } from './collection/types';
+interface UseDisabledHookProps<A extends AdditionalDefault> {
+    selected: string[];
+    disabled?: string[];
+    collection: TreeCollection<A>;
+    maxSelected?: number;
+}
+interface UseDisabledHook {
+    <A extends AdditionalDefault>(props: UseDisabledHookProps<A>): string[] | undefined;
+}
+export declare const useDisabled: UseDisabledHook;
+export {};

package/useDisabled.js

@@ -0,0 +1,20 @@
+import './index.css';
+import { useMemo } from 'react';
+import { getIdsWithNoParentsInSameList } from './collection/treeCollectionHelper.js';
+import './collection/treeCollection.js';
+
+const useDisabled = ({ selected, disabled, collection, maxSelected }) => {
+    return useMemo(() => {
+        const valueIds = getIdsWithNoParentsInSameList(collection, selected);
+        if (maxSelected && valueIds.length >= maxSelected) {
+            return collection
+                .toList()
+                .map(({ id }) => id)
+                .filter((id) => !selected.includes(id));
+        }
+        return disabled;
+    }, [selected, collection, disabled, maxSelected]);
+};
+
+export { useDisabled };
+//# sourceMappingURL=useDisabled.js.map

package/useDisabled.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useDisabled.js","sources":["../src/useDisabled.ts"],"sourcesContent":["import { useMemo } from 'react';\n\nimport TreeCollection from '@hh.ru/magritte-ui-tree-selector/collection/treeCollection';\nimport { getIdsWithNoParentsInSameList } from '@hh.ru/magritte-ui-tree-selector/collection/treeCollectionHelper';\nimport { AdditionalDefault } from '@hh.ru/magritte-ui-tree-selector/collection/types';\n\ninterface UseDisabledHookProps<A extends AdditionalDefault> {\n    selected: string[];\n    disabled?: string[];\n    collection: TreeCollection<A>;\n    maxSelected?: number;\n}\ninterface UseDisabledHook {\n    <A extends AdditionalDefault>(props: UseDisabledHookProps<A>): string[] | undefined;\n}\n\nexport const useDisabled: UseDisabledHook = ({ selected, disabled, collection, maxSelected }) => {\n    return useMemo(() => {\n        const valueIds = getIdsWithNoParentsInSameList(collection, selected);\n        if (maxSelected && valueIds.length >= maxSelected) {\n            return collection\n                .toList()\n                .map(({ id }) => id)\n                .filter((id) => !selected.includes(id));\n        }\n        return disabled;\n    }, [selected, collection, disabled, maxSelected]);\n};\n"],"names":[],"mappings":";;;;AAgBO,MAAM,WAAW,GAAoB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,KAAI;IAC5F,OAAO,OAAO,CAAC,MAAK;QAChB,MAAM,QAAQ,GAAG,6BAA6B,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AACrE,QAAA,IAAI,WAAW,IAAI,QAAQ,CAAC,MAAM,IAAI,WAAW,EAAE;AAC/C,YAAA,OAAO,UAAU;AACZ,iBAAA,MAAM,EAAE;iBACR,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;AACnB,iBAAA,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/C,SAAA;AACD,QAAA,OAAO,QAAQ,CAAC;KACnB,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;AACtD;;;;"}

package/useExpanded.d.ts

@@ -12,5 +12,5 @@ interface UseExpandedHookReturn {
 interface UseExpandedHook {
     (props: UseExpandedHookProps): UseExpandedHookReturn;
 }
-declare const useExpanded: UseExpandedHook;
-export default useExpanded;
+export declare const useExpanded: UseExpandedHook;
+export {};

package/useExpanded.js

@@ -46,5 +46,5 @@ const useExpanded = ({ initialValue, controlledExpanded, onExpand }) => {
     return { expanded, setExpanded: handleSetExpanded, handleExpansion };
 };
 
-export { areEqualArrays, useExpanded as default };
+export { areEqualArrays, useExpanded };
 //# sourceMappingURL=useExpanded.js.map

package/useExpanded.js.map

@@ -1 +1 @@
-{"version":3,"file":"useExpanded.js","sources":["../src/useExpanded.ts"],"sourcesContent":["import { useCallback, useEffect, useRef, useState } from 'react';\n\nexport const areEqualArrays = (arr1: string[], arr2: string[]): boolean => {\n    if (arr1.length !== arr2.length) {\n        return false;\n    }\n    const sortArr2 = arr2.slice().sort();\n    return arr1\n        .slice()\n        .sort()\n        .every((item, index) => item === sortArr2[index]);\n};\n\ninterface UseExpandedHookProps {\n    initialValue: string[];\n    controlledExpanded?: string[];\n    onExpand?: (expanded: string[]) => void;\n}\n\ninterface UseExpandedHookReturn {\n    expanded: string[];\n    setExpanded: (expanded: string[]) => void;\n    handleExpansion: (id: string) => void;\n}\ninterface UseExpandedHook {\n    (props: UseExpandedHookProps): UseExpandedHookReturn;\n}\n\nconst useExpanded: UseExpandedHook = ({ initialValue, controlledExpanded, onExpand }) => {\n    const [expanded, setExpanded] = useState(initialValue);\n    const expandedRef = useRef(initialValue);\n    const handlerRef = useRef(onExpand);\n\n    const handleSetExpanded = useCallback((updatedExpanded: string[]) => {\n        handlerRef.current?.(updatedExpanded.slice());\n\n        if (!areEqualArrays(expandedRef.current, updatedExpanded)) {\n            setExpanded(updatedExpanded);\n        }\n    }, []);\n\n    const handleExpansion = useCallback(\n        (id: string): void => {\n            let updatedExpanded;\n            if (expandedRef.current.includes(id)) {\n                updatedExpanded = expandedRef.current.filter((itemId) => itemId !== id);\n            } else {\n                updatedExpanded = expandedRef.current.slice();\n                updatedExpanded.push(id);\n            }\n            handleSetExpanded(updatedExpanded);\n        },\n        [handleSetExpanded]\n    );\n\n    useEffect(() => {\n        handlerRef.current = onExpand;\n    }, [onExpand]);\n\n    useEffect(() => {\n        expandedRef.current = expanded;\n    }, [expanded]);\n\n    useEffect(() => {\n        if (controlledExpanded) {\n            handleSetExpanded(controlledExpanded.slice());\n        }\n    }, [controlledExpanded, handleSetExpanded]);\n\n    return { expanded, setExpanded: handleSetExpanded, handleExpansion };\n};\n\nexport default useExpanded;\n"],"names":[],"mappings":";;MAEa,cAAc,GAAG,CAAC,IAAc,EAAE,IAAc,KAAa;AACtE,IAAA,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;AAC7B,QAAA,OAAO,KAAK,CAAC;AAChB,KAAA;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;AACrC,IAAA,OAAO,IAAI;AACN,SAAA,KAAK,EAAE;AACP,SAAA,IAAI,EAAE;AACN,SAAA,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,EAAE;AAiBI,MAAA,WAAW,GAAoB,CAAC,EAAE,YAAY,EAAE,kBAAkB,EAAE,QAAQ,EAAE,KAAI;IACpF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;AACvD,IAAA,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACzC,IAAA,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEpC,IAAA,MAAM,iBAAiB,GAAG,WAAW,CAAC,CAAC,eAAyB,KAAI;QAChE,UAAU,CAAC,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC;QAE9C,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE;YACvD,WAAW,CAAC,eAAe,CAAC,CAAC;AAChC,SAAA;KACJ,EAAE,EAAE,CAAC,CAAC;AAEP,IAAA,MAAM,eAAe,GAAG,WAAW,CAC/B,CAAC,EAAU,KAAU;AACjB,QAAA,IAAI,eAAe,CAAC;QACpB,IAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;AAClC,YAAA,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,MAAM,KAAK,EAAE,CAAC,CAAC;AAC3E,SAAA;AAAM,aAAA;AACH,YAAA,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;AAC9C,YAAA,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC5B,SAAA;QACD,iBAAiB,CAAC,eAAe,CAAC,CAAC;AACvC,KAAC,EACD,CAAC,iBAAiB,CAAC,CACtB,CAAC;IAEF,SAAS,CAAC,MAAK;AACX,QAAA,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAC;AAClC,KAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,SAAS,CAAC,MAAK;AACX,QAAA,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;AACnC,KAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,SAAS,CAAC,MAAK;AACX,QAAA,IAAI,kBAAkB,EAAE;AACpB,YAAA,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC;AACjD,SAAA;AACL,KAAC,EAAE,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC;AACzE;;;;"}
+{"version":3,"file":"useExpanded.js","sources":["../src/useExpanded.ts"],"sourcesContent":["import { useCallback, useEffect, useRef, useState } from 'react';\n\nexport const areEqualArrays = (arr1: string[], arr2: string[]): boolean => {\n    if (arr1.length !== arr2.length) {\n        return false;\n    }\n    const sortArr2 = arr2.slice().sort();\n    return arr1\n        .slice()\n        .sort()\n        .every((item, index) => item === sortArr2[index]);\n};\n\ninterface UseExpandedHookProps {\n    initialValue: string[];\n    controlledExpanded?: string[];\n    onExpand?: (expanded: string[]) => void;\n}\n\ninterface UseExpandedHookReturn {\n    expanded: string[];\n    setExpanded: (expanded: string[]) => void;\n    handleExpansion: (id: string) => void;\n}\ninterface UseExpandedHook {\n    (props: UseExpandedHookProps): UseExpandedHookReturn;\n}\n\nexport const useExpanded: UseExpandedHook = ({ initialValue, controlledExpanded, onExpand }) => {\n    const [expanded, setExpanded] = useState(initialValue);\n    const expandedRef = useRef(initialValue);\n    const handlerRef = useRef(onExpand);\n\n    const handleSetExpanded = useCallback((updatedExpanded: string[]) => {\n        handlerRef.current?.(updatedExpanded.slice());\n\n        if (!areEqualArrays(expandedRef.current, updatedExpanded)) {\n            setExpanded(updatedExpanded);\n        }\n    }, []);\n\n    const handleExpansion = useCallback(\n        (id: string): void => {\n            let updatedExpanded;\n            if (expandedRef.current.includes(id)) {\n                updatedExpanded = expandedRef.current.filter((itemId) => itemId !== id);\n            } else {\n                updatedExpanded = expandedRef.current.slice();\n                updatedExpanded.push(id);\n            }\n            handleSetExpanded(updatedExpanded);\n        },\n        [handleSetExpanded]\n    );\n\n    useEffect(() => {\n        handlerRef.current = onExpand;\n    }, [onExpand]);\n\n    useEffect(() => {\n        expandedRef.current = expanded;\n    }, [expanded]);\n\n    useEffect(() => {\n        if (controlledExpanded) {\n            handleSetExpanded(controlledExpanded.slice());\n        }\n    }, [controlledExpanded, handleSetExpanded]);\n\n    return { expanded, setExpanded: handleSetExpanded, handleExpansion };\n};\n"],"names":[],"mappings":";;MAEa,cAAc,GAAG,CAAC,IAAc,EAAE,IAAc,KAAa;AACtE,IAAA,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;AAC7B,QAAA,OAAO,KAAK,CAAC;AAChB,KAAA;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;AACrC,IAAA,OAAO,IAAI;AACN,SAAA,KAAK,EAAE;AACP,SAAA,IAAI,EAAE;AACN,SAAA,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,EAAE;AAiBK,MAAM,WAAW,GAAoB,CAAC,EAAE,YAAY,EAAE,kBAAkB,EAAE,QAAQ,EAAE,KAAI;IAC3F,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;AACvD,IAAA,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACzC,IAAA,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEpC,IAAA,MAAM,iBAAiB,GAAG,WAAW,CAAC,CAAC,eAAyB,KAAI;QAChE,UAAU,CAAC,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC;QAE9C,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE;YACvD,WAAW,CAAC,eAAe,CAAC,CAAC;AAChC,SAAA;KACJ,EAAE,EAAE,CAAC,CAAC;AAEP,IAAA,MAAM,eAAe,GAAG,WAAW,CAC/B,CAAC,EAAU,KAAU;AACjB,QAAA,IAAI,eAAe,CAAC;QACpB,IAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;AAClC,YAAA,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,MAAM,KAAK,EAAE,CAAC,CAAC;AAC3E,SAAA;AAAM,aAAA;AACH,YAAA,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;AAC9C,YAAA,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC5B,SAAA;QACD,iBAAiB,CAAC,eAAe,CAAC,CAAC;AACvC,KAAC,EACD,CAAC,iBAAiB,CAAC,CACtB,CAAC;IAEF,SAAS,CAAC,MAAK;AACX,QAAA,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAC;AAClC,KAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,SAAS,CAAC,MAAK;AACX,QAAA,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;AACnC,KAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,SAAS,CAAC,MAAK;AACX,QAAA,IAAI,kBAAkB,EAAE;AACpB,YAAA,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC;AACjD,SAAA;AACL,KAAC,EAAE,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC;AACzE;;;;"}

package/useSelected.d.ts

@@ -1,9 +1,14 @@
+import TreeCollection from './collection/treeCollection';
 import { AdditionalDefault } from './collection/types';
 import ImmutableSelectionStrategy from './strategy/immutableSelectionStrategy';
 interface UseSelectedHookProps<A extends AdditionalDefault> {
-    value: string[];
+    value?: string[];
+    initialValue?: string[];
     strategy: ImmutableSelectionStrategy<A>;
+    collection: TreeCollection<A>;
     onChange?: (id: string, isSelected: boolean, allSelected: string[]) => void;
+    collapseToParentId?: boolean;
+    maxSelected?: number;
 }
 type UseSelectedHookReturn = {
     selected: string[];

package/useSelected.js

@@ -1,16 +1,47 @@
 import './index.css';
-import { useState, useCallback } from 'react';
+import { useCallback, useState, useRef, useEffect } from 'react';
+import { getIdsWithNoParentsInSameList } from './collection/treeCollectionHelper.js';
+import './collection/treeCollection.js';
 
-const useSelected = ({ value: initialValue, strategy, onChange }) => {
-    const [values, setValues] = useState(initialValue);
+const defaultArray = [];
+const useSelected = ({ value, initialValue = defaultArray, maxSelected, strategy, collection, collapseToParentId, onChange, }) => {
+    const getSelectedFromValue = useCallback(() => {
+        let newValue = value?.slice();
+        if (maxSelected && newValue && newValue.length > maxSelected) {
+            newValue = newValue.slice(0, maxSelected);
+        }
+        return strategy.add([], newValue);
+    }, [value, maxSelected, strategy]);
+    const isControlled = !!value;
+    const slicedInitialValue = initialValue && maxSelected ? initialValue.slice(0, maxSelected) : initialValue;
+    const [selected, setSelectedState] = useState(isControlled ? getSelectedFromValue : slicedInitialValue);
+    const firstRender = useRef(true);
     const setSelected = useCallback((id, isSelected) => {
         const ids = [id];
-        const updatedSelected = isSelected ? strategy.add(values, ids) : strategy.remove(values, ids);
-        setValues(updatedSelected);
-        onChange?.(id, isSelected, updatedSelected);
-    }, [strategy, values, onChange]);
+        const updatedSelected = isSelected ? strategy.add(selected, ids) : strategy.remove(selected, ids);
+        const filteredUpdatedSelected = collapseToParentId
+            ? getIdsWithNoParentsInSameList(collection, updatedSelected)
+            : updatedSelected;
+        if (maxSelected && filteredUpdatedSelected.length > maxSelected) {
+            filteredUpdatedSelected.length = maxSelected;
+        }
+        if (!isControlled) {
+            setSelectedState(strategy.add([], filteredUpdatedSelected));
+        }
+        onChange?.(id, isSelected, filteredUpdatedSelected);
+    }, [strategy, selected, collection, collapseToParentId, onChange, isControlled, maxSelected]);
+    useEffect(() => {
+        if (isControlled) {
+            if (firstRender.current) {
+                firstRender.current = false;
+                return;
+            }
+            const selected = getSelectedFromValue();
+            setSelectedState(selected);
+        }
+    }, [getSelectedFromValue, firstRender, isControlled]);
     return {
-        selected: values,
+        selected,
         setSelected,
     };
 };

package/useSelected.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSelected.js","sources":["../src/useSelected.ts"],"sourcesContent":["import { useState, useCallback } from 'react';\n\nimport { AdditionalDefault } from '@hh.ru/magritte-ui-tree-selector/collection/types';\nimport ImmutableSelectionStrategy from '@hh.ru/magritte-ui-tree-selector/strategy/immutableSelectionStrategy';\n\ninterface UseSelectedHookProps<A extends AdditionalDefault> {\n    value: string[];\n    strategy: ImmutableSelectionStrategy<A>;\n    onChange?: (id: string, isSelected: boolean, allSelected: string[]) => void;\n}\n\ntype UseSelectedHookReturn = {\n    selected: string[];\n    setSelected: (id: string, isSelected: boolean) => void;\n};\n\ninterface UseSelectedHook {\n    <A extends AdditionalDefault>(props: UseSelectedHookProps<A>): UseSelectedHookReturn;\n}\n\nexport const useSelected: UseSelectedHook = ({ value: initialValue, strategy, onChange }) => {\n    const [values, setValues] = useState(initialValue);\n\n    const setSelected = useCallback(\n        (id: string, isSelected: boolean) => {\n            const ids = [id];\n            const updatedSelected = isSelected ? strategy.add(values, ids) : strategy.remove(values, ids);\n\n            setValues(updatedSelected);\n            onChange?.(id, isSelected, updatedSelected);\n        },\n        [strategy, values, onChange]\n    );\n\n    return {\n        selected: values,\n        setSelected,\n    };\n};\n"],"names":[],"mappings":";;AAoBO,MAAM,WAAW,GAAoB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAI;IACxF,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IAEnD,MAAM,WAAW,GAAG,WAAW,CAC3B,CAAC,EAAU,EAAE,UAAmB,KAAI;AAChC,QAAA,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;QACjB,MAAM,eAAe,GAAG,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAE9F,SAAS,CAAC,eAAe,CAAC,CAAC;QAC3B,QAAQ,GAAG,EAAE,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;KAC/C,EACD,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAC/B,CAAC;IAEF,OAAO;AACH,QAAA,QAAQ,EAAE,MAAM;QAChB,WAAW;KACd,CAAC;AACN;;;;"}
+{"version":3,"file":"useSelected.js","sources":["../src/useSelected.ts"],"sourcesContent":["import { useState, useCallback, useRef, useEffect } from 'react';\n\nimport TreeCollection from '@hh.ru/magritte-ui-tree-selector/collection/treeCollection';\nimport { getIdsWithNoParentsInSameList } from '@hh.ru/magritte-ui-tree-selector/collection/treeCollectionHelper';\nimport { AdditionalDefault } from '@hh.ru/magritte-ui-tree-selector/collection/types';\nimport ImmutableSelectionStrategy from '@hh.ru/magritte-ui-tree-selector/strategy/immutableSelectionStrategy';\n\ninterface UseSelectedHookProps<A extends AdditionalDefault> {\n    value?: string[];\n    initialValue?: string[];\n    strategy: ImmutableSelectionStrategy<A>;\n    collection: TreeCollection<A>;\n    onChange?: (id: string, isSelected: boolean, allSelected: string[]) => void;\n    collapseToParentId?: boolean;\n    maxSelected?: number;\n}\n\ntype UseSelectedHookReturn = {\n    selected: string[];\n    setSelected: (id: string, isSelected: boolean) => void;\n};\n\ninterface UseSelectedHook {\n    <A extends AdditionalDefault>(props: UseSelectedHookProps<A>): UseSelectedHookReturn;\n}\n\nconst defaultArray: string[] = [];\n\nexport const useSelected: UseSelectedHook = ({\n    value,\n    initialValue = defaultArray,\n    maxSelected,\n    strategy,\n    collection,\n    collapseToParentId,\n    onChange,\n}) => {\n    const getSelectedFromValue = useCallback((): string[] => {\n        let newValue = value?.slice();\n        if (maxSelected && newValue && newValue.length > maxSelected) {\n            newValue = newValue.slice(0, maxSelected);\n        }\n        return strategy.add([], newValue as string[]);\n    }, [value, maxSelected, strategy]);\n    const isControlled = !!value;\n    const slicedInitialValue = initialValue && maxSelected ? initialValue.slice(0, maxSelected) : initialValue;\n\n    const [selected, setSelectedState] = useState(isControlled ? getSelectedFromValue : slicedInitialValue);\n    const firstRender = useRef(true);\n\n    const setSelected = useCallback(\n        (id: string, isSelected: boolean) => {\n            const ids = [id];\n            const updatedSelected = isSelected ? strategy.add(selected, ids) : strategy.remove(selected, ids);\n            const filteredUpdatedSelected = collapseToParentId\n                ? getIdsWithNoParentsInSameList(collection, updatedSelected)\n                : updatedSelected;\n            if (maxSelected && filteredUpdatedSelected.length > maxSelected) {\n                filteredUpdatedSelected.length = maxSelected;\n            }\n            if (!isControlled) {\n                setSelectedState(strategy.add([], filteredUpdatedSelected));\n            }\n            onChange?.(id, isSelected, filteredUpdatedSelected);\n        },\n        [strategy, selected, collection, collapseToParentId, onChange, isControlled, maxSelected]\n    );\n\n    useEffect(() => {\n        if (isControlled) {\n            if (firstRender.current) {\n                firstRender.current = false;\n                return;\n            }\n\n            const selected = getSelectedFromValue();\n\n            setSelectedState(selected);\n        }\n    }, [getSelectedFromValue, firstRender, isControlled]);\n\n    return {\n        selected,\n        setSelected,\n    };\n};\n"],"names":[],"mappings":";;;;AA0BA,MAAM,YAAY,GAAa,EAAE,CAAC;MAErB,WAAW,GAAoB,CAAC,EACzC,KAAK,EACL,YAAY,GAAG,YAAY,EAC3B,WAAW,EACX,QAAQ,EACR,UAAU,EACV,kBAAkB,EAClB,QAAQ,GACX,KAAI;AACD,IAAA,MAAM,oBAAoB,GAAG,WAAW,CAAC,MAAe;AACpD,QAAA,IAAI,QAAQ,GAAG,KAAK,EAAE,KAAK,EAAE,CAAC;QAC9B,IAAI,WAAW,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,WAAW,EAAE;YAC1D,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;AAC7C,SAAA;QACD,OAAO,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,QAAoB,CAAC,CAAC;KACjD,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;AACnC,IAAA,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC;IAC7B,MAAM,kBAAkB,GAAG,YAAY,IAAI,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,YAAY,CAAC;AAE3G,IAAA,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,YAAY,GAAG,oBAAoB,GAAG,kBAAkB,CAAC,CAAC;AACxG,IAAA,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEjC,MAAM,WAAW,GAAG,WAAW,CAC3B,CAAC,EAAU,EAAE,UAAmB,KAAI;AAChC,QAAA,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;QACjB,MAAM,eAAe,GAAG,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClG,MAAM,uBAAuB,GAAG,kBAAkB;AAC9C,cAAE,6BAA6B,CAAC,UAAU,EAAE,eAAe,CAAC;cAC1D,eAAe,CAAC;AACtB,QAAA,IAAI,WAAW,IAAI,uBAAuB,CAAC,MAAM,GAAG,WAAW,EAAE;AAC7D,YAAA,uBAAuB,CAAC,MAAM,GAAG,WAAW,CAAC;AAChD,SAAA;QACD,IAAI,CAAC,YAAY,EAAE;YACf,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,uBAAuB,CAAC,CAAC,CAAC;AAC/D,SAAA;QACD,QAAQ,GAAG,EAAE,EAAE,UAAU,EAAE,uBAAuB,CAAC,CAAC;AACxD,KAAC,EACD,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,kBAAkB,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,CAAC,CAC5F,CAAC;IAEF,SAAS,CAAC,MAAK;AACX,QAAA,IAAI,YAAY,EAAE;YACd,IAAI,WAAW,CAAC,OAAO,EAAE;AACrB,gBAAA,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC;gBAC5B,OAAO;AACV,aAAA;AAED,YAAA,MAAM,QAAQ,GAAG,oBAAoB,EAAE,CAAC;YAExC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;AAC9B,SAAA;KACJ,EAAE,CAAC,oBAAoB,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAEtD,OAAO;QACH,QAAQ;QACR,WAAW;KACd,CAAC;AACN;;;;"}

package/ItemContent-74eb482b.js

@@ -1,22 +0,0 @@
-import './index.css';
-import { jsxs, jsx } from 'react/jsx-runtime';
-import { useCallback } from 'react';
-import classnames from 'classnames';
-import { Cell, CellText } from '@hh.ru/magritte-ui-cell';
-import { DotFilledSize24, ChevronDownOutlinedSize24, ChevronUpOutlinedSize24 } from '@hh.ru/magritte-ui-icon/icon';
-import { Action } from './Action.js';
-import { Text } from '@hh.ru/magritte-ui-typography';
-
-var styles = {"wrapper":"magritte-wrapper___GHKV6_1-3-1","letter":"magritte-letter___yZOCU_1-3-1","icon":"magritte-icon___kO3Fj_1-3-1","space":"magritte-space___xTO79_1-3-1","iconActive":"magritte-iconActive___4yrG5_1-3-1","content":"magritte-content___ZRc6R_1-3-1","with-shift":"magritte-with-shift___ZErxZ_1-3-1","withShift":"magritte-with-shift___ZErxZ_1-3-1","with-indent":"magritte-with-indent___MH9Vy_1-3-1","withIndent":"magritte-with-indent___MH9Vy_1-3-1","item":"magritte-item___2LtOL_1-3-1","children":"magritte-children___kq-eq_1-3-1","with-two-boxes":"magritte-with-two-boxes___LWOy2_1-3-1","withTwoBoxes":"magritte-with-two-boxes___LWOy2_1-3-1","with-three-boxes":"magritte-with-three-boxes___cyVao_1-3-1","withThreeBoxes":"magritte-with-three-boxes___cyVao_1-3-1"};
-
-const ItemContent = ({ item, hasAction, hasChildren, letter, expanded, onExpansion, hasLetterOnLevel, selected, onChange, indeterminate, singleChoice, hasDot, maxControlsOnLevel, }) => {
-    const handleExpandableClick = useCallback(() => onExpansion && onExpansion(item.id), [item.id, onExpansion]);
-    const currentActionCount = +hasDot + +hasAction + +hasChildren;
-    const neededSpacesCount = maxControlsOnLevel - currentActionCount;
-    return (jsxs("div", { className: styles.wrapper, children: [(letter || hasLetterOnLevel) && (jsx("div", { className: styles.letter, children: letter && (jsx(Text, { typography: "subtitle-1-semibold", style: "secondary", Element: "span", children: letter })) })), hasDot && (jsx("div", { className: styles.icon, children: jsx(DotFilledSize24, { initial: "tertiary" }) })), [...Array(neededSpacesCount).keys()].map((_, i) => (jsx("div", { className: styles.space }, i))), hasChildren && (jsxs("div", { className: classnames(styles.icon, {
-                    [styles.iconActive]: hasChildren,
-                }), onClick: handleExpandableClick, children: [expanded && jsx(ChevronDownOutlinedSize24, { initial: "tertiary" }), !expanded && jsx(ChevronUpOutlinedSize24, { initial: "tertiary" })] })), jsx(Cell, { left: hasAction ? (jsx(Action, { selected: selected, onChange: onChange, id: item.id, indeterminate: indeterminate, singleChoice: singleChoice })) : undefined, children: jsx(CellText, { children: item.text }) })] }));
-};
-
-export { ItemContent as I, styles as s };
-//# sourceMappingURL=ItemContent-74eb482b.js.map