@salutejs/plasma-new-hope 0.336.0-canary.2219.17586567115.0 → 0.336.0-canary.2219.17680564117.0

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

@@ -6,9 +6,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-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, {
@@ -22,9 +19,6 @@ 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 _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -52,9 +46,6 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-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] : {};
@@ -124,9 +115,6 @@ function _object_without_properties_loose(source, excluded) {
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
@@ -147,7 +135,7 @@ 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, getTextValue } from "./utils";
 import { Inner, StyledTextField, VirtualList, SelectAll } from "./ui";
 import { pathReducer, focusedPathReducer } from "./reducers";
 import { getPathMap, getTreeMaps } from "./hooks/getPathMaps";
@@ -218,7 +206,7 @@ import { Context } from "./Combobox.context";
             return getTreeMaps(transformedItems);
         }, [
             items
-        ]), 3), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1], labelToItemMap = _useMemo[2];
+        ]), 2), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[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;
@@ -306,39 +294,18 @@ import { Context } from "./Combobox.context";
             }
         };
         // Обработчик чипов
-        var handleChipsChange = function(chipLabels) {
+        var handleChipClick = function(chip) {
             if (!Array.isArray(value)) return;
-            // TODO: #1564
-            // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
-            if (renderValue && !isTargetAmount) {
-                var resultValues = _to_consumable_array(value);
-                value.forEach(function(_, index) {
+            if (isTargetAmount) {
+                // При закрытии чипа в режиме isTargetAmount в value оставляем только disabled-элементы
+                onChange(value.filter(function(val) {
                     var _valueToItemMap_get;
-                    var stringValue = value[index];
-                    var label = (_valueToItemMap_get = valueToItemMap.get(stringValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label;
-                    var labelAfterRenderValue = renderValue(label ? labelToItemMap.get(label) : {
-                        value: stringValue,
-                        label: stringValue.toString()
-                    });
-                    if (!chipLabels.includes(labelAfterRenderValue)) {
-                        resultValues.splice(index, 1);
-                    }
-                });
-                var removedItemValue = getRemovedElement(value, resultValues, isTargetAmount);
-                onChange(resultValues, removedItemValue ? valueToItemMap.get(removedItemValue) || {
-                    value: removedItemValue,
-                    label: removedItemValue.toString()
-                } : null);
+                    return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
+                }));
             } else {
-                var newValues = chipLabels.map(function(chipLabel) {
-                    var _labelToItemMap_get;
-                    return ((_labelToItemMap_get = labelToItemMap.get(chipLabel)) === null || _labelToItemMap_get === void 0 ? void 0 : _labelToItemMap_get.value) || chipLabel;
-                });
-                var removedItemValue1 = getRemovedElement(value, newValues, isTargetAmount);
-                onChange(newValues, removedItemValue1 ? valueToItemMap.get(removedItemValue1) || {
-                    value: removedItemValue1,
-                    label: removedItemValue1.toString()
-                } : null);
+                onChange(value.filter(function(val) {
+                    return val !== chip.value;
+                }), valueToItemMap.get(chip.value) || null);
             }
         };
         // Обработчик открытия/закрытия выпадающего списка
@@ -368,14 +335,32 @@ import { Context } from "./Combobox.context";
                 return;
             }
             var checkedCopy = new Map(checked);
-            if (!checkedCopy.get(item.value)) {
-                checkedCopy.set(item.value, true);
-                updateDescendants(item, checkedCopy, true, valueToItemMap);
-            } else {
-                checkedCopy.set(item.value, false);
-                updateDescendants(item, checkedCopy, false);
+            switch(checkedCopy.get(item.value)){
+                // Если чекбокс в состоянии indeterminate
+                case 'indeterminate':
+                    {
+                        updateDescendants(item, checkedCopy, true, valueToItemMap);
+                        break;
+                    }
+                // Если чекбокс в состоянии checked
+                case true:
+                    {
+                        updateDescendants(item, checkedCopy, false, valueToItemMap);
+                        checkedCopy.set(item.value, false);
+                        break;
+                    }
+                // Если чекбокс в состоянии unchecked
+                case false:
+                    {
+                        updateDescendants(item, checkedCopy, true, valueToItemMap);
+                        checkedCopy.set(item.value, true);
+                        break;
+                    }
+                default:
+                    {
+                        break;
+                    }
             }
-            updateAncestors(item, checkedCopy);
             var newValues = [];
             valueToItemMap.forEach(function(item, key) {
                 if (checkedCopy.get(key)) {
@@ -442,20 +427,28 @@ import { Context } from "./Combobox.context";
                 if (value.length === 0) return [];
                 if (isTargetAmount) {
                     return [
-                        "Выбрано ".concat(targetAmount || value.length)
+                        {
+                            value: '_removeAll',
+                            label: "Выбрано ".concat(targetAmount || value.length),
+                            disabled: value.every(function(val) {
+                                var _valueToItemMap_get;
+                                return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
+                            })
+                        }
                     ];
                 }
-                var renderValueMapper = renderValue && function(stringValue) {
-                    return renderValue(valueToItemMap.get(stringValue) || {
-                        value: stringValue,
-                        label: stringValue.toString()
-                    });
-                };
-                var valueToItemMapper = function(stringValue) {
-                    var _valueToItemMap_get;
-                    return ((_valueToItemMap_get = valueToItemMap.get(stringValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || stringValue.toString();
-                };
-                return value.map(renderValueMapper || valueToItemMapper);
+                return value.map(function(value) {
+                    var _valueToItemMap_get, _valueToItemMap_get1;
+                    var currentLabel = renderValue ? renderValue(valueToItemMap.get(value) || {
+                        value: value,
+                        label: value
+                    }) : ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value.toString();
+                    return {
+                        value: value,
+                        label: currentLabel,
+                        disabled: ((_valueToItemMap_get1 = valueToItemMap.get(value)) === null || _valueToItemMap_get1 === void 0 ? void 0 : _valueToItemMap_get1.disabled) || false
+                    };
+                });
             }
             return [];
         };
@@ -612,8 +605,8 @@ import { Context } from "./Combobox.context";
                     keepPlaceholder: keepPlaceholder
                 }, multiple ? {
                     enumerationType: 'chip',
-                    chips: getChips(),
-                    onChangeChips: handleChipsChange
+                    _chips: getChips(),
+                    _onChipClick: handleChipClick
                 } : {
                     enumerationType: 'plain'
                 }, rest), {

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

@@ -24,16 +24,14 @@ export var getPathMap = function(items) {
 export var getTreeMaps = function(items) {
     var valueToCheckedMap = new Map();
     var valueToItemMap = new Map();
-    var labelToItemMap = new Map();
     var rec = function(items) {
         var prevIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '';
         items === null || items === void 0 ? void 0 : items.forEach(function(item, index) {
-            var value = item.value, label = item.label, innerItems = item.items;
+            var value = item.value, innerItems = item.items;
             var currIndex = "".concat(prevIndex, "/").concat(index).replace(/^(\/)/, '');
             valueToCheckedMap.set(value, false);
             if (isEmpty(innerItems) || !innerItems) {
                 valueToItemMap.set(value, item);
-                labelToItemMap.set(label, item);
             } else {
                 rec(innerItems, currIndex);
             }
@@ -42,7 +40,6 @@ export var getTreeMaps = function(items) {
     rec(items);
     return [
         valueToCheckedMap,
-        valueToItemMap,
-        labelToItemMap
+        valueToItemMap
     ];
 };

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

@@ -5,5 +5,4 @@ export { updateSingleAncestors } from "./updateSingleAncestors";
 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

@@ -325,16 +325,6 @@ export var datePickerRangeRoot = function(Root) {
                 return;
             }
             var isCalendarOpen = ((firstInputRef === null || firstInputRef === void 0 ? void 0 : (_firstInputRef_current = firstInputRef.current) === null || _firstInputRef_current === void 0 ? void 0 : _firstInputRef_current.contains((event === null || event === void 0 ? void 0 : event.target) || null)) || (secondInputRef === null || secondInputRef === void 0 ? void 0 : (_secondInputRef_current = secondInputRef.current) === null || _secondInputRef_current === void 0 ? void 0 : _secondInputRef_current.contains((event === null || event === void 0 ? void 0 : event.target) || null))) && (event === null || event === void 0 ? void 0 : event.code) !== keys.Escape ? true : currentOpened;
-            if (!isCalendarOpen) {
-                if (calendarFirstValue && !calendarSecondValue) {
-                    var _secondInputRef_current1;
-                    secondInputRef === null || secondInputRef === void 0 ? void 0 : (_secondInputRef_current1 = secondInputRef.current) === null || _secondInputRef_current1 === void 0 ? void 0 : _secondInputRef_current1.focus();
-                }
-                if (calendarSecondValue && !calendarFirstValue) {
-                    var _firstInputRef_current1;
-                    firstInputRef === null || firstInputRef === void 0 ? void 0 : (_firstInputRef_current1 = firstInputRef.current) === null || _firstInputRef_current1 === void 0 ? void 0 : _firstInputRef_current1.focus();
-                }
-            }
             if (!isCalendarOpen) {
                 setSecondTextFieldClicked(false);
             }
@@ -373,28 +363,40 @@ export var datePickerRangeRoot = function(Root) {
             }, commonArgs)), endOriginalDate = _getFormattedDates1.originalDate;
             if (!calendarFirstValue && correctStartDates.calendar) {
                 startOriginalDate = new Date(correctStartDates.calendar);
+            }
+            if (!calendarSecondValue && correctEndDates.calendar) {
+                endOriginalDate = new Date(correctEndDates.calendar);
+            }
+            var _getSortedValues = _sliced_to_array(getSortedValues([
+                startOriginalDate,
+                endOriginalDate
+            ]), 2), startValue = _getSortedValues[0], endValue = _getSortedValues[1];
+            var _getFormattedDates2 = getFormattedDates(_object_spread({
+                value: startValue,
+                delimiter: dateFormatDelimiter
+            }, commonArgs)), formattedFirstDate = _getFormattedDates2.formattedDate, originalFirstDate = _getFormattedDates2.originalDate, isoFirstDate = _getFormattedDates2.isoDate;
+            var _getFormattedDates3 = getFormattedDates(_object_spread({
+                value: endValue,
+                delimiter: dateFormatDelimiter
+            }, commonArgs)), formattedSecondDate = _getFormattedDates3.formattedDate, originalSecondDate = _getFormattedDates3.originalDate, isoSecondDate = _getFormattedDates3.isoDate;
+            if (formattedFirstDate !== inputFirstValue) {
                 if (onChangeFirstValue) {
-                    onChangeFirstValue(event, correctStartDates.input, correctStartDates.calendar, correctStartDates.calendar.toISOString());
+                    onChangeFirstValue(event, formattedFirstDate, originalFirstDate, isoFirstDate);
                 }
                 if (onCommitFirstDate) {
-                    var dateInfo = getFirstQuarterInfo(correctStartDates.calendar);
-                    onCommitFirstDate(correctStartDates.input, false, true, dateInfo, correctStartDates.calendar, correctStartDates.calendar.toISOString());
+                    var dateInfo = originalFirstDate ? getFirstQuarterInfo(originalFirstDate) : undefined;
+                    onCommitFirstDate(formattedFirstDate, false, true, dateInfo, originalFirstDate, isoFirstDate);
                 }
             }
-            if (!calendarSecondValue && correctEndDates.calendar) {
-                endOriginalDate = new Date(correctEndDates.calendar);
+            if (formattedSecondDate !== inputSecondValue) {
                 if (onChangeSecondValue) {
-                    onChangeSecondValue(event, correctEndDates.input, correctEndDates.calendar, correctEndDates.calendar.toISOString());
+                    onChangeSecondValue(event, formattedSecondDate, originalSecondDate, isoSecondDate);
                 }
                 if (onCommitSecondDate) {
-                    var dateInfo1 = getSecondQuarterInfo(correctEndDates.calendar);
-                    onCommitSecondDate(correctEndDates.input, false, true, dateInfo1, correctEndDates.calendar, correctEndDates.calendar.toISOString());
+                    var dateInfo1 = originalSecondDate ? getSecondQuarterInfo(originalSecondDate) : undefined;
+                    onCommitSecondDate(formattedSecondDate, false, true, dateInfo1, originalSecondDate, isoSecondDate);
                 }
             }
-            var _getSortedValues = _sliced_to_array(getSortedValues([
-                startOriginalDate,
-                endOriginalDate
-            ]), 2), startValue = _getSortedValues[0], endValue = _getSortedValues[1];
             setFirstInputValue(startValue);
             setSecondInputValue(endValue);
             outerHandler === null || outerHandler === void 0 ? void 0 : outerHandler(event);

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

@@ -131,7 +131,7 @@ import React, { useRef, useCallback, useEffect, useState, forwardRef, isValidEle
 import { usePopper } from "react-popper";
 import { useForkRef } from "@salutejs/plasma-core";
 import { useFocusTrap } from "../../hooks";
-import { cx } from "../../utils";
+import { cx, safeUseId } from "../../utils";
 import { Portal } from "../Portal";
 import { base as viewCSS } from "./variations/_view/base";
 import { StyledArrow, StyledPopover, StyledRoot, StyledWrapper } from "./Popover.styles";
@@ -176,6 +176,7 @@ export var POPOVER_PORTAL_ID = 'plasma-popover-root';
         var portalRef = useRef(null);
         var targetRef = useRef(null);
         var trapRef = useFocusTrap(innerIsOpen && isFocusTrapped);
+        var uuid = safeUseId();
         var popoverForkRef = useForkRef(popoverRef, trapRef);
         var _useState = _sliced_to_array(useState(null), 2), arrowElement = _useState[0], setArrowElement = _useState[1];
         var _useState1 = _sliced_to_array(useState(false), 2), forceRender = _useState1[1];
@@ -326,8 +327,9 @@ export var POPOVER_PORTAL_ID = 'plasma-popover-root';
                 portal = rootRef.current;
             }
             if (!portal) {
+                var portalId = "".concat(POPOVER_PORTAL_ID, "-").concat(uuid);
                 portal = document.createElement('div');
-                portal.setAttribute('id', POPOVER_PORTAL_ID);
+                portal.setAttribute('id', portalId);
                 if (typeof frame === 'string' && frame !== 'document') {
                     var _document_getElementById;
                     (_document_getElementById = document.getElementById(frame)) === null || _document_getElementById === void 0 ? void 0 : _document_getElementById.appendChild(portal);

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

@@ -199,7 +199,7 @@ import { Context } from "./Select.context";
             items
         ]);
         // Создаем структуры для быстрой работы с деревом
-        var _usePathMaps = _sliced_to_array(usePathMaps(transformedItems), 5), pathMap = _usePathMaps[0], focusedToValueMap = _usePathMaps[1], valueToCheckedMap = _usePathMaps[2], valueToItemMap = _usePathMaps[3], labelToItemMap = _usePathMaps[4];
+        var _usePathMaps = _sliced_to_array(usePathMaps(transformedItems), 4), pathMap = _usePathMaps[0], focusedToValueMap = _usePathMaps[1], valueToCheckedMap = _usePathMaps[2], valueToItemMap = _usePathMaps[3];
         var _useState = _sliced_to_array(useState(props.multiselect ? [] : ''), 2), internalValue = _useState[0], setInternalValue = _useState[1];
         var value = outerValue !== null && outerValue !== undefined ? outerValue : internalValue;
         var floatingPopoverRef = useRef(null);
@@ -287,14 +287,32 @@ import { Context } from "./Select.context";
                 return;
             }
             var checkedCopy = new Map(checked);
-            if (!checkedCopy.get(item.value)) {
-                checkedCopy.set(item.value, true);
-                updateDescendants(item, checkedCopy, true, valueToItemMap);
-            } else {
-                checkedCopy.set(item.value, false);
-                updateDescendants(item, checkedCopy, false);
+            switch(checkedCopy.get(item.value)){
+                // Если чекбокс в состоянии indeterminate
+                case 'indeterminate':
+                    {
+                        updateDescendants(item, checkedCopy, true, valueToItemMap);
+                        break;
+                    }
+                // Если чекбокс в состоянии checked
+                case true:
+                    {
+                        updateDescendants(item, checkedCopy, false, valueToItemMap);
+                        checkedCopy.set(item.value, false);
+                        break;
+                    }
+                // Если чекбокс в состоянии unchecked
+                case false:
+                    {
+                        updateDescendants(item, checkedCopy, true, valueToItemMap);
+                        checkedCopy.set(item.value, true);
+                        break;
+                    }
+                default:
+                    {
+                        break;
+                    }
             }
-            updateAncestors(item, checkedCopy);
             var newValues = [];
             valueToItemMap.forEach(function(item, key) {
                 if (checkedCopy.get(key)) {
@@ -485,7 +503,6 @@ import { Context } from "./Select.context";
                     activeDescendantItemValue: activeDescendantItemValue,
                     isTargetAmount: isTargetAmount,
                     onChange: onChange,
-                    labelToItemMap: labelToItemMap,
                     chipView: chipView,
                     separator: separator,
                     requiredProps: requiredProps,

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

@@ -5,18 +5,16 @@ export var usePathMaps = function(items) {
     var focusedToValueMap = new Map();
     var valueToCheckedMap = new Map();
     var valueToItemMap = new Map();
-    var labelToItemMap = new Map();
     pathMap.set('root', (items === null || items === void 0 ? void 0 : items.length) || 0);
     var rec = function(items) {
         var prevIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '';
         items === null || items === void 0 ? void 0 : items.forEach(function(item, index) {
-            var value = item.value, label = item.label, innerItems = item.items;
+            var value = item.value, innerItems = item.items;
             var currIndex = "".concat(prevIndex, "/").concat(index).replace(/^(\/)/, '');
             focusedToValueMap.set(currIndex, item);
             valueToCheckedMap.set(value, false);
             if (isEmpty(innerItems) || !innerItems) {
                 valueToItemMap.set(value, item);
-                labelToItemMap.set(label, item);
             } else {
                 pathMap.set(value, innerItems.length);
                 rec(innerItems, currIndex);
@@ -28,7 +26,6 @@ export var usePathMaps = function(items) {
         pathMap,
         focusedToValueMap,
         valueToCheckedMap,
-        valueToItemMap,
-        labelToItemMap
+        valueToItemMap
     ];
 };

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

@@ -2,7 +2,7 @@ import React, { forwardRef } from "react";
 import { useForkRef } from "@salutejs/plasma-core";
 import { Button, Textfield } from "./ui";
 export var Target = /*#__PURE__*/ forwardRef(function(param, ref) {
-    var value = param.value, opened = param.opened, valueToItemMap = param.valueToItemMap, label = param.label, placeholder = param.placeholder, onKeyDown = param.onKeyDown, labelPlacement = param.labelPlacement, size = param.size, contentLeft = param.contentLeft, disabled = param.disabled, readOnly = param.readOnly, renderValue = param.renderValue, selectProps = param.selectProps, inputWrapperRef = param.inputWrapperRef, multiselect = param.multiselect, view = param.view, helperText = param.helperText, treeId = param.treeId, activeDescendantItemValue = param.activeDescendantItemValue, isTargetAmount = param.isTargetAmount, onChange = param.onChange, labelToItemMap = param.labelToItemMap, chipView = param.chipView, separator = param.separator, requiredProps = param.requiredProps, hintProps = param.hintProps;
+    var value = param.value, opened = param.opened, valueToItemMap = param.valueToItemMap, label = param.label, placeholder = param.placeholder, onKeyDown = param.onKeyDown, labelPlacement = param.labelPlacement, size = param.size, contentLeft = param.contentLeft, disabled = param.disabled, readOnly = param.readOnly, renderValue = param.renderValue, selectProps = param.selectProps, inputWrapperRef = param.inputWrapperRef, multiselect = param.multiselect, view = param.view, helperText = param.helperText, treeId = param.treeId, activeDescendantItemValue = param.activeDescendantItemValue, isTargetAmount = param.isTargetAmount, onChange = param.onChange, chipView = param.chipView, separator = param.separator, requiredProps = param.requiredProps, hintProps = param.hintProps;
     var buttonRef = useForkRef(ref, inputWrapperRef);
     if (selectProps.renderTarget) {
         return /*#__PURE__*/ React.createElement("div", {
@@ -47,7 +47,6 @@ export var Target = /*#__PURE__*/ forwardRef(function(param, ref) {
         valueToItemMap: valueToItemMap,
         renderValue: renderValue,
         onChange: onChange,
-        labelToItemMap: labelToItemMap,
         chipView: chipView,
         requiredProps: requiredProps,
         hintProps: hintProps,

package/styled-components/es/components/Select/ui/Target/ui/Textfield/Textfield.js

@@ -1,11 +1,3 @@
-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, {
@@ -26,12 +18,6 @@ function _instanceof(left, right) {
         return left instanceof right;
     }
 }
-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] : {};
@@ -71,23 +57,12 @@ 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 React, { forwardRef } from "react";
-import { sizeToIconSize, getItemId, getRemovedElement } from "../../../../utils";
+import { sizeToIconSize, getItemId } from "../../../../utils";
 import { classes } from "../../../../Select.tokens";
 import { IconArrowWrapper, StyledArrow, StyledTextField, StyledLeftHelper } from "./Textfield.styles";
 export var Textfield = /*#__PURE__*/ forwardRef(function(param, ref) {
-    var inputWrapperRef = param.inputWrapperRef, opened = param.opened, multiselect = param.multiselect, value = param.value, label = param.label, labelPlacement = param.labelPlacement, keepPlaceholder = param.keepPlaceholder, placeholder = param.placeholder, onKeyDown = param.onKeyDown, size = param.size, view = param.view, contentLeft = param.contentLeft, helperText = param.helperText, treeId = param.treeId, activeDescendantItemValue = param.activeDescendantItemValue, disabled = param.disabled, readOnly = param.readOnly, isTargetAmount = param.isTargetAmount, valueToItemMap = param.valueToItemMap, renderValue = param.renderValue, onChange = param.onChange, labelToItemMap = param.labelToItemMap, chipView = param.chipView, requiredProps = param.requiredProps, chipType = param.chipType, hintProps = param.hintProps;
+    var inputWrapperRef = param.inputWrapperRef, opened = param.opened, multiselect = param.multiselect, value = param.value, label = param.label, labelPlacement = param.labelPlacement, keepPlaceholder = param.keepPlaceholder, placeholder = param.placeholder, onKeyDown = param.onKeyDown, size = param.size, view = param.view, contentLeft = param.contentLeft, helperText = param.helperText, treeId = param.treeId, activeDescendantItemValue = param.activeDescendantItemValue, disabled = param.disabled, readOnly = param.readOnly, isTargetAmount = param.isTargetAmount, valueToItemMap = param.valueToItemMap, renderValue = param.renderValue, onChange = param.onChange, chipView = param.chipView, requiredProps = param.requiredProps, chipType = param.chipType, hintProps = param.hintProps;
     var withArrowInverse = opened ? classes.arrowInverse : undefined;
     var getValue = function() {
         var _valueToItemMap_get;
@@ -107,58 +82,44 @@ export var Textfield = /*#__PURE__*/ forwardRef(function(param, ref) {
             if (value.length === 0) return [];
             if (isTargetAmount) {
                 return [
-                    "Выбрано ".concat(value.length)
+                    {
+                        value: '_removeAll',
+                        label: "Выбрано ".concat(value.length),
+                        disabled: value.every(function(val) {
+                            var _valueToItemMap_get;
+                            return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
+                        })
+                    }
                 ];
             }
-            var renderValueMapper = renderValue && function(stringValue) {
-                return renderValue(valueToItemMap.get(stringValue) || {
-                    value: stringValue,
-                    label: stringValue.toString()
-                });
-            };
-            var valueToItemMapper = function(stringValue) {
-                var _valueToItemMap_get;
-                return ((_valueToItemMap_get = valueToItemMap.get(stringValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || stringValue.toString();
-            };
-            return value.map(renderValueMapper || valueToItemMapper);
+            return value.map(function(value) {
+                var _valueToItemMap_get, _valueToItemMap_get1;
+                var currentLabel = renderValue ? renderValue(valueToItemMap.get(value) || {
+                    value: value,
+                    label: value.toString()
+                }) : ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value.toString();
+                return {
+                    value: value,
+                    label: currentLabel,
+                    disabled: ((_valueToItemMap_get1 = valueToItemMap.get(value)) === null || _valueToItemMap_get1 === void 0 ? void 0 : _valueToItemMap_get1.disabled) || false
+                };
+            });
         }
         return [];
     };
     // Обработчик чипов
-    var handleChipsChange = function(chipLabels) {
+    var handleChipClick = function(chip) {
         if (!Array.isArray(value)) return;
-        // TODO: #1564
-        // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
-        if (renderValue && !isTargetAmount) {
-            var resultValues = _to_consumable_array(value);
-            value.forEach(function(_, index) {
+        if (isTargetAmount) {
+            // При закрытии чипа в режиме isTargetAmount в value оставляем только disabled-элементы
+            onChange(value.filter(function(val) {
                 var _valueToItemMap_get;
-                var stringValue = value[index];
-                var label = (_valueToItemMap_get = valueToItemMap.get(stringValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label;
-                var labelAfterRenderValue = renderValue(label ? labelToItemMap.get(label) : {
-                    value: stringValue,
-                    label: stringValue.toString()
-                });
-                if (!chipLabels.includes(labelAfterRenderValue)) {
-                    resultValues.splice(index, 1);
-                }
-            });
-            var removedItemValue = getRemovedElement(value, resultValues, isTargetAmount);
-            onChange(resultValues, removedItemValue ? valueToItemMap.get(removedItemValue) || {
-                value: removedItemValue,
-                label: removedItemValue.toString()
-            } : null);
+                return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
+            }));
         } else {
-            var newValues = chipLabels.map(function(chipLabel) {
-                var _labelToItemMap_get;
-                return ((_labelToItemMap_get = labelToItemMap.get(chipLabel)) === null || _labelToItemMap_get === void 0 ? void 0 : _labelToItemMap_get.value) || chipLabel;
-            });
-            var removedItemValue1 = getRemovedElement(value, newValues, isTargetAmount);
-            var item = removedItemValue1 ? valueToItemMap.get(removedItemValue1) || {
-                value: removedItemValue1,
-                label: removedItemValue1.toString()
-            } : null;
-            onChange(newValues, item);
+            onChange(value.filter(function(val) {
+                return val !== chip.value;
+            }), valueToItemMap.get(chip.value) || null);
         }
     };
     var helperTextStopPropagation = function(event) {
@@ -197,8 +158,8 @@ export var Textfield = /*#__PURE__*/ forwardRef(function(param, ref) {
         "aria-activedescendant": activeDescendantItemValue ? getItemId(treeId, activeDescendantItemValue) : ''
     }, multiselect ? {
         enumerationType: 'chip',
-        chips: getChips(),
-        onChangeChips: handleChipsChange,
+        _chips: getChips(),
+        _onChipClick: handleChipClick,
         chipType: chipType,
         chipView: chipView
     } : {

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

@@ -9,4 +9,3 @@ export { getView } from "./getView";
 export { getPlacement } from "./getPlacement";
 export { getFallbackPlacements } from "./getFallbackPlacements";
 export { getItemId } from "./getItemId";
-export { getRemovedElement } from "./getRemovedElement";