@salutejs/plasma-new-hope 0.193.1-canary.1562.11858039838.0 → 0.194.0-canary.1552.11858023676.0

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

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -20,14 +19,12 @@ 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", "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 _SelectNative = /*#__PURE__*/require("./ui/SelectNative/SelectNative");
+var _excluded = ["name", "multiple", "value", "onChange", "defaultValue", "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); }
-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 _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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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."); }
 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); }
@@ -41,12 +38,15 @@ var Context = exports.Context = /*#__PURE__*/(0, _react.createContext)({});
 /**
  * Поле ввода с выпадающим списком и возможностью фильтрации и выбора элементов.
  */
+
 var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
   return /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _valueToItemMap$get, _valueToItemMap$get2, _getItemByFocused;
-    var multiple = props.multiple,
+    var name = props.name,
+      multiple = props.multiple,
       outerValue = props.value,
       outerOnChange = props.onChange,
+      defaultValue = props.defaultValue,
       isTargetAmount = props.isTargetAmount,
       targetAmount = props.targetAmount,
       items = props.items,
@@ -78,6 +78,7 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       outerCloseAfterSelect = props.closeAfterSelect,
       renderValue = props.renderValue,
       rest = _objectWithoutProperties(props, _excluded);
+    console.log('render');
     var transformedItems = (0, _react.useMemo)(function () {
       return (0, _utils3.initialItemsTransform)(items || []);
     }, [items]);
@@ -153,11 +154,27 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
         }
       }
     }, floatingPopoverRef);
+
+    // Эта функция срабатывает при изменении Combobox и
+    // при изменении нативного Select для формы (срабатывает только после изменения internalValue и рендера).
     var onChange = function onChange(newValue) {
+      // Условие для отправки изменений наружу
       if (outerOnChange) {
-        outerOnChange(newValue);
+        // Условие для отправки если комбобокс используется без формы.
+        if (!name && (typeof newValue === 'string' || Array.isArray(newValue))) {
+          outerOnChange(newValue);
+        }
+
+        // Условие для отправки если комбобокс используется с формой.
+        if (name && _typeof(newValue) === 'object' && !Array.isArray(newValue)) {
+          outerOnChange(newValue);
+        }
+      }
+
+      // Условие для изменения внутреннего значения (только если newValue строка или массив строк).
+      if (typeof newValue === 'string' || Array.isArray(newValue)) {
+        setInternalValue(newValue);
       }
-      setInternalValue(newValue);
     };
     var handleClickArrow = function handleClickArrow() {
       if (disabled || readOnly) {
@@ -190,24 +207,9 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
 
     // Обработчик чипов
     var handleChipsChange = function handleChipsChange(chipLabels) {
-      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;
-        }));
-      }
+      onChange(chipLabels.map(function (chipLabel) {
+        return labelToItemMap.get(chipLabel).value;
+      }));
     };
 
     // Обработчик открытия/закрытия выпадающего списка
@@ -360,13 +362,24 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       // Т.к. вначале нужно отфильтровать и провалидировать outerValue и результат положить в переменную.
       // А переменную, содержащую сложные типы данных, нельзя помещать в deps.
     }, [outerValue, internalValue, items]);
+    (0, _react.useEffect)(function () {
+      if (defaultValue) {
+        setInternalValue(defaultValue);
+      }
+    }, [defaultValue]);
     return /*#__PURE__*/_react["default"].createElement(Root, {
       size: size,
       view: view,
       labelPlacement: labelPlacement,
       disabled: disabled,
       readOnly: readOnly
-    }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(Context.Provider, {
+    }, name && /*#__PURE__*/_react["default"].createElement(_SelectNative.SelectNative, {
+      name: name,
+      value: internalValue,
+      multiple: multiple,
+      onChange: onChange,
+      ref: ref
+    }), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(Context.Provider, {
       value: {
         focusedPath: focusedPath,
         checked: checked,
@@ -376,6 +389,7 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
         handleItemClick: handleItemClick,
         variant: variant,
         renderItem: renderItem,
+        valueToItemMap: valueToItemMap,
         treeId: treeId
       }
     }, /*#__PURE__*/_react["default"].createElement(_FloatingPopover.FloatingPopover, {
@@ -389,7 +403,7 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       listWidth: listWidth,
       target: function target(referenceRef) {
         return /*#__PURE__*/_react["default"].createElement(_ui.StyledTextField, _extends({
-          ref: inputForkRef,
+          ref: name ? inputRef : inputForkRef,
           inputWrapperRef: referenceRef,
           value: textValue,
           onChange: handleTextValueChange,

package/styled-components/cjs/components/Combobox/ComboboxNew/ui/Inner/ui/Item/Item.js

@@ -40,6 +40,7 @@ var Item = exports.Item = function Item(_ref) {
     handleItemClick = _useContext.handleItemClick,
     variant = _useContext.variant,
     renderItem = _useContext.renderItem,
+    valueToItemMap = _useContext.valueToItemMap,
     treeId = _useContext.treeId;
   var disabledClassName = disabled ? _Combobox.classes.dropdownItemIsDisabled : undefined;
   var focusedClass = currentLevel === focusedPath.length - 1 && index === (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[currentLevel]) ? _Combobox.classes.dropdownItemIsFocused : undefined;
@@ -93,7 +94,7 @@ var Item = exports.Item = function Item(_ref) {
   }))), !multiple && checked.get(item.value) === 'done' && /*#__PURE__*/_react["default"].createElement(_Icon.IconDone, {
     size: (0, _utils.sizeToIconSize)(size, variant),
     color: "inherit"
-  })), renderItem ? /*#__PURE__*/_react["default"].createElement(_Item.StyledText, null, renderItem(item)) : /*#__PURE__*/_react["default"].createElement(_Item.StyledWrapper, null, /*#__PURE__*/_react["default"].createElement(_Item.StyledCell, {
+  })), renderItem ? /*#__PURE__*/_react["default"].createElement(_Item.StyledText, null, renderItem(valueToItemMap.get(value))) : /*#__PURE__*/_react["default"].createElement(_Item.StyledWrapper, null, /*#__PURE__*/_react["default"].createElement(_Item.StyledCell, {
     view: "default",
     size: "l",
     contentLeft: contentLeft,

package/styled-components/cjs/components/Combobox/ComboboxNew/ui/SelectNative/SelectNative.js

@@ -0,0 +1,40 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SelectNative = void 0;
+var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
+var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
+var _utils = /*#__PURE__*/require("../../../../../utils");
+var _SelectNative = /*#__PURE__*/require("./SelectNative.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; }
+var SelectNative = exports.SelectNative = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var name = _ref.name,
+    multiple = _ref.multiple,
+    value = _ref.value,
+    onChange = _ref.onChange;
+  var values = multiple ? value : [value];
+  var selectRef = (0, _react.useRef)(null);
+  var forkRef = (0, _plasmaCore.useForkRef)(selectRef, ref);
+  (0, _react.useEffect)(function () {
+    var event = (0, _utils.createEvent)(selectRef);
+    if (onChange) {
+      onChange(event);
+    }
+  }, [values]);
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_SelectNative.SelectHidden, {
+    ref: forkRef,
+    multiple: multiple,
+    name: name,
+    hidden: true,
+    value: multiple ? values : values[0]
+  }, values.map(function (v) {
+    return /*#__PURE__*/_react["default"].createElement("option", {
+      key: v,
+      value: v
+    }, v);
+  })));
+});

package/styled-components/cjs/components/Combobox/ComboboxNew/ui/SelectNative/SelectNative.styles.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SelectHidden = void 0;
+var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
+var _mixins = /*#__PURE__*/require("../../../../../mixins");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var SelectHidden = exports.SelectHidden = /*#__PURE__*/_styledComponents["default"].select.withConfig({
+  componentId: "plasma-new-hope__sc-w046ru-0"
+})(["", ";"], /*#__PURE__*/(0, _mixins.applyHidden)());

package/styled-components/cjs/components/Dropdown/Dropdown.js

@@ -20,7 +20,7 @@ var _Dropdown2 = /*#__PURE__*/require("./Dropdown.tokens");
 var _useKeyboardNavigation = /*#__PURE__*/require("./hooks/useKeyboardNavigation");
 var _useHashMaps3 = /*#__PURE__*/require("./hooks/useHashMaps");
 var _FloatingPopover = /*#__PURE__*/require("./FloatingPopover");
-var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "alwaysOpened", "portal", "renderItem"];
+var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "alwaysOpened", "portal"];
 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); }
@@ -69,7 +69,6 @@ var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
       _ref$alwaysOpened = _ref.alwaysOpened,
       alwaysOpened = _ref$alwaysOpened === void 0 ? false : _ref$alwaysOpened,
       portal = _ref.portal,
-      renderItem = _ref.renderItem,
       rest = _objectWithoutProperties(_ref, _excluded);
     var _useReducer = (0, _react.useReducer)(_pathReducer.pathReducer, []),
       _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -145,8 +144,7 @@ var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
         onItemClick: onItemClick,
         onItemSelect: onItemSelect,
         hasArrow: hasArrow,
-        treeId: treeId,
-        renderItem: renderItem
+        treeId: treeId
       }
     }, /*#__PURE__*/_react["default"].createElement(_FloatingPopover.FloatingPopover, {
       ref: floatingPopoverRef,

package/styled-components/cjs/components/Dropdown/ui/DropdownItem/DropdownItem.js

@@ -43,8 +43,7 @@ var DropdownItem = exports.DropdownItem = function DropdownItem(_ref) {
     onItemSelect = _useContext.onItemSelect,
     onItemClick = _useContext.onItemClick,
     hasArrow = _useContext.hasArrow,
-    treeId = _useContext.treeId,
-    renderItem = _useContext.renderItem;
+    treeId = _useContext.treeId;
   var hasDescendants = Boolean(item.items);
   var disclosureIconSize = size === 'xs' ? 'xs' : 's';
   var isDisabledClassName = disabled || isDisabled ? _Dropdown.classes.dropdownItemIsDisabled : undefined;
@@ -95,7 +94,7 @@ var DropdownItem = exports.DropdownItem = function DropdownItem(_ref) {
     "aria-expanded": ariaExpanded,
     "aria-level": ariaLevel,
     "aria-label": ariaLabel
-  }, renderItem ? /*#__PURE__*/_react["default"].createElement(_DropdownItem.RenderItemWrapper, null, renderItem(item)) : /*#__PURE__*/_react["default"].createElement(_DropdownItem.CellWrapper, null, /*#__PURE__*/_react["default"].createElement(_DropdownItem.StyledCell, {
+  }, /*#__PURE__*/_react["default"].createElement(_DropdownItem.CellWrapper, null, /*#__PURE__*/_react["default"].createElement(_DropdownItem.StyledCell, {
     contentLeft: contentLeft,
     contentRight: contentRight,
     alignContentLeft: "center",

package/styled-components/cjs/components/Dropdown/ui/DropdownItem/DropdownItem.styles.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Wrapper = exports.StyledCell = exports.RenderItemWrapper = exports.Divider = exports.DisclosureIconWrapper = exports.CellWrapper = void 0;
+exports.Wrapper = exports.StyledCell = exports.Divider = exports.DisclosureIconWrapper = exports.CellWrapper = void 0;
 var _styledComponents = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("styled-components"));
 var _Dropdown = /*#__PURE__*/require("../../Dropdown.tokens");
 var _mixins = /*#__PURE__*/require("../../../../mixins");
@@ -42,7 +42,4 @@ var Wrapper = exports.Wrapper = /*#__PURE__*/_styledComponents["default"].li.wit
   outlineRadius: /*#__PURE__*/"var(".concat(_Dropdown.tokens.itemBorderRadius, ")"),
   hasTransition: false,
   customFocusRules: /*#__PURE__*/"\n            &.".concat(_Dropdown.classes.dropdownItemIsFocused, ":before {\n                outline: none;\n                box-shadow: 0 0 0 0.0625rem var(").concat(_Dropdown.constants.focusColor, ");\n            }\n        ")
-}));
-var RenderItemWrapper = exports.RenderItemWrapper = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  componentId: "plasma-new-hope__sc-hs0ek1-5"
-})(["", ";flex:1;"], /*#__PURE__*/(0, _mixins.applyEllipsis)());
+}));

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

@@ -281,6 +281,7 @@ var selectRoot = exports.selectRoot = function selectRoot(Root) {
         handleItemClick: handleItemClick,
         variant: variant,
         renderItem: renderItem,
+        valueToItemMap: valueToItemMap,
         treeId: treeId
       }
     }, /*#__PURE__*/_react["default"].createElement(_FloatingPopover.FloatingPopover, {

package/styled-components/cjs/components/Select/ui/Inner/ui/Item/Item.js

@@ -41,6 +41,7 @@ var Item = exports.Item = function Item(_ref) {
     handleItemClick = _useContext.handleItemClick,
     variant = _useContext.variant,
     renderItem = _useContext.renderItem,
+    valueToItemMap = _useContext.valueToItemMap,
     treeId = _useContext.treeId;
   var itemDisabled = Boolean(disabled || isDisabled);
   var disabledClassName = itemDisabled ? _Select.classes.dropdownItemIsDisabled : undefined;
@@ -95,7 +96,7 @@ var Item = exports.Item = function Item(_ref) {
   }))), !multiselect && checked.get(item.value) === 'done' && /*#__PURE__*/_react["default"].createElement(_Icon.IconDone, {
     size: (0, _utils.sizeToIconSize)(size, variant),
     color: "inherit"
-  })), renderItem ? /*#__PURE__*/_react["default"].createElement(_Item.StyledText, null, renderItem(item)) : /*#__PURE__*/_react["default"].createElement(_Item.StyledWrapper, null, /*#__PURE__*/_react["default"].createElement(_Item.StyledCell, {
+  })), renderItem ? /*#__PURE__*/_react["default"].createElement(_Item.StyledText, null, renderItem(valueToItemMap.get(value))) : /*#__PURE__*/_react["default"].createElement(_Item.StyledWrapper, null, /*#__PURE__*/_react["default"].createElement(_Item.StyledCell, {
     contentLeft: contentLeft,
     contentRight: contentRight
     // TODO: #1548

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

@@ -12,12 +12,6 @@ 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,
@@ -62,24 +56,9 @@ var Textfield = exports.Textfield = /*#__PURE__*/(0, _react.forwardRef)(function
 
   // Обработчик чипов
   var handleChipsChange = function handleChipsChange(chipLabels) {
-    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;
-      }));
-    }
+    onChange(chipLabels.map(function (chipLabel) {
+      return labelToItemMap.get(chipLabel).value;
+    }));
   };
   return /*#__PURE__*/_react["default"].createElement(_Textfield.StyledTextField, _extends({
     ref: ref,

package/styled-components/cjs/examples/plasma_b2c/components/Combobox/Combobox.stories.tsx

@@ -353,11 +353,11 @@ const items = [
 
 const SingleStory = (args: StorySelectProps) => {
     const [value, setValue] = useState('');
-
     return (
         <div style={{ width: '400px' }}>
             <Combobox
                 {...args}
+                name="mau"
                 items={items}
                 value={value}
                 onChange={setValue}

package/styled-components/cjs/utils/createEvent.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createEvent = void 0;
+var createEvent = exports.createEvent = function createEvent(ref) {
+  if (ref.current) {
+    var event = new Event('change', {
+      bubbles: true
+    });
+    Object.defineProperty(event, 'target', {
+      writable: false,
+      value: ref.current
+    });
+    var syntheticEvent = createSyntheticEvent(event);
+    return syntheticEvent;
+  }
+  return null;
+};
+var createSyntheticEvent = function createSyntheticEvent(event) {
+  var _isDefaultPrevented = false;
+  var _isPropagationStopped = false;
+  var preventDefault = function preventDefault() {
+    _isDefaultPrevented = true;
+    event.preventDefault();
+  };
+  var stopPropagation = function stopPropagation() {
+    _isPropagationStopped = true;
+    event.stopPropagation();
+  };
+  return {
+    nativeEvent: event,
+    currentTarget: event.currentTarget,
+    target: event.target,
+    bubbles: event.bubbles,
+    cancelable: event.cancelable,
+    defaultPrevented: event.defaultPrevented,
+    eventPhase: event.eventPhase,
+    isTrusted: event.isTrusted,
+    preventDefault: preventDefault,
+    isDefaultPrevented: function isDefaultPrevented() {
+      return _isDefaultPrevented;
+    },
+    stopPropagation: stopPropagation,
+    isPropagationStopped: function isPropagationStopped() {
+      return _isPropagationStopped;
+    },
+    persist: function persist() {},
+    timeStamp: event.timeStamp,
+    type: event.type
+  };
+};

package/styled-components/cjs/utils/index.js

@@ -16,6 +16,7 @@ var _exportNames = {
   mergeRefs: true,
   setRefList: true,
   isEmpty: true,
+  createEvent: true,
   constants: true,
   noop: true,
   fixedForwardRef: true
@@ -32,7 +33,14 @@ Object.defineProperty(exports, "canUseDOM", {
     return _canUseDOM.canUseDOM;
   }
 });
-exports.cx = exports.constants = exports.composableStyle = void 0;
+exports.constants = exports.composableStyle = void 0;
+Object.defineProperty(exports, "createEvent", {
+  enumerable: true,
+  get: function get() {
+    return _createEvent.createEvent;
+  }
+});
+exports.cx = void 0;
 Object.defineProperty(exports, "extractTextFrom", {
   enumerable: true,
   get: function get() {
@@ -94,6 +102,7 @@ var _react = /*#__PURE__*/require("./react");
 var _isNumber = /*#__PURE__*/require("./isNumber");
 var _setRefList = /*#__PURE__*/require("./setRefList");
 var _isEmpty = /*#__PURE__*/require("./isEmpty");
+var _createEvent = /*#__PURE__*/require("./createEvent");
 var _constants = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./constants"));
 exports.constants = _constants;
 var _getPopoverPlacement = /*#__PURE__*/require("./getPopoverPlacement");

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

@@ -1,9 +1,6 @@
-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 _excluded = ["name", "multiple", "value", "onChange", "defaultValue", "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 _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 _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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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."); }
 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); }
@@ -12,7 +9,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { forwardRef, useState, useReducer, useMemo, createContext, useLayoutEffect, useRef } from 'react';
+import React, { forwardRef, useState, useReducer, useMemo, createContext, useLayoutEffect, useRef, useEffect } from 'react';
 import { safeUseId, useForkRef } from '@salutejs/plasma-core';
 import { isEmpty } from '../../../utils';
 import { useOutsideClick } from '../../../hooks';
@@ -27,17 +24,21 @@ import { getPathMap, getTreeMaps } from './hooks/getPathMaps';
 import { Ul, base, StyledArrow, IconArrowWrapper, StyledEmptyState } from './Combobox.styles';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';
+import { SelectNative } from './ui/SelectNative/SelectNative';
 export var Context = /*#__PURE__*/createContext({});
 
 /**
  * Поле ввода с выпадающим списком и возможностью фильтрации и выбора элементов.
  */
+
 export var comboboxRoot = function comboboxRoot(Root) {
   return /*#__PURE__*/forwardRef(function (props, ref) {
     var _valueToItemMap$get, _valueToItemMap$get2, _getItemByFocused;
-    var multiple = props.multiple,
+    var name = props.name,
+      multiple = props.multiple,
       outerValue = props.value,
       outerOnChange = props.onChange,
+      defaultValue = props.defaultValue,
       isTargetAmount = props.isTargetAmount,
       targetAmount = props.targetAmount,
       items = props.items,
@@ -69,6 +70,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
       outerCloseAfterSelect = props.closeAfterSelect,
       renderValue = props.renderValue,
       rest = _objectWithoutProperties(props, _excluded);
+    console.log('render');
     var transformedItems = useMemo(function () {
       return initialItemsTransform(items || []);
     }, [items]);
@@ -144,11 +146,27 @@ export var comboboxRoot = function comboboxRoot(Root) {
         }
       }
     }, floatingPopoverRef);
+
+    // Эта функция срабатывает при изменении Combobox и
+    // при изменении нативного Select для формы (срабатывает только после изменения internalValue и рендера).
     var onChange = function onChange(newValue) {
+      // Условие для отправки изменений наружу
       if (outerOnChange) {
-        outerOnChange(newValue);
+        // Условие для отправки если комбобокс используется без формы.
+        if (!name && (typeof newValue === 'string' || Array.isArray(newValue))) {
+          outerOnChange(newValue);
+        }
+
+        // Условие для отправки если комбобокс используется с формой.
+        if (name && _typeof(newValue) === 'object' && !Array.isArray(newValue)) {
+          outerOnChange(newValue);
+        }
+      }
+
+      // Условие для изменения внутреннего значения (только если newValue строка или массив строк).
+      if (typeof newValue === 'string' || Array.isArray(newValue)) {
+        setInternalValue(newValue);
       }
-      setInternalValue(newValue);
     };
     var handleClickArrow = function handleClickArrow() {
       if (disabled || readOnly) {
@@ -181,24 +199,9 @@ export var comboboxRoot = function comboboxRoot(Root) {
 
     // Обработчик чипов
     var handleChipsChange = function handleChipsChange(chipLabels) {
-      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;
-        }));
-      }
+      onChange(chipLabels.map(function (chipLabel) {
+        return labelToItemMap.get(chipLabel).value;
+      }));
     };
 
     // Обработчик открытия/закрытия выпадающего списка
@@ -351,13 +354,24 @@ export var comboboxRoot = function comboboxRoot(Root) {
       // Т.к. вначале нужно отфильтровать и провалидировать outerValue и результат положить в переменную.
       // А переменную, содержащую сложные типы данных, нельзя помещать в deps.
     }, [outerValue, internalValue, items]);
+    useEffect(function () {
+      if (defaultValue) {
+        setInternalValue(defaultValue);
+      }
+    }, [defaultValue]);
     return /*#__PURE__*/React.createElement(Root, {
       size: size,
       view: view,
       labelPlacement: labelPlacement,
       disabled: disabled,
       readOnly: readOnly
-    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Context.Provider, {
+    }, name && /*#__PURE__*/React.createElement(SelectNative, {
+      name: name,
+      value: internalValue,
+      multiple: multiple,
+      onChange: onChange,
+      ref: ref
+    }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Context.Provider, {
       value: {
         focusedPath: focusedPath,
         checked: checked,
@@ -367,6 +381,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
         handleItemClick: handleItemClick,
         variant: variant,
         renderItem: renderItem,
+        valueToItemMap: valueToItemMap,
         treeId: treeId
       }
     }, /*#__PURE__*/React.createElement(FloatingPopover, {
@@ -380,7 +395,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
       listWidth: listWidth,
       target: function target(referenceRef) {
         return /*#__PURE__*/React.createElement(StyledTextField, _extends({
-          ref: inputForkRef,
+          ref: name ? inputRef : inputForkRef,
           inputWrapperRef: referenceRef,
           value: textValue,
           onChange: handleTextValueChange,