@alfalab/core-components-select 10.7.3 → 10.8.2

package/dist/components/option/index.css

@@ -1,4 +1,4 @@
-/* hash: sk43l */
+/* hash: 851vo */
 :root {
     --color-light-bg-primary: #fff;
     --color-light-bg-secondary: #f3f4f5;
@@ -53,7 +53,7 @@
 
     /* optgroup */
 }
-.select__option_5r59h {
+.select__option_94p39 {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -69,11 +69,11 @@
     position: relative;
     cursor: pointer
 }
-.select__option_5r59h:not(.select__disabled_5r59h):active {
+.select__option_94p39:not(.select__disabled_94p39):active {
         background: var(--select-option-active-background);
         color: var(--select-option-active-color);
     }
-.select__option_5r59h:before {
+.select__option_94p39:before {
         content: '';
         position: absolute;
         left: var(--select-option-left-padding);
@@ -84,60 +84,60 @@
         display: var(--select-option-divider-display);
         transition: opacity 0.2s ease;
     }
-.select__option_5r59h:first-child:before {
+.select__option_94p39:first-child:before {
         display: none;
     }
-.select__s_5r59h {
+.select__s_94p39 {
     min-height: var(--size-s-height);
 }
-.select__m_5r59h {
+.select__m_94p39 {
     min-height: var(--size-m-height);
 }
-.select__l_5r59h {
+.select__l_94p39 {
     min-height: var(--size-l-height);
 }
-.select__xl_5r59h {
+.select__xl_94p39 {
     min-height: var(--size-xl-height);
 }
-.select__l_5r59h,
-.select__xl_5r59h {
+.select__l_94p39,
+.select__xl_94p39 {
     padding-left: var(--select-option-l-left-padding);
     padding-right: var(--select-option-l-right-padding)
 }
-.select__l_5r59h:before, .select__xl_5r59h:before {
+.select__l_94p39:before, .select__xl_94p39:before {
         left: var(--select-option-l-left-padding);
         right: var(--select-option-l-right-padding);
     }
-.select__selected_5r59h {
+.select__selected_94p39 {
     background: var(--select-option-selected-background);
     color: var(--select-option-selected-color);
     cursor: default;
 }
-.select__highlighted_5r59h {
+.select__highlighted_94p39 {
     background: var(--select-option-hover-background);
     color: var(--select-option-hover-color)
 }
-.select__highlighted_5r59h:before,
-    .select__highlighted_5r59h + .select__option_5r59h:before {
+.select__highlighted_94p39:before,
+    .select__highlighted_94p39 + .select__option_94p39:before {
         opacity: 0;
     }
-.select__disabled_5r59h {
+.select__disabled_94p39 {
     cursor: var(--disabled-cursor);
     background: var(--select-option-disabled-background);
     color: var(--select-option-disabled-color);
 }
-.select__content_5r59h {
+.select__content_94p39 {
     overflow: hidden;
     flex: 1;
     text-overflow: ellipsis;
 }
-.select__textContent_5r59h {
+.select__textContent_94p39 {
     padding-top: var(--gap-s);
     padding-bottom: var(--gap-s);
 }
 /* IE min-height fix */
 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    .select__option_5r59h:after {
+    .select__option_94p39:after {
         min-height: inherit;
         font-size: 0;
         content: '';

package/dist/components/option/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../tslib.es6-b07d064f.js');
+require('../../tslib.es6-42d27d11.js');
 require('react');
 require('classnames');
 require('@alfalab/core-components-checkbox');

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

@@ -2,11 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-b07d064f.js');
+var tslib_es6 = require('../../tslib.es6-42d27d11.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');
 var components_optgroup_Component = require('../optgroup/Component.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -15,7 +17,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultLegacy(mergeRefs);
 
-var styles = {"optionsList":"select__optionsList_9017r","scrollable":"select__scrollable_9017r","emptyPlaceholder":"select__emptyPlaceholder_9017r","l":"select__l_9017r","xl":"select__xl_9017r"};
+var styles = {"optionsList":"select__optionsList_doe4n","scrollable":"select__scrollable_doe4n","emptyPlaceholder":"select__emptyPlaceholder_doe4n","l":"select__l_doe4n","xl":"select__xl_doe4n"};
 require('./index.css')
 
 var createCounter = function () {
@@ -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.optionsList, styles[size], className), "data-test-id": dataTestId },
-        header,
-        React__default['default'].createElement("div", { className: styles.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.emptyPlaceholder }, emptyPlaceholder))),
+            emptyPlaceholder && options.length === 0 && (React__default['default'].createElement("div", { className: styles.emptyPlaceholder }, emptyPlaceholder))));
+    };
+    var renderWithCustomScrollbar = function () {
+        var scrollableNodeProps = {
+            onScroll: onScroll,
+            'data-test-id': dataTestId,
+            ref: ref,
+        };
+        return (React__default['default'].createElement(coreComponentsScrollbar.Scrollbar, { className: styles.scrollable, ref: scrollbarRef, horizontalAutoStretch: optionsListWidth === 'content', scrollableNodeProps: scrollableNodeProps, contentNodeProps: { ref: listRef } }, renderListItems()));
+    };
+    var renderWithNativeScrollbar = function () {
+        return (React__default['default'].createElement("div", { className: styles.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.optionsList, styles[size], className) }),
+        header,
+        nativeScrollbar ? renderWithNativeScrollbar() : renderWithCustomScrollbar(),
         footer));
 });
 

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

@@ -1,4 +1,4 @@
-/* hash: 1jqys */
+/* hash: bo9ns */
 :root {
     --color-light-text-secondary: #546272;
 }
@@ -26,21 +26,21 @@
 
     /* optgroup */
 }
-.select__optionsList_9017r {
+.select__optionsList_doe4n {
     overflow: auto;
     width: 100%;
     outline: none;
     box-sizing: border-box;
 }
-.select__scrollable_9017r {
+.select__scrollable_doe4n {
     overflow: auto;
     width: 100%;
 }
-.select__emptyPlaceholder_9017r {
+.select__emptyPlaceholder_doe4n {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
 }
-.select__l_9017r .select__emptyPlaceholder_9017r,
-.select__xl_9017r .select__emptyPlaceholder_9017r {
+.select__l_doe4n .select__emptyPlaceholder_doe4n,
+.select__xl_doe4n .select__emptyPlaceholder_doe4n {
     padding: var(--gap-xl) var(--gap-m);
 }

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

@@ -2,11 +2,13 @@
 
 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('react-merge-refs');
+require('@alfalab/core-components-scrollbar');
 require('../optgroup/Component.js');
 var components_optionsList_Component = require('./Component.js');
 

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../tslib.es6-b07d064f.js');
+require('../../tslib.es6-42d27d11.js');
 require('react');
 require('classnames');
 require('@alfalab/hooks');
@@ -12,6 +12,7 @@ require('../field/Component.js');
 require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('../arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar');
 require('../optgroup/Component.js');
 require('../options-list/Component.js');
 require('@alfalab/core-components-checkbox');
@@ -21,17 +22,17 @@ require('resize-observer');
 require('@alfalab/core-components-popover');
 require('downshift');
 require('../native-select/Component.js');
-require('../../Component-091e9ade.js');
+require('../../Component-a8813866.js');
 require('../../Component.js');
 require('@alfalab/core-components-bottom-sheet');
 require('@alfalab/core-components-button');
 require('@alfalab/core-components-base-modal');
 require('./options-list/Component.js');
 require('./checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../../Component-f0271ef8.js');
+var presets_useSelectWithApply_hook = require('../../Component-4d827af4.js');
 require('react-virtual');
 require('@alfalab/core-components-skeleton');
-require('../../intersection-observer-b658c897.js');
+require('../../intersection-observer-f51db423.js');
 
 
 

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

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"checkmark":"select__checkmark_1w2eq","selected":"select__selected_1w2eq"};
+var styles = {"checkmark":"select__checkmark_1re1u","selected":"select__selected_1re1u"};
 require('./index.css')
 
 var Checkmark = function (_a) {

package/dist/components/select-mobile/checkmark/index.css

@@ -1,4 +1,4 @@
-/* hash: 1yt9v */
+/* hash: xq335 */
 :root {
 
     /* Hard */
@@ -18,7 +18,7 @@
 
     /* optgroup */
 }
-.select__checkmark_1w2eq {
+.select__checkmark_1re1u {
     flex-shrink: 0;
     display: flex;
     align-items: center;
@@ -29,9 +29,9 @@
     height: 24px;
     opacity: 0
 }
-.select__checkmark_1w2eq:first-child {
+.select__checkmark_1re1u:first-child {
         display: none;
     }
-.select__checkmark_1w2eq.select__selected_1w2eq {
+.select__checkmark_1re1u.select__selected_1re1u {
         opacity: 1;
     }

package/dist/components/select-mobile/index.css

@@ -1,4 +1,4 @@
-/* hash: 1mv13 */
+/* hash: 172k0 */
 :root {
 
     /* Hard */
@@ -24,12 +24,12 @@
 
     /* optgroup */
 }
-.select__component_tgmt1 {
+.select__component_q32z9 {
     width: max-content;
     position: relative;
     outline: 0;
 }
-.select__popoverInner_tgmt1 {
+.select__popoverInner_q32z9 {
     padding-top: var(--select-options-list-offset);
     padding-bottom: var(--select-options-list-offset);
     box-shadow: none;
@@ -38,31 +38,31 @@
     border-radius: 0;
     position: relative;
 }
-.select__sheet_tgmt1 {
+.select__sheet_q32z9 {
     overflow: hidden;
 }
-.select__sheetContent_tgmt1 {
+.select__sheetContent_q32z9 {
     padding: 0;
 }
-.select__sheetContainer_tgmt1 {
+.select__sheetContainer_q32z9 {
     padding: 0;
 }
-.select__block_tgmt1 {
+.select__block_q32z9 {
     width: 100%;
 }
 /* width: max-content; fix for IE */
 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    .select__component_tgmt1 {
+    .select__component_q32z9 {
         float: left;
         clear: left;
     }
 }
-.select__option_tgmt1 {
+.select__option_q32z9 {
     padding: var(--gap-2xs) var(--gap-l) var(--gap-2xs) var(--gap-m)
 }
-.select__option_tgmt1:before {
+.select__option_q32z9:before {
         display: none;
     }
-.select__optionGroup_tgmt1 {
+.select__optionGroup_q32z9 {
     padding: var(--gap-m) var(--gap-m) var(--gap-xs);
 }

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

@@ -1 +1 @@
-export * from "../../Component-f0271ef8";
+export * from "../../Component-4d827af4";

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../tslib.es6-b07d064f.js');
+require('../../tslib.es6-42d27d11.js');
 require('react');
 require('classnames');
 require('@alfalab/hooks');
@@ -12,6 +12,7 @@ require('../field/Component.js');
 require('@alfalab/icons-glyph/ChevronDownMIcon');
 require('../arrow/Component.js');
 require('react-merge-refs');
+require('@alfalab/core-components-scrollbar');
 require('../optgroup/Component.js');
 require('../options-list/Component.js');
 require('@alfalab/core-components-checkbox');
@@ -21,17 +22,17 @@ require('resize-observer');
 require('@alfalab/core-components-popover');
 require('downshift');
 require('../native-select/Component.js');
-require('../../Component-091e9ade.js');
+require('../../Component-a8813866.js');
 require('../../Component.js');
 require('@alfalab/core-components-bottom-sheet');
 require('@alfalab/core-components-button');
 require('@alfalab/core-components-base-modal');
 require('./options-list/Component.js');
 require('./checkmark/Component.js');
-var presets_useSelectWithApply_hook = require('../../Component-f0271ef8.js');
+var presets_useSelectWithApply_hook = require('../../Component-4d827af4.js');
 require('react-virtual');
 require('@alfalab/core-components-skeleton');
-require('../../intersection-observer-b658c897.js');
+require('../../intersection-observer-f51db423.js');
 
 
 

package/dist/components/select-mobile/options-list/Component.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../../tslib.es6-b07d064f.js');
+var tslib_es6 = require('../../../tslib.es6-42d27d11.js');
 var React = require('react');
 var cn = require('classnames');
 var utils = require('../../../utils.js');
@@ -15,7 +15,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"optionsList":"select__optionsList_1ok55","emptyPlaceholder":"select__emptyPlaceholder_1ok55","l":"select__l_1ok55","xl":"select__xl_1ok55","footer":"select__footer_1ok55","footerButton":"select__footerButton_1ok55","highlighted":"select__highlighted_1ok55"};
+var styles = {"optionsList":"select__optionsList_1l6lb","emptyPlaceholder":"select__emptyPlaceholder_1l6lb","l":"select__l_1l6lb","xl":"select__xl_1l6lb","footer":"select__footer_1l6lb","footerButton":"select__footerButton_1l6lb","highlighted":"select__highlighted_1l6lb"};
 require('./index.css')
 
 var createCounter = function () {

package/dist/components/select-mobile/options-list/index.css

@@ -1,4 +1,4 @@
-/* hash: vet1u */
+/* hash: y3qz2 */
 :root {
     --color-light-bg-primary: #fff;
     --color-light-border-primary: #dbdee1;
@@ -32,20 +32,20 @@
     --select-mobile-footer-border-top: 1px solid var(--color-light-border-primary);
     --select-mobile-footer-background-color: var(--color-light-bg-primary);
 }
-.select__optionsList_1ok55 {
+.select__optionsList_1l6lb {
     width: 100%;
     outline: none;
     box-sizing: border-box;
 }
-.select__emptyPlaceholder_1ok55 {
+.select__emptyPlaceholder_1l6lb {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
 }
-.select__l_1ok55 .select__emptyPlaceholder_1ok55,
-.select__xl_1ok55 .select__emptyPlaceholder_1ok55 {
+.select__l_1l6lb .select__emptyPlaceholder_1l6lb,
+.select__xl_1l6lb .select__emptyPlaceholder_1l6lb {
     padding: var(--gap-xl) var(--gap-m);
 }
-.select__footer_1ok55 {
+.select__footer_1l6lb {
     display: flex;
     justify-content: space-between;
     position: sticky;
@@ -53,13 +53,13 @@
     background-color: var(--color-light-bg-primary);
     bottom: 0
 }
-.select__footer_1ok55 .select__footerButton_1ok55:first-of-type {
+.select__footer_1l6lb .select__footerButton_1l6lb:first-of-type {
         margin-right: var(--gap-m);
     }
-.select__footerButton_1ok55 {
+.select__footerButton_1l6lb {
     width: 50%;
 }
-.select__highlighted_1ok55 {
+.select__highlighted_1l6lb {
     border-top: var(--select-mobile-footer-border-top);
     background-color: var(--select-mobile-footer-background-color);
 }

package/dist/components/select-mobile/options-list/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../../tslib.es6-b07d064f.js');
+require('../../../tslib.es6-42d27d11.js');
 require('react');
 require('classnames');
 require('../../../utils.js');

package/dist/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/components/virtual-options-list/Component.js

@@ -2,10 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-b07d064f.js');
+var tslib_es6 = require('../../tslib.es6-42d27d11.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');
 var components_optgroup_Component = require('../optgroup/Component.js');
 var reactVirtual = require('react-virtual');
 
@@ -14,14 +16,15 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"virtualOptionsList":"select__virtualOptionsList_l1ipl","scrollable":"select__scrollable_l1ipl","inner":"select__inner_l1ipl","virtualRow":"select__virtualRow_l1ipl","highlighted":"select__highlighted_l1ipl","emptyPlaceholder":"select__emptyPlaceholder_l1ipl","l":"select__l_l1ipl","xl":"select__xl_l1ipl"};
+var styles = {"virtualOptionsList":"select__virtualOptionsList_of2jd","scrollable":"select__scrollable_of2jd","inner":"select__inner_of2jd","virtualRow":"select__virtualRow_of2jd","highlighted":"select__highlighted_of2jd","emptyPlaceholder":"select__emptyPlaceholder_of2jd","l":"select__l_of2jd","xl":"select__xl_of2jd"};
 require('./index.css')
 
 /* 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.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.virtualRow, (_a = {},
+                    _a[styles.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.scrollable, ref: scrollbarRef, scrollableNodeProps: { onScroll: onScroll, ref: parentRef }, contentNodeProps: contentNodeProps }, renderList()));
+    };
+    var renderWithNativeScrollbar = function () {
+        return (React__default['default'].createElement("div", { className: styles.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.virtualOptionsList, styles[size], className), "data-test-id": dataTestId },
         header,
-        React__default['default'].createElement("div", { className: styles.scrollable, ref: parentRef, onScroll: onScroll },
-            React__default['default'].createElement("div", { className: styles.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.virtualRow, (_a = {},
-                        _a[styles.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.emptyPlaceholder }, emptyPlaceholder)),
         footer));
 };