@ozen-ui/kit 0.60.0 → 0.61.0

package/__inner__/cjs/components/Select/Select.js

@@ -10,6 +10,7 @@ var useMultiRef_1 = require("../../hooks/useMultiRef");
 var useThemeProps_1 = require("../../hooks/useThemeProps");
 var classname_1 = require("../../utils/classname");
 var isKeys_1 = require("../../utils/isKeys");
+var isString_1 = require("../../utils/isString");
 var DataList_1 = require("../DataList");
 var components_1 = require("./components");
 var constants_1 = require("./constants");
@@ -22,21 +23,20 @@ var SelectRender = function (inProps, ref) {
     });
     var _a = props.size, size = _a === void 0 ? constants_1.SELECT_DEFAULT_SIZE : _a, _b = props.autoFocus, autoFocus = _b === void 0 ? constants_1.SELECT_DEFAULT_AUTO_FOCUS : _b, _c = props.fullWidth, fullWidth = _c === void 0 ? constants_1.SELECT_DEFAULT_FULL_WIDTH : _c, _d = props.disabled, disabled = _d === void 0 ? constants_1.SELECT_DEFAULT_DISABLED : _d, _e = props.required, required = _e === void 0 ? constants_1.SELECT_DEFAULT_REQUIRED : _e, _f = props.multiline, multiline = _f === void 0 ? constants_1.SELECT_DEFAULT_MULTILINE : _f, _g = props.defaultOpen, defaultOpen = _g === void 0 ? constants_1.SELECT_DEFAULT_DEFAULT_OPEN : _g, valueProp = props.value, defaultValue = props.defaultValue, onChange = props.onChange, renderValueProp = props.renderValue, children = props.children, onClick = props.onClick, onKeyDown = props.onKeyDown, menuProps = props.menuProps, dataListPropsProp = props.dataListProps, bodyProps = props.bodyProps, bodeRefProp = props.bodyRef, onCloseProp = props.onClose, onOpenProp = props.onOpen, openProp = props.open, multiple = props.multiple, other = tslib_1.__rest(props, ["size", "autoFocus", "fullWidth", "disabled", "required", "multiline", "defaultOpen", "value", "defaultValue", "onChange", "renderValue", "children", "onClick", "onKeyDown", "menuProps", "dataListProps", "bodyProps", "bodyRef", "onClose", "onOpen", "open", "multiple"]);
     var bodyInnerRef = (0, react_1.useRef)(null);
-    /** @deprecated props */
-    var bodyRef = (bodyProps === null || bodyProps === void 0 ? void 0 : bodyProps.ref) || bodeRefProp;
+    var bodyRef = (0, useMultiRef_1.useMultiRef)([(bodyProps === null || bodyProps === void 0 ? void 0 : bodyProps.ref) || bodeRefProp, bodyInnerRef]);
     var dataListProps = dataListPropsProp || menuProps;
     var _h = tslib_1.__read((0, useControlled_1.useControlled)({
         value: valueProp,
         defaultValue: defaultValue,
         name: 'Select',
         state: 'value',
-    }), 3), valueState = _h[0], setValueState = _h[1], isValueControlled = _h[2];
+    }), 2), valueState = _h[0], setValueState = _h[1];
     var _j = tslib_1.__read((0, useControlled_1.useControlled)({
         value: openProp,
         defaultValue: defaultOpen,
         name: 'Select',
         state: 'open',
-    }), 3), open = _j[0], setOpen = _j[1], isOpenControlled = _j[2];
+    }), 2), open = _j[0], setOpen = _j[1];
     var currentLabel;
     var isNotSelectOption = function (child) { return !(0, react_1.isValidElement)(child) || child.type !== DataList_1.DataListOption; };
     var resolvedChildren = (0, react_is_1.isFragment)(children)
@@ -45,27 +45,23 @@ var SelectRender = function (inProps, ref) {
     react_1.Children.forEach(resolvedChildren, function (child) {
         var _a, _b;
         if (!isNotSelectOption(child)) {
-            var label = typeof child.props.children === 'string'
+            var label = (0, isString_1.isString)(child.props.children)
                 ? (_a = child.props.label) !== null && _a !== void 0 ? _a : child.props.children
                 : child.props.label;
-            var params = {
-                multiple: multiple,
-                label: currentLabel,
-                value: valueState,
-            };
-            if ((0, helpers_1.isMultipleParams)(params)) {
+            var params = tslib_1.__assign(tslib_1.__assign({}, inProps), { multiple: multiple, value: valueState });
+            if ((0, helpers_1.isMultipleParams)(params) &&
+                (0, helpers_1.isMultipleLabel)(currentLabel, multiple)) {
                 var selected = (_b = params.value) === null || _b === void 0 ? void 0 : _b.includes(child.props.value);
-                if (selected) {
-                    currentLabel = tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read((params.label || [])), false), [
+                if (selected)
+                    currentLabel = tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read((currentLabel || [])), false), [
                         label,
                     ], false);
-                }
             }
-            if ((0, helpers_1.isNotMultipleParams)(params)) {
+            if ((0, helpers_1.isNotMultipleParams)(params) &&
+                (0, helpers_1.isNotMultipleLabel)(currentLabel, multiple)) {
                 var selected = params.value === child.props.value;
-                if (selected) {
+                if (selected)
                     currentLabel = label;
-                }
             }
         }
     });
@@ -80,52 +76,40 @@ var SelectRender = function (inProps, ref) {
     var handleToggle = function () {
         if (disabled)
             return;
-        if (open) {
+        if (open)
             handleClose();
-        }
-        else {
+        else
             handleOpen();
-        }
     };
-    var handleClick = function (event) {
-        onClick === null || onClick === void 0 ? void 0 : onClick(event);
+    var handleClick = function (e) {
+        onClick === null || onClick === void 0 ? void 0 : onClick(e);
         handleToggle();
     };
     /** Управление элементом контроля через клавиатуру */
-    var handleKeyDown = function (event) {
-        if ((0, isKeys_1.isKeys)(event, ['Space', 'ArrowDown', 'ArrowUp']) && !open) {
-            event.preventDefault();
+    var handleKeyDown = function (e) {
+        if ((0, isKeys_1.isKeys)(e, ['Space', 'ArrowDown', 'ArrowUp']) && !open) {
+            e.preventDefault();
             handleToggle();
         }
-        onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
+        onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(e);
     };
     /** Событие выбора значения из раскрывающегося списка */
-    var handleChange = function (event, _a) {
+    var handleChange = function (e, _a) {
         var value = _a.value;
-        if (!isValueControlled || onChange) {
-            setValueState(value);
-        }
-        onChange === null || onChange === void 0 ? void 0 : onChange(value, event);
+        setValueState(value);
+        onChange === null || onChange === void 0 ? void 0 : onChange(value, e);
         if (!multiple)
             handleClose();
     };
     /** Представление значение элемента контроля по умолчанию */
     var renderDefaultValue = function (option) {
         var _a = option.label, label = _a === void 0 ? '' : _a, _b = option.value, value = _b === void 0 ? '' : _b;
-        if (!value && value !== 0) {
+        if (!value && value !== 0)
             return null;
-        }
-        var params = {
-            multiple: multiple,
-            label: label,
-            value: value,
-        };
-        if ((0, helpers_1.isMultipleParams)(params)) {
-            return react_1.default.createElement("span", null, tslib_1.__spreadArray([], tslib_1.__read(params.label), false).join(', '));
-        }
-        if ((0, helpers_1.isNotMultipleParams)(params)) {
-            return react_1.default.createElement("span", null, params.label);
-        }
+        if ((0, helpers_1.isMultipleLabel)(label, multiple))
+            return react_1.default.createElement("span", null, tslib_1.__spreadArray([], tslib_1.__read(label), false).join(', '));
+        if ((0, helpers_1.isNotMultipleLabel)(label, multiple))
+            return react_1.default.createElement("span", null, label);
         return null;
     };
     /** Значение для текстового поля компонента */
@@ -135,12 +119,10 @@ var SelectRender = function (inProps, ref) {
             multiple: multiple,
             value: valueState,
         };
-        if ((0, helpers_1.isMultipleParams)(params)) {
-            return (_a = params.value) === null || _a === void 0 ? void 0 : _a.join(',');
-        }
-        if ((0, helpers_1.isNotMultipleParams)(params)) {
-            return params.value;
-        }
+        if ((0, helpers_1.isMultipleParams)(params))
+            return ((_a = params.value) === null || _a === void 0 ? void 0 : _a.join(',')) || '';
+        if ((0, helpers_1.isNotMultipleParams)(params))
+            return (params === null || params === void 0 ? void 0 : params.value) || '';
         return '';
     };
     /** Представление значение элемента контроля */
@@ -150,22 +132,22 @@ var SelectRender = function (inProps, ref) {
         /** Устанавливает фокус на элементе контроля
          * если компонент по умолчанию открыт — defaultOpen={true}
          * и является неконтролируемым */
-        if (defaultOpen && !isOpenControlled) {
+        if (defaultOpen)
             (_a = bodyInnerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-        }
-    }, [open]);
+    }, []);
     (0, react_1.useEffect)(function () {
         var _a;
         /** Автофокус на элементе контроля */
-        if (autoFocus) {
+        if (autoFocus)
             (_a = bodyInnerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-        }
     }, [autoFocus]);
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(components_1.SelectInput, tslib_1.__assign({ size: size, disabled: disabled, required: required, multiline: multiline, fullWidth: fullWidth }, other, { open: open, onClick: handleClick, onKeyDown: handleKeyDown, value: inputValue(), renderedValue: renderValue({
+        react_1.default.createElement(components_1.SelectInput, tslib_1.__assign({ size: size, disabled: disabled, required: required, multiline: multiline, fullWidth: fullWidth }, other, { open: open, value: inputValue(), onClick: handleClick, onKeyDown: handleKeyDown, renderedValue: renderValue({
                 label: currentLabel,
                 value: valueState,
-            }), bodyProps: tslib_1.__assign(tslib_1.__assign({}, bodyProps), { ref: (0, useMultiRef_1.useMultiRef)([bodyRef, bodyInnerRef]) }), ref: ref })),
-        react_1.default.createElement(DataList_1.DataList, tslib_1.__assign({ equalAnchorWidth: true }, dataListProps, { listProps: tslib_1.__assign({ size: size, role: 'listbox' }, dataListProps === null || dataListProps === void 0 ? void 0 : dataListProps.listProps), open: open, multiple: multiple, selected: (valueState || ''), onSelect: handleChange, anchorRef: bodyInnerRef, onClose: handleClose }), children)));
+            }), bodyProps: tslib_1.__assign(tslib_1.__assign({}, bodyProps), { ref: bodyRef }), ref: ref })),
+        react_1.default.createElement(DataList_1.DataList, tslib_1.__assign({ equalAnchorWidth: true }, dataListProps, { listProps: tslib_1.__assign({ size: size, role: 'listbox' }, dataListProps === null || dataListProps === void 0 ? void 0 : dataListProps.listProps), open: open, multiple: multiple, onClose: handleClose, onSelect: handleChange, anchorRef: bodyInnerRef, 
+            // TODO: add `null` to `DataListSelected`
+            selected: (valueState || null) }), children)));
 };
 exports.Select = (0, react_1.forwardRef)(SelectRender);

package/__inner__/cjs/components/Select/components/SelectInput/SelectInput.js

@@ -14,7 +14,7 @@ var FieldLabel_1 = require("../../../FieldLabel");
 var Fieldset_1 = require("../../../Fieldset");
 var constants_1 = require("../../constants");
 var index_1 = require("../../index");
-var SelectConsumer_1 = require("../SelectConsumer");
+var SelectInputContextConsumer_1 = require("../SelectInputContextConsumer");
 exports.SelectInput = (0, react_1.forwardRef)(function (_a, ref) {
     var _b = _a.size, size = _b === void 0 ? constants_1.SELECT_DEFAULT_SIZE : _b, _c = _a.multiline, multiline = _c === void 0 ? constants_1.SELECT_DEFAULT_MULTILINE : _c, open = _a.open, label = _a.label, error = _a.error, id = _a.id, name = _a.name, renderLeft = _a.renderLeft, renderRight = _a.renderRight, renderedValue = _a.renderedValue, fullWidth = _a.fullWidth, disabled = _a.disabled, hint = _a.hint, required = _a.required, className = _a.className, inputProps = _a.inputProps, valueProp = _a.value, placeholderProp = _a.placeholder, defaultValue = _a.defaultValue, onFocus = _a.onFocus, onBlur = _a.onBlur, onClick = _a.onClick, onKeyDown = _a.onKeyDown, labelProps = _a.labelProps, fieldProps = _a.fieldProps, hintProps = _a.hintProps, labelRef = _a.labelRef, inputRef = _a.inputRef, fieldRef = _a.fieldRef, bodyProps = _a.bodyProps, other = tslib_1.__rest(_a, ["size", "multiline", "open", "label", "error", "id", "name", "renderLeft", "renderRight", "renderedValue", "fullWidth", "disabled", "hint", "required", "className", "inputProps", "value", "placeholder", "defaultValue", "onFocus", "onBlur", "onClick", "onKeyDown", "labelProps", "fieldProps", "hintProps", "labelRef", "inputRef", "fieldRef", "bodyProps"]);
     var _d = tslib_1.__read((0, useBoolean_1.useBoolean)(), 2), focused = _d[0], _e = _d[1], on = _e.on, off = _e.off;
@@ -27,14 +27,13 @@ exports.SelectInput = (0, react_1.forwardRef)(function (_a, ref) {
         off();
         onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
     }, [onBlur]);
-    return (react_1.default.createElement(FieldControl_1.FieldControl, tslib_1.__assign({ error: error, size: size, filled: filled, focused: focused, disabled: disabled, fullWidth: fullWidth, required: required }, other, { className: (0, index_1.cnSelect)({
-            multiline: multiline,
-        }, [className]), ref: ref }),
-        react_1.default.createElement("div", tslib_1.__assign({ role: "button", "aria-haspopup": "listbox", "aria-expanded": open }, bodyProps, { onClick: onClick, onKeyDown: onKeyDown, tabIndex: disabled ? -1 : 0, onFocus: handleFocus, onBlur: handleBlur, className: (0, index_1.cnSelect)('Body', [bodyProps === null || bodyProps === void 0 ? void 0 : bodyProps.className]) }),
+    return (react_1.default.createElement(FieldControl_1.FieldControl, tslib_1.__assign({ size: size, error: error, filled: filled, focused: focused, disabled: disabled, required: required, fullWidth: fullWidth }, other, { ref: ref, className: (0, index_1.cnSelect)({ multiline: multiline }, [className]) }),
+        react_1.default.createElement("div", tslib_1.__assign({ role: "button", "aria-expanded": open, "aria-haspopup": "listbox" }, bodyProps, { onClick: onClick, onBlur: handleBlur, onKeyDown: onKeyDown, onFocus: handleFocus, tabIndex: disabled ? -1 : 0, className: (0, index_1.cnSelect)('Body', [bodyProps === null || bodyProps === void 0 ? void 0 : bodyProps.className]) }),
             react_1.default.createElement(FieldIcon_1.FieldIcon, { icon: renderLeft, className: (0, index_1.cnSelect)('RenderLeft') }),
             react_1.default.createElement("div", { className: (0, index_1.cnSelect)('FieldContainer') },
+                react_1.default.createElement("div", { className: (0, index_1.cnSelect)('HiddenLabel'), "aria-hidden": true }, label),
                 react_1.default.createElement(FieldLabel_1.FieldLabel, tslib_1.__assign({}, labelProps, { className: (0, index_1.cnSelect)('Label', [labelProps === null || labelProps === void 0 ? void 0 : labelProps.className]), ref: (labelProps === null || labelProps === void 0 ? void 0 : labelProps.ref) || labelRef }), label),
-                react_1.default.createElement(SelectConsumer_1.SelectInputConsumer, { id: id, name: name, value: valueProp, defaultValue: defaultValue, placeholder: placeholderProp, fieldProps: fieldProps, inputProps: inputProps, fieldRef: (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.ref) || fieldRef, inputRef: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.ref) || inputRef, renderedValue: renderedValue })),
+                react_1.default.createElement(SelectInputContextConsumer_1.SelectInputContextConsumer, { id: id, name: name, value: valueProp, fieldProps: fieldProps, inputProps: inputProps, defaultValue: defaultValue, renderedValue: renderedValue, placeholder: placeholderProp, fieldRef: (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.ref) || fieldRef, inputRef: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.ref) || inputRef })),
             react_1.default.createElement(FieldIcon_1.FieldIcon, { icon: renderRight, className: (0, index_1.cnSelect)('RenderRight') }),
             react_1.default.createElement(FieldIcon_1.FieldIcon, { icon: icons_1.ChevronDownIcon, className: (0, classnames_1.classnames)((0, index_1.cnSelect)('RenderRight'), (0, index_1.cnSelect)('DropDownIcon', { open: open })) }),
             react_1.default.createElement(Fieldset_1.Fieldset, { className: (0, index_1.cnSelect)('Fieldset') })),

package/__inner__/cjs/components/Select/components/SelectInputContextConsumer/SelectInputContextConsumer.d.ts

@@ -0,0 +1,5 @@
+import type { FC } from 'react';
+import type { SelectInputProps } from '../SelectInput';
+type SelectInputContextConsumerProps = Pick<SelectInputProps, 'value' | 'placeholder' | 'defaultValue' | 'id' | 'name' | 'fieldProps' | 'fieldRef' | 'inputProps' | 'inputRef' | 'renderedValue'>;
+export declare const SelectInputContextConsumer: FC<SelectInputContextConsumerProps>;
+export {};

package/__inner__/cjs/components/Select/components/{SelectConsumer/SelectInputConsumer.js → SelectInputContextConsumer/SelectInputContextConsumer.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SelectInputConsumer = void 0;
+exports.SelectInputContextConsumer = void 0;
 var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importDefault(require("react"));
 var FieldControl_1 = require("../../../FieldControl");
 var index_1 = require("../../index");
-var SelectInputConsumer = function (_a) {
+var SelectInputContextConsumer = function (_a) {
     var id = _a.id, name = _a.name, _b = _a.value, valueProp = _b === void 0 ? '' : _b, placeholderProp = _a.placeholder, defaultValue = _a.defaultValue, inputProps = _a.inputProps, inputRef = _a.inputRef, fieldRef = _a.fieldRef, fieldProps = _a.fieldProps, renderedValue = _a.renderedValue;
     var context = (0, FieldControl_1.useFieldControl)();
     var _c = tslib_1.__read(context, 1), fieldControl = _c[0];
@@ -18,4 +18,4 @@ var SelectInputConsumer = function (_a) {
             ]), ref: fieldRef }), placeholder || renderedValue),
         react_1.default.createElement("input", tslib_1.__assign({ id: id, name: name, defaultValue: defaultValue, value: valueProp, disabled: disabled, required: required, tabIndex: -1, "aria-hidden": true, readOnly: true }, inputProps, { className: (0, index_1.cnSelect)('Input', [inputProps === null || inputProps === void 0 ? void 0 : inputProps.className]), ref: inputRef }))));
 };
-exports.SelectInputConsumer = SelectInputConsumer;
+exports.SelectInputContextConsumer = SelectInputContextConsumer;

package/__inner__/cjs/components/Select/components/SelectInputContextConsumer/index.d.ts

@@ -0,0 +1 @@
+export * from './SelectInputContextConsumer';

package/__inner__/cjs/components/Select/components/{SelectConsumer → SelectInputContextConsumer}/index.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./SelectInputConsumer"), exports);
+tslib_1.__exportStar(require("./SelectInputContextConsumer"), exports);

package/__inner__/cjs/components/Select/helpers/types.d.ts

@@ -1,8 +1,5 @@
-import type { SelectPropLabel, SelectProps, SelectPropValue } from '../types';
-export type SelectedParams<MULTIPLE extends boolean = false> = {
-    multiple: SelectProps<MULTIPLE>['multiple'];
-    value?: SelectPropValue<MULTIPLE>;
-    label?: SelectPropLabel<MULTIPLE>;
-};
-export declare const isMultipleParams: (params: SelectedParams<boolean>) => params is SelectedParams<true>;
-export declare const isNotMultipleParams: (params: SelectedParams<boolean>) => params is SelectedParams<false>;
+import type { SelectProps, SelectLabel } from '../types';
+export declare const isMultipleParams: (params: SelectProps<boolean>) => params is SelectProps<true>;
+export declare const isNotMultipleParams: (params: SelectProps<boolean>) => params is SelectProps<false>;
+export declare const isMultipleLabel: (_label: SelectLabel<boolean>, multiple?: boolean) => _label is SelectLabel<true>;
+export declare const isNotMultipleLabel: (_label: SelectLabel<boolean>, multiple?: boolean) => _label is SelectLabel<false>;

package/__inner__/cjs/components/Select/helpers/types.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNotMultipleParams = exports.isMultipleParams = void 0;
+exports.isNotMultipleLabel = exports.isMultipleLabel = exports.isNotMultipleParams = exports.isMultipleParams = void 0;
 var isMultipleParams = function (params) { return !!params.multiple; };
 exports.isMultipleParams = isMultipleParams;
 var isNotMultipleParams = function (params) { return !params.multiple; };
 exports.isNotMultipleParams = isNotMultipleParams;
+var isMultipleLabel = function (_label, multiple) { return !!multiple; };
+exports.isMultipleLabel = isMultipleLabel;
+var isNotMultipleLabel = function (_label, multiple) { return !multiple; };
+exports.isNotMultipleLabel = isNotMultipleLabel;

package/__inner__/cjs/components/Select/types.d.ts

@@ -1,45 +1,37 @@
 import type { ReactElement, ReactNode, SyntheticEvent } from 'react';
 import type { ExtendableComponentPropsWithRef } from '../../types/ExtendableComponentPropsWithRef';
 import type { FormElementSizeVariant } from '../../types/FormElementSizeVariant';
-import type { DataListBaseProps, DataListSelected } from '../DataList';
+import type { DataListBaseProps, DataListOptionProps, DataListSelected } from '../DataList';
 import type { SelectInputProps, SelectInputRef } from './components';
-export type SelectSizeVariant = FormElementSizeVariant;
-export type SelectLabel = string | number | undefined;
-export type SelectPropLabel<MULTIPLE extends boolean> = (MULTIPLE extends true ? SelectLabel[] : SelectLabel) | undefined;
-export type SelectPropValue<MULTIPLE extends boolean> = DataListSelected<MULTIPLE>;
-export type SelectedOptionProp<MULTIPLE extends boolean> = {
-    label?: SelectPropLabel<MULTIPLE>;
+export type SelectPropSize = FormElementSizeVariant;
+export type SelectLabel<MULTIPLE extends boolean = false> = (MULTIPLE extends true ? DataListOptionProps['label'][] : DataListOptionProps['label']) | undefined;
+export type SelectPropValue<MULTIPLE extends boolean = false> = DataListSelected<MULTIPLE>;
+export type SelectPropOnChange<MULTIPLE extends boolean = false> = (value: SelectPropValue<MULTIPLE>, e: SyntheticEvent | KeyboardEvent) => void;
+export type SelectedOption<MULTIPLE extends boolean = false> = {
+    label?: SelectLabel<MULTIPLE>;
     value?: SelectPropValue<MULTIPLE>;
 };
-export type SelectRenderValue<MULTIPLE extends boolean> = (option: SelectedOptionProp<MULTIPLE>) => ReactNode | null;
-type SelectOpenControlledProps = {
-    /** Текущее состояние списка. Если `true`, список отображается. */
-    open?: boolean;
-    /** Состояние открытие по умолчанию (неконтролируемый компонент) */
-    defaultOpen?: never;
-};
-type SelectOpenUncontrolledProps = {
-    /** Текущее состояние списка. Если `true`, список отображается. */
-    open?: never;
-    /** Состояние открытие по умолчанию (неконтролируемый компонент) */
-    defaultOpen: boolean;
-};
-type SelectControlledProps<MULTIPLE extends boolean = false> = {
-    /** Выбранное значение */
-    value?: SelectPropValue<MULTIPLE>;
-    /** Обработчик события на изменение выбранного значения */
-    onChange?: (value: SelectPropValue<MULTIPLE>, e: SyntheticEvent | KeyboardEvent) => void;
-    /** Значение поля по умолчанию (неконтролируемый компонент) */
-    defaultValue?: never;
-};
-type SelectUncontrolledProps<MULTIPLE extends boolean = false> = {
-    /** Значение поля по умолчанию (неконтролируемый компонент) */
-    defaultValue: SelectPropValue<MULTIPLE>;
-    /** Выбранное значение */
-    value?: never;
-    /** Обработчик события на изменение выбранного значения */
-    onChange?: never;
-};
+export type SelectPropRenderValue<MULTIPLE extends boolean = false> = (option: SelectedOption<MULTIPLE>) => ReactNode | null;
+/**
+ * @deprecated
+ * Use the `SelectRenderValueProp` type to replace it.
+ * */
+export type SelectRenderValue<MULTIPLE extends boolean = false> = SelectPropRenderValue<MULTIPLE>;
+/**
+ * @deprecated
+ * Use the `SelectLabel` type to replace it.
+ * */
+export type SelectPropLabel<MULTIPLE extends boolean = false> = SelectLabel<MULTIPLE>;
+/**
+ * @deprecated
+ * Use the `SelectSizeProp` type to replace it.
+ * */
+export type SelectSizeVariant = SelectPropSize;
+/**
+ * @deprecated
+ * Use the `SelectedPropOption` type to replace it.
+ * */
+export type SelectedOptionProp<MULTIPLE extends boolean = false> = SelectedOption<MULTIPLE>;
 type SelectPropsDeprecated<MULTIPLE extends boolean = false> = {
     /**
      * Свойства компонента Menu
@@ -52,21 +44,31 @@ export type SelectProps<MULTIPLE extends boolean = false> = ExtendableComponentP
     /** Если `true` устанавливает автофокус */
     autoFocus?: boolean;
     /** Размер компонента */
-    size?: SelectSizeVariant;
+    size?: SelectPropSize;
+    /** Текущее состояние списка. Если `true`, список отображается. */
+    open?: boolean;
+    /** Состояние открытие по умолчанию (неконтролируемый компонент) */
+    defaultOpen?: boolean;
+    /** Выбранное значение */
+    value?: SelectPropValue<MULTIPLE>;
+    /** Обработчик события на изменение выбранного значения */
+    onChange?: SelectPropOnChange<MULTIPLE>;
+    /** Значение поля по умолчанию (неконтролируемый компонент) */
+    defaultValue?: SelectPropValue<MULTIPLE>;
     /** Рендер-функция для выбранного значения */
-    renderValue?: SelectRenderValue<MULTIPLE>;
+    renderValue?: SelectPropRenderValue<MULTIPLE>;
     /** Содержимое компонента */
     children?: ReactNode;
     /** Свойства компонента DataList */
     dataListProps?: Partial<Omit<DataListBaseProps<MULTIPLE>, 'onClose' | 'open' | 'anchorRef' | 'multiple' | 'selected' | 'onSelect'>>;
     /** Функция обратного вызова, которая будет вызвана когда компонент запрашивает закрытие */
-    onClose?: () => void;
+    onClose?(): void;
     /** Функция обратного вызова, которая будет вызвана когда компонент запрашивает открытие */
-    onOpen?: () => void;
+    onOpen?(): void;
     /** Если `true` из списка можно выбрать несколько вариантов */
     multiple?: MULTIPLE;
     /** Идентификатор компонента для тестов */
     'data-testid'?: string;
-} & Pick<SelectInputProps, 'id' | 'name' | 'label' | 'placeholder' | 'disabled' | 'required' | 'disableStroke' | 'error' | 'hint' | 'fullWidth' | 'renderLeft' | 'renderRight' | 'multiline' | 'inputProps' | 'labelProps' | 'hintProps' | 'bodyProps' | 'inputRef' | 'labelRef' | 'bodyRef'> & SelectPropsDeprecated<MULTIPLE> & (SelectControlledProps<MULTIPLE> | SelectUncontrolledProps<MULTIPLE>) & (SelectOpenControlledProps | SelectOpenUncontrolledProps), 'div'>;
+} & Pick<SelectInputProps, 'id' | 'name' | 'label' | 'placeholder' | 'disabled' | 'required' | 'disableStroke' | 'error' | 'hint' | 'fullWidth' | 'renderLeft' | 'renderRight' | 'multiline' | 'inputProps' | 'labelProps' | 'hintProps' | 'bodyProps' | 'inputRef' | 'labelRef' | 'bodyRef'> & SelectPropsDeprecated<MULTIPLE>, 'div'>;
 export type SelectComponent = <MULTIPLE extends boolean = false>(props: SelectProps<MULTIPLE>) => ReactElement | null;
 export {};

package/__inner__/cjs/components/Stack/types.d.ts

@@ -1,6 +1,6 @@
 import type { ElementType, ReactElement } from 'react';
 import type { ResponsiveValue } from '../../types/ResponsiveValue';
-import type { PolymorphicComponentPropsWithoutRef } from '../../utils/polymorphicComponentWithRef';
+import type { PolymorphicComponentPropsWithRef } from '../../utils/polymorphicComponentWithRef';
 export declare const stackGapVariant: readonly ["0", "xs", "s", "m", "l", "xl", "2xl", "3xl", "4xl", "5xl", "6xl", "7xl", "8xl"];
 export declare const stackDirectionVariant: readonly ["row", "column", "rowReverse", "columnReverse"];
 export declare const stackAlignVariant: readonly ["center", "start", "end", "baseline"];
@@ -27,4 +27,4 @@ export type StackBaseProps = {
     /** React-элемент для разделителя между дочерними компонентами стека */
     divider?: ReactElement;
 };
-export type StackProps<As extends ElementType = 'div'> = PolymorphicComponentPropsWithoutRef<StackBaseProps, As>;
+export type StackProps<As extends ElementType = 'div'> = PolymorphicComponentPropsWithRef<StackBaseProps, As>;

package/__inner__/esm/components/Autocomplete/helper.d.ts

@@ -2,76 +2,13 @@ import type { AutocompleteDefaultOption, AutocompletePropGetOptionDisabled, Auto
 export declare const defaultGetOptionKey: AutocompletePropGetOptionKey<AutocompleteDefaultOption>;
 export declare const defaultGetOptionLabel: AutocompletePropGetOptionLabel<AutocompleteDefaultOption>;
 export declare const defaultGetOptionDisabled: AutocompletePropGetOptionDisabled<AutocompleteDefaultOption>;
-export declare function withDefaultGetters<OPTION>(props: AutocompleteProps<OPTION>): ({
+export declare function withDefaultGetters<OPTION>(props: AutocompleteProps<OPTION>): {
     options: OPTION[];
     size?: import("../../types/FormElementSizeVariant").FormElementSizeVariant;
     value?: import("./types").AutocompletePropValue<OPTION>;
     defaultValue?: import("./types").AutocompletePropValue<OPTION>;
-    onChange?: ((e: import("react").SyntheticEvent | KeyboardEvent, value: OPTION | null) => void) | undefined;
-    inputValue?: string;
-    onInputChange?: (e: import("react").ChangeEvent<HTMLInputElement> | null, value: string) => void;
-    renderInput?: import("./types").AutocompleteRenderInput;
-    renderOption?: import("./types").AutocompletePropRenderOption<OPTION> | undefined;
-    getOptionLabel?: AutocompletePropGetOptionLabel<OPTION> | undefined;
-    getOptionKey?: AutocompletePropGetOptionKey<OPTION> | undefined;
-    getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION> | undefined;
-    disableCloseOnSelect?: boolean;
-    allowCustomValue?: boolean;
-    loading?: boolean;
-    noOptionsText?: import("react").ReactNode;
-    clearText?: string;
-    openText?: string;
-    closeText?: string;
-    loadingText?: import("react").ReactNode;
-    onClose?: () => void;
-    onOpen?: () => void;
-    disableClearButton?: boolean;
-    searchFunction?: import("./types").AutocompleteSearchFunction<OPTION> | undefined;
-    disableShowEmptyOptionsList?: boolean;
-    disableShowChevron?: boolean;
-    dataListProps?: Partial<Omit<import("../DataList").DataListProps, "onSelect" | "open" | "onClose" | "multiple" | "selected" | "anchorRef">>;
-} & {
-    error?: boolean | undefined;
-    label?: string | undefined;
-    style?: import("react").CSSProperties | undefined;
-    className?: string | undefined;
-    onKeyDown?: import("react").KeyboardEventHandler<HTMLDivElement> | undefined;
-    autoFocus?: boolean | undefined;
-    disabled?: boolean | undefined;
-    placeholder?: string | undefined;
-    required?: boolean | undefined;
-    fullWidth?: boolean | undefined;
-    disableStroke?: boolean | undefined;
-    hint?: string | null | undefined;
-    renderLeft?: import("../FieldIcon").FieldIconProps["icon"];
-    renderRight?: import("../FieldIcon").FieldIconProps["icon"];
-    inputProps?: import("../FieldInput").FieldInputProps | undefined;
-    bodyProps?: import("react").ComponentPropsWithRef<"label"> | undefined;
-    hintProps?: Omit<import("../FieldHint").FieldHintProps, "children"> | undefined;
-} & {
     open?: boolean;
-    defaultOpen?: never;
-} & (OPTION extends {
-    label: AutocompleteDefaultOption["label"];
-} ? Record<string, unknown> : {
-    getOptionLabel?: AutocompletePropGetOptionLabel<OPTION> | undefined;
-}) & (OPTION extends {
-    id: AutocompleteDefaultOption["id"];
-} ? Record<string, unknown> : {
-    getOptionKey?: AutocompletePropGetOptionKey<OPTION> | undefined;
-}) & (OPTION extends {
-    disabled: AutocompleteDefaultOption["disabled"];
-} ? Record<string, unknown> : {
-    getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION> | undefined;
-}) & {
-    getOptionLabel: AutocompletePropGetOptionLabel<AutocompleteDefaultOption> | AutocompletePropGetOptionLabel<OPTION>;
-    getOptionKey: AutocompletePropGetOptionKey<AutocompleteDefaultOption> | AutocompletePropGetOptionKey<OPTION>;
-    getOptionDisabled: AutocompletePropGetOptionDisabled<AutocompleteDefaultOption> | AutocompletePropGetOptionDisabled<OPTION>;
-}) | ({
-    options: OPTION[];
-    size?: import("../../types/FormElementSizeVariant").FormElementSizeVariant;
-    value?: import("./types").AutocompletePropValue<OPTION>;
-    defaultValue?: import("./types").AutocompletePropValue<OPTION>;
+    defaultOpen?: boolean;
     onChange?: ((e: import("react").SyntheticEvent | KeyboardEvent, value: OPTION | null) => void) | undefined;
     inputValue?: string;
     onInputChange?: (e: import("react").ChangeEvent<HTMLInputElement> | null, value: string) => void;
@@ -95,6 +32,7 @@ export declare function withDefaultGetters<OPTION>(props: AutocompleteProps<OPTI
     disableShowEmptyOptionsList?: boolean;
     disableShowChevron?: boolean;
     dataListProps?: Partial<Omit<import("../DataList").DataListProps, "onSelect" | "open" | "onClose" | "multiple" | "selected" | "anchorRef">>;
+    ref?: import("react").Ref<HTMLDivElement>;
 } & {
     error?: boolean | undefined;
     label?: string | undefined;
@@ -113,23 +51,20 @@ export declare function withDefaultGetters<OPTION>(props: AutocompleteProps<OPTI
     inputProps?: import("../FieldInput").FieldInputProps | undefined;
     bodyProps?: import("react").ComponentPropsWithRef<"label"> | undefined;
     hintProps?: Omit<import("../FieldHint").FieldHintProps, "children"> | undefined;
-} & {
-    open?: never;
-    defaultOpen?: boolean;
 } & (OPTION extends {
     label: AutocompleteDefaultOption["label"];
-} ? Record<string, unknown> : {
+} ? object : {
     getOptionLabel?: AutocompletePropGetOptionLabel<OPTION> | undefined;
 }) & (OPTION extends {
     id: AutocompleteDefaultOption["id"];
-} ? Record<string, unknown> : {
+} ? object : {
     getOptionKey?: AutocompletePropGetOptionKey<OPTION> | undefined;
 }) & (OPTION extends {
     disabled: AutocompleteDefaultOption["disabled"];
-} ? Record<string, unknown> : {
+} ? object : {
     getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION> | undefined;
 }) & {
     getOptionLabel: AutocompletePropGetOptionLabel<AutocompleteDefaultOption> | AutocompletePropGetOptionLabel<OPTION>;
     getOptionKey: AutocompletePropGetOptionKey<AutocompleteDefaultOption> | AutocompletePropGetOptionKey<OPTION>;
     getOptionDisabled: AutocompletePropGetOptionDisabled<AutocompleteDefaultOption> | AutocompletePropGetOptionDisabled<OPTION>;
-});
+};

package/__inner__/esm/components/Autocomplete/types.d.ts

@@ -1,4 +1,4 @@
-import type { ChangeEvent, ReactElement, ReactNode, SyntheticEvent } from 'react';
+import type { ChangeEvent, ReactElement, ReactNode, Ref, SyntheticEvent } from 'react';
 import type { FormElementSizeVariant } from '../../types/FormElementSizeVariant';
 import type { DataListProps } from '../DataList';
 import type { InputProps } from '../Input';
@@ -18,18 +18,6 @@ export type AutocompleteDefaultOption = {
 };
 export type AutocompleteSearchFunction<OPTION> = (options: OPTION[], searchValue: string) => OPTION[];
 export type AutocompleteRenderInput = (props: InputProps) => ReactNode;
-type AutocompleteOpenControlledProps = {
-    /** Текущее состояние списка. Если `true`, список отображается. */
-    open?: boolean;
-    /** Состояние открытие по умолчанию (неконтролируемый компонент) */
-    defaultOpen?: never;
-};
-type AutocompleteOpenUncontrolledProps = {
-    /** Текущее состояние списка. Если `true`, список отображается. */
-    open?: never;
-    /** Состояние открытие по умолчанию (неконтролируемый компонент) */
-    defaultOpen?: boolean;
-};
 type AutocompleteInputProps = Pick<InputProps, 'placeholder' | 'autoFocus' | 'fullWidth' | 'disabled' | 'label' | 'required' | 'disableStroke' | 'style' | 'error' | 'hint' | 'renderLeft' | 'renderRight' | 'className' | 'inputProps' | 'hintProps' | 'bodyProps' | 'onKeyDown'>;
 type AutocompleteDataListProps = Partial<Omit<DataListProps, 'onClose' | 'open' | 'anchorRef' | 'multiple' | 'selected' | 'onSelect'>>;
 export type AutocompleteProps<OPTION = AutocompleteDefaultOption> = {
@@ -41,6 +29,10 @@ export type AutocompleteProps<OPTION = AutocompleteDefaultOption> = {
     value?: AutocompletePropValue<OPTION>;
     /** Выбранное значение опции по умолчанию */
     defaultValue?: AutocompletePropValue<OPTION>;
+    /** Текущее состояние списка. Если `true`, список отображается. */
+    open?: boolean;
+    /** Состояние открытие по умолчанию (неконтролируемый компонент) */
+    defaultOpen?: boolean;
     /** Функция обратного вызова, которая будет вызвана при выборе значения */
     onChange?: (e: SyntheticEvent | KeyboardEvent, value: OPTION | null) => void;
     /** Введённое значение в текстовом поле */
@@ -87,17 +79,19 @@ export type AutocompleteProps<OPTION = AutocompleteDefaultOption> = {
     disableShowChevron?: boolean;
     /** Свойства компонента DataList */
     dataListProps?: AutocompleteDataListProps;
-} & AutocompleteInputProps & (AutocompleteOpenControlledProps | AutocompleteOpenUncontrolledProps) & (OPTION extends {
+    /** Ссылка на HTML элемент */
+    ref?: Ref<HTMLDivElement>;
+} & AutocompleteInputProps & (OPTION extends {
     label: AutocompleteDefaultOption['label'];
-} ? Record<string, unknown> : {
+} ? object : {
     getOptionLabel?: AutocompletePropGetOptionLabel<OPTION>;
 }) & (OPTION extends {
     id: AutocompleteDefaultOption['id'];
-} ? Record<string, unknown> : {
+} ? object : {
     getOptionKey?: AutocompletePropGetOptionKey<OPTION>;
 }) & (OPTION extends {
     disabled: AutocompleteDefaultOption['disabled'];
-} ? Record<string, unknown> : {
+} ? object : {
     getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION>;
 });
 export type AutocompleteComponent = <OPTION = AutocompleteDefaultOption>(props: AutocompleteProps<OPTION>) => ReactElement | null;