@snack-uikit/tree 0.12.4-preview-6a625dbd.0 → 0.12.4-preview-74429015.0

package/dist/cjs/components/Tree/Tree.js

@@ -25,18 +25,18 @@ const helperComponents_1 = require("../../helperComponents");
 const styles_module_scss_1 = __importDefault(require('./styles.module.css'));
 const utils_2 = require("./utils");
 function Tree(_a) {
-  var {
-      data,
-      onNodeClick,
-      onExpand,
-      expandedNodes,
-      nodeActions,
-      parentActions,
-      onDataLoad,
-      showLines = true,
-      showIcons = true,
-      className
-    } = _a,
+  var data = _a.data,
+    onNodeClick = _a.onNodeClick,
+    onExpand = _a.onExpand,
+    expandedNodes = _a.expandedNodes,
+    nodeActions = _a.nodeActions,
+    parentActions = _a.parentActions,
+    onDataLoad = _a.onDataLoad,
+    _a$showLines = _a.showLines,
+    showLines = _a$showLines === void 0 ? true : _a$showLines,
+    _a$showIcons = _a.showIcons,
+    showIcons = _a$showIcons === void 0 ? true : _a$showIcons,
+    className = _a.className,
     rest = __rest(_a, ["data", "onNodeClick", "onExpand", "expandedNodes", "nodeActions", "parentActions", "onDataLoad", "showLines", "showIcons", "className"]);
   return (0, jsx_runtime_1.jsx)("div", Object.assign({
     className: (0, classnames_1.default)(styles_module_scss_1.default.tree, className),

package/dist/cjs/components/Tree/utils.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.extractSelectableProps = extractSelectableProps;
 const constants_1 = require("../../constants");
 function extractSelectableProps(_ref) {
-  let {
-    selectionMode,
-    selected,
-    onSelect
-  } = _ref;
+  let selectionMode = _ref.selectionMode,
+    selected = _ref.selected,
+    onSelect = _ref.onSelect;
   switch (selectionMode) {
     case constants_1.SELECTION_MODE.Single:
       return {

package/dist/cjs/contexts/TreeContext.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
   for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
@@ -36,28 +38,30 @@ exports.TreeContext = (0, react_1.createContext)({
   isSelectable: false
 });
 function TreeContextProvider(_ref) {
-  let {
-    children,
-    value
-  } = _ref;
-  const {
-      onNodeClick: onNodeClickProp,
-      onExpand: onExpandProp,
-      onSelect: onSelectProp,
-      selectionMode,
-      data
-    } = value,
+  let children = _ref.children,
+    value = _ref.value;
+  const onNodeClickProp = value.onNodeClick,
+    onExpandProp = value.onExpand,
+    onSelectProp = value.onSelect,
+    selectionMode = value.selectionMode,
+    data = value.data,
     props = __rest(value, ["onNodeClick", "onExpand", "onSelect", "selectionMode", "data"]);
   const isMultiSelect = selectionMode === constants_1.SELECTION_MODE.Multi;
   const isSingleSelect = selectionMode === constants_1.SELECTION_MODE.Single;
   const isSelectable = Boolean(selectionMode);
-  const [expandedNodes, onExpandHandler] = (0, uncontrollable_1.useUncontrolledProp)(value.expandedNodes, value.expandedNodes || [], onExpandProp);
+  const _ref2 = (0, uncontrollable_1.useUncontrolledProp)(value.expandedNodes, value.expandedNodes || [], onExpandProp),
+    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+    expandedNodes = _ref3[0],
+    onExpandHandler = _ref3[1];
   const onExpand = (0, react_1.useCallback)(node => {
     const isExpanded = expandedNodes.includes(node.id);
     const nodes = isExpanded ? expandedNodes.filter(id => id !== node.id) : expandedNodes.concat(node.id);
     onExpandHandler(nodes, node);
   }, [expandedNodes, onExpandHandler]);
-  const [selectedNodes, onSelectHandler] = (0, uncontrollable_1.useUncontrolledProp)(value.selected, [], onSelectProp);
+  const _ref4 = (0, uncontrollable_1.useUncontrolledProp)(value.selected, [], onSelectProp),
+    _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
+    selectedNodes = _ref5[0],
+    onSelectHandler = _ref5[1];
   const onSelect = (0, react_1.useCallback)((node, parentNode) => {
     if (!isSelectable || node.disabled) return;
     if (isSingleSelect) {
@@ -87,7 +91,10 @@ function TreeContextProvider(_ref) {
       return acc;
     }, []);
   }, [data, expandedNodes]);
-  const [focusIndex, setFocusIndex] = (0, react_1.useState)();
+  const _ref6 = (0, react_1.useState)(),
+    _ref7 = (0, _slicedToArray2.default)(_ref6, 2),
+    focusIndex = _ref7[0],
+    setFocusIndex = _ref7[1];
   const focusedNodeId = focusIndex !== undefined ? focusableNodeIds[focusIndex] : undefined;
   const setFocusPosition = (0, react_1.useCallback)(nodeId => {
     const newFocusIndex = focusableNodeIds.indexOf(nodeId);

package/dist/cjs/helperComponents/ExpandableTreeNode/ExpandableTreeNode.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -55,40 +57,43 @@ const TreeNode_1 = require("../TreeNode");
 const styles_module_scss_1 = __importDefault(require('./styles.module.css'));
 exports.ExpandableTreeNode = (0, react_1.forwardRef)((_a, ref) => {
   var _b = _a.node,
-    {
-      'data-test-id': dataTestId
-    } = _b,
+    dataTestId = _b['data-test-id'],
     node = __rest(_b, ['data-test-id']),
-    {
-      parentNode,
-      tabIndexAvailable
-    } = _a;
-  const {
-    expandedNodes,
-    onExpand,
-    onDataLoad,
-    showLines
-  } = (0, TreeContext_1.useTreeContext)();
+    parentNode = _a.parentNode,
+    tabIndexAvailable = _a.tabIndexAvailable;
+  const _ref = (0, TreeContext_1.useTreeContext)(),
+    expandedNodes = _ref.expandedNodes,
+    onExpand = _ref.onExpand,
+    onDataLoad = _ref.onDataLoad,
+    showLines = _ref.showLines;
   const isExpandable = Boolean(node.nested);
   const isExpanded = (expandedNodes === null || expandedNodes === void 0 ? void 0 : expandedNodes.includes(node.id)) || false;
-  const [isLoading, setLoading] = (0, react_1.useState)(false);
-  const [state, toggle] = (0, react_transition_state_1.default)({
-    timeout: constants_1.TRANSITION_TIMING.accordionFolding,
-    initialEntered: isExpanded || undefined,
-    enter: isExpanded
-  });
+  const _ref2 = (0, react_1.useState)(false),
+    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+    isLoading = _ref3[0],
+    setLoading = _ref3[1];
+  const _ref4 = (0, react_transition_state_1.default)({
+      timeout: constants_1.TRANSITION_TIMING.accordionFolding,
+      initialEntered: isExpanded || undefined,
+      enter: isExpanded
+    }),
+    _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
+    state = _ref5[0],
+    toggle = _ref5[1];
   const showContent = node.nested && node.nested.length > 0 && state.status !== 'exited';
   const childrenRefs = (0, react_1.useRef)([]);
-  const [lastItemHeight, setLastItemHeight] = (0, react_1.useState)(0);
+  const _ref6 = (0, react_1.useState)(0),
+    _ref7 = (0, _slicedToArray2.default)(_ref6, 2),
+    lastItemHeight = _ref7[0],
+    setLastItemHeight = _ref7[1];
   (0, react_1.useEffect)(() => {
     var _a, _b;
     const lastItem = (_a = childrenRefs.current) === null || _a === void 0 ? void 0 : _a.at(-1);
     if (lastItem) {
       const observer = new ResizeObserver(entities => entities.forEach(entity => {
         if (entity.target === lastItem) {
-          const [{
-            blockSize: newHeight
-          }] = entity.contentBoxSize;
+          const _entity$contentBoxSiz = (0, _slicedToArray2.default)(entity.contentBoxSize, 1),
+            newHeight = _entity$contentBoxSiz[0].blockSize;
           setLastItemHeight(newHeight);
         }
       }));
@@ -156,7 +161,7 @@ exports.ExpandableTreeNode = (0, react_1.forwardRef)((_a, ref) => {
         children: [(0, jsx_runtime_1.jsx)(TreeLine_1.TreeLine, {
           visible: showLines,
           "data-test-id": constants_1.TEST_IDS.line,
-          height: `calc(100% - ${lastItemHeight}px)`,
+          height: "calc(100% - ".concat(lastItemHeight, "px)"),
           className: styles_module_scss_1.default.treeLine
         }), (0, jsx_runtime_1.jsx)("div", {
           className: styles_module_scss_1.default.expandableNested,

package/dist/cjs/helperComponents/TreeItem/TreeItem.js

@@ -10,11 +10,9 @@ const constants_1 = require("../../constants");
 const ExpandableTreeNode_1 = require("../ExpandableTreeNode");
 const TreeNode_1 = require("../TreeNode");
 exports.TreeItem = (0, react_1.forwardRef)((_ref, ref) => {
-  let {
-    node,
-    tabIndexAvailable,
-    parentNode
-  } = _ref;
+  let node = _ref.node,
+    tabIndexAvailable = _ref.tabIndexAvailable,
+    parentNode = _ref.parentNode;
   const dataTestId = node['data-test-id'] || constants_1.TEST_IDS.node;
   const nodeProps = Object.assign(Object.assign({}, node), {
     'data-test-id': dataTestId

package/dist/cjs/helperComponents/TreeLine/TreeLine.js

@@ -14,14 +14,12 @@ const classnames_1 = __importDefault(require("classnames"));
 const constants_1 = require("../../constants");
 const styles_module_scss_1 = __importDefault(require('./styles.module.css'));
 function TreeLine(_ref) {
-  let {
-    className,
-    halfWidth,
-    horizontal,
-    visible,
-    height,
-    width
-  } = _ref;
+  let className = _ref.className,
+    halfWidth = _ref.halfWidth,
+    horizontal = _ref.horizontal,
+    visible = _ref.visible,
+    height = _ref.height,
+    width = _ref.width;
   return (0, jsx_runtime_1.jsx)("div", {
     className: (0, classnames_1.default)(styles_module_scss_1.default.treeLine, className),
     style: {

package/dist/cjs/helperComponents/TreeNode/TreeNode.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
   for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
@@ -34,50 +36,56 @@ const components_1 = require("./components");
 const styles_module_scss_1 = __importDefault(require('./styles.module.css'));
 const utils_2 = require("./utils");
 exports.TreeNode = (0, react_1.forwardRef)((_a, ref) => {
-  var {
-      id,
-      title,
-      icon = (0, jsx_runtime_1.jsx)(icons_1.FileSVG, {
-        size: 24
-      }),
-      expandedIcon = (0, jsx_runtime_1.jsx)(icons_1.FolderOpenSVG, {
-        size: 24
-      }),
-      collapsedIcon = (0, jsx_runtime_1.jsx)(icons_1.FolderSVG, {
-        size: 24
-      }),
-      disabled,
-      onClick,
-      nested,
-      className,
-      onChevronClick,
-      onKeyDown,
-      isLoading,
-      parentNode,
-      tabIndexAvailable,
-      href
-    } = _a,
+  var id = _a.id,
+    title = _a.title,
+    _a$icon = _a.icon,
+    icon = _a$icon === void 0 ? (0, jsx_runtime_1.jsx)(icons_1.FileSVG, {
+      size: 24
+    }) : _a$icon,
+    _a$expandedIcon = _a.expandedIcon,
+    expandedIcon = _a$expandedIcon === void 0 ? (0, jsx_runtime_1.jsx)(icons_1.FolderOpenSVG, {
+      size: 24
+    }) : _a$expandedIcon,
+    _a$collapsedIcon = _a.collapsedIcon,
+    collapsedIcon = _a$collapsedIcon === void 0 ? (0, jsx_runtime_1.jsx)(icons_1.FolderSVG, {
+      size: 24
+    }) : _a$collapsedIcon,
+    disabled = _a.disabled,
+    onClick = _a.onClick,
+    nested = _a.nested,
+    className = _a.className,
+    onChevronClick = _a.onChevronClick,
+    onKeyDown = _a.onKeyDown,
+    isLoading = _a.isLoading,
+    parentNode = _a.parentNode,
+    tabIndexAvailable = _a.tabIndexAvailable,
+    href = _a.href,
     rest = __rest(_a, ["id", "title", "icon", "expandedIcon", "collapsedIcon", "disabled", "onClick", "nested", "className", "onChevronClick", "onKeyDown", "isLoading", "parentNode", "tabIndexAvailable", "href"]);
-  const {
-    isMultiSelect,
-    isSelectable,
-    onNodeClick,
-    selected,
-    expandedNodes,
-    onSelect,
-    nodeActions,
-    parentActions,
-    setFocusPosition,
-    resetFocusPosition,
-    focusedNodeId,
-    setFocusIndex,
-    focusableNodeIds,
-    showToggle,
-    showLines,
-    showIcons
-  } = (0, TreeContext_1.useTreeContext)();
-  const [isDroplistOpen, setDroplistOpen] = (0, react_1.useState)(false);
-  const [isDroplistTriggerFocused, setFocusDroplistTrigger] = (0, react_1.useState)(false);
+  const _ref = (0, TreeContext_1.useTreeContext)(),
+    isMultiSelect = _ref.isMultiSelect,
+    isSelectable = _ref.isSelectable,
+    onNodeClick = _ref.onNodeClick,
+    selected = _ref.selected,
+    expandedNodes = _ref.expandedNodes,
+    onSelect = _ref.onSelect,
+    nodeActions = _ref.nodeActions,
+    parentActions = _ref.parentActions,
+    setFocusPosition = _ref.setFocusPosition,
+    resetFocusPosition = _ref.resetFocusPosition,
+    focusedNodeId = _ref.focusedNodeId,
+    setFocusIndex = _ref.setFocusIndex,
+    focusableNodeIds = _ref.focusableNodeIds,
+    showToggle = _ref.showToggle,
+    showLines = _ref.showLines,
+    showIcons = _ref.showIcons;
+  const _ref2 = (0, react_1.useState)(false),
+    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+    isDroplistOpen = _ref3[0],
+    setDroplistOpen = _ref3[1];
+  const _ref4 = (0, react_1.useState)(false),
+    _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
+    isDroplistTriggerFocused = _ref5[0],
+    setFocusDroplistTrigger = _ref5[1];
   const contentRef = (0, react_1.useRef)(null);
   const anchorRef = (0, react_1.useRef)(null);
   const isExpandable = Array.isArray(nested);

package/dist/cjs/helperComponents/TreeNode/components/TreeNodeActions.js

@@ -18,15 +18,13 @@ const constants_1 = require("../../../constants");
 const styles_module_scss_1 = __importDefault(require('../styles.module.css'));
 const utils_1 = require("../utils");
 function TreeNodeActions(_ref) {
-  let {
-    getNodeActions,
-    isDroplistTriggerFocused,
-    focusNode,
-    isDroplistOpen,
-    setDroplistOpen,
-    onBlurActions,
-    node
-  } = _ref;
+  let getNodeActions = _ref.getNodeActions,
+    isDroplistTriggerFocused = _ref.isDroplistTriggerFocused,
+    focusNode = _ref.focusNode,
+    isDroplistOpen = _ref.isDroplistOpen,
+    setDroplistOpen = _ref.setDroplistOpen,
+    onBlurActions = _ref.onBlurActions,
+    node = _ref.node;
   const droplistActions = getNodeActions(node);
   const localRef = (0, react_1.useRef)(null);
   (0, react_1.useEffect)(() => {

package/dist/cjs/helperComponents/TreeNode/components/TreeNodeHref.js

@@ -14,11 +14,9 @@ const react_1 = require("react");
 const constants_1 = require("../../../constants");
 const styles_module_scss_1 = __importDefault(require('../styles.module.css'));
 exports.TreeNodeHref = (0, react_1.forwardRef)((_ref, ref) => {
-  let {
-    href,
-    children,
-    onClick
-  } = _ref;
+  let href = _ref.href,
+    children = _ref.children,
+    onClick = _ref.onClick;
   return href ? (0, jsx_runtime_1.jsx)("a", {
     href: href,
     className: styles_module_scss_1.default.treeNodeLink,

package/dist/cjs/helpers/extractTreeNodeTitle.js

@@ -9,10 +9,8 @@ exports.extractTreeNodeTitle = void 0;
  * Если title задан функцией, использует getTitle (если он доступен).
  */
 const extractTreeNodeTitle = _ref => {
-  let {
-    title,
-    getTitle
-  } = _ref;
+  let title = _ref.title,
+    getTitle = _ref.getTitle;
   var _a;
   return typeof title === 'string' ? title : (_a = getTitle === null || getTitle === void 0 ? void 0 : getTitle()) !== null && _a !== void 0 ? _a : '';
 };

package/dist/cjs/helpers/getSearchedTreeItems.js

@@ -19,15 +19,12 @@ const isMatchedTreeItem = search => {
  * @returns Новое дерево, содержащее только совпавшие узлы и их путь в иерархии.
  */
 const getSearchedTreeItems = _ref => {
-  let {
-    tree,
-    searchOptions
-  } = _ref;
+  let tree = _ref.tree,
+    searchOptions = _ref.searchOptions;
   if (!(searchOptions === null || searchOptions === void 0 ? void 0 : searchOptions.query)) return tree;
-  const {
-    query = '',
-    includeChildrenMatchedParent
-  } = searchOptions;
+  const _searchOptions$query = searchOptions.query,
+    query = _searchOptions$query === void 0 ? '' : _searchOptions$query,
+    includeChildrenMatchedParent = searchOptions.includeChildrenMatchedParent;
   const matchFunc = isMatchedTreeItem(query);
   const searchItems = treeItems => treeItems.reduce((acc, item) => {
     const hasMatchingTitle = matchFunc(item);

package/dist/cjs/helpers/getSearchedTreeNodeById.js

@@ -13,13 +13,11 @@ exports.getSearchedTreeNodeById = void 0;
  * @returns Для одиночного id возвращает узел или null, для массива id — список узлов.
  */
 const getSearchedTreeNodeById = _ref => {
-  let {
-    tree,
-    searchOptions: {
-      id,
-      includeNested = true
-    }
-  } = _ref;
+  let tree = _ref.tree,
+    _ref$searchOptions = _ref.searchOptions,
+    id = _ref$searchOptions.id,
+    _ref$searchOptions$in = _ref$searchOptions.includeNested,
+    includeNested = _ref$searchOptions$in === void 0 ? true : _ref$searchOptions$in;
   const isArrayIds = Array.isArray(id);
   if (!id || isArrayIds && id.length === 0) {
     return isArrayIds ? [] : null;

package/dist/cjs/helpers/lookupTreeForSelectedNodes.js

@@ -14,15 +14,11 @@ const findAllChildNodeIds_1 = require("./findAllChildNodeIds");
  * @returns Обновленный список выбранных id.
  */
 function lookupTreeForSelectedNodes(_ref) {
-  let {
-    node,
-    selectedNodes,
-    parentNode
-  } = _ref;
+  let node = _ref.node,
+    selectedNodes = _ref.selectedNodes,
+    parentNode = _ref.parentNode;
   var _a;
-  const {
-    nested
-  } = node;
+  const nested = node.nested;
   const childSelection = (nested === null || nested === void 0 ? void 0 : nested.length) ? (0, checkNestedNodesSelection_1.checkNestedNodesSelection)(nested, selectedNodes) : undefined;
   const isSelected = childSelection ? childSelection.someSelected || childSelection.allSelected : selectedNodes.includes(node.id);
   let updatedSelectedNodes = [];

package/dist/cjs/helpers/traverse.js

@@ -30,10 +30,8 @@ const traverse = (nodes, callback) => {
     if (!nodeWithDepth) {
       continue;
     }
-    const {
-      node,
-      depth
-    } = nodeWithDepth;
+    const node = nodeWithDepth.node,
+      depth = nodeWithDepth.depth;
     callback(node, depth);
     for (const child of (_a = node.nested) !== null && _a !== void 0 ? _a : []) {
       queue.enqueue({

package/dist/cjs/helpers/traverseWithTarget.js

@@ -32,11 +32,9 @@ const traverseWithTarget = (nodes, rootTargetList, callback) => {
   while (!queue.isEmpty()) {
     const item = queue.dequeue();
     if (!item) continue;
-    const {
-      node,
-      depth,
-      targetList
-    } = item;
+    const node = item.node,
+      depth = item.depth,
+      targetList = item.targetList;
     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) {

package/dist/cjs/hooks/__tests__/useSearchableTree.spec.js

@@ -63,15 +63,14 @@ const mapNodeToRecordItem = node => ({
 (0, vitest_1.describe)('useSearchableTree', () => {
   (0, vitest_1.it)('should initialize tree and treeItemsRecord from initTree', () => {
     const initTree = [createLeaf('node-1'), createParent('node-2', [createLeaf('node-2-1')])];
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
-      initTree,
-      onPreloadNode: vitest_1.vi.fn(),
-      onPreloadNodes: vitest_1.vi.fn(),
-      onSearch: vitest_1.vi.fn(),
-      mapNodeToRecordItem
-    }));
+    const _ref = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
+        initTree,
+        onPreloadNode: vitest_1.vi.fn(),
+        onPreloadNodes: vitest_1.vi.fn(),
+        onSearch: vitest_1.vi.fn(),
+        mapNodeToRecordItem
+      })),
+      result = _ref.result;
     (0, vitest_1.expect)(result.current.tree.current).toEqual(initTree);
     (0, vitest_1.expect)(result.current.treeItemsRecord.current).toEqual({
       'node-1': {
@@ -86,15 +85,14 @@ const mapNodeToRecordItem = node => ({
     });
   });
   (0, vitest_1.it)('should update expandedNodes on onExpand call', () => {
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
-      initTree: [createLeaf('root')],
-      onPreloadNode: vitest_1.vi.fn(),
-      onPreloadNodes: vitest_1.vi.fn(),
-      onSearch: vitest_1.vi.fn(),
-      mapNodeToRecordItem
-    }));
+    const _ref2 = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
+        initTree: [createLeaf('root')],
+        onPreloadNode: vitest_1.vi.fn(),
+        onPreloadNodes: vitest_1.vi.fn(),
+        onSearch: vitest_1.vi.fn(),
+        mapNodeToRecordItem
+      })),
+      result = _ref2.result;
     (0, react_1.act)(() => {
       result.current.onExpand(['root', 'child']);
     });
@@ -104,15 +102,14 @@ const mapNodeToRecordItem = node => ({
     const initTree = [createParent('root', [])];
     const preloadedChildren = [createLeaf('child-1'), createLeaf('child-2')];
     const onPreloadNode = vitest_1.vi.fn().mockResolvedValue(preloadedChildren);
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
-      initTree,
-      onPreloadNode,
-      onPreloadNodes: vitest_1.vi.fn(),
-      onSearch: vitest_1.vi.fn(),
-      mapNodeToRecordItem
-    }));
+    const _ref3 = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
+        initTree,
+        onPreloadNode,
+        onPreloadNodes: vitest_1.vi.fn(),
+        onSearch: vitest_1.vi.fn(),
+        mapNodeToRecordItem
+      })),
+      result = _ref3.result;
     let loadResult;
     yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
       loadResult = yield result.current.onDataLoad(createParent('root', []));
@@ -160,15 +157,14 @@ const mapNodeToRecordItem = node => ({
         'external-root': [createLeaf('external-child')]
       }, Object.fromEntries(nodeIds.filter(id => id !== 'expandable-root' && id !== 'external-root').map(id => [id, []])));
     }));
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
-      initTree: [createParent('init-root', [])],
-      onPreloadNode: vitest_1.vi.fn(),
-      onPreloadNodes,
-      onSearch,
-      mapNodeToRecordItem
-    }));
+    const _ref4 = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
+        initTree: [createParent('init-root', [])],
+        onPreloadNode: vitest_1.vi.fn(),
+        onPreloadNodes,
+        onSearch,
+        mapNodeToRecordItem
+      })),
+      result = _ref4.result;
     (0, react_1.act)(() => {
       result.current.onExpand(['expandable-root']);
       result.current.search.onChange('query');
@@ -200,15 +196,14 @@ const mapNodeToRecordItem = node => ({
         needPreloadNodes: []
       };
     }));
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
-      initTree: [createLeaf('initial')],
-      onPreloadNode: vitest_1.vi.fn(),
-      onPreloadNodes: vitest_1.vi.fn(),
-      onSearch,
-      mapNodeToRecordItem
-    }));
+    const _ref5 = (0, react_1.renderHook)(() => (0, useSearchableTree_1.useSearchableTree)({
+        initTree: [createLeaf('initial')],
+        onPreloadNode: vitest_1.vi.fn(),
+        onPreloadNodes: vitest_1.vi.fn(),
+        onSearch,
+        mapNodeToRecordItem
+      })),
+      result = _ref5.result;
     (0, react_1.act)(() => {
       result.current.search.onChange('query');
     });

package/dist/cjs/hooks/__tests__/useTreeMultiSelection.spec.js

@@ -44,20 +44,19 @@ const createParent = (id, nested) => ({
 });
 (0, vitest_1.describe)('useTreeMultiSelection', () => {
   (0, vitest_1.it)('should keep selected state uncontrolled by default', () => __awaiter(void 0, void 0, void 0, function* () {
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
-      onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
-        return {
-          preloadedChildren: [],
-          updatedTree: []
-        };
+    const _ref = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
+        onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
+          return {
+            preloadedChildren: [],
+            updatedTree: []
+          };
+        })),
+        onSelect: () => ({
+          added: ['a'],
+          removed: []
+        })
       })),
-      onSelect: () => ({
-        added: ['a'],
-        removed: []
-      })
-    }));
+      result = _ref.result;
     (0, vitest_1.expect)(result.current.selected).toEqual([]);
     yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
       yield result.current.onSelect(['a'], createLeaf('a'));
@@ -66,36 +65,7 @@ const createParent = (id, nested) => ({
   }));
   (0, vitest_1.it)('should call onChangeSelected when selection updates', () => __awaiter(void 0, void 0, void 0, function* () {
     const onChangeSelected = vitest_1.vi.fn();
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
-      onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
-        return {
-          preloadedChildren: [],
-          updatedTree: []
-        };
-      })),
-      onSelect: () => ({
-        added: ['a'],
-        removed: []
-      }),
-      onChangeSelected
-    }));
-    yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
-      yield result.current.onSelect(['a'], createLeaf('a'));
-    }));
-    (0, vitest_1.expect)(onChangeSelected).toHaveBeenCalledWith(['a']);
-  }));
-  (0, vitest_1.it)('should treat selected prop as controlled', () => __awaiter(void 0, void 0, void 0, function* () {
-    const onChangeSelected = vitest_1.vi.fn();
-    const {
-      result,
-      rerender
-    } = (0, react_1.renderHook)(_ref => {
-      let {
-        selected
-      } = _ref;
-      return (0, useTreeMultiSelection_1.useTreeMultiSelection)({
+    const _ref2 = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
         onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
           return {
             preloadedChildren: [],
@@ -103,17 +73,42 @@ const createParent = (id, nested) => ({
           };
         })),
         onSelect: () => ({
-          added: ['b'],
+          added: ['a'],
           removed: []
         }),
-        selected,
         onChangeSelected
-      });
-    }, {
-      initialProps: {
-        selected: ['a']
-      }
-    });
+      })),
+      result = _ref2.result;
+    yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
+      yield result.current.onSelect(['a'], createLeaf('a'));
+    }));
+    (0, vitest_1.expect)(onChangeSelected).toHaveBeenCalledWith(['a']);
+  }));
+  (0, vitest_1.it)('should treat selected prop as controlled', () => __awaiter(void 0, void 0, void 0, function* () {
+    const onChangeSelected = vitest_1.vi.fn();
+    const _ref3 = (0, react_1.renderHook)(_ref4 => {
+        let selected = _ref4.selected;
+        return (0, useTreeMultiSelection_1.useTreeMultiSelection)({
+          onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
+            return {
+              preloadedChildren: [],
+              updatedTree: []
+            };
+          })),
+          onSelect: () => ({
+            added: ['b'],
+            removed: []
+          }),
+          selected,
+          onChangeSelected
+        });
+      }, {
+        initialProps: {
+          selected: ['a']
+        }
+      }),
+      result = _ref3.result,
+      rerender = _ref3.rerender;
     (0, vitest_1.expect)(result.current.selected).toEqual(['a']);
     yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
       yield result.current.onSelect(['a', 'b'], createLeaf('b'));
@@ -139,12 +134,11 @@ const createParent = (id, nested) => ({
       added: ['parent', 'child-1', 'child-2'],
       removed: []
     }));
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
-      onDataLoad,
-      onSelect
-    }));
+    const _ref5 = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
+        onDataLoad,
+        onSelect
+      })),
+      result = _ref5.result;
     yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
       yield result.current.onSelect(['parent'], node);
     }));
@@ -168,12 +162,11 @@ const createParent = (id, nested) => ({
       added: ['parent'],
       removed: []
     }));
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
-      onDataLoad,
-      onSelect
-    }));
+    const _ref6 = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
+        onDataLoad,
+        onSelect
+      })),
+      result = _ref6.result;
     yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
       yield result.current.onSelect(['parent'], node);
     }));
@@ -186,20 +179,19 @@ const createParent = (id, nested) => ({
     (0, vitest_1.expect)(result.current.selected).toEqual(['parent']);
   }));
   (0, vitest_1.it)('should deduplicate ids when merging added into selection', () => __awaiter(void 0, void 0, void 0, function* () {
-    const {
-      result
-    } = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
-      onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
-        return {
-          preloadedChildren: [],
-          updatedTree: []
-        };
+    const _ref7 = (0, react_1.renderHook)(() => (0, useTreeMultiSelection_1.useTreeMultiSelection)({
+        onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
+          return {
+            preloadedChildren: [],
+            updatedTree: []
+          };
+        })),
+        onSelect: () => ({
+          added: ['a', 'a', 'b'],
+          removed: []
+        })
       })),
-      onSelect: () => ({
-        added: ['a', 'a', 'b'],
-        removed: []
-      })
-    }));
+      result = _ref7.result;
     yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
       yield result.current.onSelect(['a'], createLeaf('a'));
     }));
@@ -207,32 +199,29 @@ const createParent = (id, nested) => ({
   }));
   (0, vitest_1.it)('should apply removed ids from selection', () => __awaiter(void 0, void 0, void 0, function* () {
     const onChangeSelected = vitest_1.vi.fn();
-    const {
-      result,
-      rerender
-    } = (0, react_1.renderHook)(_ref2 => {
-      let {
-        selected
-      } = _ref2;
-      return (0, useTreeMultiSelection_1.useTreeMultiSelection)({
-        onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
-          return {
-            preloadedChildren: [],
-            updatedTree: []
-          };
-        })),
-        onSelect: () => ({
-          added: [],
-          removed: ['a']
-        }),
-        selected,
-        onChangeSelected
-      });
-    }, {
-      initialProps: {
-        selected: ['a', 'b']
-      }
-    });
+    const _ref8 = (0, react_1.renderHook)(_ref9 => {
+        let selected = _ref9.selected;
+        return (0, useTreeMultiSelection_1.useTreeMultiSelection)({
+          onDataLoad: vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
+            return {
+              preloadedChildren: [],
+              updatedTree: []
+            };
+          })),
+          onSelect: () => ({
+            added: [],
+            removed: ['a']
+          }),
+          selected,
+          onChangeSelected
+        });
+      }, {
+        initialProps: {
+          selected: ['a', 'b']
+        }
+      }),
+      result = _ref8.result,
+      rerender = _ref8.rerender;
     yield (0, react_1.act)(() => __awaiter(void 0, void 0, void 0, function* () {
       yield result.current.onSelect(['b'], createLeaf('a'));
     }));

package/dist/cjs/hooks/useSearchableTree.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -48,19 +50,23 @@ const helpers_1 = require("../helpers");
  * @returns Ссылки на состояние дерева, контролы поиска и колбэки для `expand`/`dataLoad`.
  */
 function useSearchableTree(_ref) {
-  let {
-    initTree,
-    onPreloadNode,
-    onPreloadNodes,
-    onSearch,
-    mapNodeToRecordItem
-  } = _ref;
+  let initTree = _ref.initTree,
+    onPreloadNode = _ref.onPreloadNode,
+    onPreloadNodes = _ref.onPreloadNodes,
+    onSearch = _ref.onSearch,
+    mapNodeToRecordItem = _ref.mapNodeToRecordItem;
   const tree = (0, reactuse_1.useRefState)(initTree);
   const treeItemsRecord = (0, reactuse_1.useRefState)({});
   const expandedNodes = (0, reactuse_1.useRefState)([]);
-  const [search, setSearch] = (0, react_1.useState)('');
+  const _ref2 = (0, react_1.useState)(''),
+    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+    search = _ref3[0],
+    setSearch = _ref3[1];
   const debouncedSearch = (0, reactuse_1.useDebounceValue)(search, 500);
-  const [loading, setLoading] = (0, react_1.useState)(false);
+  const _ref4 = (0, react_1.useState)(false),
+    _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
+    loading = _ref5[0],
+    setLoading = _ref5[1];
   const searchPromiseRef = (0, react_1.useRef)(null);
   const searchAbortControllerRef = (0, react_1.useRef)(null);
   const buildTreeItemsRecord = (0, react_1.useCallback)(nodes => {
@@ -103,10 +109,9 @@ function useSearchableTree(_ref) {
     }, abortController.signal));
     searchPromiseRef.current = searchPromise;
     try {
-      const {
-        tree: searchedTree,
-        needPreloadNodes
-      } = yield searchPromise;
+      const _yield$searchPromise = yield searchPromise,
+        searchedTree = _yield$searchPromise.tree,
+        needPreloadNodes = _yield$searchPromise.needPreloadNodes;
       if (!searchPromise.isCanceled()) {
         tree.current = searchedTree;
         treeItemsRecord.current = buildTreeItemsRecord(searchedTree);
@@ -121,7 +126,10 @@ function useSearchableTree(_ref) {
           return;
         }
         let tmpTree = [...searchedTree];
-        for (const [nodeId, children] of Object.entries(preloadedNodes)) {
+        for (const _ref6 of Object.entries(preloadedNodes)) {
+          var _ref7 = (0, _slicedToArray2.default)(_ref6, 2);
+          const nodeId = _ref7[0];
+          const children = _ref7[1];
           tmpTree = (0, helpers_1.updateTreeNode)(tmpTree, nodeId, {
             nested: children
           });

package/dist/cjs/hooks/useTreeMultiSelection.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -54,34 +56,34 @@ const getNewSelectedIds = (selectedIds, added, removed) => {
  * @returns Текущий список выбранных id и обработчик выбора узла.
  */
 function useTreeMultiSelection(_ref) {
-  let {
-    onDataLoad,
-    onSelect: onSelectProp,
-    selected,
-    onChangeSelected
-  } = _ref;
-  const [selectedIds = [], setSelectedIds] = (0, utils_1.useValueControl)({
-    value: selected,
-    defaultValue: [],
-    onChange: onChangeSelected
-  });
+  let onDataLoad = _ref.onDataLoad,
+    onSelectProp = _ref.onSelect,
+    selected = _ref.selected,
+    onChangeSelected = _ref.onChangeSelected;
+  const _ref2 = (0, utils_1.useValueControl)({
+      value: selected,
+      defaultValue: [],
+      onChange: onChangeSelected
+    }),
+    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+    _ref3$ = _ref3[0],
+    selectedIds = _ref3$ === void 0 ? [] : _ref3$,
+    setSelectedIds = _ref3[1];
   const onSelect = (0, react_1.useCallback)((selectedKeys, node) => __awaiter(this, void 0, void 0, function* () {
     const isSelected = selectedKeys.includes(node.id);
     const clonedNode = Object.assign({}, node);
     if (node.nested && !node.nested.length) {
-      const {
-        preloadedChildren
-      } = yield onDataLoad(node);
+      const _yield$onDataLoad = yield onDataLoad(node),
+        preloadedChildren = _yield$onDataLoad.preloadedChildren;
       clonedNode.nested = preloadedChildren;
     }
-    const {
-      added,
-      removed
-    } = onSelectProp({
-      selectedKeys,
-      node: clonedNode,
-      isSelected
-    });
+    const _onSelectProp = onSelectProp({
+        selectedKeys,
+        node: clonedNode,
+        isSelected
+      }),
+      added = _onSelectProp.added,
+      removed = _onSelectProp.removed;
     const updatedSelectedIds = getNewSelectedIds(selectedIds, added, removed);
     setSelectedIds(updatedSelectedIds);
   }), [onDataLoad, onSelectProp, selectedIds, setSelectedIds]);

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Tree",
-  "version": "0.12.4-preview-6a625dbd.0",
+  "version": "0.12.4-preview-74429015.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -55,9 +55,9 @@
     "@siberiacancode/reactuse": "0.3.14",
     "@snack-uikit/button": "0.19.19",
     "@snack-uikit/icons": "0.27.7",
-    "@snack-uikit/list": "0.33.3-preview-6a625dbd.0",
+    "@snack-uikit/list": "0.33.3-preview-74429015.0",
     "@snack-uikit/toggles": "0.13.27",
-    "@snack-uikit/truncate-string": "0.7.14-preview-6a625dbd.0",
+    "@snack-uikit/truncate-string": "0.7.14-preview-74429015.0",
     "@snack-uikit/typography": "0.8.13",
     "@snack-uikit/utils": "4.0.2",
     "cancelable-promise": "4.3.1",
@@ -66,5 +66,5 @@
     "react-transition-state": "2.1.1",
     "uncontrollable": "8.0.4"
   },
-  "gitHead": "38c6c6054ab0755be48b32041085b8b497f4960a"
+  "gitHead": "d3215f7071f7e99365d9da19a2485d8c39cf3aeb"
 }