@salutejs/plasma-new-hope 0.327.0-canary.1741.15743877104.0 → 0.327.0-canary.1741.15776056320.0

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

@@ -17,7 +17,7 @@ _export(exports, {
     }
 });
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
-var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../utils");
 var _hooks = require("../../hooks");
 var _FloatingPopover = require("./FloatingPopover");
 var _focusedReducer = require("./reducers/focusedReducer");
@@ -206,9 +206,9 @@ var autocompleteRoot = function(Root) {
         var _useReducer = _sliced_to_array((0, _react.useReducer)(_focusedReducer.focusedReducer, null), 2), focused = _useReducer[0], dispatchFocused = _useReducer[1];
         var _useState = _sliced_to_array((0, _react.useState)(''), 2), innerValue = _useState[0], setInnerValue = _useState[1];
         var _useState1 = _sliced_to_array((0, _react.useState)(false), 2), isOpen = _useState1[0], setIsOpen = _useState1[1];
-        var listId = (0, _plasmacore.safeUseId)();
+        var listId = (0, _utils.safeUseId)();
         var value = outerValue !== null && outerValue !== void 0 ? outerValue : innerValue;
-        var helperTextId = (0, _plasmacore.safeUseId)();
+        var helperTextId = (0, _utils.safeUseId)();
         var floatingPopoverRef = (0, _react.useRef)(null);
         var targetRef = (0, _hooks.useOutsideClick)(function() {
             setIsOpen(false);

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

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "FloatingPopover", {
 });
 var _react = require("@floating-ui/react");
 var _react1 = /*#__PURE__*/ _interop_require_wildcard(require("react"));
-var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../utils");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -131,7 +131,7 @@ var FloatingPopover = /*#__PURE__*/ (0, _react1.forwardRef)(function(param, ref)
             })
         ]
     }), refs = _useFloating.refs, floatingStyles = _useFloating.floatingStyles;
-    var wrappedId = (0, _plasmacore.safeUseId)();
+    var wrappedId = (0, _utils.safeUseId)();
     // Проверка на target. Это может быть как ReactNode, так и функция, в которую пробрасывается ref.
     // Это нужно для более тонкой настройки reference-элемента, вокруг которого и будет позиционироваться выпадашка.
     // Пример: когда в Textfield под инпутом находится helperText (или еще что-либо),

package/styled-components/cjs/components/Calendar/CalendarBase/CalendarBase.js

@@ -255,6 +255,20 @@ var calendarBaseRoot = function(Root) {
         }, [
             calendarState
         ]);
+        (0, _react.useEffect)(function() {
+            if (prevType !== type) {
+                dispatch({
+                    type: _types.ActionType.UPDATE_CALENDAR_STATE,
+                    payload: {
+                        calendarState: type,
+                        size: _reducer.sizeMap[type].single
+                    }
+                });
+                setPrevType(type);
+            }
+        }, [
+            type
+        ]);
         (0, _react.useEffect)(function() {
             if (value && prevValue && (0, _utils.isValueUpdate)(value, prevValue) || value && !prevValue) {
                 dispatch({

package/styled-components/cjs/components/Calendar/CalendarDouble/CalendarDouble.js

@@ -301,6 +301,20 @@ var calendarDoubleRoot = function(Root) {
         }, [
             calendarState
         ]);
+        (0, _react.useEffect)(function() {
+            if (prevType !== type) {
+                dispatch({
+                    type: _types.ActionType.UPDATE_CALENDAR_STATE,
+                    payload: {
+                        calendarState: type,
+                        size: _reducer.sizeMap[type].double
+                    }
+                });
+                setPrevType(type);
+            }
+        }, [
+            type
+        ]);
         (0, _react.useEffect)(function() {
             if (value && prevValue && (0, _utils.isValueUpdate)(value, prevValue) || value && !prevValue) {
                 var _getBoundaryDates = _sliced_to_array(getBoundaryDates(), 2), minVisibleDate = _getBoundaryDates[0], maxVisibleDate = _getBoundaryDates[1];

package/styled-components/cjs/components/Calendar/ui/CalendarDays/CalendarDays.js

@@ -183,6 +183,9 @@ var CalendarDays = function(param) {
     };
     var getRefs = function(element, isDayInCurrentMonth, i, j) {
         if (isDayInCurrentMonth) {
+            if (!outerRefs.current[i + offset]) {
+                outerRefs.current[i + offset] = [];
+            }
             outerRefs.current[i + offset][j] = element;
         }
     };

package/styled-components/cjs/components/Calendar/ui/CalendarMonths/CalendarMonths.js

@@ -189,6 +189,9 @@ var CalendarMonths = function(param) {
         return onHoverMonth === null || onHoverMonth === void 0 ? void 0 : onHoverMonth(undefined);
     };
     var getRefs = (0, _react.useCallback)(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         offset,

package/styled-components/cjs/components/Calendar/ui/CalendarQuarters/CalendarQuarters.js

@@ -188,6 +188,9 @@ var CalendarQuarters = function(param) {
         return onHoverQuarter === null || onHoverQuarter === void 0 ? void 0 : onHoverQuarter(undefined);
     };
     var getRefs = (0, _react.useCallback)(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         offset,

package/styled-components/cjs/components/Calendar/ui/CalendarYears/CalendarYears.js

@@ -189,6 +189,9 @@ var CalendarYears = function(param) {
         return onHoverYear === null || onHoverYear === void 0 ? void 0 : onHoverYear(undefined);
     };
     var getRefs = (0, _react.useCallback)(function(element, i, j) {
+        if (!outerRefs.current[i + offset]) {
+            outerRefs.current[i + offset] = [];
+        }
         outerRefs.current[i + offset][j] = element;
     }, [
         outerRefs

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

@@ -19,6 +19,7 @@ _export(exports, {
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _plasmacore = require("@salutejs/plasma-core");
 var _utils = require("../../utils");
+var _utils1 = require("../../utils");
 var _base = require("./variations/_view/base");
 var _base1 = require("./variations/_size/base");
 var _base2 = require("./variations/_disabled/base");
@@ -173,7 +174,7 @@ var checkboxRoot = function(Root) {
             inputRef,
             indeterminate
         ]);
-        var uniqId = (0, _plasmacore.safeUseId)();
+        var uniqId = (0, _utils.safeUseId)();
         var uniqLabelId = "label-".concat(uniqId);
         var uniqDescriptionId = "description-".concat(uniqId);
         var checkboxId = id || "input-".concat(uniqId);
@@ -229,7 +230,7 @@ var checkboxRoot = function(Root) {
             id: uniqLabelId,
             "aria-hidden": isLabelAriaHidden
         }, label), description && /*#__PURE__*/ _react.default.createElement(_Checkboxstyles.StyledDescription, {
-            className: (0, _utils.cx)(singleLineClass, onlyDescriptionClass),
+            className: (0, _utils1.cx)(singleLineClass, onlyDescriptionClass),
             id: uniqDescriptionId
         }, description))));
     });

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

@@ -19,12 +19,13 @@ _export(exports, {
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _plasmacore = require("@salutejs/plasma-core");
 var _utils = require("../../../utils");
+var _utils1 = require("../../../utils");
 var _hooks = require("../../../hooks");
-var _utils1 = require("../../Select/utils");
+var _utils2 = require("../../Select/utils");
 var _Comboboxtokens = require("./Combobox.tokens");
 var _FloatingPopover = require("./FloatingPopover");
 var _useKeyboardNavigation = require("./hooks/useKeyboardNavigation");
-var _utils2 = require("./utils");
+var _utils3 = require("./utils");
 var _ui = require("./ui");
 var _reducers = require("./reducers");
 var _getPathMaps = require("./hooks/getPathMaps");
@@ -263,7 +264,7 @@ var comboboxRoot = function(Root) {
             "onToggle"
         ]);
         var transformedItems = (0, _react.useMemo)(function() {
-            return (0, _utils2.initialItemsTransform)(items || []);
+            return (0, _utils3.initialItemsTransform)(items || []);
         }, [
             items
         ]);
@@ -279,10 +280,10 @@ var comboboxRoot = function(Root) {
         var inputRef = (0, _react.useRef)(null);
         var floatingPopoverRef = (0, _react.useRef)(null);
         var inputForkRef = (0, _plasmacore.useForkRef)(inputRef, ref);
-        var treeId = (0, _plasmacore.safeUseId)();
+        var treeId = (0, _utils.safeUseId)();
         var filteredItems = (0, _react.useMemo)(function() {
             var _valueToItemMap_get;
-            return (0, _utils2.filterItems)(transformedItems, textValue, ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value, filter);
+            return (0, _utils3.filterItems)(transformedItems, textValue, ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value, filter);
         }, [
             transformedItems,
             textValue,
@@ -320,7 +321,7 @@ var comboboxRoot = function(Root) {
             // Если изменилось, то возвращаем label выбранного айтема.
             // Если нет выбранного элемента, то стираем значение инпута.
             if (textValue !== value) {
-                if ((0, _utils.isEmpty)(value)) {
+                if ((0, _utils1.isEmpty)(value)) {
                     setTextValue('');
                 } else if (multiple) {
                     setTextValue('');
@@ -398,7 +399,7 @@ var comboboxRoot = function(Root) {
                         resultValues.splice(index, 1);
                     }
                 });
-                var removedItemValue = (0, _utils2.getRemovedElement)(value, resultValues, isTargetAmount);
+                var removedItemValue = (0, _utils3.getRemovedElement)(value, resultValues, isTargetAmount);
                 onChange(resultValues, removedItemValue ? valueToItemMap.get(removedItemValue) || {
                     value: removedItemValue,
                     label: removedItemValue.toString()
@@ -408,7 +409,7 @@ var comboboxRoot = function(Root) {
                     var _labelToItemMap_get;
                     return ((_labelToItemMap_get = labelToItemMap.get(chipLabel)) === null || _labelToItemMap_get === void 0 ? void 0 : _labelToItemMap_get.value) || chipLabel;
                 });
-                var removedItemValue1 = (0, _utils2.getRemovedElement)(value, newValues, isTargetAmount);
+                var removedItemValue1 = (0, _utils3.getRemovedElement)(value, newValues, isTargetAmount);
                 onChange(newValues, removedItemValue1 ? valueToItemMap.get(removedItemValue1) || {
                     value: removedItemValue1,
                     label: removedItemValue1.toString()
@@ -444,12 +445,12 @@ var comboboxRoot = function(Root) {
             var checkedCopy = new Map(checked);
             if (!checkedCopy.get(item.value)) {
                 checkedCopy.set(item.value, true);
-                (0, _utils2.updateDescendants)(item, checkedCopy, true, valueToItemMap);
+                (0, _utils3.updateDescendants)(item, checkedCopy, true, valueToItemMap);
             } else {
                 checkedCopy.set(item.value, false);
-                (0, _utils2.updateDescendants)(item, checkedCopy, false);
+                (0, _utils3.updateDescendants)(item, checkedCopy, false);
             }
-            (0, _utils2.updateAncestors)(item, checkedCopy);
+            (0, _utils3.updateAncestors)(item, checkedCopy);
             var newValues = [];
             valueToItemMap.forEach(function(item, key) {
                 if (checkedCopy.get(key)) {
@@ -478,7 +479,7 @@ var comboboxRoot = function(Root) {
         };
         // Обработчик клика по айтему выпадающего списка
         var handleItemClick = function(item, e) {
-            if (!(0, _utils.isEmpty)(item === null || item === void 0 ? void 0 : item.items)) {
+            if (!(0, _utils1.isEmpty)(item === null || item === void 0 ? void 0 : item.items)) {
                 return;
             }
             if (multiple) {
@@ -524,7 +525,7 @@ var comboboxRoot = function(Root) {
             return [];
         };
         var handlePressDown = function(item, e) {
-            if ((0, _utils.isEmpty)(item.items)) {
+            if ((0, _utils1.isEmpty)(item.items)) {
                 handleItemClick(item, e);
             } else if (multiple) {
                 handleCheckboxChange(item);
@@ -556,14 +557,14 @@ var comboboxRoot = function(Root) {
             checkedCopy.forEach(function(_, key) {
                 checkedCopy.set(key, false);
             });
-            if (!(0, _utils.isEmpty)(value)) {
+            if (!(0, _utils1.isEmpty)(value)) {
                 if (Array.isArray(value)) {
                     value.forEach(function(val) {
                         // Только если value находится в items, т.к. value может и не существовать в items.
                         if (valueToItemMap.has(val)) {
                             checkedCopy.set(val, true);
-                            (0, _utils2.updateDescendants)(valueToItemMap.get(val), checkedCopy, true);
-                            (0, _utils2.updateAncestors)(valueToItemMap.get(val), checkedCopy);
+                            (0, _utils3.updateDescendants)(valueToItemMap.get(val), checkedCopy, true);
+                            (0, _utils3.updateAncestors)(valueToItemMap.get(val), checkedCopy);
                         }
                     });
                 } else {
@@ -571,7 +572,7 @@ var comboboxRoot = function(Root) {
                     // eslint-disable-next-line no-lonely-if
                     if (valueToItemMap.has(value)) {
                         checkedCopy.set(value, 'done');
-                        (0, _utils2.updateSingleAncestors)(valueToItemMap.get(value), checkedCopy, 'dot');
+                        (0, _utils3.updateSingleAncestors)(valueToItemMap.get(value), checkedCopy, 'dot');
                     }
                 }
             }
@@ -649,7 +650,7 @@ var comboboxRoot = function(Root) {
                         onClick: handleClickArrow
                     }, /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.StyledArrow, {
                         color: "inherit",
-                        size: (0, _utils1.sizeToIconSize)(size),
+                        size: (0, _utils2.sizeToIconSize)(size),
                         className: withArrowInverse
                     })),
                     textBefore: textBefore,
@@ -662,7 +663,7 @@ var comboboxRoot = function(Root) {
                     "aria-autocomplete": "list",
                     "aria-controls": "".concat(treeId, "_tree_level_1"),
                     "aria-expanded": isCurrentListOpen,
-                    "aria-activedescendant": activeDescendantItemValue ? (0, _utils2.getItemId)(treeId, activeDescendantItemValue) : '',
+                    "aria-activedescendant": activeDescendantItemValue ? (0, _utils3.getItemId)(treeId, activeDescendantItemValue) : '',
                     labelPlacement: labelPlacement,
                     keepPlaceholder: keepPlaceholder
                 }, multiple ? {
@@ -695,7 +696,7 @@ var comboboxRoot = function(Root) {
             virtual: virtual,
             listOverflow: listOverflow,
             onScroll: virtual ? undefined : onScroll
-        }, beforeList, (0, _utils.isEmpty)(filteredItems) ? /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.StyledEmptyState, {
+        }, beforeList, (0, _utils1.isEmpty)(filteredItems) ? /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.StyledEmptyState, {
             className: _Comboboxtokens.classes.emptyStateWrapper,
             size: size,
             description: emptyStateDescription || 'Ничего не найдено'

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

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "FloatingPopover", {
 });
 var _react = require("@floating-ui/react");
 var _react1 = /*#__PURE__*/ _interop_require_wildcard(require("react"));
-var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../../utils");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -137,7 +137,7 @@ var FloatingPopover = /*#__PURE__*/ (0, _react1.forwardRef)(function(param, ref)
             })
         ]
     }), refs = _useFloating.refs, floatingStyles = _useFloating.floatingStyles;
-    var wrappedId = (0, _plasmacore.safeUseId)();
+    var wrappedId = (0, _utils.safeUseId)();
     var handleClick = function() {
         if (onToggle) {
             onToggle(!opened);

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

@@ -9,9 +9,9 @@ Object.defineProperty(exports, "Inner", {
     }
 });
 var _react = /*#__PURE__*/ _interop_require_default(require("react"));
-var _plasmacore = require("@salutejs/plasma-core");
-var _FloatingPopover = require("../../FloatingPopover");
 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) {
@@ -36,10 +36,10 @@ var Inner = function(param) {
         }
     };
     var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
-    var treeId = (0, _plasmacore.safeUseId)();
+    var treeId = (0, _utils.safeUseId)();
     var listId = "".concat(treeId, "_tree_level_").concat(currentLevel + 2);
     var nextLevel = currentLevel + 1;
-    if (!(0, _utils.isEmpty)(item === null || item === void 0 ? void 0 : item.items)) {
+    if (!(0, _utils1.isEmpty)(item === null || item === void 0 ? void 0 : item.items)) {
         var _item_items;
         return /*#__PURE__*/ _react.default.createElement(_FloatingPopover.FloatingPopover, {
             placement: (item === null || item === void 0 ? void 0 : item.placement) || 'right-start',

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

@@ -19,8 +19,9 @@ _export(exports, {
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _plasmacore = require("@salutejs/plasma-core");
 var _utils = require("../../../utils");
+var _utils1 = require("../../../utils");
 var _hooks = require("../../../hooks");
-var _utils1 = require("./utils");
+var _utils2 = require("./utils");
 var _hooks1 = require("./hooks");
 var _base = require("./variations/_view/base");
 var _base1 = require("./variations/_size/base");
@@ -195,7 +196,7 @@ var comboboxRoot = function(Root) {
         ]);
         var _targetRef_current;
         var forceUpdate = (0, _hooks.useForceUpdate)();
-        var uniqId = (0, _plasmacore.safeUseId)();
+        var uniqId = (0, _utils.safeUseId)();
         var innerId = id || uniqId;
         var _rest_valueType = rest.valueType, valueType = _rest_valueType === void 0 ? 'single' : _rest_valueType, value = rest.value;
         var offset = [
@@ -267,11 +268,11 @@ var comboboxRoot = function(Root) {
             var _item_dataset = item.dataset, newValue = _item_dataset.value;
             if (rest.valueType === 'multiple') {
                 var _rest_onChangeValue1;
-                var newSelected = (0, _utils1.getNewSelected)(rest.value, newValue, rest.valueType);
+                var newSelected = (0, _utils2.getNewSelected)(rest.value, newValue, rest.valueType);
                 (_rest_onChangeValue1 = rest.onChangeValue) === null || _rest_onChangeValue1 === void 0 ? void 0 : _rest_onChangeValue1.call(rest, newSelected);
                 return;
             }
-            var newSelected1 = (0, _utils1.getNewSelected)(rest.value, newValue, 'single');
+            var newSelected1 = (0, _utils2.getNewSelected)(rest.value, newValue, 'single');
             (_rest_onChangeValue = rest.onChangeValue) === null || _rest_onChangeValue === void 0 ? void 0 : _rest_onChangeValue.call(rest, newSelected1);
             onInnerToggle === null || onInnerToggle === void 0 ? void 0 : onInnerToggle(alwaysOpened || false, event);
             closedWithoutChanges.current = false;
@@ -301,11 +302,11 @@ var comboboxRoot = function(Root) {
             updateValue: updateValue
         }), onKeyDownTarget = _useKeyNavigation.onKeyDownTarget, onKeyDownSelect = _useKeyNavigation.onKeyDownSelect;
         var childrenArray = _react.Children.toArray(children);
-        var childrenMemo = (0, _utils1.getChildren)(childrenArray, {
+        var childrenMemo = (0, _utils2.getChildren)(childrenArray, {
             onClick: onClickChildrenItem,
             childrenRefs: itemsRefs
         }, value, filterValue, filterFunction).filter(Boolean);
-        var values = (0, _utils1.getValues)(childrenArray, value);
+        var values = (0, _utils2.getValues)(childrenArray, value);
         var onSearch = function(newSearch, newOpened) {
             setSearch(newSearch);
             setFilterValue(newSearch);
@@ -358,10 +359,10 @@ var comboboxRoot = function(Root) {
                 onSearch: onSearch,
                 onKeyDown: onKeyDownHandle
             }, rest)),
-            className: (0, _utils.cx)(ref === null || ref === void 0 ? void 0 : ref.classList.toString()),
+            className: (0, _utils1.cx)(ref === null || ref === void 0 ? void 0 : ref.classList.toString()),
             id: innerId,
             offset: offset,
-            placement: (0, _utils.getPlacements)(placement),
+            placement: (0, _utils1.getPlacements)(placement),
             usePortal: usePortal,
             selectWidth: dynamicTargetWidth,
             frame: frame,

package/styled-components/cjs/components/Combobox/ComboboxOld/ui/ComboboxItem/ComboboxItem.js

@@ -17,10 +17,10 @@ _export(exports, {
     }
 });
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
-var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../../../../utils");
 var _Comboboxtokens = require("../../Combobox.tokens");
-var _utils = require("../../utils");
-var _utils1 = require("../../../../../utils");
+var _utils1 = require("../../utils");
+var _utils2 = require("../../../../../utils");
 var _base = require("./variations/_view/base");
 var _base1 = require("./variations/_size/base");
 var _ComboboxItemstyles = require("./ComboboxItem.styles");
@@ -141,7 +141,7 @@ var comboboxItemRoot = function(Root) {
             "onClick",
             "onChange"
         ]);
-        var uniqId = (0, _plasmacore.safeUseId)();
+        var uniqId = (0, _utils.safeUseId)();
         var innerId = id || uniqId;
         var withComboboxItemIsSelected = checked || isSelected ? _Comboboxtokens.classes.comboboxItemIsSelected : undefined;
         var withComboboxItemIsDisabled = disabled ? _Comboboxtokens.classes.comboboxItemIsDisabled : undefined;
@@ -179,19 +179,19 @@ var comboboxItemRoot = function(Root) {
             onChange: handleOnChange
         });
         var ContentLeft = (0, _react.useMemo)(function() {
-            return (0, _utils.getValidComponent)(ContentLeftComponent, contentProps);
+            return (0, _utils1.getValidComponent)(ContentLeftComponent, contentProps);
         }, [
             ContentRightComponent,
             contentProps
         ]);
         var ContentRight = (0, _react.useMemo)(function() {
-            return (0, _utils.getValidComponent)(ContentRightComponent, contentProps);
+            return (0, _utils1.getValidComponent)(ContentRightComponent, contentProps);
         }, [
             ContentRightComponent,
             contentProps
         ]);
         return /*#__PURE__*/ _react.default.createElement(Root, _object_spread({
-            className: (0, _utils1.cx)(withComboboxItemIsSelected, withComboboxItemIsDisabled, className),
+            className: (0, _utils2.cx)(withComboboxItemIsSelected, withComboboxItemIsDisabled, className),
             view: view,
             size: size,
             id: innerId,

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

@@ -18,10 +18,10 @@ _export(exports, {
 });
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../utils");
 var _Popup = require("../Popup");
 var _Overlay = require("../Overlay");
-var _utils = require("../Popup/utils");
-var _utils1 = require("../../utils");
+var _utils1 = require("../Popup/utils");
 var _hooks = require("../../hooks");
 var _Drawertokens = require("./Drawer.tokens");
 var _base = require("./variations/_view/base");
@@ -160,11 +160,11 @@ var drawerRoot = function(Root) {
         var trapRef = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef);
         var popupController = (0, _Popup.usePopupContext)();
         var innerRef = (0, _plasmacore.useForkRef)(trapRef, outerRef);
-        var uniqId = (0, _plasmacore.safeUseId)();
+        var uniqId = (0, _utils.safeUseId)();
         var innerId = id || uniqId;
         var overlayBackgroundToken = withBlur ? "var(".concat(_Drawertokens.tokens.drawerOverlayWithBlurColor, ")") : "var(".concat(_Drawertokens.tokens.drawerOverlayColor, ")");
-        var innerWidth = width ? (0, _utils1.getSizeValueFromProp)(width) : '100%';
-        var innerHeight = height ? (0, _utils1.getSizeValueFromProp)(height) : '100%';
+        var innerWidth = width ? (0, _utils.getSizeValueFromProp)(width) : '100%';
+        var innerHeight = height ? (0, _utils.getSizeValueFromProp)(height) : '100%';
         var placementClass = placement ? _Drawertokens.classes["".concat(placement, "Placement")] : undefined;
         var drawerInfo = (0, _hooks1.useDrawer)({
             id: innerId,
@@ -176,7 +176,7 @@ var drawerRoot = function(Root) {
             disableScroll: asModal
         }).drawerInfo;
         var transparent = (0, _react.useMemo)(function() {
-            return (0, _DrawerContext.getIdLastDrawer)(popupController.items) !== innerId;
+            return (0, _DrawerContext.getIdLastDrawer)(Array.from(popupController.items.values())) !== innerId;
         }, [
             innerId,
             popupController.items
@@ -193,7 +193,7 @@ var drawerRoot = function(Root) {
         return /*#__PURE__*/ _react.default.createElement(_Drawerstyles.StyledPopup, _object_spread({
             id: innerId,
             ref: asModal ? innerRef : outerRef,
-            className: (0, _utils1.cx)(placementClass),
+            className: (0, _utils.cx)(placementClass),
             opened: innerIsOpen,
             zIndex: zIndex,
             placement: placement,
@@ -207,7 +207,7 @@ var drawerRoot = function(Root) {
                 view: view
             }, /*#__PURE__*/ _react.default.createElement(_Overlay.Overlay, {
                 className: _Drawertokens.classes.overlay,
-                zIndex: zIndex || _utils.DEFAULT_Z_INDEX,
+                zIndex: zIndex || _utils1.DEFAULT_Z_INDEX,
                 backgroundColorProperty: overlayBackgroundToken,
                 withBlur: withBlur,
                 transparent: transparent,

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

@@ -50,7 +50,7 @@ var useDrawer = function(param) {
         if (!closeOnEsc) {
             return;
         }
-        if (event.keyCode === ESCAPE_KEYCODE && (0, _DrawerContext.getIdLastDrawer)(popupController.items) === id) {
+        if (event.keyCode === ESCAPE_KEYCODE && (0, _DrawerContext.getIdLastDrawer)(Array.from(popupController.items.values())) === id) {
             if (onEscKeyDown) {
                 onEscKeyDown(event);
                 return;
@@ -90,7 +90,7 @@ var useDrawer = function(param) {
         if (!_utils.canUseDOM) {
             return;
         }
-        if (!isOpen && !(0, _DrawerContext.hasDrawers)(popupController.items)) {
+        if (!isOpen && !(0, _DrawerContext.hasDrawers)(Array.from(popupController.items.values()))) {
             document.body.style.overflow = overflow.current;
         }
     }, [

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

@@ -17,8 +17,8 @@ _export(exports, {
     }
 });
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
-var _plasmacore = require("@salutejs/plasma-core");
 var _utils = require("../../utils");
+var _utils1 = require("../../utils");
 var _hooks = require("../../hooks");
 var _pathReducer = require("./reducers/pathReducer");
 var _focusedPathReducer = require("./reducers/focusedPathReducer");
@@ -26,7 +26,7 @@ var _ui = require("./ui");
 var _base = require("./variations/_view/base");
 var _base1 = require("./variations/_size/base");
 var _Dropdownstyles = require("./Dropdown.styles");
-var _utils1 = require("./utils");
+var _utils2 = require("./utils");
 var _Dropdowntokens = require("./Dropdown.tokens");
 var _useKeyboardNavigation = require("./hooks/useKeyboardNavigation");
 var _useHashMaps = require("./hooks/useHashMaps");
@@ -211,9 +211,9 @@ var dropdownRoot = function(Root) {
         var _useReducer1 = _sliced_to_array((0, _react.useReducer)(_focusedPathReducer.focusedPathReducer, []), 2), focusedPath = _useReducer1[0], dispatchFocusedPath = _useReducer1[1];
         var isCurrentListOpen = alwaysOpened || Boolean(path[0]);
         var _useHashMaps1 = _sliced_to_array((0, _useHashMaps.useHashMaps)(items), 2), pathMap = _useHashMaps1[0], focusedToValueMap = _useHashMaps1[1];
-        var activeDescendantItemValue = ((_getItemByFocused = (0, _utils1.getItemByFocused)(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value) || '';
+        var activeDescendantItemValue = ((_getItemByFocused = (0, _utils2.getItemByFocused)(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value) || '';
         var floatingPopoverRef = (0, _react.useRef)(null);
-        var treeId = (0, _plasmacore.safeUseId)();
+        var treeId = (0, _utils.safeUseId)();
         // Логика работы при клике за пределами выпадающего списка
         var targetRef = (0, _hooks.useOutsideClick)(function(event) {
             if (!isCurrentListOpen || !closeOnOverlayClick || alwaysOpened) {
@@ -288,22 +288,22 @@ var dropdownRoot = function(Root) {
             ref: floatingPopoverRef,
             opened: isCurrentListOpen,
             onToggle: handleGlobalToggle,
-            placement: (0, _utils1.getPlacement)(placement),
+            placement: (0, _utils2.getPlacement)(placement),
             offset: offset,
             portal: portal,
             trigger: trigger,
-            target: (0, _utils1.childrenWithProps)(children, {
+            target: (0, _utils2.childrenWithProps)(children, {
                 role: 'combobox',
                 'aria-controls': "".concat(treeId, "_tree_level_1"),
                 'aria-expanded': isCurrentListOpen,
-                'aria-activedescendant': activeDescendantItemValue ? (0, _utils1.getItemId)(treeId, activeDescendantItemValue.toString()) : '',
+                'aria-activedescendant': activeDescendantItemValue ? (0, _utils2.getItemId)(treeId, activeDescendantItemValue.toString()) : '',
                 onKeyDown: onKeyDown,
                 onContextMenu: openByRightClick ? onContextMenu : undefined
             }),
             zIndex: zIndex,
             isInner: false
         }, /*#__PURE__*/ _react.default.createElement(Root, _object_spread({
-            className: (0, _utils.cx)(className, _Dropdowntokens.classes.dropdownRoot),
+            className: (0, _utils1.cx)(className, _Dropdowntokens.classes.dropdownRoot),
             ref: ref,
             view: view,
             size: size,

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

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "FloatingPopover", {
 });
 var _react = require("@floating-ui/react");
 var _react1 = /*#__PURE__*/ _interop_require_wildcard(require("react"));
-var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../utils");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -137,7 +137,7 @@ var FloatingPopover = /*#__PURE__*/ (0, _react1.forwardRef)(function(param, ref)
             (0, _react.shift)()
         ]
     }), refs = _useFloating.refs, floatingStyles = _useFloating.floatingStyles;
-    var wrappedId = (0, _plasmacore.safeUseId)();
+    var wrappedId = (0, _utils.safeUseId)();
     var handleTargetClick = function(event) {
         if (trigger === 'hover') {
             return;

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

@@ -9,11 +9,11 @@ Object.defineProperty(exports, "DropdownInner", {
     }
 });
 var _react = /*#__PURE__*/ _interop_require_default(require("react"));
-var _plasmacore = require("@salutejs/plasma-core");
+var _utils = require("../../../../utils");
 var _DropdownItem = require("../DropdownItem/DropdownItem");
 var _Dropdownstyles = require("../../Dropdown.styles");
 var _FloatingPopover = require("../../FloatingPopover");
-var _utils = require("../../utils");
+var _utils1 = require("../../utils");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -36,12 +36,12 @@ var DropdownInner = function(param) {
         }
     };
     var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
-    var treeId = (0, _plasmacore.safeUseId)();
+    var treeId = (0, _utils.safeUseId)();
     var listId = "".concat(treeId, "_tree_level_").concat(currentLevel + 2);
     var nextLevel = currentLevel + 1;
     if (item === null || item === void 0 ? void 0 : item.items) {
         return /*#__PURE__*/ _react.default.createElement(_FloatingPopover.FloatingPopover, {
-            placement: (0, _utils.getPlacement)((item === null || item === void 0 ? void 0 : item.placement) || 'right'),
+            placement: (0, _utils1.getPlacement)((item === null || item === void 0 ? void 0 : item.placement) || 'right'),
             opened: isCurrentListOpen,
             onToggle: handleToggle,
             trigger: item.trigger || trigger,