@salutejs/plasma-new-hope 0.339.1-canary.2315.19231744336.0 → 0.340.0-canary.2254.19262020278.0

package/styled-components/es/components/DateTimePicker/ui/index.js

@@ -0,0 +1,6 @@
+export * from "./Input/Input";
+export * from "./CalendarGrid/CalendarGrid";
+export * from "./TimeGrid/TimeGrid";
+export * from "./Popover/Popover";
+export * from "./DateShortcut/DateShortcutList";
+export { StyledSeparator } from "./Popover/Popover.styles";

package/styled-components/es/components/DateTimePicker/utils/getFormattedDateTime.js

@@ -0,0 +1,108 @@
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+import { needFullMonth } from "../../DatePicker/utils/dateHelper";
+import { getOriginalDateTime } from "./getOriginalDateTime";
+import { normalizeDateTime } from "./normalizeDateTime";
+export var getFormattedDateTime = function(param) {
+    var value = param.value, lang = param.lang, format = param.format, dateFormat = param.dateFormat, timeFormat = param.timeFormat, includeEdgeDates = param.includeEdgeDates, min = param.min, max = param.max;
+    var withFullMonth = needFullMonth(format || '');
+    var _getOriginalDateTime = getOriginalDateTime({
+        value: value,
+        lang: lang,
+        fullFormat: format,
+        dateFormat: dateFormat,
+        timeFormat: timeFormat,
+        needFullMonth: withFullMonth
+    }), formattedDate = _getOriginalDateTime.formattedDate, isoDate = _getOriginalDateTime.isoDate, originalDate = _getOriginalDateTime.originalDate, timeValue = _getOriginalDateTime.timeValue, dateValue = _getOriginalDateTime.dateValue;
+    if (!originalDate) {
+        var innerValue = format && (needFullMonth(format) ? formattedDate : formattedDate.slice(0, format.length));
+        var result = {
+            formattedDate: innerValue || '',
+            isoDate: isoDate,
+            originalDate: originalDate,
+            timeValue: timeValue,
+            dateValue: dateValue
+        };
+        if (dateValue && !timeValue) {
+            var _normalizeDateTime = normalizeDateTime({
+                originalDate: dateValue,
+                lang: lang,
+                format: dateFormat,
+                includeEdgeDates: includeEdgeDates,
+                min: min,
+                max: max
+            }), normalizedDate = _normalizeDateTime.normalizedDate, formattedNormalizedDate = _normalizeDateTime.formattedNormalizedDate;
+            var parsedNormalizedDate = formattedNormalizedDate + (innerValue === null || innerValue === void 0 ? void 0 : innerValue.slice(formattedNormalizedDate.length));
+            return _object_spread_props(_object_spread({}, result), {
+                formattedDate: parsedNormalizedDate,
+                dateValue: normalizedDate
+            });
+        }
+        return result;
+    }
+    var _normalizeDateTime1 = normalizeDateTime({
+        originalDate: originalDate,
+        lang: lang,
+        format: format,
+        includeEdgeDates: includeEdgeDates,
+        min: min,
+        max: max
+    }), normalizedDate1 = _normalizeDateTime1.normalizedDate, formattedNormalizedDate1 = _normalizeDateTime1.formattedNormalizedDate;
+    return {
+        formattedDate: formattedNormalizedDate1,
+        isoDate: normalizedDate1.toISOString(),
+        originalDate: normalizedDate1,
+        timeValue: normalizedDate1,
+        dateValue: normalizedDate1
+    };
+};

package/styled-components/es/components/DateTimePicker/utils/getMaskedValue.js

@@ -0,0 +1,42 @@
+export var getMaskedValue = function(param) {
+    var value = param.value, prevValue = param.prevValue, format = param.format, delimiters = param.delimiters, selectionStart = param.selectionStart;
+    if (!value) {
+        return {
+            formattedValue: '',
+            selectionStart: 0
+        };
+    }
+    if (!format || !(delimiters === null || delimiters === void 0 ? void 0 : delimiters.length)) {
+        return {
+            formattedValue: value,
+            selectionStart: selectionStart
+        };
+    }
+    var currentSelection = selectionStart || 0;
+    var dateRegExp = new RegExp("[^0-9".concat(delimiters.join(''), "]"), 'g');
+    var formattedValue = value.replace(dateRegExp, '');
+    if (formattedValue.length >= format.length) {
+        return {
+            formattedValue: formattedValue.slice(0, format.length),
+            selectionStart: selectionStart
+        };
+    }
+    if (prevValue && formattedValue.length < prevValue.length) {
+        if (delimiters.includes(format[currentSelection])) {
+            return {
+                formattedValue: formattedValue.slice(0, currentSelection - 1),
+                selectionStart: currentSelection - 1
+            };
+        }
+    }
+    if (delimiters.includes(format[currentSelection])) {
+        return {
+            formattedValue: formattedValue + format[currentSelection],
+            selectionStart: currentSelection + 1
+        };
+    }
+    return {
+        formattedValue: formattedValue,
+        selectionStart: currentSelection
+    };
+};

package/styled-components/es/components/DateTimePicker/utils/getOriginalDateTime.js

@@ -0,0 +1,118 @@
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+import { customDayjs } from "../../../utils/datejs";
+var initialValueStructure = {
+    isoDate: '',
+    originalDate: undefined,
+    dateValue: undefined,
+    timeValue: undefined,
+    formattedDate: ''
+};
+export var getOriginalDateTime = function(param) {
+    var value = param.value, lang = param.lang, fullFormat = param.fullFormat, dateFormat = param.dateFormat, timeFormat = param.timeFormat, needFullMonth = param.needFullMonth;
+    var _String;
+    if (!value || !lang || !fullFormat) {
+        return initialValueStructure;
+    }
+    customDayjs.locale(lang);
+    if (_instanceof(value, Date)) {
+        var currentDate = new Date(value);
+        return {
+            formattedDate: customDayjs(value).format(fullFormat),
+            isoDate: currentDate.toISOString(),
+            originalDate: currentDate,
+            dateValue: currentDate,
+            timeValue: currentDate
+        };
+    }
+    if (!needFullMonth && fullFormat.length !== ((_String = String(value)) === null || _String === void 0 ? void 0 : _String.length)) {
+        var baseValueStructure = _object_spread_props(_object_spread({}, initialValueStructure), {
+            formattedDate: value
+        });
+        var rawDate = value.slice(0, dateFormat === null || dateFormat === void 0 ? void 0 : dateFormat.length);
+        var rawTime = value.slice(((dateFormat === null || dateFormat === void 0 ? void 0 : dateFormat.length) || 0) + 1);
+        if (dateFormat && customDayjs(rawDate, dateFormat, true).isValid()) {
+            baseValueStructure = _object_spread_props(_object_spread({}, baseValueStructure), {
+                dateValue: customDayjs(rawDate, dateFormat).toDate()
+            });
+        }
+        if (timeFormat && customDayjs(rawTime, timeFormat, true).isValid()) {
+            baseValueStructure = _object_spread_props(_object_spread({}, baseValueStructure), {
+                timeValue: customDayjs(value, fullFormat).toDate()
+            });
+        }
+        return baseValueStructure;
+    }
+    if (customDayjs(value, fullFormat).isValid()) {
+        var isoDate = customDayjs(value, fullFormat).toISOString();
+        var originalDate = customDayjs(value, fullFormat).toDate();
+        var formattedDate = customDayjs(value, fullFormat).format(fullFormat);
+        return {
+            formattedDate: formattedDate,
+            isoDate: isoDate,
+            originalDate: originalDate,
+            dateValue: originalDate,
+            timeValue: originalDate
+        };
+    }
+    return _object_spread_props(_object_spread({}, initialValueStructure), {
+        formattedDate: value
+    });
+};

package/styled-components/es/components/DateTimePicker/utils/index.js

@@ -0,0 +1,2 @@
+export * from "./getFormattedDateTime";
+export * from "./normalizeDateTime";

package/styled-components/es/components/DateTimePicker/utils/normalizeDateTime.js

@@ -0,0 +1,20 @@
+import { customDayjs } from "../../../utils/datejs";
+export var normalizeDateTime = function(param) {
+    var originalDate = param.originalDate, lang = param.lang, format = param.format, includeEdgeDates = param.includeEdgeDates, min = param.min, max = param.max;
+    var dateCandidate = originalDate;
+    customDayjs.locale(lang);
+    if (min && includeEdgeDates && min > originalDate) {
+        dateCandidate = min;
+    } else if (min && !includeEdgeDates && min >= originalDate) {
+        dateCandidate = customDayjs(min).add(1, 's').toDate();
+    } else if (max && includeEdgeDates && max < originalDate) {
+        dateCandidate = max;
+    } else if (max && !includeEdgeDates && max <= originalDate) {
+        dateCandidate = customDayjs(max).subtract(1, 's').toDate();
+    }
+    var formattedDateCandidate = format ? customDayjs(dateCandidate).format(format) : dateCandidate.toString();
+    return {
+        normalizedDate: dateCandidate,
+        formattedNormalizedDate: formattedDateCandidate
+    };
+};

package/styled-components/es/components/DateTimePicker/variations/_disabled/base.js

@@ -0,0 +1,6 @@
+import { css } from "styled-components";
+import { tokens } from "../../DateTimePicker.tokens";
+export var base = css([
+    "&[disabled]{opacity:var(",
+    ");cursor:not-allowed;}"
+], tokens.disabledOpacity);

package/styled-components/es/components/DateTimePicker/variations/_readonly/base.js

@@ -0,0 +1,8 @@
+import { css } from "styled-components";
+import { tokens } from "../../DateTimePicker.tokens";
+import { LeftHelper } from "../../DateTimePicker.styles";
+export var base = css([
+    "&[readonly]{cursor:default;",
+    "{color:var(",
+    ");}}"
+], LeftHelper, tokens.leftHelperColorReadOnly);

package/styled-components/es/components/DateTimePicker/variations/_size/base.js

@@ -0,0 +1,14 @@
+import { css } from "styled-components";
+import { LeftHelper } from "../../DateTimePicker.styles";
+import { tokens } from "../../DateTimePicker.tokens";
+export var base = css([
+    "",
+    "{margin:var(",
+    ");font-family:var(",
+    ");font-size:var(",
+    ");font-style:var(",
+    ");font-weight:var(",
+    ");letter-spacing:var(",
+    ");line-height:var(",
+    ");}"
+], LeftHelper, tokens.leftHelperOffset, tokens.leftHelperFontFamily, tokens.leftHelperFontSize, tokens.leftHelperFontStyle, tokens.leftHelperFontWeight, tokens.leftHelperLetterSpacing, tokens.leftHelperLineHeight);

package/styled-components/es/components/DateTimePicker/variations/_tooltip-size/base.js

@@ -0,0 +1,4 @@
+import { css } from "styled-components";
+export var base = css([
+    ""
+]);

package/styled-components/es/components/DateTimePicker/variations/_view/base.js

@@ -0,0 +1,8 @@
+import { css } from "styled-components";
+import { LeftHelper } from "../../DateTimePicker.styles";
+import { tokens } from "../../DateTimePicker.tokens";
+export var base = css([
+    "",
+    "{color:var(",
+    ");}"
+], LeftHelper, tokens.leftHelperColor);

package/styled-components/es/components/Select/Select.js

@@ -414,7 +414,8 @@ import { Context } from "./Select.context";
             treePath: treePath,
             dispatchTreePath: dispatchTreePath,
             treeView: treeView,
-            valueToPathMap: valueToPathMap
+            valueToPathMap: valueToPathMap,
+            items: transformedItems
         }).onKeyDown;
         // В данном эффекте мы следим за изменениями value снаружи и вносим коррективы в дерево чекбоксов.
         // Пример: когда юзер очистил value извне, тогда нужно пройтись по элементам и выключить все чекбоксы.

package/styled-components/es/components/Select/hooks/useKeyboardNavigation.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 { keyExists } from "../reducers/treePathReducer";
 var JUMP_SIZE = 10;
 export var keys = {
@@ -21,8 +46,9 @@ 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, treePath = param.treePath, dispatchTreePath = param.dispatchTreePath, treeView = param.treeView, valueToPathMap = param.valueToPathMap;
+    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, treePath = param.treePath, dispatchTreePath = param.dispatchTreePath, treeView = param.treeView, valueToPathMap = param.valueToPathMap, items = param.items;
     if (treeView) {
         return keyboardNavigationTree({
             focusedPath: focusedPath,
@@ -36,7 +62,8 @@ export var useKeyNavigation = function(param) {
             treePath: treePath,
             dispatchTreePath: dispatchTreePath,
             treeView: treeView,
-            valueToPathMap: valueToPathMap
+            valueToPathMap: valueToPathMap,
+            items: items
         });
     }
     return keyboardNavigationDefault({
@@ -51,7 +78,8 @@ export var useKeyNavigation = function(param) {
         treePath: treePath,
         dispatchTreePath: dispatchTreePath,
         treeView: treeView,
-        valueToPathMap: valueToPathMap
+        valueToPathMap: valueToPathMap,
+        items: items
     });
 };
 var keyboardNavigationDefault = function(param) {
@@ -320,24 +348,85 @@ var keyboardNavigationDefault = function(param) {
     };
 };
 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, treePath = param.treePath, dispatchTreePath = param.dispatchTreePath, valueToPathMap = param.valueToPathMap;
+    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, treePath = param.treePath, dispatchTreePath = param.dispatchTreePath, valueToPathMap = param.valueToPathMap, items = param.items;
     var _currentItem_parent_items, _currentItem_parent;
-    var currentIndex = (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[focusedPath.length - 1]) || 0;
     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 (focusedPath.length) {
-                        if (currentIndex > 0) {
+                    /**
+                 * Если список открыт и фокус уже установлен на каком-либо элементе.
+                 * */ if (focusedPath.length) {
+                        /**
+                     * Если это не первый элемент, то нужно вначале найти элемент для фокуса.
+                     * Т.к. если верхний элемент раскрыт, то и перемещаться нужно не на него,
+                     * а на его самый нижний дочерний элемент.
+                     * */ if (currentIndex > 0) {
+                            var nextFocus = _to_consumable_array(focusedPath.slice(0, -1)).concat([
+                                currentIndex - 1
+                            ]);
+                            while(nextFocus){
+                                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.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: 'change_last_focus',
-                                value: currentIndex - 1
+                                type: 'set_focus',
+                                value: nextFocus
+                            });
+                        } else {
+                            /**
+                         * Если элемент первый, то нужно лишь подняться к его родителю.
+                         * */ dispatchFocusedPath({
+                                type: 'return_prev_focus'
                             });
                         }
                     } else {
-                        dispatchPath({
+                        /**
+                     * Если список закрыт, то нужно его открыть и установить фокус на первый элемент.
+                     * */ dispatchPath({
                             type: 'opened_first_level'
                         });
                         dispatchFocusedPath({
@@ -349,15 +438,61 @@ var keyboardNavigationTree = function(param) {
                 }
             case keys.ArrowDown:
                 {
-                    if (focusedPath.length) {
-                        if (currentIndex + 1 < currentLength) {
+                    /**
+                 * Если список открыт и фокус уже установлен на каком-либо элементе.
+                 * */ 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({
+                        /**
+                     * Если список закрыт, то нужно его открыть и установить фокус на первый элемент.
+                     * */ dispatchPath({
                             type: 'opened_first_level'
                         });
                         dispatchFocusedPath({
@@ -371,19 +506,10 @@ var keyboardNavigationTree = function(param) {
                 {
                     if (path[0]) {
                         if (focusedPath.length) {
-                            var isCurrentLevelOpened = keyExists(treePath, valueToPathMap.get((currentItem === null || currentItem === void 0 ? void 0 : currentItem.value.toString()) || '') || []);
-                            if (isCurrentLevelOpened) {
-                                dispatchTreePath({
-                                    type: 'toggled_level',
-                                    value: valueToPathMap.get((currentItem === null || currentItem === void 0 ? void 0 : currentItem.value.toString()) || '') || []
-                                });
-                            } else if (focusedPath.length === 1) {
-                                handleListToggle(false);
-                            } else {
-                                dispatchFocusedPath({
-                                    type: 'return_prev_focus'
-                                });
-                            }
+                            dispatchTreePath({
+                                type: 'close_level',
+                                value: valueToPathMap.get((currentItem === null || currentItem === void 0 ? void 0 : currentItem.value.toString()) || '') || []
+                            });
                         }
                     }
                     break;
@@ -391,26 +517,13 @@ var keyboardNavigationTree = function(param) {
             case keys.ArrowRight:
                 {
                     if (path[0]) {
-                        if (!focusedPath.length) {
+                        if (!focusedPath.length || (currentItem === null || currentItem === void 0 ? void 0 : currentItem.disabled) || (currentItem === null || currentItem === void 0 ? void 0 : currentItem.isDisabled) || !(currentItem === null || currentItem === void 0 ? void 0 : currentItem.items)) {
                             break;
                         }
-                        if ((currentItem === null || currentItem === void 0 ? void 0 : currentItem.disabled) || (currentItem === null || currentItem === void 0 ? void 0 : currentItem.isDisabled)) {
-                            break;
-                        }
-                        if (currentItem === null || currentItem === void 0 ? void 0 : currentItem.items) {
-                            var isCurrentLevelOpened1 = keyExists(treePath, valueToPathMap.get(currentItem.value.toString()) || []);
-                            if (isCurrentLevelOpened1) {
-                                dispatchFocusedPath({
-                                    type: 'add_focus',
-                                    value: 0
-                                });
-                            } else {
-                                dispatchTreePath({
-                                    type: 'toggled_level',
-                                    value: valueToPathMap.get(currentItem.value.toString()) || []
-                                });
-                            }
-                        }
+                        dispatchTreePath({
+                            type: 'open_level',
+                            value: valueToPathMap.get(currentItem.value.toString()) || []
+                        });
                     }
                     break;
                 }

package/styled-components/es/components/Select/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: