@salutejs/plasma-b2c 1.413.0-canary.1470.11191908547.0 → 1.413.0-canary.1470.11192852883.0

package/components/Combobox/index.d.ts

@@ -1,236 +1,17 @@
-import React from 'react';
+import React, { ComponentProps, ForwardedRef, ReactElement } from 'react';
+import type { ItemOption, ComboboxProps } from '@salutejs/plasma-new-hope';
+import { Combobox as ComboboxOld } from './Legacy';
+import { Combobox as ComboboxNew } from './Combobox';
 export { ComboboxDivider, ComboboxFooter, ComboboxGroup, ComboboxHeader, ComboboxItem } from './Legacy';
 export type { ComboboxOldProps as ComboboxProps } from '@salutejs/plasma-new-hope/styled-components';
-declare const Combobox: React.ForwardRefExoticComponent<(Omit<import("@salutejs/plasma-new-hope/types/engines/types").PropsType<{
-    size: {
-        xs: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        s: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        m: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        l: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-    view: {
-        default: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-}> & Omit<import("@salutejs/plasma-core").InputHTMLAttributes<HTMLInputElement>, "onChange" | "size" | "value" | "type" | "target" | "checked" | "minLength" | "maxLength"> & import("@salutejs/plasma-new-hope/types/components/Combobox/ComboboxOld/Combobox.types").CustomComboboxProps & {
-    valueType?: "single" | undefined;
-    value?: import("@salutejs/plasma-new-hope/types/components/Combobox/ComboboxOld/Combobox.types").ComboboxPrimitiveValue | undefined;
-    onChangeValue?: ((value?: import("@salutejs/plasma-new-hope/types/components/Combobox/ComboboxOld/Combobox.types").ComboboxPrimitiveValue | undefined) => void) | undefined;
-} & React.RefAttributes<HTMLInputElement> & {
-    items?: undefined;
-}, "ref"> | Omit<import("@salutejs/plasma-new-hope/types/engines/types").PropsType<{
-    size: {
-        xs: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        s: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        m: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        l: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-    view: {
-        default: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-}> & Omit<import("@salutejs/plasma-core").InputHTMLAttributes<HTMLInputElement>, "onChange" | "size" | "value" | "type" | "target" | "checked" | "minLength" | "maxLength"> & import("@salutejs/plasma-new-hope/types/components/Combobox/ComboboxOld/Combobox.types").CustomComboboxProps & {
-    valueType: "multiple";
-    value?: import("@salutejs/plasma-new-hope/types/components/Combobox/ComboboxOld/Combobox.types").ComboboxPrimitiveValue[] | undefined;
-    onChangeValue?: ((value?: import("@salutejs/plasma-new-hope/types/components/Combobox/ComboboxOld/Combobox.types").ComboboxPrimitiveValue[] | undefined) => void) | undefined;
-} & React.RefAttributes<HTMLInputElement> & {
-    items?: undefined;
-}, "ref"> | Omit<Omit<import("@salutejs/plasma-new-hope/styled-components").ComboboxProps<import("@salutejs/plasma-new-hope/styled-components").ItemOption>, "view" | "size" | "disabled" | "readOnly" | "labelPlacement"> & Pick<import("@salutejs/plasma-new-hope/types/engines/types").PropsType<{
-    view: {
-        default: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        positive: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        warning: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        negative: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-    size: {
-        l: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        m: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        s: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        xs: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-    labelPlacement: {
-        inner: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-        outer: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-    disabled: {
-        true: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-    readOnly: {
-        true: import("@salutejs/plasma-new-hope/types/engines/types").PolymorphicClassName;
-    };
-}> & (({
-    items: import("@salutejs/plasma-new-hope/styled-components").ItemOption[];
-    placement?: ("top" | "top-start" | "top-end" | "right" | "right-start" | "right-end" | "bottom" | "bottom-start" | "bottom-end" | "left" | "left-start" | "left-end") | undefined;
-    label?: string | undefined;
-    placeholder?: string | undefined;
-    helperText?: string | undefined;
-    contentLeft?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
-    textBefore?: string | undefined;
-    textAfter?: string | undefined;
-    variant?: "normal" | "tight" | undefined;
-    listOverflow?: import("csstype").Property.Overflow | undefined;
-    listHeight?: import("csstype").Property.Height<string | number> | undefined;
-    listWidth?: import("csstype").Property.Width<string | number> | undefined;
-    portal?: React.MutableRefObject<HTMLElement | null> | undefined;
-    renderItem?: ((item: import("@salutejs/plasma-new-hope/styled-components").ItemOption) => React.ReactNode) | undefined;
-    filter?: ((label: string, textValue: string) => boolean) | undefined;
-    closeAfterSelect?: boolean | undefined;
-    size?: string | undefined;
-    view?: string | undefined;
-    labelPlacement?: "outer" | "inner" | undefined;
-} & {
-    readOnly?: boolean | undefined;
-    disabled?: true | undefined;
-    alwaysOpened?: false | undefined;
-} & {
-    multiple?: false | undefined;
-    value?: string | undefined;
-    onChange?: ((value: string) => void) | undefined;
-    isTargetAmount?: false | undefined;
-} & Omit<React.ButtonHTMLAttributes<HTMLInputElement>, "onChange" | "value"> & React.RefAttributes<HTMLInputElement>) | ({
-    items: import("@salutejs/plasma-new-hope/styled-components").ItemOption[];
-    placement?: ("top" | "top-start" | "top-end" | "right" | "right-start" | "right-end" | "bottom" | "bottom-start" | "bottom-end" | "left" | "left-start" | "left-end") | undefined;
-    label?: string | undefined;
-    placeholder?: string | undefined;
-    helperText?: string | undefined;
-    contentLeft?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
-    textBefore?: string | undefined;
-    textAfter?: string | undefined;
-    variant?: "normal" | "tight" | undefined;
-    listOverflow?: import("csstype").Property.Overflow | undefined;
-    listHeight?: import("csstype").Property.Height<string | number> | undefined;
-    listWidth?: import("csstype").Property.Width<string | number> | undefined;
-    portal?: React.MutableRefObject<HTMLElement | null> | undefined;
-    renderItem?: ((item: import("@salutejs/plasma-new-hope/styled-components").ItemOption) => React.ReactNode) | undefined;
-    filter?: ((label: string, textValue: string) => boolean) | undefined;
-    closeAfterSelect?: boolean | undefined;
-    size?: string | undefined;
-    view?: string | undefined;
-    labelPlacement?: "outer" | "inner" | undefined;
-} & {
-    readOnly?: boolean | undefined;
-    disabled?: true | undefined;
-    alwaysOpened?: false | undefined;
-} & {
-    multiple: true;
-    value?: string[] | undefined;
-    onChange?: ((value: string[]) => void) | undefined;
-    isTargetAmount?: boolean | undefined;
-} & Omit<React.ButtonHTMLAttributes<HTMLInputElement>, "onChange" | "value"> & React.RefAttributes<HTMLInputElement>) | ({
-    items: import("@salutejs/plasma-new-hope/styled-components").ItemOption[];
-    placement?: ("top" | "top-start" | "top-end" | "right" | "right-start" | "right-end" | "bottom" | "bottom-start" | "bottom-end" | "left" | "left-start" | "left-end") | undefined;
-    label?: string | undefined;
-    placeholder?: string | undefined;
-    helperText?: string | undefined;
-    contentLeft?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
-    textBefore?: string | undefined;
-    textAfter?: string | undefined;
-    variant?: "normal" | "tight" | undefined;
-    listOverflow?: import("csstype").Property.Overflow | undefined;
-    listHeight?: import("csstype").Property.Height<string | number> | undefined;
-    listWidth?: import("csstype").Property.Width<string | number> | undefined;
-    portal?: React.MutableRefObject<HTMLElement | null> | undefined;
-    renderItem?: ((item: import("@salutejs/plasma-new-hope/styled-components").ItemOption) => React.ReactNode) | undefined;
-    filter?: ((label: string, textValue: string) => boolean) | undefined;
-    closeAfterSelect?: boolean | undefined;
-    size?: string | undefined;
-    view?: string | undefined;
-    labelPlacement?: "outer" | "inner" | undefined;
-} & {
-    readOnly?: true | undefined;
-    disabled?: boolean | undefined;
-    alwaysOpened?: false | undefined;
-} & {
-    multiple?: false | undefined;
-    value?: string | undefined;
-    onChange?: ((value: string) => void) | undefined;
-    isTargetAmount?: false | undefined;
-} & Omit<React.ButtonHTMLAttributes<HTMLInputElement>, "onChange" | "value"> & React.RefAttributes<HTMLInputElement>) | ({
-    items: import("@salutejs/plasma-new-hope/styled-components").ItemOption[];
-    placement?: ("top" | "top-start" | "top-end" | "right" | "right-start" | "right-end" | "bottom" | "bottom-start" | "bottom-end" | "left" | "left-start" | "left-end") | undefined;
-    label?: string | undefined;
-    placeholder?: string | undefined;
-    helperText?: string | undefined;
-    contentLeft?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
-    textBefore?: string | undefined;
-    textAfter?: string | undefined;
-    variant?: "normal" | "tight" | undefined;
-    listOverflow?: import("csstype").Property.Overflow | undefined;
-    listHeight?: import("csstype").Property.Height<string | number> | undefined;
-    listWidth?: import("csstype").Property.Width<string | number> | undefined;
-    portal?: React.MutableRefObject<HTMLElement | null> | undefined;
-    renderItem?: ((item: import("@salutejs/plasma-new-hope/styled-components").ItemOption) => React.ReactNode) | undefined;
-    filter?: ((label: string, textValue: string) => boolean) | undefined;
-    closeAfterSelect?: boolean | undefined;
-    size?: string | undefined;
-    view?: string | undefined;
-    labelPlacement?: "outer" | "inner" | undefined;
-} & {
-    readOnly?: true | undefined;
-    disabled?: boolean | undefined;
-    alwaysOpened?: false | undefined;
-} & {
-    multiple: true;
-    value?: string[] | undefined;
-    onChange?: ((value: string[]) => void) | undefined;
-    isTargetAmount?: boolean | undefined;
-} & Omit<React.ButtonHTMLAttributes<HTMLInputElement>, "onChange" | "value"> & React.RefAttributes<HTMLInputElement>) | ({
-    items: import("@salutejs/plasma-new-hope/styled-components").ItemOption[];
-    placement?: ("top" | "top-start" | "top-end" | "right" | "right-start" | "right-end" | "bottom" | "bottom-start" | "bottom-end" | "left" | "left-start" | "left-end") | undefined;
-    label?: string | undefined;
-    placeholder?: string | undefined;
-    helperText?: string | undefined;
-    contentLeft?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
-    textBefore?: string | undefined;
-    textAfter?: string | undefined;
-    variant?: "normal" | "tight" | undefined;
-    listOverflow?: import("csstype").Property.Overflow | undefined;
-    listHeight?: import("csstype").Property.Height<string | number> | undefined;
-    listWidth?: import("csstype").Property.Width<string | number> | undefined;
-    portal?: React.MutableRefObject<HTMLElement | null> | undefined;
-    renderItem?: ((item: import("@salutejs/plasma-new-hope/styled-components").ItemOption) => React.ReactNode) | undefined;
-    filter?: ((label: string, textValue: string) => boolean) | undefined;
-    closeAfterSelect?: boolean | undefined;
-    size?: string | undefined;
-    view?: string | undefined;
-    labelPlacement?: "outer" | "inner" | undefined;
-} & {
-    readOnly?: false | undefined;
-    disabled?: false | undefined;
-    alwaysOpened?: true | undefined;
-} & {
-    multiple?: false | undefined;
-    value?: string | undefined;
-    onChange?: ((value: string) => void) | undefined;
-    isTargetAmount?: false | undefined;
-} & Omit<React.ButtonHTMLAttributes<HTMLInputElement>, "onChange" | "value"> & React.RefAttributes<HTMLInputElement>) | ({
-    items: import("@salutejs/plasma-new-hope/styled-components").ItemOption[];
-    placement?: ("top" | "top-start" | "top-end" | "right" | "right-start" | "right-end" | "bottom" | "bottom-start" | "bottom-end" | "left" | "left-start" | "left-end") | undefined;
-    label?: string | undefined;
-    placeholder?: string | undefined;
-    helperText?: string | undefined;
-    contentLeft?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
-    textBefore?: string | undefined;
-    textAfter?: string | undefined;
-    variant?: "normal" | "tight" | undefined;
-    listOverflow?: import("csstype").Property.Overflow | undefined;
-    listHeight?: import("csstype").Property.Height<string | number> | undefined;
-    listWidth?: import("csstype").Property.Width<string | number> | undefined;
-    portal?: React.MutableRefObject<HTMLElement | null> | undefined;
-    renderItem?: ((item: import("@salutejs/plasma-new-hope/styled-components").ItemOption) => React.ReactNode) | undefined;
-    filter?: ((label: string, textValue: string) => boolean) | undefined;
-    closeAfterSelect?: boolean | undefined;
-    size?: string | undefined;
-    view?: string | undefined;
-    labelPlacement?: "outer" | "inner" | undefined;
-} & {
-    readOnly?: false | undefined;
-    disabled?: false | undefined;
-    alwaysOpened?: true | undefined;
-} & {
-    multiple: true;
-    value?: string[] | undefined;
-    onChange?: ((value: string[]) => void) | undefined;
-    isTargetAmount?: boolean | undefined;
-} & Omit<React.ButtonHTMLAttributes<HTMLInputElement>, "onChange" | "value"> & React.RefAttributes<HTMLInputElement>)), "view" | "size" | "disabled" | "readOnly" | "labelPlacement"> & {
-    ref?: React.ForwardedRef<HTMLInputElement> | undefined;
-}, "ref">) & React.RefAttributes<HTMLInputElement>>;
-export { Combobox };
+declare type PropsFromConfig = 'view' | 'size' | 'labelPlacement' | 'disabled' | 'readOnly';
+declare type PropsOld = ComponentProps<typeof ComboboxOld> & {
+    items?: never;
+};
+declare type CommonProps = <T extends ItemOption>(props: PropsOld | (Omit<ComboboxProps<T>, PropsFromConfig> & Pick<ComponentProps<typeof ComboboxNew>, PropsFromConfig> & {
+    ref?: ForwardedRef<HTMLInputElement>;
+})) => ReactElement;
+export declare const Combobox: CommonProps;
+declare type PropsNew<T extends ItemOption> = Omit<ComboboxProps<T>, PropsFromConfig> & Pick<ComponentProps<typeof ComboboxNew>, PropsFromConfig>;
+declare type CommonProps2<T extends ItemOption> = PropsOld | PropsNew<T>;
+export declare const Combobox2: <T extends ItemOption>(props: CommonProps2<T> & React.RefAttributes<HTMLInputElement>) => React.ReactNode;

package/components/Combobox/index.js

@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Combobox = void 0;
+exports.Combobox2 = exports.Combobox = void 0;
 Object.defineProperty(exports, "ComboboxDivider", {
   enumerable: true,
   get: function get() {
@@ -41,7 +41,10 @@ var _Combobox = /*#__PURE__*/require("./Combobox");
 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); }
-var Combobox = exports.Combobox = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+function fixedForwardRef(render) {
+  return /*#__PURE__*/(0, _react.forwardRef)(render);
+}
+var ComboboxComponent = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   if (props.items) {
     return /*#__PURE__*/_react["default"].createElement(_Combobox.Combobox, _extends({
       ref: ref
@@ -50,4 +53,19 @@ var Combobox = exports.Combobox = /*#__PURE__*/(0, _react.forwardRef)(function (
   return /*#__PURE__*/_react["default"].createElement(_Legacy.Combobox, _extends({
     ref: ref
   }, props));
-});
+});
+var Combobox = exports.Combobox = ComboboxComponent;
+
+// Alternative approach
+
+var ComboboxComponent2 = function ComboboxComponent2(props, ref) {
+  if (props.items) {
+    return /*#__PURE__*/_react["default"].createElement(_Combobox.Combobox, _extends({
+      ref: ref
+    }, props));
+  }
+  return /*#__PURE__*/_react["default"].createElement(_Legacy.Combobox, _extends({
+    ref: ref
+  }, props));
+};
+var Combobox2 = exports.Combobox2 = /*#__PURE__*/fixedForwardRef(ComboboxComponent2);

package/css/cjs/components/Combobox/Combobox.js

@@ -6,8 +6,7 @@ var plasmaNewHope = require('@salutejs/plasma-new-hope');
 var Combobox_config = require('./Combobox.config.js');
 
 var mergedConfig = /*#__PURE__*/plasmaNewHope.mergeConfig(plasmaNewHope.comboboxNewConfig, Combobox_config.config);
-var ComboboxComponent = /*#__PURE__*/plasmaNewHope.component(mergedConfig);
-var Combobox = ComboboxComponent;
+var Combobox = /*#__PURE__*/plasmaNewHope.component(mergedConfig);
 
 // const items = [
 //     {
@@ -36,5 +35,4 @@ var Combobox = ComboboxComponent;
 // };
 
 exports.Combobox = Combobox;
-exports.ComboboxComponent = ComboboxComponent;
 //# sourceMappingURL=Combobox.js.map

package/css/cjs/components/Combobox/Combobox.js.map

@@ -1 +1 @@
-{"version":3,"file":"Combobox.js","sources":["../../../../src-css/components/Combobox/Combobox.tsx"],"sourcesContent":["import type { ComponentProps, ReactElement, ForwardedRef } from 'react';\nimport { comboboxNewConfig, component, mergeConfig } from '@salutejs/plasma-new-hope';\nimport type { ComboboxProps, ItemOption } from '@salutejs/plasma-new-hope';\n// import React from 'react';\n\nimport { config } from './Combobox.config';\n\nconst mergedConfig = mergeConfig(comboboxNewConfig, config);\nexport const ComboboxComponent = component(mergedConfig);\n\ntype PropsFromConfig = 'view' | 'size' | 'labelPlacement' | 'disabled' | 'readOnly';\n\ntype ComboboxType = <T extends ItemOption>(\n    props: Omit<ComboboxProps<T>, PropsFromConfig> &\n        Pick<ComponentProps<typeof ComboboxComponent>, PropsFromConfig> & { ref?: ForwardedRef<HTMLInputElement> },\n) => ReactElement;\n\nconst Combobox = ComboboxComponent as ComboboxType;\n\nexport { Combobox };\n\n// const items = [\n//     {\n//         value: 'north_america',\n//         label: 'Северная Америка',\n//         name: 'dima',\n//     },\n//     {\n//         value: 'north_america',\n//         label: 'Северная Америка',\n//         name: 'dima',\n//     },\n// ];\n//\n// const Func = () => {\n//     return (\n//         <Combobox\n//             items={items}\n//             renderItem={(item) => {\n//                 console.log(item);\n//\n//                 return <div>123</div>;\n//             }}\n//         />\n//     );\n// };\n"],"names":["mergedConfig","mergeConfig","comboboxNewConfig","config","ComboboxComponent","component","Combobox"],"mappings":";;;;;;;AAOA,IAAMA,YAAY,gBAAGC,yBAAW,CAACC,+BAAiB,EAAEC,sBAAM,CAAC,CAAA;IAC9CC,iBAAiB,gBAAGC,uBAAS,CAACL,YAAY,EAAC;AASlDM,IAAAA,QAAQ,GAAGF,kBAAiC;;AAIlD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;"}
+{"version":3,"file":"Combobox.js","sources":["../../../../src-css/components/Combobox/Combobox.tsx"],"sourcesContent":["import { comboboxNewConfig, component, mergeConfig } from '@salutejs/plasma-new-hope';\n\n// import React from 'react';\nimport { config } from './Combobox.config';\n\nconst mergedConfig = mergeConfig(comboboxNewConfig, config);\nconst Combobox = component(mergedConfig);\n\n// type PropsFromConfig = 'view' | 'size' | 'labelPlacement' | 'disabled' | 'readOnly';\n//\n// type ComboboxType = <T extends ItemOption>(\n//     props: Omit<ComboboxProps<T>, PropsFromConfig> &\n//         Pick<ComponentProps<typeof ComboboxComponent>, PropsFromConfig> & { ref?: ForwardedRef<HTMLInputElement> },\n// ) => ReactElement;\n//\n// const Combobox = ComboboxComponent as ComboboxType;\n\nexport { Combobox };\n\n// const items = [\n//     {\n//         value: 'north_america',\n//         label: 'Северная Америка',\n//         name: 'dima',\n//     },\n//     {\n//         value: 'north_america',\n//         label: 'Северная Америка',\n//         name: 'dima',\n//     },\n// ];\n//\n// const Func = () => {\n//     return (\n//         <Combobox\n//             items={items}\n//             renderItem={(item) => {\n//                 console.log(item);\n//\n//                 return <div>123</div>;\n//             }}\n//         />\n//     );\n// };\n"],"names":["mergedConfig","mergeConfig","comboboxNewConfig","config","Combobox","component"],"mappings":";;;;;;;AAKA,IAAMA,YAAY,gBAAGC,yBAAW,CAACC,+BAAiB,EAAEC,sBAAM,CAAC,CAAA;AAC3D,IAAMC,QAAQ,gBAAGC,uBAAS,CAACL,YAAY,EAAC;;AAaxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;"}

package/css/cjs/components/Combobox/index.js

@@ -7,7 +7,10 @@ var React = require('react');
 var Combobox$2 = require('./Combobox.js');
 var Combobox$1 = require('./Legacy/Combobox.js');
 
-var Combobox = /*#__PURE__*/React.forwardRef(function (props, ref) {
+function fixedForwardRef(render) {
+  return /*#__PURE__*/React.forwardRef(render);
+}
+var ComboboxComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
   if (props.items) {
     return /*#__PURE__*/React.createElement(Combobox$2.Combobox, _rollupPluginBabelHelpers.extends({
       ref: ref
@@ -17,6 +20,21 @@ var Combobox = /*#__PURE__*/React.forwardRef(function (props, ref) {
     ref: ref
   }, props));
 });
+var Combobox = ComboboxComponent;
+
+// Alternative approach
+
+var ComboboxComponent2 = function ComboboxComponent2(props, ref) {
+  if (props.items) {
+    return /*#__PURE__*/React.createElement(Combobox$2.Combobox, _rollupPluginBabelHelpers.extends({
+      ref: ref
+    }, props));
+  }
+  return /*#__PURE__*/React.createElement(Combobox$1.Combobox, _rollupPluginBabelHelpers.extends({
+    ref: ref
+  }, props));
+};
+var Combobox2 = /*#__PURE__*/fixedForwardRef(ComboboxComponent2);
 
 exports.ComboboxDivider = Combobox$1.ComboboxDivider;
 exports.ComboboxFooter = Combobox$1.ComboboxFooter;
@@ -24,4 +42,5 @@ exports.ComboboxGroup = Combobox$1.ComboboxGroup;
 exports.ComboboxHeader = Combobox$1.ComboboxHeader;
 exports.ComboboxItem = Combobox$1.ComboboxItem;
 exports.Combobox = Combobox;
+exports.Combobox2 = Combobox2;
 //# sourceMappingURL=index.js.map

package/css/cjs/components/Combobox/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src-css/components/Combobox/index.tsx"],"sourcesContent":["import React, { forwardRef, ComponentProps } from 'react';\n\nimport { Combobox as ComboboxOld } from './Legacy';\nimport { Combobox as ComboboxNew } from './Combobox';\n\nexport { ComboboxDivider, ComboboxFooter, ComboboxGroup, ComboboxHeader, ComboboxItem } from './Legacy';\n\nexport type { ComboboxOldProps as ComboboxProps } from '@salutejs/plasma-new-hope';\n\ntype PropsOld = ComponentProps<typeof ComboboxOld> & { items?: never };\ntype PropsNew = ComponentProps<typeof ComboboxNew>;\n\ntype CommonProps = PropsOld | PropsNew;\n\nconst Combobox = forwardRef<HTMLInputElement, CommonProps>((props, ref) => {\n    if (props.items) {\n        return <ComboboxNew ref={ref} {...props} />;\n    }\n\n    return <ComboboxOld ref={ref} {...props} />;\n});\n\nexport { Combobox };\n"],"names":["Combobox","forwardRef","props","ref","items","React","createElement","ComboboxNew","_extends","ComboboxOld"],"mappings":";;;;;;;;;AAcMA,IAAAA,QAAQ,gBAAGC,gBAAU,CAAgC,UAACC,KAAK,EAAEC,GAAG,EAAK;EACvE,IAAID,KAAK,CAACE,KAAK,EAAE;AACb,IAAA,oBAAOC,KAAA,CAAAC,aAAA,CAACC,mBAAW,EAAAC,iCAAA,CAAA;AAACL,MAAAA,GAAG,EAAEA,GAAAA;KAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,GAAA;AAEA,EAAA,oBAAOG,KAAA,CAAAC,aAAA,CAACG,mBAAW,EAAAD,iCAAA,CAAA;AAACL,IAAAA,GAAG,EAAEA,GAAAA;GAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,CAAC;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../src-css/components/Combobox/index.tsx"],"sourcesContent":["import React, { forwardRef, ComponentProps, ForwardedRef, ReactElement } from 'react';\nimport type { ItemOption, ComboboxProps } from '@salutejs/plasma-new-hope';\n\nimport { Combobox as ComboboxOld } from './Legacy';\nimport { Combobox as ComboboxNew } from './Combobox';\n\nexport { ComboboxDivider, ComboboxFooter, ComboboxGroup, ComboboxHeader, ComboboxItem } from './Legacy';\n\nexport type { ComboboxOldProps as ComboboxProps } from '@salutejs/plasma-new-hope';\n\nfunction fixedForwardRef<T, P = {}>(\n    render: (props: P, ref: React.Ref<T>) => React.ReactNode,\n): (props: P & React.RefAttributes<T>) => React.ReactNode {\n    return forwardRef(render as any) as any;\n}\n\ntype PropsFromConfig = 'view' | 'size' | 'labelPlacement' | 'disabled' | 'readOnly';\n\ntype PropsOld = ComponentProps<typeof ComboboxOld> & { items?: never };\n\ntype CommonProps = <T extends ItemOption>(\n    props:\n        | PropsOld\n        | (Omit<ComboboxProps<T>, PropsFromConfig> &\n              Pick<ComponentProps<typeof ComboboxNew>, PropsFromConfig> & { ref?: ForwardedRef<HTMLInputElement> }),\n) => ReactElement;\n\nconst ComboboxComponent = forwardRef<any, any>((props, ref) => {\n    if (props.items) {\n        return <ComboboxNew ref={ref} {...props} />;\n    }\n\n    return <ComboboxOld ref={ref} {...props} />;\n});\n\nexport const Combobox = ComboboxComponent as CommonProps;\n\n// Alternative approach\n\ntype PropsNew<T extends ItemOption> = Omit<ComboboxProps<T>, PropsFromConfig> &\n    Pick<ComponentProps<typeof ComboboxNew>, PropsFromConfig>;\n\ntype CommonProps2<T extends ItemOption> = PropsOld | PropsNew<T>;\n\nconst ComboboxComponent2 = <T extends ItemOption>(\n    props: CommonProps2<T>,\n    ref: React.ForwardedRef<HTMLInputElement>,\n) => {\n    if (props.items) {\n        return <ComboboxNew ref={ref} {...(props as any)} />;\n    }\n\n    return <ComboboxOld ref={ref} {...props} />;\n};\n\nexport const Combobox2 = fixedForwardRef(ComboboxComponent2);\n"],"names":["fixedForwardRef","render","forwardRef","ComboboxComponent","props","ref","items","React","createElement","ComboboxNew","_extends","ComboboxOld","Combobox","ComboboxComponent2","Combobox2"],"mappings":";;;;;;;;;AAUA,SAASA,eAAeA,CACpBC,MAAwD,EACF;EACtD,oBAAOC,gBAAU,CAACD,MAAa,CAAC,CAAA;AACpC,CAAA;AAaA,IAAME,iBAAiB,gBAAGD,gBAAU,CAAW,UAACE,KAAK,EAAEC,GAAG,EAAK;EAC3D,IAAID,KAAK,CAACE,KAAK,EAAE;AACb,IAAA,oBAAOC,KAAA,CAAAC,aAAA,CAACC,mBAAW,EAAAC,iCAAA,CAAA;AAACL,MAAAA,GAAG,EAAEA,GAAAA;KAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,GAAA;AAEA,EAAA,oBAAOG,KAAA,CAAAC,aAAA,CAACG,mBAAW,EAAAD,iCAAA,CAAA;AAACL,IAAAA,GAAG,EAAEA,GAAAA;GAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,CAAC,CAAC,CAAA;AAEK,IAAMQ,QAAQ,GAAGT,kBAAgC;;AAExD;;AAOA,IAAMU,kBAAkB,GAAG,SAArBA,kBAAkBA,CACpBT,KAAsB,EACtBC,GAAyC,EACxC;EACD,IAAID,KAAK,CAACE,KAAK,EAAE;AACb,IAAA,oBAAOC,KAAA,CAAAC,aAAA,CAACC,mBAAW,EAAAC,iCAAA,CAAA;AAACL,MAAAA,GAAG,EAAEA,GAAAA;KAAUD,EAAAA,KAAK,CAAW,CAAC,CAAA;AACxD,GAAA;AAEA,EAAA,oBAAOG,KAAA,CAAAC,aAAA,CAACG,mBAAW,EAAAD,iCAAA,CAAA;AAACL,IAAAA,GAAG,EAAEA,GAAAA;GAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,CAAC,CAAA;IAEYU,SAAS,gBAAGd,eAAe,CAACa,kBAAkB;;;;;;;;;;"}

package/css/cjs/index.js

@@ -68,6 +68,7 @@ var index$1 = require('./components/Typography/Old/index.js');
 
 
 exports.Combobox = index.Combobox;
+exports.Combobox2 = index.Combobox2;
 Object.defineProperty(exports, 'AccordionItem', {
 	enumerable: true,
 	get: function () { return plasmaNewHope.AccordionItem; }

package/css/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/css/es/components/Combobox/Combobox.js

@@ -2,8 +2,7 @@ import { component, mergeConfig, comboboxNewConfig } from '@salutejs/plasma-new-
 import { config } from './Combobox.config.js';
 
 var mergedConfig = /*#__PURE__*/mergeConfig(comboboxNewConfig, config);
-var ComboboxComponent = /*#__PURE__*/component(mergedConfig);
-var Combobox = ComboboxComponent;
+var Combobox = /*#__PURE__*/component(mergedConfig);
 
 // const items = [
 //     {
@@ -31,5 +30,5 @@ var Combobox = ComboboxComponent;
 //     );
 // };
 
-export { Combobox, ComboboxComponent };
+export { Combobox };
 //# sourceMappingURL=Combobox.js.map

package/css/es/components/Combobox/Combobox.js.map

@@ -1 +1 @@
-{"version":3,"file":"Combobox.js","sources":["../../../../src-css/components/Combobox/Combobox.tsx"],"sourcesContent":["import type { ComponentProps, ReactElement, ForwardedRef } from 'react';\nimport { comboboxNewConfig, component, mergeConfig } from '@salutejs/plasma-new-hope';\nimport type { ComboboxProps, ItemOption } from '@salutejs/plasma-new-hope';\n// import React from 'react';\n\nimport { config } from './Combobox.config';\n\nconst mergedConfig = mergeConfig(comboboxNewConfig, config);\nexport const ComboboxComponent = component(mergedConfig);\n\ntype PropsFromConfig = 'view' | 'size' | 'labelPlacement' | 'disabled' | 'readOnly';\n\ntype ComboboxType = <T extends ItemOption>(\n    props: Omit<ComboboxProps<T>, PropsFromConfig> &\n        Pick<ComponentProps<typeof ComboboxComponent>, PropsFromConfig> & { ref?: ForwardedRef<HTMLInputElement> },\n) => ReactElement;\n\nconst Combobox = ComboboxComponent as ComboboxType;\n\nexport { Combobox };\n\n// const items = [\n//     {\n//         value: 'north_america',\n//         label: 'Северная Америка',\n//         name: 'dima',\n//     },\n//     {\n//         value: 'north_america',\n//         label: 'Северная Америка',\n//         name: 'dima',\n//     },\n// ];\n//\n// const Func = () => {\n//     return (\n//         <Combobox\n//             items={items}\n//             renderItem={(item) => {\n//                 console.log(item);\n//\n//                 return <div>123</div>;\n//             }}\n//         />\n//     );\n// };\n"],"names":["mergedConfig","mergeConfig","comboboxNewConfig","config","ComboboxComponent","component","Combobox"],"mappings":";;;AAOA,IAAMA,YAAY,gBAAGC,WAAW,CAACC,iBAAiB,EAAEC,MAAM,CAAC,CAAA;IAC9CC,iBAAiB,gBAAGC,SAAS,CAACL,YAAY,EAAC;AASlDM,IAAAA,QAAQ,GAAGF,kBAAiC;;AAIlD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;"}
+{"version":3,"file":"Combobox.js","sources":["../../../../src-css/components/Combobox/Combobox.tsx"],"sourcesContent":["import { comboboxNewConfig, component, mergeConfig } from '@salutejs/plasma-new-hope';\n\n// import React from 'react';\nimport { config } from './Combobox.config';\n\nconst mergedConfig = mergeConfig(comboboxNewConfig, config);\nconst Combobox = component(mergedConfig);\n\n// type PropsFromConfig = 'view' | 'size' | 'labelPlacement' | 'disabled' | 'readOnly';\n//\n// type ComboboxType = <T extends ItemOption>(\n//     props: Omit<ComboboxProps<T>, PropsFromConfig> &\n//         Pick<ComponentProps<typeof ComboboxComponent>, PropsFromConfig> & { ref?: ForwardedRef<HTMLInputElement> },\n// ) => ReactElement;\n//\n// const Combobox = ComboboxComponent as ComboboxType;\n\nexport { Combobox };\n\n// const items = [\n//     {\n//         value: 'north_america',\n//         label: 'Северная Америка',\n//         name: 'dima',\n//     },\n//     {\n//         value: 'north_america',\n//         label: 'Северная Америка',\n//         name: 'dima',\n//     },\n// ];\n//\n// const Func = () => {\n//     return (\n//         <Combobox\n//             items={items}\n//             renderItem={(item) => {\n//                 console.log(item);\n//\n//                 return <div>123</div>;\n//             }}\n//         />\n//     );\n// };\n"],"names":["mergedConfig","mergeConfig","comboboxNewConfig","config","Combobox","component"],"mappings":";;;AAKA,IAAMA,YAAY,gBAAGC,WAAW,CAACC,iBAAiB,EAAEC,MAAM,CAAC,CAAA;AAC3D,IAAMC,QAAQ,gBAAGC,SAAS,CAACL,YAAY,EAAC;;AAaxC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;"}

package/css/es/components/Combobox/index.js

@@ -4,7 +4,10 @@ import { Combobox as Combobox$1 } from './Combobox.js';
 import { Combobox as Combobox$2 } from './Legacy/Combobox.js';
 export { ComboboxDivider, ComboboxFooter, ComboboxGroup, ComboboxHeader, ComboboxItem } from './Legacy/Combobox.js';
 
-var Combobox = /*#__PURE__*/forwardRef(function (props, ref) {
+function fixedForwardRef(render) {
+  return /*#__PURE__*/forwardRef(render);
+}
+var ComboboxComponent = /*#__PURE__*/forwardRef(function (props, ref) {
   if (props.items) {
     return /*#__PURE__*/React.createElement(Combobox$1, _extends({
       ref: ref
@@ -14,6 +17,21 @@ var Combobox = /*#__PURE__*/forwardRef(function (props, ref) {
     ref: ref
   }, props));
 });
+var Combobox = ComboboxComponent;
 
-export { Combobox };
+// Alternative approach
+
+var ComboboxComponent2 = function ComboboxComponent2(props, ref) {
+  if (props.items) {
+    return /*#__PURE__*/React.createElement(Combobox$1, _extends({
+      ref: ref
+    }, props));
+  }
+  return /*#__PURE__*/React.createElement(Combobox$2, _extends({
+    ref: ref
+  }, props));
+};
+var Combobox2 = /*#__PURE__*/fixedForwardRef(ComboboxComponent2);
+
+export { Combobox, Combobox2 };
 //# sourceMappingURL=index.js.map

package/css/es/components/Combobox/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src-css/components/Combobox/index.tsx"],"sourcesContent":["import React, { forwardRef, ComponentProps } from 'react';\n\nimport { Combobox as ComboboxOld } from './Legacy';\nimport { Combobox as ComboboxNew } from './Combobox';\n\nexport { ComboboxDivider, ComboboxFooter, ComboboxGroup, ComboboxHeader, ComboboxItem } from './Legacy';\n\nexport type { ComboboxOldProps as ComboboxProps } from '@salutejs/plasma-new-hope';\n\ntype PropsOld = ComponentProps<typeof ComboboxOld> & { items?: never };\ntype PropsNew = ComponentProps<typeof ComboboxNew>;\n\ntype CommonProps = PropsOld | PropsNew;\n\nconst Combobox = forwardRef<HTMLInputElement, CommonProps>((props, ref) => {\n    if (props.items) {\n        return <ComboboxNew ref={ref} {...props} />;\n    }\n\n    return <ComboboxOld ref={ref} {...props} />;\n});\n\nexport { Combobox };\n"],"names":["Combobox","forwardRef","props","ref","items","React","createElement","ComboboxNew","_extends","ComboboxOld"],"mappings":";;;;;;AAcMA,IAAAA,QAAQ,gBAAGC,UAAU,CAAgC,UAACC,KAAK,EAAEC,GAAG,EAAK;EACvE,IAAID,KAAK,CAACE,KAAK,EAAE;AACb,IAAA,oBAAOC,KAAA,CAAAC,aAAA,CAACC,UAAW,EAAAC,QAAA,CAAA;AAACL,MAAAA,GAAG,EAAEA,GAAAA;KAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,GAAA;AAEA,EAAA,oBAAOG,KAAA,CAAAC,aAAA,CAACG,UAAW,EAAAD,QAAA,CAAA;AAACL,IAAAA,GAAG,EAAEA,GAAAA;GAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,CAAC;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../src-css/components/Combobox/index.tsx"],"sourcesContent":["import React, { forwardRef, ComponentProps, ForwardedRef, ReactElement } from 'react';\nimport type { ItemOption, ComboboxProps } from '@salutejs/plasma-new-hope';\n\nimport { Combobox as ComboboxOld } from './Legacy';\nimport { Combobox as ComboboxNew } from './Combobox';\n\nexport { ComboboxDivider, ComboboxFooter, ComboboxGroup, ComboboxHeader, ComboboxItem } from './Legacy';\n\nexport type { ComboboxOldProps as ComboboxProps } from '@salutejs/plasma-new-hope';\n\nfunction fixedForwardRef<T, P = {}>(\n    render: (props: P, ref: React.Ref<T>) => React.ReactNode,\n): (props: P & React.RefAttributes<T>) => React.ReactNode {\n    return forwardRef(render as any) as any;\n}\n\ntype PropsFromConfig = 'view' | 'size' | 'labelPlacement' | 'disabled' | 'readOnly';\n\ntype PropsOld = ComponentProps<typeof ComboboxOld> & { items?: never };\n\ntype CommonProps = <T extends ItemOption>(\n    props:\n        | PropsOld\n        | (Omit<ComboboxProps<T>, PropsFromConfig> &\n              Pick<ComponentProps<typeof ComboboxNew>, PropsFromConfig> & { ref?: ForwardedRef<HTMLInputElement> }),\n) => ReactElement;\n\nconst ComboboxComponent = forwardRef<any, any>((props, ref) => {\n    if (props.items) {\n        return <ComboboxNew ref={ref} {...props} />;\n    }\n\n    return <ComboboxOld ref={ref} {...props} />;\n});\n\nexport const Combobox = ComboboxComponent as CommonProps;\n\n// Alternative approach\n\ntype PropsNew<T extends ItemOption> = Omit<ComboboxProps<T>, PropsFromConfig> &\n    Pick<ComponentProps<typeof ComboboxNew>, PropsFromConfig>;\n\ntype CommonProps2<T extends ItemOption> = PropsOld | PropsNew<T>;\n\nconst ComboboxComponent2 = <T extends ItemOption>(\n    props: CommonProps2<T>,\n    ref: React.ForwardedRef<HTMLInputElement>,\n) => {\n    if (props.items) {\n        return <ComboboxNew ref={ref} {...(props as any)} />;\n    }\n\n    return <ComboboxOld ref={ref} {...props} />;\n};\n\nexport const Combobox2 = fixedForwardRef(ComboboxComponent2);\n"],"names":["fixedForwardRef","render","forwardRef","ComboboxComponent","props","ref","items","React","createElement","ComboboxNew","_extends","ComboboxOld","Combobox","ComboboxComponent2","Combobox2"],"mappings":";;;;;;AAUA,SAASA,eAAeA,CACpBC,MAAwD,EACF;EACtD,oBAAOC,UAAU,CAACD,MAAa,CAAC,CAAA;AACpC,CAAA;AAaA,IAAME,iBAAiB,gBAAGD,UAAU,CAAW,UAACE,KAAK,EAAEC,GAAG,EAAK;EAC3D,IAAID,KAAK,CAACE,KAAK,EAAE;AACb,IAAA,oBAAOC,KAAA,CAAAC,aAAA,CAACC,UAAW,EAAAC,QAAA,CAAA;AAACL,MAAAA,GAAG,EAAEA,GAAAA;KAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,GAAA;AAEA,EAAA,oBAAOG,KAAA,CAAAC,aAAA,CAACG,UAAW,EAAAD,QAAA,CAAA;AAACL,IAAAA,GAAG,EAAEA,GAAAA;GAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,CAAC,CAAC,CAAA;AAEK,IAAMQ,QAAQ,GAAGT,kBAAgC;;AAExD;;AAOA,IAAMU,kBAAkB,GAAG,SAArBA,kBAAkBA,CACpBT,KAAsB,EACtBC,GAAyC,EACxC;EACD,IAAID,KAAK,CAACE,KAAK,EAAE;AACb,IAAA,oBAAOC,KAAA,CAAAC,aAAA,CAACC,UAAW,EAAAC,QAAA,CAAA;AAACL,MAAAA,GAAG,EAAEA,GAAAA;KAAUD,EAAAA,KAAK,CAAW,CAAC,CAAA;AACxD,GAAA;AAEA,EAAA,oBAAOG,KAAA,CAAAC,aAAA,CAACG,UAAW,EAAAD,QAAA,CAAA;AAACL,IAAAA,GAAG,EAAEA,GAAAA;GAASD,EAAAA,KAAK,CAAG,CAAC,CAAA;AAC/C,CAAC,CAAA;IAEYU,SAAS,gBAAGd,eAAe,CAACa,kBAAkB;;;;"}

package/css/es/index.js

@@ -1,4 +1,4 @@
-export { Combobox } from './components/Combobox/index.js';
+export { Combobox, Combobox2 } from './components/Combobox/index.js';
 export { AccordionItem, ButtonBase, CellTextbox, CellTextboxLabel, CellTextboxSubtitle, CellTextboxTitle, Col, Overlay, PopupProvider as PopupBaseProvider, Portal, RadioGroup, RectSkeleton, Row, SSRProvider, SegmentProvider, TabItemRefs, TabsContext, addNotification, closeNotification, counterTokens, datePickerClasses, datePickerTokens, dividerTokens, modalClasses as modalBaseClasses, popupClasses as popupBaseClasses, priceClasses, rangeTokens, sheetClasses, toolbarTokens, usePopupContext as usePopupBaseContext, useSegment, useToast } from '@salutejs/plasma-new-hope';
 export { Accordion } from './components/Accordion/Accordion.js';
 export { Attach } from './components/Attach/Attach.js';

package/es/components/Combobox/Combobox.js

@@ -1,10 +1,19 @@
 import { comboboxNewConfig, component, mergeConfig } from '@salutejs/plasma-new-hope/styled-components';
-// import React from 'react';
 
+// import React from 'react';
 import { config } from './Combobox.config';
 var mergedConfig = /*#__PURE__*/mergeConfig(comboboxNewConfig, config);
-export var ComboboxComponent = /*#__PURE__*/component(mergedConfig);
-var Combobox = ComboboxComponent;
+var Combobox = /*#__PURE__*/component(mergedConfig);
+
+// type PropsFromConfig = 'view' | 'size' | 'labelPlacement' | 'disabled' | 'readOnly';
+//
+// type ComboboxType = <T extends ItemOption>(
+//     props: Omit<ComboboxProps<T>, PropsFromConfig> &
+//         Pick<ComponentProps<typeof ComboboxComponent>, PropsFromConfig> & { ref?: ForwardedRef<HTMLInputElement> },
+// ) => ReactElement;
+//
+// const Combobox = ComboboxComponent as ComboboxType;
+
 export { Combobox };
 
 // const items = [

package/es/components/Combobox/index.js

@@ -3,7 +3,10 @@ import React, { forwardRef } from 'react';
 import { Combobox as ComboboxOld } from './Legacy';
 import { Combobox as ComboboxNew } from './Combobox';
 export { ComboboxDivider, ComboboxFooter, ComboboxGroup, ComboboxHeader, ComboboxItem } from './Legacy';
-var Combobox = /*#__PURE__*/forwardRef(function (props, ref) {
+function fixedForwardRef(render) {
+  return /*#__PURE__*/forwardRef(render);
+}
+var ComboboxComponent = /*#__PURE__*/forwardRef(function (props, ref) {
   if (props.items) {
     return /*#__PURE__*/React.createElement(ComboboxNew, _extends({
       ref: ref
@@ -13,4 +16,18 @@ var Combobox = /*#__PURE__*/forwardRef(function (props, ref) {
     ref: ref
   }, props));
 });
-export { Combobox };
+export var Combobox = ComboboxComponent;
+
+// Alternative approach
+
+var ComboboxComponent2 = function ComboboxComponent2(props, ref) {
+  if (props.items) {
+    return /*#__PURE__*/React.createElement(ComboboxNew, _extends({
+      ref: ref
+    }, props));
+  }
+  return /*#__PURE__*/React.createElement(ComboboxOld, _extends({
+    ref: ref
+  }, props));
+};
+export var Combobox2 = /*#__PURE__*/fixedForwardRef(ComboboxComponent2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-b2c",
-  "version": "1.413.0-canary.1470.11191908547.0",
+  "version": "1.413.0-canary.1470.11192852883.0",
   "description": "Salute Design System / React UI kit for business-related web applications",
   "author": "Salute Frontend Team <salute.developers@gmail.com>",
   "license": "MIT",
@@ -44,7 +44,7 @@
   "dependencies": {
     "@salutejs/plasma-core": "1.180.0",
     "@salutejs/plasma-hope": "1.313.0",
-    "@salutejs/plasma-new-hope": "0.162.0-canary.1470.11191908547.0",
+    "@salutejs/plasma-new-hope": "0.162.0-canary.1470.11192852883.0",
     "@salutejs/plasma-themes": "0.18.0",
     "@salutejs/plasma-tokens-b2c": "0.52.0",
     "@salutejs/plasma-tokens-web": "1.57.0",
@@ -109,5 +109,5 @@
     "react"
   ],
   "sideEffects": false,
-  "gitHead": "a5419bb3774fd80c76357a84f021a153fbd23782"
+  "gitHead": "31708cca2dab9da6e091c77255d9b52e5761cd92"
 }