@alfalab/core-components 46.2.1 → 46.3.0-beta.0

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

@@ -31,7 +31,8 @@ var BaseSelect = React.forwardRef(
 // eslint-disable-next-line complexity
 function (_a, ref) {
     var _b;
-    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, _c = _a.autocomplete, autocomplete = _c === void 0 ? false : _c, _d = _a.multiple, multiple = _d === void 0 ? false : _d, _e = _a.allowUnselect, allowUnselect = _e === void 0 ? false : _e, _f = _a.disabled, disabled = _f === void 0 ? false : _f, _g = _a.closeOnSelect, closeOnSelect = _g === void 0 ? !multiple : _g, _h = _a.circularNavigation, circularNavigation = _h === void 0 ? false : _h, _j = _a.nativeSelect, nativeSelect = _j === void 0 ? false : _j, _k = _a.defaultOpen, defaultOpen = _k === void 0 ? false : _k, openProp = _a.open, _l = _a.popoverPosition, popoverPosition = _l === void 0 ? 'bottom-start' : _l, _m = _a.preventFlip, preventFlip = _m === void 0 ? true : _m, _o = _a.optionsListWidth, optionsListWidth = _o === void 0 ? 'content' : _o, name = _a.name, id = _a.id, selected = _a.selected, _p = _a.size, size = _p === void 0 ? 48 : _p, _q = _a.optionsSize, optionsSize = _q === void 0 ? size : _q, error = _a.error, hint = _a.hint, block = _a.block, label = _a.label, labelView = _a.labelView, placeholder = _a.placeholder, _r = _a.fieldProps, fieldProps = _r === void 0 ? {} : _r, _s = _a.optionsListProps, optionsListProps = _s === void 0 ? {} : _s, _t = _a.optionProps, optionProps = _t === void 0 ? {} : _t, _u = _a.searchProps, searchProps = _u === void 0 ? {} : _u, _v = _a.showSearch, showSearch = _v === void 0 ? false : _v, valueRenderer = _a.valueRenderer, onChange = _a.onChange, onOpen = _a.onOpen, onFocus = _a.onFocus, onBlur = _a.onBlur, onScroll = _a.onScroll, Arrow = _a.Arrow, _w = _a.Field, Field = _w === void 0 ? function () { return null; } : _w, _x = _a.OptionsList, OptionsList = _x === void 0 ? function () { return null; } : _x, _y = _a.Optgroup, Optgroup = _y === void 0 ? function () { return null; } : _y, _z = _a.Option, Option = _z === void 0 ? function () { return null; } : _z, _0 = _a.Search, Search = _0 === void 0 ? function () { return null; } : _0, updatePopover = _a.updatePopover, zIndexPopover = _a.zIndexPopover, _1 = _a.showEmptyOptionsList, showEmptyOptionsList = _1 === void 0 ? false : _1, visibleOptions = _a.visibleOptions, view = _a.view, _2 = _a.isBottomSheet, isBottomSheet = _2 === void 0 ? true : _2, 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;
+    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;
     var rootRef = React.useRef(null);
     var fieldRef = React.useRef(null);
     var listRef = React.useRef(null);
@@ -39,13 +40,24 @@ function (_a, ref) {
     var searchRef = React.useRef(null);
     var scrollableContainerRef = React.useRef(null);
     var onOpenRef = React.useRef(onOpen);
-    var _3 = React__default.default.useState(''), searchState = _3[0], setSearchState = _3[1];
-    var _4 = typeof (searchProps === null || searchProps === void 0 ? void 0 : searchProps.value) === 'string'
+    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'
         ? [searchProps.value, searchProps.onChange]
-        : [searchState, setSearchState], search = _4[0], setSearch = _4[1];
+        : [searchState, setSearchState], search = _6[0], setSearch = _6[1];
     var accessor = searchProps.accessor || utils.defaultAccessor;
     var filterFn = searchProps.filterFn || utils.defaultFilterFn;
-    var _5 = React.useMemo(function () { return utils.processOptions(options, selected, function (option) { return filterFn(accessor(option), search); }); }, [filterFn, accessor, options, search, selected]), filteredOptions = _5.filteredOptions, flatOptions = _5.flatOptions, selectedOptions = _5.selectedOptions;
+    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 () {
+        return utils.processOptions(options, selected, function (option) {
+            if (utils.isGroup(option)) {
+                var groupAccessorValue = groupAccessor(option);
+                return (typeof groupAccessorValue === 'string' &&
+                    filterFn(groupAccessorValue, search));
+            }
+            return filterFn(accessor(option), search);
+        }, filterGroup);
+    }, [options, selected, filterFn, accessor, search, filterGroup, groupAccessor]), filteredOptions = _7.filteredOptions, flatOptions = _7.flatOptions, selectedOptions = _7.selectedOptions;
     var scrollIntoView = function (node) {
         if (!node || view === 'mobile')
             return;
@@ -88,8 +100,8 @@ function (_a, ref) {
         useMultipleSelectionProps.selectedItems = selectedOptions;
     }
     onOpenRef.current = onOpen;
-    var _6 = downshift.useMultipleSelection(useMultipleSelectionProps), selectedItems = _6.selectedItems, addSelectedItem = _6.addSelectedItem, setSelectedItems = _6.setSelectedItems, removeSelectedItem = _6.removeSelectedItem, getDropdownProps = _6.getDropdownProps;
-    var _7 = downshift.useCombobox({
+    var _8 = downshift.useMultipleSelection(useMultipleSelectionProps), selectedItems = _8.selectedItems, addSelectedItem = _8.addSelectedItem, setSelectedItems = _8.setSelectedItems, removeSelectedItem = _8.removeSelectedItem, getDropdownProps = _8.getDropdownProps;
+    var _9 = downshift.useCombobox({
         id: id,
         isOpen: openProp,
         items: flatOptions,
@@ -170,7 +182,7 @@ function (_a, ref) {
                     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;
+    }), 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;
     React.useEffect(function () {
         /*
          * При изменении openProp, состояние внутри downshift в useEnhancedReducer не меняется, поэтому меняем его таким способом
@@ -186,7 +198,7 @@ function (_a, ref) {
         }
     }, [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 _10 = getMenuProps({ ref: listRef }, { suppressRefError: true }), menuRef = _10.ref, menuProps = tslib.__rest(_10, ["ref"]);
     var handleEntered = function (node, isAppearing) {
         var _a, _b, _c, _d, _e;
         if (showSearch)
@@ -337,7 +349,7 @@ function (_a, ref) {
                 _a[mobileStyles.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 _9 = optionsListProps, header = _9.header, emptyPlaceholder = _9.emptyPlaceholder;
+    var _11 = optionsListProps, header = _11.header, emptyPlaceholder = _11.emptyPlaceholder;
     var renderOptionsListHeader = function () {
         if (header || (view === 'desktop' && showSearch)) {
             return (React__default.default.createElement(React__default.default.Fragment, null,

package/select/components/base-select/mobile.css

@@ -29,9 +29,9 @@
     /* optgroup */
 } .select__sheet_mps48 {
     overflow: hidden;
-} .select__sheetContent_mps48.select__sheetContent_mps48 {
+} .select__sheetContent_mps48 {
     padding: 0
-} .select__sheetContent_mps48.select__sheetContent_mps48 .select__modalContent_mps48 {
+} .select__sheetContent_mps48 .select__modalContent_mps48 {
         padding: 0;
         display: flex;
         flex-direction: column;

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

@@ -29,7 +29,8 @@ var BaseSelect = React.forwardRef(
 // eslint-disable-next-line complexity
 function (_a, ref) {
     var _b;
-    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, _c = _a.autocomplete, autocomplete = _c === void 0 ? false : _c, _d = _a.multiple, multiple = _d === void 0 ? false : _d, _e = _a.allowUnselect, allowUnselect = _e === void 0 ? false : _e, _f = _a.disabled, disabled = _f === void 0 ? false : _f, _g = _a.closeOnSelect, closeOnSelect = _g === void 0 ? !multiple : _g, _h = _a.circularNavigation, circularNavigation = _h === void 0 ? false : _h, _j = _a.nativeSelect, nativeSelect = _j === void 0 ? false : _j, _k = _a.defaultOpen, defaultOpen = _k === void 0 ? false : _k, openProp = _a.open, _l = _a.popoverPosition, popoverPosition = _l === void 0 ? 'bottom-start' : _l, _m = _a.preventFlip, preventFlip = _m === void 0 ? true : _m, _o = _a.optionsListWidth, optionsListWidth = _o === void 0 ? 'content' : _o, name = _a.name, id = _a.id, selected = _a.selected, _p = _a.size, size = _p === void 0 ? 48 : _p, _q = _a.optionsSize, optionsSize = _q === void 0 ? size : _q, error = _a.error, hint = _a.hint, block = _a.block, label = _a.label, labelView = _a.labelView, placeholder = _a.placeholder, _r = _a.fieldProps, fieldProps = _r === void 0 ? {} : _r, _s = _a.optionsListProps, optionsListProps = _s === void 0 ? {} : _s, _t = _a.optionProps, optionProps = _t === void 0 ? {} : _t, _u = _a.searchProps, searchProps = _u === void 0 ? {} : _u, _v = _a.showSearch, showSearch = _v === void 0 ? false : _v, valueRenderer = _a.valueRenderer, onChange = _a.onChange, onOpen = _a.onOpen, onFocus = _a.onFocus, onBlur = _a.onBlur, onScroll = _a.onScroll, Arrow = _a.Arrow, _w = _a.Field, Field = _w === void 0 ? function () { return null; } : _w, _x = _a.OptionsList, OptionsList = _x === void 0 ? function () { return null; } : _x, _y = _a.Optgroup, Optgroup = _y === void 0 ? function () { return null; } : _y, _z = _a.Option, Option = _z === void 0 ? function () { return null; } : _z, _0 = _a.Search, Search = _0 === void 0 ? function () { return null; } : _0, updatePopover = _a.updatePopover, zIndexPopover = _a.zIndexPopover, _1 = _a.showEmptyOptionsList, showEmptyOptionsList = _1 === void 0 ? false : _1, visibleOptions = _a.visibleOptions, view = _a.view, _2 = _a.isBottomSheet, isBottomSheet = _2 === void 0 ? true : _2, 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;
+    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;
     var rootRef = React.useRef(null);
     var fieldRef = React.useRef(null);
     var listRef = React.useRef(null);
@@ -37,13 +38,24 @@ function (_a, ref) {
     var searchRef = React.useRef(null);
     var scrollableContainerRef = React.useRef(null);
     var onOpenRef = React.useRef(onOpen);
-    var _3 = React__default.default.useState(''), searchState = _3[0], setSearchState = _3[1];
-    var _4 = typeof (searchProps === null || searchProps === void 0 ? void 0 : searchProps.value) === 'string'
+    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'
         ? [searchProps.value, searchProps.onChange]
-        : [searchState, setSearchState], search = _4[0], setSearch = _4[1];
+        : [searchState, setSearchState], search = _6[0], setSearch = _6[1];
     var accessor = searchProps.accessor || utils.defaultAccessor;
     var filterFn = searchProps.filterFn || utils.defaultFilterFn;
-    var _5 = React.useMemo(function () { return utils.processOptions(options, selected, function (option) { return filterFn(accessor(option), search); }); }, [filterFn, accessor, options, search, selected]), filteredOptions = _5.filteredOptions, flatOptions = _5.flatOptions, selectedOptions = _5.selectedOptions;
+    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 () {
+        return utils.processOptions(options, selected, function (option) {
+            if (utils.isGroup(option)) {
+                var groupAccessorValue = groupAccessor(option);
+                return (typeof groupAccessorValue === 'string' &&
+                    filterFn(groupAccessorValue, search));
+            }
+            return filterFn(accessor(option), search);
+        }, filterGroup);
+    }, [options, selected, filterFn, accessor, search, filterGroup, groupAccessor]), filteredOptions = _7.filteredOptions, flatOptions = _7.flatOptions, selectedOptions = _7.selectedOptions;
     var scrollIntoView = function (node) {
         if (!node || view === 'mobile')
             return;
@@ -86,8 +98,8 @@ function (_a, ref) {
         useMultipleSelectionProps.selectedItems = selectedOptions;
     }
     onOpenRef.current = onOpen;
-    var _6 = downshift.useMultipleSelection(useMultipleSelectionProps), selectedItems = _6.selectedItems, addSelectedItem = _6.addSelectedItem, setSelectedItems = _6.setSelectedItems, removeSelectedItem = _6.removeSelectedItem, getDropdownProps = _6.getDropdownProps;
-    var _7 = downshift.useCombobox({
+    var _8 = downshift.useMultipleSelection(useMultipleSelectionProps), selectedItems = _8.selectedItems, addSelectedItem = _8.addSelectedItem, setSelectedItems = _8.setSelectedItems, removeSelectedItem = _8.removeSelectedItem, getDropdownProps = _8.getDropdownProps;
+    var _9 = downshift.useCombobox({
         id: id,
         isOpen: openProp,
         items: flatOptions,
@@ -168,7 +180,7 @@ function (_a, ref) {
                     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;
+    }), 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;
     React.useEffect(function () {
         /*
          * При изменении openProp, состояние внутри downshift в useEnhancedReducer не меняется, поэтому меняем его таким способом
@@ -184,7 +196,7 @@ function (_a, ref) {
         }
     }, [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 _10 = getMenuProps({ ref: listRef }, { suppressRefError: true }), menuRef = _10.ref, menuProps = tslib.__rest(_10, ["ref"]);
     var handleEntered = function (node, isAppearing) {
         var _a, _b, _c, _d, _e;
         if (showSearch)
@@ -335,7 +347,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 _9 = optionsListProps, header = _9.header, emptyPlaceholder = _9.emptyPlaceholder;
+    var _11 = optionsListProps, header = _11.header, emptyPlaceholder = _11.emptyPlaceholder;
     var renderOptionsListHeader = function () {
         if (header || (view === 'desktop' && showSearch)) {
             return (React__default.default.createElement(React__default.default.Fragment, null,

package/select/cssm/components/base-select/mobile.module.css

@@ -28,9 +28,9 @@
     /* optgroup */
 } .sheet {
     overflow: hidden;
-} .sheetContent.sheetContent {
+} .sheetContent {
     padding: 0
-} .sheetContent.sheetContent .modalContent {
+} .sheetContent .modalContent {
         padding: 0;
         display: flex;
         flex-direction: column;

package/select/{hook-23a1acb8.js → cssm/hook-052c1a2e.js}

@@ -58,17 +58,29 @@ var OptionsListWithApply = React.forwardRef(function (_a, ref) {
 var SELECT_ALL_KEY = 'select_all';
 var selectAllOption = { key: SELECT_ALL_KEY, content: 'Выбрать все' };
 function useSelectWithApply(_a) {
-    var options = _a.options, selected = _a.selected, _b = _a.onChange, onChange = _b === void 0 ? function () { return null; } : _b, OptionsList = _a.OptionsList, _c = _a.optionsListProps, optionsListProps = _c === void 0 ? {} : _c, _d = _a.showClear, showClear = _d === void 0 ? true : _d, _e = _a.showSelectAll, showSelectAll = _e === void 0 ? false : _e, _f = _a.showHeaderWithSelectAll, showHeaderWithSelectAll = _f === void 0 ? false : _f, showSearch = _a.showSearch, _g = _a.searchProps, searchProps = _g === void 0 ? {} : _g;
-    var _h = React.useState(''), searchState = _h[0], setSearchState = _h[1];
-    var _j = typeof (searchProps === null || searchProps === void 0 ? void 0 : searchProps.value) === 'string'
+    var _b, _c;
+    var options = _a.options, selected = _a.selected, _d = _a.onChange, onChange = _d === void 0 ? function () { return null; } : _d, OptionsList = _a.OptionsList, _e = _a.optionsListProps, optionsListProps = _e === void 0 ? {} : _e, _f = _a.showClear, showClear = _f === void 0 ? true : _f, _g = _a.showSelectAll, showSelectAll = _g === void 0 ? false : _g, _h = _a.showHeaderWithSelectAll, showHeaderWithSelectAll = _h === void 0 ? false : _h, _j = _a.showSearch, showSearch = _j === void 0 ? false : _j, _k = _a.searchProps, searchProps = _k === void 0 ? {} : _k;
+    var _l = React.useState(''), searchState = _l[0], setSearchState = _l[1];
+    var _m = typeof (searchProps === null || searchProps === void 0 ? void 0 : searchProps.value) === 'string'
         ? [searchProps.value, searchProps.onChange]
-        : [searchState, setSearchState], search = _j[0], setSearch = _j[1];
+        : [searchState, setSearchState], search = _m[0], setSearch = _m[1];
     var accessor = searchProps.accessor || utils.defaultAccessor;
     var filterFn = searchProps.filterFn || utils.defaultFilterFn;
-    var _k = React.useMemo(function () {
-        return utils.processOptions(options, selected, showSearch ? function (option) { return filterFn(accessor(option), search); } : undefined);
-    }, [filterFn, accessor, options, search, selected, showSearch]), flatOptions = _k.flatOptions, selectedOptions = _k.selectedOptions;
-    var _l = React.useState(selectedOptions), selectedDraft = _l[0], setSelectedDraft = _l[1];
+    var groupAccessor = (_b = searchProps.groupAccessor) !== null && _b !== void 0 ? _b : utils.defaultGroupAccessor;
+    var filterGroup = (_c = searchProps.filterGroup) !== null && _c !== void 0 ? _c : false;
+    var _o = React.useMemo(function () {
+        return utils.processOptions(options, selected, showSearch
+            ? function (option) {
+                if (utils.isGroup(option)) {
+                    var groupAccessorValue = groupAccessor(option);
+                    return (typeof groupAccessorValue === 'string' &&
+                        filterFn(groupAccessorValue, search));
+                }
+                return filterFn(accessor(option), search);
+            }
+            : undefined, filterGroup);
+    }, [options, selected, showSearch, filterGroup, filterFn, accessor, search, groupAccessor]), flatOptions = _o.flatOptions, selectedOptions = _o.selectedOptions;
+    var _p = React.useState(selectedOptions), selectedDraft = _p[0], setSelectedDraft = _p[1];
     var selectedOptionsRef = React.useRef(selectedOptions);
     var handleApply = function () {
         onChange({

package/select/{esm/hook-64a8061f.d.ts → cssm/hook-2f4e96b2.d.ts}

@@ -45,14 +45,12 @@ type UseSelectWithApplyProps = {
 declare const SELECT_ALL_KEY = "select_all";
 declare function useSelectWithApply({ options, selected, onChange, OptionsList, optionsListProps, showClear, showSelectAll, showHeaderWithSelectAll, showSearch, searchProps, }: UseSelectWithApplyProps): {
     OptionsList: import("react").ForwardRefExoticComponent<import("./typings").OptionsListProps & {
-        /**
-         * Обработчик выбора
-         */
         showClear?: boolean | undefined;
         onClose?: (() => void) | undefined;
-        selectedDraft?: OptionShape[] | undefined; /**
-         * Компонент выпадающего меню
+        /**
+         * Обработчик выбора
          */
+        selectedDraft?: OptionShape[] | undefined;
         OptionsList?: import("react").FC<import("./typings").OptionsListProps & import("react").RefAttributes<HTMLDivElement>> | undefined;
         Footer?: import("react").FC<import("./presets/useSelectWithApply/options-list-with-apply/footer/Component").FooterProps> | undefined;
         Header?: import("react").FC<import("./presets/useSelectWithApply/options-list-with-apply/header/Component").HeaderProps> | undefined;
@@ -83,13 +81,15 @@ declare function useSelectWithApply({ options, selected, onChange, OptionsList,
     })[];
     onChange: (payload: import("./typings").BaseSelectChangePayload) => void;
     selected: string | OptionShape | (string | OptionShape)[] | null | undefined;
-    showSearch: boolean | undefined;
+    showSearch: boolean;
     searchProps: {
         value: string;
         onChange: ((value: string) => void) | undefined;
         componentProps?: import("./typings").SearchProps | undefined;
         accessor?: ((option: OptionShape) => string) | undefined;
         filterFn?: ((optionText: string, search: string) => boolean) | undefined;
+        filterGroup?: boolean | undefined;
+        groupAccessor?: ((group: import("./typings").GroupShape) => string | undefined) | undefined;
     } | undefined;
     originalProps: {
         options: (OptionShape | import("./typings").GroupShape)[];
@@ -100,13 +100,15 @@ declare function useSelectWithApply({ options, selected, onChange, OptionsList,
         showClear: boolean;
         showSelectAll: boolean;
         showHeaderWithSelectAll: boolean;
-        showSearch: boolean | undefined;
+        showSearch: boolean;
         searchProps: {
             componentProps?: import("./typings").SearchProps | undefined;
             accessor?: ((option: OptionShape) => string) | undefined;
             filterFn?: ((optionText: string, search: string) => boolean) | undefined;
             value?: string | undefined;
             onChange?: ((value: string) => void) | undefined;
+            filterGroup?: boolean | undefined;
+            groupAccessor?: ((group: import("./typings").GroupShape) => string | undefined) | undefined;
         };
     };
 };

package/select/cssm/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-546b2479.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-052c1a2e.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/cssm/presets/index.d.ts

@@ -1,3 +1,3 @@
 export * from "./useSelectWithLoading/hook";
 export * from "./useLazyLoading/hook";
-export * from "../hook-64a8061f";
+export * from "../hook-2f4e96b2";

package/select/cssm/presets/index.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var presets_useSelectWithLoading_hook = require('./useSelectWithLoading/hook.js');
 var presets_useLazyLoading_hook = require('./useLazyLoading/hook.js');
-var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-546b2479.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-052c1a2e.js');
 
 
 

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

@@ -4,7 +4,7 @@ require('tslib');
 require('react');
 require('deep-equal');
 require('../../utils.js');
-var presets_useSelectWithApply_optionsListWithApply_Component = require('../../hook-546b2479.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../../hook-052c1a2e.js');
 
 
 

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

@@ -4,7 +4,7 @@ require('tslib');
 require('react');
 require('../../../components/options-list/Component.js');
 require('../../../consts.js');
-var presets_useSelectWithApply_optionsListWithApply_Component = require('../../../hook-546b2479.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../../../hook-052c1a2e.js');
 require('./footer/Component.js');
 require('./header/Component.js');
 

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

@@ -1 +1 @@
-export * from "../../../hook-546b2479";
+export * from "../../../hook-052c1a2e";

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

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var presets_useSelectWithApply_optionsListWithApply_Component = require('../../../hook-546b2479.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../../../hook-052c1a2e.js');
 
 
 

package/select/cssm/shared/index.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var presets_useSelectWithLoading_hook = require('../presets/useSelectWithLoading/hook.js');
 var presets_useLazyLoading_hook = require('../presets/useLazyLoading/hook.js');
-var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-546b2479.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-052c1a2e.js');
 var utils = require('../utils.js');
 var components_option_Component = require('../components/option/Component.js');
 var components_baseOption_Component = require('../components/base-option/Component.js');
@@ -23,6 +23,7 @@ exports.SELECT_ALL_KEY = presets_useSelectWithApply_optionsListWithApply_Compone
 exports.useSelectWithApply = presets_useSelectWithApply_optionsListWithApply_Component.useSelectWithApply;
 exports.defaultAccessor = utils.defaultAccessor;
 exports.defaultFilterFn = utils.defaultFilterFn;
+exports.defaultGroupAccessor = utils.defaultGroupAccessor;
 exports.getSelectTestIds = utils.getSelectTestIds;
 exports.isGroup = utils.isGroup;
 exports.isOptionShape = utils.isOptionShape;

package/select/cssm/typings.d.ts

@@ -5,7 +5,7 @@ import { InputProps } from "../../input";
 import { ModalProps } from "../../modal";
 import { ModalFooterProps, ModalHeaderProps } from "../../modal/shared";
 import { PopoverProps } from "../../popover";
-import { UseSelectWithApplyProps } from "./hook-64a8061f";
+import { UseSelectWithApplyProps } from "./hook-2f4e96b2";
 type AnyObject = Record<string, any>;
 type OptionShape = {
     /**
@@ -237,6 +237,8 @@ type BaseSelectProps = {
         filterFn?: (optionText: string, search: string) => boolean;
         value?: string;
         onChange?: (value: string) => void;
+        filterGroup?: boolean;
+        groupAccessor?: (group: GroupShape) => string | undefined;
     };
     /**
      * Обработчик выбора

package/select/cssm/utils.d.ts

@@ -6,7 +6,7 @@ declare const joinOptions: ({ selected, selectedMultiple, }: {
     selected?: OptionShape | undefined;
     selectedMultiple?: OptionShape[] | undefined;
 }) => ReactNode[] | null;
-declare function processOptions(options: BaseSelectProps['options'], selected?: BaseSelectProps['selected'], filterFn?: (option: OptionShape) => boolean): {
+declare function processOptions(options: BaseSelectProps['options'], selected?: BaseSelectProps['selected'], filterFn?: (option: OptionShape | GroupShape) => boolean, filterGroup?: boolean): {
     filteredOptions: (OptionShape | GroupShape)[];
     flatOptions: OptionShape[];
     selectedOptions: OptionShape[];
@@ -35,6 +35,7 @@ type useVisibleOptionsArgs = {
 };
 declare function useVisibleOptions({ visibleOptions, listRef, styleTargetRef, open, invalidate, }: useVisibleOptionsArgs): void;
 declare function defaultFilterFn(optionText: string, search: string): boolean;
+declare function defaultGroupAccessor(option: GroupShape): string | undefined;
 declare function defaultAccessor(option: OptionShape): string;
 declare function usePrevious<T>(value: T): T | undefined;
 declare const lastIndexOf: <T>(array: T[], predicate: (item: T) => boolean) => number;
@@ -64,4 +65,4 @@ declare function getSelectTestIds(dataTestId: string): {
     modalHeader: string;
     modalContent: string;
 };
-export { isGroup, isOptionShape, joinOptions, processOptions, useVisibleOptions, defaultFilterFn, defaultAccessor, usePrevious, lastIndexOf, getSelectTestIds };
+export { isGroup, isOptionShape, joinOptions, processOptions, useVisibleOptions, defaultFilterFn, defaultGroupAccessor, defaultAccessor, usePrevious, lastIndexOf, getSelectTestIds };

package/select/cssm/utils.js

@@ -28,9 +28,10 @@ var joinOptions = function (_a) {
     }, []);
 };
 // За один проход делает список пунктов меню плоским и находит выбранные пункты по ключу
-function processOptions(options, selected, filterFn) {
+function processOptions(options, selected, filterFn, filterGroup) {
     if (selected === void 0) { selected = []; }
     if (filterFn === void 0) { filterFn = function () { return true; }; }
+    if (filterGroup === void 0) { filterGroup = false; }
     var flatOptions = [];
     var filteredOptions = [];
     var selectedArray = Array.isArray(selected) ? selected : [selected];
@@ -38,12 +39,20 @@ function processOptions(options, selected, filterFn) {
     var selectedKeys = selectedArray.filter(function (option) { return typeof option === 'string'; });
     var isSelected = function (option) { return selectedKeys.includes(option.key); };
     var process = function (option) {
-        if (isSelected(option)) {
+        var isGroupOption = isGroup(option);
+        if (!isGroupOption && isSelected(option)) {
             selectedOptions.push(option);
         }
         if (!filterFn(option))
             return false;
-        flatOptions.push(option);
+        if (isGroupOption) {
+            if (filterGroup) {
+                Array.prototype.push.apply(flatOptions, option.options);
+            }
+        }
+        else {
+            flatOptions.push(option);
+        }
         return true;
     };
     options.forEach(function (option) {
@@ -54,14 +63,16 @@ function processOptions(options, selected, filterFn) {
                 if (matched)
                     group_1.options.push(groupOption);
             });
-            if (group_1.options.length)
+            if (group_1.options.length) {
                 filteredOptions.push(group_1);
+                return;
+            }
+            if (!filterGroup)
+                return;
         }
-        else {
-            var matched = process(option);
-            if (matched)
-                filteredOptions.push(option);
-        }
+        var matched = process(option);
+        if (matched)
+            filteredOptions.push(option);
     });
     return { filteredOptions: filteredOptions, flatOptions: flatOptions, selectedOptions: selectedOptions };
 }
@@ -92,6 +103,9 @@ function defaultFilterFn(optionText, search) {
         return true;
     return optionText.toLowerCase().includes(search.toLowerCase());
 }
+function defaultGroupAccessor(option) {
+    return option.label;
+}
 function defaultAccessor(option) {
     if (typeof option.content === 'string')
         return option.content;
@@ -146,6 +160,7 @@ function getSelectTestIds(dataTestId) {
 
 exports.defaultAccessor = defaultAccessor;
 exports.defaultFilterFn = defaultFilterFn;
+exports.defaultGroupAccessor = defaultGroupAccessor;
 exports.getSelectTestIds = getSelectTestIds;
 exports.isGroup = isGroup;
 exports.isOptionShape = isOptionShape;

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-699ea205.js';
+import './hook-261ab63e.js';
 import 'deep-equal';
 import './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../button/esm/desktop';

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

@@ -7,7 +7,7 @@ import { compute } from 'compute-scroll-into-view';
 import { useMultipleSelection, useCombobox } from 'downshift';
 import { fnUtils, getDataTestId } from '../../../../shared/esm';
 import { useLayoutEffect_SAFE_FOR_SSR } from '@alfalab/hooks';
-import { defaultAccessor, defaultFilterFn, processOptions } from '../../utils.js';
+import { defaultAccessor, defaultFilterFn, defaultGroupAccessor, processOptions, isGroup } from '../../utils.js';
 import { NativeSelect } from '../native-select/Component.js';
 
 var styles = {"component":"select__component_13j3x","popoverInner":"select__popoverInner_13j3x","optionsListWrapper":"select__optionsListWrapper_13j3x","optionsListBorder":"select__optionsListBorder_13j3x","nativeSelect":"select__nativeSelect_13j3x","block":"select__block_13j3x","emptySearchPlaceholder":"select__emptySearchPlaceholder_13j3x","search":"select__search_13j3x"};
@@ -23,7 +23,8 @@ var BaseSelect = forwardRef(
 // eslint-disable-next-line complexity
 function (_a, ref) {
     var _b;
-    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, _c = _a.autocomplete, autocomplete = _c === void 0 ? false : _c, _d = _a.multiple, multiple = _d === void 0 ? false : _d, _e = _a.allowUnselect, allowUnselect = _e === void 0 ? false : _e, _f = _a.disabled, disabled = _f === void 0 ? false : _f, _g = _a.closeOnSelect, closeOnSelect = _g === void 0 ? !multiple : _g, _h = _a.circularNavigation, circularNavigation = _h === void 0 ? false : _h, _j = _a.nativeSelect, nativeSelect = _j === void 0 ? false : _j, _k = _a.defaultOpen, defaultOpen = _k === void 0 ? false : _k, openProp = _a.open, _l = _a.popoverPosition, popoverPosition = _l === void 0 ? 'bottom-start' : _l, _m = _a.preventFlip, preventFlip = _m === void 0 ? true : _m, _o = _a.optionsListWidth, optionsListWidth = _o === void 0 ? 'content' : _o, name = _a.name, id = _a.id, selected = _a.selected, _p = _a.size, size = _p === void 0 ? 48 : _p, _q = _a.optionsSize, optionsSize = _q === void 0 ? size : _q, error = _a.error, hint = _a.hint, block = _a.block, label = _a.label, labelView = _a.labelView, placeholder = _a.placeholder, _r = _a.fieldProps, fieldProps = _r === void 0 ? {} : _r, _s = _a.optionsListProps, optionsListProps = _s === void 0 ? {} : _s, _t = _a.optionProps, optionProps = _t === void 0 ? {} : _t, _u = _a.searchProps, searchProps = _u === void 0 ? {} : _u, _v = _a.showSearch, showSearch = _v === void 0 ? false : _v, valueRenderer = _a.valueRenderer, onChange = _a.onChange, onOpen = _a.onOpen, onFocus = _a.onFocus, onBlur = _a.onBlur, onScroll = _a.onScroll, Arrow = _a.Arrow, _w = _a.Field, Field = _w === void 0 ? function () { return null; } : _w, _x = _a.OptionsList, OptionsList = _x === void 0 ? function () { return null; } : _x, _y = _a.Optgroup, Optgroup = _y === void 0 ? function () { return null; } : _y, _z = _a.Option, Option = _z === void 0 ? function () { return null; } : _z, _0 = _a.Search, Search = _0 === void 0 ? function () { return null; } : _0, updatePopover = _a.updatePopover, zIndexPopover = _a.zIndexPopover, _1 = _a.showEmptyOptionsList, showEmptyOptionsList = _1 === void 0 ? false : _1, visibleOptions = _a.visibleOptions, view = _a.view, _2 = _a.isBottomSheet, isBottomSheet = _2 === void 0 ? true : _2, 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;
+    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;
     var rootRef = useRef(null);
     var fieldRef = useRef(null);
     var listRef = useRef(null);
@@ -31,13 +32,24 @@ function (_a, ref) {
     var searchRef = useRef(null);
     var scrollableContainerRef = useRef(null);
     var onOpenRef = useRef(onOpen);
-    var _3 = React.useState(''), searchState = _3[0], setSearchState = _3[1];
-    var _4 = typeof (searchProps === null || searchProps === void 0 ? void 0 : searchProps.value) === 'string'
+    var _5 = React.useState(''), searchState = _5[0], setSearchState = _5[1];
+    var _6 = typeof (searchProps === null || searchProps === void 0 ? void 0 : searchProps.value) === 'string'
         ? [searchProps.value, searchProps.onChange]
-        : [searchState, setSearchState], search = _4[0], setSearch = _4[1];
+        : [searchState, setSearchState], search = _6[0], setSearch = _6[1];
     var accessor = searchProps.accessor || defaultAccessor;
     var filterFn = searchProps.filterFn || defaultFilterFn;
-    var _5 = useMemo(function () { return processOptions(options, selected, function (option) { return filterFn(accessor(option), search); }); }, [filterFn, accessor, options, search, selected]), filteredOptions = _5.filteredOptions, flatOptions = _5.flatOptions, selectedOptions = _5.selectedOptions;
+    var filterGroup = (_c = searchProps.filterGroup) !== null && _c !== void 0 ? _c : false;
+    var groupAccessor = (_d = searchProps.groupAccessor) !== null && _d !== void 0 ? _d : defaultGroupAccessor;
+    var _7 = useMemo(function () {
+        return processOptions(options, selected, function (option) {
+            if (isGroup(option)) {
+                var groupAccessorValue = groupAccessor(option);
+                return (typeof groupAccessorValue === 'string' &&
+                    filterFn(groupAccessorValue, search));
+            }
+            return filterFn(accessor(option), search);
+        }, filterGroup);
+    }, [options, selected, filterFn, accessor, search, filterGroup, groupAccessor]), filteredOptions = _7.filteredOptions, flatOptions = _7.flatOptions, selectedOptions = _7.selectedOptions;
     var scrollIntoView = function (node) {
         if (!node || view === 'mobile')
             return;
@@ -80,8 +92,8 @@ function (_a, ref) {
         useMultipleSelectionProps.selectedItems = selectedOptions;
     }
     onOpenRef.current = onOpen;
-    var _6 = useMultipleSelection(useMultipleSelectionProps), selectedItems = _6.selectedItems, addSelectedItem = _6.addSelectedItem, setSelectedItems = _6.setSelectedItems, removeSelectedItem = _6.removeSelectedItem, getDropdownProps = _6.getDropdownProps;
-    var _7 = useCombobox({
+    var _8 = useMultipleSelection(useMultipleSelectionProps), selectedItems = _8.selectedItems, addSelectedItem = _8.addSelectedItem, setSelectedItems = _8.setSelectedItems, removeSelectedItem = _8.removeSelectedItem, getDropdownProps = _8.getDropdownProps;
+    var _9 = useCombobox({
         id: id,
         isOpen: openProp,
         items: flatOptions,
@@ -162,7 +174,7 @@ function (_a, ref) {
                     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;
+    }), 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;
     useEffect(function () {
         /*
          * При изменении openProp, состояние внутри downshift в useEnhancedReducer не меняется, поэтому меняем его таким способом
@@ -178,7 +190,7 @@ function (_a, ref) {
         }
     }, [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 _10 = getMenuProps({ ref: listRef }, { suppressRefError: true }), menuRef = _10.ref, menuProps = __rest(_10, ["ref"]);
     var handleEntered = function (node, isAppearing) {
         var _a, _b, _c, _d, _e;
         if (showSearch)
@@ -329,7 +341,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 _9 = optionsListProps, header = _9.header, emptyPlaceholder = _9.emptyPlaceholder;
+    var _11 = optionsListProps, header = _11.header, emptyPlaceholder = _11.emptyPlaceholder;
     var renderOptionsListHeader = function () {
         if (header || (view === 'desktop' && showSearch)) {
             return (React.createElement(React.Fragment, null,

package/select/esm/components/base-select/mobile.css

@@ -29,9 +29,9 @@
     /* optgroup */
 } .select__sheet_mps48 {
     overflow: hidden;
-} .select__sheetContent_mps48.select__sheetContent_mps48 {
+} .select__sheetContent_mps48 {
     padding: 0
-} .select__sheetContent_mps48.select__sheetContent_mps48 .select__modalContent_mps48 {
+} .select__sheetContent_mps48 .select__modalContent_mps48 {
         padding: 0;
         display: flex;
         flex-direction: column;