@salutejs/plasma-new-hope 0.340.0-canary.2324.19228888741.0 → 0.340.0-canary.2325.19236948330.0

package/emotion/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/emotion/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:

package/emotion/es/components/Select/reducers/treePathReducer.js

@@ -73,6 +73,18 @@ export function treePathReducer(state, action) {
                 }
                 return stateCopy;
             }
+        case 'open_level':
+            {
+                var stateCopy1 = deepCopy(state);
+                createObjectAtPath(stateCopy1, action.value);
+                return stateCopy1;
+            }
+        case 'close_level':
+            {
+                var stateCopy2 = deepCopy(state);
+                removeObjectAtPath(stateCopy2, action.value);
+                return stateCopy2;
+            }
         default:
             {
                 return state;

package/emotion/es/components/Select/ui/Target/ui/Textfield/Textfield.js

@@ -115,11 +115,14 @@ export var Textfield = /*#__PURE__*/ forwardRef(function(param, ref) {
             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
+            });
         }
     };
     var helperTextStopPropagation = function(event) {

package/emotion/es/components/Select/ui/TreeList/TreeList.js

@@ -20,8 +20,10 @@ export var TreeList = function(param) {
     }, beforeList, items === null || items === void 0 ? void 0 : items.map(function(item, index) {
         return /*#__PURE__*/ React.createElement(Item, {
             key: index,
-            index: index,
-            item: item
+            item: item,
+            pathToItem: [
+                index
+            ]
         });
     }), afterList));
 };
@@ -69,7 +71,9 @@ var VirtualTreeList = function(param) {
             ref: virtualizer.measureElement
         }, /*#__PURE__*/ React.createElement(Item, {
             item: items[virtualRow.index],
-            index: virtualRow.index
+            pathToItem: [
+                virtualRow.index
+            ]
         }));
     })))), afterList);
 };

package/emotion/es/components/Select/ui/TreeList/ui/Item/Item.js

@@ -1,11 +1,38 @@
-import React, { useContext } from "react";
+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 React, { useContext, useRef } from "react";
 import { classes } from "../../../../Select.tokens";
 import { sizeToIconSize } from "../../../../utils";
+import { isArraysEqual, cx } from "../../../../../../utils";
+import { useDidMountEffect } from "../../../../../../hooks";
 import { keyExists } from "../../../../reducers/treePathReducer";
 import { Context } from "../../../../Select.context";
 import { ItemWrapper, ChildItems, Offset, IconWrapper, StyledCheckboxWrapper, StyledCheckbox, StyledIndicator, StyledIconDone, StyledText, StyledWrapper, StyledCell, DisclosureIconWrapper, StyledArrowRight, Wrapper, StyledArrowLeft } from "./Item.styles";
 export var Item = function(param) {
-    var item = param.item, index = param.index;
+    var item = param.item, pathToItem = param.pathToItem;
     var _valueToPathMap_get, _item_items;
     var label = item.label, value = item.value, disabled = item.disabled, isDisabled = item.isDisabled, contentLeft = item.contentLeft, contentRight = item.contentRight;
     var isLeaf = !(item === null || item === void 0 ? void 0 : item.items);
@@ -13,11 +40,14 @@ export var Item = function(param) {
     // @ts-ignore
     _checkboxAppearance = _useContext._checkboxAppearance, focusedPath = _useContext.focusedPath, treePath = _useContext.treePath, dispatchTreePath = _useContext.dispatchTreePath, arrowPlacement = _useContext.arrowPlacement, handleItemClick = _useContext.handleItemClick, handleCheckboxChange = _useContext.handleCheckboxChange, valueToPathMap = _useContext.valueToPathMap;
     var itemDisabled = Boolean(disabled || isDisabled);
+    var disabledClassName = itemDisabled ? classes.dropdownItemIsDisabled : undefined;
+    var ref = useRef(null);
     var currentItemDepth = (((_valueToPathMap_get = valueToPathMap.get(item.value.toString())) === null || _valueToPathMap_get === void 0 ? void 0 : _valueToPathMap_get.length) || 0) - 1;
     var isCurrentLevelOpened = keyExists(treePath, valueToPathMap.get(value.toString()) || []);
     var withArrowInverse = isCurrentLevelOpened ? classes.arrowInverse : undefined;
-    var focusedClass = currentItemDepth === focusedPath.length - 1 && index === (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[currentItemDepth]) ? classes.dropdownItemIsFocused : undefined;
+    var focusedClass = isArraysEqual(pathToItem, focusedPath) ? classes.dropdownItemIsFocused : undefined;
     var handleClick = function(e) {
+        if (itemDisabled) return;
         if (!isLeaf) {
             dispatchTreePath({
                 type: 'toggled_level',
@@ -33,8 +63,20 @@ export var Item = function(param) {
         e.stopPropagation();
         handleCheckboxChange(item);
     };
+    useDidMountEffect(function() {
+        if (focusedClass && (ref === null || ref === void 0 ? void 0 : ref.current)) {
+            ref.current.scrollIntoView({
+                behavior: 'smooth',
+                block: 'center',
+                inline: 'center'
+            });
+        }
+    }, [
+        focusedClass
+    ]);
     return /*#__PURE__*/ React.createElement(ItemWrapper, null, /*#__PURE__*/ React.createElement(Wrapper, {
-        className: focusedClass,
+        ref: ref,
+        className: cx(focusedClass, disabledClassName),
         onClick: handleClick,
         variant: variant,
         role: "treeitem"
@@ -92,8 +134,10 @@ export var Item = function(param) {
     }))), !isLeaf && isCurrentLevelOpened && /*#__PURE__*/ React.createElement(ChildItems, null, (_item_items = item.items) === null || _item_items === void 0 ? void 0 : _item_items.map(function(item, index) {
         return /*#__PURE__*/ React.createElement(Item, {
             item: item,
-            index: index,
-            key: index
+            key: item.value,
+            pathToItem: _to_consumable_array(pathToItem).concat([
+                index
+            ])
         });
     })));
 };