@alfalab/core-components 44.7.0-beta.0 → 44.7.0-beta.1

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

@@ -35,7 +35,6 @@ function (_a, ref) {
     var listRef = React.useRef(null);
     var initiatorRef = React.useRef(null);
     var searchRef = React.useRef(null);
-    var alreadyClickedRef = React.useRef(false);
     var scrollableContainerRef = React.useRef(null);
     var onOpenRef = React.useRef(onOpen);
     var _3 = React__default.default.useState(''), searchState = _3[0], setSearchState = _3[1];
@@ -96,6 +95,24 @@ function (_a, ref) {
         isItemDisabled: isItemDisabled,
         defaultHighlightedIndex: selectedItems.length === 0 ? -1 : undefined,
         scrollIntoView: scrollIntoView,
+        onSelectedItemChange: function (changes) {
+            var selectedItem = changes.selectedItem || initiatorRef.current;
+            if (selectedItem && !selectedItem.disabled) {
+                var alreadySelected = selectedItems.includes(selectedItem);
+                var allowRemove = allowUnselect || (multiple && selectedItems.length > 1);
+                if (alreadySelected && allowRemove) {
+                    removeSelectedItem(selectedItem);
+                }
+                if (!alreadySelected) {
+                    if (multiple) {
+                        addSelectedItem(selectedItem);
+                    }
+                    else {
+                        setSelectedItems([selectedItem]);
+                    }
+                }
+            }
+        },
         onIsOpenChange: function (changes) {
             if (onOpenRef.current) {
                 /**
@@ -124,16 +141,9 @@ function (_a, ref) {
                 }
             }
         },
-        // eslint-disable-next-line complexity
         stateReducer: function (state, actionAndChanges) {
             var type = actionAndChanges.type, changes = actionAndChanges.changes;
-            var selectedItem = changes.selectedItem;
             switch (type) {
-                case downshift.useCombobox.stateChangeTypes.InputBlur:
-                    if (view === 'mobile') {
-                        return state;
-                    }
-                    return changes;
                 case downshift.useCombobox.stateChangeTypes.InputKeyDownArrowDown:
                     if (!circularNavigation && state.highlightedIndex === options.length - 1) {
                         return tslib.__assign(tslib.__assign({}, changes), { highlightedIndex: state.highlightedIndex });
@@ -145,42 +155,36 @@ function (_a, ref) {
                     }
                     return changes;
                 case downshift.useCombobox.stateChangeTypes.InputKeyDownEnter:
-                case downshift.useCombobox.stateChangeTypes.ItemClick:
+                case downshift.useCombobox.stateChangeTypes.ItemClick: {
+                    var selectedItem = changes.selectedItem;
                     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__default.default.version.indexOf('18') === 0) {
-                            alreadyClickedRef.current = true;
-                            setTimeout(function () {
-                                alreadyClickedRef.current = false;
-                            });
-                        }
-                        var alreadySelected = selectedItems.includes(selectedItem);
-                        var allowRemove = allowUnselect || (multiple && selectedItems.length > 1);
-                        if (alreadySelected && allowRemove) {
-                            removeSelectedItem(selectedItem);
-                        }
-                        if (!alreadySelected) {
-                            if (multiple) {
-                                addSelectedItem(selectedItem);
-                            }
-                            else {
-                                setSelectedItems([selectedItem]);
-                            }
-                        }
-                    }
-                    return tslib.__assign(tslib.__assign({}, changes), { isOpen: !closeOnSelect || (view === 'mobile' && multiple), 
+                    return tslib.__assign(tslib.__assign({}, 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;
             }
         },
     }), open = _7.isOpen, getMenuProps = _7.getMenuProps, getInputProps = _7.getInputProps, getItemProps = _7.getItemProps, getLabelProps = _7.getLabelProps, highlightedIndex = _7.highlightedIndex, toggleMenu = _7.toggleMenu, openMenu = _7.openMenu, closeMenu = _7.closeMenu, setHighlightedIndex = _7.setHighlightedIndex;
-    var menuProps = getMenuProps({ ref: listRef }, { suppressRefError: true });
+    React.useEffect(function () {
+        /*
+         * При изменении openProp, состояние внутри downshift в useEnhancedReducer не меняется, поэтому меняем его таким способом
+         * Скорее всего это исправят в будущих версиях downshift
+         */
+        if (openProp !== undefined) {
+            if (openProp) {
+                openMenu();
+            }
+            else {
+                closeMenu();
+            }
+        }
+    }, [openProp, openMenu, closeMenu]);
     var inputProps = getInputProps(getDropdownProps({ ref: mergeRefs__default.default([ref, fieldRef]) }));
+    var _8 = getMenuProps({ ref: listRef }, { suppressRefError: true }), menuRef = _8.ref, menuProps = tslib.__rest(_8, ["ref"]);
     var handleEntered = function (node, isAppearing) {
         var _a, _b, _c, _d, _e;
         if (showSearch)
@@ -331,7 +335,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 _8 = optionsListProps, header = _8.header, emptyPlaceholder = _8.emptyPlaceholder;
+    var _9 = optionsListProps, header = _9.header, emptyPlaceholder = _9.emptyPlaceholder;
     var renderOptionsListHeader = function () {
         if (header || (view === 'desktop' && showSearch)) {
             return (React__default.default.createElement(React__default.default.Fragment, null,
@@ -354,7 +358,7 @@ function (_a, ref) {
         if (flatOptions.length === 0 && !showEmptyOptionsList && !showSearch)
             return null;
         var listProps = optionsListProps;
-        return (React__default.default.createElement("div", tslib.__assign({}, menuProps, { className: cn__default.default(optionsListClassName, view === 'mobile' && mobileStyles__default.default.optionsListWrapper, view === 'desktop' && styles__default.default.optionsListWrapper) }),
+        return (React__default.default.createElement("div", tslib.__assign({}, menuProps, { ref: view === 'desktop' ? menuRef : undefined, className: cn__default.default(optionsListClassName, view === 'mobile' && mobileStyles__default.default.optionsListWrapper, view === 'desktop' && styles__default.default.optionsListWrapper) }),
             React__default.default.createElement(OptionsList, tslib.__assign({}, listProps, { ref: view === 'desktop' ? listProps.ref : scrollableContainerRef, setHighlightedIndex: view === 'desktop' ? setHighlightedIndex : undefined, className: cn__default.default((_a = {}, _a[mobileStyles__default.default.optionsList] = view === 'mobile', _a)), scrollbarClassName: cn__default.default((_b = {}, _b[mobileStyles__default.default.scrollbar] = view === 'mobile', _b)), 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: coreComponentsShared.getDataTestId(dataTestId, 'options-list'), header: renderOptionsListHeader(), optionGroupClassName: cn__default.default(optionGroupClassName, (_c = {},
                     _c[mobileStyles__default.default.optionGroup] = view === 'mobile',
                     _c)), emptyPlaceholder: renderEmptyPlaceholder(), onScroll: onScroll })),
@@ -368,7 +372,7 @@ function (_a, ref) {
     };
     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, { scrollableContainerRef: scrollableContainerRef, onClose: function () {
+            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);
@@ -380,7 +384,7 @@ function (_a, ref) {
     };
     var renderInModalMobile = function () {
         if (!nativeSelect && ModalMobile) {
-            return (React__default.default.createElement(ModalMobile, tslib.__assign({ dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'modal'), open: open, hasCloser: true }, modalProps, { onClose: function () {
+            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++) {

package/select/esm/Component.responsive.js

@@ -41,7 +41,7 @@ import '../../base-modal/esm';
 import '../../button/esm/mobile';
 import './components/virtual-options-list/Component.js';
 import 'react-virtual';
-import './hook-65049d00.js';
+import './hook-70d4d250.js';
 import './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../button/esm/desktop';
 import './presets/useSelectWithApply/options-list-with-apply/header/Component.js';

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

@@ -1,5 +1,5 @@
-import { __assign, __spreadArray } from 'tslib';
-import React, { forwardRef, useRef, useMemo, useCallback, useEffect } from 'react';
+import { __assign, __rest, __spreadArray } from 'tslib';
+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';
@@ -29,7 +29,6 @@ function (_a, ref) {
     var listRef = useRef(null);
     var initiatorRef = useRef(null);
     var searchRef = useRef(null);
-    var alreadyClickedRef = useRef(false);
     var scrollableContainerRef = useRef(null);
     var onOpenRef = useRef(onOpen);
     var _3 = React.useState(''), searchState = _3[0], setSearchState = _3[1];
@@ -90,6 +89,24 @@ function (_a, ref) {
         isItemDisabled: isItemDisabled,
         defaultHighlightedIndex: selectedItems.length === 0 ? -1 : undefined,
         scrollIntoView: scrollIntoView,
+        onSelectedItemChange: function (changes) {
+            var selectedItem = changes.selectedItem || initiatorRef.current;
+            if (selectedItem && !selectedItem.disabled) {
+                var alreadySelected = selectedItems.includes(selectedItem);
+                var allowRemove = allowUnselect || (multiple && selectedItems.length > 1);
+                if (alreadySelected && allowRemove) {
+                    removeSelectedItem(selectedItem);
+                }
+                if (!alreadySelected) {
+                    if (multiple) {
+                        addSelectedItem(selectedItem);
+                    }
+                    else {
+                        setSelectedItems([selectedItem]);
+                    }
+                }
+            }
+        },
         onIsOpenChange: function (changes) {
             if (onOpenRef.current) {
                 /**
@@ -118,16 +135,9 @@ function (_a, ref) {
                 }
             }
         },
-        // eslint-disable-next-line complexity
         stateReducer: function (state, actionAndChanges) {
             var type = actionAndChanges.type, changes = actionAndChanges.changes;
-            var selectedItem = changes.selectedItem;
             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 __assign(__assign({}, changes), { highlightedIndex: state.highlightedIndex });
@@ -139,42 +149,36 @@ function (_a, ref) {
                     }
                     return changes;
                 case useCombobox.stateChangeTypes.InputKeyDownEnter:
-                case useCombobox.stateChangeTypes.ItemClick:
+                case useCombobox.stateChangeTypes.ItemClick: {
+                    var selectedItem = changes.selectedItem;
                     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(function () {
-                                alreadyClickedRef.current = false;
-                            });
-                        }
-                        var alreadySelected = selectedItems.includes(selectedItem);
-                        var allowRemove = allowUnselect || (multiple && selectedItems.length > 1);
-                        if (alreadySelected && allowRemove) {
-                            removeSelectedItem(selectedItem);
-                        }
-                        if (!alreadySelected) {
-                            if (multiple) {
-                                addSelectedItem(selectedItem);
-                            }
-                            else {
-                                setSelectedItems([selectedItem]);
-                            }
-                        }
-                    }
-                    return __assign(__assign({}, changes), { isOpen: !closeOnSelect || (view === 'mobile' && multiple), 
+                    return __assign(__assign({}, 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;
             }
         },
     }), open = _7.isOpen, getMenuProps = _7.getMenuProps, getInputProps = _7.getInputProps, getItemProps = _7.getItemProps, getLabelProps = _7.getLabelProps, highlightedIndex = _7.highlightedIndex, toggleMenu = _7.toggleMenu, openMenu = _7.openMenu, closeMenu = _7.closeMenu, setHighlightedIndex = _7.setHighlightedIndex;
-    var menuProps = getMenuProps({ ref: listRef }, { suppressRefError: true });
+    useEffect(function () {
+        /*
+         * При изменении openProp, состояние внутри downshift в useEnhancedReducer не меняется, поэтому меняем его таким способом
+         * Скорее всего это исправят в будущих версиях downshift
+         */
+        if (openProp !== undefined) {
+            if (openProp) {
+                openMenu();
+            }
+            else {
+                closeMenu();
+            }
+        }
+    }, [openProp, openMenu, closeMenu]);
     var inputProps = getInputProps(getDropdownProps({ ref: mergeRefs([ref, fieldRef]) }));
+    var _8 = getMenuProps({ ref: listRef }, { suppressRefError: true }), menuRef = _8.ref, menuProps = __rest(_8, ["ref"]);
     var handleEntered = function (node, isAppearing) {
         var _a, _b, _c, _d, _e;
         if (showSearch)
@@ -325,7 +329,7 @@ function (_a, ref) {
                 _a[mobileStyles.search] = view === 'mobile',
                 _a)), ref: mergeRefs([searchRef, ((_c = searchProps === null || searchProps === void 0 ? void 0 : searchProps.componentProps) === null || _c === void 0 ? void 0 : _c.ref) || null]) })));
     };
-    var _8 = optionsListProps, header = _8.header, emptyPlaceholder = _8.emptyPlaceholder;
+    var _9 = optionsListProps, header = _9.header, emptyPlaceholder = _9.emptyPlaceholder;
     var renderOptionsListHeader = function () {
         if (header || (view === 'desktop' && showSearch)) {
             return (React.createElement(React.Fragment, null,
@@ -348,7 +352,7 @@ function (_a, ref) {
         if (flatOptions.length === 0 && !showEmptyOptionsList && !showSearch)
             return null;
         var listProps = optionsListProps;
-        return (React.createElement("div", __assign({}, menuProps, { className: cn(optionsListClassName, view === 'mobile' && mobileStyles.optionsListWrapper, view === 'desktop' && styles.optionsListWrapper) }),
+        return (React.createElement("div", __assign({}, menuProps, { ref: view === 'desktop' ? menuRef : undefined, className: cn(optionsListClassName, view === 'mobile' && mobileStyles.optionsListWrapper, view === 'desktop' && styles.optionsListWrapper) }),
             React.createElement(OptionsList, __assign({}, listProps, { ref: view === 'desktop' ? listProps.ref : scrollableContainerRef, setHighlightedIndex: view === 'desktop' ? setHighlightedIndex : undefined, className: cn((_a = {}, _a[mobileStyles.optionsList] = view === 'mobile', _a)), scrollbarClassName: cn((_b = {}, _b[mobileStyles.scrollbar] = view === 'mobile', _b)), 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, (_c = {},
                     _c[mobileStyles.optionGroup] = view === 'mobile',
                     _c)), emptyPlaceholder: renderEmptyPlaceholder(), onScroll: onScroll })),
@@ -362,7 +366,7 @@ function (_a, ref) {
     };
     var renderInBottomSheet = function () {
         if (!nativeSelect && BottomSheet) {
-            return (React.createElement(BottomSheet, __assign({ 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: function () {
+            return (React.createElement(BottomSheet, __assign({ 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: function () {
                     var _a;
                     closeMenu();
                     (_a = bottomSheetProps === null || bottomSheetProps === void 0 ? void 0 : bottomSheetProps.onClose) === null || _a === void 0 ? void 0 : _a.call(bottomSheetProps);
@@ -374,7 +378,7 @@ function (_a, ref) {
     };
     var renderInModalMobile = function () {
         if (!nativeSelect && ModalMobile) {
-            return (React.createElement(ModalMobile, __assign({ dataTestId: getDataTestId(dataTestId, 'modal'), open: open, hasCloser: true }, modalProps, { onClose: function () {
+            return (React.createElement(ModalMobile, __assign({ dataTestId: getDataTestId(dataTestId, 'modal'), open: open, hasCloser: true }, modalProps, { componentRef: menuRef, onClose: function () {
                     var _a;
                     var args = [];
                     for (var _i = 0; _i < arguments.length; _i++) {

package/select/esm/index.js

@@ -41,7 +41,7 @@ import '../../base-modal/esm';
 import '../../button/esm/mobile';
 import './components/virtual-options-list/Component.js';
 import 'react-virtual';
-import './hook-65049d00.js';
+import './hook-70d4d250.js';
 import './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../button/esm/desktop';
 import './presets/useSelectWithApply/options-list-with-apply/header/Component.js';

package/select/esm/mobile/Component.mobile.js

@@ -12,7 +12,7 @@ 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-65049d00.js';
+import { u as useSelectWithApply } from '../hook-70d4d250.js';
 import { Header } from '../presets/useSelectWithApply/options-list-with-apply/header/Component.js';
 import 'classnames';
 import '@alfalab/icons-glyph/ChevronDownMIcon';

package/select/esm/mobile/Component.modal.mobile.js

@@ -37,7 +37,7 @@ import '../../../input/esm';
 import '@alfalab/icons-glyph/MagnifierMIcon';
 import '../components/virtual-options-list/Component.js';
 import 'react-virtual';
-import '../hook-65049d00.js';
+import '../hook-70d4d250.js';
 import '../presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../../button/esm/desktop';
 import '../presets/useSelectWithApply/options-list-with-apply/header/Component.js';

package/select/esm/mobile/index.js

@@ -38,7 +38,7 @@ import '../../../input/esm';
 import '@alfalab/icons-glyph/MagnifierMIcon';
 import '../components/virtual-options-list/Component.js';
 import 'react-virtual';
-import '../hook-65049d00.js';
+import '../hook-70d4d250.js';
 import '../presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../../button/esm/desktop';
 import '../presets/useSelectWithApply/options-list-with-apply/header/Component.js';

package/select/esm/presets/index.js

@@ -1,6 +1,6 @@
 export { useSelectWithLoading } from './useSelectWithLoading/hook.js';
 export { useLazyLoading } from './useLazyLoading/hook.js';
-export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-65049d00.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-70d4d250.js';
 import 'tslib';
 import 'react';
 import '../../../skeleton/esm';

package/select/esm/presets/useSelectWithApply/hook.js

@@ -1,7 +1,7 @@
 import 'tslib';
 import 'react';
 import '../../../../shared/esm';
-export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../../hook-65049d00.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../../hook-70d4d250.js';
 import '../../utils.js';
 import '../../components/options-list/Component.js';
 import 'react-merge-refs';

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

@@ -1,7 +1,7 @@
 import 'tslib';
 import 'react';
 import '../../../components/options-list/Component.js';
-export { O as OptionsListWithApply } from '../../../hook-65049d00.js';
+export { O as OptionsListWithApply } from '../../../hook-70d4d250.js';
 import './footer/Component.js';
 import './header/Component.js';
 import 'react-merge-refs';

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

@@ -1 +1 @@
-export * from "../../../hook-65049d00";
+export * from "../../../hook-70d4d250";

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

@@ -1,4 +1,4 @@
-export { O as OptionsListWithApply } from '../../../hook-65049d00.js';
+export { O as OptionsListWithApply } from '../../../hook-70d4d250.js';
 import 'tslib';
 import 'react';
 import '../../../utils.js';

package/select/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-65049d00.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-70d4d250.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/select/mobile/Component.mobile.js

@@ -14,7 +14,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-2784297a.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-6fc2190d.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 }; }

package/select/modern/Component.responsive.js

@@ -40,7 +40,7 @@ import '../../base-modal/modern';
 import '../../button/modern/mobile';
 import './components/virtual-options-list/Component.js';
 import 'react-virtual';
-import './hook-23f60998.js';
+import './hook-7bb88af2.js';
 import './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../button/modern/desktop';
 import './presets/useSelectWithApply/options-list-with-apply/header/Component.js';

package/select/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';
@@ -27,7 +27,6 @@ const BaseSelect = forwardRef(
     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([

package/select/modern/index.js

@@ -40,7 +40,7 @@ import '../../base-modal/modern';
 import '../../button/modern/mobile';
 import './components/virtual-options-list/Component.js';
 import 'react-virtual';
-import './hook-23f60998.js';
+import './hook-7bb88af2.js';
 import './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../button/modern/desktop';
 import './presets/useSelectWithApply/options-list-with-apply/header/Component.js';

package/select/modern/mobile/Component.mobile.js

@@ -11,7 +11,7 @@ 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-23f60998.js';
+import { u as useSelectWithApply } from '../hook-7bb88af2.js';
 import { Header } from '../presets/useSelectWithApply/options-list-with-apply/header/Component.js';
 import 'classnames';
 import '@alfalab/icons-glyph/ChevronDownMIcon';

package/select/modern/mobile/Component.modal.mobile.js

@@ -36,7 +36,7 @@ import '../../../input/modern';
 import '@alfalab/icons-glyph/MagnifierMIcon';
 import '../components/virtual-options-list/Component.js';
 import 'react-virtual';
-import '../hook-23f60998.js';
+import '../hook-7bb88af2.js';
 import '../presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../../button/modern/desktop';
 import '../presets/useSelectWithApply/options-list-with-apply/header/Component.js';

package/select/modern/mobile/index.js

@@ -37,7 +37,7 @@ import '../../../input/modern';
 import '@alfalab/icons-glyph/MagnifierMIcon';
 import '../components/virtual-options-list/Component.js';
 import 'react-virtual';
-import '../hook-23f60998.js';
+import '../hook-7bb88af2.js';
 import '../presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../../button/modern/desktop';
 import '../presets/useSelectWithApply/options-list-with-apply/header/Component.js';

package/select/modern/presets/index.js

@@ -1,6 +1,6 @@
 export { useSelectWithLoading } from './useSelectWithLoading/hook.js';
 export { useLazyLoading } from './useLazyLoading/hook.js';
-export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-23f60998.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-7bb88af2.js';
 import 'react';
 import '../../../skeleton/modern';
 import '../components/option/Component.js';