@salutejs/plasma-new-hope 0.336.0-canary.2218.17555761279.0 → 0.336.0-canary.2218.17560383957.0

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

@@ -267,6 +267,7 @@ var selectRoot = function(Root) {
         var activeDescendantItemValue = ((_getItemByFocused = (0, _useKeyboardNavigation.getItemByFocused)(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value.toString()) || '';
         var closeAfterSelect = outerCloseAfterSelect !== null && outerCloseAfterSelect !== void 0 ? outerCloseAfterSelect : !props.multiselect;
         var treeId = (0, _utils.safeUseId)();
+        var listWrapperRef = (0, _react.useRef)(null);
         var view = target === 'textfield-like' && (disabled || readOnly) ? 'default' : (0, _utils1.getView)(status, outerView);
         // Собираем объект с пропсами для required и прокидываем их напрямую в компонент Textfield.
         var requiredProps = props.target === 'button-like' ? undefined : {
@@ -553,12 +554,12 @@ var selectRoot = function(Root) {
             disabled: disabled,
             readOnly: readOnly
         }, rest), /*#__PURE__*/ _react.default.createElement(_Selectstyles.ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ _react.default.createElement(_Selectstyles.Ul, {
             role: "tree",
             id: "".concat(treeId, "_tree_level_1"),
             "aria-multiselectable": Boolean(props.multiselect),
-            listOverflow: listOverflow,
             listMaxHeight: listMaxHeight || listHeight,
             onScroll: virtual ? undefined : handleScroll,
             ref: targetRef,
@@ -579,7 +580,8 @@ var selectRoot = function(Root) {
                 path: path,
                 dispatchPath: dispatchPath,
                 index: index,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }), afterList))))));
     });

package/styled-components/cjs/components/Select/Select.styles.js

@@ -65,7 +65,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 var ListWrapper = _styledcomponents.default.div.withConfig({
     displayName: "Select.styles__ListWrapper",
-    componentId: "sc-30266665-0"
+    componentId: "sc-3f8cf8d4-0"
 })([
     "width:",
     ";padding:calc(var(",
@@ -82,10 +82,10 @@ var ListWrapper = _styledcomponents.default.div.withConfig({
 }, _Selecttokens.tokens.padding, _Selecttokens.tokens.dropdownBorderWidth, _Selecttokens.tokens.borderRadius, _Selecttokens.constants.background, _Selecttokens.constants.boxShadow, _Selecttokens.tokens.dropdownBorderWidth, _Selecttokens.tokens.dropdownBorderColor);
 var Ul = _styledcomponents.default.ul.withConfig({
     displayName: "Select.styles__Ul",
-    componentId: "sc-30266665-1"
+    componentId: "sc-3f8cf8d4-1"
 })([
     "max-height:",
-    ";overflow-y:",
+    ";overflow-x:hidden;overflow-y:",
     ";border-radius:calc(var(",
     ") - 0.125rem - var(",
     ",0rem));margin:0;padding:0;"
@@ -94,8 +94,8 @@ var Ul = _styledcomponents.default.ul.withConfig({
     return(// eslint-disable-next-line no-nested-ternary
     virtual ? 'auto' : listMaxHeight ? (0, _utils.getCorrectHeight)(listMaxHeight) : 'auto');
 }, function(param) {
-    var virtual = param.virtual, listOverflow = param.listOverflow;
-    return virtual ? 'visible' : listOverflow || 'visible';
+    var virtual = param.virtual;
+    return virtual ? 'visible' : 'auto';
 }, _Selecttokens.tokens.borderRadius, _Selecttokens.tokens.dropdownBorderWidth);
 var base = (0, _styledcomponents.css)([
     ""

package/styled-components/cjs/components/Select/hooks/useKeyboardNavigation.js

@@ -198,13 +198,9 @@ var useKeyNavigation = function(param) {
             case keys.Tab:
             case keys.Escape:
                 {
-                    dispatchFocusedPath({
-                        type: 'reset'
-                    });
-                    dispatchPath({
-                        type: 'reset'
-                    });
-                    handleListToggle(false);
+                    if (path[0]) {
+                        handleListToggle(false);
+                    }
                     break;
                 }
             case keys.Home:

package/styled-components/cjs/components/Select/ui/Inner/Inner.js

@@ -8,18 +8,54 @@ Object.defineProperty(exports, "Inner", {
         return Inner;
     }
 });
-var _react = /*#__PURE__*/ _interop_require_default(require("react"));
+var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _utils = require("../../../../utils");
 var _Selectstyles = require("../../Select.styles");
 var _FloatingPopover = require("../../FloatingPopover");
 var _Item = require("./ui/Item/Item");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
     };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
 }
 var Inner = function(param) {
-    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, listWidth = param.listWidth;
+    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, listWidth = param.listWidth, portal = param.portal;
     var handleToggle = function(opened) {
         if (opened) {
             dispatchPath({
@@ -34,6 +70,7 @@ var Inner = function(param) {
             });
         }
     };
+    var listWrapperRef = (0, _react.useRef)(null);
     var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
     var treeId = (0, _utils.safeUseId)();
     var listId = "".concat(treeId, "_tree_level_").concat(currentLevel + 2);
@@ -54,13 +91,16 @@ var Inner = function(param) {
                 ariaLevel: nextLevel,
                 ariaLabel: item.label
             }),
-            isInner: true
+            isInner: true,
+            portal: portal
         }, /*#__PURE__*/ _react.default.createElement(_Selectstyles.ListWrapper, {
-            listWidth: listWidth
+            listWidth: listWidth,
+            ref: listWrapperRef
         }, /*#__PURE__*/ _react.default.createElement(_Selectstyles.Ul, {
             role: "group",
             id: listId,
-            virtual: false
+            virtual: false,
+            listMaxHeight: item === null || item === void 0 ? void 0 : item.listMaxHeight
         }, (_item_items = item.items) === null || _item_items === void 0 ? void 0 : _item_items.map(function(innerItem, innerIndex) {
             return /*#__PURE__*/ _react.default.createElement(Inner, {
                 key: "".concat(innerIndex, "/").concat(currentLevel),
@@ -69,7 +109,8 @@ var Inner = function(param) {
                 path: path,
                 dispatchPath: dispatchPath,
                 index: innerIndex,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }))));
     }

package/styled-components/es/components/Combobox/ComboboxNew/Combobox.js

@@ -225,6 +225,7 @@ import { Context } from "./Combobox.context";
         var floatingPopoverRef = useRef(null);
         var inputForkRef = useForkRef(inputRef, ref);
         var treeId = safeUseId();
+        var listWrapperRef = useRef(null);
         var filteredItems = useMemo(function() {
             return filterItems(transformedItems, textValue, getTextValue(multiple, value, valueToItemMap, renderValue), filter);
         }, [
@@ -285,22 +286,10 @@ import { Context } from "./Combobox.context";
                 setInternalValue(newValue);
             }
         };
-        var handleClickArrow = function() {
-            if (disabled || readOnly) {
-                return;
-            }
-            if (isCurrentListOpen) {
-                dispatchPath({
-                    type: 'reset'
-                });
-            } else {
-                dispatchPath({
-                    type: 'opened_first_level'
-                });
-            }
-            dispatchFocusedPath({
-                type: 'reset'
-            });
+        var handleClickArrow = function(e) {
+            handleListToggle(!isCurrentListOpen);
+            // При клике на иконку закрытия фокус не должен становиться в инпут.
+            e.stopPropagation();
         };
         // Обработчик изменения значения в инпуте
         var handleTextValueChange = function(e) {
@@ -437,6 +426,12 @@ import { Context } from "./Combobox.context";
                 onChange(isCurrentChecked ? '' : item.value, item);
             }
         };
+        // Обработчик клика на таргет
+        var handleTargetClick = function() {
+            if (!isCurrentListOpen) {
+                handleListToggle(true);
+            }
+        };
         var getChips = function() {
             if (multiple && Array.isArray(value)) {
                 if (value.length === 0) return [];
@@ -569,13 +564,14 @@ import { Context } from "./Combobox.context";
         }, /*#__PURE__*/ React.createElement(FloatingPopover, {
             ref: floatingPopoverRef,
             opened: isCurrentListOpen,
-            onToggle: handleListToggle,
             placement: placement,
             portal: portal,
             listWidth: listWidth,
             offset: _offset,
             target: function(referenceRef) {
-                return /*#__PURE__*/ React.createElement(StyledTextField, _object_spread_props(_object_spread({
+                return /*#__PURE__*/ React.createElement("div", {
+                    onClick: handleTargetClick
+                }, /*#__PURE__*/ React.createElement(StyledTextField, _object_spread_props(_object_spread({
                     ref: name ? inputRef : inputForkRef,
                     inputWrapperRef: referenceRef,
                     value: textValue,
@@ -589,7 +585,8 @@ import { Context } from "./Combobox.context";
                     contentLeft: contentLeft,
                     contentRight: /*#__PURE__*/ React.createElement(IconArrowWrapper, {
                         disabled: disabled,
-                        onClick: handleClickArrow
+                        onClick: handleClickArrow,
+                        className: classes.comboboxTargetArrow
                     }, /*#__PURE__*/ React.createElement(StyledArrow, {
                         color: "inherit",
                         size: sizeToIconSize(size),
@@ -616,7 +613,7 @@ import { Context } from "./Combobox.context";
                     enumerationType: 'plain'
                 }, rest), {
                     _onEnterDisabled: true // Пропс для отключения обработчика Enter внутри Textfield
-                }));
+                })));
             },
             zIndex: zIndex,
             isInner: false
@@ -628,6 +625,7 @@ import { Context } from "./Combobox.context";
             readOnly: readOnly,
             name: name
         }, /*#__PURE__*/ React.createElement(ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
             role: "tree",
@@ -636,7 +634,6 @@ import { Context } from "./Combobox.context";
             listMaxHeight: listMaxHeight || listHeight,
             ref: targetRef,
             virtual: virtual,
-            listOverflow: listOverflow,
             onScroll: virtual ? undefined : onScroll
         }, beforeList, isEmpty(filteredItems) ? /*#__PURE__*/ React.createElement(StyledEmptyState, {
             className: classes.emptyStateWrapper,
@@ -658,7 +655,8 @@ import { Context } from "./Combobox.context";
                 path: path,
                 dispatchPath: dispatchPath,
                 index: index,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         })), afterList)))))));
     });

package/styled-components/es/components/Combobox/ComboboxNew/Combobox.styles.js

@@ -8,7 +8,7 @@ var mergedConfig = mergeConfig(emptyStateConfig);
 var EmptyState = component(mergedConfig);
 export var ListWrapper = styled.div.withConfig({
     displayName: "Combobox.styles__ListWrapper",
-    componentId: "sc-7fefedf8-0"
+    componentId: "sc-21c5f0bf-0"
 })([
     "width:",
     ";padding:calc(var(",
@@ -25,10 +25,10 @@ export var ListWrapper = styled.div.withConfig({
 }, tokens.padding, tokens.dropdownBorderWidth, tokens.borderRadius, constants.background, constants.boxShadow, tokens.dropdownBorderWidth, tokens.dropdownBorderColor);
 export var Ul = styled.ul.withConfig({
     displayName: "Combobox.styles__Ul",
-    componentId: "sc-7fefedf8-1"
+    componentId: "sc-21c5f0bf-1"
 })([
     "max-height:",
-    ";overflow-y:",
+    ";overflow-x:hidden;overflow-y:",
     ";border-radius:calc(var(",
     ") - 0.125rem - var(",
     ",0rem));margin:0;padding:0;.",
@@ -37,12 +37,12 @@ export var Ul = styled.ul.withConfig({
     var virtual = param.virtual, listMaxHeight = param.listMaxHeight;
     return virtual ? 'auto' : listMaxHeight || 'auto';
 }, function(param) {
-    var virtual = param.virtual, listOverflow = param.listOverflow;
-    return virtual ? 'visible' : listOverflow || 'visible';
+    var virtual = param.virtual;
+    return virtual ? 'visible' : 'auto';
 }, tokens.borderRadius, tokens.dropdownBorderWidth, classes.emptyStateWrapper);
 export var IconArrowWrapper = styled.div.withConfig({
     displayName: "Combobox.styles__IconArrowWrapper",
-    componentId: "sc-7fefedf8-2"
+    componentId: "sc-21c5f0bf-2"
 })([
     "line-height:0;color:var(",
     ");cursor:",
@@ -63,7 +63,7 @@ export var sizeMap = {
 };
 export var StyledArrow = styled(IconDisclosureDownCentered).withConfig({
     displayName: "Combobox.styles__StyledArrow",
-    componentId: "sc-7fefedf8-3"
+    componentId: "sc-21c5f0bf-3"
 })([
     "width:",
     ";height:",
@@ -80,7 +80,7 @@ export var base = css([
 ]);
 export var StyledEmptyState = styled(EmptyState).withConfig({
     displayName: "Combobox.styles__StyledEmptyState",
-    componentId: "sc-7fefedf8-4"
+    componentId: "sc-21c5f0bf-4"
 })([
     "",
     ":var(",
@@ -102,7 +102,7 @@ export var StyledEmptyState = styled(EmptyState).withConfig({
 ], emptyStateTokens.borderRadius, tokens.textFieldBorderRadius, emptyStateTokens.padding, tokens.emptyStatePadding, emptyStateTokens.fontFamily, tokens.textFieldFontFamily, emptyStateTokens.fontSize, tokens.textFieldFontSize, emptyStateTokens.fontStyle, tokens.textFieldFontStyle, emptyStateTokens.fontWeight, tokens.textFieldFontWeight, emptyStateTokens.fontLetterSpacing, tokens.textFieldLetterSpacing, emptyStateTokens.fontLineHeight, tokens.textFieldLineHeight);
 export var StyledLeftHelper = styled.span.withConfig({
     displayName: "Combobox.styles__StyledLeftHelper",
-    componentId: "sc-7fefedf8-5"
+    componentId: "sc-21c5f0bf-5"
 })([
     "margin:0;padding:0;"
 ]);

package/styled-components/es/components/Combobox/ComboboxNew/Combobox.tokens.js

@@ -2,7 +2,7 @@ export var classes = {
     dropdownItemIsFocused: 'dropdown-item-is-focused',
     dropdownItemIsDisabled: 'dropdown-item-is-disabled',
     dropdownItemIsActive: 'dropdown-item-is-active',
-    selectTargetArrow: 'combobox-target-arrow',
+    comboboxTargetArrow: 'combobox-target-arrow',
     arrowInverse: 'arrow-inverse',
     textfieldTarget: 'combobox-textfield-target',
     selectChipIsFocused: 'combobox-chip-is-focused',

package/styled-components/es/components/Combobox/ComboboxNew/hooks/useKeyboardNavigation.js

@@ -159,13 +159,9 @@ export var useKeyNavigation = function(param) {
             case keys.Tab:
             case keys.Escape:
                 {
-                    dispatchPath({
-                        type: 'reset'
-                    });
-                    dispatchFocusedPath({
-                        type: 'reset'
-                    });
-                    handleListToggle(false);
+                    if (path[0]) {
+                        handleListToggle(false);
+                    }
                     if (multiple) {
                         setTextValue('');
                     } else if (textValue !== value) {

package/styled-components/es/components/Combobox/ComboboxNew/ui/Inner/Inner.js

@@ -1,11 +1,11 @@
-import React from "react";
+import React, { useRef } from "react";
 import { safeUseId } from "../../../../../utils";
 import { FloatingPopover } from "../../FloatingPopover";
 import { isEmpty } from "../../../../../utils";
 import { Ul, ListWrapper } from "../../Combobox.styles";
 import { Item } from "./ui";
 export var Inner = function(param) {
-    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, listWidth = param.listWidth;
+    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, listWidth = param.listWidth, portal = param.portal;
     var handleToggle = function(opened) {
         if (opened) {
             dispatchPath({
@@ -20,6 +20,7 @@ export var Inner = function(param) {
             });
         }
     };
+    var listWrapperRef = useRef(null);
     var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
     var treeId = safeUseId();
     var listId = "".concat(treeId, "_tree_level_").concat(currentLevel + 2);
@@ -40,13 +41,16 @@ export var Inner = function(param) {
                 ariaLevel: nextLevel,
                 ariaLabel: item.label
             }),
-            isInner: true
+            isInner: true,
+            portal: portal
         }, /*#__PURE__*/ React.createElement(ListWrapper, {
-            listWidth: listWidth
+            listWidth: listWidth,
+            ref: listWrapperRef
         }, /*#__PURE__*/ React.createElement(Ul, {
             role: "group",
             id: listId,
-            virtual: false
+            virtual: false,
+            listMaxHeight: item === null || item === void 0 ? void 0 : item.listMaxHeight
         }, (_item_items = item.items) === null || _item_items === void 0 ? void 0 : _item_items.map(function(innerItem, innerIndex) {
             return /*#__PURE__*/ React.createElement(Inner, {
                 key: "".concat(innerIndex, "/").concat(currentLevel),
@@ -55,7 +59,8 @@ export var Inner = function(param) {
                 path: path,
                 dispatchPath: dispatchPath,
                 index: innerIndex,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }))));
     }

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

@@ -119,7 +119,7 @@ import { Context } from "./Dropdown.context";
  * Выпадающий список.
  */ export var dropdownRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(_param, ref) {
-        var items = _param.items, children = _param.children, placement = _param.placement, offset = _param.offset, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, onToggle = _param.onToggle, size = _param.size, view = _param.view, _param_itemRole = _param.itemRole, itemRole = _param_itemRole === void 0 ? 'treeitem' : _param_itemRole, className = _param.className, listMaxHeight = _param.listMaxHeight, listWidth = _param.listWidth, listHeight = _param.listHeight, listOverflow = _param.listOverflow, _param_closeOnSelect = _param.closeOnSelect, closeOnSelect = _param_closeOnSelect === void 0 ? true : _param_closeOnSelect, onHover = _param.onHover, onItemSelect = _param.onItemSelect, onItemClick = _param.onItemClick, _param_trigger = _param.trigger, trigger = _param_trigger === void 0 ? 'click' : _param_trigger, _param_openByRightClick = _param.openByRightClick, openByRightClick = _param_openByRightClick === void 0 ? false : _param_openByRightClick, _param_variant = _param.variant, variant = _param_variant === void 0 ? 'normal' : _param_variant, _param_hasArrow = _param.hasArrow, hasArrow = _param_hasArrow === void 0 ? true : _param_hasArrow, _param_alwaysOpened = _param.alwaysOpened, alwaysOpened = _param_alwaysOpened === void 0 ? false : _param_alwaysOpened, portal = _param.portal, renderItem = _param.renderItem, zIndex = _param.zIndex, beforeList = _param.beforeList, afterList = _param.afterList, rest = _object_without_properties(_param, [
+        var items = _param.items, children = _param.children, placement = _param.placement, offset = _param.offset, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, onToggle = _param.onToggle, size = _param.size, view = _param.view, _param_itemRole = _param.itemRole, itemRole = _param_itemRole === void 0 ? 'treeitem' : _param_itemRole, className = _param.className, listMaxHeight = _param.listMaxHeight, listWidth = _param.listWidth, listHeight = _param.listHeight, _param_closeOnSelect = _param.closeOnSelect, closeOnSelect = _param_closeOnSelect === void 0 ? true : _param_closeOnSelect, onHover = _param.onHover, onItemSelect = _param.onItemSelect, onItemClick = _param.onItemClick, _param_trigger = _param.trigger, trigger = _param_trigger === void 0 ? 'click' : _param_trigger, _param_openByRightClick = _param.openByRightClick, openByRightClick = _param_openByRightClick === void 0 ? false : _param_openByRightClick, _param_variant = _param.variant, variant = _param_variant === void 0 ? 'normal' : _param_variant, _param_hasArrow = _param.hasArrow, hasArrow = _param_hasArrow === void 0 ? true : _param_hasArrow, _param_alwaysOpened = _param.alwaysOpened, alwaysOpened = _param_alwaysOpened === void 0 ? false : _param_alwaysOpened, portal = _param.portal, renderItem = _param.renderItem, zIndex = _param.zIndex, beforeList = _param.beforeList, afterList = _param.afterList, rest = _object_without_properties(_param, [
             "items",
             "children",
             "placement",
@@ -133,7 +133,6 @@ import { Context } from "./Dropdown.context";
             "listMaxHeight",
             "listWidth",
             "listHeight",
-            "listOverflow",
             "closeOnSelect",
             "onHover",
             "onItemSelect",
@@ -159,6 +158,7 @@ import { Context } from "./Dropdown.context";
         var _useHashMaps = _sliced_to_array(useHashMaps(items), 2), pathMap = _useHashMaps[0], focusedToValueMap = _useHashMaps[1];
         var activeDescendantItemValue = ((_getItemByFocused = getItemByFocused(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value) || '';
         var floatingPopoverRef = useRef(null);
+        var listWrapperRef = useRef(null);
         var treeId = safeUseId();
         // Логика работы при клике за пределами выпадающего списка
         var targetRef = useOutsideClick(function(event) {
@@ -252,17 +252,14 @@ import { Context } from "./Dropdown.context";
             className: cx(className, classes.dropdownRoot),
             ref: ref,
             view: view,
-            size: size,
-            style: {
-                display: 'inline-block'
-            }
+            size: size
         }, rest), /*#__PURE__*/ React.createElement(ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
             ref: targetRef,
             id: "".concat(treeId, "_tree_level_1"),
             role: "tree",
-            listOverflow: listOverflow,
             listMaxHeight: listMaxHeight || listHeight
         }, beforeList, items.map(function(item, index) {
             return /*#__PURE__*/ React.createElement(DropdownInner, {
@@ -273,9 +270,8 @@ import { Context } from "./Dropdown.context";
                 path: path,
                 dispatchPath: dispatchPath,
                 index: index,
-                listOverflow: listOverflow,
-                listMaxHeight: listMaxHeight || listHeight,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }), afterList)))));
     });

package/styled-components/es/components/Dropdown/Dropdown.styles.js

@@ -4,7 +4,7 @@ import { getCorrectHeight } from "./utils";
 import { tokens, constants } from "./Dropdown.tokens";
 export var ListWrapper = styled.div.withConfig({
     displayName: "Dropdown.styles__ListWrapper",
-    componentId: "sc-eabc61b1-0"
+    componentId: "sc-768e302d-0"
 })([
     "width:",
     ";padding:calc(var(",
@@ -21,19 +21,15 @@ export var ListWrapper = styled.div.withConfig({
 }, tokens.padding, tokens.borderWidth, tokens.borderRadius, constants.background, constants.boxShadow, tokens.borderWidth, tokens.borderColor);
 export var Ul = styled.ul.withConfig({
     displayName: "Dropdown.styles__Ul",
-    componentId: "sc-eabc61b1-1"
+    componentId: "sc-768e302d-1"
 })([
     "max-height:",
-    ";overflow-y:",
-    ";border-radius:calc(var(",
+    ";overflow-x:hidden;overflow-y:auto;border-radius:calc(var(",
     ") - 0.125rem - var(",
     ",0rem));margin:0;padding:0;"
 ], function(param) {
     var listMaxHeight = param.listMaxHeight;
     return listMaxHeight ? getCorrectHeight(listMaxHeight) : 'auto';
-}, function(param) {
-    var listOverflow = param.listOverflow;
-    return listOverflow || 'visible';
 }, tokens.borderRadius, tokens.borderWidth);
 export var base = css([
     ""

package/styled-components/es/components/Dropdown/FloatingPopover.js

@@ -96,10 +96,10 @@ var FloatingPopover = /*#__PURE__*/ forwardRef(function(param, ref) {
         stickIfOpen: false,
         ignoreMouse: trigger === 'hover'
     });
-    var _useInteractions = useInteractions([
+    var getReferenceProps = useInteractions([
         hover,
         click
-    ]), getReferenceProps = _useInteractions.getReferenceProps, getFloatingProps = _useInteractions.getFloatingProps;
+    ]).getReferenceProps;
     return /*#__PURE__*/ React.createElement("div", {
         ref: ref,
         id: wrappedId,
@@ -109,12 +109,12 @@ var FloatingPopover = /*#__PURE__*/ forwardRef(function(param, ref) {
         }
     }, /*#__PURE__*/ React.createElement("div", _object_spread({
         ref: refs.setReference
-    }, getReferenceProps()), target), opened && /*#__PURE__*/ React.createElement(FloatingPortal, getFloatingPortalProps(portal, wrappedId), /*#__PURE__*/ React.createElement("div", _object_spread({
+    }, getReferenceProps()), target), opened && /*#__PURE__*/ React.createElement(FloatingPortal, getFloatingPortalProps(portal, wrappedId), /*#__PURE__*/ React.createElement("div", {
         ref: refs.setFloating,
         style: _object_spread_props(_object_spread({}, floatingStyles), {
             zIndex: zIndex || 1000
         })
-    }, getFloatingProps()), children)));
+    }, children)));
 });
 // root - принимает ref контейнера портала.
 // id - если есть портал - не используется, если портала нет - подставляется 'wrappedId'.

package/styled-components/es/components/Dropdown/hooks/useKeyboardNavigation.js

@@ -162,13 +162,9 @@ export var useKeyNavigation = function(param) {
             case keys.Tab:
             case keys.Escape:
                 {
-                    dispatchFocusedPath({
-                        type: 'reset'
-                    });
-                    dispatchPath({
-                        type: 'reset'
-                    });
-                    handleGlobalToggle(false, event);
+                    if (path[0]) {
+                        handleGlobalToggle(false, event);
+                    }
                     break;
                 }
             case keys.Home:

package/styled-components/es/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -1,11 +1,11 @@
-import React from "react";
+import React, { useRef } from "react";
 import { safeUseId } from "../../../../utils";
 import { DropdownItem } from "../DropdownItem/DropdownItem";
 import { Ul, ListWrapper } from "../../Dropdown.styles";
 import { FloatingPopover } from "../../FloatingPopover";
 import { getPlacement } from "../../utils";
 var DropdownInner = function(param) {
-    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, trigger = param.trigger, listMaxHeight = param.listMaxHeight, listOverflow = param.listOverflow, listWidth = param.listWidth;
+    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, trigger = param.trigger, listWidth = param.listWidth, portal = param.portal;
     var handleToggle = function(opened) {
         if (opened) {
             dispatchPath({
@@ -20,6 +20,7 @@ var DropdownInner = function(param) {
             });
         }
     };
+    var listWrapperRef = useRef(null);
     var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
     var treeId = safeUseId();
     var listId = "".concat(treeId, "_tree_level_").concat(currentLevel + 2);
@@ -40,14 +41,15 @@ var DropdownInner = function(param) {
                 ariaLevel: nextLevel,
                 ariaLabel: item.label
             }),
-            isInner: true
+            isInner: true,
+            portal: portal
         }, /*#__PURE__*/ React.createElement(ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
             id: listId,
             role: "group",
-            listMaxHeight: listMaxHeight,
-            listOverflow: listOverflow
+            listMaxHeight: item.listMaxHeight
         }, item.items.map(function(innerItem, innerIndex) {
             return /*#__PURE__*/ React.createElement(DropdownInner, {
                 key: "".concat(innerIndex, "/").concat(currentLevel),
@@ -57,9 +59,8 @@ var DropdownInner = function(param) {
                 dispatchPath: dispatchPath,
                 index: innerIndex,
                 trigger: trigger,
-                listMaxHeight: listMaxHeight,
-                listOverflow: listOverflow,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }))));
     }

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

@@ -210,6 +210,7 @@ import { Context } from "./Select.context";
         var activeDescendantItemValue = ((_getItemByFocused = getItemByFocused(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value.toString()) || '';
         var closeAfterSelect = outerCloseAfterSelect !== null && outerCloseAfterSelect !== void 0 ? outerCloseAfterSelect : !props.multiselect;
         var treeId = safeUseId();
+        var listWrapperRef = useRef(null);
         var view = target === 'textfield-like' && (disabled || readOnly) ? 'default' : getView(status, outerView);
         // Собираем объект с пропсами для required и прокидываем их напрямую в компонент Textfield.
         var requiredProps = props.target === 'button-like' ? undefined : {
@@ -496,12 +497,12 @@ import { Context } from "./Select.context";
             disabled: disabled,
             readOnly: readOnly
         }, rest), /*#__PURE__*/ React.createElement(ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
             role: "tree",
             id: "".concat(treeId, "_tree_level_1"),
             "aria-multiselectable": Boolean(props.multiselect),
-            listOverflow: listOverflow,
             listMaxHeight: listMaxHeight || listHeight,
             onScroll: virtual ? undefined : handleScroll,
             ref: targetRef,
@@ -522,7 +523,8 @@ import { Context } from "./Select.context";
                 path: path,
                 dispatchPath: dispatchPath,
                 index: index,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }), afterList))))));
     });