@alfalab/core-components-select 10.2.4 → 10.4.2

package/dist/components/option/Component.js

@@ -2,9 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../tslib.es6-14b6a04f.js');
+var tslib_es6 = require('../../tslib.es6-8b9e19c1.js');
 var React = require('react');
 var cn = require('classnames');
+require('@alfalab/core-components-checkbox');
 var components_checkmark_Component = require('../checkmark/Component.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -12,22 +13,23 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 
-var styles = {"option":"select__option_17akr","disabled":"select__disabled_17akr","s":"select__s_17akr","m":"select__m_17akr","l":"select__l_17akr","xl":"select__xl_17akr","selected":"select__selected_17akr","highlighted":"select__highlighted_17akr","content":"select__content_17akr","textContent":"select__textContent_17akr"};
+var styles = {"option":"select__option_1n02t","disabled":"select__disabled_1n02t","s":"select__s_1n02t","m":"select__m_1n02t","l":"select__l_1n02t","xl":"select__xl_1n02t","selected":"select__selected_1n02t","highlighted":"select__highlighted_1n02t","content":"select__content_1n02t","textContent":"select__textContent_1n02t"};
 require('./index.css')
 
 var Option = function (_a) {
     var _b, _c;
-    var _d = _a.size, size = _d === void 0 ? 's' : _d, className = _a.className, option = _a.option, children = _a.children, selected = _a.selected, highlighted = _a.highlighted, disabled = _a.disabled, _e = _a.Checkmark, Checkmark = _e === void 0 ? components_checkmark_Component.Checkmark : _e, innerProps = _a.innerProps, dataTestId = _a.dataTestId;
+    var _d = _a.size, size = _d === void 0 ? 's' : _d, className = _a.className, option = _a.option, children = _a.children, selected = _a.selected, highlighted = _a.highlighted, disabled = _a.disabled, multiple = _a.multiple, _e = _a.Checkmark, Checkmark = _e === void 0 ? components_checkmark_Component.Checkmark : _e, innerProps = _a.innerProps, dataTestId = _a.dataTestId;
     var content = children || option.content || option.key;
     return (React__default['default'].createElement("div", tslib_es6.__assign({}, innerProps, { className: cn__default['default'](styles.option, styles[size], className, (_b = {},
             _b[styles.highlighted] = highlighted,
             _b[styles.selected] = selected,
             _b[styles.disabled] = disabled,
             _b)), "data-test-id": dataTestId }),
-        Checkmark && React__default['default'].createElement(Checkmark, { selected: selected }),
+        Checkmark && React__default['default'].createElement(Checkmark, { selected: selected, multiple: multiple, position: 'before' }),
         React__default['default'].createElement("div", { className: cn__default['default'](styles.content, (_c = {},
                 _c[styles.textContent] = !React.isValidElement(content),
-                _c)) }, content)));
+                _c)) }, content),
+        Checkmark && React__default['default'].createElement(Checkmark, { selected: selected, multiple: multiple, position: 'after' })));
 };
 
 exports.Option = Option;

package/dist/components/option/index.css

@@ -1,4 +1,4 @@
-/* hash: 1ru95 */
+/* hash: 1m3mz */
 :root {
     --color-light-bg-primary: #fff;
     --color-light-bg-secondary: #f3f4f5;
@@ -53,7 +53,7 @@
 
     /* optgroup */
 }
-.select__option_17akr {
+.select__option_1n02t {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -69,11 +69,11 @@
     position: relative;
     cursor: pointer
 }
-.select__option_17akr:not(.select__disabled_17akr):active {
+.select__option_1n02t:not(.select__disabled_1n02t):active {
         background: var(--select-option-active-background);
         color: var(--select-option-active-color);
     }
-.select__option_17akr:before {
+.select__option_1n02t: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_17akr:first-child:before {
+.select__option_1n02t:first-child:before {
         display: none;
     }
-.select__s_17akr {
+.select__s_1n02t {
     min-height: var(--size-s-height);
 }
-.select__m_17akr {
+.select__m_1n02t {
     min-height: var(--size-m-height);
 }
-.select__l_17akr {
+.select__l_1n02t {
     min-height: var(--size-l-height);
 }
-.select__xl_17akr {
+.select__xl_1n02t {
     min-height: var(--size-xl-height);
 }
-.select__l_17akr,
-.select__xl_17akr {
+.select__l_1n02t,
+.select__xl_1n02t {
     padding-left: var(--select-option-l-left-padding);
     padding-right: var(--select-option-l-right-padding)
 }
-.select__l_17akr:before, .select__xl_17akr:before {
+.select__l_1n02t:before, .select__xl_1n02t:before {
         left: var(--select-option-l-left-padding);
         right: var(--select-option-l-right-padding);
     }
-.select__selected_17akr {
+.select__selected_1n02t {
     background: var(--select-option-selected-background);
     color: var(--select-option-selected-color);
     cursor: default;
 }
-.select__highlighted_17akr {
+.select__highlighted_1n02t {
     background: var(--select-option-hover-background);
     color: var(--select-option-hover-color)
 }
-.select__highlighted_17akr:before,
-    .select__highlighted_17akr + .select__option_17akr:before {
+.select__highlighted_1n02t:before,
+    .select__highlighted_1n02t + .select__option_1n02t:before {
         opacity: 0;
     }
-.select__disabled_17akr {
+.select__disabled_1n02t {
     cursor: var(--disabled-cursor);
     background: var(--select-option-disabled-background);
     color: var(--select-option-disabled-color);
 }
-.select__content_17akr {
+.select__content_1n02t {
     overflow: hidden;
     text-overflow: ellipsis;
     flex: 1;
 }
-.select__textContent_17akr {
+.select__textContent_1n02t {
     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_17akr:after {
+    .select__option_1n02t:after {
         min-height: inherit;
         font-size: 0;
         content: '';

package/dist/components/option/index.js

@@ -2,9 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../tslib.es6-14b6a04f.js');
+require('../../tslib.es6-8b9e19c1.js');
 require('react');
 require('classnames');
+require('@alfalab/core-components-checkbox');
 require('../checkmark/Component.js');
 var components_option_Component = require('./Component.js');
 

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib_es6 = require('../../tslib.es6-8b9e19c1.js');
 var React = require('react');
 var cn = require('classnames');
 var utils = require('../../utils.js');
@@ -14,7 +15,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
 var mergeRefs__default = /*#__PURE__*/_interopDefaultLegacy(mergeRefs);
 
-var styles = {"optionsList":"select__optionsList_qkx5i","emptyPlaceholder":"select__emptyPlaceholder_qkx5i","l":"select__l_qkx5i","xl":"select__xl_qkx5i"};
+var styles = {"optionsList":"select__optionsList_1j2v1","scrollable":"select__scrollable_1j2v1","emptyPlaceholder":"select__emptyPlaceholder_1j2v1","l":"select__l_1j2v1","xl":"select__xl_1j2v1"};
 require('./index.css')
 
 var createCounter = function () {
@@ -23,10 +24,11 @@ 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, Option = _a.Option, _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;
+    var _b = _a.size, size = _b === void 0 ? 's' : _b, className = _a.className, 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 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 counter = createCounter();
-    var renderGroup = React.useCallback(function (group) { return (React__default['default'].createElement(Optgroup, { label: group.label, key: group.label, size: size }, group.options.map(function (option) { return Option({ option: option, index: counter() }); }))); }, [Option, counter, size]);
+    var renderGroup = React.useCallback(function (group) { return (React__default['default'].createElement(Optgroup, { label: group.label, key: group.label, size: size }, group.options.map(function (option) { return renderOption(option, counter()); }))); }, [counter, renderOption, size]);
     utils.useVisibleOptions({
         visibleOptions: visibleOptions,
         listRef: listRef,
@@ -36,11 +38,14 @@ var OptionsList = React.forwardRef(function (_a, ref) {
     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, ref: mergeRefs__default['default']([listRef, ref]), onScroll: onScroll },
-        options.map(function (option) {
-            return utils.isGroup(option) ? renderGroup(option) : Option({ option: option, index: counter() });
-        }),
-        emptyPlaceholder && options.length === 0 && (React__default['default'].createElement("div", { className: styles.emptyPlaceholder }, emptyPlaceholder))));
+    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 },
+            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))),
+        footer));
 });
 
 exports.OptionsList = OptionsList;

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

@@ -1,4 +1,4 @@
-/* hash: z236i */
+/* hash: wqslz */
 :root {
     --color-light-text-secondary: #546272;
 }
@@ -26,17 +26,21 @@
 
     /* optgroup */
 }
-.select__optionsList_qkx5i {
+.select__optionsList_1j2v1 {
     overflow: auto;
     width: 100%;
     outline: none;
     box-sizing: border-box;
 }
-.select__emptyPlaceholder_qkx5i {
+.select__scrollable_1j2v1 {
+    overflow: auto;
+    width: 100%;
+}
+.select__emptyPlaceholder_1j2v1 {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
 }
-.select__l_qkx5i .select__emptyPlaceholder_qkx5i,
-.select__xl_qkx5i .select__emptyPlaceholder_qkx5i {
+.select__l_1j2v1 .select__emptyPlaceholder_1j2v1,
+.select__xl_1j2v1 .select__emptyPlaceholder_1j2v1 {
     padding: var(--gap-xl) var(--gap-m);
 }

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

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

package/dist/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 };

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib_es6 = require('../../tslib.es6-8b9e19c1.js');
 var React = require('react');
 var cn = require('classnames');
 var utils = require('../../utils.js');
@@ -13,12 +14,12 @@ 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_suu2p","inner":"select__inner_suu2p","virtualRow":"select__virtualRow_suu2p","highlighted":"select__highlighted_suu2p","emptyPlaceholder":"select__emptyPlaceholder_suu2p","l":"select__l_suu2p","xl":"select__xl_suu2p"};
+var styles = {"virtualOptionsList":"select__virtualOptionsList_1ttzm","scrollable":"select__scrollable_1ttzm","inner":"select__inner_1ttzm","virtualRow":"select__virtualRow_1ttzm","highlighted":"select__highlighted_1ttzm","emptyPlaceholder":"select__emptyPlaceholder_1ttzm","l":"select__l_1ttzm","xl":"select__xl_1ttzm"};
 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, 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;
+    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 listRef = React.useRef(null);
     var parentRef = React.useRef(null);
     var _j = React.useState(0), visibleOptionsInvalidateKey = _j[0], setVisibleOptionsInvalidateKey = _j[1];
@@ -85,22 +86,25 @@ var VirtualOptionsList = function (_a) {
             return acc;
         }, {});
     }, [options]);
-    return (React__default['default'].createElement("div", { className: cn__default['default'](styles.virtualOptionsList, styles[size], className), ref: parentRef, "data-test-id": dataTestId, 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) && Option({ option: option, index: virtualRow.index })));
-        })),
-        emptyPlaceholder && options.length === 0 && (React__default['default'].createElement("div", { className: styles.emptyPlaceholder }, emptyPlaceholder))));
+    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))))));
+            }))),
+        emptyPlaceholder && options.length === 0 && (React__default['default'].createElement("div", { className: styles.emptyPlaceholder }, emptyPlaceholder)),
+        footer));
 };
 
 exports.VirtualOptionsList = VirtualOptionsList;

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

@@ -1,4 +1,4 @@
-/* hash: 6w9fm */
+/* hash: 15n9i */
 :root {
     --color-light-border-primary: #dbdee1;
     --color-light-text-secondary: #546272;
@@ -32,24 +32,27 @@
 
     /* optgroup */
 }
-.select__virtualOptionsList_suu2p {
-    overflow: auto;
+.select__virtualOptionsList_1ttzm {
     width: 100%;
     outline: none;
     box-sizing: border-box;
     position: relative;
 }
-.select__inner_suu2p {
+.select__scrollable_1ttzm {
+    overflow: auto;
+    width: 100%;
+}
+.select__inner_1ttzm {
     position: relative;
     width: 100%;
 }
-.select__virtualRow_suu2p {
+.select__virtualRow_1ttzm {
     position: absolute;
     top: 0;
     left: 0;
     width: 100%
 }
-.select__virtualRow_suu2p:before {
+.select__virtualRow_1ttzm:before {
         content: '';
         position: absolute;
         z-index: 1;
@@ -60,18 +63,18 @@
         background: var(--select-option-divider-background);
         display: var(--select-option-divider-display);
     }
-.select__virtualRow_suu2p:first-child:before {
+.select__virtualRow_1ttzm:first-child:before {
         display: none;
     }
-.select__highlighted_suu2p:before,
-    .select__highlighted_suu2p + .select__virtualRow_suu2p:before {
+.select__highlighted_1ttzm:before,
+    .select__highlighted_1ttzm + .select__virtualRow_1ttzm:before {
         display: none;
     }
-.select__emptyPlaceholder_suu2p {
+.select__emptyPlaceholder_1ttzm {
     padding: var(--gap-m) var(--gap-s);
     color: var(--select-options-list-empty-placeholder-color);
 }
-.select__l_suu2p .select__emptyPlaceholder_suu2p,
-.select__xl_suu2p .select__emptyPlaceholder_suu2p {
+.select__l_1ttzm .select__emptyPlaceholder_1ttzm,
+.select__xl_1ttzm .select__emptyPlaceholder_1ttzm {
     padding: var(--gap-xl) var(--gap-m);
 }

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

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

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" | "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/cssm/Component.js

@@ -18,6 +18,7 @@ require('./components/optgroup/index.module.css');
 var components_optgroup_Component = require('./components/optgroup/Component.js');
 require('./components/options-list/index.module.css');
 var components_optionsList_Component = require('./components/options-list/Component.js');
+require('@alfalab/core-components-checkbox/dist/cssm');
 require('./components/checkmark/index.module.css');
 require('./components/checkmark/Component.js');
 require('./components/option/index.module.css');

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

@@ -27,10 +27,11 @@ var getDataTestId = function (dataTestId, element) {
 
 var BaseSelect = React.forwardRef(function (_a, ref) {
     var _b;
-    var dataTestId = _a.dataTestId, className = _a.className, fieldClassName = _a.fieldClassName, optionsListClassName = _a.optionsListClassName, optionClassName = _a.optionClassName, options = _a.options, _c = _a.autocomplete, autocomplete = _c === void 0 ? false : _c, _d = _a.multiple, multiple = _d === void 0 ? false : _d, _e = _a.allowUnselect, allowUnselect = _e === void 0 ? false : _e, _f = _a.disabled, disabled = _f === void 0 ? false : _f, _g = _a.closeOnSelect, closeOnSelect = _g === void 0 ? !multiple : _g, _h = _a.circularNavigation, circularNavigation = _h === void 0 ? false : _h, _j = _a.nativeSelect, nativeSelect = _j === void 0 ? false : _j, _k = _a.defaultOpen, defaultOpen = _k === void 0 ? false : _k, openProp = _a.open, _l = _a.popoverPosition, popoverPosition = _l === void 0 ? 'bottom-start' : _l, _m = _a.preventFlip, preventFlip = _m === void 0 ? true : _m, _o = _a.optionsListWidth, optionsListWidth = _o === void 0 ? 'content' : _o, name = _a.name, id = _a.id, selected = _a.selected, _p = _a.size, size = _p === void 0 ? 's' : _p, _q = _a.optionsSize, optionsSize = _q === void 0 ? size : _q, error = _a.error, hint = _a.hint, block = _a.block, label = _a.label, placeholder = _a.placeholder, _r = _a.fieldProps, fieldProps = _r === void 0 ? {} : _r, _s = _a.optionsListProps, optionsListProps = _s === void 0 ? {} : _s, _t = _a.optionProps, optionProps = _t === void 0 ? {} : _t, valueRenderer = _a.valueRenderer, onChange = _a.onChange, onOpen = _a.onOpen, onFocus = _a.onFocus, onBlur = _a.onBlur, onScroll = _a.onScroll, Arrow = _a.Arrow, _u = _a.Field, Field = _u === void 0 ? function () { return null; } : _u, _v = _a.OptionsList, OptionsList = _v === void 0 ? function () { return null; } : _v, _w = _a.Optgroup, Optgroup = _w === void 0 ? function () { return null; } : _w, _x = _a.Option, Option = _x === void 0 ? function () { return null; } : _x, updatePopover = _a.updatePopover, zIndexPopover = _a.zIndexPopover, _y = _a.showEmptyOptionsList, showEmptyOptionsList = _y === void 0 ? false : _y, visibleOptions = _a.visibleOptions;
+    var dataTestId = _a.dataTestId, className = _a.className, fieldClassName = _a.fieldClassName, optionsListClassName = _a.optionsListClassName, optionClassName = _a.optionClassName, popperClassName = _a.popperClassName, options = _a.options, _c = _a.autocomplete, autocomplete = _c === void 0 ? false : _c, _d = _a.multiple, multiple = _d === void 0 ? false : _d, _e = _a.allowUnselect, allowUnselect = _e === void 0 ? false : _e, _f = _a.disabled, disabled = _f === void 0 ? false : _f, _g = _a.closeOnSelect, closeOnSelect = _g === void 0 ? !multiple : _g, _h = _a.circularNavigation, circularNavigation = _h === void 0 ? false : _h, _j = _a.nativeSelect, nativeSelect = _j === void 0 ? false : _j, _k = _a.defaultOpen, defaultOpen = _k === void 0 ? false : _k, openProp = _a.open, _l = _a.popoverPosition, popoverPosition = _l === void 0 ? 'bottom-start' : _l, _m = _a.preventFlip, preventFlip = _m === void 0 ? true : _m, _o = _a.optionsListWidth, optionsListWidth = _o === void 0 ? 'content' : _o, name = _a.name, id = _a.id, selected = _a.selected, _p = _a.size, size = _p === void 0 ? 's' : _p, _q = _a.optionsSize, optionsSize = _q === void 0 ? size : _q, error = _a.error, hint = _a.hint, block = _a.block, label = _a.label, placeholder = _a.placeholder, _r = _a.fieldProps, fieldProps = _r === void 0 ? {} : _r, _s = _a.optionsListProps, optionsListProps = _s === void 0 ? {} : _s, _t = _a.optionProps, optionProps = _t === void 0 ? {} : _t, valueRenderer = _a.valueRenderer, onChange = _a.onChange, onOpen = _a.onOpen, onFocus = _a.onFocus, onBlur = _a.onBlur, onScroll = _a.onScroll, Arrow = _a.Arrow, _u = _a.Field, Field = _u === void 0 ? function () { return null; } : _u, _v = _a.OptionsList, OptionsList = _v === void 0 ? function () { return null; } : _v, _w = _a.Optgroup, Optgroup = _w === void 0 ? function () { return null; } : _w, _x = _a.Option, Option = _x === void 0 ? function () { return null; } : _x, updatePopover = _a.updatePopover, zIndexPopover = _a.zIndexPopover, _y = _a.showEmptyOptionsList, showEmptyOptionsList = _y === void 0 ? false : _y, visibleOptions = _a.visibleOptions;
     var rootRef = React.useRef(null);
     var fieldRef = React.useRef(null);
     var listRef = React.useRef(null);
+    var initiatorRef = React.useRef(null);
     var itemToString = function (option) { return (option ? option.key : ''); };
     var _z = React.useMemo(function () { return utils.processOptions(options, selected); }, [
         options,
@@ -44,8 +45,10 @@ var BaseSelect = React.forwardRef(function (_a, ref) {
                 onChange({
                     selectedMultiple: selectedItems_1,
                     selected: selectedItems_1.length ? selectedItems_1[0] : null,
+                    initiator: initiatorRef.current,
                     name: name,
                 });
+                initiatorRef.current = null;
             }
         },
         stateReducer: function (state, actionAndChanges) {
@@ -90,6 +93,7 @@ var BaseSelect = React.forwardRef(function (_a, ref) {
             switch (type) {
                 case downshift.useCombobox.stateChangeTypes.InputKeyDownEnter:
                 case downshift.useCombobox.stateChangeTypes.ItemClick:
+                    initiatorRef.current = selectedItem;
                     if (selectedItem && !selectedItem.disabled) {
                         var alreadySelected = selectedItems.includes(selectedItem);
                         var allowRemove = allowUnselect || (multiple && selectedItems.length > 1);
@@ -135,14 +139,15 @@ var BaseSelect = React.forwardRef(function (_a, ref) {
     };
     var handleFieldKeyDown = function (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)
@@ -162,24 +167,22 @@ var BaseSelect = React.forwardRef(function (_a, ref) {
             return option.selected ? acc.concat(flatOptions[index]) : acc;
         }, []));
     }, [flatOptions, setSelectedItems]);
-    var WrappedOption = React.useCallback(function (_a) {
-        var option = _a.option, index = _a.index, rest = tslib_es6.__rest(_a, ["option", "index"]);
-        return (React__default['default'].createElement(React__default['default'].Fragment, { key: option.key }, Option(tslib_es6.__assign(tslib_es6.__assign(tslib_es6.__assign({}, optionProps), rest), { className: optionClassName, innerProps: getItemProps({
-                index: index,
-                item: option,
-                disabled: option.disabled,
-                onMouseDown: function (event) { return event.preventDefault(); },
-            }), index: index,
-            option: option, size: optionsSize, disabled: option.disabled, highlighted: index === highlightedIndex, selected: selectedItems.includes(option), dataTestId: getDataTestId(dataTestId, 'option') }))));
-    }, [
-        Option,
-        optionProps,
-        optionClassName,
+    var getOptionProps = React.useCallback(function (option, index) { return (tslib_es6.__assign(tslib_es6.__assign({}, optionProps), { className: optionClassName, innerProps: getItemProps({
+            index: index,
+            item: option,
+            disabled: option.disabled,
+            onMouseDown: function (event) { return event.preventDefault(); },
+        }), multiple: multiple,
+        index: index,
+        option: option, size: optionsSize, disabled: option.disabled, highlighted: index === highlightedIndex, selected: selectedItems.includes(option), dataTestId: getDataTestId(dataTestId, 'option') })); }, [
+        dataTestId,
         getItemProps,
-        optionsSize,
         highlightedIndex,
+        multiple,
+        optionClassName,
+        optionProps,
+        optionsSize,
         selectedItems,
-        dataTestId,
     ]);
     React.useEffect(function () {
         if (defaultOpen)
@@ -223,7 +226,7 @@ var BaseSelect = React.forwardRef(function (_a, ref) {
     var needRenderOptionsList = flatOptions.length > 0 || showEmptyOptionsList;
     return (React__default['default'].createElement("div", tslib_es6.__assign({}, getComboboxProps(tslib_es6.__assign(tslib_es6.__assign({ ref: rootRef }, (disabled && { 'aria-disabled': true })), { className: cn__default['default'](styles__default['default'].component, (_b = {}, _b[styles__default['default'].block] = block, _b), className) })), { onKeyDown: disabled ? undefined : handleFieldKeyDown, tabIndex: -1, "data-test-id": getDataTestId(dataTestId) }),
         nativeSelect && renderNativeSelect(),
-        React__default['default'].createElement(Field, tslib_es6.__assign({ selectedMultiple: selectedItems, selected: selectedItems[0], multiple: multiple, open: open, disabled: disabled, size: size, placeholder: placeholder, label: label && React__default['default'].createElement("span", tslib_es6.__assign({}, getLabelProps()), label), Arrow: Arrow && React__default['default'].createElement(Arrow, { open: open }), error: error, hint: hint, valueRenderer: valueRenderer, className: fieldClassName, innerProps: {
+        React__default['default'].createElement(Field, tslib_es6.__assign({ selectedMultiple: selectedItems, selected: selectedItems[0], setSelectedItems: setSelectedItems, toggleMenu: toggleMenu, multiple: multiple, open: open, disabled: disabled, size: size, placeholder: placeholder, label: label && React__default['default'].createElement("span", tslib_es6.__assign({}, getLabelProps()), label), Arrow: Arrow && React__default['default'].createElement(Arrow, { open: open }), error: error, hint: hint, valueRenderer: valueRenderer, className: fieldClassName, innerProps: {
                 onBlur: handleFieldBlur,
                 onFocus: disabled ? undefined : handleFieldFocus,
                 onClick: disabled ? undefined : handleFieldClick,
@@ -237,8 +240,8 @@ var BaseSelect = React.forwardRef(function (_a, ref) {
                     : undefined,
             }, 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: styles__default['default'].popoverInner, 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: WrappedOption, visibleOptions: visibleOptions, onScroll: onScroll, dataTestId: getDataTestId(dataTestId, 'options-list') }))))))));
+        !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') }))))))));
 });
 
 exports.BaseSelect = BaseSelect;

package/dist/cssm/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/cssm/components/checkmark/Component.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var cn = require('classnames');
+var coreComponentsCheckbox = require('@alfalab/core-components-checkbox/dist/cssm');
 var styles = require('./index.module.css');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -14,10 +15,15 @@ var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
 
 var Checkmark = function (_a) {
     var _b;
-    var selected = _a.selected;
-    return (React__default['default'].createElement("span", { className: cn__default['default'](styles__default['default'].checkmark, (_b = {},
-            _b[styles__default['default'].selected] = selected,
-            _b)) }));
+    var selected = _a.selected, className = _a.className, multiple = _a.multiple, _c = _a.position, position = _c === void 0 ? 'before' : _c;
+    var single = !multiple || position === 'after';
+    var checkmarkClassNames = cn__default['default'](styles__default['default'].checkmark, className, styles__default['default'][position], (_b = {},
+        _b[styles__default['default'].multiple] = !single,
+        _b[styles__default['default'].single] = single,
+        _b[styles__default['default'].selected] = selected,
+        _b));
+    var handleCheckboxClick = React.useCallback(function (event) { return event.stopPropagation(); }, []);
+    return single ? (React__default['default'].createElement("span", { className: checkmarkClassNames })) : (React__default['default'].createElement(coreComponentsCheckbox.Checkbox, { checked: selected, className: checkmarkClassNames, size: 'm', onClick: handleCheckboxClick }));
 };
 
 exports.Checkmark = Checkmark;

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('react');
 require('classnames');
+require('@alfalab/core-components-checkbox/dist/cssm');
 require('./index.module.css');
 var components_checkmark_Component = require('./Component.js');