@alfalab/core-components-select 17.5.1 → 17.6.0

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

@@ -1,4 +1,4 @@
-/* hash: 1voyl */
+/* hash: 1wp5b */
 :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root {
     --color-light-neutral-300: #e7e8eb;
@@ -29,32 +29,32 @@
     /* checkmark */
 
     /* optgroup */
-} .select__optionsList_r1501 {
+} .select__optionsList_14c2k {
     width: 100%;
     outline: none;
     box-sizing: border-box;
     position: relative;
-} .select__optionsListHeader_r1501 {
+} .select__optionsListHeader_14c2k {
     box-sizing: border-box;
     border-bottom: 1px solid transparent;
     transition: border-color 0.2s ease
-} .select__optionsListHeader_r1501.select__headerHighlighted_r1501 {
+} .select__optionsListHeader_14c2k.select__headerHighlighted_14c2k {
         border-bottom-color: var(--color-light-neutral-300);
-    } .select__optionsListFooter_r1501 {
+    } .select__optionsListFooter_14c2k {
     position: sticky;
     bottom: 0;
     box-sizing: border-box;
     border-top: 1px solid transparent;
     transition: border-color 0.2s ease
-} .select__optionsListFooter_r1501.select__withBorder_r1501 {
+} .select__optionsListFooter_14c2k.select__withBorder_14c2k {
         border-top-color: var(--color-light-neutral-300);
-    } .select__scrollable_r1501 {
+    } .select__scrollable_14c2k {
     overflow: auto;
     width: 100%;
-} .select__emptyPlaceholder_r1501 {
+} .select__emptyPlaceholder_14c2k {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
-} .select__size-64_r1501 .select__emptyPlaceholder_r1501,
-.select__size-72_r1501 .select__emptyPlaceholder_r1501 {
+} .select__size-64_14c2k .select__emptyPlaceholder_14c2k,
+.select__size-72_14c2k .select__emptyPlaceholder_14c2k {
     padding: var(--gap-xl) var(--gap-m);
 }

package/modern/components/search/Component.js

@@ -3,7 +3,7 @@ import cn from 'classnames';
 import { Input } from '@alfalab/core-components-input/modern';
 import { MagnifierMIcon } from '@alfalab/icons-glyph/MagnifierMIcon';
 
-const styles = {"component":"select__component_cq2to"};
+const styles = {"component":"select__component_14dac"};
 require('./index.css')
 
 const Search = forwardRef(({ clear = true, placeholder = 'Поиск', className, leftAddons = React.createElement(MagnifierMIcon, { color: '#86868A' }), ...restProps }, ref) => (React.createElement(Input, { ref: ref, className: cn(styles.component, className), placeholder: placeholder, leftAddons: leftAddons, clear: clear, ...restProps })));

package/modern/components/search/index.css

@@ -1,4 +1,4 @@
-/* hash: kmrba */
+/* hash: 4r7qu */
 :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
@@ -23,6 +23,6 @@
     /* checkmark */
 
     /* optgroup */
-} .select__component_cq2to.select__component_cq2to {
+} .select__component_14dac.select__component_14dac {
     width: auto;
 }

package/modern/components/virtual-options-list/Component.js

@@ -9,7 +9,7 @@ import { SIZE_TO_CLASSNAME_MAP, DEFAULT_VISIBLE_OPTIONS } from '../../consts.js'
 import { usePrevious, lastIndexOf, useVisibleOptions, isGroup } from '../../utils.js';
 import { Optgroup } from '../optgroup/Component.js';
 
-const styles = {"virtualOptionsList":"select__virtualOptionsList_1sq6j","virtualOptionsListHeader":"select__virtualOptionsListHeader_1sq6j","virtualOptionsListFooter":"select__virtualOptionsListFooter_1sq6j","withBorder":"select__withBorder_1sq6j","scrollable":"select__scrollable_1sq6j","inner":"select__inner_1sq6j","virtualRow":"select__virtualRow_1sq6j","highlighted":"select__highlighted_1sq6j","emptyPlaceholder":"select__emptyPlaceholder_1sq6j","size-64":"select__size-64_1sq6j","size-72":"select__size-72_1sq6j"};
+const styles = {"virtualOptionsList":"select__virtualOptionsList_p181u","virtualOptionsListHeader":"select__virtualOptionsListHeader_p181u","virtualOptionsListFooter":"select__virtualOptionsListFooter_p181u","withBorder":"select__withBorder_p181u","scrollable":"select__scrollable_p181u","inner":"select__inner_p181u","virtualRow":"select__virtualRow_p181u","highlighted":"select__highlighted_p181u","emptyPlaceholder":"select__emptyPlaceholder_p181u","size-64":"select__size-64_p181u","size-72":"select__size-72_p181u"};
 require('./index.css')
 
 const VirtualOptionsList = forwardRef(({ size = 48, flatOptions = [], highlightedIndex = -1, optionGroupClassName, className, getOptionProps, Option, open, options = [], Optgroup: Optgroup$1 = Optgroup, dataTestId, emptyPlaceholder, visibleOptions = DEFAULT_VISIBLE_OPTIONS, header, footer, showFooter = true, optionsListWidth, onScroll, nativeScrollbar: nativeScrollbarProp, setHighlightedIndex, selectedItems, setSelectedItems, search, multiple, }, ref) => {

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

@@ -1,4 +1,4 @@
-/* hash: hox9a */
+/* hash: 1a2lv */
 :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root {
     --color-light-border-primary: #d5d6dc;
@@ -35,35 +35,35 @@
     /* checkmark */
 
     /* optgroup */
-} .select__virtualOptionsList_1sq6j {
+} .select__virtualOptionsList_p181u {
     width: 100%;
     outline: none;
     box-sizing: border-box;
     position: sticky;
     justify-content: space-between;
-} .select__virtualOptionsListHeader_1sq6j {
+} .select__virtualOptionsListHeader_p181u {
     box-sizing: border-box;
     border-bottom: 1px solid var(--color-light-neutral-300);
-} .select__virtualOptionsListFooter_1sq6j {
+} .select__virtualOptionsListFooter_p181u {
     position: sticky;
     bottom: 0;
     box-sizing: border-box;
     border-top: 1px solid transparent
-} .select__virtualOptionsListFooter_1sq6j.select__withBorder_1sq6j {
+} .select__virtualOptionsListFooter_p181u.select__withBorder_p181u {
         border-top: 1px solid var(--color-light-neutral-300);
-    } .select__scrollable_1sq6j {
+    } .select__scrollable_p181u {
     position: relative;
     overflow: auto;
     width: 100%;
-} .select__inner_1sq6j {
+} .select__inner_p181u {
     position: relative;
     width: 100%;
-} .select__virtualRow_1sq6j {
+} .select__virtualRow_p181u {
     position: absolute;
     top: 0;
     left: 0;
     width: 100%
-} .select__virtualRow_1sq6j:before {
+} .select__virtualRow_p181u:before {
         content: '';
         position: absolute;
         z-index: 1;
@@ -73,16 +73,16 @@
         height: 1px;
         background: var(--select-option-divider-background);
         display: var(--select-option-divider-display);
-    } .select__virtualRow_1sq6j:first-child:before {
+    } .select__virtualRow_p181u:first-child:before {
         display: none;
-    } .select__highlighted_1sq6j:before,
-    .select__highlighted_1sq6j + .select__virtualRow_1sq6j:before {
+    } .select__highlighted_p181u:before,
+    .select__highlighted_p181u + .select__virtualRow_p181u:before {
         display: none;
-    } .select__emptyPlaceholder_1sq6j {
+    } .select__emptyPlaceholder_p181u {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
     flex: 1;
-} .select__size-64_1sq6j .select__emptyPlaceholder_1sq6j,
-.select__size-72_1sq6j .select__emptyPlaceholder_1sq6j {
+} .select__size-64_p181u .select__emptyPlaceholder_p181u,
+.select__size-72_p181u .select__emptyPlaceholder_p181u {
     padding: var(--gap-xl) var(--gap-m);
 }

package/{esm/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/modern/{hook-b0f48fdd.js → hook-6a076c91.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';
@@ -50,14 +50,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/modern/mobile/Component.mobile.js

@@ -11,15 +11,13 @@ 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-6a076c91.js';
 import { Header } from '../presets/useSelectWithApply/options-list-with-apply/header/Component.js';
 
 const VIRTUAL_OPTIONS_LIST_THRESHOLD = 30;
-const SelectMobile = forwardRef(({ autocomplete = false, multiple = false, allowUnselect = false, disabled = false, closeOnSelect = !multiple, circularNavigation = false, defaultOpen = false, open: openProp, size = 56, optionsSize = 56, fieldProps = {}, optionProps = {}, optionsListProps = {}, Arrow: Arrow$1 = Arrow, Field: Field$1 = Field, Optgroup: Optgroup$1 = Optgroup, Option: Option$1 = Option, Search: Search$1 = Search, selected, isBottomSheet = true, options, OptionsList: OptionsList$1 = options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
+const SelectMobile = forwardRef(({ autocomplete = false, multiple = false, allowUnselect = false, disabled = false, closeOnSelect = !multiple, circularNavigation = false, defaultOpen = false, open: openProp, size = 56, optionsSize = 56, fieldProps = {}, optionProps = {}, optionsListProps = {}, Arrow: Arrow$1 = Arrow, Field: Field$1 = Field, Optgroup: Optgroup$1 = Optgroup, Option: Option$1 = Option, Search: Search$1 = Search, selected, options, OptionsList: OptionsList$1 = options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
     ? VirtualOptionsList
     : OptionsList, onChange, showClear = true, showSelectAll, showHeaderWithSelectAll, useWithApplyHook = multiple, showSearch, searchProps, ...restProps }, ref) => {
-    const typedRestBottomSheetProps = restProps;
-    const typedRestModalProps = restProps;
     const applyProps = useSelectWithApply({
         optionsListProps: {
             ...optionsListProps,
@@ -38,19 +36,19 @@ const SelectMobile = forwardRef(({ autocomplete = false, multiple = false, allow
     return (React.createElement(BaseSelect, { ref: ref, view: 'mobile', autocomplete: autocomplete, multiple: multiple, allowUnselect: allowUnselect, disabled: disabled, closeOnSelect: closeOnSelect, circularNavigation: circularNavigation, defaultOpen: defaultOpen, open: openProp, size: size, optionsSize: optionsSize, fieldProps: {
             FormControlComponent: FormControlMobile,
             ...fieldProps,
-        }, optionProps: optionProps, Arrow: Arrow$1, Field: Field$1, Optgroup: Optgroup$1, Option: Option$1, Search: Search$1, isBottomSheet: isBottomSheet, options: options, selected: selected, onChange: onChange, OptionsList: OptionsList$1, showSearch: showSearch, searchProps: searchProps, BottomSheet: BottomSheet, ModalMobile: ModalMobile, ...(isBottomSheet
+        }, optionProps: optionProps, Arrow: Arrow$1, Field: Field$1, Optgroup: Optgroup$1, Option: Option$1, Search: Search$1, options: options, selected: selected, onChange: onChange, OptionsList: OptionsList$1, showSearch: showSearch, searchProps: searchProps, BottomSheet: BottomSheet, ModalMobile: ModalMobile, optionsListProps: optionsListProps, ...restProps, ...(restProps.isBottomSheet === false
             ? {
-                bottomSheetProps: {
+                modalHeaderProps: {
                     bottomAddons,
-                    ...typedRestBottomSheetProps.bottomSheetProps,
+                    ...restProps.modalHeaderProps,
                 },
             }
             : {
-                modalHeaderProps: {
+                bottomSheetProps: {
                     bottomAddons,
-                    ...typedRestModalProps.modalHeaderProps,
+                    ...restProps.bottomSheetProps,
                 },
-            }), optionsListProps: optionsListProps, ...restProps, ...(useWithApplyHook && applyProps) }));
+            }), ...(useWithApplyHook && applyProps) }));
 });
 
 export { SelectMobile };

package/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/modern/presets/index.js

@@ -1,3 +1,3 @@
 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-6a076c91.js';

package/modern/presets/useSelectWithApply/hook.js

@@ -1,4 +1,4 @@
 import 'react';
 import 'deep-equal';
 import '../../utils.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-6a076c91.js';

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

@@ -1,6 +1,6 @@
 import 'react';
 import '../../../components/options-list/Component.js';
 import '../../../consts.js';
-export { O as OptionsListWithApply } from '../../../hook-b0f48fdd.js';
+export { O as OptionsListWithApply } from '../../../hook-6a076c91.js';
 import './footer/Component.js';
 import './header/Component.js';

package/modern/presets/useSelectWithApply/options-list-with-apply/footer/Component.js

@@ -2,13 +2,13 @@ import React from 'react';
 import { ButtonDesktop } from '@alfalab/core-components-button/modern/desktop';
 import { getDataTestId } from '@alfalab/core-components-shared/modern';
 
-const styles = {"footer":"select__footer_mtsft"};
+const styles = {"footer":"select__footer_1i5y0","button":"select__button_1i5y0"};
 require('./index.css')
 
 const Footer = ({ handleApply, handleClear, showClear, selectedDraft = [], dataTestId, }) => (React.createElement("div", { 
     // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
     tabIndex: 0, className: styles.footer },
-    React.createElement(ButtonDesktop, { size: 32, view: 'primary', onClick: handleApply, dataTestId: getDataTestId(dataTestId, 'apply') }, "\u041F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C"),
-    showClear && selectedDraft.length > 0 && (React.createElement(ButtonDesktop, { size: 32, view: 'secondary', onClick: handleClear, dataTestId: getDataTestId(dataTestId, 'clear') }, "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C"))));
+    React.createElement(ButtonDesktop, { size: 32, view: 'primary', onClick: handleApply, dataTestId: getDataTestId(dataTestId, 'apply'), className: styles.button }, "\u041F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C"),
+    showClear && selectedDraft.length > 0 && (React.createElement(ButtonDesktop, { size: 32, view: 'secondary', onClick: handleClear, dataTestId: getDataTestId(dataTestId, 'clear'), className: styles.button }, "\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C"))));
 
 export { Footer };

package/modern/presets/useSelectWithApply/options-list-with-apply/footer/index.css

@@ -1,4 +1,4 @@
-/* hash: 1atn7 */
+/* hash: 467s1 */
 :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root {
     --color-light-bg-primary: #fff; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
@@ -17,10 +17,10 @@
     --gap-s: 12px;
 } :root {
 } :root {
-} .select__footer_mtsft {
+} .select__footer_1i5y0 {
     background-color: var(--color-light-bg-primary);
     padding: var(--gap-s);
     outline: none
-} .select__footer_mtsft > * + * {
+} .select__footer_1i5y0 > .select__button_1i5y0 + .select__button_1i5y0 {
         margin-left: var(--gap-xs);
     }

package/modern/presets/useSelectWithApply/options-list-with-apply/header/Component.js

@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import { Checkbox } from '@alfalab/core-components-checkbox/modern';
 
-const styles = {"desktop":"select__desktop_1d88n","mobile":"select__mobile_1d88n"};
+const styles = {"desktop":"select__desktop_14hbg","mobile":"select__mobile_14hbg"};
 require('./index.css')
 
 const Header = ({ onChange, checked, indeterminate, mobile }) => (React.createElement("div", { className: cn({ [styles.desktop]: !mobile, [styles.mobile]: mobile }) },

package/modern/presets/useSelectWithApply/options-list-with-apply/header/index.css

@@ -1,4 +1,4 @@
-/* hash: aayk5 */
+/* hash: 7p34l */
 :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } /* deprecated */ :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
@@ -16,8 +16,8 @@
     --gap-s: 12px;
 } :root {
 } :root {
-} .select__desktop_1d88n {
+} .select__desktop_14hbg {
     padding: var(--gap-s);
-} .select__mobile_1d88n {
+} .select__mobile_14hbg {
     padding: var(--gap-s) var(--gap-xs);
 }

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

@@ -1 +1 @@
-export * from "../../../hook-b0f48fdd";
+export * from "../../../hook-6a076c91";

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

@@ -1 +1 @@
-export { O as OptionsListWithApply } from '../../../hook-b0f48fdd.js';
+export { O as OptionsListWithApply } from '../../../hook-6a076c91.js';

package/modern/presets/useSelectWithLoading/hook.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Skeleton } from '@alfalab/core-components-skeleton/modern';
 import { Option } from '../../components/option/Component.js';
 
-const styles = {"skeleton":"select__skeleton_tq0ek"};
+const styles = {"skeleton":"select__skeleton_170xy"};
 require('./index.css')
 
 function useSelectWithLoading({ loading = false, visibleOptions = 6, Option: Option$1 = Option, }) {

package/modern/presets/useSelectWithLoading/index.css

@@ -1,5 +1,5 @@
-/* hash: gk7un */
-.select__skeleton_tq0ek {
+/* hash: hkekb */
+.select__skeleton_170xy {
     position: absolute;
     top: 50%;
     transform: translateY(-50%);

package/modern/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-b0f48fdd.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-6a076c91.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/modern/typings.d.ts

@@ -5,7 +5,7 @@ import { InputProps } from "@alfalab/core-components-input";
 import { ModalProps } from "@alfalab/core-components-modal";
 import { ModalFooterProps, ModalHeaderProps } from "@alfalab/core-components-modal/shared";
 import { PopoverProps } from "@alfalab/core-components-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/modern/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/modern/utils.js

@@ -20,7 +20,7 @@ const joinOptions = ({ selected, selectedMultiple, }) => {
     }, []);
 };
 // За один проход делает список пунктов меню плоским и находит выбранные пункты по ключу
-function processOptions(options, selected = [], filterFn = () => true) {
+function processOptions(options, selected = [], filterFn = () => true, filterGroup = false) {
     const flatOptions = [];
     const filteredOptions = [];
     const selectedArray = Array.isArray(selected) ? selected : [selected];
@@ -28,12 +28,20 @@ function processOptions(options, selected = [], filterFn = () => true) {
     const selectedKeys = selectedArray.filter((option) => typeof option === 'string');
     const isSelected = (option) => selectedKeys.includes(option.key);
     const process = (option) => {
-        if (isSelected(option)) {
+        const 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((option) => {
@@ -47,14 +55,16 @@ function processOptions(options, selected = [], filterFn = () => true) {
                 if (matched)
                     group.options.push(groupOption);
             });
-            if (group.options.length)
+            if (group.options.length) {
                 filteredOptions.push(group);
+                return;
+            }
+            if (!filterGroup)
+                return;
         }
-        else {
-            const matched = process(option);
-            if (matched)
-                filteredOptions.push(option);
-        }
+        const matched = process(option);
+        if (matched)
+            filteredOptions.push(option);
     });
     return { filteredOptions, flatOptions, selectedOptions };
 }
@@ -84,6 +94,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;
@@ -136,4 +149,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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alfalab/core-components-select",
-    "version": "17.5.1",
+    "version": "17.6.0",
     "description": "Select component",
     "keywords": [],
     "license": "MIT",

package/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/presets/index.js

@@ -4,7 +4,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-23a1acb8.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../hook-4d5fa450.js');
 
 
 

package/presets/useSelectWithApply/hook.js

@@ -6,7 +6,7 @@ require('tslib');
 require('react');
 require('deep-equal');
 require('../../utils.js');
-var presets_useSelectWithApply_optionsListWithApply_Component = require('../../hook-23a1acb8.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../../hook-4d5fa450.js');
 
 
 

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

@@ -6,7 +6,7 @@ require('tslib');
 require('react');
 require('../../../components/options-list/Component.js');
 require('../../../consts.js');
-var presets_useSelectWithApply_optionsListWithApply_Component = require('../../../hook-23a1acb8.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('../../../hook-4d5fa450.js');
 require('./footer/Component.js');
 require('./header/Component.js');