@alfalab/core-components 23.4.1 → 23.6.0-beta.2

package/select/modern/Component.js

@@ -11,6 +11,7 @@ import { Field } from './components/field/Component.js';
 import { Arrow } from './components/arrow/Component.js';
 import { Optgroup } from './components/optgroup/Component.js';
 import { OptionsList } from './components/options-list/Component.js';
+import '../../checkbox/modern';
 import './components/checkmark/Component.js';
 import { Option } from './components/option/Component.js';
 import '../../popover/modern';

package/select/modern/components/arrow/Component.js

@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import { ChevronDownMIcon } from '@alfalab/icons-glyph/ChevronDownMIcon';
 
-var styles = {"arrow":"select__arrow_cyz0y","open":"select__open_cyz0y"};
+var styles = {"arrow":"select__arrow_1tzxz","open":"select__open_1tzxz"};
 require('./index.css');
 
 const Arrow = ({ open, className }) => (React.createElement(ChevronDownMIcon, { className: cn(styles.arrow, className, { [styles.open]: open }) }));

package/select/modern/components/arrow/index.css

@@ -1,4 +1,4 @@
-/* hash: nciuq */
+/* hash: 1ekr6 */
 :root {
     --color-light-graphic-primary: #0b1f35;
 }
@@ -24,7 +24,7 @@
 
     /* optgroup */
 }
-.select__arrow_cyz0y {
+.select__arrow_1tzxz {
     display: block;
     width: 24px;
     height: 24px;
@@ -32,6 +32,6 @@
 
     transition: transform 0.15s ease-in-out, opacity 0.2s ease;
 }
-.select__open_cyz0y {
+.select__open_1tzxz {
     transform: var(--arrow-transform);
 }

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

@@ -12,13 +12,14 @@ const getDataTestId = (dataTestId, element) => {
     return dataTestId ? `${dataTestId}${elementPart}` : undefined;
 };
 
-var styles = {"component":"select__component_3tzi3","popoverInner":"select__popoverInner_3tzi3","optionsList":"select__optionsList_3tzi3","nativeSelect":"select__nativeSelect_3tzi3","block":"select__block_3tzi3"};
+var styles = {"component":"select__component_gtegf","popoverInner":"select__popoverInner_gtegf","optionsList":"select__optionsList_gtegf","nativeSelect":"select__nativeSelect_gtegf","block":"select__block_gtegf"};
 require('./index.css');
 
 const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsListClassName, optionClassName, options, autocomplete = false, multiple = false, allowUnselect = false, disabled = false, closeOnSelect = !multiple, circularNavigation = false, nativeSelect = false, defaultOpen = false, open: openProp, popoverPosition = 'bottom-start', preventFlip = true, optionsListWidth = 'content', name, id, selected, size = 's', optionsSize = size, error, hint, block, label, placeholder, fieldProps = {}, optionsListProps = {}, optionProps = {}, valueRenderer, onChange, onOpen, onFocus, onBlur, onScroll, Arrow, Field = () => null, OptionsList = () => null, Optgroup = () => null, Option = () => null, updatePopover, zIndexPopover, showEmptyOptionsList = false, visibleOptions, }, ref) => {
     const rootRef = useRef(null);
     const fieldRef = useRef(null);
     const listRef = useRef(null);
+    const initiatorRef = useRef(null);
     const itemToString = (option) => (option ? option.key : '');
     const { flatOptions, selectedOptions } = useMemo(() => processOptions(options, selected), [
         options,
@@ -32,6 +33,7 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
                 onChange({
                     selectedMultiple: selectedItems,
                     selected: selectedItems.length ? selectedItems[0] : null,
+                    initiator: initiatorRef.current,
                     name,
                 });
             }
@@ -78,6 +80,7 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
             switch (type) {
                 case useCombobox.stateChangeTypes.InputKeyDownEnter:
                 case useCombobox.stateChangeTypes.ItemClick:
+                    initiatorRef.current = selectedItem;
                     if (selectedItem && !selectedItem.disabled) {
                         const alreadySelected = selectedItems.includes(selectedItem);
                         const allowRemove = allowUnselect || (multiple && selectedItems.length > 1);
@@ -132,7 +135,8 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
         if ([' ', 'Enter'].includes(event.key) &&
             !autocomplete &&
             !nativeSelect &&
-            event.target.tagName !== 'INPUT') {
+            event.target.tagName !== 'INPUT' &&
+            event.target.tagName !== 'BUTTON') {
             // Открываем\закрываем меню по нажатию enter или пробела
             event.preventDefault();
             if (!open || highlightedIndex === -1)
@@ -150,9 +154,8 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
     const handleNativeSelectChange = useCallback(event => {
         setSelectedItems([...event.target.options].reduce((acc, option, index) => option.selected ? acc.concat(flatOptions[index]) : acc, []));
     }, [flatOptions, setSelectedItems]);
-    const WrappedOption = useCallback(({ option, index, ...rest }) => (React.createElement(React.Fragment, { key: option.key }, Option({
+    const getOptionProps = useCallback((option, index) => ({
         ...optionProps,
-        ...rest,
         className: optionClassName,
         innerProps: getItemProps({
             index,
@@ -160,6 +163,7 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
             disabled: option.disabled,
             onMouseDown: (event) => event.preventDefault(),
         }),
+        multiple,
         index,
         option,
         size: optionsSize,
@@ -167,15 +171,15 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
         highlighted: index === highlightedIndex,
         selected: selectedItems.includes(option),
         dataTestId: getDataTestId(dataTestId, 'option'),
-    }))), [
-        Option,
-        optionProps,
-        optionClassName,
+    }), [
+        dataTestId,
         getItemProps,
-        optionsSize,
         highlightedIndex,
+        multiple,
+        optionClassName,
+        optionProps,
+        optionsSize,
         selectedItems,
-        dataTestId,
     ]);
     useEffect(() => {
         if (defaultOpen)
@@ -236,7 +240,7 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
             }, dataTestId: getDataTestId(dataTestId, 'field') }, fieldProps)),
         name && !nativeSelect && renderValue(),
         !nativeSelect && (React.createElement(Popover, { open: open, withTransition: false, anchorElement: fieldRef.current, position: popoverPosition, preventFlip: preventFlip, popperClassName: styles.popoverInner, update: updatePopover, zIndex: zIndexPopover }, needRenderOptionsList && (React.createElement("div", Object.assign({}, menuProps, { className: cn(optionsListClassName, styles.optionsList) }),
-            React.createElement(OptionsList, Object.assign({}, optionsListProps, { flatOptions: flatOptions, highlightedIndex: highlightedIndex, open: open, size: size, options: options, Optgroup: Optgroup, Option: WrappedOption, visibleOptions: visibleOptions, onScroll: onScroll, dataTestId: getDataTestId(dataTestId, 'options-list') }))))))));
+            React.createElement(OptionsList, Object.assign({}, optionsListProps, { flatOptions: flatOptions, highlightedIndex: highlightedIndex, open: open, size: size, options: options, Optgroup: Optgroup, Option: Option, selectedItems: selectedItems, setSelectedItems: setSelectedItems, getOptionProps: getOptionProps, toggleMenu: toggleMenu, visibleOptions: visibleOptions, onScroll: onScroll, dataTestId: getDataTestId(dataTestId, 'options-list') }))))))));
 });
 
 export { BaseSelect };

package/select/modern/components/base-select/index.css

@@ -1,4 +1,4 @@
-/* hash: torem */
+/* hash: 16bq9 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -28,12 +28,12 @@
 
     /* optgroup */
 }
-.select__component_3tzi3 {
+.select__component_gtegf {
     width: max-content;
     position: relative;
     outline: 0;
 }
-.select__popoverInner_3tzi3 {
+.select__popoverInner_gtegf {
     padding-top: var(--select-options-list-offset);
     padding-bottom: var(--select-options-list-offset);
     box-shadow: none;
@@ -42,7 +42,7 @@
     border-radius: 0;
     position: relative;
 }
-.select__optionsList_3tzi3 {
+.select__optionsList_gtegf {
     padding-top: var(--select-options-list-top-padding);
     padding-bottom: var(--select-options-list-bottom-padding);
     box-shadow: var(--select-options-list-box-shadow);
@@ -51,7 +51,7 @@
     overflow: hidden;
     will-change: transform;
 }
-.select__nativeSelect_3tzi3 {
+.select__nativeSelect_gtegf {
     opacity: 0;
     overflow: hidden;
     position: absolute;
@@ -65,12 +65,12 @@
     cursor: pointer;
     z-index: 1;
 }
-.select__block_3tzi3 {
+.select__block_gtegf {
     width: 100%;
 }
 /* width: max-content; fix for IE */
 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    .select__component_3tzi3 {
+    .select__component_gtegf {
         float: left;
         clear: left;
     }

package/select/modern/components/checkmark/Component.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { CheckmarkProps } from "../../typings";
-declare const Checkmark: ({ selected }: CheckmarkProps) => JSX.Element;
+declare const Checkmark: ({ selected, className, multiple, position, }: CheckmarkProps) => JSX.Element;
 export { Checkmark };

package/select/modern/components/checkmark/Component.js

@@ -1,11 +1,19 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import cn from 'classnames';
+import { Checkbox } from '../../../../checkbox/modern';
 
-var styles = {"checkmark":"select__checkmark_2aau5","selected":"select__selected_2aau5"};
+var styles = {"checkmark":"select__checkmark_1ocrb","single":"select__single_1ocrb","selected":"select__selected_1ocrb","before":"select__before_1ocrb","multiple":"select__multiple_1ocrb","after":"select__after_1ocrb"};
 require('./index.css');
 
-const Checkmark = ({ selected }) => (React.createElement("span", { className: cn(styles.checkmark, {
+const Checkmark = ({ selected, className, multiple, position = 'before', }) => {
+    const single = !multiple || position === 'after';
+    const checkmarkClassNames = cn(styles.checkmark, className, styles[position], {
+        [styles.multiple]: !single,
+        [styles.single]: single,
         [styles.selected]: selected,
-    }) }));
+    });
+    const handleCheckboxClick = useCallback(event => event.stopPropagation(), []);
+    return single ? (React.createElement("span", { className: checkmarkClassNames })) : (React.createElement(Checkbox, { checked: selected, className: checkmarkClassNames, size: "m", onClick: handleCheckboxClick }));
+};
 
 export { Checkmark };

package/select/modern/components/checkmark/index.css

@@ -1,4 +1,4 @@
-/* hash: 1om7w */
+/* hash: ut15l */
 :root {
     --color-light-graphic-primary: #0b1f35;
 }
@@ -12,6 +12,7 @@
 }
 :root {
     --gap-xs: 8px;
+    --gap-s: 12px;
 }
 :root {
     --border-radius-circle: 50%;
@@ -26,27 +27,38 @@
 
     --select-checkmark-margin: 0 var(--gap-xs) 0 0;
     --select-checkmark-size: 4px;
-    --select-checkmark-order: 0;
+    --select-checkmark-before-display: 'flex';
+    --select-checkmark-after-display: none;
     --select-checkmark-unselected-opacity: 0;
     --select-checkmark-background: var(--color-light-graphic-primary);
     --select-checkmark-border-radius: var(--border-radius-circle);
 
     /* optgroup */
 }
-.select__checkmark_2aau5 {
+.select__checkmark_1ocrb {
+    flex-shrink: 0;
+    margin: var(--select-checkmark-margin);
+}
+.select__single_1ocrb {
     display: flex;
     align-items: center;
     justify-content: center;
     opacity: var(--select-checkmark-unselected-opacity);
-    flex-shrink: 0;
     background: var(--select-checkmark-background);
     background-size: cover;
     border-radius: var(--select-checkmark-border-radius);
-    margin: var(--select-checkmark-margin);
-    order: var(--select-checkmark-order);
     width: var(--select-checkmark-size);
-    height: var(--select-checkmark-size);
+    height: var(--select-checkmark-size)
+}
+.select__single_1ocrb.select__selected_1ocrb {
+        opacity: 1;
+    }
+.select__before_1ocrb {
+    display: var(--select-checkmark-before-display)
 }
-.select__selected_2aau5 {
-    opacity: 1;
+.select__before_1ocrb.select__multiple_1ocrb {
+        margin-right: var(--gap-s);
+    }
+.select__after_1ocrb {
+    display: var(--select-checkmark-after-display);
 }

package/select/modern/components/checkmark/index.js

@@ -1,3 +1,4 @@
 import 'react';
 import 'classnames';
+import '../../../../checkbox/modern';
 export { Checkmark } from './Component.js';

package/select/modern/components/field/Component.js

@@ -4,7 +4,7 @@ import { useFocus } from '@alfalab/hooks';
 import { FormControl } from '../../../../form-control/modern';
 import { joinOptions } from '../../utils.js';
 
-var styles = {"component":"select__component_zcys1","field":"select__field_zcys1","disabled":"select__disabled_zcys1","arrow":"select__arrow_zcys1","placeholder":"select__placeholder_zcys1","contentWrapper":"select__contentWrapper_zcys1","value":"select__value_zcys1","focusVisible":"select__focusVisible_zcys1"};
+var styles = {"component":"select__component_1n1tg","field":"select__field_1n1tg","disabled":"select__disabled_1n1tg","arrow":"select__arrow_1n1tg","placeholder":"select__placeholder_1n1tg","contentWrapper":"select__contentWrapper_1n1tg","value":"select__value_1n1tg","focusVisible":"select__focusVisible_1n1tg"};
 require('./index.css');
 
 const Field = ({ size = 'm', open, multiple, error, hint, disabled, label, placeholder, selectedMultiple = [], selected, rightAddons, valueRenderer = joinOptions, Arrow, innerProps, dataTestId, fieldClassName, ...restProps }) => {

package/select/modern/components/field/index.css

@@ -1,4 +1,4 @@
-/* hash: g2rtk */
+/* hash: 19plr */
 :root {
     --color-light-border-link: #007aff;
     --color-light-text-secondary: #546272;
@@ -26,24 +26,24 @@
 
     /* optgroup */
 }
-.select__component_zcys1 {
+.select__component_1n1tg {
     width: 100%;
     outline: none;
 }
-.select__field_zcys1:not(.select__disabled_zcys1) {
+.select__field_1n1tg:not(.select__disabled_1n1tg) {
     cursor: pointer
 }
-.select__field_zcys1:not(.select__disabled_zcys1):hover .select__arrow_zcys1 {
+.select__field_1n1tg:not(.select__disabled_1n1tg):hover .select__arrow_1n1tg {
             opacity: var(--select-arrow-hover-opacity);
         }
-.select__disabled_zcys1 {
+.select__disabled_1n1tg {
     cursor: var(--disabled-cursor);
 }
 /* TODO: Заюзать переменные из инпута */
-.select__placeholder_zcys1 {
+.select__placeholder_1n1tg {
     color: var(--color-light-text-secondary);
 }
-.select__contentWrapper_zcys1 {
+.select__contentWrapper_1n1tg {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -53,12 +53,12 @@
     overflow: hidden;
     width: 100%;
 }
-.select__value_zcys1 {
+.select__value_1n1tg {
     overflow: hidden;
     text-overflow: ellipsis;
     text-align: left;
 }
-.select__focusVisible_zcys1 {
+.select__focusVisible_1n1tg {
     outline: 2px solid var(--focus-color);
     outline-offset: 2px;
 }

package/select/modern/components/index.js

@@ -12,6 +12,7 @@ export { Field } from './field/Component.js';
 export { Arrow } from './arrow/Component.js';
 export { Optgroup } from './optgroup/Component.js';
 export { OptionsList } from './options-list/Component.js';
+import '../../../checkbox/modern';
 import './checkmark/Component.js';
 export { Option } from './option/Component.js';
 import '../../../popover/modern';

package/select/modern/components/optgroup/Component.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import cn from 'classnames';
 
-var styles = {"optgroup":"select__optgroup_1p8xu","label":"select__label_1p8xu","l":"select__l_1p8xu","xl":"select__xl_1p8xu"};
+var styles = {"optgroup":"select__optgroup_378ql","label":"select__label_378ql","l":"select__l_378ql","xl":"select__xl_378ql"};
 require('./index.css');
 
 const Optgroup = ({ children, label, size = 's' }) => (React.createElement(React.Fragment, null,

package/select/modern/components/optgroup/index.css

@@ -1,4 +1,4 @@
-/* hash: 1yzw9 */
+/* hash: pa8y1 */
 :root {
     --color-light-bg-primary: #fff;
     --color-light-text-secondary: #546272;
@@ -33,7 +33,7 @@
     --select-optgroup-l-left-padding: var(--gap-m);
     --select-optgroup-l-right-padding: var(--gap-m);
 }
-.select__optgroup_1p8xu {
+.select__optgroup_378ql {
     position: relative;
     display: flex;
     align-items: center;
@@ -43,10 +43,10 @@
     background: var(--select-optgroup-background);
     min-height: 40px
 }
-.select__optgroup_1p8xu + *[role='option']:before {
+.select__optgroup_378ql + *[role='option']:before {
         display: none;
     }
-.select__label_1p8xu {
+.select__label_378ql {
     font-size: 12px;
     line-height: 16px;
     font-weight: 500;
@@ -56,8 +56,8 @@
     display: block;
     color: var(--select-optgroup-color);
 }
-.select__l_1p8xu,
-.select__xl_1p8xu {
+.select__l_378ql,
+.select__xl_378ql {
     padding-left: var(--select-optgroup-l-left-padding);
     padding-right: var(--select-optgroup-l-right-padding);
 }

package/select/modern/components/option/Component.js

@@ -1,21 +1,23 @@
 import React, { isValidElement } from 'react';
 import cn from 'classnames';
+import '../../../../checkbox/modern';
 import { Checkmark } from '../checkmark/Component.js';
 
-var styles = {"option":"select__option_4km3b","disabled":"select__disabled_4km3b","s":"select__s_4km3b","m":"select__m_4km3b","l":"select__l_4km3b","xl":"select__xl_4km3b","selected":"select__selected_4km3b","highlighted":"select__highlighted_4km3b","content":"select__content_4km3b","textContent":"select__textContent_4km3b"};
+var styles = {"option":"select__option_mkr6z","disabled":"select__disabled_mkr6z","s":"select__s_mkr6z","m":"select__m_mkr6z","l":"select__l_mkr6z","xl":"select__xl_mkr6z","selected":"select__selected_mkr6z","highlighted":"select__highlighted_mkr6z","content":"select__content_mkr6z","textContent":"select__textContent_mkr6z"};
 require('./index.css');
 
-const Option = ({ size = 's', className, option, children, selected, highlighted, disabled, Checkmark: Checkmark$1 = Checkmark, innerProps, dataTestId, }) => {
+const Option = ({ size = 's', className, option, children, selected, highlighted, disabled, multiple, Checkmark: Checkmark$1 = Checkmark, innerProps, dataTestId, }) => {
     const content = children || option.content || option.key;
     return (React.createElement("div", Object.assign({}, innerProps, { className: cn(styles.option, styles[size], className, {
             [styles.highlighted]: highlighted,
             [styles.selected]: selected,
             [styles.disabled]: disabled,
         }), "data-test-id": dataTestId }),
-        Checkmark$1 && React.createElement(Checkmark$1, { selected: selected }),
+        Checkmark$1 && React.createElement(Checkmark$1, { selected: selected, multiple: multiple, position: 'before' }),
         React.createElement("div", { className: cn(styles.content, {
                 [styles.textContent]: !isValidElement(content),
-            }) }, content)));
+            }) }, content),
+        Checkmark$1 && React.createElement(Checkmark$1, { selected: selected, multiple: multiple, position: 'after' })));
 };
 
 export { Option };

package/select/modern/components/option/index.css

@@ -1,4 +1,4 @@
-/* hash: 1r8pz */
+/* hash: jfu8g */
 :root {
     --color-light-bg-primary: #fff;
     --color-light-bg-secondary: #f3f4f5;
@@ -53,7 +53,7 @@
 
     /* optgroup */
 }
-.select__option_4km3b {
+.select__option_mkr6z {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -69,11 +69,11 @@
     position: relative;
     cursor: pointer
 }
-.select__option_4km3b:not(.select__disabled_4km3b):active {
+.select__option_mkr6z:not(.select__disabled_mkr6z):active {
         background: var(--select-option-active-background);
         color: var(--select-option-active-color);
     }
-.select__option_4km3b:before {
+.select__option_mkr6z: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_4km3b:first-child:before {
+.select__option_mkr6z:first-child:before {
         display: none;
     }
-.select__s_4km3b {
+.select__s_mkr6z {
     min-height: var(--size-s-height);
 }
-.select__m_4km3b {
+.select__m_mkr6z {
     min-height: var(--size-m-height);
 }
-.select__l_4km3b {
+.select__l_mkr6z {
     min-height: var(--size-l-height);
 }
-.select__xl_4km3b {
+.select__xl_mkr6z {
     min-height: var(--size-xl-height);
 }
-.select__l_4km3b,
-.select__xl_4km3b {
+.select__l_mkr6z,
+.select__xl_mkr6z {
     padding-left: var(--select-option-l-left-padding);
     padding-right: var(--select-option-l-right-padding)
 }
-.select__l_4km3b:before, .select__xl_4km3b:before {
+.select__l_mkr6z:before, .select__xl_mkr6z:before {
         left: var(--select-option-l-left-padding);
         right: var(--select-option-l-right-padding);
     }
-.select__selected_4km3b {
+.select__selected_mkr6z {
     background: var(--select-option-selected-background);
     color: var(--select-option-selected-color);
     cursor: default;
 }
-.select__highlighted_4km3b {
+.select__highlighted_mkr6z {
     background: var(--select-option-hover-background);
     color: var(--select-option-hover-color)
 }
-.select__highlighted_4km3b:before,
-    .select__highlighted_4km3b + .select__option_4km3b:before {
+.select__highlighted_mkr6z:before,
+    .select__highlighted_mkr6z + .select__option_mkr6z:before {
         opacity: 0;
     }
-.select__disabled_4km3b {
+.select__disabled_mkr6z {
     cursor: var(--disabled-cursor);
     background: var(--select-option-disabled-background);
     color: var(--select-option-disabled-color);
 }
-.select__content_4km3b {
+.select__content_mkr6z {
     overflow: hidden;
     text-overflow: ellipsis;
     flex: 1;
 }
-.select__textContent_4km3b {
+.select__textContent_mkr6z {
     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_4km3b:after {
+    .select__option_mkr6z:after {
         min-height: inherit;
         font-size: 0;
         content: '';

package/select/modern/components/option/index.js

@@ -1,4 +1,5 @@
 import 'react';
 import 'classnames';
+import '../../../../checkbox/modern';
 import '../checkmark/Component.js';
 export { Option } from './Component.js';

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

@@ -1,10 +1,10 @@
-import React, { forwardRef, useRef, useCallback } from 'react';
+import React, { forwardRef, useCallback, useRef } from 'react';
 import cn from 'classnames';
 import mergeRefs from 'react-merge-refs';
 import { useVisibleOptions, isGroup } from '../../utils.js';
 import { Optgroup } from '../optgroup/Component.js';
 
-var styles = {"optionsList":"select__optionsList_a6kdx","emptyPlaceholder":"select__emptyPlaceholder_a6kdx","l":"select__l_a6kdx","xl":"select__xl_a6kdx"};
+var styles = {"optionsList":"select__optionsList_1w89h","scrollable":"select__scrollable_1w89h","emptyPlaceholder":"select__emptyPlaceholder_1w89h","l":"select__l_1w89h","xl":"select__xl_1w89h"};
 require('./index.css');
 
 const createCounter = () => {
@@ -12,10 +12,11 @@ const createCounter = () => {
     // eslint-disable-next-line no-plusplus
     return () => count++;
 };
-const OptionsList = forwardRef(({ size = 's', className, Option, options = [], Optgroup: Optgroup$1 = Optgroup, dataTestId, emptyPlaceholder, visibleOptions = 5, onScroll, open, }, ref) => {
+const OptionsList = forwardRef(({ size = 's', className, Option, getOptionProps, options = [], Optgroup: Optgroup$1 = Optgroup, dataTestId, emptyPlaceholder, visibleOptions = 5, onScroll, open, header, footer, }, ref) => {
+    const renderOption = useCallback((option, index) => (React.createElement(Option, Object.assign({ key: option.key }, getOptionProps(option, index)))), [getOptionProps]);
     const listRef = useRef(null);
     const counter = createCounter();
-    const renderGroup = useCallback((group) => (React.createElement(Optgroup$1, { label: group.label, key: group.label, size: size }, group.options.map(option => Option({ option, index: counter() })))), [Option, counter, size]);
+    const renderGroup = useCallback((group) => (React.createElement(Optgroup$1, { label: group.label, key: group.label, size: size }, group.options.map(option => renderOption(option, counter())))), [counter, renderOption, size]);
     useVisibleOptions({
         visibleOptions,
         listRef,
@@ -25,9 +26,12 @@ const OptionsList = forwardRef(({ size = 's', className, Option, options = [], O
     if (options.length === 0 && !emptyPlaceholder) {
         return null;
     }
-    return (React.createElement("div", { className: cn(styles.optionsList, styles[size], className), "data-test-id": dataTestId, ref: mergeRefs([listRef, ref]), onScroll: onScroll },
-        options.map(option => isGroup(option) ? renderGroup(option) : Option({ option, index: counter() })),
-        emptyPlaceholder && options.length === 0 && (React.createElement("div", { className: styles.emptyPlaceholder }, emptyPlaceholder))));
+    return (React.createElement("div", { className: cn(styles.optionsList, styles[size], className), "data-test-id": dataTestId },
+        header,
+        React.createElement("div", { className: styles.scrollable, ref: mergeRefs([listRef, ref]), onScroll: onScroll },
+            options.map(option => isGroup(option) ? renderGroup(option) : renderOption(option, counter())),
+            emptyPlaceholder && options.length === 0 && (React.createElement("div", { className: styles.emptyPlaceholder }, emptyPlaceholder))),
+        footer));
 });
 
 export { OptionsList };

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

@@ -1,4 +1,4 @@
-/* hash: y8oeg */
+/* hash: llpjm */
 :root {
     --color-light-text-secondary: #546272;
 }
@@ -26,17 +26,21 @@
 
     /* optgroup */
 }
-.select__optionsList_a6kdx {
+.select__optionsList_1w89h {
     overflow: auto;
     width: 100%;
     outline: none;
     box-sizing: border-box;
 }
-.select__emptyPlaceholder_a6kdx {
+.select__scrollable_1w89h {
+    overflow: auto;
+    width: 100%;
+}
+.select__emptyPlaceholder_1w89h {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
 }
-.select__l_a6kdx .select__emptyPlaceholder_a6kdx,
-.select__xl_a6kdx .select__emptyPlaceholder_a6kdx {
+.select__l_1w89h .select__emptyPlaceholder_1w89h,
+.select__xl_1w89h .select__emptyPlaceholder_1w89h {
     padding: var(--gap-xl) var(--gap-m);
 }

package/select/modern/components/virtual-options-list/Component.d.ts

@@ -6,5 +6,5 @@ type VirtualOptionsList = OptionsListProps & {
      */
     overscan?: number;
 };
-declare const VirtualOptionsList: ({ size, flatOptions, highlightedIndex, className, Option, open, options, overscan, Optgroup, dataTestId, emptyPlaceholder, visibleOptions, onScroll, }: VirtualOptionsList) => JSX.Element;
+declare const VirtualOptionsList: ({ size, flatOptions, highlightedIndex, className, getOptionProps, Option, open, options, overscan, Optgroup, dataTestId, emptyPlaceholder, visibleOptions, onScroll, header, footer, }: VirtualOptionsList) => JSX.Element;
 export { VirtualOptionsList };