@salutejs/plasma-new-hope 0.340.0-canary.2322.19132961849.0 → 0.340.0-canary.2322.19262336998.0

package/emotion/es/components/Combobox/ComboboxNew/Combobox.js

@@ -135,9 +135,9 @@ import { sizeToIconSize } from "../../Select/utils";
 import { classes } from "./Combobox.tokens";
 import { FloatingPopover } from "./FloatingPopover";
 import { useKeyNavigation, getItemByFocused } from "./hooks/useKeyboardNavigation";
-import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId, getTextValue } from "./utils";
-import { Inner, StyledTextField, VirtualList, SelectAll } from "./ui";
-import { pathReducer, focusedPathReducer } from "./reducers";
+import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId, getTextValue, defaultFilter } from "./utils";
+import { Inner, StyledTextField, VirtualList, SelectAll, TreeList } from "./ui";
+import { pathReducer, focusedPathReducer, treePathReducer } from "./reducers";
 import { getPathMap, getTreeMaps } from "./hooks/getPathMaps";
 import { Ul, base, StyledArrow, IconArrowWrapper, StyledEmptyState, StyledLeftHelper, ListWrapper } from "./Combobox.styles";
 import { base as viewCSS } from "./variations/_view/base";
@@ -149,7 +149,7 @@ import { Context } from "./Combobox.context";
  */ export var comboboxRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(props, ref) {
         var _getItemByFocused;
-        var name = props.name, multiple = props.multiple, outerValue = props.value, outerOnChange = props.onChange, defaultValue = props.defaultValue, isTargetAmount = props.isTargetAmount, targetAmount = props.targetAmount, items = props.items, _props_placement = props.placement, placement = _props_placement === void 0 ? 'bottom-start' : _props_placement, label = props.label, placeholder = props.placeholder, helperText = props.helperText, contentLeft = props.contentLeft, textBefore = props.textBefore, textAfter = props.textAfter, _props_variant = props.variant, variant = _props_variant === void 0 ? 'normal' : _props_variant, listOverflow = props.listOverflow, listHeight = props.listHeight, listMaxHeight = props.listMaxHeight, listWidth = props.listWidth, portal = props.portal, renderItem = props.renderItem, view = props.view, size = props.size, labelPlacement = props.labelPlacement, keepPlaceholder = props.keepPlaceholder, _props_readOnly = props.readOnly, readOnly = _props_readOnly === void 0 ? false : _props_readOnly, _props_disabled = props.disabled, disabled = _props_disabled === void 0 ? false : _props_disabled, _props_alwaysOpened = props.alwaysOpened, alwaysOpened = _props_alwaysOpened === void 0 ? false : _props_alwaysOpened, filter = props.filter, outerCloseAfterSelect = props.closeAfterSelect, renderValue = props.renderValue, zIndex = props.zIndex, beforeList = props.beforeList, afterList = props.afterList, _props_virtual = props.virtual, virtual = _props_virtual === void 0 ? false : _props_virtual, hintView = props.hintView, hintSize = props.hintSize, emptyStateDescription = props.emptyStateDescription, onChangeValue = props.onChangeValue, onScroll = props.onScroll, onToggle = props.onToggle, _props_mode = props.mode, mode = _props_mode === void 0 ? 'default' : _props_mode, _props_chipClickArea = props.chipClickArea, chipClickArea = _props_chipClickArea === void 0 ? 'full' : _props_chipClickArea, // @ts-ignore
+        var name = props.name, multiple = props.multiple, outerValue = props.value, outerOnChange = props.onChange, defaultValue = props.defaultValue, isTargetAmount = props.isTargetAmount, targetAmount = props.targetAmount, items = props.items, _props_treeView = props.treeView, treeView = _props_treeView === void 0 ? false : _props_treeView, _props_arrowPlacement = props.arrowPlacement, arrowPlacement = _props_arrowPlacement === void 0 ? 'left' : _props_arrowPlacement, _props_placement = props.placement, placement = _props_placement === void 0 ? 'bottom-start' : _props_placement, label = props.label, placeholder = props.placeholder, helperText = props.helperText, contentLeft = props.contentLeft, textBefore = props.textBefore, textAfter = props.textAfter, _props_variant = props.variant, variant = _props_variant === void 0 ? 'normal' : _props_variant, listOverflow = props.listOverflow, listHeight = props.listHeight, listMaxHeight = props.listMaxHeight, listWidth = props.listWidth, portal = props.portal, renderItem = props.renderItem, view = props.view, size = props.size, labelPlacement = props.labelPlacement, keepPlaceholder = props.keepPlaceholder, _props_readOnly = props.readOnly, readOnly = _props_readOnly === void 0 ? false : _props_readOnly, _props_disabled = props.disabled, disabled = _props_disabled === void 0 ? false : _props_disabled, _props_alwaysOpened = props.alwaysOpened, alwaysOpened = _props_alwaysOpened === void 0 ? false : _props_alwaysOpened, filter = props.filter, outerCloseAfterSelect = props.closeAfterSelect, renderValue = props.renderValue, zIndex = props.zIndex, beforeList = props.beforeList, afterList = props.afterList, _props_virtual = props.virtual, virtual = _props_virtual === void 0 ? false : _props_virtual, hintView = props.hintView, hintSize = props.hintSize, emptyStateDescription = props.emptyStateDescription, onChangeValue = props.onChangeValue, onScroll = props.onScroll, onToggle = props.onToggle, _props_mode = props.mode, mode = _props_mode === void 0 ? 'default' : _props_mode, _props_chipClickArea = props.chipClickArea, chipClickArea = _props_chipClickArea === void 0 ? 'full' : _props_chipClickArea, // @ts-ignore
         _offset = props._offset, rest = _object_without_properties(props, [
             "name",
             "multiple",
@@ -159,6 +159,8 @@ import { Context } from "./Combobox.context";
             "isTargetAmount",
             "targetAmount",
             "items",
+            "treeView",
+            "arrowPlacement",
             "placement",
             "label",
             "placeholder",
@@ -207,8 +209,10 @@ import { Context } from "./Combobox.context";
             return getTreeMaps(transformedItems);
         }, [
             items
-        ]), 2), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1];
-        var _useState = _sliced_to_array(useState(getTextValue(multiple, outerValue, valueToItemMap, renderValue)), 2), textValue = _useState[0], setTextValue = _useState[1];
+        ]), 3), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1], valueToPathMap = _useMemo[2];
+        // Состояние поля поиска в target
+        var _useState = _sliced_to_array(useState(getTextValue(multiple, outerValue, valueToItemMap, renderValue)), 2), textValue = _useState[0], setTextValueState = _useState[1];
+        // Внутреннее состояние выбранных элементов
         var _useState1 = _sliced_to_array(useState(multiple ? [] : ''), 2), internalValue = _useState1[0], setInternalValue = _useState1[1];
         var value = outerValue !== null && outerValue !== undefined ? outerValue : internalValue;
         var rootRef = useRef(null);
@@ -217,12 +221,14 @@ import { Context } from "./Combobox.context";
         var inputForkRef = useForkRef(inputRef, ref);
         var listWrapperRef = useRef(null);
         var treeId = safeUseId();
+        var filterCb = filter || defaultFilter;
         var filteredItems = useMemo(function() {
             return filterItems(transformedItems, textValue, getTextValue(multiple, value, valueToItemMap, renderValue), filter);
         }, [
             transformedItems,
             textValue,
-            filter
+            filter,
+            value
         ]);
         var _useMemo1 = _sliced_to_array(useMemo(function() {
             return getPathMap(filteredItems);
@@ -237,17 +243,22 @@ import { Context } from "./Combobox.context";
         var _useReducer = _sliced_to_array(useReducer(pathReducer, initialPath), 2), path = _useReducer[0], dispatchPath = _useReducer[1];
         var _useReducer1 = _sliced_to_array(useReducer(focusedPathReducer, []), 2), focusedPath = _useReducer1[0], dispatchFocusedPath = _useReducer1[1];
         var _useState2 = _sliced_to_array(useState(valueToCheckedMap), 2), checked = _useState2[0], setChecked = _useState2[1];
+        var _useReducer2 = _sliced_to_array(useReducer(treePathReducer, {}), 2), treePath = _useReducer2[0], dispatchTreePath = _useReducer2[1];
         var isCurrentListOpen = Boolean(path[0]);
         var activeDescendantItemValue = ((_getItemByFocused = getItemByFocused(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value) || '';
         var withArrowInverse = isCurrentListOpen ? classes.arrowInverse : undefined;
         var closeAfterSelect = outerCloseAfterSelect !== null && outerCloseAfterSelect !== void 0 ? outerCloseAfterSelect : !multiple;
+        var setTextValue = function(newTextValue) {
+            setTextValueState(newTextValue);
+            if (onChangeValue) {
+                onChangeValue(newTextValue);
+            }
+        };
         /* Логика работы при клике за пределами выпадающего списка */ useOutsideClick(function() {
             if (!isCurrentListOpen || alwaysOpened) {
                 return;
             }
             handleListToggle(false);
-            // Возвращаем актуальное значение поля ввода после закрытия выпадающего списка.
-            setTextValue(getTextValue(multiple, value, valueToItemMap, renderValue));
         }, [
             floatingPopoverRef,
             listWrapperRef
@@ -297,11 +308,14 @@ import { Context } from "./Combobox.context";
                 onChange(value.filter(function(val) {
                     var _valueToItemMap_get;
                     return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
-                }));
+                }), null);
             } else {
                 onChange(value.filter(function(val) {
                     return val !== chip.value;
-                }), valueToItemMap.get(chip.value) || null);
+                }), valueToItemMap.get(chip.value) || {
+                    value: chip.value,
+                    label: chip.label
+                });
             }
         };
         // Обработчик открытия/закрытия выпадающего списка
@@ -321,6 +335,11 @@ import { Context } from "./Combobox.context";
                 dispatchPath({
                     type: 'reset'
                 });
+                dispatchTreePath({
+                    type: 'reset'
+                });
+                // Возвращаем актуальное значение поля ввода после закрытия выпадающего списка.
+                setTextValue(getTextValue(multiple, value, valueToItemMap, renderValue));
                 // Скроллим чипы к левому краю при закрытии компонента
                 var el = rootRef === null || rootRef === void 0 ? void 0 : (_rootRef_current = rootRef.current) === null || _rootRef_current === void 0 ? void 0 : _rootRef_current.querySelector('.input-scrollable-wrapper');
                 if (multiple && value.length > 0 && el) {
@@ -384,6 +403,9 @@ import { Context } from "./Combobox.context";
                 dispatchFocusedPath({
                     type: 'reset'
                 });
+                dispatchTreePath({
+                    type: 'reset'
+                });
             }
             if (onChange) {
                 onChange(newValues, item);
@@ -409,6 +431,9 @@ import { Context } from "./Combobox.context";
                 dispatchFocusedPath({
                     type: 'reset'
                 });
+                dispatchTreePath({
+                    type: 'reset'
+                });
             }
             // Закрываем список, если элемент уже выбран.
             if (mode === 'radio' && isCurrentChecked) {
@@ -477,7 +502,12 @@ import { Context } from "./Combobox.context";
             multiple: multiple,
             value: value,
             textValue: textValue,
-            valueToItemMap: valueToItemMap
+            valueToItemMap: valueToItemMap,
+            treePath: treePath,
+            dispatchTreePath: dispatchTreePath,
+            treeView: treeView,
+            valueToPathMap: valueToPathMap,
+            items: filteredItems
         }).onKeyDown;
         // В данном эффекте мы следим за изменениями value снаружи и вносим коррективы в дерево чекбоксов.
         // Пример: когда юзер очистил value извне, тогда нужно пройтись по элементам и выключить все чекбоксы.
@@ -539,6 +569,30 @@ import { Context } from "./Combobox.context";
         }, [
             defaultValue
         ]);
+        // Эффект для раскрытия дерева при поиске.
+        useLayoutEffect(function() {
+            if (treeView) {
+                // Если поле ввода стало пустым или если пользователь выбирает элемент,
+                // то скрываем все узлы дерева и выходим из эффекта.
+                if (textValue === '' || textValue === getTextValue(multiple, value, valueToItemMap, renderValue)) {
+                    dispatchTreePath({
+                        type: 'reset'
+                    });
+                    return;
+                }
+                // Иначе раскрываем все узлы, когда пользователь начинает вводить текст в поле ввода.
+                dispatchTreePath({
+                    type: 'expand_by_key',
+                    value: {
+                        filteredItems: filteredItems,
+                        filterCb: filterCb,
+                        textValue: textValue
+                    }
+                });
+            }
+        }, [
+            textValue
+        ]);
         return /*#__PURE__*/ React.createElement(Root, {
             size: size,
             view: view,
@@ -571,7 +625,11 @@ import { Context } from "./Combobox.context";
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 // eslint-disable-next-line no-underscore-dangle
-                _checkboxAppearance: rest._checkboxAppearance
+                _checkboxAppearance: rest._checkboxAppearance,
+                treePath: treePath,
+                dispatchTreePath: dispatchTreePath,
+                arrowPlacement: arrowPlacement,
+                valueToPathMap: valueToPathMap
             }
         }, /*#__PURE__*/ React.createElement(FloatingPopover, {
             ref: floatingPopoverRef,
@@ -637,7 +695,18 @@ import { Context } from "./Combobox.context";
             disabled: disabled,
             readOnly: readOnly,
             name: name
-        }, /*#__PURE__*/ React.createElement(ListWrapper, {
+        }, isEmpty(filteredItems) ? /*#__PURE__*/ React.createElement(StyledEmptyState, {
+            className: classes.emptyStateWrapper,
+            size: size,
+            description: emptyStateDescription || 'Ничего не найдено'
+        }) : /*#__PURE__*/ React.createElement(React.Fragment, null, treeView ? /*#__PURE__*/ React.createElement(TreeList, {
+            items: filteredItems,
+            listMaxHeight: listMaxHeight || listHeight,
+            onScroll: virtual ? undefined : onScroll,
+            virtual: virtual,
+            beforeList: beforeList,
+            afterList: afterList
+        }) : /*#__PURE__*/ React.createElement(ListWrapper, {
             ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
@@ -647,11 +716,7 @@ import { Context } from "./Combobox.context";
             listMaxHeight: listMaxHeight || listHeight,
             virtual: virtual,
             onScroll: virtual ? undefined : onScroll
-        }, beforeList, isEmpty(filteredItems) ? /*#__PURE__*/ React.createElement(StyledEmptyState, {
-            className: classes.emptyStateWrapper,
-            size: size,
-            description: emptyStateDescription || 'Ничего не найдено'
-        }) : /*#__PURE__*/ React.createElement(React.Fragment, null, props.multiple && props.selectAllOptions && // TODO: #2004
+        }, beforeList, props.multiple && props.selectAllOptions && // TODO: #2004
         /*#__PURE__*/ React.createElement(SelectAll, {
             selectAllOptions: props.selectAllOptions,
             variant: variant
@@ -670,7 +735,7 @@ import { Context } from "./Combobox.context";
                 listWidth: listWidth,
                 portal: listWrapperRef
             });
-        })), afterList)))))));
+        }), afterList))))))));
     });
 };
 export var comboboxConfig = {

package/emotion/es/components/Combobox/ComboboxNew/Combobox.tokens.js

@@ -33,6 +33,8 @@ export var tokens = {
     itemIconMargin: '--plasma-combobox-item-icon-margin',
     itemBackgroundHover: '--plasma-combobox-item-background-hover',
     itemIconColor: '--plasma-combobox-item-icon-color',
+    itemGap: '--plasma-select-item-gap',
+    itemTreeOffsetWidth: '--plasma-select-item-tree-offset-width',
     cellPadding: '--plasma-combobox-cell-padding',
     cellPaddingLeftContent: '--plasma-combobox-cell-padding-left-content',
     cellPaddingContent: '--plasma-combobox-cell-padding-content',

package/emotion/es/components/Combobox/ComboboxNew/hooks/getPathMaps.js

@@ -1,3 +1,28 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 import { isEmpty } from "../../../../utils";
 export var getPathMap = function(items) {
     var pathMap = new Map();
@@ -24,22 +49,29 @@ export var getPathMap = function(items) {
 export var getTreeMaps = function(items) {
     var valueToCheckedMap = new Map();
     var valueToItemMap = new Map();
+    var valueToPathMap = new Map();
     var rec = function(items) {
-        var prevIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '';
+        var prevIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '', path = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
         items === null || items === void 0 ? void 0 : items.forEach(function(item, index) {
             var value = item.value, innerItems = item.items;
             var currIndex = "".concat(prevIndex, "/").concat(index).replace(/^(\/)/, '');
             valueToCheckedMap.set(value, false);
+            valueToPathMap.set(value.toString(), _to_consumable_array(path).concat([
+                value.toString()
+            ]));
             if (isEmpty(innerItems) || !innerItems) {
                 valueToItemMap.set(value, item);
             } else {
-                rec(innerItems, currIndex);
+                rec(innerItems, currIndex, _to_consumable_array(path).concat([
+                    value.toString()
+                ]));
             }
         });
     };
     rec(items);
     return [
         valueToCheckedMap,
-        valueToItemMap
+        valueToItemMap,
+        valueToPathMap
     ];
 };

package/emotion/es/components/Combobox/ComboboxNew/hooks/useKeyboardNavigation.js

@@ -1,4 +1,30 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 import { isEmpty } from "../../../../utils";
+import { keyExists } from "../../../Select/reducers";
 var JUMP_SIZE = 10;
 export var keys = {
     Enter: 'Enter',
@@ -21,7 +47,53 @@ export var getItemByFocused = function(focusedPath, focusedToValueMap) {
     }, '').replace(/^(\/)/, '');
     return focusedToValueMap.get(focusedPathAsString);
 };
+// #TODO: подумать над идеей выноса логики фокуса непосредственно в focusedPathReducer.
 export var useKeyNavigation = function(param) {
+    var focusedPath = param.focusedPath, dispatchFocusedPath = param.dispatchFocusedPath, path = param.path, dispatchPath = param.dispatchPath, pathMap = param.pathMap, focusedToValueMap = param.focusedToValueMap, handleListToggle = param.handleListToggle, handlePressDown = param.handlePressDown, setTextValue = param.setTextValue, multiple = param.multiple, value = param.value, textValue = param.textValue, valueToItemMap = param.valueToItemMap, treePath = param.treePath, dispatchTreePath = param.dispatchTreePath, treeView = param.treeView, valueToPathMap = param.valueToPathMap, items = param.items;
+    if (treeView) {
+        return keyboardNavigationTree({
+            focusedPath: focusedPath,
+            dispatchFocusedPath: dispatchFocusedPath,
+            path: path,
+            dispatchPath: dispatchPath,
+            pathMap: pathMap,
+            focusedToValueMap: focusedToValueMap,
+            handleListToggle: handleListToggle,
+            handlePressDown: handlePressDown,
+            setTextValue: setTextValue,
+            multiple: multiple,
+            value: value,
+            textValue: textValue,
+            valueToItemMap: valueToItemMap,
+            treePath: treePath,
+            dispatchTreePath: dispatchTreePath,
+            treeView: treeView,
+            valueToPathMap: valueToPathMap,
+            items: items
+        });
+    }
+    return keyboardNavigationDefault({
+        focusedPath: focusedPath,
+        dispatchFocusedPath: dispatchFocusedPath,
+        path: path,
+        dispatchPath: dispatchPath,
+        pathMap: pathMap,
+        focusedToValueMap: focusedToValueMap,
+        handleListToggle: handleListToggle,
+        handlePressDown: handlePressDown,
+        setTextValue: setTextValue,
+        multiple: multiple,
+        value: value,
+        textValue: textValue,
+        valueToItemMap: valueToItemMap,
+        treePath: treePath,
+        dispatchTreePath: dispatchTreePath,
+        treeView: treeView,
+        valueToPathMap: valueToPathMap,
+        items: items
+    });
+};
+var keyboardNavigationDefault = function(param) {
     var focusedPath = param.focusedPath, dispatchFocusedPath = param.dispatchFocusedPath, path = param.path, dispatchPath = param.dispatchPath, pathMap = param.pathMap, focusedToValueMap = param.focusedToValueMap, handleListToggle = param.handleListToggle, handlePressDown = param.handlePressDown, setTextValue = param.setTextValue, multiple = param.multiple, value = param.value, textValue = param.textValue, valueToItemMap = param.valueToItemMap;
     var currentIndex = (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[focusedPath.length - 1]) || 0;
     var currentLength = pathMap.get(path === null || path === void 0 ? void 0 : path[focusedPath.length - 1]) || 0;
@@ -280,3 +352,244 @@ export var useKeyNavigation = function(param) {
         onKeyDown: onKeyDown
     };
 };
+var keyboardNavigationTree = function(param) {
+    var focusedPath = param.focusedPath, dispatchFocusedPath = param.dispatchFocusedPath, path = param.path, dispatchPath = param.dispatchPath, pathMap = param.pathMap, focusedToValueMap = param.focusedToValueMap, handleListToggle = param.handleListToggle, handlePressDown = param.handlePressDown, setTextValue = param.setTextValue, multiple = param.multiple, value = param.value, textValue = param.textValue, valueToItemMap = param.valueToItemMap, treePath = param.treePath, dispatchTreePath = param.dispatchTreePath, valueToPathMap = param.valueToPathMap, items = param.items;
+    var _currentItem_parent_items, _currentItem_parent;
+    var currentItem = getItemByFocused(focusedPath, focusedToValueMap);
+    var currentIndex = (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[focusedPath.length - 1]) || 0;
+    var currentLength = (currentItem === null || currentItem === void 0 ? void 0 : (_currentItem_parent = currentItem.parent) === null || _currentItem_parent === void 0 ? void 0 : (_currentItem_parent_items = _currentItem_parent.items) === null || _currentItem_parent_items === void 0 ? void 0 : _currentItem_parent_items.length) || pathMap.get('root') || 0;
+    var isValidFocus = function(focusCandidate) {
+        if (!Array.isArray(items) || !Array.isArray(focusCandidate)) return false;
+        var currentLevel = items;
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = focusCandidate[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var index = _step.value;
+                if (!Array.isArray(currentLevel) || index >= currentLevel.length) {
+                    return false;
+                }
+                var node = currentLevel[index];
+                currentLevel = node.items || [];
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+        return true;
+    };
+    var onKeyDown = function(event) {
+        switch(event.code){
+            case keys.ArrowUp:
+                {
+                    if (path[0]) {
+                        event.stopPropagation();
+                        event.preventDefault();
+                    }
+                    /**
+                 * Если список открыт и фокус уже установлен на каком-либо элементе.
+                 * */ if (focusedPath.length) {
+                        /**
+                     * Если это не первый элемент, то нужно вначале найти элемент для фокуса.
+                     * Т.к. если верхний элемент раскрыт, то и перемещаться нужно не на него,
+                     * а на его самый нижний дочерний элемент.
+                     * */ if (currentIndex > 0) {
+                            var nextFocus = _to_consumable_array(focusedPath.slice(0, -1)).concat([
+                                currentIndex - 1
+                            ]);
+                            for(var i = 0; i <= focusedPath.length; i++){
+                                var focusedPathAsString = nextFocus.reduce(function(acc, n) {
+                                    return "".concat(acc, "/").concat(n);
+                                }, '').replace(/^(\/)/, '');
+                                var item = focusedToValueMap.get(focusedPathAsString);
+                                var isLevelOpened = keyExists(treePath, valueToPathMap.get(item === null || item === void 0 ? void 0 : item.value.toString()) || []);
+                                if (isLevelOpened) {
+                                    var _item_items;
+                                    nextFocus = _to_consumable_array(nextFocus).concat([
+                                        ((item === null || item === void 0 ? void 0 : (_item_items = item.items) === null || _item_items === void 0 ? void 0 : _item_items.length) || 0) - 1
+                                    ]);
+                                } else {
+                                    break;
+                                }
+                            }
+                            dispatchFocusedPath({
+                                type: 'set_focus',
+                                value: nextFocus
+                            });
+                        } else {
+                            /**
+                         * Если элемент первый, то нужно лишь подняться к его родителю.
+                         * */ dispatchFocusedPath({
+                                type: 'return_prev_focus'
+                            });
+                        }
+                    } else {
+                        /**
+                     * Если список закрыт, то нужно его открыть и установить фокус на первый элемент.
+                     * */ dispatchPath({
+                            type: 'opened_first_level'
+                        });
+                        dispatchFocusedPath({
+                            type: 'set_initial_focus'
+                        });
+                        handleListToggle(true);
+                    }
+                    break;
+                }
+            case keys.ArrowDown:
+                {
+                    if (path[0]) {
+                        event.stopPropagation();
+                        event.preventDefault();
+                    }
+                    /**
+                 * Если список открыт и фокус уже установлен на каком-либо элементе.
+                 * */ if (focusedPath.length) {
+                        /**
+                     * Заходим сюда если у элемента есть другие вложенные элементы.
+                     * */ if ((currentItem === null || currentItem === void 0 ? void 0 : currentItem.items) && (currentItem === null || currentItem === void 0 ? void 0 : currentItem.items.length)) {
+                            var isCurrentLevelOpened = keyExists(treePath, valueToPathMap.get(currentItem.value.toString()) || []);
+                            /**
+                         * Если у этого элемента открыт его дочерний список,
+                         * то устанавливаем фокус на первый элемент из этого списка
+                         * и сразу же выходим из обработчика события.
+                         * */ if (isCurrentLevelOpened) {
+                                dispatchFocusedPath({
+                                    type: 'add_focus',
+                                    value: 0
+                                });
+                                break;
+                            }
+                        }
+                        /**
+                     * Если мы еще не достигли конца списка, то движемся к следующему элементу.
+                     * */ if (currentIndex + 1 < currentLength) {
+                            dispatchFocusedPath({
+                                type: 'change_last_focus',
+                                value: currentIndex + 1
+                            });
+                        } else {
+                            /**
+                         * Если же достигли последнего элемента на текущем уровне, то нужно определить,
+                         * на какой из элементов ниже мы перейдем.
+                         * Переход фокуса отсюда может быть только на уровни выше, при чем сразу на несколько.
+                         * */ var focusCandidate = _to_consumable_array(focusedPath);
+                            var nextFocus1 = null;
+                            while(focusCandidate.length > 1){
+                                focusCandidate = _to_consumable_array(focusCandidate.slice(0, -2)).concat([
+                                    (focusCandidate.at(-2) || 0) + 1
+                                ]);
+                                if (isValidFocus(focusCandidate)) {
+                                    nextFocus1 = focusCandidate;
+                                    break;
+                                }
+                            }
+                            if (nextFocus1) {
+                                dispatchFocusedPath({
+                                    type: 'set_focus',
+                                    value: nextFocus1
+                                });
+                            } else {
+                                break;
+                            }
+                        }
+                    } else {
+                        /**
+                     * Если список закрыт, то нужно его открыть и установить фокус на первый элемент.
+                     * */ dispatchPath({
+                            type: 'opened_first_level'
+                        });
+                        dispatchFocusedPath({
+                            type: 'set_initial_focus'
+                        });
+                        handleListToggle(true);
+                    }
+                    break;
+                }
+            case keys.ArrowLeft:
+                {
+                    if (path[0]) {
+                        event.stopPropagation();
+                        event.preventDefault();
+                        if (focusedPath.length) {
+                            dispatchTreePath({
+                                type: 'close_level',
+                                value: valueToPathMap.get((currentItem === null || currentItem === void 0 ? void 0 : currentItem.value.toString()) || '') || []
+                            });
+                        }
+                    }
+                    break;
+                }
+            case keys.ArrowRight:
+                {
+                    if (path[0]) {
+                        event.stopPropagation();
+                        event.preventDefault();
+                        if (!focusedPath.length || (currentItem === null || currentItem === void 0 ? void 0 : currentItem.disabled) || !(currentItem === null || currentItem === void 0 ? void 0 : currentItem.items)) {
+                            break;
+                        }
+                        dispatchTreePath({
+                            type: 'open_level',
+                            value: valueToPathMap.get(currentItem.value.toString()) || []
+                        });
+                    }
+                    break;
+                }
+            case keys.Enter:
+                {
+                    event.preventDefault();
+                    if (!currentItem || (currentItem === null || currentItem === void 0 ? void 0 : currentItem.disabled)) {
+                        break;
+                    }
+                    if (!path[0]) {
+                        dispatchPath({
+                            type: 'opened_first_level'
+                        });
+                        dispatchFocusedPath({
+                            type: 'set_initial_focus'
+                        });
+                        break;
+                    }
+                    handlePressDown(currentItem);
+                    break;
+                }
+            case keys.Tab:
+            case keys.Escape:
+                {
+                    if (path[0]) {
+                        handleListToggle(false);
+                    }
+                    if (multiple) {
+                        setTextValue('');
+                    } else if (textValue !== value) {
+                        // Проверяем, отличается ли значение в инпуте от выбранного value после нажатия Tab/Enter.
+                        // Если изменилось, то возвращаем label выбранного айтема.
+                        // Если нет выбранного элемента, то стираем значение инпута.
+                        if (isEmpty(value)) {
+                            setTextValue('');
+                        } else {
+                            var _valueToItemMap_get;
+                            setTextValue(((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || '');
+                        }
+                    }
+                    break;
+                }
+            default:
+                {
+                    break;
+                }
+        }
+    };
+    return {
+        onKeyDown: onKeyDown
+    };
+};

package/emotion/es/components/Combobox/ComboboxNew/reducers/focusedPathReducer.js

@@ -29,6 +29,10 @@ export function focusedPathReducer(state, action) {
             {
                 return [];
             }
+        case 'set_focus':
+            {
+                return action.value;
+            }
         case 'set_initial_focus':
             {
                 return [
@@ -49,6 +53,9 @@ export function focusedPathReducer(state, action) {
             }
         case 'return_prev_focus':
             {
+                if (state.length === 1) {
+                    return state;
+                }
                 return state.slice(0, -1);
             }
         default:

package/emotion/es/components/Combobox/ComboboxNew/reducers/index.js

@@ -1,2 +1,3 @@
 export * from "./pathReducer";
 export * from "./focusedPathReducer";
+export * from "./treePathReducer";