@alfalab/core-components-select 15.2.3 → 16.0.0

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

@@ -2,33 +2,55 @@ import React, { forwardRef, useRef, useMemo, useCallback, useEffect } from 'reac
 import mergeRefs from 'react-merge-refs';
 import { ResizeObserver } from '@juggle/resize-observer';
 import cn from 'classnames';
+import { compute } from 'compute-scroll-into-view';
 import { useMultipleSelection, useCombobox } from 'downshift';
-import { Popover } from '@alfalab/core-components-popover/modern';
-import { getDataTestId } from '@alfalab/core-components-shared/modern';
+import { fnUtils, getDataTestId } from '@alfalab/core-components-shared/modern';
 import { useLayoutEffect_SAFE_FOR_SSR } from '@alfalab/hooks';
-import { defaultAccessor, processOptions, defaultFilterFn } from '../../utils.js';
+import { defaultAccessor, defaultFilterFn, processOptions } from '../../utils.js';
 import { NativeSelect } from '../native-select/Component.js';
 
-const styles = {"component":"select__component_1ba4q","popoverInner":"select__popoverInner_1ba4q","optionsList":"select__optionsList_1ba4q","optionsListBorder":"select__optionsListBorder_1ba4q","nativeSelect":"select__nativeSelect_1ba4q","block":"select__block_1ba4q","emptySearchPlaceholder":"select__emptySearchPlaceholder_1ba4q","search":"select__search_1ba4q"};
+const styles = {"component":"select__component_1fm58","popoverInner":"select__popoverInner_1fm58","optionsListWrapper":"select__optionsListWrapper_1fm58","optionsListBorder":"select__optionsListBorder_1fm58","nativeSelect":"select__nativeSelect_1fm58","block":"select__block_1fm58","emptySearchPlaceholder":"select__emptySearchPlaceholder_1fm58","search":"select__search_1fm58"};
 require('./index.css')
 
+const mobileStyles = {"sheet":"select__sheet_1agfp","sheetContent":"select__sheetContent_1agfp","modalContent":"select__modalContent_1agfp","sheetContainer":"select__sheetContainer_1agfp","optionsListWrapper":"select__optionsListWrapper_1agfp","optionsList":"select__optionsList_1agfp","scrollbar":"select__scrollbar_1agfp","search":"select__search_1agfp","component":"select__component_1agfp","option":"select__option_1agfp","optionGroup":"select__optionGroup_1agfp"};
+require('./mobile.css')
+
 /* eslint-disable no-nested-ternary */
+const itemToString = (option) => (option ? option.key : '');
+const isItemDisabled = (option) => Boolean(option?.disabled);
 const BaseSelect = forwardRef(
 // TODO: 😭
 // eslint-disable-next-line complexity
-({ dataTestId, className, fieldClassName, 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, }, 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 = '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) => {
     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 [searchState, setSearchState] = React.useState('');
     const [search, setSearch] = typeof searchProps?.value === 'string'
         ? [searchProps.value, searchProps.onChange]
         : [searchState, setSearchState];
-    const itemToString = (option) => (option ? option.key : '');
     const accessor = searchProps.accessor || defaultAccessor;
-    const { filteredOptions, flatOptions, selectedOptions } = useMemo(() => processOptions(options, selected, (option) => defaultFilterFn(accessor(option), search)), [accessor, options, search, selected]);
+    const filterFn = searchProps.filterFn || defaultFilterFn;
+    const { filteredOptions, flatOptions, selectedOptions } = useMemo(() => processOptions(options, selected, (option) => filterFn(accessor(option), search)), [filterFn, accessor, options, search, selected]);
+    const scrollIntoView = (node) => {
+        if (!node || view === 'mobile')
+            return;
+        requestAnimationFrame(() => {
+            const actions = compute(node, {
+                boundary: listRef.current,
+                block: 'nearest',
+                scrollMode: 'if-needed',
+            });
+            actions.forEach((action) => {
+                const { el, top } = action;
+                el.scrollTop = top;
+            });
+        });
+    };
     const useMultipleSelectionProps = {
         itemToString,
         onSelectedItemsChange: (changes) => {
@@ -56,13 +78,14 @@ const BaseSelect = forwardRef(
         useMultipleSelectionProps.selectedItems = selectedOptions;
     }
     const { selectedItems, addSelectedItem, setSelectedItems, removeSelectedItem, getDropdownProps, } = useMultipleSelection(useMultipleSelectionProps);
-    const { isOpen: open, getMenuProps, getInputProps, getItemProps, getComboboxProps, getLabelProps, highlightedIndex, toggleMenu, openMenu, setHighlightedIndex, } = useCombobox({
+    const { isOpen: open, getMenuProps, getInputProps, getItemProps, getLabelProps, highlightedIndex, toggleMenu, openMenu, closeMenu, setHighlightedIndex, } = useCombobox({
         id,
         isOpen: openProp,
-        circularNavigation,
         items: flatOptions,
         itemToString,
+        isItemDisabled,
         defaultHighlightedIndex: selectedItems.length === 0 ? -1 : undefined,
+        scrollIntoView,
         onIsOpenChange: (changes) => {
             if (onOpen) {
                 /**
@@ -79,7 +102,7 @@ const BaseSelect = forwardRef(
                 }, 0);
             }
             if (showSearch) {
-                if (changes.isOpen) {
+                if (changes.isOpen && view === 'desktop') {
                     setTimeout(() => {
                         searchRef.current?.focus();
                     }, 0);
@@ -89,14 +112,37 @@ 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 };
+                    }
+                    return changes;
+                case useCombobox.stateChangeTypes.InputKeyDownArrowUp:
+                    if (!circularNavigation && state.highlightedIndex === 0) {
+                        return { ...changes, highlightedIndex: state.highlightedIndex };
+                    }
+                    return changes;
                 case useCombobox.stateChangeTypes.InputKeyDownEnter:
                 case useCombobox.stateChangeTypes.ItemClick:
-                    initiatorRef.current = selectedItem;
-                    if (selectedItem && !selectedItem.disabled) {
+                    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) {
@@ -113,7 +159,7 @@ const BaseSelect = forwardRef(
                     }
                     return {
                         ...changes,
-                        isOpen: !closeOnSelect,
+                        isOpen: !closeOnSelect || (view === 'mobile' && multiple),
                         // при closeOnSelect === false - сохраняем подсвеченный индекс
                         highlightedIndex: state.isOpen && !closeOnSelect
                             ? state.highlightedIndex
@@ -126,6 +172,16 @@ const BaseSelect = forwardRef(
     });
     const menuProps = getMenuProps({ ref: listRef }, { suppressRefError: true });
     const inputProps = getInputProps(getDropdownProps({ ref: mergeRefs([ref, fieldRef]) }));
+    const handleEntered = (node, isAppearing) => {
+        if (showSearch)
+            searchRef.current?.focus();
+        if (isBottomSheet) {
+            bottomSheetProps?.transitionProps?.onEntered?.(node, isAppearing);
+        }
+        else {
+            modalProps?.transitionProps?.onEntered?.(node, isAppearing);
+        }
+    };
     const handleFieldFocus = (event) => {
         if (onFocus)
             onFocus(event);
@@ -134,15 +190,19 @@ const BaseSelect = forwardRef(
         }
     };
     const handleFieldBlur = (event) => {
-        const isNextFocusInsideList = listRef.current?.contains((event.relatedTarget || document.activeElement));
-        if (!isNextFocusInsideList) {
-            if (onBlur)
-                onBlur(event);
-            inputProps.onBlur(event);
+        if (view === 'desktop') {
+            const isNextFocusInsideList = listRef.current?.contains((event.relatedTarget || document.activeElement));
+            if (!isNextFocusInsideList) {
+                if (onBlur)
+                    onBlur(event);
+                inputProps.onBlur?.(event);
+            }
         }
+        if (view === 'mobile' && !open && onBlur)
+            onBlur(event);
     };
     const handleFieldKeyDown = (event) => {
-        inputProps.onKeyDown(event);
+        inputProps.onKeyDown?.(event);
         // https://caniuse.com/?search=KeyboardEvent.key
         const isKeyUnsupported = event.key === 'Unidentified';
         if (autocomplete &&
@@ -175,13 +235,15 @@ const BaseSelect = forwardRef(
         // eslint-disable-next-line
         [...event.target.options].reduce((acc, option, index) => option.selected ? acc.concat(flatOptions[index]) : acc, []));
     }, [flatOptions, setSelectedItems]);
-    const getOptionProps = useCallback((option, index) => ({
+    const getOptionProps = (option, index) => ({
         ...optionProps,
-        className: optionClassName,
+        mobile: view === 'mobile',
+        className: cn(optionClassName, {
+            [mobileStyles.option]: view === 'mobile',
+        }),
         innerProps: getItemProps({
             index,
             item: option,
-            disabled: option.disabled,
             onMouseDown: (event) => event.preventDefault(),
         }),
         multiple,
@@ -192,16 +254,7 @@ const BaseSelect = forwardRef(
         highlighted: index === highlightedIndex,
         selected: selectedItems.some(({ key }) => key === option.key),
         dataTestId: getDataTestId(dataTestId, 'option'),
-    }), [
-        dataTestId,
-        getItemProps,
-        highlightedIndex,
-        multiple,
-        optionClassName,
-        optionProps,
-        optionsSize,
-        selectedItems,
-    ]);
+    });
     useEffect(() => {
         if (defaultOpen)
             openMenu();
@@ -213,7 +266,7 @@ const BaseSelect = forwardRef(
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     const calcOptionsListWidth = useCallback(() => {
-        if (listRef.current) {
+        if (view === 'desktop' && listRef.current) {
             const widthAttr = optionsListWidth === 'field' ? 'width' : 'minWidth';
             const optionsListMinWidth = rootRef.current
                 ? rootRef.current.getBoundingClientRect().width
@@ -221,43 +274,36 @@ const BaseSelect = forwardRef(
             listRef.current.setAttribute('style', '');
             listRef.current.style[widthAttr] = `${optionsListMinWidth}px`;
         }
-    }, [optionsListWidth]);
+    }, [view, optionsListWidth]);
     useEffect(() => {
-        const ResizeObserver$1 = window.ResizeObserver || ResizeObserver;
-        const observer = new ResizeObserver$1(calcOptionsListWidth);
-        if (rootRef.current) {
-            observer.observe(rootRef.current);
+        if (view === 'desktop') {
+            const ResizeObserver$1 = window.ResizeObserver || ResizeObserver;
+            const observer = new ResizeObserver$1(calcOptionsListWidth);
+            if (rootRef.current) {
+                observer.observe(rootRef.current);
+            }
+            return () => {
+                observer.disconnect();
+            };
         }
-        return () => {
-            observer.disconnect();
-        };
-    }, [calcOptionsListWidth, open, optionsListWidth]);
+        return fnUtils.noop;
+    }, [view, calcOptionsListWidth, open, optionsListWidth]);
     useLayoutEffect_SAFE_FOR_SSR(calcOptionsListWidth, [
         open,
         optionsListWidth,
         filteredOptions,
         selectedItems,
     ]);
-    const renderValue = useCallback(() => selectedItems.map((option) => (React.createElement("input", { type: 'hidden', name: name, value: option.key, key: option.key }))), [selectedItems, name]);
-    const renderNativeSelect = useCallback(() => {
+    const renderValue = () => selectedItems.map((option) => (React.createElement("input", { type: 'hidden', name: name, value: option.key, key: option.key })));
+    const renderNativeSelect = () => {
         const value = multiple
             ? selectedItems.map((option) => option.key)
             : (selectedItems[0] || {}).key;
         return (React.createElement(NativeSelect, { ...menuProps, className: styles.nativeSelect, disabled: disabled, multiple: multiple, name: name, value: value, onChange: handleNativeSelectChange, options: filteredOptions }));
-    }, [
-        multiple,
-        selectedItems,
-        disabled,
-        name,
-        handleNativeSelectChange,
-        filteredOptions,
-        menuProps,
-    ]);
-    const { header, emptyPlaceholder } = optionsListProps;
-    const renderOptionsListHeader = () => {
-        if (!showSearch && !header) {
+    };
+    const renderSearch = () => {
+        if (!showSearch)
             return null;
-        }
         const handleClear = (event) => {
             setSearch?.('');
             searchProps?.componentProps?.onClear?.(event);
@@ -266,12 +312,21 @@ const BaseSelect = forwardRef(
             setSearch?.(payload.value);
             searchProps?.componentProps?.onChange?.(event, payload);
         };
-        return (React.createElement(React.Fragment, null,
-            header,
-            showSearch && (React.createElement(Search, { ...searchProps?.componentProps, value: search, onChange: handleChange, dataTestId: getDataTestId(dataTestId, 'search'), onClear: handleClear, className: cn(styles.search, searchProps?.componentProps?.className), ref: searchRef }))));
+        return (React.createElement(Search, { ...searchProps?.componentProps, value: search, onChange: handleChange, dataTestId: getDataTestId(dataTestId, 'search'), onClear: handleClear, className: cn(searchProps?.componentProps?.className, {
+                [styles.search]: view === 'desktop',
+                [mobileStyles.search]: view === 'mobile',
+            }), ref: mergeRefs([searchRef, searchProps?.componentProps?.ref || null]) }));
     };
-    const needRenderOptionsList = flatOptions.length > 0 || showEmptyOptionsList || showSearch;
-    const renderEmptyPlaceholder = useCallback(() => {
+    const { header, emptyPlaceholder } = optionsListProps;
+    const renderOptionsListHeader = () => {
+        if (header || (view === 'desktop' && showSearch)) {
+            return (React.createElement(React.Fragment, null,
+                header,
+                view === 'desktop' && renderSearch()));
+        }
+        return null;
+    };
+    const renderEmptyPlaceholder = () => {
         if (emptyPlaceholder) {
             return emptyPlaceholder;
         }
@@ -279,19 +334,71 @@ const BaseSelect = forwardRef(
             return React.createElement("div", { className: styles.emptySearchPlaceholder }, "\u041D\u0438\u0447\u0435\u0433\u043E \u043D\u0435 \u043D\u0430\u0448\u043B\u043E\u0441\u044C");
         }
         return undefined;
-    }, [emptyPlaceholder, showSearch]);
-    return (React.createElement("div", { ...getComboboxProps({
-            ref: rootRef,
-            ...(disabled && { 'aria-disabled': true }),
-            className: cn(styles.component, { [styles.block]: block }, className),
-        }), onKeyDown: disabled ? undefined : handleFieldKeyDown, tabIndex: -1, "data-test-id": getDataTestId(dataTestId) },
+    };
+    const renderOptionsList = () => {
+        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) },
+            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 }),
+            view === 'desktop' && React.createElement("div", { className: styles.optionsListBorder })));
+    };
+    const renderInPopover = () => {
+        if (!nativeSelect && Popover) {
+            return (React.createElement(Popover, { open: open, withTransition: false, anchorElement: fieldRef.current, position: popoverPosition, preventFlip: preventFlip, popperClassName: cn(styles.popoverInner, popperClassName), update: updatePopover, zIndex: zIndexPopover }, renderOptionsList()));
+        }
+        return null;
+    };
+    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: () => {
+                    closeMenu();
+                    bottomSheetProps?.onClose?.();
+                }, transitionProps: {
+                    ...bottomSheetProps?.transitionProps,
+                    onEntered: handleEntered,
+                }, bottomAddons: React.createElement(React.Fragment, null,
+                    renderSearch(),
+                    bottomSheetProps?.bottomAddons), containerProps: {
+                    ...bottomSheetProps?.containerProps,
+                    onScroll,
+                } }, renderOptionsList()));
+        }
+        return null;
+    };
+    const renderInModalMobile = () => {
+        if (!nativeSelect && ModalMobile) {
+            return (React.createElement(ModalMobile, { open: open, hasCloser: true, ...modalProps, onClose: (...args) => {
+                    closeMenu();
+                    modalProps?.onClose?.(...args);
+                }, contentClassName: cn(mobileStyles.sheetContent, modalProps?.contentClassName), ref: mergeRefs([
+                    scrollableContainerRef,
+                    modalProps?.ref,
+                ]), wrapperProps: {
+                    ...modalProps?.wrapperProps,
+                    onScroll,
+                }, transitionProps: {
+                    ...modalProps?.transitionProps,
+                    onEntered: handleEntered,
+                } },
+                React.createElement(ModalMobile.Header, { hasCloser: true, sticky: true, ...modalHeaderProps, title: undefined, bottomAddons: React.createElement(React.Fragment, null,
+                        renderSearch(),
+                        modalHeaderProps?.bottomAddons) }, modalHeaderProps?.title || label || placeholder),
+                React.createElement(ModalMobile.Content, { flex: true, className: mobileStyles.modalContent }, renderOptionsList()),
+                modalFooterProps?.children && React.createElement(ModalMobile.Footer, { ...modalFooterProps })));
+        }
+        return null;
+    };
+    return (React.createElement("div", { ...(disabled && { 'aria-disabled': true }), "aria-expanded": inputProps['aria-expanded'], "aria-haspopup": 'listbox', role: inputProps.role, className: cn(styles.component, { [styles.block]: block }, className), ref: rootRef, onKeyDown: disabled ? undefined : handleFieldKeyDown, tabIndex: -1, "data-test-id": getDataTestId(dataTestId) },
         nativeSelect && renderNativeSelect(),
         React.createElement(Field, { selectedMultiple: selectedItems, selected: selectedItems[0], setSelectedItems: setSelectedItems, toggleMenu: toggleMenu, multiple: multiple, open: open, disabled: disabled, size: size, placeholder: placeholder, label: label && React.createElement("span", { ...getLabelProps() }, label), labelView: labelView, Arrow: Arrow && React.createElement(Arrow, { open: open }), error: error, hint: hint, valueRenderer: valueRenderer, className: fieldClassName, innerProps: {
                 onBlur: handleFieldBlur,
                 onFocus: disabled ? undefined : handleFieldFocus,
                 onClick: disabled ? undefined : handleFieldClick,
                 tabIndex: disabled ? undefined : nativeSelect ? -1 : 0,
-                ref: mergeRefs([inputProps.ref]),
+                ref: inputProps.ref,
                 id: inputProps.id,
                 'aria-labelledby': inputProps['aria-labelledby'],
                 'aria-controls': inputProps['aria-controls'],
@@ -300,9 +407,9 @@ const BaseSelect = forwardRef(
                     : undefined,
             }, dataTestId: getDataTestId(dataTestId, 'field'), ...fieldProps }),
         name && !nativeSelect && renderValue(),
-        !nativeSelect && (React.createElement(Popover, { open: open, withTransition: false, anchorElement: fieldRef.current, position: popoverPosition, preventFlip: preventFlip, popperClassName: cn(styles.popoverInner, popperClassName), update: updatePopover, zIndex: zIndexPopover }, needRenderOptionsList && (React.createElement("div", { ...menuProps, className: cn(optionsListClassName, styles.optionsList) },
-            React.createElement(OptionsList, { ...optionsListProps, setHighlightedIndex: setHighlightedIndex, 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: visibleOptions, onScroll: onScroll, dataTestId: getDataTestId(dataTestId, 'options-list'), header: renderOptionsListHeader(), emptyPlaceholder: renderEmptyPlaceholder() }),
-            React.createElement("div", { className: styles.optionsListBorder })))))));
+        view === 'desktop' && renderInPopover(),
+        view === 'mobile' && isBottomSheet && renderInBottomSheet(),
+        view === 'mobile' && !isBottomSheet && renderInModalMobile()));
 });
 
 export { BaseSelect };

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

@@ -1,8 +1,8 @@
-/* hash: 1hb7x */
+/* hash: 1wi9e */
 :root {
 } /* deprecated */ :root {
     --color-light-bg-primary: #fff;
-    --color-light-border-secondary: #e9e9eb; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+    --color-light-border-secondary: #e7e8ec; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* 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 {
 } :root {
@@ -37,12 +37,12 @@
     /* checkmark */
 
     /* optgroup */
-} .select__component_1ba4q {
+} .select__component_1fm58 {
     width: max-content;
     position: relative;
     outline: 0;
     max-width: 100%;
-} .select__popoverInner_1ba4q {
+} .select__popoverInner_1fm58 {
     padding-top: var(--select-options-list-offset);
     padding-bottom: var(--select-options-list-offset);
     box-shadow: none;
@@ -50,7 +50,7 @@
     background: transparent;
     border-radius: 0;
     position: relative;
-} .select__optionsList_1ba4q {
+} .select__optionsListWrapper_1fm58 {
     position: relative;
     padding-top: var(--select-options-list-top-padding);
     padding-bottom: var(--select-options-list-bottom-padding);
@@ -59,7 +59,7 @@
     background: var(--select-option-background);
     overflow: hidden;
     will-change: transform;
-} .select__optionsListBorder_1ba4q {
+} .select__optionsListBorder_1fm58 {
     position: absolute;
     top: 0;
     right: 0;
@@ -68,7 +68,7 @@
     box-shadow: inset 0 0 0 1px var(--color-light-border-secondary);
     border-radius: inherit;
     pointer-events: none;
-} .select__nativeSelect_1ba4q {
+} .select__nativeSelect_1fm58 {
     opacity: 0;
     overflow: hidden;
     position: absolute;
@@ -81,16 +81,16 @@
     height: 100%;
     cursor: pointer;
     z-index: 1;
-} .select__block_1ba4q {
+} .select__block_1fm58 {
     width: 100%;
-} .select__emptySearchPlaceholder_1ba4q {
+} .select__emptySearchPlaceholder_1fm58 {
     text-align: center;
-} .select__search_1ba4q {
+} .select__search_1fm58 {
     margin: var(--gap-s) var(--gap-s) 0
-} .select__search_1ba4q:last-child {
+} .select__search_1fm58:last-child {
         margin-bottom: var(--gap-s);
     } /* width: max-content; fix for IE */ @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    .select__component_1ba4q {
+    .select__component_1fm58 {
         float: left;
         clear: left;
     }

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

@@ -3,8 +3,8 @@ import 'react';
 import 'react-merge-refs';
 import '@juggle/resize-observer';
 import 'classnames';
+import 'compute-scroll-into-view';
 import 'downshift';
-import '@alfalab/core-components-popover/modern';
 import '@alfalab/core-components-shared/modern';
 import '@alfalab/hooks';
 import '../../utils.js';

package/modern/components/{base-select-mobile/index.css → base-select/mobile.css}

@@ -1,4 +1,4 @@
-/* hash: 1qv48 */
+/* hash: 1ocl5 */
 :root {
 } /* 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 */
@@ -27,44 +27,35 @@
     /* checkmark */
 
     /* optgroup */
-} .select__component_r2ukf {
-    width: max-content;
-    position: relative;
-    outline: 0;
-    max-width: 100%;
-} .select__sheet_r2ukf {
+} .select__sheet_1agfp {
     overflow: hidden;
-} .select__sheetContent_r2ukf {
+} .select__sheetContent_1agfp {
     padding: 0
-} .select__sheetContent_r2ukf .select__modalContent_r2ukf {
+} .select__sheetContent_1agfp .select__modalContent_1agfp {
         padding: 0;
         display: flex;
         flex-direction: column;
-    } .select__sheetContainer_r2ukf {
+    } .select__sheetContainer_1agfp {
     padding: 0;
-} .select__block_r2ukf {
-    width: 100%;
-} .select__optionsListWrapper_r2ukf {
+} .select__optionsListWrapper_1agfp {
     flex: 1;
-} .select__optionsList_r2ukf {
+} .select__optionsList_1agfp {
     height: 100%;
     display: flex;
     flex-direction: column;
-} .select__scrollbar_r2ukf {
+} .select__scrollbar_1agfp {
     flex: 1;
-} .select__emptySearchPlaceholder_r2ukf {
-    text-align: center;
-} .select__search_r2ukf {
+} .select__search_1agfp {
     padding: var(--gap-xs);
 } /* width: max-content; fix for IE */ @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    .select__component_r2ukf {
+    .select__component_1agfp {
         float: left;
         clear: left;
     }
-} .select__option_r2ukf {
+} .select__option_1agfp {
     padding: var(--gap-2xs) var(--gap-l) var(--gap-2xs) var(--gap-m)
-} .select__option_r2ukf:before {
+} .select__option_1agfp:before {
         display: none;
-    } .select__optionGroup_r2ukf {
+    } .select__optionGroup_1agfp {
     padding: var(--gap-m) var(--gap-m) var(--gap-xs);
 }

package/modern/components/checkmark/Component.js

@@ -5,7 +5,7 @@ import { Checkbox } from '@alfalab/core-components-checkbox/modern';
 import { CheckmarkCircleMIcon } from '@alfalab/icons-glyph/CheckmarkCircleMIcon';
 import CheckmarkMIcon from '@alfalab/icons-glyph/CheckmarkMIcon';
 
-const styles = {"checkmark":"select__checkmark_qy8ro","after":"select__after_qy8ro","single":"select__single_qy8ro","selected":"select__selected_qy8ro","before":"select__before_qy8ro","multiple":"select__multiple_qy8ro","colorIcon":"select__colorIcon_qy8ro"};
+const styles = {"checkmark":"select__checkmark_1cgjn","after":"select__after_1cgjn","single":"select__single_1cgjn","selected":"select__selected_1cgjn","before":"select__before_1cgjn","multiple":"select__multiple_1cgjn","colorIcon":"select__colorIcon_1cgjn"};
 require('./index.css')
 
 const Checkmark = ({ selected, disabled = false, className, multiple, position = 'before', }) => {

package/modern/components/checkmark/index.css

@@ -1,7 +1,7 @@
-/* hash: qm43x */
+/* hash: 6digy */
 :root {
 } /* deprecated */ :root {
-    --color-light-graphic-positive: #2fc26e;
+    --color-light-graphic-positive: #0cc44d;
     --color-light-graphic-primary: #0e0e0e; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* 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 {
@@ -39,12 +39,12 @@
     --select-checkmark-border-radius: var(--border-radius-circle);
 
     /* optgroup */
-} .select__checkmark_qy8ro {
+} .select__checkmark_1cgjn {
     flex-shrink: 0;
     margin: var(--select-checkmark-margin)
-} .select__checkmark_qy8ro.select__after_qy8ro {
+} .select__checkmark_1cgjn.select__after_1cgjn {
         margin: var(--select-checkmark-margin-after);
-    } .select__single_qy8ro {
+    } .select__single_1cgjn {
     display: flex;
     align-items: center;
     justify-content: center;
@@ -54,17 +54,17 @@
     border-radius: var(--select-checkmark-border-radius);
     width: var(--select-checkmark-size);
     height: var(--select-checkmark-size)
-} .select__single_qy8ro.select__selected_qy8ro {
+} .select__single_1cgjn.select__selected_1cgjn {
         opacity: 1;
-    } .select__before_qy8ro {
+    } .select__before_1cgjn {
     display: var(--select-checkmark-before-display)
-} .select__before_qy8ro.select__multiple_qy8ro {
+} .select__before_1cgjn.select__multiple_1cgjn {
         margin-right: var(--gap-s);
         display: var(--select-checkmark-before-display-multiple);
-    } .select__after_qy8ro {
+    } .select__after_1cgjn {
     display: var(--select-checkmark-after-display)
-} .select__after_qy8ro.select__single_qy8ro {
+} .select__after_1cgjn.select__single_1cgjn {
         display: var(--select-checkmark-after-display-single);
-    } .select__colorIcon_qy8ro {
+    } .select__colorIcon_1cgjn {
     color: var(--color-light-graphic-positive);
 }

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

@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import { CheckmarkMIcon } from '@alfalab/icons-glyph/CheckmarkMIcon';
 
-const styles = {"checkmark":"select__checkmark_zigdo","selected":"select__selected_zigdo","displayIcon":"select__displayIcon_zigdo","displayBadge":"select__displayBadge_zigdo"};
+const styles = {"checkmark":"select__checkmark_vlb6e","selected":"select__selected_vlb6e","displayIcon":"select__displayIcon_vlb6e","displayBadge":"select__displayBadge_vlb6e"};
 require('./index.css')
 
 const Checkmark = ({ selected, className }) => (React.createElement("div", { className: cn(styles.checkmark, className, {