@alfalab/core-components-input-autocomplete 10.2.3 → 11.0.0

package/autocomplete-mobile-field/Component.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import React from 'react';
 import { ElementType } from "react";
-import { FormControlMobileProps } from "../mobile-96988a65";
-import { FieldProps as BaseFieldProps } from "../shared-4cd3936b";
+import { FormControlMobileProps } from "@alfalab/core-components-form-control/mobile";
+import { FieldProps as BaseFieldProps } from "@alfalab/core-components-select/shared";
 type FieldProps = {
     /**
      * Компонент FormControl

package/autocomplete-mobile-field/Component.js

@@ -14,22 +14,25 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 
-var styles = {"component":"input-autocomplete__component_1r0uf","field":"input-autocomplete__field_1r0uf","disabled":"input-autocomplete__disabled_1r0uf","placeholder":"input-autocomplete__placeholder_1r0uf","contentWrapper":"input-autocomplete__contentWrapper_1r0uf","value":"input-autocomplete__value_1r0uf","focusVisible":"input-autocomplete__focusVisible_1r0uf"};
+var styles = {"component":"input-autocomplete__component_1o5l0","field":"input-autocomplete__field_1o5l0","disabled":"input-autocomplete__disabled_1o5l0","placeholder":"input-autocomplete__placeholder_1o5l0","contentWrapper":"input-autocomplete__contentWrapper_1o5l0","value":"input-autocomplete__value_1o5l0","focusVisible":"input-autocomplete__focusVisible_1o5l0"};
 require('./index.css')
 
 var AutocompleteMobileField = function (_a) {
     var _b;
-    var _c = _a.size, size = _c === void 0 ? 'm' : _c; _a.open; var disabled = _a.disabled, value = _a.value, innerProps = _a.innerProps, dataTestId = _a.dataTestId, fieldClassName = _a.fieldClassName, _d = _a.labelView, labelView = _d === void 0 ? 'inner' : _d, placeholder = _a.placeholder, Arrow = _a.Arrow; _a.valueRenderer; _a.toggleMenu; _a.setSelectedItems; _a.selectedMultiple; _a.FormControlComponent; var restProps = tslib.__rest(_a, ["size", "open", "disabled", "value", "innerProps", "dataTestId", "fieldClassName", "labelView", "placeholder", "Arrow", "valueRenderer", "toggleMenu", "setSelectedItems", "selectedMultiple", "FormControlComponent"]);
+    var _c = _a.size, size = _c === void 0 ? 'm' : _c, open = _a.open, disabled = _a.disabled, value = _a.value, innerProps = _a.innerProps, dataTestId = _a.dataTestId, fieldClassName = _a.fieldClassName, _d = _a.labelView, labelView = _d === void 0 ? 'inner' : _d, placeholder = _a.placeholder, Arrow = _a.Arrow; _a.valueRenderer; _a.toggleMenu; _a.setSelectedItems; _a.selectedMultiple; _a.FormControlComponent; var restProps = tslib.__rest(_a, ["size", "open", "disabled", "value", "innerProps", "dataTestId", "fieldClassName", "labelView", "placeholder", "Arrow", "valueRenderer", "toggleMenu", "setSelectedItems", "selectedMultiple", "FormControlComponent"]);
     var _e = React.useState(false), focused = _e[0], setFocused = _e[1];
     var wrapperRef = React.useRef(null);
     var focusVisible = hooks.useFocus(wrapperRef, 'keyboard')[0];
     var filled = Boolean(value);
     var showPlaceholder = placeholder && !filled && labelView === 'outer';
+    var tabIndex = innerProps.tabIndex, restInnerProps = tslib.__rest(innerProps, ["tabIndex"]);
     return (React__default.default.createElement("div", { className: styles.component, ref: wrapperRef, onFocus: function () { return setFocused(true); }, onBlur: function () { return setFocused(false); } },
         React__default.default.createElement(mobile.FormControlMobile, tslib.__assign({ fieldClassName: cn__default.default(styles.field, fieldClassName, (_b = {},
                 _b[styles.disabled] = disabled,
                 _b[styles.focusVisible] = focusVisible,
-                _b)), block: true, size: size, focused: focused, disabled: disabled, filled: filled, labelView: labelView, rightAddons: Arrow, dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'form-control') }, restProps, innerProps),
+                _b)), block: true, size: size, focused: focused, disabled: disabled, filled: filled, labelView: labelView, rightAddons: Arrow, dataTestId: coreComponentsShared.getDataTestId(dataTestId, 'form-control'), 
+            // downshift устанавливает фокус на таргет поле после выбора опции, не даем ему это сделать пока открыт список, иначе поле поиска будет терять фокус
+            tabIndex: open ? undefined : tabIndex }, restProps, restInnerProps),
             React__default.default.createElement("div", { className: styles.contentWrapper },
                 showPlaceholder && React__default.default.createElement("span", { className: styles.placeholder }, placeholder),
                 filled && React__default.default.createElement("div", { className: styles.value }, value)))));

package/autocomplete-mobile-field/index.css

@@ -1,8 +1,8 @@
-/* hash: 1l8rj */
+/* hash: 11p4o */
 :root {
 } /* deprecated */ :root {
-    --color-light-border-link: #0072ef;
-    --color-light-text-secondary: rgba(60, 60, 67, 0.66); /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+    --color-light-border-link: #2288fa;
+    --color-light-text-secondary: rgba(4, 4, 19, 0.55); /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
 } :root {
 } :root {
@@ -18,16 +18,16 @@
 } :root {
     --focus-color: var(--color-light-border-link);
     --disabled-cursor: not-allowed;
-} .input-autocomplete__component_1r0uf {
+} .input-autocomplete__component_1o5l0 {
     width: 100%;
     outline: none;
-} .input-autocomplete__field_1r0uf:not(.input-autocomplete__disabled_1r0uf) {
+} .input-autocomplete__field_1o5l0:not(.input-autocomplete__disabled_1o5l0) {
     cursor: pointer;
-} .input-autocomplete__disabled_1r0uf {
+} .input-autocomplete__disabled_1o5l0 {
     cursor: var(--disabled-cursor);
-} .input-autocomplete__placeholder_1r0uf {
+} .input-autocomplete__placeholder_1o5l0 {
     color: var(--color-light-text-secondary);
-} .input-autocomplete__contentWrapper_1r0uf {
+} .input-autocomplete__contentWrapper_1o5l0 {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -36,11 +36,11 @@
     text-overflow: ellipsis;
     overflow: hidden;
     width: 100%;
-} .input-autocomplete__value_1r0uf {
+} .input-autocomplete__value_1o5l0 {
     overflow: hidden;
     text-overflow: ellipsis;
     text-align: left;
-} .input-autocomplete__focusVisible_1r0uf {
+} .input-autocomplete__focusVisible_1o5l0 {
     outline: 2px solid var(--focus-color);
     outline-offset: 2px;
 }

package/cssm/Component.desktop.d.ts

@@ -1,72 +1,5 @@
 /// <reference types="react" />
 import React from 'react';
-import { ChangeEvent, FC, RefAttributes } from "react";
-import { InputProps } from "@alfalab/core-components-input";
-import { BaseSelectProps } from "./shared-4cd3936b";
-type InputAutocompleteDesktopProps = Omit<BaseSelectProps, 'Field' | 'nativeSelect' | 'searchProps' | 'showSearch' | 'Search'> & {
-    /**
-     * Компонент ввода значения
-     */
-    Input?: FC<InputProps & RefAttributes<HTMLInputElement>>;
-    /**
-     * Пропсы, которые будут прокинуты в инпут
-     */
-    inputProps?: InputProps & Record<string, unknown>;
-    /**
-     * Значение поля ввода
-     */
-    value?: string;
-    /**
-     * Поле доступно только для чтения
-     */
-    readOnly?: InputProps['readOnly'];
-    /**
-     * Отображение иконки успеха
-     */
-    success?: boolean;
-    /**
-     * Обработчик ввода
-     */
-    onInput?: (event: ChangeEvent<HTMLInputElement>) => void;
-    /**
-     * Хранит функцию, с помощью которой можно обновить положение поповера
-     */
-    updatePopover?: BaseSelectProps['updatePopover'];
-};
-declare const InputAutocompleteDesktop: React.ForwardRefExoticComponent<Omit<BaseSelectProps, "nativeSelect" | "searchProps" | "showSearch" | "Field" | "Search"> & {
-    /**
-     * Компонент ввода значения
-     */
-    Input?: React.FC<Omit<import("./autocomplete-field/Component").BaseInputProps, "colorStyles" | "FormControlComponent"> & {
-        breakpoint?: number | undefined;
-        defaultMatchMediaValue?: boolean | (() => boolean) | undefined;
-    } & React.RefAttributes<HTMLInputElement>> | undefined;
-    /**
-     * Пропсы, которые будут прокинуты в инпут
-     */
-    inputProps?: (Omit<import("./autocomplete-field/Component").BaseInputProps, "colorStyles" | "FormControlComponent"> & {
-        breakpoint?: number | undefined;
-        defaultMatchMediaValue?: boolean | (() => boolean) | undefined;
-    } & Record<string, unknown>) | undefined;
-    /**
-     * Значение поля ввода
-     */
-    value?: string | undefined;
-    /**
-     * Поле доступно только для чтения
-     */
-    readOnly?: InputProps['readOnly'];
-    /**
-     * Отображение иконки успеха
-     */
-    success?: boolean | undefined;
-    /**
-     * Обработчик ввода
-     */
-    onInput?: ((event: ChangeEvent<HTMLInputElement>) => void) | undefined;
-    /**
-     * Хранит функцию, с помощью которой можно обновить положение поповера
-     */
-    updatePopover?: BaseSelectProps['updatePopover'];
-} & React.RefAttributes<HTMLInputElement>>;
-export { InputAutocompleteDesktopProps, InputAutocompleteDesktop };
+import { InputAutocompleteCommonProps } from "./types";
+declare const InputAutocompleteDesktop: React.ForwardRefExoticComponent<InputAutocompleteCommonProps & React.RefAttributes<HTMLInputElement>>;
+export { InputAutocompleteDesktop };

package/cssm/Component.desktop.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var coreComponentsPopover = require('@alfalab/core-components-popover/cssm');
 var shared = require('@alfalab/core-components-select/cssm/shared');
 var autocompleteField_Component = require('./autocomplete-field/Component.js');
 require('react-merge-refs');
@@ -17,7 +18,7 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 
 var InputAutocompleteDesktop = React.forwardRef(function (_a, ref) {
     var _b = _a.OptionsList, OptionsList = _b === void 0 ? shared.OptionsList : _b, _c = _a.Optgroup, Optgroup = _c === void 0 ? shared.Optgroup : _c, _d = _a.Option, Option = _d === void 0 ? shared.Option : _d, Input = _a.Input, _e = _a.inputProps, inputProps = _e === void 0 ? {} : _e, onInput = _a.onInput, value = _a.value, success = _a.success, readOnly = _a.readOnly, _f = _a.closeOnSelect, closeOnSelect = _f === void 0 ? false : _f, options = _a.options, restProps = tslib.__rest(_a, ["OptionsList", "Optgroup", "Option", "Input", "inputProps", "onInput", "value", "success", "readOnly", "closeOnSelect", "options"]);
-    return (React__default.default.createElement(shared.BaseSelect, tslib.__assign({ ref: ref, autocomplete: true, options: options, closeOnSelect: closeOnSelect, Option: Option, Field: autocompleteField_Component.AutocompleteField, Optgroup: Optgroup, OptionsList: OptionsList }, restProps, { fieldProps: tslib.__assign(tslib.__assign({}, restProps.fieldProps), { Input: Input, onInput: onInput, value: value, inputProps: inputProps, readOnly: readOnly, success: success }) })));
+    return (React__default.default.createElement(shared.BaseSelect, tslib.__assign({ view: 'desktop', Popover: coreComponentsPopover.Popover, ref: ref, autocomplete: true, options: options, closeOnSelect: closeOnSelect, Option: Option, Field: autocompleteField_Component.AutocompleteField, Optgroup: Optgroup, OptionsList: OptionsList }, restProps, { fieldProps: tslib.__assign(tslib.__assign({}, restProps.fieldProps), { Input: Input, onInput: onInput, value: value, inputProps: inputProps, readOnly: readOnly, success: success }) })));
 });
 
 exports.InputAutocompleteDesktop = InputAutocompleteDesktop;

package/cssm/Component.mobile.d.ts

@@ -1,98 +1,8 @@
 /// <reference types="react" />
+/// <reference types="react-transition-group" />
 import React from 'react';
-import { ChangeEvent, ElementType } from "react";
-import { ButtonMobileProps } from "./mobile-89f0cb07";
-import { AdditionalMobileProps, BaseSelectChangePayload, BaseSelectProps } from "./shared-4cd3936b";
-type InputAutocompleteMobileProps = Omit<BaseSelectProps, 'OptionsList' | 'Checkmark' | 'onScroll' | 'nativeSelect' | 'autocomplete' | 'valueRenderer' | 'searchProps' | 'showSearch' | 'Search'> & {
-    /**
-     * Обработчик выбора
-     */
-    onChange: (payload: string | BaseSelectChangePayload) => void;
-    /**
-     * Обработчик ввода фильтра.
-     */
-    onFilter: (event: ChangeEvent<HTMLInputElement>) => void;
-    /**
-     * Значение поля ввода
-     */
-    value?: string;
-    /**
-     * Значение фильтра.
-     */
-    filter?: string;
-    /**
-     * Обработчик нажатия на кнопку "Отмена".
-     */
-    onCancel?: () => void;
-    /**
-     * Обработчик нажатия на крестик в инпуте фильтра.
-     */
-    onClearFilter?: () => void;
-    /**
-     * Дополнительные пропсы компонента BottomSheet
-     */
-    bottomSheetProps?: AdditionalMobileProps['bottomSheetProps'];
-    /**
-     * Дополнительные пропсы на слот под заголовком компонента BottomSheet
-     */
-    bottomSheetHeaderAddonsProps?: Record<string, unknown>;
-    /**
-     * Дополнительные пропсы на кнопку "продолжить"
-     */
-    continueButtonProps?: ButtonMobileProps;
-    /**
-     * Дополнительные пропсы на кнопку "отмена"
-     */
-    cancelButtonProps?: ButtonMobileProps;
-    /**
-     * Кастомный инпут
-     */
-    Input?: ElementType;
-};
-declare const InputAutocompleteMobile: React.ForwardRefExoticComponent<Omit<BaseSelectProps, "onScroll" | "valueRenderer" | "autocomplete" | "nativeSelect" | "searchProps" | "showSearch" | "OptionsList" | "Search" | "Checkmark"> & {
-    /**
-     * Обработчик выбора
-     */
-    onChange: (payload: string | BaseSelectChangePayload) => void;
-    /**
-     * Обработчик ввода фильтра.
-     */
-    onFilter: (event: ChangeEvent<HTMLInputElement>) => void;
-    /**
-     * Значение поля ввода
-     */
-    value?: string | undefined;
-    /**
-     * Значение фильтра.
-     */
-    filter?: string | undefined;
-    /**
-     * Обработчик нажатия на кнопку "Отмена".
-     */
-    onCancel?: (() => void) | undefined;
-    /**
-     * Обработчик нажатия на крестик в инпуте фильтра.
-     */
-    onClearFilter?: (() => void) | undefined;
-    /**
-     * Дополнительные пропсы компонента BottomSheet
-     */
-    bottomSheetProps?: AdditionalMobileProps['bottomSheetProps'];
-    /**
-     * Дополнительные пропсы на слот под заголовком компонента BottomSheet
-     */
-    bottomSheetHeaderAddonsProps?: Record<string, unknown> | undefined;
-    /**
-     * Дополнительные пропсы на кнопку "продолжить"
-     */
-    continueButtonProps?: ButtonMobileProps | undefined;
-    /**
-     * Дополнительные пропсы на кнопку "отмена"
-     */
-    cancelButtonProps?: ButtonMobileProps | undefined;
-    /**
-     * Кастомный инпут
-     */
-    Input?: React.ElementType<any> | undefined;
+declare const InputAutocompleteMobile: React.ForwardRefExoticComponent<import("./types").InputAutocompleteCommonProps & {
+    isBottomSheet?: boolean | undefined;
+    transitionProps?: Partial<import("react-transition-group/Transition").TransitionProps<undefined>> | undefined;
 } & React.RefAttributes<unknown>>;
-export { InputAutocompleteMobileProps, InputAutocompleteMobile };
+export { InputAutocompleteMobile };

package/cssm/Component.mobile.js

@@ -7,10 +7,10 @@ var React = require('react');
 var mergeRefs = require('react-merge-refs');
 var cn = require('classnames');
 var throttle = require('lodash.throttle');
-var mobile$1 = require('@alfalab/core-components-button/cssm/mobile');
-var coreComponentsInput = require('@alfalab/core-components-input/cssm');
 var mobile = require('@alfalab/core-components-select/cssm/mobile');
+var shared = require('@alfalab/core-components-select/cssm/shared');
 var autocompleteMobileField_Component = require('./autocomplete-mobile-field/Component.js');
+var utils = require('./utils.js');
 var styles = require('./mobile.module.css');
 require('@alfalab/core-components-form-control/cssm/mobile');
 require('@alfalab/core-components-shared/cssm');
@@ -25,68 +25,63 @@ var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 var throttle__default = /*#__PURE__*/_interopDefaultCompat(throttle);
 var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
 
-var SELECTED = [];
 var InputAutocompleteMobile = React__default.default.forwardRef(function (_a, ref) {
-    var Input = _a.Input, _b = _a.bottomSheetProps, bottomSheetProps = _b === void 0 ? {} : _b, _c = _a.bottomSheetHeaderAddonsProps, bottomSheetHeaderAddonsProps = _c === void 0 ? {} : _c, _d = _a.value, value = _d === void 0 ? '' : _d, _e = _a.filter, filter = _e === void 0 ? '' : _e, name = _a.name, _f = _a.Arrow, Arrow = _f === void 0 ? null : _f, label = _a.label, placeholder = _a.placeholder, _g = _a.size, size = _g === void 0 ? 's' : _g, openProp = _a.open, onFilter = _a.onFilter, onChange = _a.onChange, onOpen = _a.onOpen, onCancel = _a.onCancel, onClearFilter = _a.onClearFilter, continueButtonProps = _a.continueButtonProps, cancelButtonProps = _a.cancelButtonProps, selected = _a.selected, multiple = _a.multiple, restProps = tslib.__rest(_a, ["Input", "bottomSheetProps", "bottomSheetHeaderAddonsProps", "value", "filter", "name", "Arrow", "label", "placeholder", "size", "open", "onFilter", "onChange", "onOpen", "onCancel", "onClearFilter", "continueButtonProps", "cancelButtonProps", "selected", "multiple"]);
+    var _b;
+    var _c;
+    var Input = _a.Input, value = _a.value, name = _a.name, _d = _a.Arrow, Arrow = _d === void 0 ? null : _d, label = _a.label, _e = _a.placeholder, placeholder = _e === void 0 ? '' : _e, _f = _a.size, size = _f === void 0 ? 's' : _f, openProp = _a.open, onInput = _a.onInput, onOpen = _a.onOpen, multiple = _a.multiple, inputProps = _a.inputProps, _g = _a.isBottomSheet, isBottomSheet = _g === void 0 ? true : _g, dataTestId = _a.dataTestId, transitionProps = _a.transitionProps, restProps = tslib.__rest(_a, ["Input", "value", "name", "Arrow", "label", "placeholder", "size", "open", "onInput", "onOpen", "multiple", "inputProps", "isBottomSheet", "dataTestId", "transitionProps"]);
     var _h = React.useState(false), open = _h[0], setOpen = _h[1];
-    var bottomSheetInputRef = React.useRef(null);
+    var frozenValue = React.useRef('');
+    var searchInputRef = React.useRef(null);
     var targetRef = React.useRef(null);
-    var setBottomSheetVisibility = function (isOpen) {
+    var restorePrevValue = function () { return onInput === null || onInput === void 0 ? void 0 : onInput(null, { value: frozenValue.current }); };
+    var setModalVisibility = function (isOpen) {
         if (openProp === undefined) {
             setOpen(isOpen);
         }
-        if (onOpen) {
-            onOpen({ open: isOpen, name: name });
+        if (isOpen) {
+            frozenValue.current = value || '';
         }
+        onOpen === null || onOpen === void 0 ? void 0 : onOpen({ open: isOpen, name: name });
     };
     var handleOpen = function (payload) {
-        setBottomSheetVisibility(Boolean(payload.open));
+        setModalVisibility(Boolean(payload.open));
     };
     var handleOptionsListTouchMove = React.useMemo(function () {
         return throttle__default.default(function () {
-            var input = bottomSheetInputRef.current;
+            var input = searchInputRef.current;
             if (input && document.activeElement === input) {
                 input.blur();
             }
         }, 300);
     }, []);
-    var handleApply = function () {
-        setBottomSheetVisibility(false);
-        onChange(filter);
-    };
-    var handleChange = function (payload) {
-        var _a;
-        onChange(payload);
-        if (multiple) {
-            // После выбора опции возвращаем фокус в поле ввода.
-            (_a = bottomSheetInputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-        }
-    };
+    var handleApply = function () { return setModalVisibility(false); };
     var handleCancel = function () {
-        setBottomSheetVisibility(false);
-        if (onCancel) {
-            onCancel();
-        }
-    };
-    var handleInputFocus = function (event) {
-        var input = bottomSheetInputRef.current;
-        // Перед закрытием шторки снимаем фокус с инпута, чтобы предотвратить скачок шторки.
-        if (event.relatedTarget === targetRef.current &&
-            input &&
-            input === document.activeElement) {
-            input.blur();
-        }
+        setModalVisibility(false);
+        restorePrevValue();
     };
-    var getBottomSheetProps = function () {
-        var Component = Input || coreComponentsInput.Input;
-        return tslib.__assign(tslib.__assign({ actionButton: (React__default.default.createElement("div", { className: styles__default.default.footer },
-                React__default.default.createElement(mobile$1.ButtonMobile, tslib.__assign({ block: true, view: 'secondary', size: 'm', onClick: handleCancel }, cancelButtonProps), "\u041E\u0442\u043C\u0435\u043D\u0430"),
-                React__default.default.createElement(mobile$1.ButtonMobile, tslib.__assign({ block: true, view: 'primary', size: 'm', onClick: handleApply }, continueButtonProps), "\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C"))), title: label || placeholder, bottomAddons: (React__default.default.createElement(Component, tslib.__assign({ block: true, clear: !!onClearFilter, onClear: onClearFilter, value: filter, onInput: onFilter, placeholder: placeholder, onFocus: handleInputFocus }, bottomSheetHeaderAddonsProps, { className: cn__default.default(styles__default.default.bottomAddonInput, bottomSheetHeaderAddonsProps.className), ref: mergeRefs__default.default([
-                    bottomSheetInputRef,
-                    bottomSheetHeaderAddonsProps.ref,
-                ]) }))), initialHeight: 'full' }, bottomSheetProps), { containerProps: tslib.__assign({ onTouchMove: handleOptionsListTouchMove }, bottomSheetProps.containerProps) });
+    var handleExiting = function (node) {
+        var _a, _b;
+        (_a = targetRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+        (_b = transitionProps === null || transitionProps === void 0 ? void 0 : transitionProps.onExiting) === null || _b === void 0 ? void 0 : _b.call(transitionProps, node);
     };
-    return (React__default.default.createElement(mobile.SelectMobile, tslib.__assign({ useWithApplyHook: false, Field: autocompleteMobileField_Component.AutocompleteMobileField }, restProps, { ref: mergeRefs__default.default([targetRef, ref]), selected: selected || SELECTED, open: Boolean(open || openProp), onOpen: handleOpen, Arrow: Arrow, onChange: handleChange, placeholder: placeholder, label: label, size: size, name: name, multiple: multiple, bottomSheetProps: getBottomSheetProps(), optionsListProps: tslib.__assign({ showFooter: false }, restProps.optionsListProps), fieldProps: tslib.__assign({ value: value }, restProps.fieldProps) })));
+    var isOpen = Boolean(open || openProp);
+    var Component = isBottomSheet ? mobile.SelectMobile : mobile.SelectModalMobile;
+    var componentProps = (_b = {
+            title: label || placeholder,
+            onClose: restorePrevValue,
+            transitionProps: tslib.__assign(tslib.__assign({}, transitionProps), { onExiting: handleExiting })
+        },
+        _b[isBottomSheet ? 'containerProps' : 'componentDivProps'] = {
+            onTouchMove: handleOptionsListTouchMove,
+        },
+        _b);
+    return (React__default.default.createElement(Component, tslib.__assign({ Field: autocompleteMobileField_Component.AutocompleteMobileField }, restProps, (isBottomSheet
+        ? { bottomSheetProps: componentProps }
+        : { modalProps: componentProps }), { dataTestId: dataTestId, useWithApplyHook: false, showSearch: true, searchProps: {
+            value: value,
+            filterFn: utils.searchFilterStub,
+            componentProps: tslib.__assign(tslib.__assign({ leftAddons: null, placeholder: placeholder }, inputProps), { className: cn__default.default(styles__default.default.input, inputProps === null || inputProps === void 0 ? void 0 : inputProps.className), clear: (_c = inputProps === null || inputProps === void 0 ? void 0 : inputProps.clear) !== null && _c !== void 0 ? _c : false, ref: mergeRefs__default.default([searchInputRef, inputProps === null || inputProps === void 0 ? void 0 : inputProps.ref]), onChange: onInput }),
+        }, Search: Input, ref: mergeRefs__default.default([targetRef, ref]), open: isOpen, onOpen: handleOpen, Arrow: Arrow, placeholder: placeholder, label: label, size: size, name: name, multiple: multiple, optionsListProps: tslib.__assign({ footer: (React__default.default.createElement(shared.Footer, { showClear: true, handleClear: handleCancel, handleApply: handleApply, clearText: '\u041E\u0442\u043C\u0435\u043D\u0430', applyText: '\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C', dataTestId: dataTestId })) }, restProps.optionsListProps), fieldProps: tslib.__assign({ value: isOpen ? frozenValue.current : value }, restProps.fieldProps) })));
 });
 
 exports.InputAutocompleteMobile = InputAutocompleteMobile;

package/cssm/Component.modal.mobile.d.ts

@@ -1,91 +1,8 @@
 /// <reference types="react" />
+/// <reference types="react-transition-group" />
 import React from 'react';
-import { ChangeEvent, ElementType } from "react";
-import { ButtonMobileProps } from "./mobile-89f0cb07";
-import { SelectModalMobileProps } from "./mobile-f28cbba0";
-import { BaseSelectChangePayload } from "./shared-4cd3936b";
-type InputAutocompleteModalMobileProps = Omit<SelectModalMobileProps, 'OptionsList' | 'Checkmark' | 'onScroll' | 'nativeSelect' | 'autocomplete' | 'valueRenderer'> & {
-    /**
-     * Обработчик выбора
-     */
-    onChange: (payload: string | BaseSelectChangePayload) => void;
-    /**
-     * Обработчик ввода фильтра.
-     */
-    onFilter: (event: ChangeEvent<HTMLInputElement>) => void;
-    /**
-     * Значение поля ввода
-     */
-    value?: string;
-    /**
-     * Значение фильтра.
-     */
-    filter?: string;
-    /**
-     * Обработчик нажатия на кнопку "Отмена".
-     */
-    onCancel?: () => void;
-    /**
-     * Обработчик нажатия на крестик в инпуте фильтра.
-     */
-    onClearFilter?: () => void;
-    /**
-     * Дополнительные пропсы на слот под заголовком
-     */
-    bottomAddonProps?: Record<string, unknown>;
-    /**
-     * Дополнительные пропсы на кнопку "продолжить"
-     */
-    continueButtonProps?: ButtonMobileProps;
-    /**
-     * Дополнительные пропсы на кнопку "отмена"
-     */
-    cancelButtonProps?: ButtonMobileProps;
-    /**
-     * Кастомный инпут
-     */
-    Input?: ElementType;
-};
-declare const InputAutocompleteModalMobile: React.ForwardRefExoticComponent<Omit<SelectModalMobileProps, "onScroll" | "valueRenderer" | "autocomplete" | "nativeSelect" | "OptionsList" | "Checkmark"> & {
-    /**
-     * Обработчик выбора
-     */
-    onChange: (payload: string | BaseSelectChangePayload) => void;
-    /**
-     * Обработчик ввода фильтра.
-     */
-    onFilter: (event: ChangeEvent<HTMLInputElement>) => void;
-    /**
-     * Значение поля ввода
-     */
-    value?: string | undefined;
-    /**
-     * Значение фильтра.
-     */
-    filter?: string | undefined;
-    /**
-     * Обработчик нажатия на кнопку "Отмена".
-     */
-    onCancel?: (() => void) | undefined;
-    /**
-     * Обработчик нажатия на крестик в инпуте фильтра.
-     */
-    onClearFilter?: (() => void) | undefined;
-    /**
-     * Дополнительные пропсы на слот под заголовком
-     */
-    bottomAddonProps?: Record<string, unknown> | undefined;
-    /**
-     * Дополнительные пропсы на кнопку "продолжить"
-     */
-    continueButtonProps?: ButtonMobileProps | undefined;
-    /**
-     * Дополнительные пропсы на кнопку "отмена"
-     */
-    cancelButtonProps?: ButtonMobileProps | undefined;
-    /**
-     * Кастомный инпут
-     */
-    Input?: React.ElementType<any> | undefined;
+declare const InputAutocompleteModalMobile: React.ForwardRefExoticComponent<import("./types").InputAutocompleteCommonProps & {
+    isBottomSheet?: boolean | undefined;
+    transitionProps?: Partial<import("react-transition-group/Transition").TransitionProps<undefined>> | undefined;
 } & React.RefAttributes<HTMLDivElement>>;
-export { InputAutocompleteModalMobileProps, InputAutocompleteModalMobile };
+export { InputAutocompleteModalMobile };

package/cssm/Component.modal.mobile.js

@@ -4,77 +4,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var mergeRefs = require('react-merge-refs');
-var cn = require('classnames');
-var throttle = require('lodash.throttle');
-var mobile$1 = require('@alfalab/core-components-button/cssm/mobile');
-var coreComponentsInput = require('@alfalab/core-components-input/cssm');
-var mobile = require('@alfalab/core-components-select/cssm/mobile');
-var autocompleteMobileField_Component = require('./autocomplete-mobile-field/Component.js');
-var styles = require('./mobile.module.css');
+var Component_mobile = require('./Component.mobile.js');
+require('react-merge-refs');
+require('classnames');
+require('lodash.throttle');
+require('@alfalab/core-components-select/cssm/mobile');
+require('@alfalab/core-components-select/cssm/shared');
+require('./autocomplete-mobile-field/Component.js');
 require('@alfalab/core-components-form-control/cssm/mobile');
 require('@alfalab/core-components-shared/cssm');
 require('@alfalab/hooks');
 require('./autocomplete-mobile-field/index.module.css');
+require('./utils.js');
+require('./mobile.module.css');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultCompat(React);
-var mergeRefs__default = /*#__PURE__*/_interopDefaultCompat(mergeRefs);
-var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
-var throttle__default = /*#__PURE__*/_interopDefaultCompat(throttle);
-var styles__default = /*#__PURE__*/_interopDefaultCompat(styles);
 
-var InputAutocompleteModalMobile = React__default.default.forwardRef(function (_a, ref) {
-    var openProp = _a.open, onOpen = _a.onOpen, name = _a.name, _b = _a.size, size = _b === void 0 ? 's' : _b, _c = _a.Input, Input = _c === void 0 ? coreComponentsInput.Input : _c, _d = _a.Arrow, Arrow = _d === void 0 ? null : _d, onClearFilter = _a.onClearFilter, _e = _a.filter, filter = _e === void 0 ? '' : _e, onFilter = _a.onFilter, placeholder = _a.placeholder, bottomAddonProps = _a.bottomAddonProps, multiple = _a.multiple, onChange = _a.onChange, onCancel = _a.onCancel, value = _a.value, cancelButtonProps = _a.cancelButtonProps, continueButtonProps = _a.continueButtonProps, modalProps = _a.modalProps, modalHeaderProps = _a.modalHeaderProps, modalFooterProps = _a.modalFooterProps, restProps = tslib.__rest(_a, ["open", "onOpen", "name", "size", "Input", "Arrow", "onClearFilter", "filter", "onFilter", "placeholder", "bottomAddonProps", "multiple", "onChange", "onCancel", "value", "cancelButtonProps", "continueButtonProps", "modalProps", "modalHeaderProps", "modalFooterProps"]);
-    var _f = React__default.default.useState(false), open = _f[0], setOpen = _f[1];
-    var targetRef = React.useRef(null);
-    var modalScrollableRef = React.useRef(null);
-    var bottomAddonRef = React.useRef(null);
-    React.useEffect(function () {
-        var modalContentNode = modalScrollableRef.current;
-        var handleListTouchMove = throttle__default.default(function () {
-            var input = bottomAddonRef.current;
-            if (input && document.activeElement === input) {
-                input.blur();
-            }
-        }, 300);
-        modalContentNode === null || modalContentNode === void 0 ? void 0 : modalContentNode.addEventListener('touchmove', handleListTouchMove);
-        return function () { return modalContentNode === null || modalContentNode === void 0 ? void 0 : modalContentNode.removeEventListener('touchmove', handleListTouchMove); };
-    }, [open]);
-    var setOpenModalSelect = function (isOpen) {
-        if (openProp === undefined) {
-            setOpen(isOpen);
-        }
-        onOpen === null || onOpen === void 0 ? void 0 : onOpen({ open: isOpen, name: name });
-    };
-    var handleOpen = function (payload) {
-        setOpenModalSelect(Boolean(payload.open));
-    };
-    var handleApply = function () {
-        setOpenModalSelect(false);
-        onChange(filter);
-    };
-    var handleCancel = function () {
-        setOpenModalSelect(false);
-        onCancel === null || onCancel === void 0 ? void 0 : onCancel();
-    };
-    var handleChange = function (payload) {
-        var _a;
-        onChange(payload);
-        if (multiple) {
-            // После выбора опции возвращаем фокус в поле ввода.
-            (_a = bottomAddonRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-        }
-    };
-    var renderBottomAddon = function () { return (React__default.default.createElement(Input, tslib.__assign({ block: true, clear: !!onClearFilter, onClear: onClearFilter, value: filter, onInput: onFilter, placeholder: placeholder }, bottomAddonProps, { className: cn__default.default(styles__default.default.bottomAddonInput, bottomAddonProps === null || bottomAddonProps === void 0 ? void 0 : bottomAddonProps.className), ref: mergeRefs__default.default([
-            bottomAddonRef,
-            bottomAddonProps === null || bottomAddonProps === void 0 ? void 0 : bottomAddonProps.ref,
-        ]) }))); };
-    var renderFooter = function () { return (React__default.default.createElement(React__default.default.Fragment, null,
-        React__default.default.createElement(mobile$1.ButtonMobile, tslib.__assign({ block: true, view: 'secondary', size: 'm', onClick: handleCancel }, cancelButtonProps), "\u041E\u0442\u043C\u0435\u043D\u0430"),
-        React__default.default.createElement(mobile$1.ButtonMobile, tslib.__assign({ block: true, view: 'primary', size: 'm', onClick: handleApply }, continueButtonProps), "\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C"))); };
-    return (React__default.default.createElement(mobile.SelectModalMobile, tslib.__assign({ Field: autocompleteMobileField_Component.AutocompleteMobileField, useWithApplyHook: false }, restProps, { ref: mergeRefs__default.default([ref, targetRef]), Arrow: Arrow, onOpen: handleOpen, onChange: handleChange, multiple: multiple, open: openProp !== null && openProp !== void 0 ? openProp : open, size: size, fieldProps: tslib.__assign({ value: value }, restProps.fieldProps), placeholder: placeholder, name: name, modalProps: tslib.__assign(tslib.__assign({}, modalProps), { componentRef: modalScrollableRef }), modalHeaderProps: tslib.__assign(tslib.__assign({}, modalHeaderProps), { bottomAddons: renderBottomAddon() }), modalFooterProps: tslib.__assign(tslib.__assign({ sticky: true }, modalFooterProps), { children: renderFooter() }) })));
-});
+var InputAutocompleteModalMobile = React__default.default.forwardRef(function (props, ref) { return React__default.default.createElement(Component_mobile.InputAutocompleteMobile, tslib.__assign({}, props, { ref: ref, isBottomSheet: false })); });
 
 exports.InputAutocompleteModalMobile = InputAutocompleteModalMobile;