@alfalab/core-components-select 15.2.3 → 16.0.0

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

@@ -7,8 +7,9 @@ var React = require('react');
 var mergeRefs = require('react-merge-refs');
 var reactVirtual = require('react-virtual');
 var cn = require('classnames');
+var coreComponentsMq = require('@alfalab/core-components-mq');
 var coreComponentsScrollbar = require('@alfalab/core-components-scrollbar');
-var hooks = require('@alfalab/hooks');
+var coreComponentsShared = require('@alfalab/core-components-shared');
 var consts = require('../../consts.js');
 var utils = require('../../utils.js');
 var components_optgroup_Component = require('../optgroup/Component.js');
@@ -19,7 +20,7 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultCompat(mergeRefs);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"virtualOptionsList":"select__virtualOptionsList_12nzi","virtualOptionsListHeader":"select__virtualOptionsListHeader_12nzi","virtualOptionsListFooter":"select__virtualOptionsListFooter_12nzi","withBorder":"select__withBorder_12nzi","scrollable":"select__scrollable_12nzi","inner":"select__inner_12nzi","virtualRow":"select__virtualRow_12nzi","highlighted":"select__highlighted_12nzi","emptyPlaceholder":"select__emptyPlaceholder_12nzi","l":"select__l_12nzi","xl":"select__xl_12nzi"};
+var styles = {"virtualOptionsList":"select__virtualOptionsList_1o6ad","virtualOptionsListHeader":"select__virtualOptionsListHeader_1o6ad","virtualOptionsListFooter":"select__virtualOptionsListFooter_1o6ad","withBorder":"select__withBorder_1o6ad","scrollable":"select__scrollable_1o6ad","inner":"select__inner_1o6ad","virtualRow":"select__virtualRow_1o6ad","highlighted":"select__highlighted_1o6ad","emptyPlaceholder":"select__emptyPlaceholder_1o6ad","l":"select__l_1o6ad","xl":"select__xl_1o6ad"};
 require('./index.css')
 
 var VirtualOptionsList = React.forwardRef(function (_a, ref) {
@@ -30,7 +31,10 @@ var VirtualOptionsList = React.forwardRef(function (_a, ref) {
     var scrollbarRef = React.useRef(null);
     var _k = React.useState(''), visibleOptionsInvalidateKey = _k[0], setVisibleOptionsInvalidateKey = _k[1];
     var prevHighlightedIndex = utils.usePrevious(highlightedIndex) || -1;
-    var nativeScrollbar = hooks.useMedia([[true, '(max-width: 1023px)']], false)[0];
+    var query = '(max-width: 1023px)';
+    var nativeScrollbar = coreComponentsMq.useMatchMedia(query, function () {
+        return coreComponentsShared.isClient() ? window.matchMedia(query).matches : true;
+    })[0];
     var rowVirtualizer = reactVirtual.useVirtual({
         size: flatOptions.length,
         parentRef: (ref || parentRef),

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

@@ -1,9 +1,9 @@
-/* hash: 186st */
+/* hash: hr27r */
 :root {
 } /* deprecated */ :root {
-    --color-light-border-primary: #dcdcdd;
-    --color-light-border-secondary: #e9e9eb;
-    --color-light-text-secondary: rgba(60, 60, 67, 0.66); /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+    --color-light-border-primary: #d5d6dc;
+    --color-light-border-secondary: #e7e8ec;
+    --color-light-text-secondary: rgba(4, 4, 19, 0.55); /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root {
 } :root {
@@ -35,34 +35,34 @@
     /* checkmark */
 
     /* optgroup */
-} .select__virtualOptionsList_12nzi {
+} .select__virtualOptionsList_1o6ad {
     width: 100%;
     outline: none;
     box-sizing: border-box;
     position: sticky;
-} .select__virtualOptionsListHeader_12nzi {
+} .select__virtualOptionsListHeader_1o6ad {
     box-sizing: border-box;
     border-bottom: 1px solid var(--color-light-border-secondary);
-} .select__virtualOptionsListFooter_12nzi {
+} .select__virtualOptionsListFooter_1o6ad {
     position: sticky;
     bottom: 0;
     box-sizing: border-box;
     border-top: 1px solid transparent
-} .select__virtualOptionsListFooter_12nzi.select__withBorder_12nzi {
+} .select__virtualOptionsListFooter_1o6ad.select__withBorder_1o6ad {
         border-top: 1px solid var(--color-light-border-secondary);
-    } .select__scrollable_12nzi {
+    } .select__scrollable_1o6ad {
     position: relative;
     overflow: auto;
     width: 100%;
-} .select__inner_12nzi {
+} .select__inner_1o6ad {
     position: relative;
     width: 100%;
-} .select__virtualRow_12nzi {
+} .select__virtualRow_1o6ad {
     position: absolute;
     top: 0;
     left: 0;
     width: 100%
-} .select__virtualRow_12nzi:before {
+} .select__virtualRow_1o6ad:before {
         content: '';
         position: absolute;
         z-index: 1;
@@ -72,15 +72,15 @@
         height: 1px;
         background: var(--select-option-divider-background);
         display: var(--select-option-divider-display);
-    } .select__virtualRow_12nzi:first-child:before {
+    } .select__virtualRow_1o6ad:first-child:before {
         display: none;
-    } .select__highlighted_12nzi:before,
-    .select__highlighted_12nzi + .select__virtualRow_12nzi:before {
+    } .select__highlighted_1o6ad:before,
+    .select__highlighted_1o6ad + .select__virtualRow_1o6ad:before {
         display: none;
-    } .select__emptyPlaceholder_12nzi {
+    } .select__emptyPlaceholder_1o6ad {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
-} .select__l_12nzi .select__emptyPlaceholder_12nzi,
-.select__xl_12nzi .select__emptyPlaceholder_12nzi {
+} .select__l_1o6ad .select__emptyPlaceholder_1o6ad,
+.select__xl_1o6ad .select__emptyPlaceholder_1o6ad {
     padding: var(--gap-xl) var(--gap-m);
 }

package/components/virtual-options-list/index.js

@@ -8,8 +8,9 @@ require('react');
 require('react-merge-refs');
 require('react-virtual');
 require('classnames');
+require('@alfalab/core-components-mq');
 require('@alfalab/core-components-scrollbar');
-require('@alfalab/hooks');
+require('@alfalab/core-components-shared');
 require('../../consts.js');
 require('../../utils.js');
 require('../optgroup/Component.js');

package/cssm/Component.desktop.d.ts

@@ -1,19 +1,6 @@
 /// <reference types="react" />
 import React from 'react';
-import { BaseFormControlProps } from "./index-ebda875c";
-import { BaseSelectProps } from "./typings";
-type FormControlDesktopProps = Omit<BaseFormControlProps, "styles" | "colorStyles">;
-type SelectFieldProps = Omit<FormControlDesktopProps, 'size'> & Record<string, unknown>;
-type SelectDesktopProps = Omit<BaseSelectProps, 'fieldProps'> & {
-    /**
-     * Пропсы, которые будут прокинуты в компонент поля
-     */
-    fieldProps?: SelectFieldProps;
-};
-declare const SelectDesktop: React.ForwardRefExoticComponent<Omit<BaseSelectProps, "fieldProps"> & {
-    /**
-     * Пропсы, которые будут прокинуты в компонент поля
-     */
-    fieldProps?: SelectFieldProps | undefined;
+declare const SelectDesktop: React.ForwardRefExoticComponent<Omit<import("./typings").BaseSelectProps, "fieldProps"> & {
+    fieldProps?: import("./typings").SelectFieldProps | undefined;
 } & React.RefAttributes<HTMLDivElement>>;
-export { SelectFieldProps, SelectDesktopProps, SelectDesktop };
+export { SelectDesktop };

package/cssm/Component.desktop.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var desktop = require('@alfalab/core-components-form-control/cssm/desktop');
+var coreComponentsPopover = require('@alfalab/core-components-popover/cssm');
 var components_arrow_Component = require('./components/arrow/Component.js');
 var components_baseSelect_Component = require('./components/base-select/Component.js');
 var components_field_Component = require('./components/field/Component.js');
@@ -17,13 +18,14 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('./components/arrow/index.module.css');
 require('react-merge-refs');
 require('@juggle/resize-observer');
+require('compute-scroll-into-view');
 require('downshift');
-require('@alfalab/core-components-popover/cssm');
 require('@alfalab/core-components-shared/cssm');
 require('@alfalab/hooks');
 require('./utils.js');
 require('./components/native-select/Component.js');
 require('./components/base-select/index.module.css');
+require('./components/base-select/mobile.module.css');
 require('./components/field/index.module.css');
 require('./components/optgroup/index.module.css');
 require('./components/checkmark/Component.js');
@@ -35,6 +37,7 @@ require('./components/checkmark/index.module.css');
 require('./components/checkmark-mobile/Component.js');
 require('./components/checkmark-mobile/index.module.css');
 require('./components/option/index.module.css');
+require('@alfalab/core-components-mq/cssm');
 require('@alfalab/core-components-scrollbar/cssm');
 require('./consts.js');
 require('./components/options-list/index.module.css');
@@ -48,7 +51,7 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 var SelectDesktop = React.forwardRef(function (_a, ref) {
     var _b = _a.Arrow, Arrow = _b === void 0 ? components_arrow_Component.Arrow : _b, _c = _a.Field, Field = _c === void 0 ? components_field_Component.Field : _c, _d = _a.OptionsList, OptionsList = _d === void 0 ? components_optionsList_Component.OptionsList : _d, _e = _a.Optgroup, Optgroup = _e === void 0 ? components_optgroup_Component.Optgroup : _e, _f = _a.Option, Option = _f === void 0 ? components_option_Component.Option : _f, _g = _a.Search, Search = _g === void 0 ? components_search_Component.Search : _g, _h = _a.fieldProps, fieldProps = _h === void 0 ? {} : _h, restProps = tslib.__rest(_a, ["Arrow", "Field", "OptionsList", "Optgroup", "Option", "Search", "fieldProps"]);
-    return (React__default.default.createElement(components_baseSelect_Component.BaseSelect, tslib.__assign({ ref: ref, Option: Option, Field: Field, fieldProps: tslib.__assign({ FormControlComponent: desktop.FormControlDesktop }, fieldProps), Search: Search, Optgroup: Optgroup, OptionsList: OptionsList, Arrow: Arrow }, restProps)));
+    return (React__default.default.createElement(components_baseSelect_Component.BaseSelect, tslib.__assign({ ref: ref, view: 'desktop', Option: Option, Field: Field, fieldProps: tslib.__assign({ FormControlComponent: desktop.FormControlDesktop }, fieldProps), Search: Search, Optgroup: Optgroup, OptionsList: OptionsList, Arrow: Arrow, Popover: coreComponentsPopover.Popover }, restProps)));
 });
 
 exports.SelectDesktop = SelectDesktop;

package/cssm/Component.mobile.d.ts

@@ -1,41 +1,5 @@
 /// <reference types="react" />
 import React from 'react';
-import { ReactNode } from "react";
-import { BottomSheetProps } from "@alfalab/core-components-bottom-sheet";
-import { UseSelectWithApplyProps } from "./hook-8abfea97";
-import { BaseSelectProps } from "./typings";
-type AdditionalMobileProps = {
-    /**
-     * Футер
-     * @deprecated Используйте bottomSheetProps.actionButton
-     */
-    footer?: ReactNode;
-    /**
-     * Будет ли свайпаться шторка
-     * @deprecated Используйте bottomSheetProps.swipeable
-     */
-    swipeable?: boolean;
-    /**
-     * Дополнительные пропсы шторки
-     */
-    bottomSheetProps?: Partial<BottomSheetProps>;
-    /**
-     * Показывать кнопку очистки
-     */
-    showClear?: UseSelectWithApplyProps['showClear'];
-    /**
-     * Показывать пункт "Выбрать все"
-     */
-    showSelectAll?: UseSelectWithApplyProps['showSelectAll'];
-    /**
-     * Показывать пункт "Выбрать все" в заголовке списка
-     */
-    showHeaderWithSelectAll?: UseSelectWithApplyProps['showHeaderWithSelectAll'];
-    /**
-     * Использовать ли хук useSelectWithApply
-     */
-    useWithApplyHook?: boolean;
-};
-type SelectMobileProps = Omit<BaseSelectProps, 'Checkmark' | 'onScroll'> & AdditionalMobileProps;
-declare const SelectMobile: React.ForwardRefExoticComponent<Omit<BaseSelectProps, "onScroll" | "Checkmark"> & AdditionalMobileProps & React.RefAttributes<unknown>>;
-export { AdditionalMobileProps, SelectMobileProps, SelectMobile };
+import { SelectMobileProps } from "./typings";
+declare const SelectMobile: React.ForwardRefExoticComponent<SelectMobileProps & React.RefAttributes<unknown>>;
+export { SelectMobile };

package/cssm/Component.mobile.js

@@ -4,33 +4,37 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var coreComponentsBottomSheet = require('@alfalab/core-components-bottom-sheet/cssm');
 var mobile = require('@alfalab/core-components-form-control/cssm/mobile');
+var Component_mobile = require('@alfalab/core-components-modal/cssm/Component.mobile');
 var components_arrow_Component = require('./components/arrow/Component.js');
-var components_baseSelectMobile_Component = require('./components/base-select-mobile/Component.js');
-var components_baseSelectMobile_footer_Component = require('./components/base-select-mobile/footer/Component.js');
+var components_baseSelect_Component = require('./components/base-select/Component.js');
 var components_field_Component = require('./components/field/Component.js');
+var components_footer_Component = require('./components/footer/Component.js');
 var components_optgroup_Component = require('./components/optgroup/Component.js');
 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-244c8d6e.js');
+var presets_useSelectWithApply_optionsListWithApply_Component = require('./hook-2f9ec939.js');
 var presets_useSelectWithApply_optionsListWithApply_header_Component = require('./presets/useSelectWithApply/options-list-with-apply/header/Component.js');
 require('classnames');
 require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('./components/arrow/index.module.css');
 require('react-merge-refs');
+require('@juggle/resize-observer');
+require('compute-scroll-into-view');
 require('downshift');
-require('@alfalab/core-components-bottom-sheet/cssm');
-require('@alfalab/core-components-modal/cssm/mobile');
 require('@alfalab/core-components-shared/cssm');
+require('@alfalab/hooks');
 require('./utils.js');
-require('./components/base-select-mobile/index.module.css');
+require('./components/native-select/Component.js');
+require('./components/base-select/index.module.css');
+require('./components/base-select/mobile.module.css');
+require('./components/field/index.module.css');
 require('@alfalab/core-components-base-modal/cssm');
 require('@alfalab/core-components-button/cssm/mobile');
-require('./components/base-select-mobile/footer/index.module.css');
-require('@alfalab/hooks');
-require('./components/field/index.module.css');
+require('./components/footer/index.module.css');
 require('./components/optgroup/index.module.css');
 require('./components/checkmark/Component.js');
 require('@alfalab/core-components-badge/cssm');
@@ -41,6 +45,7 @@ require('./components/checkmark/index.module.css');
 require('./components/checkmark-mobile/Component.js');
 require('./components/checkmark-mobile/index.module.css');
 require('./components/option/index.module.css');
+require('@alfalab/core-components-mq/cssm');
 require('@alfalab/core-components-scrollbar/cssm');
 require('./consts.js');
 require('./components/options-list/index.module.css');
@@ -60,11 +65,13 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 var VIRTUAL_OPTIONS_LIST_THRESHOLD = 30;
 var SelectMobile = React.forwardRef(function (_a, ref) {
-    var _b = _a.autocomplete, autocomplete = _b === void 0 ? false : _b, _c = _a.multiple, multiple = _c === void 0 ? false : _c, _d = _a.allowUnselect, allowUnselect = _d === void 0 ? false : _d, _e = _a.disabled, disabled = _e === void 0 ? false : _e, _f = _a.closeOnSelect, closeOnSelect = _f === void 0 ? !multiple : _f, _g = _a.circularNavigation, circularNavigation = _g === void 0 ? false : _g, _h = _a.defaultOpen, defaultOpen = _h === void 0 ? false : _h, openProp = _a.open, _j = _a.size, size = _j === void 0 ? 'm' : _j, _k = _a.optionsSize, optionsSize = _k === void 0 ? 'm' : _k, _l = _a.fieldProps, fieldProps = _l === void 0 ? {} : _l, _m = _a.optionProps, optionProps = _m === void 0 ? {} : _m, _o = _a.optionsListProps, optionsListProps = _o === void 0 ? {} : _o, _p = _a.Arrow, Arrow = _p === void 0 ? components_arrow_Component.Arrow : _p, _q = _a.Field, Field = _q === void 0 ? components_field_Component.Field : _q, _r = _a.Optgroup, Optgroup = _r === void 0 ? components_optgroup_Component.Optgroup : _r, _s = _a.Option, Option = _s === void 0 ? components_option_Component.Option : _s, _t = _a.Search, Search = _t === void 0 ? components_search_Component.Search : _t, selected = _a.selected, options = _a.options, _u = _a.OptionsList, OptionsList = _u === void 0 ? options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
+    var _b = _a.autocomplete, autocomplete = _b === void 0 ? false : _b, _c = _a.multiple, multiple = _c === void 0 ? false : _c, _d = _a.allowUnselect, allowUnselect = _d === void 0 ? false : _d, _e = _a.disabled, disabled = _e === void 0 ? false : _e, _f = _a.closeOnSelect, closeOnSelect = _f === void 0 ? !multiple : _f, _g = _a.circularNavigation, circularNavigation = _g === void 0 ? false : _g, _h = _a.defaultOpen, defaultOpen = _h === void 0 ? false : _h, openProp = _a.open, _j = _a.size, size = _j === void 0 ? 'm' : _j, _k = _a.optionsSize, optionsSize = _k === void 0 ? 'm' : _k, _l = _a.fieldProps, fieldProps = _l === void 0 ? {} : _l, _m = _a.optionProps, optionProps = _m === void 0 ? {} : _m, _o = _a.optionsListProps, optionsListProps = _o === void 0 ? {} : _o, _p = _a.Arrow, Arrow = _p === void 0 ? components_arrow_Component.Arrow : _p, _q = _a.Field, Field = _q === void 0 ? components_field_Component.Field : _q, _r = _a.Optgroup, Optgroup = _r === void 0 ? components_optgroup_Component.Optgroup : _r, _s = _a.Option, Option = _s === void 0 ? components_option_Component.Option : _s, _t = _a.Search, Search = _t === void 0 ? components_search_Component.Search : _t, selected = _a.selected, _u = _a.isBottomSheet, isBottomSheet = _u === void 0 ? true : _u, options = _a.options, _v = _a.OptionsList, OptionsList = _v === void 0 ? options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
         ? components_virtualOptionsList_Component.VirtualOptionsList
-        : components_optionsList_Component.OptionsList : _u, onChange = _a.onChange, bottomSheetProps = _a.bottomSheetProps, _v = _a.showClear, showClear = _v === void 0 ? true : _v, showSelectAll = _a.showSelectAll, showHeaderWithSelectAll = _a.showHeaderWithSelectAll, _w = _a.useWithApplyHook, useWithApplyHook = _w === void 0 ? multiple : _w, showSearch = _a.showSearch, searchProps = _a.searchProps, restProps = tslib.__rest(_a, ["autocomplete", "multiple", "allowUnselect", "disabled", "closeOnSelect", "circularNavigation", "defaultOpen", "open", "size", "optionsSize", "fieldProps", "optionProps", "optionsListProps", "Arrow", "Field", "Optgroup", "Option", "Search", "selected", "options", "OptionsList", "onChange", "bottomSheetProps", "showClear", "showSelectAll", "showHeaderWithSelectAll", "useWithApplyHook", "showSearch", "searchProps"]);
+        : components_optionsList_Component.OptionsList : _v, onChange = _a.onChange, _w = _a.showClear, showClear = _w === void 0 ? true : _w, showSelectAll = _a.showSelectAll, showHeaderWithSelectAll = _a.showHeaderWithSelectAll, _x = _a.useWithApplyHook, useWithApplyHook = _x === void 0 ? multiple : _x, showSearch = _a.showSearch, searchProps = _a.searchProps, restProps = tslib.__rest(_a, ["autocomplete", "multiple", "allowUnselect", "disabled", "closeOnSelect", "circularNavigation", "defaultOpen", "open", "size", "optionsSize", "fieldProps", "optionProps", "optionsListProps", "Arrow", "Field", "Optgroup", "Option", "Search", "selected", "isBottomSheet", "options", "OptionsList", "onChange", "showClear", "showSelectAll", "showHeaderWithSelectAll", "useWithApplyHook", "showSearch", "searchProps"]);
+    var typedRestBottomSheetProps = restProps;
+    var typedRestModalProps = restProps;
     var applyProps = presets_useSelectWithApply_optionsListWithApply_Component.useSelectWithApply({
-        optionsListProps: tslib.__assign(tslib.__assign({}, optionsListProps), { Footer: components_baseSelectMobile_footer_Component.Footer }),
+        optionsListProps: tslib.__assign(tslib.__assign({}, optionsListProps), { Footer: components_footer_Component.Footer }),
         OptionsList: OptionsList,
         showSearch: showSearch,
         searchProps: searchProps,
@@ -74,7 +81,14 @@ var SelectMobile = React.forwardRef(function (_a, ref) {
         showClear: showClear,
         showSelectAll: showSelectAll,
     });
-    return (React__default.default.createElement(components_baseSelectMobile_Component.BaseSelectMobile, tslib.__assign({ ref: ref, autocomplete: autocomplete, multiple: multiple, allowUnselect: allowUnselect, disabled: disabled, closeOnSelect: closeOnSelect, circularNavigation: circularNavigation, defaultOpen: defaultOpen, open: openProp, size: size, optionsSize: optionsSize, fieldProps: tslib.__assign({ FormControlComponent: mobile.FormControlMobile }, fieldProps), optionProps: optionProps, Arrow: Arrow, Field: Field, Optgroup: Optgroup, Option: Option, Search: Search, isBottomSheet: true, options: options, selected: selected, onChange: onChange, OptionsList: OptionsList, showSearch: showSearch, searchProps: searchProps, bottomSheetProps: tslib.__assign({ bottomAddons: useWithApplyHook && showHeaderWithSelectAll && (React__default.default.createElement(presets_useSelectWithApply_optionsListWithApply_header_Component.Header, tslib.__assign({}, applyProps.optionsListProps.headerProps, { mobile: true }))) }, bottomSheetProps), optionsListProps: optionsListProps }, restProps, (useWithApplyHook && applyProps))));
+    var bottomAddons = useWithApplyHook && showHeaderWithSelectAll && (React__default.default.createElement(presets_useSelectWithApply_optionsListWithApply_header_Component.Header, tslib.__assign({}, applyProps.optionsListProps.headerProps, { mobile: true })));
+    return (React__default.default.createElement(components_baseSelect_Component.BaseSelect, tslib.__assign({ 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: tslib.__assign({ FormControlComponent: mobile.FormControlMobile }, fieldProps), optionProps: optionProps, Arrow: Arrow, Field: Field, Optgroup: Optgroup, Option: Option, Search: Search, isBottomSheet: isBottomSheet, options: options, selected: selected, onChange: onChange, OptionsList: OptionsList, showSearch: showSearch, searchProps: searchProps, BottomSheet: coreComponentsBottomSheet.BottomSheet, ModalMobile: Component_mobile.ModalMobile }, (isBottomSheet
+        ? {
+            bottomSheetProps: tslib.__assign({ bottomAddons: bottomAddons }, typedRestBottomSheetProps.bottomSheetProps),
+        }
+        : {
+            modalHeaderProps: tslib.__assign({ bottomAddons: bottomAddons }, typedRestModalProps.modalHeaderProps),
+        }), { optionsListProps: optionsListProps }, restProps, (useWithApplyHook && applyProps))));
 });
 
 exports.SelectMobile = SelectMobile;

package/cssm/Component.modal.mobile.d.ts

@@ -1,60 +1,4 @@
 /// <reference types="react" />
 import React from 'react';
-import { ModalMobile } from "./Component.mobile-f1f15074";
-import { UseSelectWithApplyProps } from "./hook-8abfea97";
-import { BaseSelectProps } from "./typings";
-type SelectModalMobileProps = Omit<BaseSelectProps, 'Checkmark' | 'onScroll'> & {
-    /**
-     * Показывать кнопку очистки
-     */
-    showClear?: UseSelectWithApplyProps['showClear'];
-    /**
-     * Показывать пункт "Выбрать все"
-     */
-    showSelectAll?: UseSelectWithApplyProps['showSelectAll'];
-    /**
-     *  Дополнительные пропсы шапки модалки
-     */
-    modalHeaderProps?: Partial<React.ComponentProps<typeof ModalMobile.Header>>;
-    /**
-     *  Дополнительные пропсы модалки
-     */
-    modalProps?: Partial<React.ComponentProps<typeof ModalMobile>>;
-    /**
-     *  Дополнительные пропсы футера модалки
-     */
-    modalFooterProps?: Partial<React.ComponentProps<typeof ModalMobile.Footer>>;
-    showHeaderWithSelectAll?: UseSelectWithApplyProps['showHeaderWithSelectAll'];
-    /**
-     * Использовать ли хук useSelectWithApply
-     */
-    useWithApplyHook?: boolean;
-};
-declare const SelectModalMobile: React.ForwardRefExoticComponent<Omit<BaseSelectProps, "onScroll" | "Checkmark"> & {
-    /**
-     * Показывать кнопку очистки
-     */
-    showClear?: UseSelectWithApplyProps['showClear'];
-    /**
-     * Показывать пункт "Выбрать все"
-     */
-    showSelectAll?: UseSelectWithApplyProps['showSelectAll'];
-    /**
-     *  Дополнительные пропсы шапки модалки
-     */
-    modalHeaderProps?: Partial<import("./Component.mobile-f1f15074").HeaderProps> | undefined;
-    /**
-     *  Дополнительные пропсы модалки
-     */
-    modalProps?: Partial<import("./typings-baf4875b").ModalMobileProps & React.RefAttributes<HTMLDivElement>> | undefined;
-    /**
-     *  Дополнительные пропсы футера модалки
-     */
-    modalFooterProps?: Partial<import("./Component.mobile-f1f15074").FooterProps> | undefined;
-    showHeaderWithSelectAll?: UseSelectWithApplyProps['showHeaderWithSelectAll'];
-    /**
-     * Использовать ли хук useSelectWithApply
-     */
-    useWithApplyHook?: boolean | undefined;
-} & React.RefAttributes<unknown>>;
-export { SelectModalMobileProps, SelectModalMobile };
+declare const SelectModalMobile: React.ForwardRefExoticComponent<Omit<import("./typings").BaseSelectProps, "Checkmark"> & import("./typings").AdditionalMobileProps & import("./typings").ModalSelectMobileProps & React.RefAttributes<unknown>>;
+export { SelectModalMobile };

package/cssm/Component.modal.mobile.js

@@ -4,37 +4,34 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var mobile = require('@alfalab/core-components-form-control/cssm/mobile');
-var components_arrow_Component = require('./components/arrow/Component.js');
-var components_baseSelectMobile_Component = require('./components/base-select-mobile/Component.js');
-var components_baseSelectMobile_footer_Component = require('./components/base-select-mobile/footer/Component.js');
-var components_field_Component = require('./components/field/Component.js');
-var components_optgroup_Component = require('./components/optgroup/Component.js');
-var components_option_Component = require('./components/option/Component.js');
-var components_optionsList_Component = require('./components/options-list/Component.js');
-var components_virtualOptionsList_Component = require('./components/virtual-options-list/Component.js');
-var presets_useSelectWithApply_optionsListWithApply_Component = require('./hook-244c8d6e.js');
-var presets_useSelectWithApply_optionsListWithApply_header_Component = require('./presets/useSelectWithApply/options-list-with-apply/header/Component.js');
+var Component_mobile = require('./Component.mobile.js');
+require('@alfalab/core-components-bottom-sheet/cssm');
+require('@alfalab/core-components-form-control/cssm/mobile');
+require('@alfalab/core-components-modal/cssm/Component.mobile');
+require('./components/arrow/Component.js');
 require('classnames');
 require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('./components/arrow/index.module.css');
+require('./components/base-select/Component.js');
 require('react-merge-refs');
+require('@juggle/resize-observer');
+require('compute-scroll-into-view');
 require('downshift');
-require('@alfalab/core-components-bottom-sheet/cssm');
-require('@alfalab/core-components-modal/cssm/mobile');
 require('@alfalab/core-components-shared/cssm');
+require('@alfalab/hooks');
 require('./utils.js');
-require('./components/search/Component.js');
-require('@alfalab/core-components-input/cssm');
-require('@alfalab/icons-glyph/MagnifierMIcon');
-require('./components/search/index.module.css');
-require('./components/base-select-mobile/index.module.css');
+require('./components/native-select/Component.js');
+require('./components/base-select/index.module.css');
+require('./components/base-select/mobile.module.css');
+require('./components/field/Component.js');
+require('./components/field/index.module.css');
+require('./components/footer/Component.js');
 require('@alfalab/core-components-base-modal/cssm');
 require('@alfalab/core-components-button/cssm/mobile');
-require('./components/base-select-mobile/footer/index.module.css');
-require('@alfalab/hooks');
-require('./components/field/index.module.css');
+require('./components/footer/index.module.css');
+require('./components/optgroup/Component.js');
 require('./components/optgroup/index.module.css');
+require('./components/option/Component.js');
 require('./components/checkmark/Component.js');
 require('@alfalab/core-components-badge/cssm');
 require('@alfalab/core-components-checkbox/cssm');
@@ -44,37 +41,29 @@ require('./components/checkmark/index.module.css');
 require('./components/checkmark-mobile/Component.js');
 require('./components/checkmark-mobile/index.module.css');
 require('./components/option/index.module.css');
+require('./components/options-list/Component.js');
+require('@alfalab/core-components-mq/cssm');
 require('@alfalab/core-components-scrollbar/cssm');
 require('./consts.js');
 require('./components/options-list/index.module.css');
+require('./components/search/Component.js');
+require('@alfalab/core-components-input/cssm');
+require('@alfalab/icons-glyph/MagnifierMIcon');
+require('./components/search/index.module.css');
+require('./components/virtual-options-list/Component.js');
 require('react-virtual');
 require('./components/virtual-options-list/index.module.css');
+require('./hook-2f9ec939.js');
 require('./presets/useSelectWithApply/options-list-with-apply/footer/Component.js');
 require('@alfalab/core-components-button/cssm/desktop');
 require('./presets/useSelectWithApply/options-list-with-apply/footer/index.module.css');
+require('./presets/useSelectWithApply/options-list-with-apply/header/Component.js');
 require('./presets/useSelectWithApply/options-list-with-apply/header/index.module.css');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
-var VIRTUAL_OPTIONS_LIST_THRESHOLD = 30;
-var SelectModalMobile = React.forwardRef(function (_a, ref) {
-    var _b = _a.autocomplete, autocomplete = _b === void 0 ? false : _b, _c = _a.multiple, multiple = _c === void 0 ? false : _c, _d = _a.allowUnselect, allowUnselect = _d === void 0 ? false : _d, _e = _a.disabled, disabled = _e === void 0 ? false : _e, _f = _a.closeOnSelect, closeOnSelect = _f === void 0 ? !multiple : _f, _g = _a.circularNavigation, circularNavigation = _g === void 0 ? false : _g, _h = _a.defaultOpen, defaultOpen = _h === void 0 ? false : _h, openProp = _a.open, _j = _a.size, size = _j === void 0 ? 'm' : _j, _k = _a.optionsSize, optionsSize = _k === void 0 ? 'm' : _k, _l = _a.fieldProps, fieldProps = _l === void 0 ? {} : _l, _m = _a.optionProps, optionProps = _m === void 0 ? {} : _m, _o = _a.optionsListProps, optionsListProps = _o === void 0 ? {} : _o, _p = _a.Arrow, Arrow = _p === void 0 ? components_arrow_Component.Arrow : _p, _q = _a.Field, Field = _q === void 0 ? components_field_Component.Field : _q, _r = _a.Optgroup, Optgroup = _r === void 0 ? components_optgroup_Component.Optgroup : _r, _s = _a.Option, Option = _s === void 0 ? components_option_Component.Option : _s, selected = _a.selected, options = _a.options, _t = _a.OptionsList, OptionsList = _t === void 0 ? options.length > VIRTUAL_OPTIONS_LIST_THRESHOLD
-        ? components_virtualOptionsList_Component.VirtualOptionsList
-        : components_optionsList_Component.OptionsList : _t, onChange = _a.onChange, _u = _a.showClear, showClear = _u === void 0 ? true : _u, showSelectAll = _a.showSelectAll, _v = _a.useWithApplyHook, useWithApplyHook = _v === void 0 ? multiple : _v, modalHeaderProps = _a.modalHeaderProps, showHeaderWithSelectAll = _a.showHeaderWithSelectAll, showSearch = _a.showSearch, searchProps = _a.searchProps, restProps = tslib.__rest(_a, ["autocomplete", "multiple", "allowUnselect", "disabled", "closeOnSelect", "circularNavigation", "defaultOpen", "open", "size", "optionsSize", "fieldProps", "optionProps", "optionsListProps", "Arrow", "Field", "Optgroup", "Option", "selected", "options", "OptionsList", "onChange", "showClear", "showSelectAll", "useWithApplyHook", "modalHeaderProps", "showHeaderWithSelectAll", "showSearch", "searchProps"]);
-    var applyProps = presets_useSelectWithApply_optionsListWithApply_Component.useSelectWithApply({
-        optionsListProps: tslib.__assign(tslib.__assign({}, optionsListProps), { Footer: components_baseSelectMobile_footer_Component.Footer }),
-        OptionsList: OptionsList,
-        selected: selected,
-        options: options,
-        onChange: onChange,
-        showSearch: showSearch,
-        searchProps: searchProps,
-        showClear: showClear,
-        showSelectAll: showSelectAll,
-    });
-    return (React__default.default.createElement(components_baseSelectMobile_Component.BaseSelectMobile, tslib.__assign({ ref: ref, autocomplete: autocomplete, multiple: multiple, allowUnselect: allowUnselect, disabled: disabled, closeOnSelect: closeOnSelect, circularNavigation: circularNavigation, defaultOpen: defaultOpen, open: openProp, size: size, optionsSize: optionsSize, fieldProps: tslib.__assign({ FormControlComponent: mobile.FormControlMobile }, fieldProps), optionProps: optionProps, Arrow: Arrow, Field: Field, Optgroup: Optgroup, Option: Option, isBottomSheet: false, options: options, selected: selected, onChange: onChange, OptionsList: OptionsList, optionsListProps: optionsListProps, showSearch: showSearch, searchProps: searchProps, modalHeaderProps: tslib.__assign({ bottomAddons: useWithApplyHook && showHeaderWithSelectAll && (React__default.default.createElement(presets_useSelectWithApply_optionsListWithApply_header_Component.Header, tslib.__assign({}, applyProps.optionsListProps.headerProps, { mobile: true }))) }, modalHeaderProps) }, restProps, (useWithApplyHook && applyProps))));
-});
+var SelectModalMobile = React.forwardRef(function (props, ref) { return (React__default.default.createElement(Component_mobile.SelectMobile, tslib.__assign({}, props, { isBottomSheet: false, ref: ref }))); });
 
 exports.SelectModalMobile = SelectModalMobile;

package/cssm/Component.responsive.d.ts

@@ -1,19 +1,5 @@
 /// <reference types="react" />
 import React from 'react';
-import { AdditionalMobileProps } from "./Component.mobile";
-import { BaseSelectProps } from "./typings";
-type SelectResponsiveProps = BaseSelectProps & AdditionalMobileProps & {
-    /**
-     * Контрольная точка, с нее начинается desktop версия
-     * @default 1024
-     */
-    breakpoint?: number;
-};
-declare const SelectResponsive: React.ForwardRefExoticComponent<BaseSelectProps & AdditionalMobileProps & {
-    /**
-     * Контрольная точка, с нее начинается desktop версия
-     * @default 1024
-     */
-    breakpoint?: number | undefined;
-} & React.RefAttributes<HTMLDivElement>>;
-export { SelectResponsiveProps, SelectResponsive };
+import { SelectProps } from "./typings";
+declare const SelectResponsive: React.ForwardRefExoticComponent<SelectProps & React.RefAttributes<HTMLDivElement>>;
+export { SelectResponsive };

package/cssm/Component.responsive.js

@@ -4,10 +4,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var hooks = require('@alfalab/hooks');
+var coreComponentsMq = require('@alfalab/core-components-mq/cssm');
 var Component_desktop = require('./Component.desktop.js');
 var Component_mobile = require('./Component.mobile.js');
 require('@alfalab/core-components-form-control/cssm/desktop');
+require('@alfalab/core-components-popover/cssm');
 require('./components/arrow/Component.js');
 require('classnames');
 require('@alfalab/icons-glyph/ChevronDownMIcon');
@@ -15,12 +16,14 @@ require('./components/arrow/index.module.css');
 require('./components/base-select/Component.js');
 require('react-merge-refs');
 require('@juggle/resize-observer');
+require('compute-scroll-into-view');
 require('downshift');
-require('@alfalab/core-components-popover/cssm');
 require('@alfalab/core-components-shared/cssm');
+require('@alfalab/hooks');
 require('./utils.js');
 require('./components/native-select/Component.js');
 require('./components/base-select/index.module.css');
+require('./components/base-select/mobile.module.css');
 require('./components/field/Component.js');
 require('./components/field/index.module.css');
 require('./components/optgroup/Component.js');
@@ -43,19 +46,17 @@ require('./components/search/Component.js');
 require('@alfalab/core-components-input/cssm');
 require('@alfalab/icons-glyph/MagnifierMIcon');
 require('./components/search/index.module.css');
-require('@alfalab/core-components-form-control/cssm/mobile');
-require('./components/base-select-mobile/Component.js');
 require('@alfalab/core-components-bottom-sheet/cssm');
-require('@alfalab/core-components-modal/cssm/mobile');
-require('./components/base-select-mobile/index.module.css');
-require('./components/base-select-mobile/footer/Component.js');
+require('@alfalab/core-components-form-control/cssm/mobile');
+require('@alfalab/core-components-modal/cssm/Component.mobile');
+require('./components/footer/Component.js');
 require('@alfalab/core-components-base-modal/cssm');
 require('@alfalab/core-components-button/cssm/mobile');
-require('./components/base-select-mobile/footer/index.module.css');
+require('./components/footer/index.module.css');
 require('./components/virtual-options-list/Component.js');
 require('react-virtual');
 require('./components/virtual-options-list/index.module.css');
-require('./hook-244c8d6e.js');
+require('./hook-2f9ec939.js');
 require('./presets/useSelectWithApply/options-list-with-apply/footer/Component.js');
 require('@alfalab/core-components-button/cssm/desktop');
 require('./presets/useSelectWithApply/options-list-with-apply/footer/index.module.css');
@@ -67,12 +68,9 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 var SelectResponsive = React.forwardRef(function (_a, ref) {
-    var footer = _a.footer, swipeable = _a.swipeable, bottomSheetProps = _a.bottomSheetProps, OptionsList = _a.OptionsList, onScroll = _a.onScroll, fieldProps = _a.fieldProps, _b = _a.breakpoint, breakpoint = _b === void 0 ? 1024 : _b, restProps = tslib.__rest(_a, ["footer", "swipeable", "bottomSheetProps", "OptionsList", "onScroll", "fieldProps", "breakpoint"]);
-    var view = hooks.useMedia([
-        ['mobile', "(max-width: ".concat(breakpoint - 1, "px)")],
-        ['desktop', "(min-width: ".concat(breakpoint, "px)")],
-    ], 'desktop')[0];
-    return view === 'desktop' ? (React__default.default.createElement(Component_desktop.SelectDesktop, tslib.__assign({ OptionsList: OptionsList, onScroll: onScroll }, restProps, { ref: ref, fieldProps: fieldProps }))) : (React__default.default.createElement(Component_mobile.SelectMobile, tslib.__assign({ footer: footer, swipeable: swipeable, bottomSheetProps: bottomSheetProps, fieldProps: fieldProps }, restProps, { ref: ref })));
+    var onScroll = _a.onScroll, fieldProps = _a.fieldProps, _b = _a.breakpoint, breakpoint = _b === void 0 ? 1024 : _b, defaultMatchMediaValue = _a.defaultMatchMediaValue, restProps = tslib.__rest(_a, ["onScroll", "fieldProps", "breakpoint", "defaultMatchMediaValue"]);
+    var isDesktop = coreComponentsMq.useMatchMedia("(min-width: ".concat(breakpoint, "px)"), defaultMatchMediaValue)[0];
+    return isDesktop ? (React__default.default.createElement(Component_desktop.SelectDesktop, tslib.__assign({ onScroll: onScroll }, restProps, { ref: ref, fieldProps: fieldProps }))) : (React__default.default.createElement(Component_mobile.SelectMobile, tslib.__assign({ fieldProps: fieldProps }, restProps, { ref: ref })));
 });
 
 exports.SelectResponsive = SelectResponsive;