@alfalab/core-components-select 17.2.0 → 17.3.0

package/esm/mobile/Component.mobile.js

@@ -12,12 +12,12 @@ import { Option } from '../components/option/Component.js';
 import { OptionsList } from '../components/options-list/Component.js';
 import { Search } from '../components/search/Component.js';
 import { VirtualOptionsList } from '../components/virtual-options-list/Component.js';
-import { u as useSelectWithApply } from '../hook-b4192713.js';
+import { u as useSelectWithApply } from '../hook-e8eb700a.js';
 import { Header } from '../presets/useSelectWithApply/options-list-with-apply/header/Component.js';
 
 var VIRTUAL_OPTIONS_LIST_THRESHOLD = 30;
 var SelectMobile = forwardRef(function (_a, ref) {
-    var _b = _a.autocomplete, autocomplete = _b === void 0 ? false : _b, _c = _a.multiple, multiple = _c === void 0 ? false : _c, _d = _a.allowUnselect, allowUnselect = _d === void 0 ? false : _d, _e = _a.disabled, disabled = _e === void 0 ? false : _e, _f = _a.closeOnSelect, closeOnSelect = _f === void 0 ? !multiple : _f, _g = _a.circularNavigation, circularNavigation = _g === void 0 ? false : _g, _h = _a.defaultOpen, defaultOpen = _h === void 0 ? false : _h, openProp = _a.open, _j = _a.size, size = _j === void 0 ? 'm' : _j, _k = _a.optionsSize, optionsSize = _k === void 0 ? 'm' : _k, _l = _a.fieldProps, fieldProps = _l === void 0 ? {} : _l, _m = _a.optionProps, optionProps = _m === void 0 ? {} : _m, _o = _a.optionsListProps, optionsListProps = _o === void 0 ? {} : _o, _p = _a.Arrow, Arrow$1 = _p === void 0 ? Arrow : _p, _q = _a.Field, Field$1 = _q === void 0 ? Field : _q, _r = _a.Optgroup, Optgroup$1 = _r === void 0 ? Optgroup : _r, _s = _a.Option, Option$1 = _s === void 0 ? Option : _s, _t = _a.Search, Search$1 = _t === void 0 ? Search : _t, selected = _a.selected, _u = _a.isBottomSheet, isBottomSheet = _u === void 0 ? true : _u, options = _a.options, _v = _a.OptionsList, OptionsList$1 = _v === void 0 ? options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
+    var _b = _a.autocomplete, autocomplete = _b === void 0 ? false : _b, _c = _a.multiple, multiple = _c === void 0 ? false : _c, _d = _a.allowUnselect, allowUnselect = _d === void 0 ? false : _d, _e = _a.disabled, disabled = _e === void 0 ? false : _e, _f = _a.closeOnSelect, closeOnSelect = _f === void 0 ? !multiple : _f, _g = _a.circularNavigation, circularNavigation = _g === void 0 ? false : _g, _h = _a.defaultOpen, defaultOpen = _h === void 0 ? false : _h, openProp = _a.open, _j = _a.size, size = _j === void 0 ? 56 : _j, _k = _a.optionsSize, optionsSize = _k === void 0 ? 56 : _k, _l = _a.fieldProps, fieldProps = _l === void 0 ? {} : _l, _m = _a.optionProps, optionProps = _m === void 0 ? {} : _m, _o = _a.optionsListProps, optionsListProps = _o === void 0 ? {} : _o, _p = _a.Arrow, Arrow$1 = _p === void 0 ? Arrow : _p, _q = _a.Field, Field$1 = _q === void 0 ? Field : _q, _r = _a.Optgroup, Optgroup$1 = _r === void 0 ? Optgroup : _r, _s = _a.Option, Option$1 = _s === void 0 ? Option : _s, _t = _a.Search, Search$1 = _t === void 0 ? Search : _t, selected = _a.selected, _u = _a.isBottomSheet, isBottomSheet = _u === void 0 ? true : _u, options = _a.options, _v = _a.OptionsList, OptionsList$1 = _v === void 0 ? options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
         ? VirtualOptionsList
         : OptionsList : _v, onChange = _a.onChange, _w = _a.showClear, showClear = _w === void 0 ? true : _w, showSelectAll = _a.showSelectAll, showHeaderWithSelectAll = _a.showHeaderWithSelectAll, _x = _a.useWithApplyHook, useWithApplyHook = _x === void 0 ? multiple : _x, showSearch = _a.showSearch, searchProps = _a.searchProps, restProps = __rest(_a, ["autocomplete", "multiple", "allowUnselect", "disabled", "closeOnSelect", "circularNavigation", "defaultOpen", "open", "size", "optionsSize", "fieldProps", "optionProps", "optionsListProps", "Arrow", "Field", "Optgroup", "Option", "Search", "selected", "isBottomSheet", "options", "OptionsList", "onChange", "showClear", "showSelectAll", "showHeaderWithSelectAll", "useWithApplyHook", "showSearch", "searchProps"]);
     var typedRestBottomSheetProps = restProps;

package/esm/presets/index.js

@@ -1,3 +1,3 @@
 export { useSelectWithLoading } from './useSelectWithLoading/hook.js';
 export { useLazyLoading } from './useLazyLoading/hook.js';
-export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-b4192713.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-e8eb700a.js';

package/esm/presets/useSelectWithApply/hook.js

@@ -1,4 +1,4 @@
 import 'tslib';
 import 'react';
 import '../../utils.js';
-export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../../hook-b4192713.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../../hook-e8eb700a.js';

package/esm/presets/useSelectWithApply/options-list-with-apply/Component.js

@@ -2,6 +2,6 @@ import 'tslib';
 import 'react';
 import '../../../components/options-list/Component.js';
 import '../../../consts.js';
-export { O as OptionsListWithApply } from '../../../hook-b4192713.js';
+export { O as OptionsListWithApply } from '../../../hook-e8eb700a.js';
 import './footer/Component.js';
 import './header/Component.js';

package/esm/presets/useSelectWithApply/options-list-with-apply/footer/Component.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { ButtonDesktop } from '@alfalab/core-components-button/esm/desktop';
 import { getDataTestId } from '@alfalab/core-components-shared/esm';
 
-var styles = {"footer":"select__footer_1lhq3"};
+var styles = {"footer":"select__footer_1bjm6"};
 require('./index.css')
 
 var Footer = function (_a) {
@@ -10,8 +10,8 @@ var Footer = function (_a) {
     return (React.createElement("div", { 
         // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
         tabIndex: 0, className: styles.footer },
-        React.createElement(ButtonDesktop, { size: 'xxs', view: 'primary', onClick: handleApply, dataTestId: getDataTestId(dataTestId, 'apply') }, "\u041F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C"),
-        showClear && selectedDraft.length > 0 && (React.createElement(ButtonDesktop, { size: 'xxs', view: 'secondary', onClick: handleClear, dataTestId: getDataTestId(dataTestId, 'clear') }, "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C"))));
+        React.createElement(ButtonDesktop, { size: 32, view: 'primary', onClick: handleApply, dataTestId: getDataTestId(dataTestId, 'apply') }, "\u041F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C"),
+        showClear && selectedDraft.length > 0 && (React.createElement(ButtonDesktop, { size: 32, view: 'secondary', onClick: handleClear, dataTestId: getDataTestId(dataTestId, 'clear') }, "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C"))));
 };
 
 export { Footer };

package/esm/presets/useSelectWithApply/options-list-with-apply/footer/index.css

@@ -1,5 +1,5 @@
-/* hash: k1tdv */
-:root {
+/* hash: vrnud */
+:root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root {
     --color-light-bg-primary: #fff; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
@@ -17,10 +17,10 @@
     --gap-s: 12px;
 } :root {
 } :root {
-} .select__footer_1lhq3 {
+} .select__footer_1bjm6 {
     background-color: var(--color-light-bg-primary);
     padding: var(--gap-s);
     outline: none
-} .select__footer_1lhq3 > * + * {
+} .select__footer_1bjm6 > * + * {
         margin-left: var(--gap-xs);
     }

package/esm/presets/useSelectWithApply/options-list-with-apply/header/Component.js

@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import { Checkbox } from '@alfalab/core-components-checkbox/esm';
 
-var styles = {"desktop":"select__desktop_boj2v","mobile":"select__mobile_boj2v"};
+var styles = {"desktop":"select__desktop_1g9s3","mobile":"select__mobile_1g9s3"};
 require('./index.css')
 
 var Header = function (_a) {

package/esm/presets/useSelectWithApply/options-list-with-apply/header/index.css

@@ -1,5 +1,5 @@
-/* hash: 12dlh */
-:root {
+/* hash: 1m5co */
+:root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root {
@@ -16,8 +16,8 @@
     --gap-s: 12px;
 } :root {
 } :root {
-} .select__desktop_boj2v {
+} .select__desktop_1g9s3 {
     padding: var(--gap-s);
-} .select__mobile_boj2v {
+} .select__mobile_1g9s3 {
     padding: var(--gap-s) var(--gap-xs);
 }

package/esm/presets/useSelectWithApply/options-list-with-apply/index.d.ts

@@ -1 +1 @@
-export * from "../../../hook-b4192713";
+export * from "../../../hook-e8eb700a";

package/esm/presets/useSelectWithApply/options-list-with-apply/index.js

@@ -1 +1 @@
-export { O as OptionsListWithApply } from '../../../hook-b4192713.js';
+export { O as OptionsListWithApply } from '../../../hook-e8eb700a.js';

package/esm/presets/useSelectWithLoading/hook.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { Skeleton } from '@alfalab/core-components-skeleton/esm';
 import { Option } from '../../components/option/Component.js';
 
-var styles = {"skeleton":"select__skeleton_afn0z"};
+var styles = {"skeleton":"select__skeleton_y8y4e"};
 require('./index.css')
 
 function useSelectWithLoading(_a) {

package/esm/presets/useSelectWithLoading/index.css

@@ -1,5 +1,5 @@
-/* hash: 39qai */
-.select__skeleton_afn0z {
+/* hash: 6xg3z */
+.select__skeleton_y8y4e {
     position: absolute;
     top: 50%;
     transform: translateY(-50%);

package/esm/shared/index.js

@@ -1,6 +1,6 @@
 export { useSelectWithLoading } from '../presets/useSelectWithLoading/hook.js';
 export { useLazyLoading } from '../presets/useLazyLoading/hook.js';
-export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-b4192713.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-e8eb700a.js';
 export { defaultAccessor, defaultFilterFn, getSelectTestIds, isGroup, isOptionShape, joinOptions, lastIndexOf, processOptions, usePrevious, useVisibleOptions } from '../utils.js';
 export { Option } from '../components/option/Component.js';
 export { BaseOption } from '../components/base-option/Component.js';

package/esm/typings.d.ts

@@ -107,12 +107,14 @@ type BaseSelectProps = {
     multiple?: boolean;
     /**
      * Размер компонента
+     * @description s, m, l, xl deprecated, используйте вместо них 48, 56, 64, 72 соответственно
      */
-    size?: 's' | 'm' | 'l' | 'xl';
+    size?: 's' | 'm' | 'l' | 'xl' | 48 | 56 | 64 | 72;
     /**
      * Размер пунктов меню
+     * @description s, m, l, xl deprecated, используйте вместо них 48, 56, 64, 72 соответственно
      */
-    optionsSize?: 's' | 'm' | 'l' | 'xl';
+    optionsSize?: 's' | 'm' | 'l' | 'xl' | 48 | 56 | 64 | 72;
     /**
      * Растягивает компонент на ширину контейнера
      */
@@ -377,8 +379,9 @@ type OptionsListProps = {
     scrollbarClassName?: string;
     /**
      * Размер компонента
+     * @description s, m, l, xl deprecated, используйте вместо них 48, 56, 64, 72 соответственно
      */
-    size?: 's' | 'm' | 'l' | 'xl';
+    size?: 's' | 'm' | 'l' | 'xl' | 48 | 56 | 64 | 72;
     /**
      * Компонент пункта меню
      */
@@ -480,8 +483,9 @@ type OptgroupProps = {
     className?: string;
     /**
      * Размер компонента
+     * @description s, m, l, xl deprecated, используйте вместо них 48, 56, 64, 72 соответственно
      */
-    size?: 's' | 'm' | 'l' | 'xl';
+    size?: 's' | 'm' | 'l' | 'xl' | 48 | 56 | 64 | 72;
     /**
      * Заголовок группы
      */
@@ -498,8 +502,9 @@ type OptionProps = {
     className?: string;
     /**
      * Размер компонента
+     * @description s, m, l, xl deprecated, используйте вместо них 48, 56, 64, 72 соответственно
      */
-    size?: 's' | 'm' | 'l' | 'xl';
+    size?: 's' | 'm' | 'l' | 'xl' | 48 | 56 | 64 | 72;
     /**
      * Контент пункта меню
      */

package/mobile/Component.mobile.js

@@ -16,7 +16,7 @@ var components_option_Component = require('../components/option/Component.js');
 var components_optionsList_Component = require('../components/options-list/Component.js');
 var components_search_Component = require('../components/search/Component.js');
 var components_virtualOptionsList_Component = require('../components/virtual-options-list/Component.js');
-var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-5269e0eb.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-6aa923ff.js');
 var presets_useSelectWithApply_optionsListWithApply_header_Component = require('../presets/useSelectWithApply/options-list-with-apply/header/Component.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -25,7 +25,7 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 var VIRTUAL_OPTIONS_LIST_THRESHOLD = 30;
 var SelectMobile = React.forwardRef(function (_a, ref) {
-    var _b = _a.autocomplete, autocomplete = _b === void 0 ? false : _b, _c = _a.multiple, multiple = _c === void 0 ? false : _c, _d = _a.allowUnselect, allowUnselect = _d === void 0 ? false : _d, _e = _a.disabled, disabled = _e === void 0 ? false : _e, _f = _a.closeOnSelect, closeOnSelect = _f === void 0 ? !multiple : _f, _g = _a.circularNavigation, circularNavigation = _g === void 0 ? false : _g, _h = _a.defaultOpen, defaultOpen = _h === void 0 ? false : _h, openProp = _a.open, _j = _a.size, size = _j === void 0 ? 'm' : _j, _k = _a.optionsSize, optionsSize = _k === void 0 ? 'm' : _k, _l = _a.fieldProps, fieldProps = _l === void 0 ? {} : _l, _m = _a.optionProps, optionProps = _m === void 0 ? {} : _m, _o = _a.optionsListProps, optionsListProps = _o === void 0 ? {} : _o, _p = _a.Arrow, Arrow = _p === void 0 ? components_arrow_Component.Arrow : _p, _q = _a.Field, Field = _q === void 0 ? components_field_Component.Field : _q, _r = _a.Optgroup, Optgroup = _r === void 0 ? components_optgroup_Component.Optgroup : _r, _s = _a.Option, Option = _s === void 0 ? components_option_Component.Option : _s, _t = _a.Search, Search = _t === void 0 ? components_search_Component.Search : _t, selected = _a.selected, _u = _a.isBottomSheet, isBottomSheet = _u === void 0 ? true : _u, options = _a.options, _v = _a.OptionsList, OptionsList = _v === void 0 ? options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
+    var _b = _a.autocomplete, autocomplete = _b === void 0 ? false : _b, _c = _a.multiple, multiple = _c === void 0 ? false : _c, _d = _a.allowUnselect, allowUnselect = _d === void 0 ? false : _d, _e = _a.disabled, disabled = _e === void 0 ? false : _e, _f = _a.closeOnSelect, closeOnSelect = _f === void 0 ? !multiple : _f, _g = _a.circularNavigation, circularNavigation = _g === void 0 ? false : _g, _h = _a.defaultOpen, defaultOpen = _h === void 0 ? false : _h, openProp = _a.open, _j = _a.size, size = _j === void 0 ? 56 : _j, _k = _a.optionsSize, optionsSize = _k === void 0 ? 56 : _k, _l = _a.fieldProps, fieldProps = _l === void 0 ? {} : _l, _m = _a.optionProps, optionProps = _m === void 0 ? {} : _m, _o = _a.optionsListProps, optionsListProps = _o === void 0 ? {} : _o, _p = _a.Arrow, Arrow = _p === void 0 ? components_arrow_Component.Arrow : _p, _q = _a.Field, Field = _q === void 0 ? components_field_Component.Field : _q, _r = _a.Optgroup, Optgroup = _r === void 0 ? components_optgroup_Component.Optgroup : _r, _s = _a.Option, Option = _s === void 0 ? components_option_Component.Option : _s, _t = _a.Search, Search = _t === void 0 ? components_search_Component.Search : _t, selected = _a.selected, _u = _a.isBottomSheet, isBottomSheet = _u === void 0 ? true : _u, options = _a.options, _v = _a.OptionsList, OptionsList = _v === void 0 ? options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
         ? components_virtualOptionsList_Component.VirtualOptionsList
         : components_optionsList_Component.OptionsList : _v, onChange = _a.onChange, _w = _a.showClear, showClear = _w === void 0 ? true : _w, showSelectAll = _a.showSelectAll, showHeaderWithSelectAll = _a.showHeaderWithSelectAll, _x = _a.useWithApplyHook, useWithApplyHook = _x === void 0 ? multiple : _x, showSearch = _a.showSearch, searchProps = _a.searchProps, restProps = tslib.__rest(_a, ["autocomplete", "multiple", "allowUnselect", "disabled", "closeOnSelect", "circularNavigation", "defaultOpen", "open", "size", "optionsSize", "fieldProps", "optionProps", "optionsListProps", "Arrow", "Field", "Optgroup", "Option", "Search", "selected", "isBottomSheet", "options", "OptionsList", "onChange", "showClear", "showSelectAll", "showHeaderWithSelectAll", "useWithApplyHook", "showSearch", "searchProps"]);
     var typedRestBottomSheetProps = restProps;

package/modern/components/arrow/Component.js

@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import { ChevronDownMIcon } from '@alfalab/icons-glyph/ChevronDownMIcon';
 
-const styles = {"arrow":"select__arrow_1lz5y","open":"select__open_1lz5y"};
+const styles = {"arrow":"select__arrow_1on7d","open":"select__open_1on7d"};
 require('./index.css')
 
 const Arrow = ({ open, className }) => (React.createElement(ChevronDownMIcon, { className: cn(styles.arrow, className, { [styles.open]: open }) }));

package/modern/components/arrow/index.css

@@ -1,5 +1,5 @@
-/* hash: 1wo3y */
-:root {
+/* hash: 1appp */
+:root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root {
     --color-light-neutral-translucent-700: rgba(4, 4, 21, 0.47); /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
@@ -26,13 +26,13 @@
     /* checkmark */
 
     /* optgroup */
-} .select__arrow_1lz5y {
+} .select__arrow_1on7d {
     display: block;
     width: 24px;
     height: 24px;
     color: var(--select-arrow-color);
 
     transition: transform 0.15s ease-in-out, opacity 0.2s ease;
-} .select__open_1lz5y {
+} .select__open_1on7d {
     transform: var(--arrow-transform);
 }

package/modern/components/base-checkmark/Component.js

@@ -3,7 +3,7 @@ import cn from 'classnames';
 import { Checkbox } from '@alfalab/core-components-checkbox/modern';
 import { CheckmarkMIcon } from '@alfalab/icons-glyph/CheckmarkMIcon';
 
-const styles = {"checkmark":"select__checkmark_1tkf0","single":"select__single_1tkf0","selected":"select__selected_1tkf0"};
+const styles = {"checkmark":"select__checkmark_1lqnh","single":"select__single_1lqnh","selected":"select__selected_1lqnh"};
 require('./index.css')
 
 const BaseCheckmark = ({ selected, disabled = false, className, multiple, }) => {

package/modern/components/base-checkmark/index.css

@@ -1,5 +1,5 @@
-/* hash: c2v41 */
-:root {
+/* hash: 7oo6u */
+:root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root {
@@ -23,14 +23,14 @@
     /* checkmark */
 
     /* optgroup */
-} .select__checkmark_1tkf0 {
+} .select__checkmark_1lqnh {
     flex-shrink: 0;
     box-sizing: border-box;
-} .select__single_1tkf0 {
+} .select__single_1lqnh {
     display: flex;
     align-items: center;
     justify-content: center;
     opacity: 0
-} .select__single_1tkf0.select__selected_1tkf0 {
+} .select__single_1lqnh.select__selected_1lqnh {
         opacity: 1;
     }

package/modern/components/base-option/Component.js

@@ -2,7 +2,7 @@ import React, { isValidElement } from 'react';
 import cn from 'classnames';
 import { BaseCheckmark } from '../base-checkmark/Component.js';
 
-const styles = {"option":"select__option_1d9qs","disabled":"select__disabled_1d9qs","checkmarkBefore":"select__checkmarkBefore_1d9qs","mobile":"select__mobile_1d9qs","checkmarkAfter":"select__checkmarkAfter_1d9qs","textContent":"select__textContent_1d9qs","selected":"select__selected_1d9qs","highlighted":"select__highlighted_1d9qs","content":"select__content_1d9qs"};
+const styles = {"option":"select__option_13bmv","disabled":"select__disabled_13bmv","checkmarkBefore":"select__checkmarkBefore_13bmv","mobile":"select__mobile_13bmv","checkmarkAfter":"select__checkmarkAfter_13bmv","textContent":"select__textContent_13bmv","selected":"select__selected_13bmv","highlighted":"select__highlighted_13bmv","content":"select__content_13bmv"};
 require('./index.css')
 
 const BaseOption = ({ className, option, children, selected, highlighted, disabled, multiple, Checkmark = BaseCheckmark, checkmarkPosition = multiple ? 'before' : 'after', innerProps, dataTestId, mobile = false, }) => {

package/modern/components/base-option/index.css

@@ -1,5 +1,5 @@
-/* hash: btu2k */
-:root {
+/* hash: njoj2 */
+:root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root {
     --color-light-modal-bg-primary: #fff;
     --color-light-text-primary: #0e0e0e;
@@ -43,7 +43,7 @@
     /* checkmark */
 
     /* optgroup */
-} .select__option_1d9qs {
+} .select__option_13bmv {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -60,32 +60,32 @@
     position: relative;
     cursor: pointer;
     min-height: var(--size-s-height)
-} .select__option_1d9qs:not(.select__disabled_1d9qs):active {
+} .select__option_13bmv:not(.select__disabled_13bmv):active {
         background: var(--select-option-active-background);
         color: var(--select-option-active-color);
-    } .select__option_1d9qs.select__checkmarkBefore_1d9qs {
+    } .select__option_13bmv.select__checkmarkBefore_13bmv {
         padding: 0 0 0 var(--gap-s)
-    } .select__option_1d9qs.select__checkmarkBefore_1d9qs.select__mobile_1d9qs {
+    } .select__option_13bmv.select__checkmarkBefore_13bmv.select__mobile_13bmv {
             padding-left: var(--gap-m);
-        } .select__option_1d9qs.select__checkmarkAfter_1d9qs {
+        } .select__option_13bmv.select__checkmarkAfter_13bmv {
         padding: 0 var(--gap-s) 0 0
-    } .select__option_1d9qs.select__checkmarkAfter_1d9qs.select__mobile_1d9qs {
+    } .select__option_13bmv.select__checkmarkAfter_13bmv.select__mobile_13bmv {
             padding-right: var(--gap-l);
-        } .select__option_1d9qs.select__textContent_1d9qs {
+        } .select__option_13bmv.select__textContent_13bmv {
         padding: var(--gap-s)
-    } .select__option_1d9qs.select__textContent_1d9qs.select__mobile_1d9qs {
+    } .select__option_13bmv.select__textContent_13bmv.select__mobile_13bmv {
             padding: var(--gap-m) var(--gap-l) var(--gap-m) var(--gap-m);
-        } .select__selected_1d9qs {
+        } .select__selected_13bmv {
     background: var(--select-option-selected-background);
     color: var(--select-option-selected-color);
     cursor: default;
-} .select__highlighted_1d9qs {
+} .select__highlighted_13bmv {
     background: var(--select-option-hover-background);
     color: var(--select-option-hover-color);
-} .select__disabled_1d9qs {
+} .select__disabled_13bmv {
     cursor: var(--disabled-cursor);
     background: var(--select-option-disabled-background);
     color: var(--select-option-disabled-color);
-} .select__content_1d9qs {
+} .select__content_13bmv {
     flex: 1;
 }

package/modern/components/base-select/Component.js

@@ -1,4 +1,4 @@
-import React, { forwardRef, useRef, useMemo, useCallback, useEffect } from 'react';
+import React, { forwardRef, useRef, useMemo, useEffect, useCallback } from 'react';
 import mergeRefs from 'react-merge-refs';
 import { ResizeObserver } from '@juggle/resize-observer';
 import cn from 'classnames';
@@ -9,10 +9,10 @@ import { useLayoutEffect_SAFE_FOR_SSR } from '@alfalab/hooks';
 import { defaultAccessor, defaultFilterFn, processOptions } from '../../utils.js';
 import { NativeSelect } from '../native-select/Component.js';
 
-const styles = {"component":"select__component_1lmy5","popoverInner":"select__popoverInner_1lmy5","optionsListWrapper":"select__optionsListWrapper_1lmy5","optionsListBorder":"select__optionsListBorder_1lmy5","nativeSelect":"select__nativeSelect_1lmy5","block":"select__block_1lmy5","emptySearchPlaceholder":"select__emptySearchPlaceholder_1lmy5","search":"select__search_1lmy5"};
+const styles = {"component":"select__component_1hdfx","popoverInner":"select__popoverInner_1hdfx","optionsListWrapper":"select__optionsListWrapper_1hdfx","optionsListBorder":"select__optionsListBorder_1hdfx","nativeSelect":"select__nativeSelect_1hdfx","block":"select__block_1hdfx","emptySearchPlaceholder":"select__emptySearchPlaceholder_1hdfx","search":"select__search_1hdfx"};
 require('./index.css')
 
-const mobileStyles = {"sheet":"select__sheet_1o9ho","sheetContent":"select__sheetContent_1o9ho","modalContent":"select__modalContent_1o9ho","sheetContainer":"select__sheetContainer_1o9ho","optionsListWrapper":"select__optionsListWrapper_1o9ho","optionsList":"select__optionsList_1o9ho","scrollbar":"select__scrollbar_1o9ho","search":"select__search_1o9ho","option":"select__option_1o9ho","optionGroup":"select__optionGroup_1o9ho"};
+const mobileStyles = {"sheet":"select__sheet_jo8og","sheetContent":"select__sheetContent_jo8og","modalContent":"select__modalContent_jo8og","sheetContainer":"select__sheetContainer_jo8og","optionsListWrapper":"select__optionsListWrapper_jo8og","optionsList":"select__optionsList_jo8og","scrollbar":"select__scrollbar_jo8og","search":"select__search_jo8og","option":"select__option_jo8og","optionGroup":"select__optionGroup_jo8og"};
 require('./mobile.css')
 
 /* eslint-disable no-nested-ternary */
@@ -21,13 +21,12 @@ const isItemDisabled = (option) => Boolean(option?.disabled);
 const BaseSelect = forwardRef(
 // TODO: 😭
 // eslint-disable-next-line complexity
-({ dataTestId, className, fieldClassName, optionGroupClassName, optionsListClassName, optionClassName, popperClassName, options, autocomplete = false, multiple = false, allowUnselect = false, disabled = false, closeOnSelect = !multiple, circularNavigation = false, nativeSelect = false, defaultOpen = false, open: openProp, popoverPosition = 'bottom-start', preventFlip = true, optionsListWidth = 'content', name, id, selected, size = 's', optionsSize = size, error, hint, block, label, labelView, placeholder, fieldProps = {}, optionsListProps = {}, optionProps = {}, searchProps = {}, showSearch = false, valueRenderer, onChange, onOpen, onFocus, onBlur, onScroll, Arrow, Field = () => null, OptionsList = () => null, Optgroup = () => null, Option = () => null, Search = () => null, updatePopover, zIndexPopover, showEmptyOptionsList = false, visibleOptions, view, isBottomSheet = true, footer, swipeable, modalProps, modalFooterProps, modalHeaderProps, bottomSheetProps, Popover, ModalMobile, BottomSheet, }, ref) => {
+({ dataTestId, className, fieldClassName, optionGroupClassName, optionsListClassName, optionClassName, popperClassName, options, autocomplete = false, multiple = false, allowUnselect = false, disabled = false, closeOnSelect = !multiple, circularNavigation = false, nativeSelect = false, defaultOpen = false, open: openProp, popoverPosition = 'bottom-start', preventFlip = true, optionsListWidth = 'content', name, id, selected, size = 48, optionsSize = size, error, hint, block, label, labelView, placeholder, fieldProps = {}, optionsListProps = {}, optionProps = {}, searchProps = {}, showSearch = false, valueRenderer, onChange, onOpen, onFocus, onBlur, onScroll, Arrow, Field = () => null, OptionsList = () => null, Optgroup = () => null, Option = () => null, Search = () => null, updatePopover, zIndexPopover, showEmptyOptionsList = false, visibleOptions, view, isBottomSheet = true, footer, swipeable, modalProps, modalFooterProps, modalHeaderProps, bottomSheetProps, Popover, ModalMobile, BottomSheet, }, ref) => {
     const rootRef = useRef(null);
     const fieldRef = useRef(null);
     const listRef = useRef(null);
     const initiatorRef = useRef(null);
     const searchRef = useRef(null);
-    const alreadyClickedRef = useRef(false);
     const scrollableContainerRef = useRef(null);
     const onOpenRef = useRef(onOpen);
     const [searchState, setSearchState] = React.useState('');
@@ -88,6 +87,24 @@ const BaseSelect = forwardRef(
         isItemDisabled,
         defaultHighlightedIndex: selectedItems.length === 0 ? -1 : undefined,
         scrollIntoView,
+        onSelectedItemChange: (changes) => {
+            const selectedItem = changes.selectedItem || initiatorRef.current;
+            if (selectedItem && !selectedItem.disabled) {
+                const alreadySelected = selectedItems.includes(selectedItem);
+                const allowRemove = allowUnselect || (multiple && selectedItems.length > 1);
+                if (alreadySelected && allowRemove) {
+                    removeSelectedItem(selectedItem);
+                }
+                if (!alreadySelected) {
+                    if (multiple) {
+                        addSelectedItem(selectedItem);
+                    }
+                    else {
+                        setSelectedItems([selectedItem]);
+                    }
+                }
+            }
+        },
         onIsOpenChange: (changes) => {
             if (onOpenRef.current) {
                 /**
@@ -114,16 +131,9 @@ const BaseSelect = forwardRef(
                 }
             }
         },
-        // eslint-disable-next-line complexity
         stateReducer: (state, actionAndChanges) => {
             const { type, changes } = actionAndChanges;
-            const { selectedItem } = changes;
             switch (type) {
-                case useCombobox.stateChangeTypes.InputBlur:
-                    if (view === 'mobile') {
-                        return state;
-                    }
-                    return changes;
                 case useCombobox.stateChangeTypes.InputKeyDownArrowDown:
                     if (!circularNavigation && state.highlightedIndex === options.length - 1) {
                         return { ...changes, highlightedIndex: state.highlightedIndex };
@@ -135,45 +145,40 @@ const BaseSelect = forwardRef(
                     }
                     return changes;
                 case useCombobox.stateChangeTypes.InputKeyDownEnter:
-                case useCombobox.stateChangeTypes.ItemClick:
+                case useCombobox.stateChangeTypes.ItemClick: {
+                    const { selectedItem } = changes;
                     initiatorRef.current = selectedItem || null;
-                    if (selectedItem && !selectedItem.disabled && !alreadyClickedRef.current) {
-                        // TODO!!! Проблема downshift + React 18. ItemClick срабатывает дважды. См https://github.com/downshift-js/downshift/issues/1384
-                        if (view === 'mobile' && React.version.indexOf('18') === 0) {
-                            alreadyClickedRef.current = true;
-                            setTimeout(() => {
-                                alreadyClickedRef.current = false;
-                            });
-                        }
-                        const alreadySelected = selectedItems.includes(selectedItem);
-                        const allowRemove = allowUnselect || (multiple && selectedItems.length > 1);
-                        if (alreadySelected && allowRemove) {
-                            removeSelectedItem(selectedItem);
-                        }
-                        if (!alreadySelected) {
-                            if (multiple) {
-                                addSelectedItem(selectedItem);
-                            }
-                            else {
-                                setSelectedItems([selectedItem]);
-                            }
-                        }
-                    }
                     return {
                         ...changes,
+                        selectedItem: state.selectedItem === selectedItem ? null : selectedItem,
                         isOpen: !closeOnSelect || (view === 'mobile' && multiple),
                         // при closeOnSelect === false - сохраняем подсвеченный индекс
                         highlightedIndex: state.isOpen && !closeOnSelect
                             ? state.highlightedIndex
                             : changes.highlightedIndex,
                     };
+                }
                 default:
                     return changes;
             }
         },
     });
-    const menuProps = getMenuProps({ ref: listRef }, { suppressRefError: true });
+    useEffect(() => {
+        /*
+         * При изменении openProp, состояние внутри downshift в useEnhancedReducer не меняется, поэтому меняем его таким способом
+         * Скорее всего это исправят в будущих версиях downshift
+         */
+        if (openProp !== undefined) {
+            if (openProp) {
+                openMenu();
+            }
+            else {
+                closeMenu();
+            }
+        }
+    }, [openProp, openMenu, closeMenu]);
     const inputProps = getInputProps(getDropdownProps({ ref: mergeRefs([ref, fieldRef]) }));
+    const { ref: menuRef, ...menuProps } = getMenuProps({ ref: listRef }, { suppressRefError: true });
     const handleEntered = (node, isAppearing) => {
         if (showSearch)
             searchRef.current?.focus();
@@ -342,7 +347,7 @@ const BaseSelect = forwardRef(
         if (flatOptions.length === 0 && !showEmptyOptionsList && !showSearch)
             return null;
         const listProps = optionsListProps;
-        return (React.createElement("div", { ...menuProps, className: cn(optionsListClassName, view === 'mobile' && mobileStyles.optionsListWrapper, view === 'desktop' && styles.optionsListWrapper) },
+        return (React.createElement("div", { ...menuProps, ref: view === 'desktop' ? menuRef : undefined, className: cn(optionsListClassName, view === 'mobile' && mobileStyles.optionsListWrapper, view === 'desktop' && styles.optionsListWrapper) },
             React.createElement(OptionsList, { ...listProps, ref: view === 'desktop' ? listProps.ref : scrollableContainerRef, setHighlightedIndex: view === 'desktop' ? setHighlightedIndex : undefined, className: cn({ [mobileStyles.optionsList]: view === 'mobile' }), scrollbarClassName: cn({ [mobileStyles.scrollbar]: view === 'mobile' }), optionsListWidth: optionsListWidth, flatOptions: flatOptions, highlightedIndex: highlightedIndex, open: open, size: size, options: filteredOptions, Optgroup: Optgroup, Option: Option, selectedItems: selectedItems, setSelectedItems: setSelectedItems, toggleMenu: toggleMenu, getOptionProps: getOptionProps, visibleOptions: view === 'desktop' ? visibleOptions : 0, dataTestId: getDataTestId(dataTestId, 'options-list'), header: renderOptionsListHeader(), optionGroupClassName: cn(optionGroupClassName, {
                     [mobileStyles.optionGroup]: view === 'mobile',
                 }), emptyPlaceholder: renderEmptyPlaceholder(), onScroll: onScroll }),
@@ -356,7 +361,7 @@ const BaseSelect = forwardRef(
     };
     const renderInBottomSheet = () => {
         if (!nativeSelect && BottomSheet) {
-            return (React.createElement(BottomSheet, { dataTestId: getDataTestId(dataTestId, 'bottom-sheet'), open: open, className: mobileStyles.sheet, contentClassName: mobileStyles.sheetContent, containerClassName: mobileStyles.sheetContainer, title: label || placeholder, actionButton: footer, stickyHeader: true, hasCloser: true, swipeable: swipeable, initialHeight: showSearch ? 'full' : 'default', ...bottomSheetProps, scrollableContainerRef: scrollableContainerRef, onClose: () => {
+            return (React.createElement(BottomSheet, { dataTestId: getDataTestId(dataTestId, 'bottom-sheet'), open: open, className: mobileStyles.sheet, contentClassName: mobileStyles.sheetContent, containerClassName: mobileStyles.sheetContainer, title: label || placeholder, actionButton: footer, stickyHeader: true, hasCloser: true, swipeable: swipeable, initialHeight: showSearch ? 'full' : 'default', ...bottomSheetProps, sheetContainerRef: menuRef, scrollableContainerRef: scrollableContainerRef, onClose: () => {
                     closeMenu();
                     bottomSheetProps?.onClose?.();
                 }, transitionProps: {
@@ -373,7 +378,7 @@ const BaseSelect = forwardRef(
     };
     const renderInModalMobile = () => {
         if (!nativeSelect && ModalMobile) {
-            return (React.createElement(ModalMobile, { dataTestId: getDataTestId(dataTestId, 'modal'), open: open, hasCloser: true, ...modalProps, onClose: (...args) => {
+            return (React.createElement(ModalMobile, { dataTestId: getDataTestId(dataTestId, 'modal'), open: open, hasCloser: true, ...modalProps, componentRef: menuRef, onClose: (...args) => {
                     closeMenu();
                     modalProps?.onClose?.(...args);
                 }, contentClassName: cn(mobileStyles.sheetContent, modalProps?.contentClassName), ref: mergeRefs([