@salutejs/plasma-new-hope 0.336.0-canary.2214.17542835950.0 → 0.336.0-canary.2214.17668000726.0

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

@@ -218,7 +218,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 var comboboxRoot = function(Root) {
     return /*#__PURE__*/ (0, _react.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, // @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_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, // @ts-ignore
         _offset = props._offset, rest = _object_without_properties(props, [
             "name",
             "multiple",
@@ -262,6 +262,7 @@ var comboboxRoot = function(Root) {
             "onChangeValue",
             "onScroll",
             "onToggle",
+            "mode",
             "_offset"
         ]);
         var transformedItems = (0, _react.useMemo)(function() {
@@ -282,6 +283,7 @@ var comboboxRoot = function(Root) {
         var floatingPopoverRef = (0, _react.useRef)(null);
         var inputForkRef = (0, _plasmacore.useForkRef)(inputRef, ref);
         var treeId = (0, _utils.safeUseId)();
+        var listWrapperRef = (0, _react.useRef)(null);
         var filteredItems = (0, _react.useMemo)(function() {
             return (0, _utils2.filterItems)(transformedItems, textValue, (0, _utils2.getTextValue)(multiple, value, valueToItemMap, renderValue), filter);
         }, [
@@ -342,22 +344,10 @@ var comboboxRoot = function(Root) {
                 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) {
@@ -490,10 +480,20 @@ var comboboxRoot = function(Root) {
                     type: 'reset'
                 });
             }
+            // Закрываем список, если элемент уже выбран.
+            if (mode === 'radio' && isCurrentChecked) {
+                return;
+            }
             if (onChange) {
                 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 [];
@@ -626,13 +626,14 @@ var comboboxRoot = function(Root) {
         }, /*#__PURE__*/ _react.default.createElement(_FloatingPopover.FloatingPopover, {
             ref: floatingPopoverRef,
             opened: isCurrentListOpen,
-            onToggle: handleListToggle,
             placement: placement,
             portal: portal,
             listWidth: listWidth,
             offset: _offset,
             target: function(referenceRef) {
-                return /*#__PURE__*/ _react.default.createElement(_ui.StyledTextField, _object_spread_props(_object_spread({
+                return /*#__PURE__*/ _react.default.createElement("div", {
+                    onClick: handleTargetClick
+                }, /*#__PURE__*/ _react.default.createElement(_ui.StyledTextField, _object_spread_props(_object_spread({
                     ref: name ? inputRef : inputForkRef,
                     inputWrapperRef: referenceRef,
                     value: textValue,
@@ -646,7 +647,8 @@ var comboboxRoot = function(Root) {
                     contentLeft: contentLeft,
                     contentRight: /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.IconArrowWrapper, {
                         disabled: disabled,
-                        onClick: handleClickArrow
+                        onClick: handleClickArrow,
+                        className: _Comboboxtokens.classes.comboboxTargetArrow
                     }, /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.StyledArrow, {
                         color: "inherit",
                         size: (0, _utils1.sizeToIconSize)(size),
@@ -673,7 +675,7 @@ var comboboxRoot = function(Root) {
                     enumerationType: 'plain'
                 }, rest), {
                     _onEnterDisabled: true // Пропс для отключения обработчика Enter внутри Textfield
-                }));
+                })));
             },
             zIndex: zIndex,
             isInner: false
@@ -685,6 +687,7 @@ var comboboxRoot = function(Root) {
             readOnly: readOnly,
             name: name
         }, /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.Ul, {
             role: "tree",
@@ -693,7 +696,6 @@ var comboboxRoot = function(Root) {
             listMaxHeight: listMaxHeight || listHeight,
             ref: targetRef,
             virtual: virtual,
-            listOverflow: listOverflow,
             onScroll: virtual ? undefined : onScroll
         }, beforeList, (0, _utils.isEmpty)(filteredItems) ? /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.StyledEmptyState, {
             className: _Comboboxtokens.classes.emptyStateWrapper,
@@ -715,7 +717,8 @@ var comboboxRoot = function(Root) {
                 path: path,
                 dispatchPath: dispatchPath,
                 index: index,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         })), afterList)))))));
     });

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

@@ -84,7 +84,7 @@ var mergedConfig = (0, _engines.mergeConfig)(_EmptyState.emptyStateConfig);
 var EmptyState = (0, _engines.component)(mergedConfig);
 var ListWrapper = _styledcomponents.default.div.withConfig({
     displayName: "Combobox.styles__ListWrapper",
-    componentId: "sc-7fefedf8-0"
+    componentId: "sc-21c5f0bf-0"
 })([
     "width:",
     ";padding:calc(var(",
@@ -101,10 +101,10 @@ var ListWrapper = _styledcomponents.default.div.withConfig({
 }, _Comboboxtokens.tokens.padding, _Comboboxtokens.tokens.dropdownBorderWidth, _Comboboxtokens.tokens.borderRadius, _Comboboxtokens.constants.background, _Comboboxtokens.constants.boxShadow, _Comboboxtokens.tokens.dropdownBorderWidth, _Comboboxtokens.tokens.dropdownBorderColor);
 var Ul = _styledcomponents.default.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;.",
@@ -113,12 +113,12 @@ var Ul = _styledcomponents.default.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';
 }, _Comboboxtokens.tokens.borderRadius, _Comboboxtokens.tokens.dropdownBorderWidth, _Comboboxtokens.classes.emptyStateWrapper);
 var IconArrowWrapper = _styledcomponents.default.div.withConfig({
     displayName: "Combobox.styles__IconArrowWrapper",
-    componentId: "sc-7fefedf8-2"
+    componentId: "sc-21c5f0bf-2"
 })([
     "line-height:0;color:var(",
     ");cursor:",
@@ -138,7 +138,7 @@ var sizeMap = {
 };
 var StyledArrow = (0, _styledcomponents.default)(_Icon.IconDisclosureDownCentered).withConfig({
     displayName: "Combobox.styles__StyledArrow",
-    componentId: "sc-7fefedf8-3"
+    componentId: "sc-21c5f0bf-3"
 })([
     "width:",
     ";height:",
@@ -155,7 +155,7 @@ var base = (0, _styledcomponents.css)([
 ]);
 var StyledEmptyState = (0, _styledcomponents.default)(EmptyState).withConfig({
     displayName: "Combobox.styles__StyledEmptyState",
-    componentId: "sc-7fefedf8-4"
+    componentId: "sc-21c5f0bf-4"
 })([
     "",
     ":var(",
@@ -177,7 +177,7 @@ var StyledEmptyState = (0, _styledcomponents.default)(EmptyState).withConfig({
 ], _EmptyState.emptyStateTokens.borderRadius, _Comboboxtokens.tokens.textFieldBorderRadius, _EmptyState.emptyStateTokens.padding, _Comboboxtokens.tokens.emptyStatePadding, _EmptyState.emptyStateTokens.fontFamily, _Comboboxtokens.tokens.textFieldFontFamily, _EmptyState.emptyStateTokens.fontSize, _Comboboxtokens.tokens.textFieldFontSize, _EmptyState.emptyStateTokens.fontStyle, _Comboboxtokens.tokens.textFieldFontStyle, _EmptyState.emptyStateTokens.fontWeight, _Comboboxtokens.tokens.textFieldFontWeight, _EmptyState.emptyStateTokens.fontLetterSpacing, _Comboboxtokens.tokens.textFieldLetterSpacing, _EmptyState.emptyStateTokens.fontLineHeight, _Comboboxtokens.tokens.textFieldLineHeight);
 var StyledLeftHelper = _styledcomponents.default.span.withConfig({
     displayName: "Combobox.styles__StyledLeftHelper",
-    componentId: "sc-7fefedf8-5"
+    componentId: "sc-21c5f0bf-5"
 })([
     "margin:0;padding:0;"
 ]);

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

@@ -23,7 +23,7 @@ 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/cjs/components/Combobox/ComboboxNew/hooks/useKeyboardNavigation.js

@@ -180,13 +180,9 @@ 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/cjs/components/Combobox/ComboboxNew/ui/Inner/Inner.js

@@ -8,19 +8,55 @@ 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 _FloatingPopover = require("../../FloatingPopover");
 var _utils1 = require("../../../../../utils");
 var _Comboboxstyles = require("../../Combobox.styles");
 var _ui = require("./ui");
-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({
@@ -35,6 +71,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);
@@ -55,13 +92,16 @@ var Inner = function(param) {
                 ariaLevel: nextLevel,
                 ariaLabel: item.label
             }),
-            isInner: true
+            isInner: true,
+            portal: portal
         }, /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.ListWrapper, {
-            listWidth: listWidth
+            listWidth: listWidth,
+            ref: listWrapperRef
         }, /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.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),
@@ -70,7 +110,8 @@ var Inner = function(param) {
                 path: path,
                 dispatchPath: dispatchPath,
                 index: innerIndex,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }))));
     }

package/styled-components/cjs/components/Drawer/hooks/useDrawer.js

@@ -97,6 +97,17 @@ var useDrawer = function(param) {
         isOpen,
         popupController.items
     ]);
+    // При анмаунте компонента нужно обновлять overflow у body.
+    (0, _react.useEffect)(function() {
+        return function() {
+            if (!_utils.canUseDOM) {
+                return;
+            }
+            if (!(0, _DrawerContext.hasDrawers)(Array.from(popupController.items.values()))) {
+                document.body.style.overflow = overflow.current;
+            }
+        };
+    }, []);
     var drawerInfo = _object_spread({
         id: id,
         info: {

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

@@ -176,7 +176,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 var dropdownRoot = function(Root) {
     return /*#__PURE__*/ (0, _react.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",
@@ -190,7 +190,6 @@ var dropdownRoot = function(Root) {
             "listMaxHeight",
             "listWidth",
             "listHeight",
-            "listOverflow",
             "closeOnSelect",
             "onHover",
             "onItemSelect",
@@ -216,6 +215,7 @@ var dropdownRoot = function(Root) {
         var _useHashMaps1 = _sliced_to_array((0, _useHashMaps.useHashMaps)(items), 2), pathMap = _useHashMaps1[0], focusedToValueMap = _useHashMaps1[1];
         var activeDescendantItemValue = ((_getItemByFocused = (0, _utils2.getItemByFocused)(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value) || '';
         var floatingPopoverRef = (0, _react.useRef)(null);
+        var listWrapperRef = (0, _react.useRef)(null);
         var treeId = (0, _utils.safeUseId)();
         // Логика работы при клике за пределами выпадающего списка
         var targetRef = (0, _hooks.useOutsideClick)(function(event) {
@@ -309,17 +309,14 @@ var dropdownRoot = function(Root) {
             className: (0, _utils1.cx)(className, _Dropdowntokens.classes.dropdownRoot),
             ref: ref,
             view: view,
-            size: size,
-            style: {
-                display: 'inline-block'
-            }
+            size: size
         }, rest), /*#__PURE__*/ _react.default.createElement(_Dropdownstyles.ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ _react.default.createElement(_Dropdownstyles.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.default.createElement(_ui.DropdownInner, {
@@ -330,9 +327,8 @@ var dropdownRoot = function(Root) {
                 path: path,
                 dispatchPath: dispatchPath,
                 index: index,
-                listOverflow: listOverflow,
-                listMaxHeight: listMaxHeight || listHeight,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }), afterList)))));
     });

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

@@ -65,7 +65,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 var ListWrapper = _styledcomponents.default.div.withConfig({
     displayName: "Dropdown.styles__ListWrapper",
-    componentId: "sc-eabc61b1-0"
+    componentId: "sc-768e302d-0"
 })([
     "width:",
     ";padding:calc(var(",
@@ -82,19 +82,15 @@ var ListWrapper = _styledcomponents.default.div.withConfig({
 }, _Dropdowntokens.tokens.padding, _Dropdowntokens.tokens.borderWidth, _Dropdowntokens.tokens.borderRadius, _Dropdowntokens.constants.background, _Dropdowntokens.constants.boxShadow, _Dropdowntokens.tokens.borderWidth, _Dropdowntokens.tokens.borderColor);
 var Ul = _styledcomponents.default.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 ? (0, _utils.getCorrectHeight)(listMaxHeight) : 'auto';
-}, function(param) {
-    var listOverflow = param.listOverflow;
-    return listOverflow || 'visible';
 }, _Dropdowntokens.tokens.borderRadius, _Dropdowntokens.tokens.borderWidth);
 var base = (0, _styledcomponents.css)([
     ""

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

@@ -24,13 +24,6 @@ function _define_property(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 _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -128,6 +121,7 @@ var FloatingPopover = /*#__PURE__*/ (0, _react1.forwardRef)(function(param, ref)
         },
         placement: placement === 'auto' ? undefined : placement,
         open: opened,
+        onOpenChange: onToggle,
         middleware: [
             placement === 'auto' && (0, _react.autoPlacement)(),
             (0, _react.offset)({
@@ -139,40 +133,26 @@ var FloatingPopover = /*#__PURE__*/ (0, _react1.forwardRef)(function(param, ref)
             }),
             (0, _react.shift)()
         ]
-    }), refs = _useFloating.refs, floatingStyles = _useFloating.floatingStyles;
+    }), refs = _useFloating.refs, floatingStyles = _useFloating.floatingStyles, context = _useFloating.context;
     var wrappedId = (0, _utils.safeUseId)();
-    var handleTargetClick = function(event) {
-        if (trigger === 'hover') {
-            return;
-        }
-        if (onToggle) {
-            onToggle(!opened, event);
-        }
-    };
-    var handleTargetMouseEnter = function(event) {
-        if (trigger === 'click' || opened) {
-            return;
-        }
-        onToggle(true, event);
-    };
-    var handleTargetMouseLeave = function(event) {
-        if (_instanceof(event.relatedTarget, HTMLElement) && _instanceof(refs.floating.current, HTMLElement)) {
-            var _refs_floating_current;
-            if (trigger === 'click' || !opened || event.relatedTarget && refs.floating && ((_refs_floating_current = refs.floating.current) === null || _refs_floating_current === void 0 ? void 0 : _refs_floating_current.contains(event.relatedTarget))) {
-                return;
-            }
-            onToggle(false, event);
-        }
-    };
-    var handleFloatingMouseLeave = function(event) {
-        if (_instanceof(event.relatedTarget, HTMLElement) && _instanceof(refs.reference.current, HTMLElement)) {
-            var _refs_reference_current;
-            if (trigger === 'click' || !opened || event.relatedTarget && refs.reference && ((_refs_reference_current = refs.reference.current) === null || _refs_reference_current === void 0 ? void 0 : _refs_reference_current.contains(event.relatedTarget))) {
-                return;
-            }
-            onToggle(false, event);
-        }
-    };
+    var hover = (0, _react.useHover)(context, {
+        enabled: trigger === 'hover',
+        delay: {
+            open: 0,
+            close: 50
+        },
+        handleClose: (0, _react.safePolygon)({
+            requireIntent: false
+        })
+    });
+    var click = (0, _react.useClick)(context, {
+        stickIfOpen: false,
+        ignoreMouse: trigger === 'hover'
+    });
+    var getReferenceProps = (0, _react.useInteractions)([
+        hover,
+        click
+    ]).getReferenceProps;
     return /*#__PURE__*/ _react1.default.createElement("div", {
         ref: ref,
         id: wrappedId,
@@ -180,14 +160,10 @@ var FloatingPopover = /*#__PURE__*/ (0, _react1.forwardRef)(function(param, ref)
             position: 'relative',
             display: isInner ? 'block' : 'inline-block'
         }
-    }, /*#__PURE__*/ _react1.default.createElement("div", {
-        ref: refs.setReference,
-        onClick: handleTargetClick,
-        onMouseEnter: handleTargetMouseEnter,
-        onMouseLeave: handleTargetMouseLeave
-    }, target), opened && /*#__PURE__*/ _react1.default.createElement(_react.FloatingPortal, getFloatingPortalProps(portal, wrappedId), /*#__PURE__*/ _react1.default.createElement("div", {
+    }, /*#__PURE__*/ _react1.default.createElement("div", _object_spread({
+        ref: refs.setReference
+    }, getReferenceProps()), target), opened && /*#__PURE__*/ _react1.default.createElement(_react.FloatingPortal, getFloatingPortalProps(portal, wrappedId), /*#__PURE__*/ _react1.default.createElement("div", {
         ref: refs.setFloating,
-        onMouseLeave: handleFloatingMouseLeave,
         style: _object_spread_props(_object_spread({}, floatingStyles), {
             zIndex: zIndex || 1000
         })

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

@@ -180,13 +180,9 @@ 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/cjs/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -8,19 +8,55 @@ Object.defineProperty(exports, "DropdownInner", {
         return DropdownInner;
     }
 });
-var _react = /*#__PURE__*/ _interop_require_default(require("react"));
+var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _utils = require("../../../../utils");
 var _DropdownItem = require("../DropdownItem/DropdownItem");
 var _Dropdownstyles = require("../../Dropdown.styles");
 var _FloatingPopover = require("../../FloatingPopover");
 var _utils1 = require("../../utils");
-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 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({
@@ -35,6 +71,7 @@ var DropdownInner = 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);
@@ -55,14 +92,15 @@ var DropdownInner = function(param) {
                 ariaLevel: nextLevel,
                 ariaLabel: item.label
             }),
-            isInner: true
+            isInner: true,
+            portal: portal
         }, /*#__PURE__*/ _react.default.createElement(_Dropdownstyles.ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ _react.default.createElement(_Dropdownstyles.Ul, {
             id: listId,
             role: "group",
-            listMaxHeight: listMaxHeight,
-            listOverflow: listOverflow
+            listMaxHeight: item.listMaxHeight
         }, item.items.map(function(innerItem, innerIndex) {
             return /*#__PURE__*/ _react.default.createElement(DropdownInner, {
                 key: "".concat(innerIndex, "/").concat(currentLevel),
@@ -72,9 +110,8 @@ var DropdownInner = function(param) {
                 dispatchPath: dispatchPath,
                 index: innerIndex,
                 trigger: trigger,
-                listMaxHeight: listMaxHeight,
-                listOverflow: listOverflow,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         }))));
     }