@alfalab/core-components-select 17.8.2 → 17.8.3

package/components/virtual-options-list/index.css

@@ -1,4 +1,4 @@
-/* hash: hxfr2 */
+/* hash: 1qyed */
 :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-300: #e7e8eb;
@@ -14,10 +14,12 @@
 
     /* Hard up */
 } :root {
-} :root {
-    --gap-s: 12px;
-    --gap-m: 16px;
-    --gap-xl: 24px;
+} :root { /* deprecated */ /* deprecated */ /* deprecated */
+    --gap-s: 12px; /* deprecated */ /* deprecated */
+    --gap-m: 16px; /* deprecated */ /* deprecated */
+    --gap-xl: 24px; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+
+    /* новые значения, используйте их */
 } :root {
 } :root {
 } :root {
@@ -35,35 +37,35 @@
     /* checkmark */
 
     /* optgroup */
-} .select__virtualOptionsList_b5ppf {
+} .select__virtualOptionsList_1122m {
     width: 100%;
     outline: none;
     box-sizing: border-box;
     position: sticky;
     justify-content: space-between;
-} .select__virtualOptionsListHeader_b5ppf {
+} .select__virtualOptionsListHeader_1122m {
     box-sizing: border-box;
     border-bottom: 1px solid var(--color-light-neutral-300);
-} .select__virtualOptionsListFooter_b5ppf {
+} .select__virtualOptionsListFooter_1122m {
     position: sticky;
     bottom: 0;
     box-sizing: border-box;
     border-top: 1px solid transparent
-} .select__virtualOptionsListFooter_b5ppf.select__withBorder_b5ppf {
+} .select__virtualOptionsListFooter_1122m.select__withBorder_1122m {
         border-top: 1px solid var(--color-light-neutral-300);
-    } .select__scrollable_b5ppf {
+    } .select__scrollable_1122m {
     position: relative;
     overflow: auto;
     width: 100%;
-} .select__inner_b5ppf {
+} .select__inner_1122m {
     position: relative;
     width: 100%;
-} .select__virtualRow_b5ppf {
+} .select__virtualRow_1122m {
     position: absolute;
     top: 0;
     left: 0;
     width: 100%
-} .select__virtualRow_b5ppf:before {
+} .select__virtualRow_1122m:before {
         content: '';
         position: absolute;
         z-index: 1;
@@ -73,16 +75,16 @@
         height: 1px;
         background: var(--select-option-divider-background);
         display: var(--select-option-divider-display);
-    } .select__virtualRow_b5ppf:first-child:before {
+    } .select__virtualRow_1122m:first-child:before {
         display: none;
-    } .select__highlighted_b5ppf:before,
-    .select__highlighted_b5ppf + .select__virtualRow_b5ppf:before {
+    } .select__highlighted_1122m:before,
+    .select__highlighted_1122m + .select__virtualRow_1122m:before {
         display: none;
-    } .select__emptyPlaceholder_b5ppf {
+    } .select__emptyPlaceholder_1122m {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
     flex: 1;
-} .select__size-64_b5ppf .select__emptyPlaceholder_b5ppf,
-.select__size-72_b5ppf .select__emptyPlaceholder_b5ppf {
+} .select__size-64_1122m .select__emptyPlaceholder_1122m,
+.select__size-72_1122m .select__emptyPlaceholder_1122m {
     padding: var(--gap-xl) var(--gap-m);
 }

package/cssm/components/arrow/index.module.css

@@ -11,7 +11,9 @@
 
     /* Hard up */
 } :root {
-} :root {
+} :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 {
 } :root {
     --arrow-transform: rotate(180deg);

package/cssm/components/base-checkmark/index.module.css

@@ -10,7 +10,9 @@
 
     /* Hard up */
 } :root {
-} :root {
+} :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 {
 } :root {
 } :root {

package/cssm/components/base-option/index.module.css

@@ -15,10 +15,12 @@
 
     /* Hard up */
 } :root {
-} :root {
-    --gap-s: 12px;
-    --gap-m: 16px;
-    --gap-l: 20px;
+} :root { /* deprecated */ /* deprecated */ /* deprecated */
+    --gap-s: 12px; /* deprecated */ /* deprecated */
+    --gap-m: 16px; /* deprecated */
+    --gap-l: 20px; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+
+    /* новые значения, используйте их */
 } :root {
 } :root {
     --disabled-cursor: not-allowed;

package/cssm/components/base-select/Component.d.ts

@@ -1,20 +1,14 @@
 /// <reference types="react" />
 import React from 'react';
-import { FC } from "react";
-import { BottomSheetProps } from "@alfalab/core-components-bottom-sheet";
-import { ModalMobileProps } from "@alfalab/core-components-modal/mobile";
-import { ModalContentProps, ModalFooterProps, ModalHeaderProps } from "@alfalab/core-components-modal/shared";
-import { PopoverProps } from "@alfalab/core-components-popover";
-import { AdditionalMobileProps, BaseSelectProps, BottomSheetSelectMobileProps, ModalSelectMobileProps } from "../../typings";
-declare const BaseSelect: React.ForwardRefExoticComponent<BaseSelectProps & AdditionalMobileProps & BottomSheetSelectMobileProps & ModalSelectMobileProps & {
+declare const BaseSelect: React.ForwardRefExoticComponent<import("../../typings").BaseSelectProps & import("../../typings").AdditionalMobileProps & import("../../typings").BottomSheetSelectMobileProps & import("../../typings").ModalSelectMobileProps & {
     isBottomSheet?: boolean | undefined;
-    view: 'desktop' | 'mobile';
-    Popover?: React.ForwardRefExoticComponent<PopoverProps & React.RefAttributes<HTMLDivElement>> | undefined;
-    BottomSheet?: React.ForwardRefExoticComponent<BottomSheetProps & React.RefAttributes<HTMLDivElement>> | undefined;
-    ModalMobile?: (React.ForwardRefExoticComponent<ModalMobileProps & React.RefAttributes<HTMLDivElement>> & {
-        Header: FC<ModalHeaderProps>;
-        Footer: FC<ModalFooterProps>;
-        Content: FC<ModalContentProps>;
+    view: "mobile" | "desktop";
+    Popover?: React.ForwardRefExoticComponent<import("@alfalab/core-components-popover").PopoverProps & React.RefAttributes<HTMLDivElement>> | undefined;
+    BottomSheet?: React.ForwardRefExoticComponent<import("@alfalab/core-components-bottom-sheet").BottomSheetProps & React.RefAttributes<HTMLDivElement>> | undefined;
+    ModalMobile?: (React.ForwardRefExoticComponent<import("./types/component-types").ModalMobileProps & React.RefAttributes<HTMLDivElement>> & {
+        Header: React.FC<import("@alfalab/core-components-modal/shared").ModalHeaderProps>;
+        Footer: React.FC<import("@alfalab/core-components-modal/shared").ModalFooterProps>;
+        Content: React.FC<import("./types/component-types").ContentProps>;
     }) | undefined;
 } & React.RefAttributes<unknown>>;
 export { BaseSelect };

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

@@ -13,6 +13,11 @@ var coreComponentsShared = require('@alfalab/core-components-shared/cssm');
 var hooks = require('@alfalab/hooks');
 var utils = require('../../utils.js');
 var components_nativeSelect_Component = require('../native-select/Component.js');
+var components_baseSelect_components_listDesktop_helpers_getListPopoverDesktopProps = require('./components/list-desktop/helpers/get-list-popover-desktop-props.js');
+var components_baseSelect_components_listDesktop_listPopoverDesktop = require('./components/list-desktop/list-popover-desktop.js');
+var components_baseSelect_components_listMobile_helpers_getListModalMobileProps = require('./components/list-mobile/helpers/get-list-modal-mobile-props.js');
+var components_baseSelect_components_listMobile_helpers_getListBottomSheetMobileProps = require('./components/list-mobile/helpers/get-list-bottom-sheet-mobile-props.js');
+var components_baseSelect_components_listMobile_listMobile = require('./components/list-mobile/list-mobile.js');
 var styles = require('./index.module.css');
 var mobileStyles = require('./mobile.module.css');
 
@@ -29,10 +34,11 @@ var isItemDisabled = function (option) { return Boolean(option === null || optio
 var BaseSelect = React.forwardRef(
 // TODO: 😭
 // eslint-disable-next-line complexity
-function (_a, ref) {
-    var _b;
-    var _c, _d;
-    var dataTestId = _a.dataTestId, className = _a.className, fieldClassName = _a.fieldClassName, optionGroupClassName = _a.optionGroupClassName, optionsListClassName = _a.optionsListClassName, optionClassName = _a.optionClassName, popperClassName = _a.popperClassName, options = _a.options, _e = _a.autocomplete, autocomplete = _e === void 0 ? false : _e, _f = _a.multiple, multiple = _f === void 0 ? false : _f, _g = _a.allowUnselect, allowUnselect = _g === void 0 ? false : _g, _h = _a.disabled, disabled = _h === void 0 ? false : _h, _j = _a.closeOnSelect, closeOnSelect = _j === void 0 ? !multiple : _j, _k = _a.circularNavigation, circularNavigation = _k === void 0 ? false : _k, _l = _a.nativeSelect, nativeSelect = _l === void 0 ? false : _l, _m = _a.defaultOpen, defaultOpen = _m === void 0 ? false : _m, openProp = _a.open, _o = _a.popoverPosition, popoverPosition = _o === void 0 ? 'bottom-start' : _o, _p = _a.preventFlip, preventFlip = _p === void 0 ? true : _p, _q = _a.optionsListWidth, optionsListWidth = _q === void 0 ? 'content' : _q, name = _a.name, id = _a.id, selected = _a.selected, _r = _a.size, size = _r === void 0 ? 48 : _r, _s = _a.optionsSize, optionsSize = _s === void 0 ? size : _s, error = _a.error, hint = _a.hint, block = _a.block, label = _a.label, labelView = _a.labelView, placeholder = _a.placeholder, _t = _a.fieldProps, fieldProps = _t === void 0 ? {} : _t, _u = _a.optionsListProps, optionsListProps = _u === void 0 ? {} : _u, _v = _a.optionProps, optionProps = _v === void 0 ? {} : _v, _w = _a.searchProps, searchProps = _w === void 0 ? {} : _w, _x = _a.showSearch, showSearch = _x === void 0 ? false : _x, valueRenderer = _a.valueRenderer, onChange = _a.onChange, onOpen = _a.onOpen, onFocus = _a.onFocus, onBlur = _a.onBlur, onScroll = _a.onScroll, Arrow = _a.Arrow, _y = _a.Field, Field = _y === void 0 ? function () { return null; } : _y, _z = _a.OptionsList, OptionsList = _z === void 0 ? function () { return null; } : _z, _0 = _a.Optgroup, Optgroup = _0 === void 0 ? function () { return null; } : _0, _1 = _a.Option, Option = _1 === void 0 ? function () { return null; } : _1, _2 = _a.Search, Search = _2 === void 0 ? function () { return null; } : _2, updatePopover = _a.updatePopover, zIndexPopover = _a.zIndexPopover, _3 = _a.showEmptyOptionsList, showEmptyOptionsList = _3 === void 0 ? false : _3, visibleOptions = _a.visibleOptions, view = _a.view, _4 = _a.isBottomSheet, isBottomSheet = _4 === void 0 ? true : _4, footer = _a.footer, swipeable = _a.swipeable, modalProps = _a.modalProps, popoverProps = _a.popoverProps, modalFooterProps = _a.modalFooterProps, modalHeaderProps = _a.modalHeaderProps, bottomSheetProps = _a.bottomSheetProps, Popover = _a.Popover, ModalMobile = _a.ModalMobile, BottomSheet = _a.BottomSheet, limitDynamicOptionGroupSize = _a.limitDynamicOptionGroupSize;
+function (props, ref) {
+    var _a;
+    var _b, _c;
+    var dataTestId = props.dataTestId, className = props.className, fieldClassName = props.fieldClassName, optionGroupClassName = props.optionGroupClassName, optionsListClassName = props.optionsListClassName, optionClassName = props.optionClassName, options = props.options, _d = props.autocomplete, autocomplete = _d === void 0 ? false : _d, _e = props.multiple, multiple = _e === void 0 ? false : _e, _f = props.allowUnselect, allowUnselect = _f === void 0 ? false : _f, _g = props.disabled, disabled = _g === void 0 ? false : _g, _h = props.closeOnSelect, closeOnSelect = _h === void 0 ? !multiple : _h, _j = props.circularNavigation, circularNavigation = _j === void 0 ? false : _j, _k = props.nativeSelect, nativeSelect = _k === void 0 ? false : _k, _l = props.defaultOpen, defaultOpen = _l === void 0 ? false : _l, openProp = props.open, _m = props.optionsListWidth, optionsListWidth = _m === void 0 ? 'content' : _m, name = props.name, id = props.id, selected = props.selected, _o = props.size, size = _o === void 0 ? 48 : _o, _p = props.optionsSize, optionsSize = _p === void 0 ? size : _p, error = props.error, hint = props.hint, block = props.block, label = props.label, labelView = props.labelView, placeholder = props.placeholder, _q = props.fieldProps, fieldProps = _q === void 0 ? {} : _q, _r = props.optionsListProps, optionsListProps = _r === void 0 ? {} : _r, _s = props.optionProps, optionProps = _s === void 0 ? {} : _s, _t = props.searchProps, searchProps = _t === void 0 ? {} : _t, _u = props.showSearch, showSearch = _u === void 0 ? false : _u, valueRenderer = props.valueRenderer, onChange = props.onChange, onOpen = props.onOpen, onFocus = props.onFocus, onBlur = props.onBlur, onScroll = props.onScroll, Arrow = props.Arrow, _v = props.Field, Field = _v === void 0 ? function () { return null; } : _v, _w = props.OptionsList, OptionsList = _w === void 0 ? function () { return null; } : _w, _x = props.Optgroup, Optgroup = _x === void 0 ? function () { return null; } : _x, _y = props.Option, Option = _y === void 0 ? function () { return null; } : _y, _z = props.Search, Search = _z === void 0 ? function () { return null; } : _z, _0 = props.showEmptyOptionsList, showEmptyOptionsList = _0 === void 0 ? false : _0, visibleOptions = props.visibleOptions, view = props.view, _1 = props.isBottomSheet, isBottomSheet = _1 === void 0 ? true : _1, modalProps = props.modalProps, bottomSheetProps = props.bottomSheetProps, limitDynamicOptionGroupSize = props.limitDynamicOptionGroupSize;
+    var shouldSearchBlurRef = React.useRef(true);
     var rootRef = React.useRef(null);
     var fieldRef = React.useRef(null);
     var listRef = React.useRef(null);
@@ -40,15 +46,15 @@ function (_a, ref) {
     var searchRef = React.useRef(null);
     var scrollableContainerRef = React.useRef(null);
     var onOpenRef = React.useRef(onOpen);
-    var _5 = React__default.default.useState(''), searchState = _5[0], setSearchState = _5[1];
-    var _6 = typeof (searchProps === null || searchProps === void 0 ? void 0 : searchProps.value) === 'string'
+    var _2 = React__default.default.useState(''), searchState = _2[0], setSearchState = _2[1];
+    var _3 = typeof (searchProps === null || searchProps === void 0 ? void 0 : searchProps.value) === 'string'
         ? [searchProps.value, searchProps.onChange]
-        : [searchState, setSearchState], search = _6[0], setSearch = _6[1];
+        : [searchState, setSearchState], search = _3[0], setSearch = _3[1];
     var accessor = searchProps.accessor || utils.defaultAccessor;
     var filterFn = searchProps.filterFn || utils.defaultFilterFn;
-    var filterGroup = (_c = searchProps.filterGroup) !== null && _c !== void 0 ? _c : false;
-    var groupAccessor = (_d = searchProps.groupAccessor) !== null && _d !== void 0 ? _d : utils.defaultGroupAccessor;
-    var _7 = React.useMemo(function () {
+    var filterGroup = (_b = searchProps.filterGroup) !== null && _b !== void 0 ? _b : false;
+    var groupAccessor = (_c = searchProps.groupAccessor) !== null && _c !== void 0 ? _c : utils.defaultGroupAccessor;
+    var _4 = React.useMemo(function () {
         return utils.processOptions(options, selected, function (option) {
             if (utils.isGroup(option)) {
                 var groupAccessorValue = groupAccessor(option);
@@ -57,7 +63,7 @@ function (_a, ref) {
             }
             return filterFn(accessor(option), search);
         }, filterGroup);
-    }, [options, selected, filterFn, accessor, search, filterGroup, groupAccessor]), filteredOptions = _7.filteredOptions, flatOptions = _7.flatOptions, selectedOptions = _7.selectedOptions;
+    }, [options, selected, filterFn, accessor, search, filterGroup, groupAccessor]), filteredOptions = _4.filteredOptions, flatOptions = _4.flatOptions, selectedOptions = _4.selectedOptions;
     var scrollIntoView = function (node) {
         if (!node || view === 'mobile')
             return;
@@ -100,8 +106,8 @@ function (_a, ref) {
         useMultipleSelectionProps.selectedItems = selectedOptions;
     }
     onOpenRef.current = onOpen;
-    var _8 = downshift.useMultipleSelection(useMultipleSelectionProps), selectedItems = _8.selectedItems, addSelectedItem = _8.addSelectedItem, setSelectedItems = _8.setSelectedItems, removeSelectedItem = _8.removeSelectedItem, getDropdownProps = _8.getDropdownProps;
-    var _9 = downshift.useCombobox({
+    var _5 = downshift.useMultipleSelection(useMultipleSelectionProps), selectedItems = _5.selectedItems, addSelectedItem = _5.addSelectedItem, setSelectedItems = _5.setSelectedItems, removeSelectedItem = _5.removeSelectedItem, getDropdownProps = _5.getDropdownProps;
+    var _6 = downshift.useCombobox({
         id: id,
         isOpen: openProp,
         items: flatOptions,
@@ -182,7 +188,7 @@ function (_a, ref) {
                     return changes;
             }
         },
-    }), open = _9.isOpen, getMenuProps = _9.getMenuProps, getInputProps = _9.getInputProps, getItemProps = _9.getItemProps, getLabelProps = _9.getLabelProps, highlightedIndex = _9.highlightedIndex, toggleMenu = _9.toggleMenu, openMenu = _9.openMenu, closeMenu = _9.closeMenu, setHighlightedIndex = _9.setHighlightedIndex;
+    }), open = _6.isOpen, getMenuProps = _6.getMenuProps, getInputProps = _6.getInputProps, getItemProps = _6.getItemProps, getLabelProps = _6.getLabelProps, highlightedIndex = _6.highlightedIndex, toggleMenu = _6.toggleMenu, openMenu = _6.openMenu, closeMenu = _6.closeMenu, setHighlightedIndex = _6.setHighlightedIndex;
     React.useEffect(function () {
         /*
          * При изменении openProp, состояние внутри downshift в useEnhancedReducer не меняется, поэтому меняем его таким способом
@@ -198,7 +204,7 @@ function (_a, ref) {
         }
     }, [openProp, openMenu, closeMenu]);
     var inputProps = getInputProps(getDropdownProps({ ref: mergeRefs__default.default([ref, fieldRef]) }));
-    var _10 = getMenuProps({ ref: listRef }, { suppressRefError: true }), menuRef = _10.ref, menuProps = tslib.__rest(_10, ["ref"]);
+    var _7 = getMenuProps({ ref: listRef }, { suppressRefError: true }), menuRef = _7.ref, menuProps = tslib.__rest(_7, ["ref"]);
     var handleEntered = function (node, isAppearing) {
         var _a, _b, _c, _d, _e;
         if (showSearch)
@@ -276,6 +282,15 @@ function (_a, ref) {
                 index: index,
                 item: option,
                 onMouseDown: function (event) { return event.preventDefault(); },
+                onClick: function () {
+                    var _a, _b;
+                    if (view === 'mobile' || !showSearch || multiple)
+                        return;
+                    shouldSearchBlurRef.current = false;
+                    (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+                    shouldSearchBlurRef.current = true;
+                    (_b = fieldRef.current) === null || _b === void 0 ? void 0 : _b.focus();
+                },
             }), multiple: multiple, index: index, option: option, size: optionsSize, disabled: option.disabled, highlighted: index === highlightedIndex, selected: selectedItems.some(function (_a) {
                 var key = _a.key;
                 return key === option.key;
@@ -346,6 +361,8 @@ function (_a, ref) {
         };
         var handleBlur = function (event) {
             var _a, _b;
+            if (!shouldSearchBlurRef.current)
+                return;
             (_b = (_a = searchProps.componentProps) === null || _a === void 0 ? void 0 : _a.onBlur) === null || _b === void 0 ? void 0 : _b.call(_a, event);
             handleFieldBlur(event);
         };
@@ -354,7 +371,7 @@ function (_a, ref) {
                 _a[mobileStyles__default.default.search] = view === 'mobile',
                 _a)), ref: mergeRefs__default.default([searchRef, ((_c = searchProps === null || searchProps === void 0 ? void 0 : searchProps.componentProps) === null || _c === void 0 ? void 0 : _c.ref) || null]) })));
     };
-    var _11 = optionsListProps, header = _11.header, emptyPlaceholder = _11.emptyPlaceholder;
+    var _8 = optionsListProps, header = _8.header, emptyPlaceholder = _8.emptyPlaceholder;
     var renderOptionsListHeader = function () {
         if (header || (view === 'desktop' && showSearch)) {
             return (React__default.default.createElement(React__default.default.Fragment, null,
@@ -383,47 +400,7 @@ function (_a, ref) {
                     _c)), emptyPlaceholder: renderEmptyPlaceholder(), onScroll: onScroll, search: search, multiple: multiple, limitDynamicOptionGroupSize: limitDynamicOptionGroupSize })),
             view === 'desktop' && React__default.default.createElement("div", { className: styles__default.default.optionsListBorder })));
     };
-    var renderInPopover = function () {
-        if (!nativeSelect && Popover) {
-            return (React__default.default.createElement(Popover, tslib.__assign({}, popoverProps, { open: open, withTransition: false, anchorElement: fieldRef.current, position: popoverPosition, preventFlip: preventFlip, popperClassName: cn__default.default(styles__default.default.popoverInner, popperClassName), update: updatePopover, zIndex: zIndexPopover }), renderOptionsList()));
-        }
-        return null;
-    };
-    var renderInBottomSheet = function () {
-        if (!nativeSelect && BottomSheet) {
-            return (React__default.default.createElement(BottomSheet, tslib.__assign({ dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'bottom-sheet'), open: open, className: mobileStyles__default.default.sheet, contentClassName: mobileStyles__default.default.sheetContent, containerClassName: mobileStyles__default.default.sheetContainer, title: label || placeholder, actionButton: footer, stickyHeader: true, hasCloser: true, swipeable: swipeable, initialHeight: showSearch ? 'full' : 'default' }, bottomSheetProps, { sheetContainerRef: menuRef, scrollableContainerRef: scrollableContainerRef, onClose: function () {
-                    var _a;
-                    closeMenu();
-                    (_a = bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.onClose) === null || _a === void 0 ? void 0 : _a.call(bottomSheetProps);
-                }, transitionProps: tslib.__assign(tslib.__assign({}, bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.transitionProps), { onEntered: handleEntered }), bottomAddons: React__default.default.createElement(React__default.default.Fragment, null,
-                    renderSearch(),
-                    flatOptions.length > 0 && (bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.bottomAddons)), containerProps: tslib.__assign(tslib.__assign({}, bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.containerProps), { onScroll: onScroll }) }), renderOptionsList()));
-        }
-        return null;
-    };
-    var renderInModalMobile = function () {
-        if (!nativeSelect && ModalMobile) {
-            return (React__default.default.createElement(ModalMobile, tslib.__assign({ dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'modal'), open: open, hasCloser: true }, modalProps, { componentRef: menuRef, onClose: function () {
-                    var _a;
-                    var args = [];
-                    for (var _i = 0; _i < arguments.length; _i++) {
-                        args[_i] = arguments[_i];
-                    }
-                    closeMenu();
-                    (_a = modalProps === null || modalProps === void 0 ? void 0 : modalProps.onClose) === null || _a === void 0 ? void 0 : _a.call.apply(_a, tslib.__spreadArray([modalProps], args, false));
-                }, contentClassName: cn__default.default(mobileStyles__default.default.sheetContent, modalProps === null || modalProps === void 0 ? void 0 : modalProps.contentClassName), ref: mergeRefs__default.default([
-                    scrollableContainerRef,
-                    modalProps === null || modalProps === void 0 ? void 0 : modalProps.ref,
-                ]), wrapperProps: tslib.__assign(tslib.__assign({}, modalProps === null || modalProps === void 0 ? void 0 : modalProps.wrapperProps), { onScroll: onScroll }), transitionProps: tslib.__assign(tslib.__assign({}, modalProps === null || modalProps === void 0 ? void 0 : modalProps.transitionProps), { onEntered: handleEntered }) }),
-                React__default.default.createElement(ModalMobile.Header, tslib.__assign({ hasCloser: true, sticky: true }, modalHeaderProps, { title: undefined, bottomAddons: React__default.default.createElement(React__default.default.Fragment, null,
-                        renderSearch(),
-                        flatOptions.length > 0 && (modalHeaderProps === null || modalHeaderProps === void 0 ? void 0 : modalHeaderProps.bottomAddons)) }), (modalHeaderProps === null || modalHeaderProps === void 0 ? void 0 : modalHeaderProps.title) || label || placeholder),
-                React__default.default.createElement(ModalMobile.Content, { flex: true, className: mobileStyles__default.default.modalContent }, renderOptionsList()),
-                (modalFooterProps === null || modalFooterProps === void 0 ? void 0 : modalFooterProps.children) && React__default.default.createElement(ModalMobile.Footer, tslib.__assign({}, modalFooterProps))));
-        }
-        return null;
-    };
-    return (React__default.default.createElement("div", tslib.__assign({}, (disabled && { 'aria-disabled': true }), { "aria-expanded": inputProps['aria-expanded'], "aria-haspopup": 'listbox', role: inputProps.role, className: cn__default.default(styles__default.default.component, (_b = {}, _b[styles__default.default.block] = block, _b), className), ref: rootRef, onKeyDown: disabled ? undefined : handleFieldKeyDown, tabIndex: -1, "data-test-id": coreComponentsShared.getDataTestId(dataTestId) }),
+    return (React__default.default.createElement("div", tslib.__assign({}, (disabled && { 'aria-disabled': true }), { "aria-expanded": inputProps['aria-expanded'], "aria-haspopup": 'listbox', role: inputProps.role, className: cn__default.default(styles__default.default.component, (_a = {}, _a[styles__default.default.block] = block, _a), className), ref: rootRef, onKeyDown: disabled ? undefined : handleFieldKeyDown, tabIndex: -1, "data-test-id": coreComponentsShared.getDataTestId(dataTestId) }),
         nativeSelect && renderNativeSelect(),
         React__default.default.createElement(Field, tslib.__assign({ selectedMultiple: selectedItems, selected: selectedItems[0], setSelectedItems: setSelectedItems, toggleMenu: toggleMenu, multiple: multiple, open: open, disabled: disabled, size: size, placeholder: placeholder, label: label && React__default.default.createElement("span", tslib.__assign({}, getLabelProps()), label), labelView: labelView, Arrow: Arrow && React__default.default.createElement(Arrow, { open: open }), error: error, hint: hint, valueRenderer: valueRenderer, className: fieldClassName, innerProps: {
                 onBlur: handleFieldBlur,
@@ -439,9 +416,10 @@ function (_a, ref) {
                     : undefined,
             }, dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'field') }, fieldProps)),
         name && !nativeSelect && renderValue(),
-        view === 'desktop' && renderInPopover(),
-        view === 'mobile' && isBottomSheet && renderInBottomSheet(),
-        view === 'mobile' && !isBottomSheet && renderInModalMobile()));
+        view === 'desktop' && !nativeSelect && (React__default.default.createElement(components_baseSelect_components_listDesktop_listPopoverDesktop.ListPopoverDesktop, tslib.__assign({}, components_baseSelect_components_listDesktop_helpers_getListPopoverDesktopProps.getListPopoverDesktopProps(props), { open: open, fieldRef: fieldRef, renderOptionsList: renderOptionsList }))),
+        view === 'mobile' && (React__default.default.createElement(components_baseSelect_components_listMobile_listMobile.ListMobile, { baseProps: isBottomSheet
+                ? components_baseSelect_components_listMobile_helpers_getListBottomSheetMobileProps.getListBottomSheetMobileProps(props)
+                : components_baseSelect_components_listMobile_helpers_getListModalMobileProps.getListModalMobileProps(props), open: open, menuRef: menuRef, scrollableContainerRef: scrollableContainerRef, flatOptions: flatOptions, renderOptionsList: renderOptionsList, renderSearch: renderSearch, closeMenu: closeMenu, handleEntered: handleEntered }))));
 });
 
 exports.BaseSelect = BaseSelect;

package/cssm/components/base-select/components/list-desktop/helpers/get-list-popover-desktop-props.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+import { ComponentProps } from "../../../types/component-types";
+declare const getListPopoverDesktopProps: (props: ComponentProps) => {
+    Popover: import("react").ForwardRefExoticComponent<import("@alfalab/core-components-popover").PopoverProps & import("react").RefAttributes<HTMLDivElement>> | undefined;
+    popoverProps: Omit<import("@alfalab/core-components-popover").PopoverProps, "className" | "dataTestId" | "anchorElement" | "position" | "preventFlip" | "open" | "update" | "zIndex"> | undefined;
+    popoverPosition: import("@alfalab/core-components-popover").Position;
+    preventFlip: boolean;
+    popperClassName: string | undefined;
+    updatePopover: import("react").MutableRefObject<(() => void) | undefined> | undefined;
+    zIndexPopover: number | undefined;
+};
+export { getListPopoverDesktopProps };

package/cssm/components/base-select/components/list-desktop/helpers/get-list-popover-desktop-props.js

@@ -0,0 +1,19 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+// отделяем необходимые пропсы для передачи в компонент
+var getListPopoverDesktopProps = function (props) {
+    var Popover = props.Popover, popoverProps = props.popoverProps, _a = props.popoverPosition, popoverPosition = _a === void 0 ? 'bottom-start' : _a, _b = props.preventFlip, preventFlip = _b === void 0 ? true : _b, popperClassName = props.popperClassName, updatePopover = props.updatePopover, zIndexPopover = props.zIndexPopover;
+    return {
+        Popover: Popover,
+        popoverProps: popoverProps,
+        popoverPosition: popoverPosition,
+        preventFlip: preventFlip,
+        popperClassName: popperClassName,
+        updatePopover: updatePopover,
+        zIndexPopover: zIndexPopover,
+    };
+};
+
+exports.getListPopoverDesktopProps = getListPopoverDesktopProps;

package/cssm/components/base-select/components/list-desktop/list-popover-desktop.d.ts

@@ -0,0 +1,9 @@
+import { FC, ReactNode, RefObject } from 'react';
+import { ListPopoverDesktopRestProps } from "./types/types";
+type ListPopoverDesktopProps = {
+    open: boolean;
+    fieldRef: RefObject<HTMLInputElement>;
+    renderOptionsList: () => ReactNode;
+} & ListPopoverDesktopRestProps;
+declare const ListPopoverDesktop: FC<ListPopoverDesktopProps>;
+export { ListPopoverDesktop };

package/cssm/components/base-select/components/list-desktop/list-popover-desktop.js

@@ -0,0 +1,24 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var React = require('react');
+var cn = require('classnames');
+var styles = require('../../index.module.css');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
+var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
+
+var ListPopoverDesktop = function (props) {
+    var Popover = props.Popover, open = props.open, popoverProps = props.popoverProps, fieldRef = props.fieldRef, _a = props.popoverPosition, popoverPosition = _a === void 0 ? 'bottom-start' : _a, _b = props.preventFlip, preventFlip = _b === void 0 ? true : _b, popperClassName = props.popperClassName, updatePopover = props.updatePopover, zIndexPopover = props.zIndexPopover, renderOptionsList = props.renderOptionsList;
+    if (Popover) {
+        return (React__default.default.createElement(Popover, tslib.__assign({}, popoverProps, { open: open, withTransition: false, anchorElement: fieldRef.current, position: popoverPosition, preventFlip: preventFlip, popperClassName: cn__default.default(styles__default.default.popoverInner, popperClassName), update: updatePopover, zIndex: zIndexPopover }), renderOptionsList()));
+    }
+    return null;
+};
+
+exports.ListPopoverDesktop = ListPopoverDesktop;

package/cssm/components/base-select/components/list-desktop/types/types.d.ts

@@ -0,0 +1,3 @@
+import { getListPopoverDesktopProps } from "../helpers/get-list-popover-desktop-props";
+type ListPopoverDesktopRestProps = ReturnType<typeof getListPopoverDesktopProps>;
+export { ListPopoverDesktopRestProps };

package/cssm/components/base-select/components/list-desktop/types/types.js

@@ -0,0 +1,2 @@
+'use strict';
+

package/cssm/components/base-select/components/list-mobile/helpers/get-list-bottom-sheet-mobile-props.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import { ComponentProps } from "../../../types/component-types";
+declare const getListBottomSheetMobileProps: (props: ComponentProps) => {
+    BottomSheet: import("react").ForwardRefExoticComponent<import("@alfalab/core-components-bottom-sheet").BottomSheetProps & import("react").RefAttributes<HTMLDivElement>> | undefined;
+    dataTestId: string | undefined;
+    label: import("react").ReactNode;
+    placeholder: string | undefined;
+    footer: import("react").ReactNode;
+    swipeable: boolean | undefined;
+    showSearch: boolean | undefined;
+    bottomSheetProps: Partial<import("@alfalab/core-components-bottom-sheet").BottomSheetProps> | undefined;
+    isBottomSheet: boolean;
+    nativeSelect: boolean;
+    onScroll: ((event: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
+};
+export { getListBottomSheetMobileProps };

package/cssm/components/base-select/components/list-mobile/helpers/get-list-bottom-sheet-mobile-props.js

@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+// отделяем необходимые пропсы для передачи в компонент
+var getListBottomSheetMobileProps = function (props) {
+    var BottomSheet = props.BottomSheet, dataTestId = props.dataTestId, label = props.label, placeholder = props.placeholder, footer = props.footer, swipeable = props.swipeable, showSearch = props.showSearch, bottomSheetProps = props.bottomSheetProps, _a = props.isBottomSheet, isBottomSheet = _a === void 0 ? true : _a, _b = props.nativeSelect, nativeSelect = _b === void 0 ? false : _b, onScroll = props.onScroll;
+    return {
+        BottomSheet: BottomSheet,
+        dataTestId: dataTestId,
+        label: label,
+        placeholder: placeholder,
+        footer: footer,
+        swipeable: swipeable,
+        showSearch: showSearch,
+        bottomSheetProps: bottomSheetProps,
+        isBottomSheet: isBottomSheet,
+        nativeSelect: nativeSelect,
+        onScroll: onScroll,
+    };
+};
+
+exports.getListBottomSheetMobileProps = getListBottomSheetMobileProps;

package/cssm/components/base-select/components/list-mobile/helpers/get-list-modal-mobile-props.d.ts

@@ -0,0 +1,28 @@
+/// <reference types="react" />
+import { ComponentProps } from "../../../types/component-types";
+declare const getListModalMobileProps: (props: ComponentProps) => {
+    ModalMobile: (import("react").ForwardRefExoticComponent<import("../../../types/component-types").ModalMobileProps & import("react").RefAttributes<HTMLDivElement>> & {
+        Header: import("react").FC<import("@alfalab/core-components-modal/shared").ModalHeaderProps>;
+        Footer: import("react").FC<import("@alfalab/core-components-modal/shared").ModalFooterProps>;
+        Content: import("react").FC<import("../../../types/component-types").ContentProps>;
+    }) | undefined;
+    dataTestId: string | undefined;
+    modalProps: Partial<import("@alfalab/core-components-base-modal").BaseModalProps & {
+        size?: "s" | "m" | "l" | "xl" | 500 | "fullscreen" | 600 | 800 | 1140 | undefined;
+        fullscreen?: boolean | undefined;
+        fixedPosition?: boolean | undefined;
+        hasCloser?: boolean | undefined;
+        iOSLock?: boolean | undefined;
+    } & {
+        breakpoint?: number | undefined;
+        defaultMatchMediaValue?: boolean | (() => boolean) | undefined;
+    } & import("react").RefAttributes<HTMLDivElement>> | undefined;
+    modalHeaderProps: Partial<import("@alfalab/core-components-modal/shared").ModalHeaderProps> | undefined;
+    modalFooterProps: Partial<import("@alfalab/core-components-modal/shared").ModalFooterProps> | undefined;
+    label: import("react").ReactNode;
+    placeholder: string | undefined;
+    isBottomSheet: boolean;
+    nativeSelect: boolean;
+    onScroll: ((event: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
+};
+export { getListModalMobileProps };

package/cssm/components/base-select/components/list-mobile/helpers/get-list-modal-mobile-props.js

@@ -0,0 +1,22 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+// отделяем необходимые пропсы для передачи в компонент
+var getListModalMobileProps = function (props) {
+    var ModalMobile = props.ModalMobile, dataTestId = props.dataTestId, modalProps = props.modalProps, modalHeaderProps = props.modalHeaderProps, modalFooterProps = props.modalFooterProps, label = props.label, placeholder = props.placeholder, _a = props.isBottomSheet, isBottomSheet = _a === void 0 ? true : _a, _b = props.nativeSelect, nativeSelect = _b === void 0 ? false : _b, onScroll = props.onScroll;
+    return {
+        ModalMobile: ModalMobile,
+        dataTestId: dataTestId,
+        modalProps: modalProps,
+        modalHeaderProps: modalHeaderProps,
+        modalFooterProps: modalFooterProps,
+        label: label,
+        placeholder: placeholder,
+        isBottomSheet: isBottomSheet,
+        nativeSelect: nativeSelect,
+        onScroll: onScroll,
+    };
+};
+
+exports.getListModalMobileProps = getListModalMobileProps;

package/cssm/components/base-select/components/list-mobile/helpers/index.d.ts

@@ -0,0 +1,2 @@
+export { getListModalMobileProps } from "./get-list-modal-mobile-props";
+export { getListBottomSheetMobileProps } from "./get-list-bottom-sheet-mobile-props";

package/cssm/components/base-select/components/list-mobile/helpers/index.js

@@ -0,0 +1,11 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var components_baseSelect_components_listMobile_helpers_getListModalMobileProps = require('./get-list-modal-mobile-props.js');
+var components_baseSelect_components_listMobile_helpers_getListBottomSheetMobileProps = require('./get-list-bottom-sheet-mobile-props.js');
+
+
+
+exports.getListModalMobileProps = components_baseSelect_components_listMobile_helpers_getListModalMobileProps.getListModalMobileProps;
+exports.getListBottomSheetMobileProps = components_baseSelect_components_listMobile_helpers_getListBottomSheetMobileProps.getListBottomSheetMobileProps;

package/cssm/components/base-select/components/list-mobile/list-bottom-sheet-mobile.d.ts

@@ -0,0 +1,15 @@
+import { FC, ReactNode, RefObject } from 'react';
+import { OptionShape } from "../../../../typings";
+import { ListBottomSheetMobileRestProps } from "./types/types";
+type ListMobileProps = {
+    open: boolean;
+    menuRef: RefObject<HTMLDivElement>;
+    scrollableContainerRef: RefObject<HTMLDivElement>;
+    flatOptions: OptionShape[];
+    closeMenu: () => void;
+    handleEntered: (node: HTMLElement, isAppearing: boolean) => void;
+    renderSearch: () => ReactNode;
+    renderOptionsList: () => ReactNode;
+} & ListBottomSheetMobileRestProps;
+declare const ListBottomSheetMobile: FC<ListMobileProps>;
+export { ListBottomSheetMobile };

package/cssm/components/base-select/components/list-mobile/list-bottom-sheet-mobile.js

@@ -0,0 +1,29 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var React = require('react');
+var coreComponentsShared = require('@alfalab/core-components-shared/cssm');
+var mobileStyles = require('../../mobile.module.css');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultCompat(React);
+var mobileStyles__default = /*#__PURE__*/_interopDefaultCompat(mobileStyles);
+
+var ListBottomSheetMobile = function (props) {
+    var BottomSheet = props.BottomSheet, dataTestId = props.dataTestId, open = props.open, label = props.label, placeholder = props.placeholder, footer = props.footer, swipeable = props.swipeable, showSearch = props.showSearch, bottomSheetProps = props.bottomSheetProps, menuRef = props.menuRef, scrollableContainerRef = props.scrollableContainerRef, onScroll = props.onScroll, flatOptions = props.flatOptions, closeMenu = props.closeMenu, handleEntered = props.handleEntered, renderSearch = props.renderSearch, renderOptionsList = props.renderOptionsList;
+    if (BottomSheet) {
+        return (React__default.default.createElement(BottomSheet, tslib.__assign({ dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'bottom-sheet'), open: open, className: mobileStyles__default.default.sheet, contentClassName: mobileStyles__default.default.sheetContent, containerClassName: mobileStyles__default.default.sheetContainer, title: label || placeholder, actionButton: footer, stickyHeader: true, hasCloser: true, swipeable: swipeable, initialHeight: showSearch ? 'full' : 'default' }, bottomSheetProps, { sheetContainerRef: menuRef, scrollableContainerRef: scrollableContainerRef, onClose: function () {
+                var _a;
+                closeMenu();
+                (_a = bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.onClose) === null || _a === void 0 ? void 0 : _a.call(bottomSheetProps);
+            }, transitionProps: tslib.__assign(tslib.__assign({}, bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.transitionProps), { onEntered: handleEntered }), bottomAddons: React__default.default.createElement(React__default.default.Fragment, null,
+                renderSearch(),
+                flatOptions.length > 0 && (bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.bottomAddons)), containerProps: tslib.__assign(tslib.__assign({}, bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.containerProps), { onScroll: onScroll }) }), renderOptionsList()));
+    }
+    return null;
+};
+
+exports.ListBottomSheetMobile = ListBottomSheetMobile;