@salutejs/plasma-new-hope 0.190.0-canary.1538.11794569428.0 → 0.190.0-canary.1552.11794692529.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-new-hope",
-  "version": "0.190.0-canary.1538.11794569428.0",
+  "version": "0.190.0-canary.1552.11794692529.0",
   "description": "Salute Design System blueprint",
   "main": "cjs/index.js",
   "module": "es/index.js",
@@ -128,5 +128,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "c91b71dd2e8f5fbddfe17f1f97154126407fa026"
+  "gitHead": "e1fdb60679cdf3e6e3cbeef8c9cad3a06f0ef44d"
 }

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,10 +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 _Form = /*#__PURE__*/require("./ui/Form/Form");
+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 _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); }
@@ -37,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,
@@ -151,9 +155,19 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
     }, floatingPopoverRef);
     var onChange = function onChange(newValue) {
       if (outerOnChange) {
-        outerOnChange(newValue);
+        if (!name && !multiple && typeof newValue === 'string') {
+          outerOnChange(newValue);
+        }
+        if (!name && multiple && Array.isArray(newValue)) {
+          outerOnChange(newValue);
+        }
+        if (name && _typeof(newValue) === 'object' && !Array.isArray(newValue)) {
+          outerOnChange(newValue);
+        }
+      }
+      if (typeof newValue === 'string' || Array.isArray(newValue)) {
+        setInternalValue(newValue);
       }
-      setInternalValue(newValue);
     };
     var handleClickArrow = function handleClickArrow() {
       if (disabled || readOnly) {
@@ -342,13 +356,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(_Form.Form, {
+      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,
@@ -372,7 +397,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/Form/Form.js

@@ -0,0 +1,38 @@
+"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.Form = void 0;
+var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
+var _plasmaCore = /*#__PURE__*/require("@salutejs/plasma-core");
+var _syntheticEvent = /*#__PURE__*/require("../../../../../utils/syntheticEvent");
+var _Form = /*#__PURE__*/require("./Form.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 Form = exports.Form = /*#__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, _syntheticEvent.createEvent)(selectRef);
+    onChange && onChange(event);
+  }, [values]);
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Form.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/Form/Form.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-13p7uhq-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"];
+var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "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); }
@@ -66,8 +66,6 @@ var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
       variant = _ref$variant === void 0 ? 'normal' : _ref$variant,
       _ref$hasArrow = _ref.hasArrow,
       hasArrow = _ref$hasArrow === void 0 ? true : _ref$hasArrow,
-      _ref$alwaysOpened = _ref.alwaysOpened,
-      alwaysOpened = _ref$alwaysOpened === void 0 ? false : _ref$alwaysOpened,
       portal = _ref.portal,
       rest = _objectWithoutProperties(_ref, _excluded);
     var _useReducer = (0, _react.useReducer)(_pathReducer.pathReducer, []),
@@ -88,7 +86,7 @@ var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
 
     // Логика работы при клике за пределами выпадающего списка
     var targetRef = (0, _hooks.useOutsideClick)(function (event) {
-      if (!isCurrentListOpen || !closeOnOverlayClick || alwaysOpened) {
+      if (!isCurrentListOpen || !closeOnOverlayClick) {
         return;
       }
       dispatchPath({
@@ -102,7 +100,7 @@ var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
       }
     }, floatingPopoverRef);
     var handleGlobalToggle = function handleGlobalToggle(opened, event) {
-      if (alwaysOpened || opened) {
+      if (opened) {
         dispatchPath({
           type: 'opened_first_level'
         });
@@ -131,7 +129,7 @@ var dropdownRoot = exports.dropdownRoot = function dropdownRoot(Root) {
         onItemClick: onItemClick
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;
-    var isCurrentListOpen = alwaysOpened || Boolean(path[0]);
+    var isCurrentListOpen = Boolean(path[0]);
     return /*#__PURE__*/_react["default"].createElement(Context.Provider, {
       value: {
         focusedPath: focusedPath,

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/examples/plasma_b2c/components/Dropdown/Dropdown.stories.tsx

@@ -45,14 +45,6 @@ const meta: Meta<StoryDropdownProps> = {
                 type: 'select',
             },
         },
-        closeOnOverlayClick: {
-            control: { type: 'boolean' },
-            if: { arg: 'alwaysOpened', truthy: false },
-        },
-        closeOnSelect: {
-            control: { type: 'boolean' },
-            if: { arg: 'alwaysOpened', truthy: false },
-        },
     },
     args: {
         size: 'm',
@@ -62,7 +54,6 @@ const meta: Meta<StoryDropdownProps> = {
         offset: [0, 0],
         listWidth: '',
         hasArrow: true,
-        alwaysOpened: false,
         closeOnOverlayClick: true,
         closeOnSelect: true,
     },

package/styled-components/cjs/examples/plasma_web/components/Dropdown/Dropdown.stories.tsx

@@ -45,14 +45,6 @@ const meta: Meta<StoryDropdownProps> = {
                 type: 'select',
             },
         },
-        closeOnOverlayClick: {
-            control: { type: 'boolean' },
-            if: { arg: 'alwaysOpened', truthy: false },
-        },
-        closeOnSelect: {
-            control: { type: 'boolean' },
-            if: { arg: 'alwaysOpened', truthy: false },
-        },
     },
     args: {
         size: 'm',
@@ -62,7 +54,6 @@ const meta: Meta<StoryDropdownProps> = {
         offset: [0, 0],
         listWidth: '',
         hasArrow: true,
-        alwaysOpened: false,
         closeOnOverlayClick: true,
         closeOnSelect: true,
     },

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

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createSyntheticEvent = 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 = exports.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/es/components/Combobox/ComboboxNew/Combobox.js

@@ -1,5 +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 _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); }
@@ -8,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';
@@ -23,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 { Form } from './ui/Form/Form';
 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,
@@ -142,9 +147,19 @@ export var comboboxRoot = function comboboxRoot(Root) {
     }, floatingPopoverRef);
     var onChange = function onChange(newValue) {
       if (outerOnChange) {
-        outerOnChange(newValue);
+        if (!name && !multiple && typeof newValue === 'string') {
+          outerOnChange(newValue);
+        }
+        if (!name && multiple && Array.isArray(newValue)) {
+          outerOnChange(newValue);
+        }
+        if (name && _typeof(newValue) === 'object' && !Array.isArray(newValue)) {
+          outerOnChange(newValue);
+        }
+      }
+      if (typeof newValue === 'string' || Array.isArray(newValue)) {
+        setInternalValue(newValue);
       }
-      setInternalValue(newValue);
     };
     var handleClickArrow = function handleClickArrow() {
       if (disabled || readOnly) {
@@ -333,13 +348,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(Form, {
+      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,
@@ -363,7 +389,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,

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

@@ -0,0 +1,29 @@
+import React, { forwardRef, useEffect, useRef } from 'react';
+import { useForkRef } from '@salutejs/plasma-core';
+import { createEvent } from '../../../../../utils/syntheticEvent';
+import { SelectHidden } from './Form.styles';
+export var Form = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var name = _ref.name,
+    multiple = _ref.multiple,
+    value = _ref.value,
+    onChange = _ref.onChange;
+  var values = multiple ? value : [value];
+  var selectRef = useRef(null);
+  var forkRef = useForkRef(selectRef, ref);
+  useEffect(function () {
+    var event = createEvent(selectRef);
+    onChange && onChange(event);
+  }, [values]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SelectHidden, {
+    ref: forkRef,
+    multiple: multiple,
+    name: name,
+    hidden: true,
+    value: multiple ? values : values[0]
+  }, values.map(function (v) {
+    return /*#__PURE__*/React.createElement("option", {
+      key: v,
+      value: v
+    }, v);
+  })));
+});

package/styled-components/es/components/Combobox/ComboboxNew/ui/Form/Form.styles.js

@@ -0,0 +1,5 @@
+import styled from 'styled-components';
+import { applyHidden } from '../../../../../mixins';
+export var SelectHidden = /*#__PURE__*/styled.select.withConfig({
+  componentId: "plasma-new-hope__sc-13p7uhq-0"
+})(["", ";"], /*#__PURE__*/applyHidden());

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

@@ -1,4 +1,4 @@
-var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "alwaysOpened", "portal"];
+var _excluded = ["items", "children", "placement", "offset", "closeOnOverlayClick", "onToggle", "size", "view", "itemRole", "className", "listWidth", "listHeight", "listOverflow", "closeOnSelect", "onHover", "onItemSelect", "onItemClick", "trigger", "variant", "hasArrow", "portal"];
 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."); }
@@ -57,8 +57,6 @@ export var dropdownRoot = function dropdownRoot(Root) {
       variant = _ref$variant === void 0 ? 'normal' : _ref$variant,
       _ref$hasArrow = _ref.hasArrow,
       hasArrow = _ref$hasArrow === void 0 ? true : _ref$hasArrow,
-      _ref$alwaysOpened = _ref.alwaysOpened,
-      alwaysOpened = _ref$alwaysOpened === void 0 ? false : _ref$alwaysOpened,
       portal = _ref.portal,
       rest = _objectWithoutProperties(_ref, _excluded);
     var _useReducer = useReducer(pathReducer, []),
@@ -79,7 +77,7 @@ export var dropdownRoot = function dropdownRoot(Root) {
 
     // Логика работы при клике за пределами выпадающего списка
     var targetRef = useOutsideClick(function (event) {
-      if (!isCurrentListOpen || !closeOnOverlayClick || alwaysOpened) {
+      if (!isCurrentListOpen || !closeOnOverlayClick) {
         return;
       }
       dispatchPath({
@@ -93,7 +91,7 @@ export var dropdownRoot = function dropdownRoot(Root) {
       }
     }, floatingPopoverRef);
     var handleGlobalToggle = function handleGlobalToggle(opened, event) {
-      if (alwaysOpened || opened) {
+      if (opened) {
         dispatchPath({
           type: 'opened_first_level'
         });
@@ -122,7 +120,7 @@ export var dropdownRoot = function dropdownRoot(Root) {
         onItemClick: onItemClick
       }),
       onKeyDown = _useKeyNavigation.onKeyDown;
-    var isCurrentListOpen = alwaysOpened || Boolean(path[0]);
+    var isCurrentListOpen = Boolean(path[0]);
     return /*#__PURE__*/React.createElement(Context.Provider, {
       value: {
         focusedPath: focusedPath,

package/styled-components/es/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/es/examples/plasma_b2c/components/Dropdown/Dropdown.stories.tsx

@@ -45,14 +45,6 @@ const meta: Meta<StoryDropdownProps> = {
                 type: 'select',
             },
         },
-        closeOnOverlayClick: {
-            control: { type: 'boolean' },
-            if: { arg: 'alwaysOpened', truthy: false },
-        },
-        closeOnSelect: {
-            control: { type: 'boolean' },
-            if: { arg: 'alwaysOpened', truthy: false },
-        },
     },
     args: {
         size: 'm',
@@ -62,7 +54,6 @@ const meta: Meta<StoryDropdownProps> = {
         offset: [0, 0],
         listWidth: '',
         hasArrow: true,
-        alwaysOpened: false,
         closeOnOverlayClick: true,
         closeOnSelect: true,
     },

package/styled-components/es/examples/plasma_web/components/Dropdown/Dropdown.stories.tsx

@@ -45,14 +45,6 @@ const meta: Meta<StoryDropdownProps> = {
                 type: 'select',
             },
         },
-        closeOnOverlayClick: {
-            control: { type: 'boolean' },
-            if: { arg: 'alwaysOpened', truthy: false },
-        },
-        closeOnSelect: {
-            control: { type: 'boolean' },
-            if: { arg: 'alwaysOpened', truthy: false },
-        },
     },
     args: {
         size: 'm',
@@ -62,7 +54,6 @@ const meta: Meta<StoryDropdownProps> = {
         offset: [0, 0],
         listWidth: '',
         hasArrow: true,
-        alwaysOpened: false,
         closeOnOverlayClick: true,
         closeOnSelect: true,
     },

package/styled-components/es/utils/syntheticEvent.js

@@ -0,0 +1,47 @@
+export var 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;
+};
+export 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/types/components/Combobox/ComboboxNew/Combobox.d.ts

@@ -5,11 +5,11 @@ export declare const Context: React.Context<ItemContext>;
 /**
  * Поле ввода с выпадающим списком и возможностью фильтрации и выбора элементов.
  */
-export declare const comboboxRoot: (Root: RootProps<HTMLInputElement, Omit<ComboboxProps, 'items'>>) => React.ForwardRefExoticComponent<ComboboxProps<import("./ui/Inner/ui/Item/Item.types").ItemOption> & React.RefAttributes<HTMLInputElement>>;
+export declare const comboboxRoot: (Root: RootProps<HTMLInputElement, Omit<ComboboxProps, 'items'>>) => React.ForwardRefExoticComponent<ComboboxProps<import("./ui/Inner/ui/Item/Item.types").ItemOption> & React.RefAttributes<HTMLInputElement | HTMLSelectElement>>;
 export declare const comboboxConfig: {
     name: string;
     tag: string;
-    layout: (Root: RootProps<HTMLInputElement, Omit<ComboboxProps, 'items'>>) => React.ForwardRefExoticComponent<ComboboxProps<import("./ui/Inner/ui/Item/Item.types").ItemOption> & React.RefAttributes<HTMLInputElement>>;
+    layout: (Root: RootProps<HTMLInputElement, Omit<ComboboxProps, 'items'>>) => React.ForwardRefExoticComponent<ComboboxProps<import("./ui/Inner/ui/Item/Item.types").ItemOption> & React.RefAttributes<HTMLInputElement | HTMLSelectElement>>;
     base: import("@linaria/core").LinariaClassName;
     variations: {
         view: {

package/types/components/Combobox/ComboboxNew/Combobox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Combobox.d.ts","sourceRoot":"","sources":["../../../../src/components/Combobox/ComboboxNew/Combobox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4F,MAAM,OAAO,CAAC;AAIjH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAqB7C,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKnE,eAAO,MAAM,OAAO,4BAAgD,CAAC;AAErE;;GAEG;AACH,eAAO,MAAM,YAAY,SAAU,UAAU,gBAAgB,EAAE,KAAK,aAAa,EAAE,OAAO,CAAC,CAAC,+IA4YtF,CAAC;AAEP,eAAO,MAAM,cAAc;;;mBA9YQ,UAAU,gBAAgB,EAAE,KAAK,aAAa,EAAE,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;;;CAma3F,CAAC"}
+{"version":3,"file":"Combobox.d.ts","sourceRoot":"","sources":["../../../../src/components/Combobox/ComboboxNew/Combobox.tsx"],"names":[],"mappings":"AAAA,OAAO,KASN,MAAM,OAAO,CAAC;AAIf,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAqB7C,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMnE,eAAO,MAAM,OAAO,4BAAgD,CAAC;AAErE;;GAEG;AAEH,eAAO,MAAM,YAAY,SAAU,UAAU,gBAAgB,EAAE,KAAK,aAAa,EAAE,OAAO,CAAC,CAAC,mKAyatF,CAAC;AAEP,eAAO,MAAM,cAAc;;;mBA3aQ,UAAU,gBAAgB,EAAE,KAAK,aAAa,EAAE,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;;;CAgc3F,CAAC"}