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

package/select/esm/{hook-699ea205.js → hook-261ab63e.js}

@@ -1,7 +1,7 @@
 import { __rest, __assign, __spreadArray } from 'tslib';
 import React, { forwardRef, useCallback, useEffect, useState, useMemo, useRef } from 'react';
 import deepEqual from 'deep-equal';
-import { defaultAccessor, defaultFilterFn, processOptions } from './utils.js';
+import { defaultAccessor, defaultFilterFn, defaultGroupAccessor, processOptions, isGroup } from './utils.js';
 import { OptionsList } from './components/options-list/Component.js';
 import { DEFAULT_VISIBLE_OPTIONS } from './consts.js';
 import { Footer } from './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
@@ -61,17 +61,29 @@ var OptionsListWithApply = 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 = 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 = 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 || defaultAccessor;
     var filterFn = searchProps.filterFn || defaultFilterFn;
-    var _k = useMemo(function () {
-        return 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 = useState(selectedOptions), selectedDraft = _l[0], setSelectedDraft = _l[1];
+    var groupAccessor = (_b = searchProps.groupAccessor) !== null && _b !== void 0 ? _b : defaultGroupAccessor;
+    var filterGroup = (_c = searchProps.filterGroup) !== null && _c !== void 0 ? _c : false;
+    var _o = useMemo(function () {
+        return processOptions(options, selected, showSearch
+            ? function (option) {
+                if (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 = useState(selectedOptions), selectedDraft = _p[0], setSelectedDraft = _p[1];
     var selectedOptionsRef = useRef(selectedOptions);
     var handleApply = function () {
         onChange({

package/select/{modern/hook-64a8061f.d.ts → esm/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/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-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/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-699ea205.js';
+import { u as useSelectWithApply } from '../hook-261ab63e.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-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/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-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/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/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-699ea205.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-261ab63e.js';
 import 'tslib';
 import 'react';
 import '../../../skeleton/esm';

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

@@ -2,7 +2,7 @@ import 'tslib';
 import 'react';
 import 'deep-equal';
 import '../../../../shared/esm';
-export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../../hook-699ea205.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../../hook-261ab63e.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-699ea205.js';
+export { O as OptionsListWithApply } from '../../../hook-261ab63e.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-699ea205";
+export * from "../../../hook-261ab63e";

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

@@ -1,4 +1,4 @@
-export { O as OptionsListWithApply } from '../../../hook-699ea205.js';
+export { O as OptionsListWithApply } from '../../../hook-261ab63e.js';
 import 'tslib';
 import 'react';
 import 'deep-equal';

package/select/esm/shared/index.js

@@ -1,7 +1,7 @@
 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-699ea205.js';
-export { defaultAccessor, defaultFilterFn, getSelectTestIds, isGroup, isOptionShape, joinOptions, lastIndexOf, processOptions, usePrevious, useVisibleOptions } from '../utils.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-261ab63e.js';
+export { defaultAccessor, defaultFilterFn, defaultGroupAccessor, 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';
 export { OptionsList } from '../components/options-list/Component.js';

package/select/esm/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/esm/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/esm/utils.js

@@ -26,9 +26,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];
@@ -36,12 +37,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) {
@@ -52,14 +61,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 };
 }
@@ -90,6 +101,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;
@@ -142,4 +156,4 @@ function getSelectTestIds(dataTestId) {
     };
 }
 
-export { defaultAccessor, defaultFilterFn, getSelectTestIds, isGroup, isOptionShape, joinOptions, lastIndexOf, processOptions, usePrevious, useVisibleOptions };
+export { defaultAccessor, defaultFilterFn, defaultGroupAccessor, getSelectTestIds, isGroup, isOptionShape, joinOptions, lastIndexOf, processOptions, usePrevious, useVisibleOptions };

package/select/{cssm/hook-546b2479.js → hook-06cf2830.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/{cssm/hook-64a8061f.d.ts → 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/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-23a1acb8.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-06cf2830.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-b0f48fdd.js';
+import './hook-18077e63.js';
 import 'deep-equal';
 import './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../button/modern/desktop';

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

@@ -6,7 +6,7 @@ import { compute } from 'compute-scroll-into-view';
 import { useMultipleSelection, useCombobox } from 'downshift';
 import { fnUtils, getDataTestId } from '../../../../shared/modern';
 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';
 
 const 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"};
@@ -35,7 +35,16 @@ const BaseSelect = forwardRef(
         : [searchState, setSearchState];
     const accessor = searchProps.accessor || defaultAccessor;
     const filterFn = searchProps.filterFn || defaultFilterFn;
-    const { filteredOptions, flatOptions, selectedOptions } = useMemo(() => processOptions(options, selected, (option) => filterFn(accessor(option), search)), [filterFn, accessor, options, search, selected]);
+    const filterGroup = searchProps.filterGroup ?? false;
+    const groupAccessor = searchProps.groupAccessor ?? defaultGroupAccessor;
+    const { filteredOptions, flatOptions, selectedOptions } = useMemo(() => processOptions(options, selected, (option) => {
+        if (isGroup(option)) {
+            const groupAccessorValue = groupAccessor(option);
+            return (typeof groupAccessorValue === 'string' &&
+                filterFn(groupAccessorValue, search));
+        }
+        return filterFn(accessor(option), search);
+    }, filterGroup), [options, selected, filterFn, accessor, search, filterGroup, groupAccessor]);
     const scrollIntoView = (node) => {
         if (!node || view === 'mobile')
             return;

package/select/modern/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/modern/{hook-b0f48fdd.js → hook-18077e63.js}

@@ -1,6 +1,6 @@
 import React, { forwardRef, useCallback, useEffect, useState, useMemo, useRef } from 'react';
 import deepEqual from 'deep-equal';
-import { defaultAccessor, defaultFilterFn, processOptions } from './utils.js';
+import { defaultAccessor, defaultFilterFn, defaultGroupAccessor, processOptions, isGroup } from './utils.js';
 import { OptionsList } from './components/options-list/Component.js';
 import { DEFAULT_VISIBLE_OPTIONS } from './consts.js';
 import { Footer } from './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
@@ -58,14 +58,25 @@ const OptionsListWithApply = forwardRef(({ toggleMenu, getOptionProps: defaultGe
 
 const SELECT_ALL_KEY = 'select_all';
 const selectAllOption = { key: SELECT_ALL_KEY, content: 'Выбрать все' };
-function useSelectWithApply({ options, selected, onChange = () => null, OptionsList, optionsListProps = {}, showClear = true, showSelectAll = false, showHeaderWithSelectAll = false, showSearch, searchProps = {}, }) {
+function useSelectWithApply({ options, selected, onChange = () => null, OptionsList, optionsListProps = {}, showClear = true, showSelectAll = false, showHeaderWithSelectAll = false, showSearch = false, searchProps = {}, }) {
     const [searchState, setSearchState] = useState('');
     const [search, setSearch] = typeof searchProps?.value === 'string'
         ? [searchProps.value, searchProps.onChange]
         : [searchState, setSearchState];
     const accessor = searchProps.accessor || defaultAccessor;
     const filterFn = searchProps.filterFn || defaultFilterFn;
-    const { flatOptions, selectedOptions } = useMemo(() => processOptions(options, selected, showSearch ? (option) => filterFn(accessor(option), search) : undefined), [filterFn, accessor, options, search, selected, showSearch]);
+    const groupAccessor = searchProps.groupAccessor ?? defaultGroupAccessor;
+    const filterGroup = searchProps.filterGroup ?? false;
+    const { flatOptions, selectedOptions } = useMemo(() => processOptions(options, selected, showSearch
+        ? (option) => {
+            if (isGroup(option)) {
+                const 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]);
     const [selectedDraft, setSelectedDraft] = useState(selectedOptions);
     const selectedOptionsRef = useRef(selectedOptions);
     const handleApply = () => {

package/select/{hook-64a8061f.d.ts → modern/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/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-b0f48fdd.js';
+import './hook-18077e63.js';
 import 'deep-equal';
 import './presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../button/modern/desktop';

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-b0f48fdd.js';
+import { u as useSelectWithApply } from '../hook-18077e63.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-b0f48fdd.js';
+import '../hook-18077e63.js';
 import 'deep-equal';
 import '../presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../../button/modern/desktop';

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-b0f48fdd.js';
+import '../hook-18077e63.js';
 import 'deep-equal';
 import '../presets/useSelectWithApply/options-list-with-apply/footer/Component.js';
 import '../../../button/modern/desktop';

package/select/modern/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/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-b0f48fdd.js';
+export { S as SELECT_ALL_KEY, u as useSelectWithApply } from '../hook-18077e63.js';
 import 'react';
 import '../../../skeleton/modern';
 import '../components/option/Component.js';