@salutejs/plasma-new-hope 0.174.0-canary.1505.11503860288.0 → 0.174.0-canary.1505.11515852860.0

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

@@ -20,7 +20,7 @@ var _getPathMaps = /*#__PURE__*/require("./hooks/getPathMaps");
 var _Combobox2 = /*#__PURE__*/require("./Combobox.styles");
 var _base = /*#__PURE__*/require("./variations/_view/base");
 var _base2 = /*#__PURE__*/require("./variations/_size/base");
-var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
+var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "targetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -44,6 +44,7 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       outerValue = props.value,
       outerOnChange = props.onChange,
       isTargetAmount = props.isTargetAmount,
+      targetAmount = props.targetAmount,
       items = props.items,
       _props$placement = props.placement,
       placement = _props$placement === void 0 ? 'bottom-start' : _props$placement,
@@ -73,9 +74,13 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       outerCloseAfterSelect = props.closeAfterSelect,
       renderValue = props.renderValue,
       rest = _objectWithoutProperties(props, _excluded);
+    var transformedItems = (0, _react.useMemo)(function () {
+      return (0, _utils3.initialItemsTransform)(items || []);
+    }, [items]);
+
     // Создаем структуры для быстрой работы с деревом
     var _useMemo = (0, _react.useMemo)(function () {
-        return (0, _getPathMaps.getTreeMaps)(items);
+        return (0, _getPathMaps.getTreeMaps)(transformedItems);
       }, [items]),
       _useMemo2 = _slicedToArray(_useMemo, 3),
       valueToCheckedMap = _useMemo2[0],
@@ -94,9 +99,6 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
     var floatingPopoverRef = (0, _react.useRef)(null);
     var inputForkRef = (0, _plasmaCore.useForkRef)(inputRef, ref);
     var treeId = (0, _plasmaCore.safeUseId)();
-    var transformedItems = (0, _react.useMemo)(function () {
-      return (0, _utils3.initialItemsTransform)(items || []);
-    }, [items]);
     var filteredItems = (0, _utils3.filterItems)(transformedItems, textValue, (_valueToItemMap$get2 = valueToItemMap.get(value)) === null || _valueToItemMap$get2 === void 0 ? void 0 : _valueToItemMap$get2.label, filter);
     var _useMemo3 = (0, _react.useMemo)(function () {
         return (0, _getPathMaps.getPathMap)(filteredItems);
@@ -263,16 +265,7 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       if (e) {
         e.stopPropagation();
       }
-      var checkedCopy = new Map(checked);
-      var isCurrentChecked = checkedCopy.get(item.value);
-      checkedCopy.forEach(function (_, key) {
-        checkedCopy.set(key, false);
-      });
-      if (!isCurrentChecked) {
-        checkedCopy.set(item.value, 'done');
-        (0, _utils3.updateSingleAncestors)(item, checkedCopy, 'dot');
-      }
-      setTextValue(isCurrentChecked ? '' : item.label);
+      var isCurrentChecked = checked.get(item.value);
       if (!alwaysOpened && closeAfterSelect) {
         dispatchPath({
           type: 'reset'
@@ -289,14 +282,15 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       if (multiple && Array.isArray(value)) {
         if (value.length === 0) return [];
         if (isTargetAmount) {
-          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(value.length)];
+          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(targetAmount || value.length)];
         }
-        var mapper = renderValue && function (stringValue) {
+        var renderValueMapper = renderValue && function (stringValue) {
           return renderValue(valueToItemMap.get(stringValue));
-        } || function (stringValue) {
+        };
+        var valueToItemMapper = function valueToItemMapper(stringValue) {
           return valueToItemMap.get(stringValue).label;
         };
-        return value.map(mapper);
+        return value.map(renderValueMapper || valueToItemMapper);
       }
       return [];
     };
@@ -347,7 +341,7 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       // В deps мы кладем именно outerValue и internalValue, а не просто value.
       // Т.к. вначале нужно отфильтровать и провалидировать outerValue и результат положить в переменную.
       // А переменную, содержащую сложные типы данных, нельзя помещать в deps.
-    }, [outerValue, internalValue]);
+    }, [outerValue, internalValue, items]);
     return /*#__PURE__*/_react["default"].createElement(Root, {
       size: size,
       view: view,

package/emotion/cjs/components/Combobox/ComboboxNew/utils/getInitialValue.js

@@ -11,13 +11,7 @@ var getInitialValue = exports.getInitialValue = function getInitialValue(outerVa
     if (outerValue.length === 0) {
       return [];
     }
-    var updatedValue = [];
-    outerValue.forEach(function (value) {
-      if (valueToItemMap.has(value)) {
-        updatedValue.push(value);
-      }
-    });
-    return updatedValue;
+    return outerValue.filter(valueToItemMap.has.bind(valueToItemMap));
   }
   if (valueToItemMap.has(outerValue)) {
     return outerValue;

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

@@ -163,15 +163,7 @@ var selectRoot = exports.selectRoot = function selectRoot(Root) {
         if (e) {
           e.stopPropagation();
         }
-        var checkedCopy = new Map(checked);
-        var isCurrentChecked = checkedCopy.get(item.value);
-        checkedCopy.forEach(function (_, key) {
-          checkedCopy.set(key, false);
-        });
-        if (!isCurrentChecked) {
-          checkedCopy.set(item.value, 'done');
-          (0, _utils2.updateSingleAncestors)(item, checkedCopy, 'dot');
-        }
+        var isCurrentChecked = checked.get(item.value);
         if (closeAfterSelect) {
           dispatchPath({
             type: 'reset'
@@ -243,7 +235,7 @@ var selectRoot = exports.selectRoot = function selectRoot(Root) {
         }
       }
       setChecked(checkedCopy);
-    }, [outerValue]);
+    }, [outerValue, items]);
     return /*#__PURE__*/_react["default"].createElement(Root, _extends({
       ref: ref,
       size: size,

package/emotion/cjs/components/Select/utils/getButtonLabel.js

@@ -22,8 +22,8 @@ var getButtonLabel = exports.getButtonLabel = function getButtonLabel(_ref3) {
   if ((0, _utils.isEmpty)(value) && typeof value !== 'number') {
     return label || '';
   }
-  if (selectProps.multiselect && selectProps.isTargetAmount) {
-    return "\u0412\u044B\u0431\u0440\u0430\u043D\u043E: ".concat(value.toString().length);
+  if (selectProps.multiselect && Array.isArray(value) && selectProps.isTargetAmount) {
+    return "\u0412\u044B\u0431\u0440\u0430\u043D\u043E: ".concat(value.length);
   }
   if (selectProps.multiselect && Array.isArray(value)) {
     return value === null || value === void 0 ? void 0 : value.map(function (itemValue) {

package/emotion/cjs/components/Select/utils/getInitialValue.js

@@ -11,13 +11,7 @@ var getInitialValue = exports.getInitialValue = function getInitialValue(outerVa
     if (outerValue.length === 0) {
       return [];
     }
-    var updatedValue = [];
-    outerValue.forEach(function (value) {
-      if (valueToItemMap.has(value)) {
-        updatedValue.push(value);
-      }
-    });
-    return updatedValue;
+    return outerValue.filter(valueToItemMap.has.bind(valueToItemMap));
   }
   if (valueToItemMap.has(outerValue)) {
     return outerValue;

package/emotion/cjs/examples/plasma_b2c/components/Combobox/Combobox.stories.tsx

@@ -68,6 +68,10 @@ const meta: Meta<StorySelectProps> = {
             control: { type: 'boolean' },
             if: { arg: 'alwaysOpened', truthy: false },
         },
+        targetAmount: {
+            control: { type: 'number' },
+            if: { arg: 'isTargetAmount', truthy: true },
+        },
     },
     args: {
         label: 'Label',
@@ -78,6 +82,7 @@ const meta: Meta<StorySelectProps> = {
         view: 'default',
         enableContentLeft: false,
         isTargetAmount: false,
+        targetAmount: undefined,
         variant: 'normal',
         alwaysOpened: false,
         disabled: false,
@@ -94,6 +99,7 @@ const meta: Meta<StorySelectProps> = {
                 'placeholder',
                 'helperText',
                 'isTargetAmount',
+                'targetAmount',
                 'closeAfterSelect',
                 'alwaysOpened',
                 'variant',

package/emotion/cjs/examples/plasma_web/components/Combobox/Combobox.stories.tsx

@@ -68,6 +68,10 @@ const meta: Meta<StorySelectProps> = {
             control: { type: 'boolean' },
             if: { arg: 'alwaysOpened', truthy: false },
         },
+        targetAmount: {
+            control: { type: 'number' },
+            if: { arg: 'isTargetAmount', truthy: true },
+        },
     },
     args: {
         label: 'Label',
@@ -78,6 +82,7 @@ const meta: Meta<StorySelectProps> = {
         view: 'default',
         enableContentLeft: false,
         isTargetAmount: false,
+        targetAmount: undefined,
         variant: 'normal',
         alwaysOpened: false,
         disabled: false,
@@ -94,6 +99,7 @@ const meta: Meta<StorySelectProps> = {
                 'placeholder',
                 'helperText',
                 'isTargetAmount',
+                'targetAmount',
                 'closeAfterSelect',
                 'alwaysOpened',
                 'variant',

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

@@ -1,4 +1,4 @@
-var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
+var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "targetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -35,6 +35,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
       outerValue = props.value,
       outerOnChange = props.onChange,
       isTargetAmount = props.isTargetAmount,
+      targetAmount = props.targetAmount,
       items = props.items,
       _props$placement = props.placement,
       placement = _props$placement === void 0 ? 'bottom-start' : _props$placement,
@@ -64,9 +65,13 @@ export var comboboxRoot = function comboboxRoot(Root) {
       outerCloseAfterSelect = props.closeAfterSelect,
       renderValue = props.renderValue,
       rest = _objectWithoutProperties(props, _excluded);
+    var transformedItems = useMemo(function () {
+      return initialItemsTransform(items || []);
+    }, [items]);
+
     // Создаем структуры для быстрой работы с деревом
     var _useMemo = useMemo(function () {
-        return getTreeMaps(items);
+        return getTreeMaps(transformedItems);
       }, [items]),
       _useMemo2 = _slicedToArray(_useMemo, 3),
       valueToCheckedMap = _useMemo2[0],
@@ -85,9 +90,6 @@ export var comboboxRoot = function comboboxRoot(Root) {
     var floatingPopoverRef = useRef(null);
     var inputForkRef = useForkRef(inputRef, ref);
     var treeId = safeUseId();
-    var transformedItems = useMemo(function () {
-      return initialItemsTransform(items || []);
-    }, [items]);
     var filteredItems = filterItems(transformedItems, textValue, (_valueToItemMap$get2 = valueToItemMap.get(value)) === null || _valueToItemMap$get2 === void 0 ? void 0 : _valueToItemMap$get2.label, filter);
     var _useMemo3 = useMemo(function () {
         return getPathMap(filteredItems);
@@ -254,16 +256,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
       if (e) {
         e.stopPropagation();
       }
-      var checkedCopy = new Map(checked);
-      var isCurrentChecked = checkedCopy.get(item.value);
-      checkedCopy.forEach(function (_, key) {
-        checkedCopy.set(key, false);
-      });
-      if (!isCurrentChecked) {
-        checkedCopy.set(item.value, 'done');
-        updateSingleAncestors(item, checkedCopy, 'dot');
-      }
-      setTextValue(isCurrentChecked ? '' : item.label);
+      var isCurrentChecked = checked.get(item.value);
       if (!alwaysOpened && closeAfterSelect) {
         dispatchPath({
           type: 'reset'
@@ -280,14 +273,15 @@ export var comboboxRoot = function comboboxRoot(Root) {
       if (multiple && Array.isArray(value)) {
         if (value.length === 0) return [];
         if (isTargetAmount) {
-          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(value.length)];
+          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(targetAmount || value.length)];
         }
-        var mapper = renderValue && function (stringValue) {
+        var renderValueMapper = renderValue && function (stringValue) {
           return renderValue(valueToItemMap.get(stringValue));
-        } || function (stringValue) {
+        };
+        var valueToItemMapper = function valueToItemMapper(stringValue) {
           return valueToItemMap.get(stringValue).label;
         };
-        return value.map(mapper);
+        return value.map(renderValueMapper || valueToItemMapper);
       }
       return [];
     };
@@ -338,7 +332,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
       // В deps мы кладем именно outerValue и internalValue, а не просто value.
       // Т.к. вначале нужно отфильтровать и провалидировать outerValue и результат положить в переменную.
       // А переменную, содержащую сложные типы данных, нельзя помещать в deps.
-    }, [outerValue, internalValue]);
+    }, [outerValue, internalValue, items]);
     return /*#__PURE__*/React.createElement(Root, {
       size: size,
       view: view,

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

@@ -5,13 +5,7 @@ export var getInitialValue = function getInitialValue(outerValue, valueToItemMap
     if (outerValue.length === 0) {
       return [];
     }
-    var updatedValue = [];
-    outerValue.forEach(function (value) {
-      if (valueToItemMap.has(value)) {
-        updatedValue.push(value);
-      }
-    });
-    return updatedValue;
+    return outerValue.filter(valueToItemMap.has.bind(valueToItemMap));
   }
   if (valueToItemMap.has(outerValue)) {
     return outerValue;

package/emotion/es/components/Select/Select.js

@@ -154,15 +154,7 @@ export var selectRoot = function selectRoot(Root) {
         if (e) {
           e.stopPropagation();
         }
-        var checkedCopy = new Map(checked);
-        var isCurrentChecked = checkedCopy.get(item.value);
-        checkedCopy.forEach(function (_, key) {
-          checkedCopy.set(key, false);
-        });
-        if (!isCurrentChecked) {
-          checkedCopy.set(item.value, 'done');
-          updateSingleAncestors(item, checkedCopy, 'dot');
-        }
+        var isCurrentChecked = checked.get(item.value);
         if (closeAfterSelect) {
           dispatchPath({
             type: 'reset'
@@ -234,7 +226,7 @@ export var selectRoot = function selectRoot(Root) {
         }
       }
       setChecked(checkedCopy);
-    }, [outerValue]);
+    }, [outerValue, items]);
     return /*#__PURE__*/React.createElement(Root, _extends({
       ref: ref,
       size: size,

package/emotion/es/components/Select/utils/getButtonLabel.js

@@ -16,8 +16,8 @@ export var getButtonLabel = function getButtonLabel(_ref3) {
   if (isEmpty(value) && typeof value !== 'number') {
     return label || '';
   }
-  if (selectProps.multiselect && selectProps.isTargetAmount) {
-    return "\u0412\u044B\u0431\u0440\u0430\u043D\u043E: ".concat(value.toString().length);
+  if (selectProps.multiselect && Array.isArray(value) && selectProps.isTargetAmount) {
+    return "\u0412\u044B\u0431\u0440\u0430\u043D\u043E: ".concat(value.length);
   }
   if (selectProps.multiselect && Array.isArray(value)) {
     return value === null || value === void 0 ? void 0 : value.map(function (itemValue) {

package/emotion/es/components/Select/utils/getInitialValue.js

@@ -5,13 +5,7 @@ export var getInitialValue = function getInitialValue(outerValue, valueToItemMap
     if (outerValue.length === 0) {
       return [];
     }
-    var updatedValue = [];
-    outerValue.forEach(function (value) {
-      if (valueToItemMap.has(value)) {
-        updatedValue.push(value);
-      }
-    });
-    return updatedValue;
+    return outerValue.filter(valueToItemMap.has.bind(valueToItemMap));
   }
   if (valueToItemMap.has(outerValue)) {
     return outerValue;

package/emotion/es/examples/plasma_b2c/components/Combobox/Combobox.stories.tsx

@@ -68,6 +68,10 @@ const meta: Meta<StorySelectProps> = {
             control: { type: 'boolean' },
             if: { arg: 'alwaysOpened', truthy: false },
         },
+        targetAmount: {
+            control: { type: 'number' },
+            if: { arg: 'isTargetAmount', truthy: true },
+        },
     },
     args: {
         label: 'Label',
@@ -78,6 +82,7 @@ const meta: Meta<StorySelectProps> = {
         view: 'default',
         enableContentLeft: false,
         isTargetAmount: false,
+        targetAmount: undefined,
         variant: 'normal',
         alwaysOpened: false,
         disabled: false,
@@ -94,6 +99,7 @@ const meta: Meta<StorySelectProps> = {
                 'placeholder',
                 'helperText',
                 'isTargetAmount',
+                'targetAmount',
                 'closeAfterSelect',
                 'alwaysOpened',
                 'variant',

package/emotion/es/examples/plasma_web/components/Combobox/Combobox.stories.tsx

@@ -68,6 +68,10 @@ const meta: Meta<StorySelectProps> = {
             control: { type: 'boolean' },
             if: { arg: 'alwaysOpened', truthy: false },
         },
+        targetAmount: {
+            control: { type: 'number' },
+            if: { arg: 'isTargetAmount', truthy: true },
+        },
     },
     args: {
         label: 'Label',
@@ -78,6 +82,7 @@ const meta: Meta<StorySelectProps> = {
         view: 'default',
         enableContentLeft: false,
         isTargetAmount: false,
+        targetAmount: undefined,
         variant: 'normal',
         alwaysOpened: false,
         disabled: false,
@@ -94,6 +99,7 @@ const meta: Meta<StorySelectProps> = {
                 'placeholder',
                 'helperText',
                 'isTargetAmount',
+                'targetAmount',
                 'closeAfterSelect',
                 'alwaysOpened',
                 'variant',

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

@@ -8,8 +8,8 @@ import { getTreeMaps, getPathMap } from './hooks/getPathMaps.js';
 import { IconArrowWrapper, StyledArrow, Ul, StyledEmptyState, base } from './Combobox.styles.js';
 import { base as base$1 } from './variations/_view/base.js';
 import { base as base$2 } from './variations/_size/base.js';
-import { getInitialValue } from './utils/getInitialValue.js';
 import { initialItemsTransform } from './utils/initialItemsTransform.js';
+import { getInitialValue } from './utils/getInitialValue.js';
 import { filterItems } from './utils/filterItems.js';
 import { pathReducer } from './reducers/pathReducer.js';
 import { focusedPathReducer } from './reducers/focusedPathReducer.js';
@@ -23,7 +23,7 @@ import { sizeToIconSize } from '../../Select/utils/sizeToIconSize.js';
 import { getItemId } from './utils/getItemId.js';
 import { Inner } from './ui/Inner/Inner.js';
 
-var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
+var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "targetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
 var Context = /*#__PURE__*/createContext({});
 
 /**
@@ -36,6 +36,7 @@ var comboboxRoot = function comboboxRoot(Root) {
       outerValue = props.value,
       outerOnChange = props.onChange,
       isTargetAmount = props.isTargetAmount,
+      targetAmount = props.targetAmount,
       items = props.items,
       _props$placement = props.placement,
       placement = _props$placement === void 0 ? 'bottom-start' : _props$placement,
@@ -65,9 +66,13 @@ var comboboxRoot = function comboboxRoot(Root) {
       outerCloseAfterSelect = props.closeAfterSelect,
       renderValue = props.renderValue,
       rest = _objectWithoutProperties(props, _excluded);
+    var transformedItems = useMemo(function () {
+      return initialItemsTransform(items || []);
+    }, [items]);
+
     // Создаем структуры для быстрой работы с деревом
     var _useMemo = useMemo(function () {
-        return getTreeMaps(items);
+        return getTreeMaps(transformedItems);
       }, [items]),
       _useMemo2 = _slicedToArray(_useMemo, 3),
       valueToCheckedMap = _useMemo2[0],
@@ -86,9 +91,6 @@ var comboboxRoot = function comboboxRoot(Root) {
     var floatingPopoverRef = useRef(null);
     var inputForkRef = useForkRef(inputRef, ref);
     var treeId = safeUseId();
-    var transformedItems = useMemo(function () {
-      return initialItemsTransform(items || []);
-    }, [items]);
     var filteredItems = filterItems(transformedItems, textValue, (_valueToItemMap$get2 = valueToItemMap.get(value)) === null || _valueToItemMap$get2 === void 0 ? void 0 : _valueToItemMap$get2.label, filter);
     var _useMemo3 = useMemo(function () {
         return getPathMap(filteredItems);
@@ -255,16 +257,7 @@ var comboboxRoot = function comboboxRoot(Root) {
       if (e) {
         e.stopPropagation();
       }
-      var checkedCopy = new Map(checked);
-      var isCurrentChecked = checkedCopy.get(item.value);
-      checkedCopy.forEach(function (_, key) {
-        checkedCopy.set(key, false);
-      });
-      if (!isCurrentChecked) {
-        checkedCopy.set(item.value, 'done');
-        updateSingleAncestors(item, checkedCopy, 'dot');
-      }
-      setTextValue(isCurrentChecked ? '' : item.label);
+      var isCurrentChecked = checked.get(item.value);
       if (!alwaysOpened && closeAfterSelect) {
         dispatchPath({
           type: 'reset'
@@ -281,14 +274,15 @@ var comboboxRoot = function comboboxRoot(Root) {
       if (multiple && Array.isArray(value)) {
         if (value.length === 0) return [];
         if (isTargetAmount) {
-          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(value.length)];
+          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(targetAmount || value.length)];
         }
-        var mapper = renderValue && function (stringValue) {
+        var renderValueMapper = renderValue && function (stringValue) {
           return renderValue(valueToItemMap.get(stringValue));
-        } || function (stringValue) {
+        };
+        var valueToItemMapper = function valueToItemMapper(stringValue) {
           return valueToItemMap.get(stringValue).label;
         };
-        return value.map(mapper);
+        return value.map(renderValueMapper || valueToItemMapper);
       }
       return [];
     };
@@ -339,7 +333,7 @@ var comboboxRoot = function comboboxRoot(Root) {
       // В deps мы кладем именно outerValue и internalValue, а не просто value.
       // Т.к. вначале нужно отфильтровать и провалидировать outerValue и результат положить в переменную.
       // А переменную, содержащую сложные типы данных, нельзя помещать в deps.
-    }, [outerValue, internalValue]);
+    }, [outerValue, internalValue, items]);
     return /*#__PURE__*/React.createElement(Root, {
       size: size,
       view: view,