@snack-uikit/tree 0.10.1 → 0.10.2-preview-13f87e77.0

package/dist/cjs/index.js

@@ -30,4 +30,5 @@ Object.defineProperty(exports, "setNonce", {
   get: function () {
     return list_1.setNonce;
   }
-});
+});
+__exportStar(require("./hooks"), exports);

package/dist/cjs/types.d.ts

@@ -103,3 +103,15 @@ export type TreeBaseProps = TreeView | TreeMultiSelect | TreeSingleSelect;
 export type ExtendedTreeNodeProps = TreeNodeProps & {
     getTitle?(): void;
 };
+export type PreloadNodeHandler<TTreeNode extends TreeNodeProps> = (node: TreeNodeProps) => Promise<{
+    preloadedChildren: TTreeNode[];
+    updatedTree: TTreeNode[];
+}>;
+export type SelectHandler = (props: {
+    selectedKeys: string[];
+    node: TreeNodeProps;
+    isSelected: boolean;
+}) => {
+    added: string[];
+    removed: string[];
+};

package/dist/esm/helpers/__tests__/collectEmptyNestedNodesInExpanded.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/helpers/__tests__/collectEmptyNestedNodesInExpanded.spec.js

@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest';
+import { collectEmptyNestedNodesInExpanded } from '../collectEmptyNestedNodesInExpanded';
+const node = (id, nested) => (Object.assign({ id, title: id }, (nested !== undefined && { nested })));
+describe('collectEmptyNestedNodesInExpanded', () => {
+    it('returns nodes with empty nested array that are in expandedIds', () => {
+        const tree = [node('a', []), node('b', [node('b1')])];
+        const expandedIds = new Set(['a']);
+        const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+        expect(result).toHaveLength(1);
+        expect(result[0]).toMatchObject({ id: 'a', nested: [] });
+    });
+    it('does not return nodes with empty nested if not in expandedIds', () => {
+        const tree = [node('a', []), node('b', [])];
+        const expandedIds = new Set(['b']);
+        const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+        expect(result).toHaveLength(1);
+        expect(result[0].id).toBe('b');
+    });
+    it('does not return nodes that have non-empty nested', () => {
+        const tree = [node('a', [node('a1')]), node('b', [])];
+        const expandedIds = new Set(['a', 'b']);
+        const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+        expect(result).toHaveLength(1);
+        expect(result[0].id).toBe('b');
+    });
+    it('does not return nodes without nested property (leaf)', () => {
+        const tree = [node('leaf'), node('empty', [])];
+        const expandedIds = new Set(['leaf', 'empty']);
+        const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+        expect(result).toHaveLength(1);
+        expect(result[0].id).toBe('empty');
+    });
+    it('returns empty array for empty tree', () => {
+        const result = collectEmptyNestedNodesInExpanded([], new Set(['any']));
+        expect(result).toEqual([]);
+    });
+    it('returns empty array when expandedIds is empty', () => {
+        const tree = [node('a', []), node('b', [])];
+        const result = collectEmptyNestedNodesInExpanded(tree, new Set());
+        expect(result).toEqual([]);
+    });
+    it('collects from deeply nested nodes', () => {
+        const child = node('child', []);
+        const tree = [node('root', [node('mid', [child])])];
+        const expandedIds = new Set(['root', 'mid', 'child']);
+        const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+        expect(result).toHaveLength(1);
+        expect(result[0]).toMatchObject({ id: 'child', nested: [] });
+    });
+    it('returns all matching nodes from different levels', () => {
+        const tree = [node('a', []), node('b', [node('b1', []), node('b2', [])])];
+        const expandedIds = new Set(['a', 'b', 'b1', 'b2']);
+        const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+        expect(result).toHaveLength(3);
+        expect(result.map(n => n.id).sort()).toEqual(['a', 'b1', 'b2']);
+    });
+    it('only includes node if both empty nested and expanded', () => {
+        const tree = [node('expanded', []), node('collapsed', [])];
+        const expandedIds = new Set(['expanded']);
+        const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+        expect(result).toHaveLength(1);
+        expect(result[0].id).toBe('expanded');
+    });
+});

package/dist/esm/helpers/__tests__/setChildrenOfTreeNode.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/helpers/__tests__/setChildrenOfTreeNode.spec.js

@@ -0,0 +1,50 @@
+import { describe, expect, it } from 'vitest';
+import { setChildrenOfTreeNode } from '../setChildrenOfTreeNode';
+const node = (id, nested) => (Object.assign({ id, title: id }, (nested !== undefined && { nested: nested.map(n => (Object.assign(Object.assign({}, n), { title: n.id }))) })));
+describe('setChildrenOfTreeNode', () => {
+    it('replaces nested for root-level node', () => {
+        const tree = [node('a', [{ id: 'a1', title: 'a1' }]), node('b', [{ id: 'b1', title: 'b1' }])];
+        const children = [node('new1'), node('new2')];
+        const result = setChildrenOfTreeNode(tree, 'b', children);
+        expect(result).toHaveLength(2);
+        expect(result[0]).toMatchObject({ id: 'a', nested: [{ id: 'a1' }] });
+        expect(result[1]).toMatchObject({ id: 'b', nested: [{ id: 'new1' }, { id: 'new2' }] });
+    });
+    it('replaces nested for deeply nested node', () => {
+        const childWithNested = node('child');
+        childWithNested.nested = [{ id: 'grand', title: 'grand' }];
+        const tree = [node('root', [childWithNested])];
+        const children = [node('replacement')];
+        const result = setChildrenOfTreeNode(tree, 'child', children);
+        const root = result[0];
+        expect(root.nested).toHaveLength(1);
+        expect(root.nested[0]).toMatchObject({ id: 'child', nested: [{ id: 'replacement' }] });
+    });
+    it('returns cloned tree when node is not found', () => {
+        const tree = [node('a'), node('b')];
+        const result = setChildrenOfTreeNode(tree, 'missing', [node('x')]);
+        expect(result).toHaveLength(2);
+        expect(result[0]).toMatchObject({ id: 'a' });
+        expect(result[1]).toMatchObject({ id: 'b' });
+        expect(result).not.toBe(tree);
+    });
+    it('returns empty array for empty tree', () => {
+        const result = setChildrenOfTreeNode([], 'any', [node('x')]);
+        expect(result).toEqual([]);
+    });
+    it('sets children for target node that had no nested (leaf)', () => {
+        const tree = [node('leaf'), node('other')];
+        const children = [node('new1')];
+        const result = setChildrenOfTreeNode(tree, 'leaf', children);
+        expect(result[0]).toMatchObject({ id: 'leaf', nested: [{ id: 'new1' }] });
+        expect(result[1]).toMatchObject({ id: 'other' });
+    });
+    it('preserves order of root nodes when target is second', () => {
+        const tree = [node('first'), node('second', [{ id: 's1', title: 's1' }]), node('third')];
+        const children = [node('new1'), node('new2')];
+        const result = setChildrenOfTreeNode(tree, 'second', children);
+        expect(result.map(n => n.id)).toEqual(['first', 'second', 'third']);
+        expect(result[1].nested).toHaveLength(2);
+        expect(result[1].nested.map(n => n.id)).toEqual(['new1', 'new2']);
+    });
+});

package/dist/esm/helpers/collectEmptyNestedNodesInExpanded.d.ts

@@ -0,0 +1,2 @@
+import { TreeNodeProps } from '../types';
+export declare function collectEmptyNestedNodesInExpanded<TTreeNode extends TreeNodeProps>(nodes: TTreeNode[], expandedIds: Set<string>): TTreeNode[];

package/dist/esm/helpers/collectEmptyNestedNodesInExpanded.js

@@ -0,0 +1,11 @@
+import { traverse } from './traverse';
+export function collectEmptyNestedNodesInExpanded(nodes, expandedIds) {
+    const result = [];
+    traverse(nodes, node => {
+        const hasEmptyNested = Array.isArray(node.nested) && node.nested.length === 0;
+        if (hasEmptyNested && expandedIds.has(node.id)) {
+            result.push(node);
+        }
+    });
+    return result;
+}

package/dist/esm/helpers/index.d.ts

@@ -6,3 +6,5 @@ export * from './getSearchedTreeNodeById';
 export * from './lookupTreeForSelectedNodes';
 export * from './sortTreeItemsByTitle';
 export * from './traverse';
+export * from './setChildrenOfTreeNode';
+export * from './collectEmptyNestedNodesInExpanded';

package/dist/esm/helpers/index.js

@@ -6,3 +6,5 @@ export * from './getSearchedTreeNodeById';
 export * from './lookupTreeForSelectedNodes';
 export * from './sortTreeItemsByTitle';
 export * from './traverse';
+export * from './setChildrenOfTreeNode';
+export * from './collectEmptyNestedNodesInExpanded';

package/dist/esm/helpers/setChildrenOfTreeNode.d.ts

@@ -0,0 +1,2 @@
+import { TreeNodeProps } from '../types';
+export declare const setChildrenOfTreeNode: <TTreeNode extends TreeNodeProps>(tree: TTreeNode[], nodeId: string, children: TTreeNode[]) => TTreeNode[];

package/dist/esm/helpers/setChildrenOfTreeNode.js

@@ -0,0 +1,20 @@
+import { traverseWithTarget } from './traverse';
+export const setChildrenOfTreeNode = (tree, nodeId, children) => {
+    const result = [];
+    traverseWithTarget(tree, result, (source, _depth, targetList) => {
+        var _a;
+        const isTarget = source.id === nodeId;
+        const hasNested = Array.isArray(source.nested);
+        let newNested;
+        if (isTarget) {
+            newNested = children;
+        }
+        else if (hasNested) {
+            newNested = [];
+        }
+        const newNode = (newNested !== undefined ? Object.assign(Object.assign({}, source), { nested: newNested }) : Object.assign({}, source));
+        targetList.push(newNode);
+        return !isTarget && hasNested && ((_a = source.nested) === null || _a === void 0 ? void 0 : _a.length) ? newNested : undefined;
+    });
+    return result;
+};

package/dist/esm/helpers/sortTreeItemsByTitle.js

@@ -1,6 +1,6 @@
 import { extractTreeNodeTitle } from './extractTreeNodeTitle';
 export const sortTreeItemsByTitle = (items) => items === null || items === void 0 ? void 0 : items.toSorted((itemA, itemB) => {
-    const valueA = extractTreeNodeTitle(itemA);
-    const valueB = extractTreeNodeTitle(itemB);
+    const valueA = extractTreeNodeTitle(itemA).toLowerCase();
+    const valueB = extractTreeNodeTitle(itemB).toLowerCase();
     return valueA.localeCompare(valueB);
 });

package/dist/esm/helpers/traverse.d.ts

@@ -1,2 +1,8 @@
 import { TreeNodeProps } from '../';
 export declare const traverse: <T extends TreeNodeProps>(nodes: T[], callback: (node: T, depth: number) => void) => void;
+/**
+ * BFS с указанием целевого списка для каждого узла.
+ * Очередь хранит (node, depth, targetList). Callback добавляет узел в targetList
+ * и возвращает массив для детей (или undefined, чтобы не обходить детей).
+ */
+export declare const traverseWithTarget: <T extends TreeNodeProps>(nodes: T[], rootTargetList: T[], callback: (node: T, depth: number, targetList: T[]) => T[] | undefined) => void;

package/dist/esm/helpers/traverse.js

@@ -17,3 +17,27 @@ export const traverse = (nodes, callback) => {
         }
     }
 };
+/**
+ * BFS с указанием целевого списка для каждого узла.
+ * Очередь хранит (node, depth, targetList). Callback добавляет узел в targetList
+ * и возвращает массив для детей (или undefined, чтобы не обходить детей).
+ */
+export const traverseWithTarget = (nodes, rootTargetList, callback) => {
+    var _a;
+    const queue = new Queue();
+    for (const node of nodes) {
+        queue.enqueue({ node, depth: 0, targetList: rootTargetList });
+    }
+    while (!queue.isEmpty()) {
+        const item = queue.dequeue();
+        if (!item)
+            continue;
+        const { node, depth, targetList } = item;
+        const childTargetList = callback(node, depth, targetList);
+        if (childTargetList !== undefined && ((_a = node.nested) === null || _a === void 0 ? void 0 : _a.length)) {
+            for (const child of node.nested) {
+                queue.enqueue({ node: child, depth: depth + 1, targetList: childTargetList });
+            }
+        }
+    }
+};

package/dist/esm/hooks/index.d.ts

@@ -0,0 +1,2 @@
+export * from './useTreeWithPreload';
+export * from './useTreeMultiSelection';

package/dist/esm/hooks/index.js

@@ -0,0 +1,2 @@
+export * from './useTreeWithPreload';
+export * from './useTreeMultiSelection';

package/dist/esm/hooks/useTreeMultiSelection.d.ts

@@ -0,0 +1,12 @@
+import { PreloadNodeHandler, SelectHandler, TreeNodeProps } from '../types';
+type UseTreeMultiSelectionParams<TTreeNode extends TreeNodeProps> = {
+    onDataLoad: PreloadNodeHandler<TTreeNode>;
+    onSelect: SelectHandler;
+    selected?: string[];
+    onChangeSelected?: (newSelected: string[]) => void;
+};
+export declare function useTreeMultiSelection<TTreeNode extends TreeNodeProps>({ onDataLoad, onSelect: onSelectProp, selected, onChangeSelected, }: UseTreeMultiSelectionParams<TTreeNode>): {
+    selected: string[];
+    onSelect: (selectedKeys: string[], node: TreeNodeProps) => Promise<void>;
+};
+export {};

package/dist/esm/hooks/useTreeMultiSelection.js

@@ -0,0 +1,43 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useCallback } from 'react';
+import { useValueControl } from '@snack-uikit/utils';
+const getNewSelectedIds = (selectedIds, added, removed) => {
+    const result = new Set(selectedIds);
+    added.forEach(id => {
+        result.add(id);
+    });
+    removed.forEach(id => {
+        result.delete(id);
+    });
+    return Array.from(result);
+};
+export function useTreeMultiSelection({ onDataLoad, onSelect: onSelectProp, selected, onChangeSelected, }) {
+    const [selectedIds = [], setSelectedIds] = useValueControl({
+        value: selected,
+        defaultValue: [],
+        onChange: onChangeSelected,
+    });
+    const onSelect = useCallback((selectedKeys, node) => __awaiter(this, void 0, void 0, function* () {
+        const isSelected = selectedKeys.includes(node.id);
+        const clonedNode = structuredClone(node);
+        if (node.nested && !node.nested.length) {
+            const { preloadedChildren } = yield onDataLoad(node);
+            clonedNode.nested = preloadedChildren;
+        }
+        const { added, removed } = onSelectProp({ selectedKeys, node: clonedNode, isSelected });
+        const updatedSelectedIds = getNewSelectedIds(selectedIds, added, removed);
+        setSelectedIds(updatedSelectedIds);
+    }), [onDataLoad, onSelectProp, selectedIds, setSelectedIds]);
+    return {
+        selected: selectedIds,
+        onSelect,
+    };
+}

package/dist/esm/hooks/useTreeWithPreload.d.ts

@@ -0,0 +1,33 @@
+import { TreeNodeProps } from '../types';
+export type SearchResult<TTreeNode extends TreeNodeProps> = {
+    tree: TTreeNode[];
+    needPreloadNodes: string[];
+};
+export type SearchParams = {
+    search: string;
+    expandedNodes: string[];
+};
+type UseTreeWithPreloadParams<TRecordValue, TTreeNode extends TreeNodeProps> = {
+    initTree: TTreeNode[];
+    onPreloadNode: (node: TreeNodeProps) => Promise<TTreeNode[]>;
+    onPreloadNodes: (nodes: string[]) => Promise<Record<string, TTreeNode[]>>;
+    onSearch: (params: SearchParams) => Promise<SearchResult<TTreeNode>>;
+    mapNodeToRecordItem: (node: TTreeNode) => TRecordValue;
+};
+export declare function useTreeWithPreload<TRecordValue, TTreeNode extends TreeNodeProps>({ initTree, onPreloadNode, onPreloadNodes, onSearch, mapNodeToRecordItem, }: UseTreeWithPreloadParams<TRecordValue, TTreeNode>): {
+    tree: import("@siberiacancode/reactuse").StateRef<TTreeNode[]>;
+    expandedNodes: import("@siberiacancode/reactuse").StateRef<string[]>;
+    loading: boolean;
+    treeItemsRecord: import("@siberiacancode/reactuse").StateRef<Record<string, TRecordValue>>;
+    search: {
+        value: string;
+        onChange: import("react").Dispatch<import("react").SetStateAction<string>>;
+    };
+    onExpand: (nodes: string[]) => void;
+    onDataLoad: (node: TreeNodeProps) => Promise<{
+        preloadedChildren: TTreeNode[];
+        updatedTree: TTreeNode[];
+        newTreeItemsRecord: Record<string, TRecordValue>;
+    }>;
+};
+export {};

package/dist/esm/hooks/useTreeWithPreload.js

@@ -0,0 +1,98 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useDebounceValue, useDidUpdate, useRefState } from '@siberiacancode/reactuse';
+import { cancelable } from 'cancelable-promise';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { collectEmptyNestedNodesInExpanded, setChildrenOfTreeNode, traverse } from '../helpers';
+export function useTreeWithPreload({ initTree, onPreloadNode, onPreloadNodes, onSearch, mapNodeToRecordItem, }) {
+    const tree = useRefState(initTree);
+    const treeItemsRecord = useRefState({});
+    const expandedNodes = useRefState([]);
+    const [search, setSearch] = useState('');
+    const debouncedSearch = useDebounceValue(search, 500);
+    const [loading, setLoading] = useState(false);
+    const searchPromiseRef = useRef(null);
+    const buildTreeItemsRecord = useCallback((nodes) => {
+        const record = {};
+        traverse(nodes, node => {
+            record[node.id] = mapNodeToRecordItem(node);
+        });
+        return record;
+    }, [mapNodeToRecordItem]);
+    const onExpand = useCallback((nodes) => {
+        expandedNodes.current = nodes;
+    }, [expandedNodes]);
+    const onDataLoad = useCallback((node) => __awaiter(this, void 0, void 0, function* () {
+        const preloadedChildren = yield onPreloadNode(node);
+        const updatedTree = setChildrenOfTreeNode(tree.current, node.id, preloadedChildren);
+        tree.current = updatedTree;
+        const newTreeItemsRecord = Object.assign({}, treeItemsRecord.current);
+        traverse(preloadedChildren, child => {
+            newTreeItemsRecord[child.id] = mapNodeToRecordItem(child);
+        });
+        treeItemsRecord.current = newTreeItemsRecord;
+        return { preloadedChildren, updatedTree, newTreeItemsRecord };
+    }), [mapNodeToRecordItem, onPreloadNode, tree, treeItemsRecord]);
+    const handleSearch = useCallback((searchQuery) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        (_a = searchPromiseRef.current) === null || _a === void 0 ? void 0 : _a.cancel();
+        setLoading(true);
+        const searchPromise = cancelable(onSearch({ search: searchQuery, expandedNodes: expandedNodes.current }));
+        searchPromiseRef.current = searchPromise;
+        try {
+            const { tree: searchedTree, needPreloadNodes } = yield searchPromise;
+            if (!searchPromise.isCanceled()) {
+                tree.current = searchedTree;
+                treeItemsRecord.current = buildTreeItemsRecord(searchedTree);
+                const expandedSet = new Set(expandedNodes.current);
+                const toPreloadExpandableNodes = collectEmptyNestedNodesInExpanded(searchedTree, expandedSet);
+                const collectedNodesForPreload = Array.from(new Set([...toPreloadExpandableNodes.map(node => node.id), ...needPreloadNodes]));
+                if (!collectedNodesForPreload.length) {
+                    return;
+                }
+                const preloadedNodes = yield onPreloadNodes(collectedNodesForPreload);
+                if (searchPromiseRef.current !== searchPromise) {
+                    return;
+                }
+                let tmpTree = [...searchedTree];
+                for (const [nodeId, children] of Object.entries(preloadedNodes)) {
+                    tmpTree = setChildrenOfTreeNode(tmpTree, nodeId, children);
+                }
+                tree.current = tmpTree;
+                treeItemsRecord.current = buildTreeItemsRecord(tmpTree);
+            }
+        }
+        finally {
+            if (searchPromiseRef.current === searchPromise) {
+                setLoading(false);
+                searchPromiseRef.current = null;
+            }
+        }
+    }), [buildTreeItemsRecord, expandedNodes, onPreloadNodes, onSearch, tree, treeItemsRecord]);
+    useDidUpdate(() => {
+        handleSearch(debouncedSearch);
+    }, [debouncedSearch, handleSearch]);
+    useEffect(() => {
+        tree.current = initTree;
+        treeItemsRecord.current = buildTreeItemsRecord(initTree);
+    }, [buildTreeItemsRecord, initTree, tree, treeItemsRecord]);
+    return {
+        tree,
+        expandedNodes,
+        loading,
+        treeItemsRecord,
+        search: {
+            value: search,
+            onChange: setSearch,
+        },
+        onExpand,
+        onDataLoad,
+    };
+}

package/dist/esm/index.d.ts

@@ -1,3 +1,4 @@
 export * from './components';
 export type { OnNodeClick, TreeNodeId, TreeNodeProps } from './types';
 export { setNonce } from '@snack-uikit/list';
+export * from './hooks';

package/dist/esm/index.js

@@ -1,2 +1,3 @@
 export * from './components';
 export { setNonce } from '@snack-uikit/list';
+export * from './hooks';

package/dist/esm/types.d.ts

@@ -103,3 +103,15 @@ export type TreeBaseProps = TreeView | TreeMultiSelect | TreeSingleSelect;
 export type ExtendedTreeNodeProps = TreeNodeProps & {
     getTitle?(): void;
 };
+export type PreloadNodeHandler<TTreeNode extends TreeNodeProps> = (node: TreeNodeProps) => Promise<{
+    preloadedChildren: TTreeNode[];
+    updatedTree: TTreeNode[];
+}>;
+export type SelectHandler = (props: {
+    selectedKeys: string[];
+    node: TreeNodeProps;
+    isSelected: boolean;
+}) => {
+    added: string[];
+    removed: string[];
+};

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Tree",
-  "version": "0.10.1",
+  "version": "0.10.2-preview-13f87e77.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -36,6 +36,7 @@
   "license": "Apache-2.0",
   "scripts": {},
   "dependencies": {
+    "@siberiacancode/reactuse": "0.3.14",
     "@snack-uikit/button": "0.19.17",
     "@snack-uikit/icons": "0.27.7",
     "@snack-uikit/list": "0.32.15",
@@ -43,10 +44,11 @@
     "@snack-uikit/truncate-string": "0.7.9",
     "@snack-uikit/typography": "0.8.12",
     "@snack-uikit/utils": "4.0.1",
+    "cancelable-promise": "4.3.1",
     "classnames": "2.5.1",
     "queue-fifo": "0.2.6",
     "react-transition-state": "2.1.1",
     "uncontrollable": "8.0.4"
   },
-  "gitHead": "08bc11a562baec889f73cfb3af56946ab5e668fb"
+  "gitHead": "244db9228818f24f34f9d5a4dafdf6f7f2182c6d"
 }

package/src/helpers/__tests__/collectEmptyNestedNodesInExpanded.spec.ts

@@ -0,0 +1,88 @@
+import { describe, expect, it } from 'vitest';
+
+import type { TreeNodeProps } from '../../types';
+import { collectEmptyNestedNodesInExpanded } from '../collectEmptyNestedNodesInExpanded';
+
+const node = (id: string, nested?: TreeNodeProps[]) => ({
+  id,
+  title: id,
+  ...(nested !== undefined && { nested }),
+});
+
+describe('collectEmptyNestedNodesInExpanded', () => {
+  it('returns nodes with empty nested array that are in expandedIds', () => {
+    const tree = [node('a', []), node('b', [node('b1')])];
+    const expandedIds = new Set(['a']);
+    const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchObject({ id: 'a', nested: [] });
+  });
+
+  it('does not return nodes with empty nested if not in expandedIds', () => {
+    const tree = [node('a', []), node('b', [])];
+    const expandedIds = new Set(['b']);
+    const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].id).toBe('b');
+  });
+
+  it('does not return nodes that have non-empty nested', () => {
+    const tree = [node('a', [node('a1')]), node('b', [])];
+    const expandedIds = new Set(['a', 'b']);
+    const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].id).toBe('b');
+  });
+
+  it('does not return nodes without nested property (leaf)', () => {
+    const tree = [node('leaf'), node('empty', [])];
+    const expandedIds = new Set(['leaf', 'empty']);
+    const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].id).toBe('empty');
+  });
+
+  it('returns empty array for empty tree', () => {
+    const result = collectEmptyNestedNodesInExpanded([], new Set(['any']));
+    expect(result).toEqual([]);
+  });
+
+  it('returns empty array when expandedIds is empty', () => {
+    const tree = [node('a', []), node('b', [])];
+    const result = collectEmptyNestedNodesInExpanded(tree, new Set());
+
+    expect(result).toEqual([]);
+  });
+
+  it('collects from deeply nested nodes', () => {
+    const child = node('child', []);
+    const tree = [node('root', [node('mid', [child])])];
+    const expandedIds = new Set(['root', 'mid', 'child']);
+    const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toMatchObject({ id: 'child', nested: [] });
+  });
+
+  it('returns all matching nodes from different levels', () => {
+    const tree = [node('a', []), node('b', [node('b1', []), node('b2', [])])];
+    const expandedIds = new Set(['a', 'b', 'b1', 'b2']);
+    const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+
+    expect(result).toHaveLength(3);
+    expect(result.map(n => n.id).sort()).toEqual(['a', 'b1', 'b2']);
+  });
+
+  it('only includes node if both empty nested and expanded', () => {
+    const tree = [node('expanded', []), node('collapsed', [])];
+    const expandedIds = new Set(['expanded']);
+    const result = collectEmptyNestedNodesInExpanded(tree, expandedIds);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].id).toBe('expanded');
+  });
+});