@alfalab/core-components-input-autocomplete 11.0.3 → 11.2.0

package/mobile/Component.mobile.d.ts

@@ -4,5 +4,7 @@ import React from 'react';
 declare const InputAutocompleteMobile: React.ForwardRefExoticComponent<import("../types").InputAutocompleteCommonProps & {
     isBottomSheet?: boolean | undefined;
     transitionProps?: Partial<import("react-transition-group/Transition").TransitionProps<undefined>> | undefined;
+    onApply?: (() => void) | undefined;
+    onCancel?: (() => void) | undefined;
 } & React.RefAttributes<unknown>>;
 export { InputAutocompleteMobile };

package/mobile/Component.mobile.js

@@ -12,6 +12,7 @@ var shared = require('@alfalab/core-components-select/shared');
 var autocompleteMobileField_Component = require('../autocomplete-mobile-field/Component.js');
 var utils = require('../utils.js');
 require('@alfalab/core-components-form-control/mobile');
+require('@alfalab/core-components-input/shared');
 require('@alfalab/core-components-shared');
 require('@alfalab/hooks');
 
@@ -22,13 +23,13 @@ var mergeRefs__default = /*#__PURE__*/_interopDefaultCompat(mergeRefs);
 var cn__default = /*#__PURE__*/_interopDefaultCompat(cn);
 var throttle__default = /*#__PURE__*/_interopDefaultCompat(throttle);
 
-var styles = {"input":"input-autocomplete__input_dae0s"};
+var styles = {"input":"input-autocomplete__input_obkwb"};
 require('./mobile.css')
 
 var InputAutocompleteMobile = React__default.default.forwardRef(function (_a, ref) {
     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 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, onCancel = _a.onCancel, onApply = _a.onApply, restProps = tslib.__rest(_a, ["Input", "value", "name", "Arrow", "label", "placeholder", "size", "open", "onInput", "onOpen", "multiple", "inputProps", "isBottomSheet", "dataTestId", "transitionProps", "onCancel", "onApply"]);
     var _h = React.useState(false), open = _h[0], setOpen = _h[1];
     var frozenValue = React.useRef('');
     var searchInputRef = React.useRef(null);
@@ -54,10 +55,14 @@ var InputAutocompleteMobile = React__default.default.forwardRef(function (_a, re
             }
         }, 300);
     }, []);
-    var handleApply = function () { return setModalVisibility(false); };
+    var handleApply = function () {
+        setModalVisibility(false);
+        onApply === null || onApply === void 0 ? void 0 : onApply();
+    };
     var handleCancel = function () {
         setModalVisibility(false);
         restorePrevValue();
+        onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     };
     var handleExiting = function (node) {
         var _a, _b;
@@ -75,13 +80,14 @@ var InputAutocompleteMobile = React__default.default.forwardRef(function (_a, re
             onTouchMove: handleOptionsListTouchMove,
         },
         _b);
+    var clear = (_c = inputProps === null || inputProps === void 0 ? void 0 : inputProps.clear) !== null && _c !== void 0 ? _c : false;
     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.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) })));
+            componentProps: tslib.__assign(tslib.__assign({ leftAddons: null, placeholder: placeholder }, inputProps), { className: cn__default.default(styles.input, inputProps === null || inputProps === void 0 ? void 0 : inputProps.className), clear: clear, 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, clear: clear, onClear: clear ? inputProps === null || inputProps === void 0 ? void 0 : inputProps.onClear : undefined }, restProps.fieldProps) })));
 });
 
 exports.InputAutocompleteMobile = InputAutocompleteMobile;

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

@@ -4,5 +4,7 @@ import React from 'react';
 declare const InputAutocompleteModalMobile: React.ForwardRefExoticComponent<import("../types").InputAutocompleteCommonProps & {
     isBottomSheet?: boolean | undefined;
     transitionProps?: Partial<import("react-transition-group/Transition").TransitionProps<undefined>> | undefined;
+    onApply?: (() => void) | undefined;
+    onCancel?: (() => void) | undefined;
 } & React.RefAttributes<HTMLDivElement>>;
 export { InputAutocompleteModalMobile };

package/mobile/Component.modal.mobile.js

@@ -12,6 +12,7 @@ require('@alfalab/core-components-select/mobile');
 require('@alfalab/core-components-select/shared');
 require('../autocomplete-mobile-field/Component.js');
 require('@alfalab/core-components-form-control/mobile');
+require('@alfalab/core-components-input/shared');
 require('@alfalab/core-components-shared');
 require('@alfalab/hooks');
 require('../utils.js');

package/mobile/index.js

@@ -13,6 +13,7 @@ require('@alfalab/core-components-select/mobile');
 require('@alfalab/core-components-select/shared');
 require('../autocomplete-mobile-field/Component.js');
 require('@alfalab/core-components-form-control/mobile');
+require('@alfalab/core-components-input/shared');
 require('@alfalab/core-components-shared');
 require('@alfalab/hooks');
 require('../utils.js');

package/mobile/mobile.css

@@ -1,4 +1,4 @@
-/* hash: 5n9cn */
+/* hash: 1kaq4 */
 :root {
 } /* 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 */ /* 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 */
@@ -14,6 +14,6 @@
 } :root {
 } :root {
 } :root {
-} .input-autocomplete__input_dae0s {
+} .input-autocomplete__input_obkwb {
     width: auto;
 }

package/modern/Component.responsive.js

@@ -13,6 +13,7 @@ import 'lodash.throttle';
 import '@alfalab/core-components-select/modern/mobile';
 import './autocomplete-mobile-field/Component.js';
 import '@alfalab/core-components-form-control/modern/mobile';
+import '@alfalab/core-components-input/modern/shared';
 import '@alfalab/core-components-shared/modern';
 import '@alfalab/hooks';
 import './utils.js';

package/modern/autocomplete-field/Component.js

@@ -3,7 +3,7 @@ import mergeRefs from 'react-merge-refs';
 import cn from 'classnames';
 import { InputDesktop } from '@alfalab/core-components-input/modern/desktop';
 
-const styles = {"arrow":"input-autocomplete__arrow_z2bi9","error":"input-autocomplete__error_z2bi9"};
+const styles = {"arrow":"input-autocomplete__arrow_1ohhy","error":"input-autocomplete__error_1ohhy"};
 require('./index.css')
 
 const AutocompleteField = ({ label, labelView = 'inner', placeholder, size, Arrow, Input = InputDesktop, value, error, success, hint, disabled, readOnly, onInput, inputProps = {}, innerProps, }) => {

package/modern/autocomplete-field/index.css

@@ -1,4 +1,4 @@
-/* hash: xfkzu */
-.input-autocomplete__arrow_z2bi9.input-autocomplete__error_z2bi9 ~ * {
+/* hash: 1g9go */
+.input-autocomplete__arrow_1ohhy.input-autocomplete__error_1ohhy ~ * {
     display: none;
 }

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

@@ -15,5 +15,5 @@ type AutocompleteMobileFieldProps = FormControlMobileProps & Omit<BaseFieldProps
      */
     value?: string;
 };
-declare const AutocompleteMobileField: ({ size, open, disabled, value, innerProps, dataTestId, fieldClassName, labelView, placeholder, Arrow, valueRenderer, toggleMenu, setSelectedItems, selectedMultiple, FormControlComponent, ...restProps }: AutocompleteMobileFieldProps & FieldProps) => React.JSX.Element;
+declare const AutocompleteMobileField: ({ size, open, disabled, value, innerProps, dataTestId, fieldClassName, labelView, placeholder, Arrow, valueRenderer, toggleMenu, setSelectedItems, selectedMultiple, FormControlComponent, rightAddons, error, readOnly, clear, onClear, onInput, colors, ...restProps }: AutocompleteMobileFieldProps & FieldProps) => React.JSX.Element;
 export { AutocompleteMobileFieldProps, AutocompleteMobileField };

package/modern/autocomplete-mobile-field/Component.js

@@ -1,26 +1,31 @@
 import React, { useState, useRef } from 'react';
 import cn from 'classnames';
 import { FormControlMobile } from '@alfalab/core-components-form-control/modern/mobile';
+import { ClearButton } from '@alfalab/core-components-input/modern/shared';
 import { getDataTestId } from '@alfalab/core-components-shared/modern';
 import { useFocus } from '@alfalab/hooks';
 
-const styles = {"component":"input-autocomplete__component_gg3o5","field":"input-autocomplete__field_gg3o5","disabled":"input-autocomplete__disabled_gg3o5","placeholder":"input-autocomplete__placeholder_gg3o5","contentWrapper":"input-autocomplete__contentWrapper_gg3o5","value":"input-autocomplete__value_gg3o5","focusVisible":"input-autocomplete__focusVisible_gg3o5"};
+const styles = {"component":"input-autocomplete__component_zrg4l","field":"input-autocomplete__field_zrg4l","disabled":"input-autocomplete__disabled_zrg4l","placeholder":"input-autocomplete__placeholder_zrg4l","contentWrapper":"input-autocomplete__contentWrapper_zrg4l","value":"input-autocomplete__value_zrg4l","focusVisible":"input-autocomplete__focusVisible_zrg4l"};
 require('./index.css')
 
-const AutocompleteMobileField = ({ size = 'm', open, disabled, value, innerProps, dataTestId, fieldClassName, labelView = 'inner', placeholder, Arrow, valueRenderer, toggleMenu, setSelectedItems, selectedMultiple, FormControlComponent, ...restProps }) => {
+const AutocompleteMobileField = ({ size = 'm', open, disabled, value, innerProps, dataTestId, fieldClassName, labelView = 'inner', placeholder, Arrow, valueRenderer, toggleMenu, setSelectedItems, selectedMultiple, FormControlComponent, rightAddons, error, readOnly, clear, onClear, onInput, colors = 'default', ...restProps }) => {
     const [focused, setFocused] = useState(false);
     const wrapperRef = useRef(null);
     const [focusVisible] = useFocus(wrapperRef, 'keyboard');
     const filled = Boolean(value);
     const showPlaceholder = placeholder && !filled && labelView === 'outer';
+    const clearButtonVisible = clear && filled && !disabled && !readOnly;
     const { tabIndex, ...restInnerProps } = innerProps;
     return (React.createElement("div", { className: styles.component, ref: wrapperRef, onFocus: () => setFocused(true), onBlur: () => setFocused(false) },
         React.createElement(FormControlMobile, { fieldClassName: cn(styles.field, fieldClassName, {
                 [styles.disabled]: disabled,
                 [styles.focusVisible]: focusVisible,
-            }), block: true, size: size, focused: focused, disabled: disabled, filled: filled, labelView: labelView, rightAddons: Arrow, dataTestId: getDataTestId(dataTestId, 'form-control'), 
+            }), block: true, size: size, focused: focused, disabled: disabled, filled: filled, labelView: labelView, dataTestId: getDataTestId(dataTestId, 'form-control'), 
             // downshift устанавливает фокус на таргет поле после выбора опции, не даем ему это сделать пока открыт список, иначе поле поиска будет терять фокус
-            tabIndex: open ? undefined : tabIndex, ...restProps, ...restInnerProps },
+            tabIndex: open ? undefined : tabIndex, ...restProps, ...restInnerProps, readOnly: readOnly, colors: colors, error: error, rightAddons: (Arrow || rightAddons || clearButtonVisible) && (React.createElement(React.Fragment, null,
+                clearButtonVisible && (React.createElement(ClearButton, { onClick: onClear, disabled: disabled, colors: colors })),
+                rightAddons,
+                Arrow)) },
             React.createElement("div", { className: styles.contentWrapper },
                 showPlaceholder && React.createElement("span", { className: styles.placeholder }, placeholder),
                 filled && React.createElement("div", { className: styles.value }, value)))));

package/modern/autocomplete-mobile-field/index.css

@@ -1,4 +1,4 @@
-/* hash: r7aus */
+/* hash: 1vqlc */
 :root {
 } /* deprecated */ :root {
     --color-light-border-link: #2288fa;
@@ -18,16 +18,16 @@
 } :root {
     --focus-color: var(--color-light-border-link);
     --disabled-cursor: not-allowed;
-} .input-autocomplete__component_gg3o5 {
+} .input-autocomplete__component_zrg4l {
     width: 100%;
     outline: none;
-} .input-autocomplete__field_gg3o5:not(.input-autocomplete__disabled_gg3o5) {
+} .input-autocomplete__field_zrg4l:not(.input-autocomplete__disabled_zrg4l) {
     cursor: pointer;
-} .input-autocomplete__disabled_gg3o5 {
+} .input-autocomplete__disabled_zrg4l {
     cursor: var(--disabled-cursor);
-} .input-autocomplete__placeholder_gg3o5 {
+} .input-autocomplete__placeholder_zrg4l {
     color: var(--color-light-text-secondary);
-} .input-autocomplete__contentWrapper_gg3o5 {
+} .input-autocomplete__contentWrapper_zrg4l {
     font-size: 16px;
     line-height: 20px;
     font-weight: 400;
@@ -36,11 +36,11 @@
     text-overflow: ellipsis;
     overflow: hidden;
     width: 100%;
-} .input-autocomplete__value_gg3o5 {
+} .input-autocomplete__value_zrg4l {
     overflow: hidden;
     text-overflow: ellipsis;
     text-align: left;
-} .input-autocomplete__focusVisible_gg3o5 {
+} .input-autocomplete__focusVisible_zrg4l {
     outline: 2px solid var(--focus-color);
     outline-offset: 2px;
 }

package/modern/autocomplete-mobile-field/index.js

@@ -2,5 +2,6 @@ export { AutocompleteMobileField } from './Component.js';
 import 'react';
 import 'classnames';
 import '@alfalab/core-components-form-control/modern/mobile';
+import '@alfalab/core-components-input/modern/shared';
 import '@alfalab/core-components-shared/modern';
 import '@alfalab/hooks';

package/modern/index.js

@@ -13,6 +13,7 @@ import 'lodash.throttle';
 import '@alfalab/core-components-select/modern/mobile';
 import './autocomplete-mobile-field/Component.js';
 import '@alfalab/core-components-form-control/modern/mobile';
+import '@alfalab/core-components-input/modern/shared';
 import '@alfalab/core-components-shared/modern';
 import '@alfalab/hooks';
 import './utils.js';

package/modern/mobile/Component.mobile.d.ts

@@ -4,5 +4,7 @@ import React from 'react';
 declare const InputAutocompleteMobile: React.ForwardRefExoticComponent<import("../types").InputAutocompleteCommonProps & {
     isBottomSheet?: boolean | undefined;
     transitionProps?: Partial<import("react-transition-group/Transition").TransitionProps<undefined>> | undefined;
+    onApply?: (() => void) | undefined;
+    onCancel?: (() => void) | undefined;
 } & React.RefAttributes<unknown>>;
 export { InputAutocompleteMobile };

package/modern/mobile/Component.mobile.js

@@ -7,13 +7,14 @@ import { Footer } from '@alfalab/core-components-select/modern/shared';
 import { AutocompleteMobileField } from '../autocomplete-mobile-field/Component.js';
 import { searchFilterStub } from '../utils.js';
 import '@alfalab/core-components-form-control/modern/mobile';
+import '@alfalab/core-components-input/modern/shared';
 import '@alfalab/core-components-shared/modern';
 import '@alfalab/hooks';
 
-const styles = {"input":"input-autocomplete__input_dae0s"};
+const styles = {"input":"input-autocomplete__input_obkwb"};
 require('./mobile.css')
 
-const InputAutocompleteMobile = React.forwardRef(({ Input, value, name, Arrow = null, label, placeholder = '', size = 's', open: openProp, onInput, onOpen, multiple, inputProps, isBottomSheet = true, dataTestId, transitionProps, ...restProps }, ref) => {
+const InputAutocompleteMobile = React.forwardRef(({ Input, value, name, Arrow = null, label, placeholder = '', size = 's', open: openProp, onInput, onOpen, multiple, inputProps, isBottomSheet = true, dataTestId, transitionProps, onCancel, onApply, ...restProps }, ref) => {
     const [open, setOpen] = useState(false);
     const frozenValue = useRef('');
     const searchInputRef = useRef(null);
@@ -37,10 +38,14 @@ const InputAutocompleteMobile = React.forwardRef(({ Input, value, name, Arrow =
             input.blur();
         }
     }, 300), []);
-    const handleApply = () => setModalVisibility(false);
+    const handleApply = () => {
+        setModalVisibility(false);
+        onApply?.();
+    };
     const handleCancel = () => {
         setModalVisibility(false);
         restorePrevValue();
+        onCancel?.();
     };
     const handleExiting = (node) => {
         targetRef.current?.focus();
@@ -59,6 +64,7 @@ const InputAutocompleteMobile = React.forwardRef(({ Input, value, name, Arrow =
             onTouchMove: handleOptionsListTouchMove,
         },
     };
+    const clear = inputProps?.clear ?? false;
     return (React.createElement(Component, { Field: AutocompleteMobileField, ...restProps, ...(isBottomSheet
             ? { bottomSheetProps: componentProps }
             : { modalProps: componentProps }), dataTestId: dataTestId, useWithApplyHook: false, showSearch: true, searchProps: {
@@ -69,7 +75,7 @@ const InputAutocompleteMobile = React.forwardRef(({ Input, value, name, Arrow =
                 placeholder,
                 ...inputProps,
                 className: cn(styles.input, inputProps?.className),
-                clear: inputProps?.clear ?? false,
+                clear,
                 ref: mergeRefs([searchInputRef, inputProps?.ref]),
                 onChange: onInput,
             },
@@ -78,6 +84,8 @@ const InputAutocompleteMobile = React.forwardRef(({ Input, value, name, Arrow =
             ...restProps.optionsListProps,
         }, fieldProps: {
             value: isOpen ? frozenValue.current : value,
+            clear,
+            onClear: clear ? inputProps?.onClear : undefined,
             ...restProps.fieldProps,
         } }));
 });

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

@@ -4,5 +4,7 @@ import React from 'react';
 declare const InputAutocompleteModalMobile: React.ForwardRefExoticComponent<import("../types").InputAutocompleteCommonProps & {
     isBottomSheet?: boolean | undefined;
     transitionProps?: Partial<import("react-transition-group/Transition").TransitionProps<undefined>> | undefined;
+    onApply?: (() => void) | undefined;
+    onCancel?: (() => void) | undefined;
 } & React.RefAttributes<HTMLDivElement>>;
 export { InputAutocompleteModalMobile };

package/modern/mobile/Component.modal.mobile.js

@@ -7,6 +7,7 @@ import '@alfalab/core-components-select/modern/mobile';
 import '@alfalab/core-components-select/modern/shared';
 import '../autocomplete-mobile-field/Component.js';
 import '@alfalab/core-components-form-control/modern/mobile';
+import '@alfalab/core-components-input/modern/shared';
 import '@alfalab/core-components-shared/modern';
 import '@alfalab/hooks';
 import '../utils.js';

package/modern/mobile/index.js

@@ -8,6 +8,7 @@ import '@alfalab/core-components-select/modern/mobile';
 import '@alfalab/core-components-select/modern/shared';
 import '../autocomplete-mobile-field/Component.js';
 import '@alfalab/core-components-form-control/modern/mobile';
+import '@alfalab/core-components-input/modern/shared';
 import '@alfalab/core-components-shared/modern';
 import '@alfalab/hooks';
 import '../utils.js';

package/modern/mobile/mobile.css

@@ -1,4 +1,4 @@
-/* hash: 5n9cn */
+/* hash: 1kaq4 */
 :root {
 } /* 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 */ /* 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 */
@@ -14,6 +14,6 @@
 } :root {
 } :root {
 } :root {
-} .input-autocomplete__input_dae0s {
+} .input-autocomplete__input_obkwb {
     width: auto;
 }

package/modern/types.d.ts

@@ -38,6 +38,14 @@ type MobileProps = {
      * Пропсы анимации контента (CSSTransition)
      */
     transitionProps?: NonNullable<BottomSheetSelectMobileProps['bottomSheetProps']>['transitionProps'];
+    /**
+     * Клик на кнопку "Применить"
+     */
+    onApply?: () => void;
+    /**
+     * Клик на кнопку "Отмена"
+     */
+    onCancel?: () => void;
 };
 type InputAutocompleteMobileProps = InputAutocompleteCommonProps & MobileProps;
 interface InputAutocompleteProps extends InputAutocompleteCommonProps {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alfalab/core-components-input-autocomplete",
-    "version": "11.0.3",
+    "version": "11.2.0",
     "description": "",
     "keywords": [],
     "license": "MIT",
@@ -14,10 +14,10 @@
         "react": "^16.9.0 || ^17.0.1 || ^18.0.0"
     },
     "dependencies": {
-        "@alfalab/core-components-form-control": "^11.1.0",
-        "@alfalab/core-components-input": "^13.0.2",
-        "@alfalab/core-components-popover": "^6.1.0",
-        "@alfalab/core-components-select": "^16.0.3",
+        "@alfalab/core-components-form-control": "^12.0.0",
+        "@alfalab/core-components-input": "^14.0.0",
+        "@alfalab/core-components-popover": "^6.2.0",
+        "@alfalab/core-components-select": "^17.0.0",
         "@alfalab/core-components-shared": "^0.8.0",
         "@alfalab/core-components-mq": "^4.2.0",
         "@alfalab/hooks": "^1.13.0",

package/src/autocomplete-mobile-field/Component.tsx

@@ -5,6 +5,7 @@ import {
     FormControlMobile,
     FormControlMobileProps,
 } from '@alfalab/core-components-form-control/mobile';
+import { ClearButton } from '@alfalab/core-components-input/shared';
 import type { FieldProps as BaseFieldProps } from '@alfalab/core-components-select/shared';
 import { getDataTestId } from '@alfalab/core-components-shared';
 import { useFocus } from '@alfalab/hooks';
@@ -42,6 +43,13 @@ export const AutocompleteMobileField = ({
     setSelectedItems,
     selectedMultiple,
     FormControlComponent,
+    rightAddons,
+    error,
+    readOnly,
+    clear,
+    onClear,
+    onInput,
+    colors = 'default',
     ...restProps
 }: AutocompleteMobileFieldProps & FieldProps) => {
     const [focused, setFocused] = useState(false);
@@ -52,6 +60,7 @@ export const AutocompleteMobileField = ({
 
     const filled = Boolean(value);
     const showPlaceholder = placeholder && !filled && labelView === 'outer';
+    const clearButtonVisible = clear && filled && !disabled && !readOnly;
 
     const { tabIndex, ...restInnerProps } = innerProps;
 
@@ -73,12 +82,29 @@ export const AutocompleteMobileField = ({
                 disabled={disabled}
                 filled={filled}
                 labelView={labelView}
-                rightAddons={Arrow}
                 dataTestId={getDataTestId(dataTestId, 'form-control')}
                 // downshift устанавливает фокус на таргет поле после выбора опции, не даем ему это сделать пока открыт список, иначе поле поиска будет терять фокус
                 tabIndex={open ? undefined : tabIndex}
                 {...restProps}
                 {...restInnerProps}
+                readOnly={readOnly}
+                colors={colors}
+                error={error}
+                rightAddons={
+                    (Arrow || rightAddons || clearButtonVisible) && (
+                        <React.Fragment>
+                            {clearButtonVisible && (
+                                <ClearButton
+                                    onClick={onClear}
+                                    disabled={disabled}
+                                    colors={colors}
+                                />
+                            )}
+                            {rightAddons}
+                            {Arrow}
+                        </React.Fragment>
+                    )
+                }
             >
                 <div className={styles.contentWrapper}>
                     {showPlaceholder && <span className={styles.placeholder}>{placeholder}</span>}

package/src/mobile/Component.mobile.tsx

@@ -39,6 +39,8 @@ export const InputAutocompleteMobile = React.forwardRef(
             isBottomSheet = true,
             dataTestId,
             transitionProps,
+            onCancel,
+            onApply,
             ...restProps
         }: InputAutocompleteMobileProps,
         ref,
@@ -78,11 +80,15 @@ export const InputAutocompleteMobile = React.forwardRef(
             [],
         );
 
-        const handleApply = () => setModalVisibility(false);
+        const handleApply = () => {
+            setModalVisibility(false);
+            onApply?.();
+        };
 
         const handleCancel = () => {
             setModalVisibility(false);
             restorePrevValue();
+            onCancel?.();
         };
 
         const handleExiting = (node: HTMLElement) => {
@@ -108,6 +114,8 @@ export const InputAutocompleteMobile = React.forwardRef(
             },
         };
 
+        const clear = inputProps?.clear ?? false;
+
         return (
             <Component
                 Field={AutocompleteMobileField}
@@ -126,7 +134,7 @@ export const InputAutocompleteMobile = React.forwardRef(
                         placeholder,
                         ...inputProps,
                         className: cn(styles.input, inputProps?.className),
-                        clear: inputProps?.clear ?? false,
+                        clear,
                         ref: mergeRefs([searchInputRef, inputProps?.ref as Ref<HTMLInputElement>]),
                         onChange: onInput,
                     },
@@ -156,6 +164,8 @@ export const InputAutocompleteMobile = React.forwardRef(
                 }}
                 fieldProps={{
                     value: isOpen ? frozenValue.current : value,
+                    clear,
+                    onClear: clear ? inputProps?.onClear : undefined,
                     ...(restProps.fieldProps as AnyObject),
                 }}
             />

package/src/types.ts

@@ -54,6 +54,16 @@ type MobileProps = {
     transitionProps?: NonNullable<
         BottomSheetSelectMobileProps['bottomSheetProps']
     >['transitionProps'];
+
+    /**
+     * Клик на кнопку "Применить"
+     */
+    onApply?: () => void;
+
+    /**
+     * Клик на кнопку "Отмена"
+     */
+    onCancel?: () => void;
 };
 
 export type InputAutocompleteMobileProps = InputAutocompleteCommonProps & MobileProps;

package/types.d.ts

@@ -38,6 +38,14 @@ type MobileProps = {
      * Пропсы анимации контента (CSSTransition)
      */
     transitionProps?: NonNullable<BottomSheetSelectMobileProps['bottomSheetProps']>['transitionProps'];
+    /**
+     * Клик на кнопку "Применить"
+     */
+    onApply?: () => void;
+    /**
+     * Клик на кнопку "Отмена"
+     */
+    onCancel?: () => void;
 };
 type InputAutocompleteMobileProps = InputAutocompleteCommonProps & MobileProps;
 interface InputAutocompleteProps extends InputAutocompleteCommonProps {