@alfalab/core-components-select 10.7.3 → 10.8.2

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

@@ -1,4 +1,4 @@
-/* hash: 1nn3i */
+/* hash: m867o */
 :root {
     --color-light-border-primary: #dbdee1;
     --color-light-text-secondary: #546272;
@@ -32,27 +32,27 @@
 
     /* optgroup */
 }
-.select__virtualOptionsList_l1ipl {
+.select__virtualOptionsList_of2jd {
     width: 100%;
     outline: none;
     box-sizing: border-box;
     position: relative;
 }
-.select__scrollable_l1ipl {
+.select__scrollable_of2jd {
     overflow: auto;
     width: 100%;
 }
-.select__inner_l1ipl {
+.select__inner_of2jd {
     position: relative;
     width: 100%;
 }
-.select__virtualRow_l1ipl {
+.select__virtualRow_of2jd {
     position: absolute;
     top: 0;
     left: 0;
     width: 100%
 }
-.select__virtualRow_l1ipl:before {
+.select__virtualRow_of2jd:before {
         content: '';
         position: absolute;
         z-index: 1;
@@ -63,18 +63,18 @@
         background: var(--select-option-divider-background);
         display: var(--select-option-divider-display);
     }
-.select__virtualRow_l1ipl:first-child:before {
+.select__virtualRow_of2jd:first-child:before {
         display: none;
     }
-.select__highlighted_l1ipl:before,
-    .select__highlighted_l1ipl + .select__virtualRow_l1ipl:before {
+.select__highlighted_of2jd:before,
+    .select__highlighted_of2jd + .select__virtualRow_of2jd:before {
         display: none;
     }
-.select__emptyPlaceholder_l1ipl {
+.select__emptyPlaceholder_of2jd {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
 }
-.select__l_l1ipl .select__emptyPlaceholder_l1ipl,
-.select__xl_l1ipl .select__emptyPlaceholder_l1ipl {
+.select__l_of2jd .select__emptyPlaceholder_of2jd,
+.select__xl_of2jd .select__emptyPlaceholder_of2jd {
     padding: var(--gap-xl) var(--gap-m);
 }

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

@@ -2,10 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../tslib.es6-b07d064f.js');
+require('../../tslib.es6-42d27d11.js');
 require('react');
 require('classnames');
+require('@alfalab/hooks');
 require('../../utils.js');
+require('@alfalab/core-components-scrollbar');
 require('../optgroup/Component.js');
 require('react-virtual');
 var components_virtualOptionsList_Component = require('./Component.js');

package/dist/{esm/Component-228962a7.d.ts → cssm/Component-ab46cfa1.d.ts}

@@ -19,7 +19,7 @@ type SelectMobileProps = Omit<BaseSelectProps, 'OptionsList' | 'Checkmark' | 'on
      */
     swipeable?: boolean;
 };
-declare const SelectMobile: React.ForwardRefExoticComponent<Pick<BaseSelectProps, "block" | "size" | "className" | "fieldClassName" | "disabled" | "error" | "hint" | "label" | "dataTestId" | "id" | "placeholder" | "onFocus" | "onBlur" | "onChange" | "preventFlip" | "popperClassName" | "open" | "name" | "options" | "multiple" | "selected" | "valueRenderer" | "Optgroup" | "visibleOptions" | "Arrow" | "optionGroupClassName" | "Option" | "optionsListClassName" | "optionClassName" | "autocomplete" | "allowUnselect" | "closeOnSelect" | "circularNavigation" | "nativeSelect" | "defaultOpen" | "popoverPosition" | "optionsListWidth" | "optionsSize" | "fieldProps" | "optionsListProps" | "optionProps" | "onOpen" | "Field" | "updatePopover" | "zIndexPopover" | "showEmptyOptionsList"> & {
+declare const SelectMobile: React.ForwardRefExoticComponent<Pick<BaseSelectProps, "block" | "size" | "className" | "fieldClassName" | "disabled" | "error" | "hint" | "label" | "dataTestId" | "id" | "placeholder" | "onFocus" | "onBlur" | "onChange" | "preventFlip" | "popperClassName" | "open" | "name" | "options" | "multiple" | "selected" | "valueRenderer" | "Optgroup" | "optionsListWidth" | "visibleOptions" | "Arrow" | "optionGroupClassName" | "Option" | "optionsListClassName" | "optionClassName" | "autocomplete" | "allowUnselect" | "closeOnSelect" | "circularNavigation" | "nativeSelect" | "defaultOpen" | "popoverPosition" | "optionsSize" | "fieldProps" | "optionsListProps" | "optionProps" | "onOpen" | "Field" | "updatePopover" | "zIndexPopover" | "showEmptyOptionsList"> & {
     /**
      * Футер
      */

package/dist/cssm/{Component-25917959.js → Component-ab46cfa1.js}

@@ -12,6 +12,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('./components/arrow/index.module.css');
 var components_arrow_Component = require('./components/arrow/Component.js');
 var mergeRefs = require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('./components/optgroup/index.module.css');
 var components_optgroup_Component = require('./components/optgroup/Component.js');
 var components_optionsList_Component = require('./components/options-list/Component.js');
@@ -20,7 +21,7 @@ require('./components/checkmark/index.module.css');
 require('./components/option/index.module.css');
 var components_option_Component = require('./components/option/Component.js');
 var downshift = require('downshift');
-var components_baseSelect_Component = require('./Component-9bc41b6c.js');
+var components_baseSelect_Component = require('./Component-e3a61749.js');
 require('./Component.js');
 var coreComponentsBottomSheet = require('@alfalab/core-components-bottom-sheet/dist/cssm');
 var coreComponentsButton = require('@alfalab/core-components-button/dist/cssm');

package/dist/cssm/{Component-9bc41b6c.js → Component-e3a61749.js}

@@ -239,7 +239,7 @@ var BaseSelect = React.forwardRef(function (_a, ref) {
             }, dataTestId: getDataTestId(dataTestId, 'field') }, fieldProps)),
         name && !nativeSelect && renderValue(),
         !nativeSelect && (React__default['default'].createElement(coreComponentsPopover.Popover, { open: open, withTransition: false, anchorElement: fieldRef.current, position: popoverPosition, preventFlip: preventFlip, popperClassName: cn__default['default'](styles__default['default'].popoverInner, popperClassName), update: updatePopover, zIndex: zIndexPopover }, needRenderOptionsList && (React__default['default'].createElement("div", tslib_es6.__assign({}, menuProps, { className: cn__default['default'](optionsListClassName, styles__default['default'].optionsList) }),
-            React__default['default'].createElement(OptionsList, tslib_es6.__assign({}, optionsListProps, { flatOptions: flatOptions, highlightedIndex: highlightedIndex, open: open, size: size, options: options, Optgroup: Optgroup, Option: Option, selectedItems: selectedItems, setSelectedItems: setSelectedItems, toggleMenu: toggleMenu, getOptionProps: getOptionProps, visibleOptions: visibleOptions, onScroll: onScroll, dataTestId: getDataTestId(dataTestId, 'options-list') }))))))));
+            React__default['default'].createElement(OptionsList, tslib_es6.__assign({}, optionsListProps, { optionsListWidth: optionsListWidth, flatOptions: flatOptions, highlightedIndex: highlightedIndex, open: open, size: size, options: options, Optgroup: Optgroup, Option: Option, selectedItems: selectedItems, setSelectedItems: setSelectedItems, toggleMenu: toggleMenu, getOptionProps: getOptionProps, visibleOptions: visibleOptions, onScroll: onScroll, dataTestId: getDataTestId(dataTestId, 'options-list') }))))))));
 });
 
 exports.BaseSelect = BaseSelect;

package/dist/cssm/Component.d.ts

@@ -82,7 +82,7 @@ type SelectProps = Omit<BaseSelectProps, 'fieldProps'> & {
      */
     fieldProps?: FormControlProps & Record<string, unknown>;
 };
-declare const Select: React.ForwardRefExoticComponent<Pick<BaseSelectProps, "block" | "size" | "className" | "fieldClassName" | "disabled" | "error" | "hint" | "label" | "dataTestId" | "id" | "placeholder" | "onFocus" | "onBlur" | "onChange" | "onScroll" | "preventFlip" | "popperClassName" | "open" | "name" | "options" | "multiple" | "selected" | "valueRenderer" | "Optgroup" | "visibleOptions" | "Arrow" | "optionGroupClassName" | "Option" | "optionsListClassName" | "optionClassName" | "autocomplete" | "allowUnselect" | "closeOnSelect" | "circularNavigation" | "nativeSelect" | "defaultOpen" | "popoverPosition" | "optionsListWidth" | "optionsSize" | "optionsListProps" | "optionProps" | "onOpen" | "Field" | "OptionsList" | "updatePopover" | "zIndexPopover" | "showEmptyOptionsList"> & {
+declare const Select: React.ForwardRefExoticComponent<Pick<BaseSelectProps, "block" | "size" | "className" | "fieldClassName" | "disabled" | "error" | "hint" | "label" | "dataTestId" | "id" | "placeholder" | "onFocus" | "onBlur" | "onChange" | "onScroll" | "preventFlip" | "popperClassName" | "open" | "name" | "options" | "multiple" | "selected" | "valueRenderer" | "Optgroup" | "optionsListWidth" | "visibleOptions" | "Arrow" | "optionGroupClassName" | "Option" | "optionsListClassName" | "optionClassName" | "autocomplete" | "allowUnselect" | "closeOnSelect" | "circularNavigation" | "nativeSelect" | "defaultOpen" | "popoverPosition" | "optionsSize" | "optionsListProps" | "optionProps" | "onOpen" | "Field" | "OptionsList" | "updatePopover" | "zIndexPopover" | "showEmptyOptionsList"> & {
     /**
      * Пропсы, которые будут прокинуты в компонент поля
      */

package/dist/cssm/Component.js

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('./components/arrow/index.module.css');
 var components_arrow_Component = require('./components/arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('./components/optgroup/index.module.css');
 var components_optgroup_Component = require('./components/optgroup/Component.js');
 require('./components/options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('./components/native-select/Component.js');
-var components_baseSelect_Component = require('./Component-9bc41b6c.js');
+var components_baseSelect_Component = require('./Component-e3a61749.js');
 require('./components/base-select/index.module.css');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

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

@@ -11,7 +11,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('../native-select/Component.js');
-var components_baseSelect_Component = require('../../Component-9bc41b6c.js');
+var components_baseSelect_Component = require('../../Component-e3a61749.js');
 require('./index.module.css');
 
 

package/dist/cssm/components/base-select/index.d.ts

@@ -1 +1 @@
-export * from "../../Component-9bc41b6c";
+export * from "../../Component-e3a61749";

package/dist/cssm/components/base-select/index.js

@@ -11,7 +11,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('../native-select/Component.js');
-var components_baseSelect_Component = require('../../Component-9bc41b6c.js');
+var components_baseSelect_Component = require('../../Component-e3a61749.js');
 require('./index.module.css');
 
 

package/dist/cssm/components/index.js

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('./arrow/index.module.css');
 var components_arrow_Component = require('./arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('./optgroup/index.module.css');
 var components_optgroup_Component = require('./optgroup/Component.js');
 require('./options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('./native-select/Component.js');
-var components_baseSelect_Component = require('../Component-9bc41b6c.js');
+var components_baseSelect_Component = require('../Component-e3a61749.js');
 require('./base-select/index.module.css');
 require('../Component.js');
 require('@alfalab/core-components-bottom-sheet/dist/cssm');
@@ -37,7 +38,7 @@ require('./select-mobile/options-list/index.module.css');
 require('./select-mobile/options-list/Component.js');
 require('./select-mobile/checkmark/index.module.css');
 require('./select-mobile/checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../Component-25917959.js');
+var presets_useSelectWithApply_hook = require('../Component-ab46cfa1.js');
 require('../presets/useSelectWithApply/options-list-with-apply/index.module.css');
 require('./select-mobile/index.module.css');
 require('react-virtual');

package/dist/cssm/components/options-list/Component.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib_es6 = require('../../tslib.es6-f8106a15.js');
 var React = require('react');
 var cn = require('classnames');
+var hooks = require('@alfalab/hooks');
 var utils = require('../../utils.js');
 var mergeRefs = require('react-merge-refs');
+var coreComponentsScrollbar = require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../optgroup/index.module.css');
 var components_optgroup_Component = require('../optgroup/Component.js');
 var styles = require('./index.module.css');
@@ -24,27 +26,41 @@ var createCounter = function () {
     return function () { return count++; };
 };
 var OptionsList = React.forwardRef(function (_a, ref) {
-    var _b = _a.size, size = _b === void 0 ? 's' : _b, className = _a.className, optionGroupClassName = _a.optionGroupClassName, Option = _a.Option, getOptionProps = _a.getOptionProps, _c = _a.options, options = _c === void 0 ? [] : _c, _d = _a.Optgroup, Optgroup = _d === void 0 ? components_optgroup_Component.Optgroup : _d, dataTestId = _a.dataTestId, emptyPlaceholder = _a.emptyPlaceholder, _e = _a.visibleOptions, visibleOptions = _e === void 0 ? 5 : _e, onScroll = _a.onScroll, open = _a.open, header = _a.header, footer = _a.footer;
+    var _b = _a.size, size = _b === void 0 ? 's' : _b, className = _a.className, optionGroupClassName = _a.optionGroupClassName, Option = _a.Option, getOptionProps = _a.getOptionProps, _c = _a.options, options = _c === void 0 ? [] : _c, _d = _a.Optgroup, Optgroup = _d === void 0 ? components_optgroup_Component.Optgroup : _d, dataTestId = _a.dataTestId, emptyPlaceholder = _a.emptyPlaceholder, _e = _a.visibleOptions, visibleOptions = _e === void 0 ? 5 : _e, onScroll = _a.onScroll, open = _a.open, header = _a.header, footer = _a.footer, optionsListWidth = _a.optionsListWidth, nativeScrollbarProp = _a.nativeScrollbar;
+    var nativeScrollbar = hooks.useMedia([[true, '(max-width: 1023px)']], false)[0];
+    nativeScrollbar = Boolean(nativeScrollbarProp !== null && nativeScrollbarProp !== void 0 ? nativeScrollbarProp : nativeScrollbar);
     var renderOption = React.useCallback(function (option, index) { return (React__default['default'].createElement(Option, tslib_es6.__assign({ key: option.key }, getOptionProps(option, index)))); }, [getOptionProps]);
     var listRef = React.useRef(null);
+    var scrollbarRef = React.useRef(null);
     var counter = createCounter();
     var renderGroup = React.useCallback(function (group) { return (React__default['default'].createElement(Optgroup, { className: optionGroupClassName, label: group.label, key: group.label, size: size }, group.options.map(function (option) { return renderOption(option, counter()); }))); }, [optionGroupClassName, counter, renderOption, size]);
-    utils.useVisibleOptions({
-        visibleOptions: visibleOptions,
+    utils.useVisibleOptions(tslib_es6.__assign(tslib_es6.__assign({}, (!nativeScrollbar && { styleTargetRef: scrollbarRef })), { visibleOptions: visibleOptions,
         listRef: listRef,
-        open: open,
-        invalidate: options,
-    });
+        open: open, invalidate: options }));
     if (options.length === 0 && !emptyPlaceholder) {
         return null;
     }
-    return (React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].optionsList, styles__default['default'][size], className), "data-test-id": dataTestId },
-        header,
-        React__default['default'].createElement("div", { className: styles__default['default'].scrollable, ref: mergeRefs__default['default']([listRef, ref]), onScroll: onScroll },
+    var renderListItems = function () {
+        return (React__default['default'].createElement(React__default['default'].Fragment, null,
             options.map(function (option) {
                 return utils.isGroup(option) ? renderGroup(option) : renderOption(option, counter());
             }),
-            emptyPlaceholder && options.length === 0 && (React__default['default'].createElement("div", { className: styles__default['default'].emptyPlaceholder }, emptyPlaceholder))),
+            emptyPlaceholder && options.length === 0 && (React__default['default'].createElement("div", { className: styles__default['default'].emptyPlaceholder }, emptyPlaceholder))));
+    };
+    var renderWithCustomScrollbar = function () {
+        var scrollableNodeProps = {
+            onScroll: onScroll,
+            'data-test-id': dataTestId,
+            ref: ref,
+        };
+        return (React__default['default'].createElement(coreComponentsScrollbar.Scrollbar, { className: styles__default['default'].scrollable, ref: scrollbarRef, horizontalAutoStretch: optionsListWidth === 'content', scrollableNodeProps: scrollableNodeProps, contentNodeProps: { ref: listRef } }, renderListItems()));
+    };
+    var renderWithNativeScrollbar = function () {
+        return (React__default['default'].createElement("div", { className: styles__default['default'].scrollable, ref: mergeRefs__default['default']([listRef, ref]), onScroll: onScroll }, renderListItems()));
+    };
+    return (React__default['default'].createElement("div", tslib_es6.__assign({}, (nativeScrollbar && { 'data-test-id': dataTestId }), { className: cn__default['default'](styles__default['default'].optionsList, styles__default['default'][size], className) }),
+        header,
+        nativeScrollbar ? renderWithNativeScrollbar() : renderWithCustomScrollbar(),
         footer));
 });
 

package/dist/cssm/components/options-list/index.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 require('../../tslib.es6-f8106a15.js');
 require('react');
 require('classnames');
+require('@alfalab/hooks');
 require('../../utils.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../optgroup/index.module.css');
 require('../optgroup/Component.js');
 require('./index.module.css');

package/dist/cssm/components/select-mobile/Component.js

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('../arrow/index.module.css');
 require('../arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../optgroup/index.module.css');
 require('../optgroup/Component.js');
 require('../options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('../native-select/Component.js');
-require('../../Component-9bc41b6c.js');
+require('../../Component-e3a61749.js');
 require('../base-select/index.module.css');
 require('../../Component.js');
 require('@alfalab/core-components-bottom-sheet/dist/cssm');
@@ -37,7 +38,7 @@ require('./options-list/index.module.css');
 require('./options-list/Component.js');
 require('./checkmark/index.module.css');
 require('./checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../../Component-25917959.js');
+var presets_useSelectWithApply_hook = require('../../Component-ab46cfa1.js');
 require('../../presets/useSelectWithApply/options-list-with-apply/index.module.css');
 require('./index.module.css');
 require('react-virtual');

package/dist/cssm/components/select-mobile/index.d.ts

@@ -1 +1 @@
-export * from "../../Component-25917959";
+export * from "../../Component-ab46cfa1";

package/dist/cssm/components/select-mobile/index.js

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('../arrow/index.module.css');
 require('../arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../optgroup/index.module.css');
 require('../optgroup/Component.js');
 require('../options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('../native-select/Component.js');
-require('../../Component-9bc41b6c.js');
+require('../../Component-e3a61749.js');
 require('../base-select/index.module.css');
 require('../../Component.js');
 require('@alfalab/core-components-bottom-sheet/dist/cssm');
@@ -37,7 +38,7 @@ require('./options-list/index.module.css');
 require('./options-list/Component.js');
 require('./checkmark/index.module.css');
 require('./checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../../Component-25917959.js');
+var presets_useSelectWithApply_hook = require('../../Component-ab46cfa1.js');
 require('../../presets/useSelectWithApply/options-list-with-apply/index.module.css');
 require('./index.module.css');
 require('react-virtual');

package/dist/cssm/components/virtual-options-list/Component.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { OptionsListProps } from "../../typings";
-type VirtualOptionsList = OptionsListProps & {
+type VirtualOptionsList = Omit<OptionsListProps, 'optionsListWidth'> & {
     /**
      * Число отрисованных пунктов до\после видимого окна
      */
     overscan?: number;
 };
-declare const VirtualOptionsList: ({ size, flatOptions, highlightedIndex, className, getOptionProps, Option, open, options, overscan, Optgroup, dataTestId, emptyPlaceholder, visibleOptions, onScroll, header, footer, }: VirtualOptionsList) => JSX.Element;
+declare const VirtualOptionsList: ({ size, flatOptions, highlightedIndex, className, getOptionProps, Option, open, options, overscan, Optgroup, dataTestId, emptyPlaceholder, visibleOptions, onScroll, header, footer, nativeScrollbar: nativeScrollbarProp, }: VirtualOptionsList) => JSX.Element;
 export { VirtualOptionsList };

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

@@ -5,7 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib_es6 = require('../../tslib.es6-f8106a15.js');
 var React = require('react');
 var cn = require('classnames');
+var hooks = require('@alfalab/hooks');
 var utils = require('../../utils.js');
+var coreComponentsScrollbar = require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../optgroup/index.module.css');
 var components_optgroup_Component = require('../optgroup/Component.js');
 var reactVirtual = require('react-virtual');
@@ -19,9 +21,10 @@ var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
 
 /* eslint-disable react-hooks/exhaustive-deps */
 var VirtualOptionsList = function (_a) {
-    var _b = _a.size, size = _b === void 0 ? 's' : _b, _c = _a.flatOptions, flatOptions = _c === void 0 ? [] : _c, _d = _a.highlightedIndex, highlightedIndex = _d === void 0 ? -1 : _d, className = _a.className, getOptionProps = _a.getOptionProps, Option = _a.Option, open = _a.open, _e = _a.options, options = _e === void 0 ? [] : _e, _f = _a.overscan, overscan = _f === void 0 ? 10 : _f, _g = _a.Optgroup, Optgroup = _g === void 0 ? components_optgroup_Component.Optgroup : _g, dataTestId = _a.dataTestId, emptyPlaceholder = _a.emptyPlaceholder, _h = _a.visibleOptions, visibleOptions = _h === void 0 ? 5 : _h, onScroll = _a.onScroll, header = _a.header, footer = _a.footer;
+    var _b = _a.size, size = _b === void 0 ? 's' : _b, _c = _a.flatOptions, flatOptions = _c === void 0 ? [] : _c, _d = _a.highlightedIndex, highlightedIndex = _d === void 0 ? -1 : _d, className = _a.className, getOptionProps = _a.getOptionProps, Option = _a.Option, open = _a.open, _e = _a.options, options = _e === void 0 ? [] : _e, _f = _a.overscan, overscan = _f === void 0 ? 10 : _f, _g = _a.Optgroup, Optgroup = _g === void 0 ? components_optgroup_Component.Optgroup : _g, dataTestId = _a.dataTestId, emptyPlaceholder = _a.emptyPlaceholder, _h = _a.visibleOptions, visibleOptions = _h === void 0 ? 5 : _h, onScroll = _a.onScroll, header = _a.header, footer = _a.footer, nativeScrollbarProp = _a.nativeScrollbar;
     var listRef = React.useRef(null);
     var parentRef = React.useRef(null);
+    var scrollbarRef = React.useRef(null);
     var _j = React.useState(0), visibleOptionsInvalidateKey = _j[0], setVisibleOptionsInvalidateKey = _j[1];
     var prevHighlightedIndex = utils.usePrevious(highlightedIndex) || -1;
     var rowVirtualizer = reactVirtual.useVirtual({
@@ -29,6 +32,8 @@ var VirtualOptionsList = function (_a) {
         parentRef: parentRef,
         overscan: overscan,
     });
+    var nativeScrollbar = hooks.useMedia([[true, '(max-width: 1023px)']], false)[0];
+    nativeScrollbar = Boolean(nativeScrollbarProp !== null && nativeScrollbarProp !== void 0 ? nativeScrollbarProp : nativeScrollbar);
     // Сколл к выбранному пункту при открытии меню
     React.useEffect(function () {
         if (open) {
@@ -69,7 +74,7 @@ var VirtualOptionsList = function (_a) {
         visibleOptions: visibleOptions,
         invalidate: visibleOptionsInvalidateKey,
         listRef: listRef,
-        styleTargetRef: parentRef,
+        styleTargetRef: nativeScrollbar ? parentRef : scrollbarRef,
         open: open,
     });
     // Т.к. рендерится плоский список, необходимо знать индекс, когда начинается новая группа
@@ -86,23 +91,35 @@ var VirtualOptionsList = function (_a) {
             return acc;
         }, {});
     }, [options]);
+    var contentNodeProps = {
+        className: styles__default['default'].inner,
+        style: { height: rowVirtualizer.totalSize + "px" },
+        ref: listRef,
+    };
+    var renderList = function () {
+        return rowVirtualizer.virtualItems.map(function (virtualRow) {
+            var _a;
+            var option = flatOptions[virtualRow.index];
+            var group = options[groupStartIndexes[virtualRow.index]];
+            return (React__default['default'].createElement("div", { key: virtualRow.index, ref: virtualRow.measureRef, className: cn__default['default'](styles__default['default'].virtualRow, (_a = {},
+                    _a[styles__default['default'].highlighted] = highlightedIndex === virtualRow.index,
+                    _a)), style: {
+                    transform: "translateY(" + virtualRow.start + "px)",
+                } },
+                group && React__default['default'].createElement(Optgroup, { label: group.label }),
+                !utils.isGroup(option) && React__default['default'].createElement(Option, tslib_es6.__assign({}, getOptionProps(option, virtualRow.index)))));
+        });
+    };
+    var renderWithCustomScrollbar = function () {
+        return (React__default['default'].createElement(coreComponentsScrollbar.Scrollbar, { className: styles__default['default'].scrollable, ref: scrollbarRef, scrollableNodeProps: { onScroll: onScroll, ref: parentRef }, contentNodeProps: contentNodeProps }, renderList()));
+    };
+    var renderWithNativeScrollbar = function () {
+        return (React__default['default'].createElement("div", { className: styles__default['default'].scrollable, ref: parentRef, onScroll: onScroll },
+            React__default['default'].createElement("div", tslib_es6.__assign({}, contentNodeProps), renderList())));
+    };
     return (React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].virtualOptionsList, styles__default['default'][size], className), "data-test-id": dataTestId },
         header,
-        React__default['default'].createElement("div", { className: styles__default['default'].scrollable, ref: parentRef, onScroll: onScroll },
-            React__default['default'].createElement("div", { className: styles__default['default'].inner, style: {
-                    height: rowVirtualizer.totalSize + "px",
-                }, ref: listRef }, rowVirtualizer.virtualItems.map(function (virtualRow) {
-                var _a;
-                var option = flatOptions[virtualRow.index];
-                var group = options[groupStartIndexes[virtualRow.index]];
-                return (React__default['default'].createElement("div", { key: virtualRow.index, ref: virtualRow.measureRef, className: cn__default['default'](styles__default['default'].virtualRow, (_a = {},
-                        _a[styles__default['default'].highlighted] = highlightedIndex === virtualRow.index,
-                        _a)), style: {
-                        transform: "translateY(" + virtualRow.start + "px)",
-                    } },
-                    group && React__default['default'].createElement(Optgroup, { label: group.label }),
-                    !utils.isGroup(option) && (React__default['default'].createElement(Option, tslib_es6.__assign({}, getOptionProps(option, virtualRow.index))))));
-            }))),
+        nativeScrollbar ? renderWithNativeScrollbar() : renderWithCustomScrollbar(),
         emptyPlaceholder && options.length === 0 && (React__default['default'].createElement("div", { className: styles__default['default'].emptyPlaceholder }, emptyPlaceholder)),
         footer));
 };

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

@@ -5,7 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 require('../../tslib.es6-f8106a15.js');
 require('react');
 require('classnames');
+require('@alfalab/hooks');
 require('../../utils.js');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../optgroup/index.module.css');
 require('../optgroup/Component.js');
 require('react-virtual');

package/dist/cssm/index.js

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('./components/arrow/index.module.css');
 var components_arrow_Component = require('./components/arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('./components/optgroup/index.module.css');
 var components_optgroup_Component = require('./components/optgroup/Component.js');
 require('./components/options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('./components/native-select/Component.js');
-var components_baseSelect_Component = require('./Component-9bc41b6c.js');
+var components_baseSelect_Component = require('./Component-e3a61749.js');
 require('./components/base-select/index.module.css');
 var Component = require('./Component.js');
 require('@alfalab/core-components-bottom-sheet/dist/cssm');
@@ -37,7 +38,7 @@ require('./components/select-mobile/options-list/index.module.css');
 require('./components/select-mobile/options-list/Component.js');
 require('./components/select-mobile/checkmark/index.module.css');
 require('./components/select-mobile/checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('./Component-25917959.js');
+var presets_useSelectWithApply_hook = require('./Component-ab46cfa1.js');
 require('./presets/useSelectWithApply/options-list-with-apply/index.module.css');
 require('./components/select-mobile/index.module.css');
 require('react-virtual');

package/dist/cssm/presets/index.js

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('../components/arrow/index.module.css');
 require('../components/arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../components/optgroup/index.module.css');
 require('../components/optgroup/Component.js');
 require('../components/options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('../components/native-select/Component.js');
-require('../Component-9bc41b6c.js');
+require('../Component-e3a61749.js');
 require('../components/base-select/index.module.css');
 require('../Component.js');
 require('@alfalab/core-components-bottom-sheet/dist/cssm');
@@ -37,7 +38,7 @@ require('../components/select-mobile/options-list/index.module.css');
 require('../components/select-mobile/options-list/Component.js');
 require('../components/select-mobile/checkmark/index.module.css');
 require('../components/select-mobile/checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../Component-25917959.js');
+var presets_useSelectWithApply_hook = require('../Component-ab46cfa1.js');
 require('./useSelectWithApply/options-list-with-apply/index.module.css');
 require('../components/select-mobile/index.module.css');
 require('react-virtual');

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

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('../../components/arrow/index.module.css');
 require('../../components/arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../../components/optgroup/index.module.css');
 require('../../components/optgroup/Component.js');
 require('../../components/options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('../../components/native-select/Component.js');
-require('../../Component-9bc41b6c.js');
+require('../../Component-e3a61749.js');
 require('../../components/base-select/index.module.css');
 require('../../Component.js');
 require('@alfalab/core-components-bottom-sheet/dist/cssm');
@@ -37,7 +38,7 @@ require('../../components/select-mobile/options-list/index.module.css');
 require('../../components/select-mobile/options-list/Component.js');
 require('../../components/select-mobile/checkmark/index.module.css');
 require('../../components/select-mobile/checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../../Component-25917959.js');
+var presets_useSelectWithApply_hook = require('../../Component-ab46cfa1.js');
 require('./options-list-with-apply/index.module.css');
 require('../../components/select-mobile/index.module.css');
 require('react-virtual');

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

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('../../../components/arrow/index.module.css');
 require('../../../components/arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../../../components/optgroup/index.module.css');
 require('../../../components/optgroup/Component.js');
 require('../../../components/options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('../../../components/native-select/Component.js');
-require('../../../Component-9bc41b6c.js');
+require('../../../Component-e3a61749.js');
 require('../../../components/base-select/index.module.css');
 require('../../../Component.js');
 require('@alfalab/core-components-bottom-sheet/dist/cssm');
@@ -37,7 +38,7 @@ require('../../../components/select-mobile/options-list/index.module.css');
 require('../../../components/select-mobile/options-list/Component.js');
 require('../../../components/select-mobile/checkmark/index.module.css');
 require('../../../components/select-mobile/checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../../../Component-25917959.js');
+var presets_useSelectWithApply_hook = require('../../../Component-ab46cfa1.js');
 require('./index.module.css');
 require('../../../components/select-mobile/index.module.css');
 require('react-virtual');

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

@@ -1 +1 @@
-export * from "../../../Component-25917959";
+export * from "../../../Component-ab46cfa1";

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

@@ -14,6 +14,7 @@ require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('../../../components/arrow/index.module.css');
 require('../../../components/arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar/dist/cssm');
 require('../../../components/optgroup/index.module.css');
 require('../../../components/optgroup/Component.js');
 require('../../../components/options-list/index.module.css');
@@ -27,7 +28,7 @@ require('resize-observer');
 require('@alfalab/core-components-popover/dist/cssm');
 require('downshift');
 require('../../../components/native-select/Component.js');
-require('../../../Component-9bc41b6c.js');
+require('../../../Component-e3a61749.js');
 require('../../../components/base-select/index.module.css');
 require('../../../Component.js');
 require('@alfalab/core-components-bottom-sheet/dist/cssm');
@@ -37,7 +38,7 @@ require('../../../components/select-mobile/options-list/index.module.css');
 require('../../../components/select-mobile/options-list/Component.js');
 require('../../../components/select-mobile/checkmark/index.module.css');
 require('../../../components/select-mobile/checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../../../Component-25917959.js');
+var presets_useSelectWithApply_hook = require('../../../Component-ab46cfa1.js');
 require('./index.module.css');
 require('../../../components/select-mobile/index.module.css');
 require('react-virtual');

package/dist/cssm/typings.d.ts

@@ -412,6 +412,15 @@ type OptionsListProps = {
      * Нужно ли показывать футер
      */
     showFooter?: boolean;
+    /**
+     * Нужно ли использовать нативный скроллбар
+     */
+    nativeScrollbar?: boolean;
+    /**
+     * Управляет шириной выпадающего меню.
+     * Ширину определяет контент, либо ширина равна ширине поля
+     */
+    optionsListWidth?: BaseSelectProps['optionsListWidth'];
     /**
      * Обработчик подтверждения изменений
      */