@salutejs/plasma-new-hope 0.335.0-canary.2197.17377664818.0 → 0.335.0-canary.2199.17384366399.0

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

@@ -141,14 +141,13 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 import React, { forwardRef, useState, useReducer, useMemo, useLayoutEffect, useRef } from "react";
 import { useForkRef } from "@salutejs/plasma-core";
-import { safeUseId } from "../../../utils";
-import { isEmpty } from "../../../utils";
-import { useOutsideClick } from "../../../hooks";
+import { safeUseId, isEmpty } from "../../../utils";
+import { useOutsideClick, useDidMountLayoutEffect } from "../../../hooks";
 import { sizeToIconSize } from "../../Select/utils";
 import { classes } from "./Combobox.tokens";
 import { FloatingPopover } from "./FloatingPopover";
 import { useKeyNavigation, getItemByFocused } from "./hooks/useKeyboardNavigation";
-import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId, getRemovedElement } from "./utils";
+import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId, getRemovedElement, getTextValue } from "./utils";
 import { Inner, StyledTextField, VirtualList, SelectAll } from "./ui";
 import { pathReducer, focusedPathReducer } from "./reducers";
 import { getPathMap, getTreeMaps } from "./hooks/getPathMaps";
@@ -161,7 +160,7 @@ import { Context } from "./Combobox.context";
  * Поле ввода с выпадающим списком и возможностью фильтрации и выбора элементов.
  */ export var comboboxRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(props, ref) {
-        var _valueToItemMap_get, _getItemByFocused;
+        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
         _offset = props._offset, rest = _object_without_properties(props, [
             "name",
@@ -219,17 +218,15 @@ import { Context } from "./Combobox.context";
         }, [
             items
         ]), 3), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1], labelToItemMap = _useMemo[2];
-        var _useState = _sliced_to_array(useState(multiple || Array.isArray(outerValue) ? '' : ((_valueToItemMap_get = valueToItemMap.get(outerValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || (outerValue === null || outerValue === void 0 ? void 0 : outerValue.toString()) || ''), 2), textValue = _useState[0], setTextValue = _useState[1];
+        var _useState = _sliced_to_array(useState(getTextValue(multiple, outerValue, valueToItemMap, renderValue)), 2), textValue = _useState[0], setTextValue = _useState[1];
         var _useState1 = _sliced_to_array(useState(multiple ? [] : ''), 2), internalValue = _useState1[0], setInternalValue = _useState1[1];
         var value = outerValue !== null && outerValue !== undefined ? outerValue : internalValue;
         var inputRef = useRef(null);
         var floatingPopoverRef = useRef(null);
         var inputForkRef = useForkRef(inputRef, ref);
         var treeId = safeUseId();
-        var listWrapperRef = useRef(null);
         var filteredItems = useMemo(function() {
-            var _valueToItemMap_get;
-            return filterItems(transformedItems, textValue, ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value, filter);
+            return filterItems(transformedItems, textValue, getTextValue(multiple, value, valueToItemMap, renderValue), filter);
         }, [
             transformedItems,
             textValue,
@@ -266,30 +263,19 @@ import { Context } from "./Combobox.context";
             if (onToggle) {
                 onToggle(false);
             }
-            // Проверяем, отличается ли значение в инпуте от выбранного value после закрытия дропдауна.
-            // Если изменилось, то возвращаем label выбранного айтема.
-            // Если нет выбранного элемента, то стираем значение инпута.
-            if (textValue !== value) {
-                if (isEmpty(value)) {
-                    setTextValue('');
-                } else if (multiple) {
-                    setTextValue('');
-                } else {
-                    var _valueToItemMap_get;
-                    setTextValue(((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value || '');
-                }
-            }
+            // Возвращаем актуальное значение поля ввода после закрытия выпадающего списка.
+            setTextValue(getTextValue(multiple, value, valueToItemMap, renderValue));
         }, floatingPopoverRef);
         // Эта функция срабатывает при изменении Combobox и
         // при изменении нативного Select для формы (срабатывает только после изменения internalValue и рендера).
         var onChange = function(newValue, item) {
             // Условие для отправки изменений наружу
             if (props.onChange) {
-                // Условие для отправки если комбобокс используется без формы.
+                // Условие для отправки, если комбобокс используется без формы.
                 if (!props.name && (typeof newValue === 'string' || Array.isArray(newValue))) {
                     props.onChange(newValue, item || null);
                 }
-                // Условие для отправки если комбобокс используется с формой.
+                // Условие для отправки, если комбобокс используется с формой.
                 if (props.name && (typeof newValue === "undefined" ? "undefined" : _type_of(newValue)) === 'object' && !Array.isArray(newValue)) {
                     props.onChange(newValue);
                 }
@@ -525,10 +511,6 @@ import { Context } from "./Combobox.context";
                 }
             }
             setChecked(checkedCopy);
-            if (!multiple && textValue === value && valueToItemMap.has(value)) {
-                var _valueToItemMap_get;
-                setTextValue(((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || '');
-            }
         // В deps мы кладем именно outerValue и internalValue, а не просто value.
         // Т.к. вначале нужно отфильтровать и провалидировать outerValue и результат положить в переменную.
         // А переменную, содержащую сложные типы данных, нельзя помещать в deps.
@@ -538,9 +520,8 @@ import { Context } from "./Combobox.context";
             items
         ]);
         // При изменении value нужно возвращать значение в инпуте к исходному.
-        useLayoutEffect(function() {
-            var _valueToItemMap_get;
-            setTextValue(multiple ? '' : ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || (value === null || value === void 0 ? void 0 : value.toString()) || '');
+        useDidMountLayoutEffect(function() {
+            setTextValue(getTextValue(multiple, value, valueToItemMap, renderValue));
         }, [
             outerValue,
             internalValue
@@ -647,7 +628,6 @@ import { Context } from "./Combobox.context";
             readOnly: readOnly,
             name: name
         }, /*#__PURE__*/ React.createElement(ListWrapper, {
-            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
             role: "tree",
@@ -656,6 +636,7 @@ 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,
@@ -677,8 +658,7 @@ import { Context } from "./Combobox.context";
                 path: path,
                 dispatchPath: dispatchPath,
                 index: index,
-                listWidth: listWidth,
-                portal: listWrapperRef
+                listWidth: listWidth
             });
         })), 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-900436d4-0"
+    componentId: "sc-7fefedf8-0"
 })([
     "width:",
     ";padding:calc(var(",
@@ -25,7 +25,7 @@ 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-900436d4-1"
+    componentId: "sc-7fefedf8-1"
 })([
     "max-height:",
     ";overflow-y:",
@@ -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;
-    return virtual ? 'visible' : 'auto';
+    var virtual = param.virtual, listOverflow = param.listOverflow;
+    return virtual ? 'visible' : listOverflow || 'visible';
 }, tokens.borderRadius, tokens.dropdownBorderWidth, classes.emptyStateWrapper);
 export var IconArrowWrapper = styled.div.withConfig({
     displayName: "Combobox.styles__IconArrowWrapper",
-    componentId: "sc-900436d4-2"
+    componentId: "sc-7fefedf8-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-900436d4-3"
+    componentId: "sc-7fefedf8-3"
 })([
     "width:",
     ";height:",
@@ -80,7 +80,7 @@ export var base = css([
 ]);
 export var StyledEmptyState = styled(EmptyState).withConfig({
     displayName: "Combobox.styles__StyledEmptyState",
-    componentId: "sc-900436d4-4"
+    componentId: "sc-7fefedf8-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-900436d4-5"
+    componentId: "sc-7fefedf8-5"
 })([
     "margin:0;padding:0;"
 ]);

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

@@ -1,11 +1,11 @@
-import React, { useRef } from "react";
+import React 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, portal = param.portal;
+    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, listWidth = param.listWidth;
     var handleToggle = function(opened) {
         if (opened) {
             dispatchPath({
@@ -20,7 +20,6 @@ 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);
@@ -41,16 +40,13 @@ export var Inner = function(param) {
                 ariaLevel: nextLevel,
                 ariaLabel: item.label
             }),
-            isInner: true,
-            portal: portal
+            isInner: true
         }, /*#__PURE__*/ React.createElement(ListWrapper, {
-            listWidth: listWidth,
-            ref: listWrapperRef
+            listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
             role: "group",
             id: listId,
-            virtual: false,
-            listMaxHeight: item === null || item === void 0 ? void 0 : item.listMaxHeight
+            virtual: false
         }, (_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),
@@ -59,8 +55,7 @@ export var Inner = function(param) {
                 path: path,
                 dispatchPath: dispatchPath,
                 index: innerIndex,
-                listWidth: listWidth,
-                portal: listWrapperRef
+                listWidth: listWidth
             });
         }))));
     }

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

@@ -1,25 +1,57 @@
-import React from "react";
-import List from "rc-virtual-list";
+import React, { useRef } from "react";
+import { useVirtualizer } from "@tanstack/react-virtual";
 import { getHeightAsNumber } from "../../../../../utils";
 import { Item } from "../Inner/ui";
 export var VirtualList = function(param) {
     var items = param.items, listMaxHeight = param.listMaxHeight, onScroll = param.onScroll;
-    return /*#__PURE__*/ React.createElement(List, {
-        data: items,
-        height: getHeightAsNumber(listMaxHeight),
-        fullHeight: false,
-        itemHeight: 100,
-        itemKey: "id",
+    var _virtualItems_;
+    var parentRef = useRef(null);
+    var virtualizer = useVirtualizer({
+        count: items.length,
+        getScrollElement: function() {
+            return parentRef.current;
+        },
+        estimateSize: function() {
+            return 48;
+        }
+    });
+    var virtualItems = virtualizer.getVirtualItems();
+    var _virtualItems__start;
+    return /*#__PURE__*/ React.createElement("div", {
+        ref: parentRef,
+        style: {
+            height: 'auto',
+            maxHeight: getHeightAsNumber(listMaxHeight),
+            overflowY: 'auto'
+        },
         onScroll: onScroll
-    }, function(item, index, props) {
-        return /*#__PURE__*/ React.createElement("div", props, /*#__PURE__*/ React.createElement(Item, {
-            item: item,
+    }, /*#__PURE__*/ React.createElement("div", {
+        style: {
+            height: virtualizer.getTotalSize(),
+            width: '100%',
+            position: 'relative'
+        }
+    }, /*#__PURE__*/ React.createElement("div", {
+        style: {
+            position: 'absolute',
+            top: 0,
+            left: 0,
+            width: '100%',
+            transform: "translateY(".concat((_virtualItems__start = (_virtualItems_ = virtualItems[0]) === null || _virtualItems_ === void 0 ? void 0 : _virtualItems_.start) !== null && _virtualItems__start !== void 0 ? _virtualItems__start : 0, "px)")
+        }
+    }, virtualItems.map(function(virtualRow) {
+        return /*#__PURE__*/ React.createElement("div", {
+            key: virtualRow.key,
+            "data-index": virtualRow.index,
+            ref: virtualizer.measureElement
+        }, /*#__PURE__*/ React.createElement(Item, {
+            item: items[virtualRow.index],
             path: [
                 'root'
             ],
             currentLevel: 0,
-            index: index,
+            index: virtualRow.index,
             ariaLevel: 1
         }));
-    });
+    }))));
 };

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

@@ -0,0 +1,16 @@
+// Type Guard для multiple.
+// @ts-ignore
+function isMultiple(multiple, value) {
+    return Boolean(multiple);
+}
+// Хелпер для генерации начального состояния поля ввода.
+export var getTextValue = function(multiple, value, valueToItemMap, renderValue) {
+    var _valueToItemMap_get;
+    if (isMultiple(multiple, value) || !value) {
+        return '';
+    }
+    return (renderValue === null || renderValue === void 0 ? void 0 : renderValue({
+        value: value,
+        label: ''
+    })) || ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value.toString();
+};

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

@@ -6,3 +6,4 @@ export { sizeToIconSize } from "./sizeToIconSize";
 export { filterItems } from "./filterItems";
 export { getItemId } from "./getItemId";
 export { getRemovedElement } from "./getRemovedElement";
+export { getTextValue } from "./getTextValue";

package/styled-components/es/components/DatePicker/RangeDate/RangeDate.js

@@ -141,7 +141,7 @@ import { LeftHelper, StyledRange, base } from "./RangeDate.styles";
 import { RangeDatePopover } from "./RangeDatePopover/RangeDatePopover";
 export var datePickerRangeRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(_param, ref) {
-        var className = _param.className, autoComplete = _param.autoComplete, _param_isDoubleCalendar = _param.isDoubleCalendar, isDoubleCalendar = _param_isDoubleCalendar === void 0 ? false : _param_isDoubleCalendar, _param_opened = _param.opened, opened = _param_opened === void 0 ? false : _param_opened, outerValue = _param.value, _param_defaultFirstDate = _param.defaultFirstDate, defaultFirstDate = _param_defaultFirstDate === void 0 ? '' : _param_defaultFirstDate, _param_defaultSecondDate = _param.defaultSecondDate, defaultSecondDate = _param_defaultSecondDate === void 0 ? '' : _param_defaultSecondDate, preserveInvalidOnBlur = _param.preserveInvalidOnBlur, label = _param.label, leftHelper = _param.leftHelper, contentLeft = _param.contentLeft, contentRight = _param.contentRight, view = _param.view, size = _param.size, _param_readOnly = _param.readOnly, readOnly = _param_readOnly === void 0 ? false : _param_readOnly, _param_disabled = _param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, name = _param.name, _param_dividerVariant = _param.dividerVariant, dividerVariant = _param_dividerVariant === void 0 ? 'dash' : _param_dividerVariant, dividerIcon = _param.dividerIcon, firstValueError = _param.firstValueError, secondValueError = _param.secondValueError, firstValueSuccess = _param.firstValueSuccess, secondValueSuccess = _param.secondValueSuccess, firstPlaceholder = _param.firstPlaceholder, secondPlaceholder = _param.secondPlaceholder, firstTextfieldContentLeft = _param.firstTextfieldContentLeft, firstTextfieldContentRight = _param.firstTextfieldContentRight, secondTextfieldContentLeft = _param.secondTextfieldContentLeft, secondTextfieldContentRight = _param.secondTextfieldContentRight, firstTextfieldTextBefore = _param.firstTextfieldTextBefore, secondTextfieldTextBefore = _param.secondTextfieldTextBefore, firstTextfieldTextAfter = _param.firstTextfieldTextAfter, secondTextfieldTextAfter = _param.secondTextfieldTextAfter, required = _param.required, _param_requiredPlacement = _param.requiredPlacement, requiredPlacement = _param_requiredPlacement === void 0 ? 'right' : _param_requiredPlacement, _param_hasRequiredIndicator = _param.hasRequiredIndicator, hasRequiredIndicator = _param_hasRequiredIndicator === void 0 ? true : _param_hasRequiredIndicator, _param_format = _param.format, format = _param_format === void 0 ? 'DD.MM.YYYY' : _param_format, _param_lang = _param.lang, lang = _param_lang === void 0 ? 'ru' : _param_lang, maskWithFormat = _param.maskWithFormat, min = _param.min, max = _param.max, renderFromDate = _param.renderFromDate, _param_includeEdgeDates = _param.includeEdgeDates, includeEdgeDates = _param_includeEdgeDates === void 0 ? false : _param_includeEdgeDates, eventList = _param.eventList, disabledList = _param.disabledList, eventMonthList = _param.eventMonthList, disabledMonthList = _param.disabledMonthList, eventQuarterList = _param.eventQuarterList, disabledQuarterList = _param.disabledQuarterList, eventYearList = _param.eventYearList, disabledYearList = _param.disabledYearList, _param_type = _param.type, type = _param_type === void 0 ? 'Days' : _param_type, _param_frame = _param.frame, frame = _param_frame === void 0 ? 'document' : _param_frame, _param_usePortal = _param.usePortal, usePortal = _param_usePortal === void 0 ? false : _param_usePortal, _param_placement = _param.placement, placement = _param_placement === void 0 ? [
+        var className = _param.className, autoComplete = _param.autoComplete, _param_isDoubleCalendar = _param.isDoubleCalendar, isDoubleCalendar = _param_isDoubleCalendar === void 0 ? false : _param_isDoubleCalendar, _param_opened = _param.opened, opened = _param_opened === void 0 ? false : _param_opened, outerValue = _param.value, _param_defaultFirstDate = _param.defaultFirstDate, defaultFirstDate = _param_defaultFirstDate === void 0 ? '' : _param_defaultFirstDate, _param_defaultSecondDate = _param.defaultSecondDate, defaultSecondDate = _param_defaultSecondDate === void 0 ? '' : _param_defaultSecondDate, preserveInvalidOnBlur = _param.preserveInvalidOnBlur, label = _param.label, leftHelper = _param.leftHelper, contentLeft = _param.contentLeft, contentRight = _param.contentRight, view = _param.view, size = _param.size, _param_readOnly = _param.readOnly, readOnly = _param_readOnly === void 0 ? false : _param_readOnly, _param_disabled = _param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, name = _param.name, _param_dividerVariant = _param.dividerVariant, dividerVariant = _param_dividerVariant === void 0 ? 'dash' : _param_dividerVariant, dividerIcon = _param.dividerIcon, firstValueError = _param.firstValueError, secondValueError = _param.secondValueError, firstValueSuccess = _param.firstValueSuccess, secondValueSuccess = _param.secondValueSuccess, firstPlaceholder = _param.firstPlaceholder, secondPlaceholder = _param.secondPlaceholder, firstTextfieldContentLeft = _param.firstTextfieldContentLeft, firstTextfieldContentRight = _param.firstTextfieldContentRight, secondTextfieldContentLeft = _param.secondTextfieldContentLeft, secondTextfieldContentRight = _param.secondTextfieldContentRight, firstTextfieldTextBefore = _param.firstTextfieldTextBefore, secondTextfieldTextBefore = _param.secondTextfieldTextBefore, firstTextfieldTextAfter = _param.firstTextfieldTextAfter, secondTextfieldTextAfter = _param.secondTextfieldTextAfter, required = _param.required, _param_requiredPlacement = _param.requiredPlacement, requiredPlacement = _param_requiredPlacement === void 0 ? 'right' : _param_requiredPlacement, _param_hasRequiredIndicator = _param.hasRequiredIndicator, hasRequiredIndicator = _param_hasRequiredIndicator === void 0 ? true : _param_hasRequiredIndicator, _param_format = _param.format, format = _param_format === void 0 ? 'DD.MM.YYYY' : _param_format, _param_lang = _param.lang, lang = _param_lang === void 0 ? 'ru' : _param_lang, maskWithFormat = _param.maskWithFormat, min = _param.min, max = _param.max, renderFromDate = _param.renderFromDate, _param_includeEdgeDates = _param.includeEdgeDates, includeEdgeDates = _param_includeEdgeDates === void 0 ? false : _param_includeEdgeDates, eventList = _param.eventList, disabledList = _param.disabledList, eventMonthList = _param.eventMonthList, disabledMonthList = _param.disabledMonthList, eventQuarterList = _param.eventQuarterList, disabledQuarterList = _param.disabledQuarterList, eventYearList = _param.eventYearList, disabledYearList = _param.disabledYearList, _param_type = _param.type, type = _param_type === void 0 ? 'Days' : _param_type, _param_frame = _param.frame, frame = _param_frame === void 0 ? 'document' : _param_frame, _param_usePortal = _param.usePortal, usePortal = _param_usePortal === void 0 ? false : _param_usePortal, zIndex = _param.zIndex, _param_placement = _param.placement, placement = _param_placement === void 0 ? [
             'top',
             'bottom'
         ] : _param_placement, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeAfterDateSelect = _param.closeAfterDateSelect, closeAfterDateSelect = _param_closeAfterDateSelect === void 0 ? true : _param_closeAfterDateSelect, offset = _param.offset, calendarContainerWidth = _param.calendarContainerWidth, calendarContainerHeight = _param.calendarContainerHeight, stretched = _param.stretched, onToggle = _param.onToggle, onChange = _param.onChange, onChangeFirstValue = _param.onChangeFirstValue, onChangeSecondValue = _param.onChangeSecondValue, onCommitFirstDate = _param.onCommitFirstDate, onCommitSecondDate = _param.onCommitSecondDate, onFocusFirstTextfield = _param.onFocusFirstTextfield, onFocusSecondTextfield = _param.onFocusSecondTextfield, onBlurFirstTextfield = _param.onBlurFirstTextfield, onBlurSecondTextfield = _param.onBlurSecondTextfield, rest = _object_without_properties(_param, [
@@ -199,6 +199,7 @@ export var datePickerRangeRoot = function(Root) {
             "type",
             "frame",
             "usePortal",
+            "zIndex",
             "placement",
             "closeOnOverlayClick",
             "closeOnEsc",
@@ -568,6 +569,7 @@ export var datePickerRangeRoot = function(Root) {
             renderFromDate: renderFromDate,
             frame: frame,
             usePortal: usePortal,
+            zIndex: zIndex,
             placement: placement,
             closeOnOverlayClick: closeOnOverlayClick,
             closeOnEsc: closeOnEsc,

package/styled-components/es/components/DatePicker/RangeDate/RangeDatePopover/RangeDatePopover.js

@@ -18,7 +18,7 @@ import { StyledPopover } from "../RangeDate.styles";
 import { classes } from "../../DatePicker.tokens";
 import { StyledCalendar, StyledCalendarDouble } from "./RangeDatePopover.styles";
 export var RangeDatePopover = function(param) {
-    var Root = param.rootWrapper, target = param.target, isOpen = param.isOpen, opened = param.opened, isDoubleCalendar = param.isDoubleCalendar, calendarValue = param.calendarValue, min = param.min, max = param.max, renderFromDate = param.renderFromDate, includeEdgeDates = param.includeEdgeDates, eventList = param.eventList, disabledList = param.disabledList, eventMonthList = param.eventMonthList, disabledMonthList = param.disabledMonthList, eventQuarterList = param.eventQuarterList, disabledQuarterList = param.disabledQuarterList, eventYearList = param.eventYearList, disabledYearList = param.disabledYearList, _param_frame = param.frame, frame = _param_frame === void 0 ? 'document' : _param_frame, _param_usePortal = param.usePortal, usePortal = _param_usePortal === void 0 ? false : _param_usePortal, _param_placement = param.placement, placement = _param_placement === void 0 ? [
+    var Root = param.rootWrapper, target = param.target, isOpen = param.isOpen, opened = param.opened, isDoubleCalendar = param.isDoubleCalendar, calendarValue = param.calendarValue, min = param.min, max = param.max, renderFromDate = param.renderFromDate, includeEdgeDates = param.includeEdgeDates, eventList = param.eventList, disabledList = param.disabledList, eventMonthList = param.eventMonthList, disabledMonthList = param.disabledMonthList, eventQuarterList = param.eventQuarterList, disabledQuarterList = param.disabledQuarterList, eventYearList = param.eventYearList, disabledYearList = param.disabledYearList, _param_frame = param.frame, frame = _param_frame === void 0 ? 'document' : _param_frame, _param_usePortal = param.usePortal, usePortal = _param_usePortal === void 0 ? false : _param_usePortal, zIndex = param.zIndex, _param_placement = param.placement, placement = _param_placement === void 0 ? [
         'top',
         'bottom'
     ] : _param_placement, _param_closeOnOverlayClick = param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, closeOnEsc = param.closeOnEsc, offset = param.offset, calendarContainerWidth = param.calendarContainerWidth, calendarContainerHeight = param.calendarContainerHeight, stretched = param.stretched, type = param.type, size = param.size, _param_lang = param.lang, lang = _param_lang === void 0 ? 'ru' : _param_lang, disabled = param.disabled, readOnly = param.readOnly, setIsInnerOpen = param.setIsInnerOpen, onChangeValue = param.onChangeValue, onChangeStartOfRange = param.onChangeStartOfRange, onToggle = param.onToggle;
@@ -51,7 +51,8 @@ export var RangeDatePopover = function(param) {
             closeOnOverlayClick: closeOnOverlayClick,
             isFocusTrapped: false,
             target: target,
-            preventOverflow: false
+            preventOverflow: false,
+            zIndex: zIndex
         }, /*#__PURE__*/ React.createElement(Root, {
             ref: doubleCalendarRootRef,
             className: cls(classes.datePickerRoot, _define_property({}, classes.datePickerstretched, stretched)),
@@ -92,7 +93,8 @@ export var RangeDatePopover = function(param) {
         isFocusTrapped: false,
         target: target,
         preventOverflow: false,
-        closeOnEsc: closeOnEsc
+        closeOnEsc: closeOnEsc,
+        zIndex: zIndex
     }, /*#__PURE__*/ React.createElement(Root, {
         ref: calendarRootRef,
         className: cls(classes.datePickerRoot, _define_property({}, classes.datePickerstretched, stretched)),

package/styled-components/es/components/DatePicker/SingleDate/SingleDate.js

@@ -115,7 +115,7 @@ import { base as readOnlyCSS } from "./variations/_readonly/base";
 import { LeftHelper, StyledInput, StyledPopover, base } from "./SingleDate.styles";
 export var datePickerRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(_param, ref) {
-        var className = _param.className, _param_opened = _param.opened, opened = _param_opened === void 0 ? false : _param_opened, outerValue = _param.value, _param_defaultDate = _param.defaultDate, defaultDate = _param_defaultDate === void 0 ? '' : _param_defaultDate, preserveInvalidOnBlur = _param.preserveInvalidOnBlur, label = _param.label, _param_labelPlacement = _param.labelPlacement, labelPlacement = _param_labelPlacement === void 0 ? 'outer' : _param_labelPlacement, keepPlaceholder = _param.keepPlaceholder, _param_required = _param.required, required = _param_required === void 0 ? false : _param_required, _param_requiredPlacement = _param.requiredPlacement, requiredPlacement = _param_requiredPlacement === void 0 ? 'right' : _param_requiredPlacement, _param_hasRequiredIndicator = _param.hasRequiredIndicator, hasRequiredIndicator = _param_hasRequiredIndicator === void 0 ? true : _param_hasRequiredIndicator, placeholder = _param.placeholder, leftHelper = _param.leftHelper, contentLeft = _param.contentLeft, contentRight = _param.contentRight, textBefore = _param.textBefore, textAfter = _param.textAfter, view = _param.view, size = _param.size, _param_readOnly = _param.readOnly, readOnly = _param_readOnly === void 0 ? false : _param_readOnly, _param_disabled = _param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, name = _param.name, valueError = _param.valueError, valueSuccess = _param.valueSuccess, _param_format = _param.format, format = _param_format === void 0 ? 'DD.MM.YYYY' : _param_format, _param_lang = _param.lang, lang = _param_lang === void 0 ? 'ru' : _param_lang, maskWithFormat = _param.maskWithFormat, min = _param.min, max = _param.max, renderFromDate = _param.renderFromDate, _param_includeEdgeDates = _param.includeEdgeDates, includeEdgeDates = _param_includeEdgeDates === void 0 ? false : _param_includeEdgeDates, eventList = _param.eventList, disabledList = _param.disabledList, eventMonthList = _param.eventMonthList, disabledMonthList = _param.disabledMonthList, eventQuarterList = _param.eventQuarterList, disabledQuarterList = _param.disabledQuarterList, eventYearList = _param.eventYearList, disabledYearList = _param.disabledYearList, _param_type = _param.type, type = _param_type === void 0 ? 'Days' : _param_type, _param_frame = _param.frame, frame = _param_frame === void 0 ? 'document' : _param_frame, _param_usePortal = _param.usePortal, usePortal = _param_usePortal === void 0 ? false : _param_usePortal, _param_placement = _param.placement, placement = _param_placement === void 0 ? [
+        var className = _param.className, _param_opened = _param.opened, opened = _param_opened === void 0 ? false : _param_opened, outerValue = _param.value, _param_defaultDate = _param.defaultDate, defaultDate = _param_defaultDate === void 0 ? '' : _param_defaultDate, preserveInvalidOnBlur = _param.preserveInvalidOnBlur, label = _param.label, _param_labelPlacement = _param.labelPlacement, labelPlacement = _param_labelPlacement === void 0 ? 'outer' : _param_labelPlacement, keepPlaceholder = _param.keepPlaceholder, _param_required = _param.required, required = _param_required === void 0 ? false : _param_required, _param_requiredPlacement = _param.requiredPlacement, requiredPlacement = _param_requiredPlacement === void 0 ? 'right' : _param_requiredPlacement, _param_hasRequiredIndicator = _param.hasRequiredIndicator, hasRequiredIndicator = _param_hasRequiredIndicator === void 0 ? true : _param_hasRequiredIndicator, placeholder = _param.placeholder, leftHelper = _param.leftHelper, contentLeft = _param.contentLeft, contentRight = _param.contentRight, textBefore = _param.textBefore, textAfter = _param.textAfter, view = _param.view, size = _param.size, _param_readOnly = _param.readOnly, readOnly = _param_readOnly === void 0 ? false : _param_readOnly, _param_disabled = _param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, name = _param.name, valueError = _param.valueError, valueSuccess = _param.valueSuccess, _param_format = _param.format, format = _param_format === void 0 ? 'DD.MM.YYYY' : _param_format, _param_lang = _param.lang, lang = _param_lang === void 0 ? 'ru' : _param_lang, maskWithFormat = _param.maskWithFormat, min = _param.min, max = _param.max, renderFromDate = _param.renderFromDate, _param_includeEdgeDates = _param.includeEdgeDates, includeEdgeDates = _param_includeEdgeDates === void 0 ? false : _param_includeEdgeDates, eventList = _param.eventList, disabledList = _param.disabledList, eventMonthList = _param.eventMonthList, disabledMonthList = _param.disabledMonthList, eventQuarterList = _param.eventQuarterList, disabledQuarterList = _param.disabledQuarterList, eventYearList = _param.eventYearList, disabledYearList = _param.disabledYearList, _param_type = _param.type, type = _param_type === void 0 ? 'Days' : _param_type, _param_frame = _param.frame, frame = _param_frame === void 0 ? 'document' : _param_frame, _param_usePortal = _param.usePortal, usePortal = _param_usePortal === void 0 ? false : _param_usePortal, zIndex = _param.zIndex, _param_placement = _param.placement, placement = _param_placement === void 0 ? [
             'top',
             'bottom'
         ] : _param_placement, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeAfterDateSelect = _param.closeAfterDateSelect, closeAfterDateSelect = _param_closeAfterDateSelect === void 0 ? true : _param_closeAfterDateSelect, offset = _param.offset, calendarContainerWidth = _param.calendarContainerWidth, calendarContainerHeight = _param.calendarContainerHeight, stretched = _param.stretched, onChangeValue = _param.onChangeValue, onCommitDate = _param.onCommitDate, onToggle = _param.onToggle, onFocus = _param.onFocus, onBlur = _param.onBlur, onChange = _param.onChange, autoComplete = _param.autoComplete, rest = _object_without_properties(_param, [
@@ -161,6 +161,7 @@ export var datePickerRoot = function(Root) {
             "type",
             "frame",
             "usePortal",
+            "zIndex",
             "placement",
             "closeOnOverlayClick",
             "closeOnEsc",
@@ -348,7 +349,8 @@ export var datePickerRoot = function(Root) {
             closeOnOverlayClick: closeOnOverlayClick,
             isFocusTrapped: false,
             target: DatePickerInput,
-            preventOverflow: false
+            preventOverflow: false,
+            zIndex: zIndex
         }, /*#__PURE__*/ React.createElement(Root, {
             ref: calendarRootRef,
             view: view,

package/styled-components/es/components/Popup/ClientOnlyPortal.js

@@ -50,12 +50,24 @@ import { useIsomorphicLayoutEffect } from "../../hooks";
 // Полиморфная версия портала для рендера как на сервере, так и на клиенте.
 // Позволяет избежать ошибок, связанных с гидрацией.
 var ClientOnlyPortal = function(param) {
-    var children = param.children;
+    var children = param.children, providerFrame = param.providerFrame;
     var ref = useRef(null);
     var _useState = _sliced_to_array(useState(false), 2), mounted = _useState[0], setMounted = _useState[1];
     useIsomorphicLayoutEffect(function() {
-        ref.current = document.body;
         setMounted(true);
+        if (typeof providerFrame !== 'string' && providerFrame && providerFrame.current) {
+            ref.current = providerFrame.current;
+            return;
+        }
+        if (typeof providerFrame === 'string' && providerFrame !== 'document') {
+            var containerElement = document.getElementById(providerFrame);
+            if (!containerElement) {
+                ref.current = document.body;
+            }
+            ref.current = containerElement;
+            return;
+        }
+        ref.current = document.body;
     }, []);
     return mounted && ref.current ? /*#__PURE__*/ createPortal(children, ref.current) : null;
 };

package/styled-components/es/components/Popup/PopupContext.js

@@ -69,7 +69,7 @@ export var usePopupContext = function() {
 };
 // TODO: #1599
 export var PopupProvider = function(param) {
-    var children = param.children, UNSAFE_SSR_ENABLED = param.UNSAFE_SSR_ENABLED;
+    var children = param.children, providerFrame = param.providerFrame, UNSAFE_SSR_ENABLED = param.UNSAFE_SSR_ENABLED;
     var prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');
     var _useState = _sliced_to_array(useState(initialItems), 2), items = _useState[0], setItems = _useState[1];
     var uuid = safeUseId();
@@ -112,13 +112,32 @@ export var PopupProvider = function(param) {
         register: register,
         unregister: unregister
     };
+    var getDefaultPortal = function() {
+        if (typeof providerFrame !== 'string' && providerFrame && providerFrame.current && canUseDOM) {
+            return /*#__PURE__*/ React.createElement(Portal, {
+                container: providerFrame.current
+            }, /*#__PURE__*/ React.createElement(StyledPortal, {
+                id: rootId
+            }));
+        }
+        var withFrameId = typeof providerFrame === 'string' && providerFrame !== 'document';
+        var containerElement = withFrameId && canUseDOM && document.getElementById(providerFrame);
+        if (containerElement) {
+            return /*#__PURE__*/ React.createElement(Portal, {
+                container: containerElement
+            }, /*#__PURE__*/ React.createElement(StyledPortal, {
+                id: rootId
+            }));
+        }
+        return /*#__PURE__*/ React.createElement(Portal, {
+            container: document.body
+        }, /*#__PURE__*/ React.createElement(StyledPortal, {
+            id: rootId
+        }));
+    };
     return /*#__PURE__*/ React.createElement(PopupContext.Provider, {
         value: context
     }, children, UNSAFE_SSR_ENABLED ? /*#__PURE__*/ React.createElement(ClientOnlyPortal, null, /*#__PURE__*/ React.createElement(StyledPortal, {
         id: rootId
-    })) : /*#__PURE__*/ React.createElement(Portal, {
-        container: document.body
-    }, /*#__PURE__*/ React.createElement(StyledPortal, {
-        id: rootId
-    })));
+    })) : getDefaultPortal());
 };

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

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

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

@@ -4,7 +4,7 @@ import { getCorrectHeight } from "./utils";
 import { tokens, constants } from "./Select.tokens";
 export var ListWrapper = styled.div.withConfig({
     displayName: "Select.styles__ListWrapper",
-    componentId: "sc-23c571db-0"
+    componentId: "sc-30266665-0"
 })([
     "width:",
     ";padding:calc(var(",
@@ -21,7 +21,7 @@ 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: "Select.styles__Ul",
-    componentId: "sc-23c571db-1"
+    componentId: "sc-30266665-1"
 })([
     "max-height:",
     ";overflow-y:",
@@ -33,8 +33,8 @@ export var Ul = styled.ul.withConfig({
     return(// eslint-disable-next-line no-nested-ternary
     virtual ? 'auto' : listMaxHeight ? getCorrectHeight(listMaxHeight) : 'auto');
 }, function(param) {
-    var virtual = param.virtual;
-    return virtual ? 'visible' : 'auto';
+    var virtual = param.virtual, listOverflow = param.listOverflow;
+    return virtual ? 'visible' : listOverflow || 'visible';
 }, tokens.borderRadius, tokens.dropdownBorderWidth);
 export var base = css([
     ""

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

@@ -1,10 +1,10 @@
-import React, { useRef } from "react";
+import React from "react";
 import { isEmpty, safeUseId } from "../../../../utils";
 import { Ul, ListWrapper } from "../../Select.styles";
 import { FloatingPopover } from "../../FloatingPopover";
 import { Item } from "./ui/Item/Item";
 export var Inner = function(param) {
-    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, listWidth = param.listWidth, portal = param.portal;
+    var item = param.item, currentLevel = param.currentLevel, path = param.path, dispatchPath = param.dispatchPath, index = param.index, listWidth = param.listWidth;
     var handleToggle = function(opened) {
         if (opened) {
             dispatchPath({
@@ -19,7 +19,6 @@ 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,16 +39,13 @@ export var Inner = function(param) {
                 ariaLevel: nextLevel,
                 ariaLabel: item.label
             }),
-            isInner: true,
-            portal: portal
+            isInner: true
         }, /*#__PURE__*/ React.createElement(ListWrapper, {
-            listWidth: listWidth,
-            ref: listWrapperRef
+            listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
             role: "group",
             id: listId,
-            virtual: false,
-            listMaxHeight: item === null || item === void 0 ? void 0 : item.listMaxHeight
+            virtual: false
         }, (_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),
@@ -58,8 +54,7 @@ export var Inner = function(param) {
                 path: path,
                 dispatchPath: dispatchPath,
                 index: innerIndex,
-                listWidth: listWidth,
-                portal: listWrapperRef
+                listWidth: listWidth
             });
         }))));
     }