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

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

@@ -184,7 +184,7 @@ var DropdownItem = function(param) {
     };
     var handleHover = function() {
         if (onHover) {
-            onHover(index);
+            onHover(index, item);
         }
     };
     return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, dividerBefore && /*#__PURE__*/ _react.default.createElement(_DropdownItemstyles.Divider, {

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

@@ -178,7 +178,7 @@ var selectRoot = function(Root) {
     return /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         var _getItemByFocused;
         var // eslint-disable-block @typescript-eslint/ban-ts-comment
-        id = props.id, outerValue = props.value, outerOnChange = props.onChange, _props_target = props.target, target = _props_target === void 0 ? 'textfield-like' : _props_target, items = props.items, _props_placement = props.placement, placement = _props_placement === void 0 ? 'bottom' : _props_placement, label = props.label, labelPlacement = props.labelPlacement, placeholder = props.placeholder, helperText = props.helperText, _props_disabled = props.disabled, disabled = _props_disabled === void 0 ? false : _props_disabled, _props_readOnly = props.readOnly, readOnly = _props_readOnly === void 0 ? false : _props_readOnly, outerView = props.view, size = props.size, listOverflow = props.listOverflow, listHeight = props.listHeight, listMaxHeight = props.listMaxHeight, listWidth = props.listWidth, contentLeft = props.contentLeft, onScrollBottom = props.onScrollBottom, onScroll = props.onScroll, chipView = props.chipView, _props_variant = props.variant, variant = _props_variant === void 0 ? 'normal' : _props_variant, portal = props.portal, renderValue = props.renderValue, renderItem = props.renderItem, status = props.status, onItemSelect = props.onItemSelect, separator = props.separator, outerCloseAfterSelect = props.closeAfterSelect, isTargetAmount = props.isTargetAmount, beforeList = props.beforeList, afterList = props.afterList, zIndex = props.zIndex, name = props.name, defaultValue = props.defaultValue, _props_virtual = props.virtual, virtual = _props_virtual === void 0 ? false : _props_virtual, onToggle = props.onToggle, chipType = props.chipType, multiselect = props.multiselect, // @ts-ignore
+        id = props.id, outerValue = props.value, outerOnChange = props.onChange, _props_target = props.target, target = _props_target === void 0 ? 'textfield-like' : _props_target, items = props.items, _props_placement = props.placement, placement = _props_placement === void 0 ? 'bottom' : _props_placement, label = props.label, labelPlacement = props.labelPlacement, placeholder = props.placeholder, helperText = props.helperText, _props_disabled = props.disabled, disabled = _props_disabled === void 0 ? false : _props_disabled, _props_readOnly = props.readOnly, readOnly = _props_readOnly === void 0 ? false : _props_readOnly, outerView = props.view, size = props.size, listOverflow = props.listOverflow, listHeight = props.listHeight, listMaxHeight = props.listMaxHeight, listWidth = props.listWidth, contentLeft = props.contentLeft, onScrollBottom = props.onScrollBottom, onScroll = props.onScroll, chipView = props.chipView, _props_variant = props.variant, variant = _props_variant === void 0 ? 'normal' : _props_variant, portal = props.portal, renderValue = props.renderValue, renderItem = props.renderItem, status = props.status, onItemSelect = props.onItemSelect, separator = props.separator, outerCloseAfterSelect = props.closeAfterSelect, isTargetAmount = props.isTargetAmount, beforeList = props.beforeList, afterList = props.afterList, zIndex = props.zIndex, name = props.name, defaultValue = props.defaultValue, _props_virtual = props.virtual, virtual = _props_virtual === void 0 ? false : _props_virtual, onToggle = props.onToggle, chipType = props.chipType, multiselect = props.multiselect, _props_mode = props.mode, mode = _props_mode === void 0 ? 'default' : _props_mode, // @ts-ignore
         _offset = props._offset, // Извлекаем пропсы для required и hint, чтобы они не попадали в DOM.
         // @ts-ignore
         required = props.required, // @ts-ignore
@@ -234,6 +234,7 @@ var selectRoot = function(Root) {
             "onToggle",
             "chipType",
             "multiselect",
+            "mode",
             "_offset",
             "required",
             "requiredPlacement",
@@ -267,6 +268,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 : {
@@ -396,6 +398,10 @@ var selectRoot = function(Root) {
                     type: 'reset'
                 });
             }
+            // Закрываем список, если элемент уже выбран.
+            if (mode === 'radio' && isCurrentChecked) {
+                return;
+            }
             if (onChange) {
                 onChange(isCurrentChecked ? '' : item.value, item);
             }
@@ -553,12 +559,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 +585,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/cjs/components/Tree/Tree.styles.js

@@ -81,7 +81,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 var IconArrowWrapper = _styledcomponents.default.div.withConfig({
     displayName: "Tree.styles__IconArrowWrapper",
-    componentId: "sc-cfcc5086-0"
+    componentId: "sc-66cccfac-0"
 })([
     "line-height:0;color:var(",
     ");&:hover{color:var(",
@@ -90,19 +90,19 @@ var IconArrowWrapper = _styledcomponents.default.div.withConfig({
 ], _Treetokens.treeTokens.arrowColor, _Treetokens.treeTokens.arrowColorHover, _Treetokens.treeTokens.arrowColorActive);
 var StyledArrow = (0, _styledcomponents.default)(_Icon.IconDisclosureRightCentered).withConfig({
     displayName: "Tree.styles__StyledArrow",
-    componentId: "sc-cfcc5086-1"
+    componentId: "sc-66cccfac-1"
 })([
     "transition:color 0.3s ease-in,transform 0.15s ease-in;pointer-events:none;user-select:none;"
 ]);
 var StyledFolder = (0, _styledcomponents.default)(_Icon.IconFolder).withConfig({
     displayName: "Tree.styles__StyledFolder",
-    componentId: "sc-cfcc5086-2"
+    componentId: "sc-66cccfac-2"
 })([
     ""
 ]);
 var TitleWrapper = _styledcomponents.default.div.withConfig({
     displayName: "Tree.styles__TitleWrapper",
-    componentId: "sc-cfcc5086-3"
+    componentId: "sc-66cccfac-3"
 })([
     "display:flex;align-items:center;justify-content:space-between;margin:",
     ";",
@@ -113,7 +113,7 @@ var TitleWrapper = _styledcomponents.default.div.withConfig({
 }, (0, _mixins.applyEllipsis)());
 var Title = _styledcomponents.default.span.withConfig({
     displayName: "Tree.styles__Title",
-    componentId: "sc-cfcc5086-4"
+    componentId: "sc-66cccfac-4"
 })([
     "margin:var(",
     ");",
@@ -121,16 +121,16 @@ var Title = _styledcomponents.default.span.withConfig({
 ], _Treetokens.treeTokens.iconFolderMargin, (0, _mixins.applyEllipsis)());
 var ContentRight = _styledcomponents.default.div.withConfig({
     displayName: "Tree.styles__ContentRight",
-    componentId: "sc-cfcc5086-5"
+    componentId: "sc-66cccfac-5"
 })([
     "line-height:0;"
 ]);
 var Line = _styledcomponents.default.div.withConfig({
     displayName: "Tree.styles__Line",
-    componentId: "sc-cfcc5086-6"
+    componentId: "sc-66cccfac-6"
 })([
     "left:",
-    ";right:0;position:absolute;z-index:1;height:2px;background-color:var(",
+    "px;right:0;position:absolute;z-index:1;height:0.125rem;background-color:var(",
     ");border-radius:1px;pointer-events:none;"
 ], function(param) {
     var left = param.left;

package/styled-components/cjs/engines/common.js

@@ -99,10 +99,23 @@ var mergeConfig = function(baseConfig, userConfig) {
     }
     return res;
 };
+// INFO: Метод, который проводит слияние двух объектов
+// INFO: если значение явно указанно как undefined/null/пустая строка, то будет взято значение указанное в default
+function mergeWithoutNullable(defaults, componentProps) {
+    var props = Object.keys(defaults).reduce(function(acc, key) {
+        return _object_spread_props(_object_spread({}, acc), _define_property({}, key, [
+            null,
+            undefined,
+            ''
+        ].includes(componentProps[key]) ? defaults[key] : componentProps[key]));
+    }, {});
+    return _object_spread({}, componentProps, props);
+}
 function component(config) {
     var Comp = config.layout((0, _styledcomponents._component)(config));
     return /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
-        return /*#__PURE__*/ _react.default.createElement(Comp, _object_spread_props(_object_spread({}, config === null || config === void 0 ? void 0 : config.defaults, props), {
+        var mergedProps = mergeWithoutNullable(config === null || config === void 0 ? void 0 : config.defaults, props);
+        return /*#__PURE__*/ _react.default.createElement(Comp, _object_spread_props(_object_spread({}, mergedProps), {
             ref: ref
         }));
     });

package/styled-components/cjs/examples/components/Tree/Tree.config.js

@@ -35,8 +35,10 @@ var config = {
                 ":var(--text-secondary);",
                 ":var(--text-secondary);",
                 ":var(--surface-positive);",
+                ":var(--surface-solid-default);",
+                ":var(--surface-positive);",
                 ":var(--surface-solid-default);"
-            ], _Treetokens.treeTokens.iconFolderColor, _Treetokens.treeTokens.arrowColor, _Treetokens.treeTokens.arrowColorHover, _Treetokens.treeTokens.arrowColorActive, _Treetokens.treeTokens.color, _Treetokens.treeTokens.colorSelected, _Treetokens.treeTokens.itemBackgroundColorSelected, _Treetokens.treeTokens.itemBackgroundColorPrimary, _Treetokens.treeTokens.itemBackgroundColorHover, _Treetokens.treeTokens.itemBackgroundColorActive, _Treetokens.treeTokens.checkboxBorderColor, _Treetokens.treeTokens.checkboxBackgroundColor, _Treetokens.treeTokens.itemDisabledOpacity, _Treetokens.treeTokens.itemDisabledBorderColor, _Treetokens.treeTokens.itemDisabledColor, _Treetokens.treeTokens.itemDraggableBorderColor, _Treetokens.treeTokens.itemDraggableLineColor)
+            ], _Treetokens.treeTokens.iconFolderColor, _Treetokens.treeTokens.arrowColor, _Treetokens.treeTokens.arrowColorHover, _Treetokens.treeTokens.arrowColorActive, _Treetokens.treeTokens.color, _Treetokens.treeTokens.colorSelected, _Treetokens.treeTokens.itemBackgroundColorSelected, _Treetokens.treeTokens.itemBackgroundColorPrimary, _Treetokens.treeTokens.itemBackgroundColorHover, _Treetokens.treeTokens.itemBackgroundColorActive, _Treetokens.treeTokens.checkboxBorderColor, _Treetokens.treeTokens.checkboxBackgroundColor, _Treetokens.treeTokens.itemDisabledOpacity, _Treetokens.treeTokens.itemDisabledBorderColor, _Treetokens.treeTokens.itemDisabledColor, _Treetokens.treeTokens.itemDraggableBorderColor, _Treetokens.treeTokens.itemDraggableLineColor, _Treetokens.treeTokens.itemDraggableBorderColor, _Treetokens.treeTokens.itemDraggableLineColor)
         },
         size: {
             l: (0, _styledcomponents.css)([

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

@@ -161,7 +161,7 @@ import { Context } from "./Combobox.context";
  */ export var comboboxRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(props, ref) {
         var _getItemByFocused;
-        var name = props.name, multiple = props.multiple, outerValue = props.value, outerOnChange = props.onChange, defaultValue = props.defaultValue, isTargetAmount = props.isTargetAmount, targetAmount = props.targetAmount, items = props.items, _props_placement = props.placement, placement = _props_placement === void 0 ? 'bottom-start' : _props_placement, label = props.label, placeholder = props.placeholder, helperText = props.helperText, contentLeft = props.contentLeft, textBefore = props.textBefore, textAfter = props.textAfter, _props_variant = props.variant, variant = _props_variant === void 0 ? 'normal' : _props_variant, listOverflow = props.listOverflow, listHeight = props.listHeight, listMaxHeight = props.listMaxHeight, listWidth = props.listWidth, portal = props.portal, renderItem = props.renderItem, view = props.view, size = props.size, labelPlacement = props.labelPlacement, keepPlaceholder = props.keepPlaceholder, _props_readOnly = props.readOnly, readOnly = _props_readOnly === void 0 ? false : _props_readOnly, _props_disabled = props.disabled, disabled = _props_disabled === void 0 ? false : _props_disabled, _props_alwaysOpened = props.alwaysOpened, alwaysOpened = _props_alwaysOpened === void 0 ? false : _props_alwaysOpened, filter = props.filter, outerCloseAfterSelect = props.closeAfterSelect, renderValue = props.renderValue, zIndex = props.zIndex, beforeList = props.beforeList, afterList = props.afterList, _props_virtual = props.virtual, virtual = _props_virtual === void 0 ? false : _props_virtual, hintView = props.hintView, hintSize = props.hintSize, emptyStateDescription = props.emptyStateDescription, onChangeValue = props.onChangeValue, onScroll = props.onScroll, onToggle = props.onToggle, // @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",
@@ -205,6 +205,7 @@ import { Context } from "./Combobox.context";
             "onChangeValue",
             "onScroll",
             "onToggle",
+            "mode",
             "_offset"
         ]);
         var transformedItems = useMemo(function() {
@@ -225,6 +226,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 +287,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) {
@@ -433,10 +423,20 @@ import { Context } from "./Combobox.context";
                     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 [];
@@ -569,13 +569,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 +590,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 +618,7 @@ import { Context } from "./Combobox.context";
                     enumerationType: 'plain'
                 }, rest), {
                     _onEnterDisabled: true // Пропс для отключения обработчика Enter внутри Textfield
-                }));
+                })));
             },
             zIndex: zIndex,
             isInner: false
@@ -628,6 +630,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 +639,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 +660,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/Drawer/hooks/useDrawer.js

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