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

package/emotion/cjs/components/Select/ui/VirtualList/VirtualList.js

@@ -8,33 +8,101 @@ Object.defineProperty(exports, "VirtualList", {
         return VirtualList;
     }
 });
-var _react = /*#__PURE__*/ _interop_require_default(require("react"));
-var _rcvirtuallist = /*#__PURE__*/ _interop_require_default(require("rc-virtual-list"));
+var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
+var _reactvirtual = require("@tanstack/react-virtual");
 var _utils = require("../../../../utils");
 var _ui = require("../Inner/ui");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
     };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
 }
 var VirtualList = function(param) {
     var items = param.items, listMaxHeight = param.listMaxHeight, onScroll = param.onScroll;
-    return /*#__PURE__*/ _react.default.createElement(_rcvirtuallist.default, {
-        data: items,
-        height: (0, _utils.getHeightAsNumber)(listMaxHeight),
-        fullHeight: false,
-        itemHeight: 100,
-        itemKey: "id",
+    var _virtualItems_;
+    var parentRef = (0, _react.useRef)(null);
+    var virtualizer = (0, _reactvirtual.useVirtualizer)({
+        count: items.length,
+        getScrollElement: function() {
+            return parentRef.current;
+        },
+        estimateSize: function() {
+            return 48;
+        }
+    });
+    var virtualItems = virtualizer.getVirtualItems();
+    var _virtualItems__start;
+    return /*#__PURE__*/ _react.default.createElement("div", {
+        ref: parentRef,
+        style: {
+            height: 'auto',
+            maxHeight: (0, _utils.getHeightAsNumber)(listMaxHeight),
+            overflowY: 'auto'
+        },
         onScroll: onScroll
-    }, function(item, index, props) {
-        return /*#__PURE__*/ _react.default.createElement("div", props, /*#__PURE__*/ _react.default.createElement(_ui.Item, {
-            item: item,
+    }, /*#__PURE__*/ _react.default.createElement("div", {
+        style: {
+            height: virtualizer.getTotalSize(),
+            width: '100%',
+            position: 'relative'
+        }
+    }, /*#__PURE__*/ _react.default.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.default.createElement("div", {
+            key: virtualRow.key,
+            "data-index": virtualRow.index,
+            ref: virtualizer.measureElement
+        }, /*#__PURE__*/ _react.default.createElement(_ui.Item, {
+            item: items[virtualRow.index],
             path: [
                 'root'
             ],
             currentLevel: 0,
-            index: index,
+            index: virtualRow.index,
             ariaLevel: 1
         }));
-    });
+    }))));
 };

package/emotion/cjs/examples/components/Combobox/Combobox.js

@@ -1,16 +1 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "Combobox", {
-    enumerable: true,
-    get: function() {
-        return Combobox;
-    }
-});
-var _engines = require("../../../engines");
-var _ = require("../../..");
-var _Comboboxconfig = require("./Combobox.config");
-var mergedConfig = (0, _engines.mergeConfig)(_.comboboxNewConfig, _Comboboxconfig.config);
-var ComboboxComponent = (0, _engines.component)(mergedConfig);
-var Combobox = ComboboxComponent;

package/emotion/es/components/Autocomplete/Autocomplete.js

@@ -99,7 +99,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-import React, { forwardRef, useState, useReducer, useLayoutEffect, useRef } from "react";
+import React, { forwardRef, useState, useReducer, useRef } from "react";
 import { safeUseId } from "../../utils";
 import { useDidMountEffect, useOutsideClick } from "../../hooks";
 import { FloatingPopover } from "./FloatingPopover";
@@ -111,7 +111,7 @@ import { useKeyNavigation } from "./hooks/useKeyboardNavigation";
  * Компонент Autocomplete. Поле ввода с подсказками в выпадающем списке.
  */ export var autocompleteRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(_param, ref) {
-        var outerValue = _param.value, defaultValue = _param.defaultValue, onChange = _param.onChange, suggestions = _param.suggestions, view = _param.view, size = _param.size, labelPlacement = _param.labelPlacement, keepPlaceholder = _param.keepPlaceholder, disabled = _param.disabled, readOnly = _param.readOnly, label = _param.label, leftHelper = _param.leftHelper, contentLeft = _param.contentLeft, contentRight = _param.contentRight, textBefore = _param.textBefore, textAfter = _param.textAfter, onScroll = _param.onScroll, _param_listMaxHeight = _param.listMaxHeight, listMaxHeight = _param_listMaxHeight === void 0 ? '25rem' : _param_listMaxHeight, listWidth = _param.listWidth, portal = _param.portal, zIndex = _param.zIndex, filter = _param.filter, onSuggestionSelect = _param.onSuggestionSelect, _param_threshold = _param.threshold, threshold = _param_threshold === void 0 ? 2 : _param_threshold, renderList = _param.renderList, renderListEnd = _param.renderListEnd, renderItem = _param.renderItem, onSearch = _param.onSearch, hintText = _param.hintText, _param_hintView = _param.hintView, hintView = _param_hintView === void 0 ? 'default' : _param_hintView, _param_hintSize = _param.hintSize, hintSize = _param_hintSize === void 0 ? 'm' : _param_hintSize, beforeList = _param.beforeList, afterList = _param.afterList, _param_virtual = _param.virtual, virtual = _param_virtual === void 0 ? false : _param_virtual, // @ts-ignore
+        var outerValue = _param.value, defaultValue = _param.defaultValue, onChange = _param.onChange, suggestions = _param.suggestions, view = _param.view, size = _param.size, labelPlacement = _param.labelPlacement, keepPlaceholder = _param.keepPlaceholder, disabled = _param.disabled, readOnly = _param.readOnly, label = _param.label, leftHelper = _param.leftHelper, contentLeft = _param.contentLeft, contentRight = _param.contentRight, textBefore = _param.textBefore, textAfter = _param.textAfter, onScroll = _param.onScroll, _param_listMaxHeight = _param.listMaxHeight, listMaxHeight = _param_listMaxHeight === void 0 ? '25rem' : _param_listMaxHeight, listWidth = _param.listWidth, portal = _param.portal, zIndex = _param.zIndex, filter = _param.filter, onSuggestionSelect = _param.onSuggestionSelect, _param_threshold = _param.threshold, threshold = _param_threshold === void 0 ? 2 : _param_threshold, renderList = _param.renderList, renderListEnd = _param.renderListEnd, renderItem = _param.renderItem, onSearch = _param.onSearch, hintText = _param.hintText, _param_hintView = _param.hintView, hintView = _param_hintView === void 0 ? 'default' : _param_hintView, _param_hintSize = _param.hintSize, hintSize = _param_hintSize === void 0 ? 'm' : _param_hintSize, beforeList = _param.beforeList, afterList = _param.afterList, _param_virtual = _param.virtual, virtual = _param_virtual === void 0 ? false : _param_virtual, _param_flip = _param.flip, flip = _param_flip === void 0 ? false : _param_flip, // @ts-ignore
         _offset = _param._offset, rest = _object_without_properties(_param, [
             "value",
             "defaultValue",
@@ -147,10 +147,11 @@ import { useKeyNavigation } from "./hooks/useKeyboardNavigation";
             "beforeList",
             "afterList",
             "virtual",
+            "flip",
             "_offset"
         ]);
         var _useReducer = _sliced_to_array(useReducer(focusedReducer, null), 2), focused = _useReducer[0], dispatchFocused = _useReducer[1];
-        var _useState = _sliced_to_array(useState(''), 2), innerValue = _useState[0], setInnerValue = _useState[1];
+        var _useState = _sliced_to_array(useState(defaultValue || ''), 2), innerValue = _useState[0], setInnerValue = _useState[1];
         var _useState1 = _sliced_to_array(useState(false), 2), isOpen = _useState1[0], setIsOpen = _useState1[1];
         var listId = safeUseId();
         var value = outerValue !== null && outerValue !== void 0 ? outerValue : innerValue;
@@ -206,13 +207,6 @@ import { useKeyNavigation } from "./hooks/useKeyboardNavigation";
         }, [
             value
         ]);
-        useLayoutEffect(function() {
-            if (defaultValue) {
-                setInnerValue(defaultValue);
-            }
-        }, [
-            defaultValue
-        ]);
         return /*#__PURE__*/ React.createElement(Root, {
             view: view,
             size: size,
@@ -228,6 +222,7 @@ import { useKeyNavigation } from "./hooks/useKeyboardNavigation";
             zIndex: zIndex,
             listWidth: listWidth,
             offset: _offset,
+            flip: flip,
             target: function(referenceRef) {
                 return /*#__PURE__*/ React.createElement(StyledTextField, _object_spread({
                     ref: ref,

package/emotion/es/components/Autocomplete/FloatingPopover.js

@@ -1,3 +1,11 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -11,6 +19,12 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -50,11 +64,22 @@ function _object_spread_props(target, source) {
     }
     return target;
 }
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 import { flip, shift, size, useFloating, FloatingPortal, autoUpdate, offset as offsetMiddleware } from "@floating-ui/react";
 import React, { forwardRef } from "react";
 import { safeUseId } from "../../utils";
 var FloatingPopover = /*#__PURE__*/ forwardRef(function(param, ref) {
-    var target = param.target, children = param.children, opened = param.opened, portal = param.portal, zIndex = param.zIndex, listWidth = param.listWidth, offset = param.offset;
+    var target = param.target, children = param.children, opened = param.opened, portal = param.portal, zIndex = param.zIndex, listWidth = param.listWidth, offset = param.offset, flipFlag = param.flip;
     var _useFloating = useFloating({
         whileElementsMounted: function whileElementsMounted(referenceEl, floatingEl, update) {
             return autoUpdate(referenceEl, floatingEl, update, {
@@ -69,10 +94,12 @@ var FloatingPopover = /*#__PURE__*/ forwardRef(function(param, ref) {
             offsetMiddleware({
                 mainAxis: (offset === null || offset === void 0 ? void 0 : offset[1]) || 0,
                 alignmentAxis: (offset === null || offset === void 0 ? void 0 : offset[0]) || 0
-            }),
+            })
+        ].concat(_to_consumable_array(flipFlag ? [
             flip({
                 fallbackAxisSideDirection: 'end'
-            }),
+            })
+        ] : []), [
             shift(),
             size({
                 apply: function apply(param) {
@@ -82,7 +109,7 @@ var FloatingPopover = /*#__PURE__*/ forwardRef(function(param, ref) {
                     });
                 }
             })
-        ]
+        ])
     }), refs = _useFloating.refs, floatingStyles = _useFloating.floatingStyles;
     var wrappedId = safeUseId();
     // Проверка на target. Это может быть как ReactNode, так и функция, в которую пробрасывается ref.

package/emotion/es/components/Autocomplete/ui/VirtualList/VirtualList.js

@@ -1,23 +1,55 @@
-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 { SuggestionItem } from "../SuggestionItem/SuggestionItem";
 export var VirtualList = function(param) {
     var items = param.items, onClick = param.onClick, listId = param.listId, listMaxHeight = param.listMaxHeight, onScroll = param.onScroll, renderItem = param.renderItem;
-    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(SuggestionItem, {
-            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(SuggestionItem, {
+            item: items[virtualRow.index],
             onClick: onClick,
-            id: "".concat(listId, "/").concat(index),
+            id: "".concat(listId, "/").concat(virtualRow.index),
             focused: false,
             renderItem: renderItem
         }));
-    });
+    }))));
 };

package/emotion/es/components/Carousel/CarouselNew/Carousel.js

@@ -59,9 +59,9 @@ var DOTS_CENTERED_DEFAULT = false;
  * Компонент для создания списков с прокруткой.
  */ export var carouselNewRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(param, ref) {
-        var view = param.view, size = param.size, _param_scrollAlign = param.scrollAlign, scrollAlign = _param_scrollAlign === void 0 ? 'start' : _param_scrollAlign, children = param.children, _param_controlArrowsDisabled = param.controlArrowsDisabled, controlArrowsDisabled = _param_controlArrowsDisabled === void 0 ? false : _param_controlArrowsDisabled, paginationOptions = param.paginationOptions, _param_gap = param.gap, gap = _param_gap === void 0 ? '20px' : _param_gap, className = param.className, style = param.style;
-        var _useState = _sliced_to_array(useState(0), 2), index = _useState[0], setIndex = _useState[1];
+        var view = param.view, size = param.size, _param_scrollAlign = param.scrollAlign, scrollAlign = _param_scrollAlign === void 0 ? 'start' : _param_scrollAlign, children = param.children, _param_controlArrowsDisabled = param.controlArrowsDisabled, controlArrowsDisabled = _param_controlArrowsDisabled === void 0 ? false : _param_controlArrowsDisabled, paginationOptions = param.paginationOptions, _param_gap = param.gap, gap = _param_gap === void 0 ? '20px' : _param_gap, className = param.className, style = param.style, defaultIndex = param.defaultIndex;
         var slidesAmount = Children.count(children);
+        var _useState = _sliced_to_array(useState(defaultIndex && defaultIndex >= 0 ? Math.min(slidesAmount - 1, defaultIndex) : 0), 2), index = _useState[0], setIndex = _useState[1];
         var handleClickLeft = function() {
             setIndex(Math.max(0, index - 1));
         };

package/emotion/es/components/Carousel/CarouselNew/hooks/useCarousel.js

@@ -34,6 +34,7 @@ export var useCarousel = function(param) {
     var index = param.index, scrollAlign = param.scrollAlign;
     var scrollRef = useRef(null);
     var trackRef = useRef(null);
+    var isFirstRender = useRef(true);
     // Прокрутка до нужной позиции индекса, если индекс изменился.
     useEffect(function() {
         if (!scrollRef.current || !trackRef.current) {
@@ -49,9 +50,13 @@ export var useCarousel = function(param) {
                 scrollAlign: scrollAlign
             });
             scrollRef.current.scrollTo({
-                left: pos
+                left: pos,
+                behavior: isFirstRender.current ? 'instant' : 'smooth'
             });
         }
+        if (isFirstRender.current) {
+            isFirstRender.current = false;
+        }
     }, [
         index
     ]);

package/emotion/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)))))));
     });