@vkontakte/vkui 6.5.3 → 6.5.4

package/dist/components.js.tmp

@@ -38497,7 +38497,7 @@ function ChipsSelect_unsupported_iterable_to_array(o, minLen) {
 
 
 
-var ChipsSelect_findIndexAfter = function() {
+var findIndexAfter = function() {
     var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : -1;
     if (startIndex >= options.length - 1) {
         return -1;
@@ -38506,7 +38506,7 @@ var ChipsSelect_findIndexAfter = function() {
         return i > startIndex && (!isNotServicePreset(option) || !option.disabled);
     });
 };
-var ChipsSelect_findIndexBefore = function() {
+var findIndexBefore = function() {
     var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], endIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : options.length;
     var result = -1;
     if (endIndex <= 0) {
@@ -38664,11 +38664,11 @@ var ChipsSelect_findIndexBefore = function() {
     var focusOption = function(nextIndex, type) {
         var index = nextIndex === null ? -1 : nextIndex;
         if (type === FOCUS_ACTION_NEXT) {
-            var _$nextIndex = ChipsSelect_findIndexAfter(options, index);
-            index = _$nextIndex === -1 ? ChipsSelect_findIndexAfter(options) : _$nextIndex; // Следующий за index или первый валидный до index
+            var _$nextIndex = findIndexAfter(options, index);
+            index = _$nextIndex === -1 ? findIndexAfter(options) : _$nextIndex; // Следующий за index или первый валидный до index
         } else if (type === FOCUS_ACTION_PREV) {
-            var beforeIndex = ChipsSelect_findIndexBefore(options, index);
-            index = beforeIndex === -1 ? ChipsSelect_findIndexBefore(options) : beforeIndex; // Предшествующий index или последний валидный после index
+            var beforeIndex = findIndexBefore(options, index);
+            index = beforeIndex === -1 ? findIndexBefore(options) : beforeIndex; // Предшествующий index или последний валидный после index
         }
         focusOptionByIndex(index, focusedOptionIndex);
     };
@@ -40908,6 +40908,8 @@ function CustomSelectInput_object_without_properties_loose(source, excluded) {
 
 
 
+
+
 var CustomSelectInput_sizeYClassNames = {
     none: "vkuiCustomSelectInput--sizeY-none",
     compact: "vkuiCustomSelectInput--sizeY-compact"
@@ -40916,7 +40918,7 @@ var CustomSelectInput_sizeYClassNames = {
  * @since 5.10.0
  * @private
  */ var CustomSelectInput_CustomSelectInput = function(_param) {
-    var _param_align = _param.align, align = _param_align === void 0 ? 'left' : _param_align, getRef = _param.getRef, className = _param.className, getRootRef = _param.getRootRef, style = _param.style, before = _param.before, after = _param.after, status = _param.status, selectedOptionLabel = _param.selectedOptionLabel, _param_selectType = _param.selectType, selectType = _param_selectType === void 0 ? 'default' : _param_selectType, multiline = _param.multiline, disabled = _param.disabled, fetching = _param.fetching, labelTextTestId = _param.labelTextTestId, searchable = _param.searchable, restInputProps = CustomSelectInput_object_without_properties(_param, [
+    var _param_align = _param.align, align = _param_align === void 0 ? 'left' : _param_align, getRef = _param.getRef, className = _param.className, getRootRef = _param.getRootRef, style = _param.style, before = _param.before, after = _param.after, status = _param.status, children = _param.children, placeholder = _param.placeholder, _param_selectType = _param.selectType, selectType = _param_selectType === void 0 ? 'default' : _param_selectType, multiline = _param.multiline, disabled = _param.disabled, fetching = _param.fetching, labelTextTestId = _param.labelTextTestId, restProps = CustomSelectInput_object_without_properties(_param, [
         "align",
         "getRef",
         "className",
@@ -40925,32 +40927,35 @@ var CustomSelectInput_sizeYClassNames = {
         "before",
         "after",
         "status",
-        "selectedOptionLabel",
+        "children",
+        "placeholder",
         "selectType",
         "multiline",
         "disabled",
         "fetching",
-        "labelTextTestId",
-        "searchable"
+        "labelTextTestId"
     ]);
     var _useAdaptivity = useAdaptivity(), _useAdaptivity_sizeY = _useAdaptivity.sizeY, sizeY = _useAdaptivity_sizeY === void 0 ? 'none' : _useAdaptivity_sizeY;
+    var title = children || placeholder;
+    var showLabelOrPlaceholder = !Boolean(restProps.value);
     var handleRootRef = useExternRef(getRootRef);
-    var platform = usePlatform();
-    var input = /*#__PURE__*/ React.createElement(SelectTypography, CustomSelectInput_object_spread_props(CustomSelectInput_object_spread({
-        selectType: selectType,
+    var focusWithin = useFocusWithin(handleRootRef);
+    var input = /*#__PURE__*/ React.createElement(Text, CustomSelectInput_object_spread_props(CustomSelectInput_object_spread({
         type: "text"
-    }, restInputProps), {
+    }, restProps), {
         disabled: disabled && !fetching,
-        readOnly: restInputProps.readOnly || !searchable || disabled && fetching,
+        readOnly: restProps.readOnly || disabled && fetching,
         Component: "input",
         normalize: false,
-        className: "vkuiCustomSelectInput__input",
-        getRootRef: getRef
+        className: classNames("vkuiCustomSelectInput__el", (restProps.readOnly || showLabelOrPlaceholder && !focusWithin) && "vkuiCustomSelectInput__el--cursor-pointer"),
+        getRootRef: getRef,
+        placeholder: children ? '' : placeholder
     }));
+    var platform = usePlatform();
     return /*#__PURE__*/ React.createElement(FormField, {
         Component: "div",
         style: style,
-        className: classNames("vkuiCustomSelectInput", align === 'right' && "vkuiCustomSelectInput--align-right", align === 'center' && "vkuiCustomSelectInput--align-center", !selectedOptionLabel && "vkuiCustomSelectInput--empty", multiline && "vkuiCustomSelectInput--multiline", sizeY !== 'regular' && CustomSelectInput_sizeYClassNames[sizeY], before && "vkuiCustomSelectInput--hasBefore", after && "vkuiCustomSelectInput--hasAfter", className),
+        className: classNames("vkuiCustomSelectInput", align === 'right' && "vkuiCustomSelectInput--align-right", align === 'center' && "vkuiCustomSelectInput--align-center", !children && "vkuiCustomSelectInput--empty", multiline && "vkuiCustomSelectInput--multiline", sizeY !== 'regular' && CustomSelectInput_sizeYClassNames[sizeY], before && "vkuiCustomSelectInput--hasBefore", after && "vkuiCustomSelectInput--hasAfter", className),
         getRootRef: handleRootRef,
         before: before,
         after: after,
@@ -40959,97 +40964,17 @@ var CustomSelectInput_sizeYClassNames = {
         status: status
     }, /*#__PURE__*/ React.createElement("div", {
         className: "vkuiCustomSelectInput__input-group"
-    }, !searchable && platform === 'ios' ? /*#__PURE__*/ React.createElement(VisuallyHidden, null, input) : input, /*#__PURE__*/ React.createElement("div", {
-        className: classNames("vkuiCustomSelectInput__label-wrapper", className),
+    }, /*#__PURE__*/ React.createElement("div", {
+        className: classNames("vkuiCustomSelectInput__container", className),
         tabIndex: -1,
         "aria-hidden": true,
         "data-testid": labelTextTestId
     }, /*#__PURE__*/ React.createElement(SelectTypography, {
         selectType: selectType,
-        className: "vkuiCustomSelectInput__label"
-    }, selectedOptionLabel || restInputProps.placeholder))));
+        className: "vkuiCustomSelectInput__title"
+    }, showLabelOrPlaceholder && title)), restProps.readOnly && platform === 'ios' ? /*#__PURE__*/ React.createElement(VisuallyHidden, null, input) : input));
 };
 
-;// CONCATENATED MODULE: ./src/components/CustomSelect/helpers.tsx
-function helpers_object_without_properties(source, excluded) {
-    if (source == null) return {};
-    var target = helpers_object_without_properties_loose(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 helpers_object_without_properties_loose(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;
-}
-
-
-
-var helpers_findIndexAfter = function() {
-    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : -1;
-    if (startIndex >= options.length - 1) {
-        return -1;
-    }
-    return options.findIndex(function(option, i) {
-        return i > startIndex && !option.disabled;
-    });
-};
-var helpers_findIndexBefore = function() {
-    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], endIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : options.length;
-    var result = -1;
-    if (endIndex <= 0) {
-        return result;
-    }
-    for(var i = endIndex - 1; i >= 0; i--){
-        var option = options[i];
-        if (!option.disabled) {
-            result = i;
-            break;
-        }
-    }
-    return result;
-};
-function helpers_findSelectedIndex() {
-    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], value = arguments.length > 1 ? arguments[1] : void 0, withClear = arguments.length > 2 ? arguments[2] : void 0;
-    if (withClear && value === '') {
-        return -1;
-    }
-    var _options_findIndex;
-    return (_options_findIndex = options.findIndex(function(item) {
-        value = typeof item.value === 'number' ? Number(value) : value;
-        return item.value === value;
-    })) !== null && _options_findIndex !== void 0 ? _options_findIndex : -1;
-}
-function helpers_calculateInputValueFromOptions() {
-    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], selectValue = arguments.length > 1 ? arguments[1] : void 0;
-    var selectedOption = options.find(function(option) {
-        return option.value === selectValue;
-    });
-    return selectedOption ? getTextFromChildren(selectedOption.label) : '';
-}
-function helpers_defaultRenderOptionFn(_param) {
-    var option = _param.option, props = helpers_object_without_properties(_param, [
-        "option"
-    ]);
-    return /*#__PURE__*/ React.createElement(CustomSelectOption, props);
-}
-
 ;// CONCATENATED MODULE: ./src/components/CustomSelect/CustomSelect.module.css
 // extracted by mini-css-extract-plugin
 
@@ -41198,9 +41123,35 @@ function CustomSelect_unsupported_iterable_to_array(o, minLen) {
 
 
 
+
+
 var CustomSelect_sizeYClassNames = CustomSelect_define_property({
     none: "vkuiCustomSelect--sizeY-none"
 }, 'compact', "vkuiCustomSelect--sizeY-compact");
+var CustomSelect_findIndexAfter = function() {
+    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : -1;
+    if (startIndex >= options.length - 1) {
+        return -1;
+    }
+    return options.findIndex(function(option, i) {
+        return i > startIndex && !option.disabled;
+    });
+};
+var CustomSelect_findIndexBefore = function() {
+    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], endIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : options.length;
+    var result = -1;
+    if (endIndex <= 0) {
+        return result;
+    }
+    for(var i = endIndex - 1; i >= 0; i--){
+        var option = options[i];
+        if (!option.disabled) {
+            result = i;
+            break;
+        }
+    }
+    return result;
+};
 var CustomSelect_warn = warnOnce('CustomSelect');
 var checkOptionsValueType = function(options) {
     if (new Set(options.map(function(item) {
@@ -41209,9 +41160,26 @@ var checkOptionsValueType = function(options) {
         CustomSelect_warn('Некоторые значения ваших опций имеют разные типы. onChange всегда возвращает строковый тип.', 'error');
     }
 };
+function defaultRenderOptionFn(_param) {
+    var option = _param.option, props = CustomSelect_object_without_properties(_param, [
+        "option"
+    ]);
+    return /*#__PURE__*/ React.createElement(CustomSelectOption, props);
+}
 var handleOptionDown = function(e) {
     e.preventDefault();
 };
+function findSelectedIndex() {
+    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [], value = arguments.length > 1 ? arguments[1] : void 0, withClear = arguments.length > 2 ? arguments[2] : void 0;
+    if (withClear && value === '') {
+        return -1;
+    }
+    var _options_findIndex;
+    return (_options_findIndex = options.findIndex(function(item) {
+        value = typeof item.value === 'number' ? Number(value) : value;
+        return item.value === value;
+    })) !== null && _options_findIndex !== void 0 ? _options_findIndex : -1;
+}
 var filter = function(options, inputValue, filterFn) {
     return typeof filterFn === 'function' ? options.filter(function(option) {
         return filterFn(inputValue, option);
@@ -41266,16 +41234,13 @@ var filter = function(options, inputValue, filterFn) {
     var scrollBoxRef = React.useRef(null);
     var selectElRef = useExternRef(getRef);
     var optionsWrapperRef = React.useRef(null);
-    var selectInputRef = useExternRef(getSelectInputRef);
     var _React_useState1 = CustomSelect_sliced_to_array(React.useState(-1), 2), focusedOptionIndex = _React_useState1[0], setFocusedOptionIndex = _React_useState1[1];
     var _React_useState2 = CustomSelect_sliced_to_array(React.useState(props.value !== undefined), 2), isControlledOutside = _React_useState2[0], setIsControlledOutside = _React_useState2[1];
-    var _React_useState3 = CustomSelect_sliced_to_array(React.useState(function() {
+    var _React_useState3 = CustomSelect_sliced_to_array(React.useState(''), 2), inputValue = _React_useState3[0], setInputValue = _React_useState3[1];
+    var _React_useState4 = CustomSelect_sliced_to_array(React.useState(function() {
         var _props_value, _ref;
         return (_ref = (_props_value = props.value) !== null && _props_value !== void 0 ? _props_value : defaultValue) !== null && _ref !== void 0 ? _ref : allowClearButton ? '' : undefined;
-    }), 2), nativeSelectValue = _React_useState3[0], setNativeSelectValue = _React_useState3[1];
-    var _React_useState4 = CustomSelect_sliced_to_array(React.useState(function() {
-        return calculateInputValueFromOptions(optionsProp, nativeSelectValue);
-    }), 2), inputValue = _React_useState4[0], setInputValue = _React_useState4[1];
+    }), 2), nativeSelectValue = _React_useState4[0], setNativeSelectValue = _React_useState4[1];
     var _React_useState5 = CustomSelect_sliced_to_array(React.useState(popupDirection), 2), popperPlacement = _React_useState5[0], setPopperPlacement = _React_useState5[1];
     var _React_useState6 = CustomSelect_sliced_to_array(React.useState(optionsProp), 2), options = _React_useState6[0], setOptions = _React_useState6[1];
     var _props_value;
@@ -41402,6 +41367,7 @@ var filter = function(options, inputValue, filterFn) {
    *  Сброс происходит в одном из эффекте `updateOptionsAndSelectedOptionIndex()`.
    */ var close = React.useCallback(function() {
         resetKeyboardInput();
+        setInputValue('');
         setOpened(false);
         resetFocusedOption();
         onClose === null || onClose === void 0 ? void 0 : onClose();
@@ -41412,8 +41378,8 @@ var filter = function(options, inputValue, filterFn) {
     ]);
     var selectOption = React.useCallback(function(index) {
         var item = options[index];
-        close();
         setNativeSelectValue(item === null || item === void 0 ? void 0 : item.value);
+        close();
         var shouldTriggerOnChangeWhenControlledAndInnerValueIsOutOfSync = isControlledOutside && props.value !== nativeSelectValue && nativeSelectValue === (item === null || item === void 0 ? void 0 : item.value);
         if (shouldTriggerOnChangeWhenControlledAndInnerValueIsOutOfSync) {
             var _selectElRef_current;
@@ -41457,23 +41423,18 @@ var filter = function(options, inputValue, filterFn) {
             bubbles: true
         });
         (_selectElRef_current = selectElRef.current) === null || _selectElRef_current === void 0 ? void 0 : _selectElRef_current.dispatchEvent(event);
-        setInputValue(calculateInputValueFromOptions(optionsProp, nativeSelectValue));
     }, [
         close,
-        selectElRef,
-        optionsProp,
-        nativeSelectValue
+        selectElRef
     ]);
     var onFocus = React.useCallback(function() {
-        var _selectElRef_current, _selectInputRef_current;
+        var _selectElRef_current;
         var event = new Event('focusin', {
             bubbles: true
         });
         (_selectElRef_current = selectElRef.current) === null || _selectElRef_current === void 0 ? void 0 : _selectElRef_current.dispatchEvent(event);
-        (_selectInputRef_current = selectInputRef.current) === null || _selectInputRef_current === void 0 ? void 0 : _selectInputRef_current.select();
     }, [
-        selectElRef,
-        selectInputRef
+        selectElRef
     ]);
     var onClick = React.useCallback(function() {
         if (opened) {
@@ -41494,11 +41455,11 @@ var filter = function(options, inputValue, filterFn) {
     var focusOption = React.useCallback(function(type) {
         var index = focusedOptionIndex;
         if (type === 'next') {
-            var nextIndex = findIndexAfter(options, index);
-            index = nextIndex === -1 ? findIndexAfter(options) : nextIndex; // Следующий за index или первый валидный до index
+            var nextIndex = CustomSelect_findIndexAfter(options, index);
+            index = nextIndex === -1 ? CustomSelect_findIndexAfter(options) : nextIndex; // Следующий за index или первый валидный до index
         } else if (type === 'prev') {
-            var beforeIndex = findIndexBefore(options, index);
-            index = beforeIndex === -1 ? findIndexBefore(options) : beforeIndex; // Предшествующий index или последний валидный после index
+            var beforeIndex = CustomSelect_findIndexBefore(options, index);
+            index = beforeIndex === -1 ? CustomSelect_findIndexBefore(options) : beforeIndex; // Предшествующий index или последний валидный после index
         }
         focusOptionByIndex(index);
     }, [
@@ -41506,38 +41467,21 @@ var filter = function(options, inputValue, filterFn) {
         focusedOptionIndex,
         options
     ]);
-    React.useEffect(function filterOptions() {
+    React.useEffect(function updateOptionsAndSelectedOptionIndex() {
+        var _props_value, _ref;
+        var value = (_ref = (_props_value = props.value) !== null && _props_value !== void 0 ? _props_value : nativeSelectValue) !== null && _ref !== void 0 ? _ref : defaultValue;
         var options = searchable && inputValue !== undefined ? filter(optionsProp, inputValue, filterFn) : optionsProp;
         setOptions(options);
+        setSelectedOptionIndex(findSelectedIndex(options, value, allowClearButton));
     }, [
         filterFn,
         inputValue,
+        nativeSelectValue,
         optionsProp,
-        searchable
-    ]);
-    var _props_value1, _ref;
-    var selectValue = (_ref = (_props_value1 = props.value) !== null && _props_value1 !== void 0 ? _props_value1 : nativeSelectValue) !== null && _ref !== void 0 ? _ref : defaultValue;
-    React.useEffect(function updateSelectedOptionIndexOnValueChange() {
-        setSelectedOptionIndex(findSelectedIndex(options, selectValue, allowClearButton));
-    }, [
-        selectValue,
-        allowClearButton,
-        options
-    ]);
-    var prevSelectValueRef = React.useRef(selectValue);
-    React.useEffect(function updateInputValueOnSelectValueChange() {
-        if (prevSelectValueRef.current === selectValue) {
-            return;
-        }
-        setInputValue(calculateInputValueFromOptions(optionsProp, selectValue));
-    }, [
-        selectValue,
-        optionsProp
-    ]);
-    React.useEffect(function updatePrevSelectValue() {
-        prevSelectValueRef.current = selectValue;
-    }, [
-        selectValue
+        defaultValue,
+        props.value,
+        searchable,
+        allowClearButton
     ]);
     var onNativeSelectChange = function(e) {
         var newSelectedOptionIndex = findSelectedIndex(options, e.currentTarget.value, allowClearButton);
@@ -41702,6 +41646,7 @@ var filter = function(options, inputValue, filterFn) {
         renderDropdown,
         renderOption
     ]);
+    var selectInputRef = useExternRef(getSelectInputRef);
     var focusOnInputTimerRef = React.useRef();
     var focusOnInput = React.useCallback(function() {
         clearTimeout(focusOnInputTimerRef.current);
@@ -41782,14 +41727,11 @@ var filter = function(options, inputValue, filterFn) {
         selectInputRef
     ]);
     var preventInputBlurWhenClickInsideFocusedSelectArea = function(e) {
-        var _selectInputRef_current;
         // Так как инпут больше не оборачивается пустым лэйблом, то клик внутри обертки,
         // но вне инпута (например по иконке дропдауна), будет убирать фокус с инпута.
         // Чтобы в такой ситуации отключить blur инпута мы превентим mousedown событие обёртки
         var isInputFocused = document && document.activeElement === selectInputRef.current;
-        var clickTarget = e.target;
-        var inputClicked = (_selectInputRef_current = selectInputRef.current) === null || _selectInputRef_current === void 0 ? void 0 : _selectInputRef_current.contains(clickTarget);
-        if (isInputFocused && !inputClicked) {
+        if (isInputFocused) {
             e.preventDefault();
         }
     };
@@ -41799,15 +41741,19 @@ var filter = function(options, inputValue, filterFn) {
     var selectInputAriaProps = (_obj = {
         'role': 'combobox',
         'aria-controls': popupAriaId,
+        'aria-owns': popupAriaId,
         'aria-expanded': opened
     }, CustomSelect_define_property(_obj, 'aria-activedescendant', ariaActiveDescendantId && opened ? "".concat(popupAriaId, "-").concat(ariaActiveDescendantId) : undefined), CustomSelect_define_property(_obj, 'aria-labelledby', ariaLabelledBy), CustomSelect_define_property(_obj, 'aria-haspopup', 'listbox'), CustomSelect_define_property(_obj, 'aria-autocomplete', 'none'), _obj);
+    var focusWithin = useFocusWithin(handleRootRef);
     return /*#__PURE__*/ React.createElement("div", {
         className: classNames("vkuiCustomSelect", sizeY !== 'regular' && CustomSelect_sizeYClassNames[sizeY], className),
         style: style,
         ref: handleRootRef,
         onClick: passClickAndFocusToInputOnClick,
         onMouseDown: preventInputBlurWhenClickInsideFocusedSelectArea
-    }, /*#__PURE__*/ React.createElement(CustomSelectInput, CustomSelect_object_spread_props(CustomSelect_object_spread({
+    }, focusWithin && selected && !opened && /*#__PURE__*/ React.createElement(VisuallyHidden, {
+        "aria-live": "polite"
+    }, selected.label), /*#__PURE__*/ React.createElement(CustomSelectInput, CustomSelect_object_spread_props(CustomSelect_object_spread({
         autoComplete: "off",
         autoCapitalize: "none",
         autoCorrect: "off",
@@ -41817,7 +41763,7 @@ var filter = function(options, inputValue, filterFn) {
         onFocus: onFocus,
         onBlur: onBlur,
         className: openedClassNames,
-        searchable: searchable,
+        readOnly: !searchable,
         fetching: fetching,
         value: inputValue,
         onKeyUp: handleKeyUp,
@@ -41826,9 +41772,8 @@ var filter = function(options, inputValue, filterFn) {
         onClick: onClick,
         before: before,
         after: afterIcons,
-        selectType: selectType,
-        selectedOptionLabel: selected === null || selected === void 0 ? void 0 : selected.label
-    })), /*#__PURE__*/ React.createElement("select", {
+        selectType: selectType
+    }), selected === null || selected === void 0 ? void 0 : selected.label), /*#__PURE__*/ React.createElement("select", {
         ref: selectElRef,
         name: name,
         onChange: onNativeSelectChange,

package/dist/cssm/components/CustomSelect/CustomSelect.d.ts

@@ -2,12 +2,22 @@ import * as React from 'react';
 import { type FilterFn } from '../../lib/select';
 import { TrackerOptionsProps } from '../CustomScrollView/useTrackerVisibility';
 import { CustomSelectDropdownProps } from '../CustomSelectDropdown/CustomSelectDropdown';
+import { type CustomSelectOptionProps } from '../CustomSelectOption/CustomSelectOption';
 import { FormFieldProps } from '../FormField/FormField';
 import { NativeSelectProps } from '../NativeSelect/NativeSelect';
 import { SelectType } from '../Select/Select';
 import { type CustomSelectClearButtonProps } from './CustomSelectClearButton';
-import type { CustomSelectOptionInterface, CustomSelectRenderOption } from './types';
-export type { CustomSelectClearButtonProps, CustomSelectOptionInterface, CustomSelectRenderOption };
+type SelectValue = React.SelectHTMLAttributes<HTMLSelectElement>['value'];
+export interface CustomSelectOptionInterface {
+    value: SelectValue;
+    label: React.ReactElement | string;
+    disabled?: boolean;
+    [index: string]: any;
+}
+export interface CustomSelectRenderOption<T extends CustomSelectOptionInterface> extends CustomSelectOptionProps {
+    option: T;
+}
+export type { CustomSelectClearButtonProps };
 export interface SelectProps<OptionInterfaceT extends CustomSelectOptionInterface = CustomSelectOptionInterface> extends NativeSelectProps, Omit<FormFieldProps, 'maxHeight'>, TrackerOptionsProps, Pick<CustomSelectDropdownProps, 'overscrollBehavior' | 'autoHideScrollbar' | 'autoHideScrollbarDelay'> {
     /**
      * ref на внутрений компонент input

package/dist/cssm/components/CustomSelect/CustomSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomSelect.d.ts","sourceRoot":"","sources":["../../../../src/components/CustomSelect/CustomSelect.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAEL,yBAAyB,EAC1B,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,2BAA2B,CAAC;AASnC,OAAO,KAAK,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAiCrF,YAAY,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,CAAC;AAEpG,MAAM,WAAW,WAAW,CAC1B,gBAAgB,SAAS,2BAA2B,GAAG,2BAA2B,CAClF,SAAQ,iBAAiB,EACvB,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,EACjC,mBAAmB,EACnB,IAAI,CACF,yBAAyB,EACzB,oBAAoB,GAAG,mBAAmB,GAAG,wBAAwB,CACtE;IACH;;OAEG;IACH,iBAAiB,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAChD;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC;IAC/C,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC9C,cAAc,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAClC;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,KAAK,KAAK,CAAC,SAAS,CAAC;IACtF;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,EAChB,sBAAsB,GACvB,EAAE;QACD,sBAAsB,EAAE,KAAK,CAAC,SAAS,CAAC;KACzC,KAAK,KAAK,CAAC,SAAS,CAAC;IACtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC;IAChE;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAID;;GAEG;AACH,wBAAgB,YAAY,CAAC,gBAAgB,SAAS,2BAA2B,EAC/E,KAAK,EAAE,WAAW,CAAC,gBAAgB,CAAC,GACnC,KAAK,CAAC,SAAS,CAosBjB"}
+{"version":3,"file":"CustomSelect.d.ts","sourceRoot":"","sources":["../../../../src/components/CustomSelect/CustomSelect.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAEL,yBAAyB,EAC1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,2BAA2B,CAAC;AAmFnC,KAAK,WAAW,GAAG,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC;AAE1E,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,SAAS,2BAA2B,CAC7E,SAAQ,uBAAuB;IAC/B,MAAM,EAAE,CAAC,CAAC;CACX;AAED,YAAY,EAAE,4BAA4B,EAAE,CAAC;AAE7C,MAAM,WAAW,WAAW,CAC1B,gBAAgB,SAAS,2BAA2B,GAAG,2BAA2B,CAClF,SAAQ,iBAAiB,EACvB,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,EACjC,mBAAmB,EACnB,IAAI,CACF,yBAAyB,EACzB,oBAAoB,GAAG,mBAAmB,GAAG,wBAAwB,CACtE;IACH;;OAEG;IACH,iBAAiB,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAChD;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC;IAC/C,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC9C,cAAc,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAClC;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,KAAK,KAAK,CAAC,SAAS,CAAC;IACtF;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,EAChB,sBAAsB,GACvB,EAAE;QACD,sBAAsB,EAAE,KAAK,CAAC,SAAS,CAAC;KACzC,KAAK,KAAK,CAAC,SAAS,CAAC;IACtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC;IAChE;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAID;;GAEG;AACH,wBAAgB,YAAY,CAAC,gBAAgB,SAAS,2BAA2B,EAC/E,KAAK,EAAE,WAAW,CAAC,gBAAgB,CAAC,GACnC,KAAK,CAAC,SAAS,CAurBjB"}