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

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

@@ -8,101 +8,33 @@ Object.defineProperty(exports, "VirtualList", {
         return VirtualList;
     }
 });
-var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
-var _reactvirtual = require("@tanstack/react-virtual");
+var _react = /*#__PURE__*/ _interop_require_default(require("react"));
+var _rcvirtuallist = /*#__PURE__*/ _interop_require_default(require("rc-virtual-list"));
 var _utils = require("../../../../utils");
 var _ui = require("../Inner/ui");
-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
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
     };
-    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;
-    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'
-        },
+    return /*#__PURE__*/ _react.default.createElement(_rcvirtuallist.default, {
+        data: items,
+        height: (0, _utils.getHeightAsNumber)(listMaxHeight),
+        fullHeight: false,
+        itemHeight: 100,
+        itemKey: "id",
         onScroll: onScroll
-    }, /*#__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],
+    }, function(item, index, props) {
+        return /*#__PURE__*/ _react.default.createElement("div", props, /*#__PURE__*/ _react.default.createElement(_ui.Item, {
+            item: item,
             path: [
                 'root'
             ],
             currentLevel: 0,
-            index: virtualRow.index,
+            index: index,
             ariaLevel: 1
         }));
-    }))));
+    });
 };

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

@@ -1 +1,16 @@
 "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, useRef } from "react";
+import React, { forwardRef, useState, useReducer, useLayoutEffect, useRef } from "react";
 import { safeUseId } from "../../utils";
 import { useDidMountEffect, useOutsideClick } from "../../hooks";
 import { FloatingPopover } from "./FloatingPopover";
@@ -150,7 +150,7 @@ import { useKeyNavigation } from "./hooks/useKeyboardNavigation";
             "_offset"
         ]);
         var _useReducer = _sliced_to_array(useReducer(focusedReducer, null), 2), focused = _useReducer[0], dispatchFocused = _useReducer[1];
-        var _useState = _sliced_to_array(useState(defaultValue || ''), 2), innerValue = _useState[0], setInnerValue = _useState[1];
+        var _useState = _sliced_to_array(useState(''), 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,6 +206,13 @@ import { useKeyNavigation } from "./hooks/useKeyboardNavigation";
         }, [
             value
         ]);
+        useLayoutEffect(function() {
+            if (defaultValue) {
+                setInnerValue(defaultValue);
+            }
+        }, [
+            defaultValue
+        ]);
         return /*#__PURE__*/ React.createElement(Root, {
             view: view,
             size: size,

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

@@ -1,55 +1,23 @@
-import React, { useRef } from "react";
-import { useVirtualizer } from "@tanstack/react-virtual";
+import React from "react";
+import List from "rc-virtual-list";
 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;
-    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'
-        },
+    return /*#__PURE__*/ React.createElement(List, {
+        data: items,
+        height: getHeightAsNumber(listMaxHeight),
+        fullHeight: false,
+        itemHeight: 100,
+        itemKey: "id",
         onScroll: onScroll
-    }, /*#__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],
+    }, function(item, index, props) {
+        return /*#__PURE__*/ React.createElement("div", props, /*#__PURE__*/ React.createElement(SuggestionItem, {
+            item: item,
             onClick: onClick,
-            id: "".concat(listId, "/").concat(virtualRow.index),
+            id: "".concat(listId, "/").concat(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, defaultIndex = param.defaultIndex;
+        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 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,7 +34,6 @@ 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) {
@@ -50,13 +49,9 @@ export var useCarousel = function(param) {
                 scrollAlign: scrollAlign
             });
             scrollRef.current.scrollTo({
-                left: pos,
-                behavior: isFirstRender.current ? 'instant' : 'smooth'
+                left: pos
             });
         }
-        if (isFirstRender.current) {
-            isFirstRender.current = false;
-        }
     }, [
         index
     ]);

package/emotion/es/components/Combobox/ComboboxNew/Combobox.js

@@ -141,13 +141,14 @@ 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, isEmpty } from "../../../utils";
-import { useOutsideClick, useDidMountLayoutEffect } from "../../../hooks";
+import { safeUseId } from "../../../utils";
+import { isEmpty } from "../../../utils";
+import { useOutsideClick } 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, getTextValue } from "./utils";
+import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId, getRemovedElement } from "./utils";
 import { Inner, StyledTextField, VirtualList, SelectAll } from "./ui";
 import { pathReducer, focusedPathReducer } from "./reducers";
 import { getPathMap, getTreeMaps } from "./hooks/getPathMaps";
@@ -160,7 +161,7 @@ import { Context } from "./Combobox.context";
  * Поле ввода с выпадающим списком и возможностью фильтрации и выбора элементов.
  */ export var comboboxRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(props, ref) {
-        var _getItemByFocused;
+        var _valueToItemMap_get, _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",
@@ -218,15 +219,17 @@ import { Context } from "./Combobox.context";
         }, [
             items
         ]), 3), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1], labelToItemMap = _useMemo[2];
-        var _useState = _sliced_to_array(useState(getTextValue(multiple, outerValue, valueToItemMap, renderValue)), 2), textValue = _useState[0], setTextValue = _useState[1];
+        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 _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() {
-            return filterItems(transformedItems, textValue, getTextValue(multiple, value, valueToItemMap, renderValue), filter);
+            var _valueToItemMap_get;
+            return filterItems(transformedItems, textValue, ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value, filter);
         }, [
             transformedItems,
             textValue,
@@ -263,19 +266,30 @@ import { Context } from "./Combobox.context";
             if (onToggle) {
                 onToggle(false);
             }
-            // Возвращаем актуальное значение поля ввода после закрытия выпадающего списка.
-            setTextValue(getTextValue(multiple, value, valueToItemMap, renderValue));
+            // Проверяем, отличается ли значение в инпуте от выбранного 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 || '');
+                }
+            }
         }, 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);
                 }
@@ -511,6 +525,10 @@ 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.
@@ -520,8 +538,9 @@ import { Context } from "./Combobox.context";
             items
         ]);
         // При изменении value нужно возвращать значение в инпуте к исходному.
-        useDidMountLayoutEffect(function() {
-            setTextValue(getTextValue(multiple, value, valueToItemMap, renderValue));
+        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()) || '');
         }, [
             outerValue,
             internalValue
@@ -628,6 +647,7 @@ import { Context } from "./Combobox.context";
             readOnly: readOnly,
             name: name
         }, /*#__PURE__*/ React.createElement(ListWrapper, {
+            ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ React.createElement(Ul, {
             role: "tree",
@@ -636,7 +656,6 @@ import { Context } from "./Combobox.context";
             listMaxHeight: listMaxHeight || listHeight,
             ref: targetRef,
             virtual: virtual,
-            listOverflow: listOverflow,
             onScroll: virtual ? undefined : onScroll
         }, beforeList, isEmpty(filteredItems) ? /*#__PURE__*/ React.createElement(StyledEmptyState, {
             className: classes.emptyStateWrapper,
@@ -658,7 +677,8 @@ import { Context } from "./Combobox.context";
                 path: path,
                 dispatchPath: dispatchPath,
                 index: index,
-                listWidth: listWidth
+                listWidth: listWidth,
+                portal: listWrapperRef
             });
         })), afterList)))))));
     });