@alfalab/core-components-select 10.2.3 → 10.4.1

package/dist/modern/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" | "open" | "name" | "options" | "multiple" | "selected" | "valueRenderer" | "Optgroup" | "visibleOptions" | "Arrow" | "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" | "visibleOptions" | "Arrow" | "Option" | "optionsListClassName" | "optionClassName" | "autocomplete" | "allowUnselect" | "closeOnSelect" | "circularNavigation" | "nativeSelect" | "defaultOpen" | "popoverPosition" | "optionsListWidth" | "optionsSize" | "optionsListProps" | "optionProps" | "onOpen" | "Field" | "OptionsList" | "updatePopover" | "zIndexPopover" | "showEmptyOptionsList"> & {
     /**
      * Пропсы, которые будут прокинуты в компонент поля
      */

package/dist/modern/Component.js

@@ -9,6 +9,7 @@ import { Arrow } from './components/arrow/Component.js';
 import 'react-merge-refs';
 import { Optgroup } from './components/optgroup/Component.js';
 import { OptionsList } from './components/options-list/Component.js';
+import '@alfalab/core-components-checkbox/dist/modern';
 import './components/checkmark/Component.js';
 import { Option } from './components/option/Component.js';
 import 'resize-observer';

package/dist/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_17hvl","open":"select__open_17hvl"};
+var styles = {"arrow":"select__arrow_uh35h","open":"select__open_uh35h"};
 require('./index.css')
 
 const Arrow = ({ open, className }) => (React.createElement(ChevronDownMIcon, { className: cn(styles.arrow, className, { [styles.open]: open }) }));

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

@@ -1,4 +1,4 @@
-/* hash: 179qh */
+/* hash: 19l12 */
 :root {
     --color-light-graphic-primary: #0b1f35;
 }
@@ -24,7 +24,7 @@
 
     /* optgroup */
 }
-.select__arrow_17hvl {
+.select__arrow_uh35h {
     display: block;
     width: 24px;
     height: 24px;
@@ -32,6 +32,6 @@
 
     transition: transform 0.15s ease-in-out, opacity 0.2s ease;
 }
-.select__open_17hvl {
+.select__open_uh35h {
     transform: var(--arrow-transform);
 }

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

@@ -12,13 +12,14 @@ const getDataTestId = (dataTestId, element) => {
     return dataTestId ? `${dataTestId}${elementPart}` : undefined;
 };
 
-var styles = {"component":"select__component_1pn2r","popoverInner":"select__popoverInner_1pn2r","optionsList":"select__optionsList_1pn2r","nativeSelect":"select__nativeSelect_1pn2r","block":"select__block_1pn2r"};
+var styles = {"component":"select__component_1osb1","popoverInner":"select__popoverInner_1osb1","optionsList":"select__optionsList_1osb1","nativeSelect":"select__nativeSelect_1osb1","block":"select__block_1osb1"};
 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 BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsListClassName, optionClassName, popperClassName, 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,8 +33,10 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
                 onChange({
                     selectedMultiple: selectedItems,
                     selected: selectedItems.length ? selectedItems[0] : null,
+                    initiator: initiatorRef.current,
                     name,
                 });
+                initiatorRef.current = null;
             }
         },
         stateReducer: (state, actionAndChanges) => {
@@ -78,6 +81,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);
@@ -125,14 +129,15 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
     };
     const handleFieldKeyDown = (event) => {
         inputProps.onKeyDown(event);
-        if (autocomplete && !open && event.key.length === 1) {
+        if (autocomplete && !open && (event.key.length === 1 || event.key === 'Backspace')) {
             // Для автокомплита - открываем меню при начале ввода
             openMenu();
         }
         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 +155,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 +164,7 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
             disabled: option.disabled,
             onMouseDown: (event) => event.preventDefault(),
         }),
+        multiple,
         index,
         option,
         size: optionsSize,
@@ -167,15 +172,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)
@@ -221,7 +226,7 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
         className: cn(styles.component, { [styles.block]: block }, className),
     }), { onKeyDown: disabled ? undefined : handleFieldKeyDown, tabIndex: -1, "data-test-id": getDataTestId(dataTestId) }),
         nativeSelect && renderNativeSelect(),
-        React.createElement(Field, Object.assign({ selectedMultiple: selectedItems, selected: selectedItems[0], multiple: multiple, open: open, disabled: disabled, size: size, placeholder: placeholder, label: label && React.createElement("span", Object.assign({}, getLabelProps()), label), Arrow: Arrow && React.createElement(Arrow, { open: open }), error: error, hint: hint, valueRenderer: valueRenderer, className: fieldClassName, innerProps: {
+        React.createElement(Field, Object.assign({ selectedMultiple: selectedItems, selected: selectedItems[0], setSelectedItems: setSelectedItems, toggleMenu: toggleMenu, multiple: multiple, open: open, disabled: disabled, size: size, placeholder: placeholder, label: label && React.createElement("span", Object.assign({}, getLabelProps()), label), Arrow: Arrow && React.createElement(Arrow, { open: open }), error: error, hint: hint, valueRenderer: valueRenderer, className: fieldClassName, innerProps: {
                 onBlur: handleFieldBlur,
                 onFocus: disabled ? undefined : handleFieldFocus,
                 onClick: disabled ? undefined : handleFieldClick,
@@ -235,8 +240,8 @@ const BaseSelect = forwardRef(({ dataTestId, className, fieldClassName, optionsL
                     : undefined,
             }, 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') }))))))));
+        !nativeSelect && (React.createElement(Popover, { open: open, withTransition: false, anchorElement: fieldRef.current, position: popoverPosition, preventFlip: preventFlip, popperClassName: cn(styles.popoverInner, popperClassName), 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: Option, selectedItems: selectedItems, setSelectedItems: setSelectedItems, toggleMenu: toggleMenu, getOptionProps: getOptionProps, visibleOptions: visibleOptions, onScroll: onScroll, dataTestId: getDataTestId(dataTestId, 'options-list') }))))))));
 });
 
 export { BaseSelect };

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

@@ -1,4 +1,4 @@
-/* hash: 9iw9z */
+/* hash: bu6ui */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -28,12 +28,12 @@
 
     /* optgroup */
 }
-.select__component_1pn2r {
+.select__component_1osb1 {
     width: max-content;
     position: relative;
     outline: 0;
 }
-.select__popoverInner_1pn2r {
+.select__popoverInner_1osb1 {
     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_1pn2r {
+.select__optionsList_1osb1 {
     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_1pn2r {
+.select__nativeSelect_1osb1 {
     opacity: 0;
     overflow: hidden;
     position: absolute;
@@ -65,12 +65,12 @@
     cursor: pointer;
     z-index: 1;
 }
-.select__block_1pn2r {
+.select__block_1osb1 {
     width: 100%;
 }
 /* width: max-content; fix for IE */
 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-    .select__component_1pn2r {
+    .select__component_1osb1 {
         float: left;
         clear: left;
     }

package/dist/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/dist/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 '@alfalab/core-components-checkbox/dist/modern';
 
-var styles = {"checkmark":"select__checkmark_1r28q","selected":"select__selected_1r28q"};
+var styles = {"checkmark":"select__checkmark_3l2l6","single":"select__single_3l2l6","selected":"select__selected_3l2l6","before":"select__before_3l2l6","multiple":"select__multiple_3l2l6","after":"select__after_3l2l6"};
 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/dist/modern/components/checkmark/index.css

@@ -1,4 +1,4 @@
-/* hash: s19s0 */
+/* hash: manlv */
 :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_1r28q {
+.select__checkmark_3l2l6 {
+    flex-shrink: 0;
+    margin: var(--select-checkmark-margin);
+}
+.select__single_3l2l6 {
     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_3l2l6.select__selected_3l2l6 {
+        opacity: 1;
+    }
+.select__before_3l2l6 {
+    display: var(--select-checkmark-before-display)
 }
-.select__selected_1r28q {
-    opacity: 1;
+.select__before_3l2l6.select__multiple_3l2l6 {
+        margin-right: var(--gap-s);
+    }
+.select__after_3l2l6 {
+    display: var(--select-checkmark-after-display);
 }

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

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

package/dist/modern/components/field/Component.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import React from 'react';
 import { FieldProps as BaseFieldProps } from "../../typings";
-declare const Field: ({ size, open, multiple, error, hint, disabled, label, placeholder, selectedMultiple, selected, rightAddons, valueRenderer, Arrow, innerProps, dataTestId, fieldClassName, ...restProps }: BaseFieldProps & React.HTMLAttributes<HTMLDivElement> & {
+declare const Field: ({ size, open, multiple, error, hint, disabled, label, placeholder, selectedMultiple, selected, rightAddons, valueRenderer, setSelectedItems, toggleMenu, Arrow, innerProps, dataTestId, fieldClassName, ...restProps }: BaseFieldProps & React.HTMLAttributes<HTMLDivElement> & {
     block?: boolean | undefined;
     size?: "s" | "m" | "l" | "xl" | undefined;
     colors?: "default" | "inverted" | undefined;

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

@@ -4,10 +4,10 @@ import { useFocus } from '@alfalab/hooks';
 import { FormControl } from '@alfalab/core-components-form-control/dist/modern';
 import { joinOptions } from '../../utils.js';
 
-var styles = {"component":"select__component_12kv7","field":"select__field_12kv7","disabled":"select__disabled_12kv7","arrow":"select__arrow_12kv7","placeholder":"select__placeholder_12kv7","contentWrapper":"select__contentWrapper_12kv7","value":"select__value_12kv7","focusVisible":"select__focusVisible_12kv7"};
+var styles = {"component":"select__component_15tn4","field":"select__field_15tn4","disabled":"select__disabled_15tn4","arrow":"select__arrow_15tn4","placeholder":"select__placeholder_15tn4","contentWrapper":"select__contentWrapper_15tn4","value":"select__value_15tn4","focusVisible":"select__focusVisible_15tn4"};
 require('./index.css')
 
-const Field = ({ size = 'm', open, multiple, error, hint, disabled, label, placeholder, selectedMultiple = [], selected, rightAddons, valueRenderer = joinOptions, Arrow, innerProps, dataTestId, fieldClassName, ...restProps }) => {
+const Field = ({ size = 'm', open, multiple, error, hint, disabled, label, placeholder, selectedMultiple = [], selected, rightAddons, valueRenderer = joinOptions, setSelectedItems, toggleMenu, Arrow, innerProps, dataTestId, fieldClassName, ...restProps }) => {
     const [focused, setFocused] = useState(false);
     const wrapperRef = useRef(null);
     const [focusVisible] = useFocus(wrapperRef, 'keyboard');

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

@@ -1,4 +1,4 @@
-/* hash: 1iixq */
+/* hash: 1csbk */
 :root {
     --color-light-border-link: #007aff;
     --color-light-text-secondary: #546272;
@@ -26,24 +26,24 @@
 
     /* optgroup */
 }
-.select__component_12kv7 {
+.select__component_15tn4 {
     width: 100%;
     outline: none;
 }
-.select__field_12kv7:not(.select__disabled_12kv7) {
+.select__field_15tn4:not(.select__disabled_15tn4) {
     cursor: pointer
 }
-.select__field_12kv7:not(.select__disabled_12kv7):hover .select__arrow_12kv7 {
+.select__field_15tn4:not(.select__disabled_15tn4):hover .select__arrow_15tn4 {
             opacity: var(--select-arrow-hover-opacity);
         }
-.select__disabled_12kv7 {
+.select__disabled_15tn4 {
     cursor: var(--disabled-cursor);
 }
 /* TODO: Заюзать переменные из инпута */
-.select__placeholder_12kv7 {
+.select__placeholder_15tn4 {
     color: var(--color-light-text-secondary);
 }
-.select__contentWrapper_12kv7 {
+.select__contentWrapper_15tn4 {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -53,12 +53,12 @@
     overflow: hidden;
     width: 100%;
 }
-.select__value_12kv7 {
+.select__value_15tn4 {
     overflow: hidden;
     text-overflow: ellipsis;
     text-align: left;
 }
-.select__focusVisible_12kv7 {
+.select__focusVisible_15tn4 {
     outline: 2px solid var(--focus-color);
     outline-offset: 2px;
 }

package/dist/modern/components/index.js

@@ -9,6 +9,7 @@ export { Arrow } from './arrow/Component.js';
 import 'react-merge-refs';
 export { Optgroup } from './optgroup/Component.js';
 export { OptionsList } from './options-list/Component.js';
+import '@alfalab/core-components-checkbox/dist/modern';
 import './checkmark/Component.js';
 export { Option } from './option/Component.js';
 import 'resize-observer';

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import cn from 'classnames';
 
-var styles = {"optgroup":"select__optgroup_18llg","label":"select__label_18llg","l":"select__l_18llg","xl":"select__xl_18llg"};
+var styles = {"optgroup":"select__optgroup_17qtp","label":"select__label_17qtp","l":"select__l_17qtp","xl":"select__xl_17qtp"};
 require('./index.css')
 
 const Optgroup = ({ children, label, size = 's' }) => (React.createElement(React.Fragment, null,

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

@@ -1,4 +1,4 @@
-/* hash: 1rij0 */
+/* hash: 1x956 */
 :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_18llg {
+.select__optgroup_17qtp {
     position: relative;
     display: flex;
     align-items: center;
@@ -43,10 +43,10 @@
     background: var(--select-optgroup-background);
     min-height: 40px
 }
-.select__optgroup_18llg + *[role='option']:before {
+.select__optgroup_17qtp + *[role='option']:before {
         display: none;
     }
-.select__label_18llg {
+.select__label_17qtp {
     font-size: 12px;
     line-height: 16px;
     font-weight: 500;
@@ -56,8 +56,8 @@
     display: block;
     color: var(--select-optgroup-color);
 }
-.select__l_18llg,
-.select__xl_18llg {
+.select__l_17qtp,
+.select__xl_17qtp {
     padding-left: var(--select-optgroup-l-left-padding);
     padding-right: var(--select-optgroup-l-right-padding);
 }

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

@@ -1,21 +1,23 @@
 import React, { isValidElement } from 'react';
 import cn from 'classnames';
+import '@alfalab/core-components-checkbox/dist/modern';
 import { Checkmark } from '../checkmark/Component.js';
 
-var styles = {"option":"select__option_2oss7","disabled":"select__disabled_2oss7","s":"select__s_2oss7","m":"select__m_2oss7","l":"select__l_2oss7","xl":"select__xl_2oss7","selected":"select__selected_2oss7","highlighted":"select__highlighted_2oss7","content":"select__content_2oss7","textContent":"select__textContent_2oss7"};
+var styles = {"option":"select__option_1osgi","disabled":"select__disabled_1osgi","s":"select__s_1osgi","m":"select__m_1osgi","l":"select__l_1osgi","xl":"select__xl_1osgi","selected":"select__selected_1osgi","highlighted":"select__highlighted_1osgi","content":"select__content_1osgi","textContent":"select__textContent_1osgi"};
 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/dist/modern/components/option/index.css

@@ -1,4 +1,4 @@
-/* hash: un0g8 */
+/* hash: owea4 */
 :root {
     --color-light-bg-primary: #fff;
     --color-light-bg-secondary: #f3f4f5;
@@ -53,7 +53,7 @@
 
     /* optgroup */
 }
-.select__option_2oss7 {
+.select__option_1osgi {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -69,11 +69,11 @@
     position: relative;
     cursor: pointer
 }
-.select__option_2oss7:not(.select__disabled_2oss7):active {
+.select__option_1osgi:not(.select__disabled_1osgi):active {
         background: var(--select-option-active-background);
         color: var(--select-option-active-color);
     }
-.select__option_2oss7:before {
+.select__option_1osgi: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_2oss7:first-child:before {
+.select__option_1osgi:first-child:before {
         display: none;
     }
-.select__s_2oss7 {
+.select__s_1osgi {
     min-height: var(--size-s-height);
 }
-.select__m_2oss7 {
+.select__m_1osgi {
     min-height: var(--size-m-height);
 }
-.select__l_2oss7 {
+.select__l_1osgi {
     min-height: var(--size-l-height);
 }
-.select__xl_2oss7 {
+.select__xl_1osgi {
     min-height: var(--size-xl-height);
 }
-.select__l_2oss7,
-.select__xl_2oss7 {
+.select__l_1osgi,
+.select__xl_1osgi {
     padding-left: var(--select-option-l-left-padding);
     padding-right: var(--select-option-l-right-padding)
 }
-.select__l_2oss7:before, .select__xl_2oss7:before {
+.select__l_1osgi:before, .select__xl_1osgi:before {
         left: var(--select-option-l-left-padding);
         right: var(--select-option-l-right-padding);
     }
-.select__selected_2oss7 {
+.select__selected_1osgi {
     background: var(--select-option-selected-background);
     color: var(--select-option-selected-color);
     cursor: default;
 }
-.select__highlighted_2oss7 {
+.select__highlighted_1osgi {
     background: var(--select-option-hover-background);
     color: var(--select-option-hover-color)
 }
-.select__highlighted_2oss7:before,
-    .select__highlighted_2oss7 + .select__option_2oss7:before {
+.select__highlighted_1osgi:before,
+    .select__highlighted_1osgi + .select__option_1osgi:before {
         opacity: 0;
     }
-.select__disabled_2oss7 {
+.select__disabled_1osgi {
     cursor: var(--disabled-cursor);
     background: var(--select-option-disabled-background);
     color: var(--select-option-disabled-color);
 }
-.select__content_2oss7 {
+.select__content_1osgi {
     overflow: hidden;
     text-overflow: ellipsis;
     flex: 1;
 }
-.select__textContent_2oss7 {
+.select__textContent_1osgi {
     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_2oss7:after {
+    .select__option_1osgi:after {
         min-height: inherit;
         font-size: 0;
         content: '';

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

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

package/dist/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 { useVisibleOptions, isGroup } from '../../utils.js';
 import mergeRefs from 'react-merge-refs';
 import { Optgroup } from '../optgroup/Component.js';
 
-var styles = {"optionsList":"select__optionsList_nel6g","emptyPlaceholder":"select__emptyPlaceholder_nel6g","l":"select__l_nel6g","xl":"select__xl_nel6g"};
+var styles = {"optionsList":"select__optionsList_o9cww","scrollable":"select__scrollable_o9cww","emptyPlaceholder":"select__emptyPlaceholder_o9cww","l":"select__l_o9cww","xl":"select__xl_o9cww"};
 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 };