npm - @salutejs/plasma-new-hope - Versions diffs - 0.194.0-canary.1562.11851866538.0 → 0.194.0-canary.1562.11857238836.0 - Mend

@salutejs/plasma-new-hope 0.194.0-canary.1562.11851866538.0 → 0.194.0-canary.1562.11857238836.0

Files changed (10) hide show

package/cjs/components/Select/ui/Target/ui/Textfield/Textfield.js CHANGED Viewed

@@ -53,9 +53,24 @@ var Textfield = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   // Обработчик чипов
   var handleChipsChange = function handleChipsChange(chipLabels) {
-    onChange(chipLabels.map(function (chipLabel) {
-      return labelToItemMap.get(chipLabel).value;
-    }));
+    if (!Array.isArray(value)) return;
+    // TODO: #1564
+    // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
+    if (renderValue && !isTargetAmount) {
+      var resultValues = _rollupPluginBabelHelpers.toConsumableArray(value);
+      value.forEach(function (_, index) {
+        var labelAfterRenderValue = renderValue(labelToItemMap.get(valueToItemMap.get(value[index]).label));
+        if (!chipLabels.includes(labelAfterRenderValue)) {
+          resultValues.splice(index, 1);
+        }
+      });
+      onChange(resultValues);
+    } else {
+      onChange(chipLabels.map(function (chipLabel) {
+        return labelToItemMap.get(chipLabel).value;
+      }));
+    }
   };
   return /*#__PURE__*/React.createElement(Textfield_styles.StyledTextField, _rollupPluginBabelHelpers.extends({
     ref: ref,

package/cjs/components/Select/ui/Target/ui/Textfield/Textfield.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Textfield.js","sources":["../../../../../../../src/components/Select/ui/Target/ui/Textfield/Textfield.tsx"],"sourcesContent":["import React, { forwardRef } from 'react';\n\nimport { sizeToIconSize, getItemId } from '../../../../utils';\nimport { classes } from '../../../../Select.tokens';\n\nimport { IconArrowWrapper, StyledArrow, StyledTextField } from './Textfield.styles';\nimport { TextfieldProps } from './Textfield.types';\n\nexport const Textfield = forwardRef<HTMLInputElement, TextfieldProps>(\n (\n {\n inputWrapperRef,\n opened,\n multiselect,\n value,\n label,\n placeholder,\n onKeyDown,\n labelPlacement,\n size,\n view,\n handleClickArrow,\n contentLeft,\n helperText,\n treeId,\n activeDescendantItemValue,\n disabled,\n isTargetAmount,\n valueToItemMap,\n renderValue,\n onChange,\n labelToItemMap,\n chipView,\n },\n ref,\n ) => {\n const withArrowInverse = opened ? classes.arrowInverse : undefined;\n\n const getChips = (): string[] => {\n if (multiselect && Array.isArray(value)) {\n if (value.length === 0) return [];\n\n if (isTargetAmount) {\n return [`Выбрано ${value.length}`];\n }\n\n const renderValueMapper =\n renderValue && ((stringValue: string \| number) => renderValue(valueToItemMap.get(stringValue)!));\n const valueToItemMapper = (stringValue: string \| number) => valueToItemMap.get(stringValue)!.label;\n\n return value.map(renderValueMapper \|\| valueToItemMapper);\n }\n\n return [];\n };\n\n // Обработчик чипов\n const handleChipsChange = (chipLabels: any[]) => {\n onChange(chipLabels.map((chipLabel) => labelToItemMap.get(chipLabel)!.value));\n };\n\n return (\n <StyledTextField\n ref={ref}\n inputWrapperRef={inputWrapperRef}\n readOnly\n value={multiselect ? undefined : valueToItemMap.get(value.toString())?.label \|\| ''}\n size={size}\n view={view}\n chipView={chipView}\n labelPlacement={labelPlacement}\n disabled={disabled}\n label={label}\n placeholder={value instanceof Array && value.length ? '' : placeholder}\n contentLeft={contentLeft as React.ReactElement}\n contentRight={\n <IconArrowWrapper disabled={Boolean(disabled)} onClick={handleClickArrow}>\n <StyledArrow color=\"inherit\" size={sizeToIconSize(size)} className={withArrowInverse} />\n </IconArrowWrapper>\n }\n onKeyDown={onKeyDown}\n leftHelper={helperText}\n role=\"combobox\"\n aria-autocomplete=\"list\"\n aria-controls={`${treeId}_tree_level_1`}\n aria-expanded={opened}\n aria-activedescendant={activeDescendantItemValue ? getItemId(treeId, activeDescendantItemValue) : ''}\n {...(multiselect\n ? {\n enumerationType: 'chip',\n chips: getChips(),\n onChangeChips: handleChipsChange,\n }\n : { enumerationType: 'plain' })}\n onEnterDisabled // Пропс для отключения обработчика Enter внутри Textfield\n opened={opened}\n // TODO: #1547\n _forceChipManipulationWithReadonly\n />\n );\n },\n);\n"],"names":["Textfield","forwardRef","_ref","ref","_valueToItemMap$get","inputWrapperRef","opened","multiselect","value","label","placeholder","onKeyDown","labelPlacement","size","view","handleClickArrow","contentLeft","helperText","treeId","activeDescendantItemValue","disabled","isTargetAmount","valueToItemMap","renderValue","onChange","labelToItemMap","chipView","withArrowInverse","classes","arrowInverse","undefined","getChips","Array","isArray","length","concat","renderValueMapper","stringValue","get","valueToItemMapper","map","handleChipsChange","chipLabels","chipLabel","React","createElement","StyledTextField","_extends","readOnly","toString","contentRight","IconArrowWrapper","Boolean","onClick","StyledArrow","color","sizeToIconSize","className","leftHelper","role","getItemId","enumerationType","chips","onChangeChips","onEnterDisabled","_forceChipManipulationWithReadonly"],"mappings":";;;;;;;;;;;AAQO,IAAMA,SAAS,gBAAGC,gBAAU,CAC/B,UAAAC,IAAA,EAyBIC,GAAG,EACF;AAAA,EAAA,IAAAC,mBAAA,CAAA;AAAA,EAAA,IAxBGC,eAAe,GAAAH,IAAA,CAAfG,eAAe;IACfC,MAAM,GAAAJ,IAAA,CAANI,MAAM;IACNC,WAAW,GAAAL,IAAA,CAAXK,WAAW;IACXC,KAAK,GAAAN,IAAA,CAALM,KAAK;IACLC,KAAK,GAAAP,IAAA,CAALO,KAAK;IACLC,WAAW,GAAAR,IAAA,CAAXQ,WAAW;IACXC,SAAS,GAAAT,IAAA,CAATS,SAAS;IACTC,cAAc,GAAAV,IAAA,CAAdU,cAAc;IACdC,IAAI,GAAAX,IAAA,CAAJW,IAAI;IACJC,IAAI,GAAAZ,IAAA,CAAJY,IAAI;IACJC,gBAAgB,GAAAb,IAAA,CAAhBa,gBAAgB;IAChBC,WAAW,GAAAd,IAAA,CAAXc,WAAW;IACXC,UAAU,GAAAf,IAAA,CAAVe,UAAU;IACVC,MAAM,GAAAhB,IAAA,CAANgB,MAAM;IACNC,yBAAyB,GAAAjB,IAAA,CAAzBiB,yBAAyB;IACzBC,QAAQ,GAAAlB,IAAA,CAARkB,QAAQ;IACRC,cAAc,GAAAnB,IAAA,CAAdmB,cAAc;IACdC,cAAc,GAAApB,IAAA,CAAdoB,cAAc;IACdC,WAAW,GAAArB,IAAA,CAAXqB,WAAW;IACXC,QAAQ,GAAAtB,IAAA,CAARsB,QAAQ;IACRC,cAAc,GAAAvB,IAAA,CAAduB,cAAc;IACdC,QAAQ,GAAAxB,IAAA,CAARwB,QAAQ,CAAA;EAIZ,IAAMC,gBAAgB,GAAGrB,MAAM,GAAGsB,qBAAO,CAACC,YAAY,GAAGC,SAAS,CAAA;AAElE,EAAA,IAAMC,QAAQ,GAAG,SAAXA,QAAQA,GAAmB;IAC7B,IAAIxB,WAAW,IAAIyB,KAAK,CAACC,OAAO,CAACzB,KAAK,CAAC,EAAE;AACrC,MAAA,IAAIA,KAAK,CAAC0B,MAAM,KAAK,CAAC,EAAE,OAAO,EAAE,CAAA;AAEjC,MAAA,IAAIb,cAAc,EAAE;AAChB,QAAA,OAAO,+CAAAc,MAAA,CAAY3B,KAAK,CAAC0B,MAAM,CAAG,CAAA,CAAA;AACtC,OAAA;AAEA,MAAA,IAAME,iBAAiB,GACnBb,WAAW,IAAK,UAACc,WAA4B,EAAA;QAAA,OAAKd,WAAW,CAACD,cAAc,CAACgB,GAAG,CAACD,WAAW,CAAE,CAAC,CAAA;OAAC,CAAA;AACpG,MAAA,IAAME,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAIF,WAA4B,EAAA;AAAA,QAAA,OAAKf,cAAc,CAACgB,GAAG,CAACD,WAAW,CAAC,CAAE5B,KAAK,CAAA;AAAA,OAAA,CAAA;AAElG,MAAA,OAAOD,KAAK,CAACgC,GAAG,CAACJ,iBAAiB,IAAIG,iBAAiB,CAAC,CAAA;AAC5D,KAAA;AAEA,IAAA,OAAO,EAAE,CAAA;GACZ,CAAA;;AAED;AACA,EAAA,IAAME,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAIC,UAAiB,EAAK;~~AAC7ClB~~,~~IAAAA~~,QAAQ,CAACkB,UAAU,CAACF,GAAG,CAAC,~~UAACG~~,SAAS,EAAA;AAAA,~~MAAA~~,~~OAAKlB~~,cAAc,CAACa,GAAG,~~CAACK~~,SAAS,CAAC,~~CAAEnC~~,KAAK,CAAA;AAAA,~~KAAA~~,CAAC,CAAC,CAAA;~~GAChF~~,CAAA;AAED,EAAA,~~oBACIoC~~,KAAA,CAAAC,aAAA,CAACC,gCAAe,EAAAC,iCAAA,CAAA;~~AACZ5C~~,IAAAA,GAAG,EAAEA,GAAI;AACTE,IAAAA,eAAe,EAAEA,eAAgB;~~IACjC2C~~,QAAQ,EAAA,IAAA;~~IACRxC~~,KAAK,EAAED,WAAW,GAAGuB,SAAS,GAAG,EAAA1B,mBAAA,GAAAkB,cAAc,CAACgB,GAAG,CAAC9B,KAAK,~~CAACyC~~,QAAQ,EAAE,CAAC,MAAA,IAAA,~~IAAA7C~~,mBAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAApCA,mBAAA,CAAsCK,KAAK,KAAI,EAAG;AACnFI,IAAAA,IAAI,EAAEA,IAAK;AACXC,IAAAA,IAAI,EAAEA,IAAK;AACXY,IAAAA,QAAQ,EAAEA,QAAS;AACnBd,IAAAA,cAAc,EAAEA,cAAe;AAC/BQ,IAAAA,QAAQ,EAAEA,QAAS;AACnBX,IAAAA,KAAK,EAAEA,KAAM;IACbC,WAAW,EAAEF,KAAK,YAAYwB,KAAK,IAAIxB,KAAK,CAAC0B,MAAM,GAAG,EAAE,GAAGxB,WAAY;AACvEM,IAAAA,WAAW,EAAEA,WAAkC;AAC/~~CkC~~,IAAAA,YAAY,eACRN,KAAA,CAAAC,aAAA,CAACM,iCAAgB,EAAA;~~AAAC/B~~,MAAAA,QAAQ,~~EAAEgC~~,OAAO,~~CAAChC~~,QAAQ,CAAE;~~AAACiC~~,MAAAA,OAAO,~~EAAEtC~~,gBAAAA;AAAiB,KAAA,~~eACrE6B~~,KAAA,CAAAC,aAAA,CAACS,4BAAW,EAAA;AAACC,MAAAA,KAAK,EAAC,SAAS;~~AAAC1C~~,MAAAA,IAAI,~~EAAE2C~~,6BAAc,~~CAAC3C~~,IAAI,CAAE;~~AAAC4C~~,MAAAA,SAAS,~~EAAE9B~~,gBAAAA;AAAiB,KAAE,CACzE,CACrB;AACDhB,IAAAA,SAAS,EAAEA,SAAU;~~AACrB+C~~,IAAAA,UAAU,~~EAAEzC~~,UAAW;~~AACvB0C~~,IAAAA,IAAI,EAAC,UAAU;AACf,IAAA,mBAAA,EAAkB,MAAM;IACxB,~~eAAAxB~~,EAAAA,EAAAA,CAAAA,MAAA,CAAkBjB,MAAM,EAAgB,eAAA,CAAA;AACxC,IAAA,eAAA,EAAeZ,MAAO;IACtB,uBAAuBa,EAAAA,yBAAyB,~~GAAGyC~~,mBAAS,~~CAAC1C~~,MAAM,EAAEC,yBAAyB,CAAC,GAAG,EAAA;AAAG,GAAA,EAChGZ,WAAW,GACV;~~AACIsD~~,IAAAA,eAAe,EAAE,MAAM;IACvBC,KAAK,~~EAAE/B~~,QAAQ,EAAE;~~AACjBgC~~,IAAAA,aAAa,~~EAAEtB~~,iBAAAA;AACnB,GAAC,GACD;~~AAAEoB~~,IAAAA,eAAe,EAAE,OAAA;GAAS,EAAA;AAClCG,IAAAA,eAAe,EAAC,IAAA;AAAA;~~AAChB1D~~,IAAAA,MAAM,EAAEA,MAAAA;AACR;AAAA;~~IACA2D~~,kCAAkC,EAAA,IAAA;AAAA,GAAA,CACrC,CAAC,CAAA;AAEV,CACJ;;;;"}
1	+ {"version":3,"file":"Textfield.js","sources":["../../../../../../../src/components/Select/ui/Target/ui/Textfield/Textfield.tsx"],"sourcesContent":["import React, { forwardRef } from 'react';\n\nimport { sizeToIconSize, getItemId } from '../../../../utils';\nimport { classes } from '../../../../Select.tokens';\n\nimport { IconArrowWrapper, StyledArrow, StyledTextField } from './Textfield.styles';\nimport { TextfieldProps } from './Textfield.types';\n\nexport const Textfield = forwardRef<HTMLInputElement, TextfieldProps>(\n (\n {\n inputWrapperRef,\n opened,\n multiselect,\n value,\n label,\n placeholder,\n onKeyDown,\n labelPlacement,\n size,\n view,\n handleClickArrow,\n contentLeft,\n helperText,\n treeId,\n activeDescendantItemValue,\n disabled,\n isTargetAmount,\n valueToItemMap,\n renderValue,\n onChange,\n labelToItemMap,\n chipView,\n },\n ref,\n ) => {\n const withArrowInverse = opened ? classes.arrowInverse : undefined;\n\n const getChips = (): string[] => {\n if (multiselect && Array.isArray(value)) {\n if (value.length === 0) return [];\n\n if (isTargetAmount) {\n return [`Выбрано ${value.length}`];\n }\n\n const renderValueMapper =\n renderValue && ((stringValue: string \| number) => renderValue(valueToItemMap.get(stringValue)!));\n const valueToItemMapper = (stringValue: string \| number) => valueToItemMap.get(stringValue)!.label;\n\n return value.map(renderValueMapper \|\| valueToItemMapper);\n }\n\n return [];\n };\n\n // Обработчик чипов\n const handleChipsChange = (chipLabels: any[]) => {\n if (!Array.isArray(value)) return;\n\n // TODO: #1564\n // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.\n if (renderValue && !isTargetAmount) {\n const resultValues = [...value];\n\n value.forEach((_, index) => {\n const labelAfterRenderValue = renderValue(\n labelToItemMap.get(valueToItemMap.get(value[index])!.label)!,\n );\n\n if (!chipLabels.includes(labelAfterRenderValue)) {\n resultValues.splice(index, 1);\n }\n });\n\n onChange(resultValues);\n } else {\n onChange(chipLabels.map((chipLabel) => labelToItemMap.get(chipLabel)!.value));\n }\n };\n\n return (\n <StyledTextField\n ref={ref}\n inputWrapperRef={inputWrapperRef}\n readOnly\n value={multiselect ? undefined : valueToItemMap.get(value.toString())?.label \|\| ''}\n size={size}\n view={view}\n chipView={chipView}\n labelPlacement={labelPlacement}\n disabled={disabled}\n label={label}\n placeholder={value instanceof Array && value.length ? '' : placeholder}\n contentLeft={contentLeft as React.ReactElement}\n contentRight={\n <IconArrowWrapper disabled={Boolean(disabled)} onClick={handleClickArrow}>\n <StyledArrow color=\"inherit\" size={sizeToIconSize(size)} className={withArrowInverse} />\n </IconArrowWrapper>\n }\n onKeyDown={onKeyDown}\n leftHelper={helperText}\n role=\"combobox\"\n aria-autocomplete=\"list\"\n aria-controls={`${treeId}_tree_level_1`}\n aria-expanded={opened}\n aria-activedescendant={activeDescendantItemValue ? getItemId(treeId, activeDescendantItemValue) : ''}\n {...(multiselect\n ? {\n enumerationType: 'chip',\n chips: getChips(),\n onChangeChips: handleChipsChange,\n }\n : { enumerationType: 'plain' })}\n onEnterDisabled // Пропс для отключения обработчика Enter внутри Textfield\n opened={opened}\n // TODO: #1547\n _forceChipManipulationWithReadonly\n />\n );\n },\n);\n"],"names":["Textfield","forwardRef","_ref","ref","_valueToItemMap$get","inputWrapperRef","opened","multiselect","value","label","placeholder","onKeyDown","labelPlacement","size","view","handleClickArrow","contentLeft","helperText","treeId","activeDescendantItemValue","disabled","isTargetAmount","valueToItemMap","renderValue","onChange","labelToItemMap","chipView","withArrowInverse","classes","arrowInverse","undefined","getChips","Array","isArray","length","concat","renderValueMapper","stringValue","get","valueToItemMapper","map","handleChipsChange","chipLabels","resultValues","_toConsumableArray","forEach","_","index","labelAfterRenderValue","includes","splice","chipLabel","React","createElement","StyledTextField","_extends","readOnly","toString","contentRight","IconArrowWrapper","Boolean","onClick","StyledArrow","color","sizeToIconSize","className","leftHelper","role","getItemId","enumerationType","chips","onChangeChips","onEnterDisabled","_forceChipManipulationWithReadonly"],"mappings":"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"}

package/emotion/cjs/components/Select/ui/Target/ui/Textfield/Textfield.js CHANGED Viewed

@@ -12,6 +12,12 @@ var _Textfield = /*#__PURE__*/require("./Textfield.styles");
 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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(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(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(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; }
 var Textfield = exports.Textfield = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _valueToItemMap$get;
   var inputWrapperRef = _ref.inputWrapperRef,
@@ -56,9 +62,24 @@ var Textfield = exports.Textfield = /*#__PURE__*/(0, _react.forwardRef)(function
   // Обработчик чипов
   var handleChipsChange = function handleChipsChange(chipLabels) {
-    onChange(chipLabels.map(function (chipLabel) {
-      return labelToItemMap.get(chipLabel).value;
-    }));
+    if (!Array.isArray(value)) return;
+    // TODO: #1564
+    // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
+    if (renderValue && !isTargetAmount) {
+      var resultValues = _toConsumableArray(value);
+      value.forEach(function (_, index) {
+        var labelAfterRenderValue = renderValue(labelToItemMap.get(valueToItemMap.get(value[index]).label));
+        if (!chipLabels.includes(labelAfterRenderValue)) {
+          resultValues.splice(index, 1);
+        }
+      });
+      onChange(resultValues);
+    } else {
+      onChange(chipLabels.map(function (chipLabel) {
+        return labelToItemMap.get(chipLabel).value;
+      }));
+    }
   };
   return /*#__PURE__*/_react["default"].createElement(_Textfield.StyledTextField, _extends({
     ref: ref,

package/emotion/es/components/Select/ui/Target/ui/Textfield/Textfield.js CHANGED Viewed

@@ -1,4 +1,10 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(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(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(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; }
 import React, { forwardRef } from 'react';
 import { sizeToIconSize, getItemId } from '../../../../utils';
 import { classes } from '../../../../Select.tokens';
@@ -47,9 +53,24 @@ export var Textfield = /*#__PURE__*/forwardRef(function (_ref, ref) {
   // Обработчик чипов
   var handleChipsChange = function handleChipsChange(chipLabels) {
-    onChange(chipLabels.map(function (chipLabel) {
-      return labelToItemMap.get(chipLabel).value;
-    }));
+    if (!Array.isArray(value)) return;
+    // TODO: #1564
+    // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
+    if (renderValue && !isTargetAmount) {
+      var resultValues = _toConsumableArray(value);
+      value.forEach(function (_, index) {
+        var labelAfterRenderValue = renderValue(labelToItemMap.get(valueToItemMap.get(value[index]).label));
+        if (!chipLabels.includes(labelAfterRenderValue)) {
+          resultValues.splice(index, 1);
+        }
+      });
+      onChange(resultValues);
+    } else {
+      onChange(chipLabels.map(function (chipLabel) {
+        return labelToItemMap.get(chipLabel).value;
+      }));
+    }
   };
   return /*#__PURE__*/React.createElement(StyledTextField, _extends({
     ref: ref,

package/es/components/Select/ui/Target/ui/Textfield/Textfield.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { extends as _extends } from '../../../../../../_virtual/_rollupPluginBabelHelpers.js';
+import { extends as _extends, toConsumableArray as _toConsumableArray } from '../../../../../../_virtual/_rollupPluginBabelHelpers.js';
 import React, { forwardRef } from 'react';
 import { classes } from '../../../../Select.tokens.js';
 import { StyledTextField, IconArrowWrapper, StyledArrow } from './Textfield.styles.js';
@@ -49,9 +49,24 @@ var Textfield = /*#__PURE__*/forwardRef(function (_ref, ref) {
   // Обработчик чипов
   var handleChipsChange = function handleChipsChange(chipLabels) {
-    onChange(chipLabels.map(function (chipLabel) {
-      return labelToItemMap.get(chipLabel).value;
-    }));
+    if (!Array.isArray(value)) return;
+    // TODO: #1564
+    // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
+    if (renderValue && !isTargetAmount) {
+      var resultValues = _toConsumableArray(value);
+      value.forEach(function (_, index) {
+        var labelAfterRenderValue = renderValue(labelToItemMap.get(valueToItemMap.get(value[index]).label));
+        if (!chipLabels.includes(labelAfterRenderValue)) {
+          resultValues.splice(index, 1);
+        }
+      });
+      onChange(resultValues);
+    } else {
+      onChange(chipLabels.map(function (chipLabel) {
+        return labelToItemMap.get(chipLabel).value;
+      }));
+    }
   };
   return /*#__PURE__*/React.createElement(StyledTextField, _extends({
     ref: ref,

package/es/components/Select/ui/Target/ui/Textfield/Textfield.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Textfield.js","sources":["../../../../../../../src/components/Select/ui/Target/ui/Textfield/Textfield.tsx"],"sourcesContent":["import React, { forwardRef } from 'react';\n\nimport { sizeToIconSize, getItemId } from '../../../../utils';\nimport { classes } from '../../../../Select.tokens';\n\nimport { IconArrowWrapper, StyledArrow, StyledTextField } from './Textfield.styles';\nimport { TextfieldProps } from './Textfield.types';\n\nexport const Textfield = forwardRef<HTMLInputElement, TextfieldProps>(\n (\n {\n inputWrapperRef,\n opened,\n multiselect,\n value,\n label,\n placeholder,\n onKeyDown,\n labelPlacement,\n size,\n view,\n handleClickArrow,\n contentLeft,\n helperText,\n treeId,\n activeDescendantItemValue,\n disabled,\n isTargetAmount,\n valueToItemMap,\n renderValue,\n onChange,\n labelToItemMap,\n chipView,\n },\n ref,\n ) => {\n const withArrowInverse = opened ? classes.arrowInverse : undefined;\n\n const getChips = (): string[] => {\n if (multiselect && Array.isArray(value)) {\n if (value.length === 0) return [];\n\n if (isTargetAmount) {\n return [`Выбрано ${value.length}`];\n }\n\n const renderValueMapper =\n renderValue && ((stringValue: string \| number) => renderValue(valueToItemMap.get(stringValue)!));\n const valueToItemMapper = (stringValue: string \| number) => valueToItemMap.get(stringValue)!.label;\n\n return value.map(renderValueMapper \|\| valueToItemMapper);\n }\n\n return [];\n };\n\n // Обработчик чипов\n const handleChipsChange = (chipLabels: any[]) => {\n onChange(chipLabels.map((chipLabel) => labelToItemMap.get(chipLabel)!.value));\n };\n\n return (\n <StyledTextField\n ref={ref}\n inputWrapperRef={inputWrapperRef}\n readOnly\n value={multiselect ? undefined : valueToItemMap.get(value.toString())?.label \|\| ''}\n size={size}\n view={view}\n chipView={chipView}\n labelPlacement={labelPlacement}\n disabled={disabled}\n label={label}\n placeholder={value instanceof Array && value.length ? '' : placeholder}\n contentLeft={contentLeft as React.ReactElement}\n contentRight={\n <IconArrowWrapper disabled={Boolean(disabled)} onClick={handleClickArrow}>\n <StyledArrow color=\"inherit\" size={sizeToIconSize(size)} className={withArrowInverse} />\n </IconArrowWrapper>\n }\n onKeyDown={onKeyDown}\n leftHelper={helperText}\n role=\"combobox\"\n aria-autocomplete=\"list\"\n aria-controls={`${treeId}_tree_level_1`}\n aria-expanded={opened}\n aria-activedescendant={activeDescendantItemValue ? getItemId(treeId, activeDescendantItemValue) : ''}\n {...(multiselect\n ? {\n enumerationType: 'chip',\n chips: getChips(),\n onChangeChips: handleChipsChange,\n }\n : { enumerationType: 'plain' })}\n onEnterDisabled // Пропс для отключения обработчика Enter внутри Textfield\n opened={opened}\n // TODO: #1547\n _forceChipManipulationWithReadonly\n />\n );\n },\n);\n"],"names":["Textfield","forwardRef","_ref","ref","_valueToItemMap$get","inputWrapperRef","opened","multiselect","value","label","placeholder","onKeyDown","labelPlacement","size","view","handleClickArrow","contentLeft","helperText","treeId","activeDescendantItemValue","disabled","isTargetAmount","valueToItemMap","renderValue","onChange","labelToItemMap","chipView","withArrowInverse","classes","arrowInverse","undefined","getChips","Array","isArray","length","concat","renderValueMapper","stringValue","get","valueToItemMapper","map","handleChipsChange","chipLabels","chipLabel","React","createElement","StyledTextField","_extends","readOnly","toString","contentRight","IconArrowWrapper","Boolean","onClick","StyledArrow","color","sizeToIconSize","className","leftHelper","role","getItemId","enumerationType","chips","onChangeChips","onEnterDisabled","_forceChipManipulationWithReadonly"],"mappings":";;;;;;;AAQO,IAAMA,SAAS,gBAAGC,UAAU,CAC/B,UAAAC,IAAA,EAyBIC,GAAG,EACF;AAAA,EAAA,IAAAC,mBAAA,CAAA;AAAA,EAAA,IAxBGC,eAAe,GAAAH,IAAA,CAAfG,eAAe;IACfC,MAAM,GAAAJ,IAAA,CAANI,MAAM;IACNC,WAAW,GAAAL,IAAA,CAAXK,WAAW;IACXC,KAAK,GAAAN,IAAA,CAALM,KAAK;IACLC,KAAK,GAAAP,IAAA,CAALO,KAAK;IACLC,WAAW,GAAAR,IAAA,CAAXQ,WAAW;IACXC,SAAS,GAAAT,IAAA,CAATS,SAAS;IACTC,cAAc,GAAAV,IAAA,CAAdU,cAAc;IACdC,IAAI,GAAAX,IAAA,CAAJW,IAAI;IACJC,IAAI,GAAAZ,IAAA,CAAJY,IAAI;IACJC,gBAAgB,GAAAb,IAAA,CAAhBa,gBAAgB;IAChBC,WAAW,GAAAd,IAAA,CAAXc,WAAW;IACXC,UAAU,GAAAf,IAAA,CAAVe,UAAU;IACVC,MAAM,GAAAhB,IAAA,CAANgB,MAAM;IACNC,yBAAyB,GAAAjB,IAAA,CAAzBiB,yBAAyB;IACzBC,QAAQ,GAAAlB,IAAA,CAARkB,QAAQ;IACRC,cAAc,GAAAnB,IAAA,CAAdmB,cAAc;IACdC,cAAc,GAAApB,IAAA,CAAdoB,cAAc;IACdC,WAAW,GAAArB,IAAA,CAAXqB,WAAW;IACXC,QAAQ,GAAAtB,IAAA,CAARsB,QAAQ;IACRC,cAAc,GAAAvB,IAAA,CAAduB,cAAc;IACdC,QAAQ,GAAAxB,IAAA,CAARwB,QAAQ,CAAA;EAIZ,IAAMC,gBAAgB,GAAGrB,MAAM,GAAGsB,OAAO,CAACC,YAAY,GAAGC,SAAS,CAAA;AAElE,EAAA,IAAMC,QAAQ,GAAG,SAAXA,QAAQA,GAAmB;IAC7B,IAAIxB,WAAW,IAAIyB,KAAK,CAACC,OAAO,CAACzB,KAAK,CAAC,EAAE;AACrC,MAAA,IAAIA,KAAK,CAAC0B,MAAM,KAAK,CAAC,EAAE,OAAO,EAAE,CAAA;AAEjC,MAAA,IAAIb,cAAc,EAAE;AAChB,QAAA,OAAO,+CAAAc,MAAA,CAAY3B,KAAK,CAAC0B,MAAM,CAAG,CAAA,CAAA;AACtC,OAAA;AAEA,MAAA,IAAME,iBAAiB,GACnBb,WAAW,IAAK,UAACc,WAA4B,EAAA;QAAA,OAAKd,WAAW,CAACD,cAAc,CAACgB,GAAG,CAACD,WAAW,CAAE,CAAC,CAAA;OAAC,CAAA;AACpG,MAAA,IAAME,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAIF,WAA4B,EAAA;AAAA,QAAA,OAAKf,cAAc,CAACgB,GAAG,CAACD,WAAW,CAAC,CAAE5B,KAAK,CAAA;AAAA,OAAA,CAAA;AAElG,MAAA,OAAOD,KAAK,CAACgC,GAAG,CAACJ,iBAAiB,IAAIG,iBAAiB,CAAC,CAAA;AAC5D,KAAA;AAEA,IAAA,OAAO,EAAE,CAAA;GACZ,CAAA;;AAED;AACA,EAAA,IAAME,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAIC,UAAiB,EAAK;~~AAC7ClB~~,~~IAAAA~~,QAAQ,CAACkB,UAAU,CAACF,GAAG,CAAC,~~UAACG~~,SAAS,EAAA;AAAA,~~MAAA~~,~~OAAKlB~~,cAAc,CAACa,GAAG,~~CAACK~~,SAAS,CAAC,~~CAAEnC~~,KAAK,CAAA;AAAA,~~KAAA~~,CAAC,CAAC,CAAA;~~GAChF~~,CAAA;AAED,EAAA,~~oBACIoC~~,KAAA,CAAAC,aAAA,CAACC,eAAe,EAAAC,QAAA,CAAA;~~AACZ5C~~,IAAAA,GAAG,EAAEA,GAAI;AACTE,IAAAA,eAAe,EAAEA,eAAgB;~~IACjC2C~~,QAAQ,EAAA,IAAA;~~IACRxC~~,KAAK,EAAED,WAAW,GAAGuB,SAAS,GAAG,EAAA1B,mBAAA,GAAAkB,cAAc,CAACgB,GAAG,CAAC9B,KAAK,~~CAACyC~~,QAAQ,EAAE,CAAC,MAAA,IAAA,~~IAAA7C~~,mBAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAApCA,mBAAA,CAAsCK,KAAK,KAAI,EAAG;AACnFI,IAAAA,IAAI,EAAEA,IAAK;AACXC,IAAAA,IAAI,EAAEA,IAAK;AACXY,IAAAA,QAAQ,EAAEA,QAAS;AACnBd,IAAAA,cAAc,EAAEA,cAAe;AAC/BQ,IAAAA,QAAQ,EAAEA,QAAS;AACnBX,IAAAA,KAAK,EAAEA,KAAM;IACbC,WAAW,EAAEF,KAAK,YAAYwB,KAAK,IAAIxB,KAAK,CAAC0B,MAAM,GAAG,EAAE,GAAGxB,WAAY;AACvEM,IAAAA,WAAW,EAAEA,WAAkC;AAC/~~CkC~~,IAAAA,YAAY,eACRN,KAAA,CAAAC,aAAA,CAACM,gBAAgB,EAAA;~~AAAC/B~~,MAAAA,QAAQ,~~EAAEgC~~,OAAO,~~CAAChC~~,QAAQ,CAAE;~~AAACiC~~,MAAAA,OAAO,~~EAAEtC~~,gBAAAA;AAAiB,KAAA,~~eACrE6B~~,KAAA,CAAAC,aAAA,CAACS,WAAW,EAAA;AAACC,MAAAA,KAAK,EAAC,SAAS;~~AAAC1C~~,MAAAA,IAAI,~~EAAE2C~~,cAAc,~~CAAC3C~~,IAAI,CAAE;~~AAAC4C~~,MAAAA,SAAS,~~EAAE9B~~,gBAAAA;AAAiB,KAAE,CACzE,CACrB;AACDhB,IAAAA,SAAS,EAAEA,SAAU;~~AACrB+C~~,IAAAA,UAAU,~~EAAEzC~~,UAAW;~~AACvB0C~~,IAAAA,IAAI,EAAC,UAAU;AACf,IAAA,mBAAA,EAAkB,MAAM;IACxB,~~eAAAxB~~,EAAAA,EAAAA,CAAAA,MAAA,CAAkBjB,MAAM,EAAgB,eAAA,CAAA;AACxC,IAAA,eAAA,EAAeZ,MAAO;IACtB,uBAAuBa,EAAAA,yBAAyB,~~GAAGyC~~,SAAS,~~CAAC1C~~,MAAM,EAAEC,yBAAyB,CAAC,GAAG,EAAA;AAAG,GAAA,EAChGZ,WAAW,GACV;~~AACIsD~~,IAAAA,eAAe,EAAE,MAAM;IACvBC,KAAK,~~EAAE/B~~,QAAQ,EAAE;~~AACjBgC~~,IAAAA,aAAa,~~EAAEtB~~,iBAAAA;AACnB,GAAC,GACD;~~AAAEoB~~,IAAAA,eAAe,EAAE,OAAA;GAAS,EAAA;AAClCG,IAAAA,eAAe,EAAC,IAAA;AAAA;~~AAChB1D~~,IAAAA,MAAM,EAAEA,MAAAA;AACR;AAAA;~~IACA2D~~,kCAAkC,EAAA,IAAA;AAAA,GAAA,CACrC,CAAC,CAAA;AAEV,CACJ;;;;"}
1	+ {"version":3,"file":"Textfield.js","sources":["../../../../../../../src/components/Select/ui/Target/ui/Textfield/Textfield.tsx"],"sourcesContent":["import React, { forwardRef } from 'react';\n\nimport { sizeToIconSize, getItemId } from '../../../../utils';\nimport { classes } from '../../../../Select.tokens';\n\nimport { IconArrowWrapper, StyledArrow, StyledTextField } from './Textfield.styles';\nimport { TextfieldProps } from './Textfield.types';\n\nexport const Textfield = forwardRef<HTMLInputElement, TextfieldProps>(\n (\n {\n inputWrapperRef,\n opened,\n multiselect,\n value,\n label,\n placeholder,\n onKeyDown,\n labelPlacement,\n size,\n view,\n handleClickArrow,\n contentLeft,\n helperText,\n treeId,\n activeDescendantItemValue,\n disabled,\n isTargetAmount,\n valueToItemMap,\n renderValue,\n onChange,\n labelToItemMap,\n chipView,\n },\n ref,\n ) => {\n const withArrowInverse = opened ? classes.arrowInverse : undefined;\n\n const getChips = (): string[] => {\n if (multiselect && Array.isArray(value)) {\n if (value.length === 0) return [];\n\n if (isTargetAmount) {\n return [`Выбрано ${value.length}`];\n }\n\n const renderValueMapper =\n renderValue && ((stringValue: string \| number) => renderValue(valueToItemMap.get(stringValue)!));\n const valueToItemMapper = (stringValue: string \| number) => valueToItemMap.get(stringValue)!.label;\n\n return value.map(renderValueMapper \|\| valueToItemMapper);\n }\n\n return [];\n };\n\n // Обработчик чипов\n const handleChipsChange = (chipLabels: any[]) => {\n if (!Array.isArray(value)) return;\n\n // TODO: #1564\n // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.\n if (renderValue && !isTargetAmount) {\n const resultValues = [...value];\n\n value.forEach((_, index) => {\n const labelAfterRenderValue = renderValue(\n labelToItemMap.get(valueToItemMap.get(value[index])!.label)!,\n );\n\n if (!chipLabels.includes(labelAfterRenderValue)) {\n resultValues.splice(index, 1);\n }\n });\n\n onChange(resultValues);\n } else {\n onChange(chipLabels.map((chipLabel) => labelToItemMap.get(chipLabel)!.value));\n }\n };\n\n return (\n <StyledTextField\n ref={ref}\n inputWrapperRef={inputWrapperRef}\n readOnly\n value={multiselect ? undefined : valueToItemMap.get(value.toString())?.label \|\| ''}\n size={size}\n view={view}\n chipView={chipView}\n labelPlacement={labelPlacement}\n disabled={disabled}\n label={label}\n placeholder={value instanceof Array && value.length ? '' : placeholder}\n contentLeft={contentLeft as React.ReactElement}\n contentRight={\n <IconArrowWrapper disabled={Boolean(disabled)} onClick={handleClickArrow}>\n <StyledArrow color=\"inherit\" size={sizeToIconSize(size)} className={withArrowInverse} />\n </IconArrowWrapper>\n }\n onKeyDown={onKeyDown}\n leftHelper={helperText}\n role=\"combobox\"\n aria-autocomplete=\"list\"\n aria-controls={`${treeId}_tree_level_1`}\n aria-expanded={opened}\n aria-activedescendant={activeDescendantItemValue ? getItemId(treeId, activeDescendantItemValue) : ''}\n {...(multiselect\n ? {\n enumerationType: 'chip',\n chips: getChips(),\n onChangeChips: handleChipsChange,\n }\n : { enumerationType: 'plain' })}\n onEnterDisabled // Пропс для отключения обработчика Enter внутри Textfield\n opened={opened}\n // TODO: #1547\n _forceChipManipulationWithReadonly\n />\n );\n },\n);\n"],"names":["Textfield","forwardRef","_ref","ref","_valueToItemMap$get","inputWrapperRef","opened","multiselect","value","label","placeholder","onKeyDown","labelPlacement","size","view","handleClickArrow","contentLeft","helperText","treeId","activeDescendantItemValue","disabled","isTargetAmount","valueToItemMap","renderValue","onChange","labelToItemMap","chipView","withArrowInverse","classes","arrowInverse","undefined","getChips","Array","isArray","length","concat","renderValueMapper","stringValue","get","valueToItemMapper","map","handleChipsChange","chipLabels","resultValues","_toConsumableArray","forEach","_","index","labelAfterRenderValue","includes","splice","chipLabel","React","createElement","StyledTextField","_extends","readOnly","toString","contentRight","IconArrowWrapper","Boolean","onClick","StyledArrow","color","sizeToIconSize","className","leftHelper","role","getItemId","enumerationType","chips","onChangeChips","onEnterDisabled","_forceChipManipulationWithReadonly"],"mappings":";;;;;;;AAQO,IAAMA,SAAS,gBAAGC,UAAU,CAC/B,UAAAC,IAAA,EAyBIC,GAAG,EACF;AAAA,EAAA,IAAAC,mBAAA,CAAA;AAAA,EAAA,IAxBGC,eAAe,GAAAH,IAAA,CAAfG,eAAe;IACfC,MAAM,GAAAJ,IAAA,CAANI,MAAM;IACNC,WAAW,GAAAL,IAAA,CAAXK,WAAW;IACXC,KAAK,GAAAN,IAAA,CAALM,KAAK;IACLC,KAAK,GAAAP,IAAA,CAALO,KAAK;IACLC,WAAW,GAAAR,IAAA,CAAXQ,WAAW;IACXC,SAAS,GAAAT,IAAA,CAATS,SAAS;IACTC,cAAc,GAAAV,IAAA,CAAdU,cAAc;IACdC,IAAI,GAAAX,IAAA,CAAJW,IAAI;IACJC,IAAI,GAAAZ,IAAA,CAAJY,IAAI;IACJC,gBAAgB,GAAAb,IAAA,CAAhBa,gBAAgB;IAChBC,WAAW,GAAAd,IAAA,CAAXc,WAAW;IACXC,UAAU,GAAAf,IAAA,CAAVe,UAAU;IACVC,MAAM,GAAAhB,IAAA,CAANgB,MAAM;IACNC,yBAAyB,GAAAjB,IAAA,CAAzBiB,yBAAyB;IACzBC,QAAQ,GAAAlB,IAAA,CAARkB,QAAQ;IACRC,cAAc,GAAAnB,IAAA,CAAdmB,cAAc;IACdC,cAAc,GAAApB,IAAA,CAAdoB,cAAc;IACdC,WAAW,GAAArB,IAAA,CAAXqB,WAAW;IACXC,QAAQ,GAAAtB,IAAA,CAARsB,QAAQ;IACRC,cAAc,GAAAvB,IAAA,CAAduB,cAAc;IACdC,QAAQ,GAAAxB,IAAA,CAARwB,QAAQ,CAAA;EAIZ,IAAMC,gBAAgB,GAAGrB,MAAM,GAAGsB,OAAO,CAACC,YAAY,GAAGC,SAAS,CAAA;AAElE,EAAA,IAAMC,QAAQ,GAAG,SAAXA,QAAQA,GAAmB;IAC7B,IAAIxB,WAAW,IAAIyB,KAAK,CAACC,OAAO,CAACzB,KAAK,CAAC,EAAE;AACrC,MAAA,IAAIA,KAAK,CAAC0B,MAAM,KAAK,CAAC,EAAE,OAAO,EAAE,CAAA;AAEjC,MAAA,IAAIb,cAAc,EAAE;AAChB,QAAA,OAAO,+CAAAc,MAAA,CAAY3B,KAAK,CAAC0B,MAAM,CAAG,CAAA,CAAA;AACtC,OAAA;AAEA,MAAA,IAAME,iBAAiB,GACnBb,WAAW,IAAK,UAACc,WAA4B,EAAA;QAAA,OAAKd,WAAW,CAACD,cAAc,CAACgB,GAAG,CAACD,WAAW,CAAE,CAAC,CAAA;OAAC,CAAA;AACpG,MAAA,IAAME,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAIF,WAA4B,EAAA;AAAA,QAAA,OAAKf,cAAc,CAACgB,GAAG,CAACD,WAAW,CAAC,CAAE5B,KAAK,CAAA;AAAA,OAAA,CAAA;AAElG,MAAA,OAAOD,KAAK,CAACgC,GAAG,CAACJ,iBAAiB,IAAIG,iBAAiB,CAAC,CAAA;AAC5D,KAAA;AAEA,IAAA,OAAO,EAAE,CAAA;GACZ,CAAA;;AAED;AACA,EAAA,IAAME,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAIC,UAAiB,EAAK;AAC7C,IAAA,IAAI,CAACV,KAAK,CAACC,OAAO,CAACzB,KAAK,CAAC,EAAE,OAAA;;AAE3B;AACA;AACA,IAAA,IAAIe,WAAW,IAAI,CAACF,cAAc,EAAE;AAChC,MAAA,IAAMsB,YAAY,GAAAC,kBAAA,CAAOpC,KAAK,CAAC,CAAA;AAE/BA,MAAAA,KAAK,CAACqC,OAAO,CAAC,UAACC,CAAC,EAAEC,KAAK,EAAK;QACxB,IAAMC,qBAAqB,GAAGzB,WAAW,CACrCE,cAAc,CAACa,GAAG,CAAChB,cAAc,CAACgB,GAAG,CAAC9B,KAAK,CAACuC,KAAK,CAAC,CAAC,CAAEtC,KAAK,CAC9D,CAAC,CAAA;AAED,QAAA,IAAI,CAACiC,UAAU,CAACO,QAAQ,CAACD,qBAAqB,CAAC,EAAE;AAC7CL,UAAAA,YAAY,CAACO,MAAM,CAACH,KAAK,EAAE,CAAC,CAAC,CAAA;AACjC,SAAA;AACJ,OAAC,CAAC,CAAA;MAEFvB,QAAQ,CAACmB,YAAY,CAAC,CAAA;AAC1B,KAAC,MAAM;AACHnB,MAAAA,QAAQ,CAACkB,UAAU,CAACF,GAAG,CAAC,UAACW,SAAS,EAAA;AAAA,QAAA,OAAK1B,cAAc,CAACa,GAAG,CAACa,SAAS,CAAC,CAAE3C,KAAK,CAAA;AAAA,OAAA,CAAC,CAAC,CAAA;AACjF,KAAA;GACH,CAAA;AAED,EAAA,oBACI4C,KAAA,CAAAC,aAAA,CAACC,eAAe,EAAAC,QAAA,CAAA;AACZpD,IAAAA,GAAG,EAAEA,GAAI;AACTE,IAAAA,eAAe,EAAEA,eAAgB;IACjCmD,QAAQ,EAAA,IAAA;IACRhD,KAAK,EAAED,WAAW,GAAGuB,SAAS,GAAG,EAAA1B,mBAAA,GAAAkB,cAAc,CAACgB,GAAG,CAAC9B,KAAK,CAACiD,QAAQ,EAAE,CAAC,MAAA,IAAA,IAAArD,mBAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAApCA,mBAAA,CAAsCK,KAAK,KAAI,EAAG;AACnFI,IAAAA,IAAI,EAAEA,IAAK;AACXC,IAAAA,IAAI,EAAEA,IAAK;AACXY,IAAAA,QAAQ,EAAEA,QAAS;AACnBd,IAAAA,cAAc,EAAEA,cAAe;AAC/BQ,IAAAA,QAAQ,EAAEA,QAAS;AACnBX,IAAAA,KAAK,EAAEA,KAAM;IACbC,WAAW,EAAEF,KAAK,YAAYwB,KAAK,IAAIxB,KAAK,CAAC0B,MAAM,GAAG,EAAE,GAAGxB,WAAY;AACvEM,IAAAA,WAAW,EAAEA,WAAkC;AAC/C0C,IAAAA,YAAY,eACRN,KAAA,CAAAC,aAAA,CAACM,gBAAgB,EAAA;AAACvC,MAAAA,QAAQ,EAAEwC,OAAO,CAACxC,QAAQ,CAAE;AAACyC,MAAAA,OAAO,EAAE9C,gBAAAA;AAAiB,KAAA,eACrEqC,KAAA,CAAAC,aAAA,CAACS,WAAW,EAAA;AAACC,MAAAA,KAAK,EAAC,SAAS;AAAClD,MAAAA,IAAI,EAAEmD,cAAc,CAACnD,IAAI,CAAE;AAACoD,MAAAA,SAAS,EAAEtC,gBAAAA;AAAiB,KAAE,CACzE,CACrB;AACDhB,IAAAA,SAAS,EAAEA,SAAU;AACrBuD,IAAAA,UAAU,EAAEjD,UAAW;AACvBkD,IAAAA,IAAI,EAAC,UAAU;AACf,IAAA,mBAAA,EAAkB,MAAM;IACxB,eAAAhC,EAAAA,EAAAA,CAAAA,MAAA,CAAkBjB,MAAM,EAAgB,eAAA,CAAA;AACxC,IAAA,eAAA,EAAeZ,MAAO;IACtB,uBAAuBa,EAAAA,yBAAyB,GAAGiD,SAAS,CAAClD,MAAM,EAAEC,yBAAyB,CAAC,GAAG,EAAA;AAAG,GAAA,EAChGZ,WAAW,GACV;AACI8D,IAAAA,eAAe,EAAE,MAAM;IACvBC,KAAK,EAAEvC,QAAQ,EAAE;AACjBwC,IAAAA,aAAa,EAAE9B,iBAAAA;AACnB,GAAC,GACD;AAAE4B,IAAAA,eAAe,EAAE,OAAA;GAAS,EAAA;AAClCG,IAAAA,eAAe,EAAC,IAAA;AAAA;AAChBlE,IAAAA,MAAM,EAAEA,MAAAA;AACR;AAAA;IACAmE,kCAAkC,EAAA,IAAA;AAAA,GAAA,CACrC,CAAC,CAAA;AAEV,CACJ;;;;"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-new-hope",
-  "version": "0.194.0-canary.1562.11851866538.0",
+  "version": "0.194.0-canary.1562.11857238836.0",
   "description": "Salute Design System blueprint",
   "main": "cjs/index.js",
   "module": "es/index.js",
@@ -129,5 +129,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "31a26f7b2e4fdc07bee9b216f1d201b67be3a85b"
+  "gitHead": "ab766838da1cd0dac89f2b4ee0601a7f1cf7a210"
 }

package/styled-components/cjs/components/Select/ui/Target/ui/Textfield/Textfield.js CHANGED Viewed

@@ -12,6 +12,12 @@ var _Textfield = /*#__PURE__*/require("./Textfield.styles");
 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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(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(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(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; }
 var Textfield = exports.Textfield = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _valueToItemMap$get;
   var inputWrapperRef = _ref.inputWrapperRef,
@@ -56,9 +62,24 @@ var Textfield = exports.Textfield = /*#__PURE__*/(0, _react.forwardRef)(function
   // Обработчик чипов
   var handleChipsChange = function handleChipsChange(chipLabels) {
-    onChange(chipLabels.map(function (chipLabel) {
-      return labelToItemMap.get(chipLabel).value;
-    }));
+    if (!Array.isArray(value)) return;
+    // TODO: #1564
+    // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
+    if (renderValue && !isTargetAmount) {
+      var resultValues = _toConsumableArray(value);
+      value.forEach(function (_, index) {
+        var labelAfterRenderValue = renderValue(labelToItemMap.get(valueToItemMap.get(value[index]).label));
+        if (!chipLabels.includes(labelAfterRenderValue)) {
+          resultValues.splice(index, 1);
+        }
+      });
+      onChange(resultValues);
+    } else {
+      onChange(chipLabels.map(function (chipLabel) {
+        return labelToItemMap.get(chipLabel).value;
+      }));
+    }
   };
   return /*#__PURE__*/_react["default"].createElement(_Textfield.StyledTextField, _extends({
     ref: ref,

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

@@ -1,4 +1,10 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(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(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(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; }
 import React, { forwardRef } from 'react';
 import { sizeToIconSize, getItemId } from '../../../../utils';
 import { classes } from '../../../../Select.tokens';
@@ -47,9 +53,24 @@ export var Textfield = /*#__PURE__*/forwardRef(function (_ref, ref) {
   // Обработчик чипов
   var handleChipsChange = function handleChipsChange(chipLabels) {
-    onChange(chipLabels.map(function (chipLabel) {
-      return labelToItemMap.get(chipLabel).value;
-    }));
+    if (!Array.isArray(value)) return;
+    // TODO: #1564
+    // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
+    if (renderValue && !isTargetAmount) {
+      var resultValues = _toConsumableArray(value);
+      value.forEach(function (_, index) {
+        var labelAfterRenderValue = renderValue(labelToItemMap.get(valueToItemMap.get(value[index]).label));
+        if (!chipLabels.includes(labelAfterRenderValue)) {
+          resultValues.splice(index, 1);
+        }
+      });
+      onChange(resultValues);
+    } else {
+      onChange(chipLabels.map(function (chipLabel) {
+        return labelToItemMap.get(chipLabel).value;
+      }));
+    }
   };
   return /*#__PURE__*/React.createElement(StyledTextField, _extends({
     ref: ref,

package/types/components/Select/ui/Target/ui/Textfield/Textfield.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Textfield.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/Select/ui/Target/ui/Textfield/Textfield.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAM1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,eAAO,MAAM,SAAS,~~yFA6FrB~~,CAAC"}
1	+ {"version":3,"file":"Textfield.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/Select/ui/Target/ui/Textfield/Textfield.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAM1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,eAAO,MAAM,SAAS,yFAiHrB,CAAC"}