@cloud-ru/uikit-product-mobile-fields 2.2.3 → 2.2.5-preview-0d3148a1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/dist/cjs/components/MobileFieldSelect/MobileFieldSelectMultiple.js +3 -2
- package/dist/cjs/components/MobileFieldSelect/MobileFieldSelectSingle.js +8 -4
- package/dist/cjs/components/MobileFieldSelect/hooks.d.ts +8 -5
- package/dist/cjs/components/MobileFieldSelect/hooks.js +16 -9
- package/dist/cjs/components/MobileFieldSelect/index.d.ts +2 -0
- package/dist/cjs/components/MobileFieldSelect/index.js +6 -1
- package/dist/cjs/components/MobileFieldSelect/types.d.ts +8 -2
- package/dist/cjs/components/MobileFieldSelect/utils/extractListProps.d.ts +1 -1
- package/dist/cjs/components/MobileFieldSelect/utils/extractListProps.js +6 -1
- package/dist/esm/components/MobileFieldSelect/MobileFieldSelectMultiple.js +3 -2
- package/dist/esm/components/MobileFieldSelect/MobileFieldSelectSingle.js +8 -4
- package/dist/esm/components/MobileFieldSelect/hooks.d.ts +8 -5
- package/dist/esm/components/MobileFieldSelect/hooks.js +16 -9
- package/dist/esm/components/MobileFieldSelect/index.d.ts +2 -0
- package/dist/esm/components/MobileFieldSelect/index.js +1 -0
- package/dist/esm/components/MobileFieldSelect/types.d.ts +8 -2
- package/dist/esm/components/MobileFieldSelect/utils/extractListProps.d.ts +1 -1
- package/dist/esm/components/MobileFieldSelect/utils/extractListProps.js +6 -1
- package/package.json +5 -5
- package/src/components/MobileFieldSelect/MobileFieldSelectMultiple.tsx +2 -0
- package/src/components/MobileFieldSelect/MobileFieldSelectSingle.tsx +9 -2
- package/src/components/MobileFieldSelect/hooks.tsx +25 -6
- package/src/components/MobileFieldSelect/index.ts +12 -0
- package/src/components/MobileFieldSelect/types.ts +21 -2
- package/src/components/MobileFieldSelect/utils/extractListProps.ts +10 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## 2.2.4 (2026-07-21)
|
|
7
|
+
|
|
8
|
+
### Only dependencies have been changed
|
|
9
|
+
* [@cloud-ru/uikit-product-icons@17.7.0]($PUBLIC_PROJECT_URL/blob/master/packages/icons/CHANGELOG.md)
|
|
10
|
+
* [@cloud-ru/uikit-product-mobile-dropdown@2.1.19]($PUBLIC_PROJECT_URL/blob/master/packages/mobile-dropdown/CHANGELOG.md)
|
|
11
|
+
* [@cloud-ru/uikit-product-mobile-modal@2.2.2]($PUBLIC_PROJECT_URL/blob/master/packages/mobile-modal/CHANGELOG.md)
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## 2.2.3 (2026-07-07)
|
|
7
18
|
|
|
8
19
|
### Only dependencies have been changed
|
|
@@ -39,7 +39,7 @@ const defaultSelectedOptionFormatter = item =>
|
|
|
39
39
|
// @ts-ignore
|
|
40
40
|
(item === null || item === void 0 ? void 0 : item.content.option) || '';
|
|
41
41
|
exports.MobileFieldSelectMultiple = (0, react_1.forwardRef)((_a, ref) => {
|
|
42
|
-
var { id, name, placeholder, size = 's', options, virtualized, value: valueProp, defaultValue, onChange: onChangeProp, disabled = false, readonly = false, searchable: searchableProp = true, showClearButton = true, onKeyDown: onInputKeyDownProp, validationState = 'default', search, enableFuzzySearch = true, autocomplete = false, autoFocus, prefixIcon, prefix, postfix, removeByBackspace = false, addOptionByEnter = false, addCustomOptionTriggers, open: openProp, onOpenChange, selectedOptionFormatter = defaultSelectedOptionFormatter } = _a, rest = __rest(_a, ["id", "name", "placeholder", "size", "options", "virtualized", "value", "defaultValue", "onChange", "disabled", "readonly", "searchable", "showClearButton", "onKeyDown", "validationState", "search", "enableFuzzySearch", "autocomplete", "autoFocus", "prefixIcon", "prefix", "postfix", "removeByBackspace", "addOptionByEnter", "addCustomOptionTriggers", "open", "onOpenChange", "selectedOptionFormatter"]);
|
|
42
|
+
var { id, name, placeholder, size = 's', options, virtualized, value: valueProp, defaultValue, onChange: onChangeProp, disabled = false, readonly = false, searchable: searchableProp = true, showClearButton = true, onKeyDown: onInputKeyDownProp, validationState = 'default', search, enableFuzzySearch = true, autocomplete = false, autoFocus, prefixIcon, prefix, postfix, removeByBackspace = false, addOptionByEnter = false, addCustomOptionTriggers, open: openProp, onOpenChange, selectedOptionFormatter = defaultSelectedOptionFormatter, resetSearchOnOptionSelection = true } = _a, rest = __rest(_a, ["id", "name", "placeholder", "size", "options", "virtualized", "value", "defaultValue", "onChange", "disabled", "readonly", "searchable", "showClearButton", "onKeyDown", "validationState", "search", "enableFuzzySearch", "autocomplete", "autoFocus", "prefixIcon", "prefix", "postfix", "removeByBackspace", "addOptionByEnter", "addCustomOptionTriggers", "open", "onOpenChange", "selectedOptionFormatter", "resetSearchOnOptionSelection"]);
|
|
43
43
|
const { t } = (0, uikit_product_locale_1.useLocale)('MobileFields');
|
|
44
44
|
const localRef = (0, react_1.useRef)(null);
|
|
45
45
|
const contentRef = (0, react_1.useRef)(null);
|
|
@@ -51,7 +51,8 @@ exports.MobileFieldSelectMultiple = (0, react_1.forwardRef)((_a, ref) => {
|
|
|
51
51
|
});
|
|
52
52
|
const [{ selectedItems, items = [] }, setItems] = (0, react_1.useState)(() => (0, utils_2.updateMultipleItems)({ options, value, currentItems: [], selectedItems: undefined }));
|
|
53
53
|
const { flattenItems } = (0, react_1.useMemo)(() => (0, list_1.kindFlattenItems)({ items }), [items]);
|
|
54
|
-
const { inputValue, setInputValue, prevInputValue, updateInputValue } = (0, hooks_2.useSearchInput)(Object.assign(Object.assign({}, search), { defaultValue: '', selectedOptionFormatter
|
|
54
|
+
const { inputValue, setInputValue, prevInputValue, updateInputValue } = (0, hooks_2.useSearchInput)(Object.assign(Object.assign({}, search), { defaultValue: '', selectedOptionFormatter,
|
|
55
|
+
resetSearchOnOptionSelection }));
|
|
55
56
|
const { resolvedAddCustomOptionTriggers, tryCommitCustomOptionFromInput } = (0, fields_1.useFieldSelectMultipleCustomOption)({
|
|
56
57
|
addCustomOptionTriggers,
|
|
57
58
|
addOptionByEnter,
|
|
@@ -35,7 +35,7 @@ const defaultSelectedOptionFormatter = item =>
|
|
|
35
35
|
// @ts-expect-error
|
|
36
36
|
(item === null || item === void 0 ? void 0 : item.content.option) || '';
|
|
37
37
|
exports.MobileFieldSelectSingle = (0, react_1.forwardRef)((_a, ref) => {
|
|
38
|
-
var { id, name, placeholder, size = 's', options, virtualized, value: valueProp, defaultValue, onChange: onChangeProp, disabled = false, readonly = false, searchable: searchableProp = true, showCopyButton = true, showClearButton = true, onKeyDown: onInputKeyDownProp, required = false, validationState = 'default', search, enableFuzzySearch = true, autocomplete = false, autoFocus, prefixIcon, prefix, postfix, addOptionByEnter = false, addCustomOptionTriggers, open: openProp, onOpenChange, selectedOptionFormatter = defaultSelectedOptionFormatter } = _a, rest = __rest(_a, ["id", "name", "placeholder", "size", "options", "virtualized", "value", "defaultValue", "onChange", "disabled", "readonly", "searchable", "showCopyButton", "showClearButton", "onKeyDown", "required", "validationState", "search", "enableFuzzySearch", "autocomplete", "autoFocus", "prefixIcon", "prefix", "postfix", "addOptionByEnter", "addCustomOptionTriggers", "open", "onOpenChange", "selectedOptionFormatter"]);
|
|
38
|
+
var { id, name, placeholder, size = 's', options, virtualized, value: valueProp, defaultValue, onChange: onChangeProp, disabled = false, readonly = false, searchable: searchableProp = true, showCopyButton = true, showClearButton = true, onKeyDown: onInputKeyDownProp, required = false, validationState = 'default', search, enableFuzzySearch = true, autocomplete = false, autoFocus, prefixIcon, prefix, postfix, addOptionByEnter = false, addCustomOptionTriggers, open: openProp, onOpenChange, selectedOptionFormatter = defaultSelectedOptionFormatter, resetSearchOnOptionSelection = true, onCopyButtonClick } = _a, rest = __rest(_a, ["id", "name", "placeholder", "size", "options", "virtualized", "value", "defaultValue", "onChange", "disabled", "readonly", "searchable", "showCopyButton", "showClearButton", "onKeyDown", "required", "validationState", "search", "enableFuzzySearch", "autocomplete", "autoFocus", "prefixIcon", "prefix", "postfix", "addOptionByEnter", "addCustomOptionTriggers", "open", "onOpenChange", "selectedOptionFormatter", "resetSearchOnOptionSelection", "onCopyButtonClick"]);
|
|
39
39
|
const localRef = (0, react_1.useRef)(null);
|
|
40
40
|
const [open = false, setOpen] = (0, utils_1.useValueControl)({ value: openProp, onChange: onOpenChange });
|
|
41
41
|
const [value, setValue] = (0, utils_1.useValueControl)({
|
|
@@ -44,7 +44,8 @@ exports.MobileFieldSelectSingle = (0, react_1.forwardRef)((_a, ref) => {
|
|
|
44
44
|
onChange: onChangeProp,
|
|
45
45
|
});
|
|
46
46
|
const [{ selectedItem, items = [] }, setItems] = (0, react_1.useState)(() => (0, utils_2.updateItems)({ options, value, currentItems: [], selectedItem: undefined }));
|
|
47
|
-
const { inputValue, setInputValue, prevInputValue } = (0, hooks_2.useSearchInput)(Object.assign(Object.assign({}, search), { selectedOptionFormatter
|
|
47
|
+
const { inputValue, setInputValue, prevInputValue } = (0, hooks_2.useSearchInput)(Object.assign(Object.assign({}, search), { selectedOptionFormatter,
|
|
48
|
+
resetSearchOnOptionSelection }));
|
|
48
49
|
const prevSelectedItem = (0, react_1.useRef)(selectedItem);
|
|
49
50
|
const prefixSettings = (0, hooks_1.usePrefix)({ prefix, disabled });
|
|
50
51
|
const postfixSettings = (0, hooks_1.usePostfix)({ postfix, disabled });
|
|
@@ -62,9 +63,11 @@ exports.MobileFieldSelectSingle = (0, react_1.forwardRef)((_a, ref) => {
|
|
|
62
63
|
return;
|
|
63
64
|
}
|
|
64
65
|
prevSelectedItem.current = selectedItem;
|
|
65
|
-
|
|
66
|
+
if (resetSearchOnOptionSelection) {
|
|
67
|
+
setInputValue('');
|
|
68
|
+
}
|
|
66
69
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
67
|
-
}, [selectedItem, prevSelectedItem]);
|
|
70
|
+
}, [selectedItem, prevSelectedItem, resetSearchOnOptionSelection]);
|
|
68
71
|
const onClear = (0, react_1.useCallback)(() => {
|
|
69
72
|
var _a;
|
|
70
73
|
setValue(undefined);
|
|
@@ -81,6 +84,7 @@ exports.MobileFieldSelectSingle = (0, react_1.forwardRef)((_a, ref) => {
|
|
|
81
84
|
showCopyButton,
|
|
82
85
|
inputRef: localRef,
|
|
83
86
|
onClear,
|
|
87
|
+
onCopyButtonClick,
|
|
84
88
|
valueToCopy: selectedOptionFormatter(selectedItem),
|
|
85
89
|
});
|
|
86
90
|
const handleSelectionChange = (0, react_1.useCallback)((newValue) => {
|
|
@@ -15,32 +15,35 @@ type UseCopyButtonProps = {
|
|
|
15
15
|
valueToCopy: string;
|
|
16
16
|
size: Size;
|
|
17
17
|
onValueRequest?(): AsyncValueRequest;
|
|
18
|
+
onCopyButtonClick?(): void;
|
|
18
19
|
disabled?: boolean;
|
|
19
20
|
prefix?: string;
|
|
20
21
|
postfix?: string;
|
|
21
22
|
};
|
|
22
|
-
export declare function useCopyButton({ copyButtonRef, showCopyButton, size, valueToCopy, onValueRequest, disabled, prefix, postfix, }: UseCopyButtonProps): ButtonProps;
|
|
23
|
+
export declare function useCopyButton({ copyButtonRef, showCopyButton, size, valueToCopy, onValueRequest, onCopyButtonClick, disabled, prefix, postfix, }: UseCopyButtonProps): ButtonProps;
|
|
23
24
|
type UseButtonsProps = {
|
|
24
25
|
readonly: boolean;
|
|
25
26
|
showClearButton: boolean;
|
|
26
27
|
showCopyButton: boolean;
|
|
27
28
|
size: 's' | 'm' | 'l';
|
|
28
29
|
onClear(): void;
|
|
30
|
+
onCopyButtonClick?(): void;
|
|
29
31
|
inputRef: RefObject<HTMLInputElement>;
|
|
30
32
|
valueToCopy?: string;
|
|
31
33
|
};
|
|
32
|
-
export declare function useButtons({ readonly, showClearButton, showCopyButton, size, onClear, inputRef, valueToCopy, }: UseButtonsProps): {
|
|
34
|
+
export declare function useButtons({ readonly, showClearButton, showCopyButton, size, onClear, onCopyButtonClick, inputRef, valueToCopy, }: UseButtonsProps): {
|
|
33
35
|
postfixButtons: import("react/jsx-runtime").JSX.Element | undefined;
|
|
34
36
|
inputKeyDownNavigationHandler: KeyboardEventHandler<HTMLInputElement>;
|
|
35
37
|
buttonsRefs: (Element | null)[];
|
|
36
38
|
};
|
|
37
|
-
export declare function useSearchInput({ value, onChange, defaultValue, selectedOptionFormatter, }: SearchState & {
|
|
39
|
+
export declare function useSearchInput({ value, onChange, defaultValue, selectedOptionFormatter, resetSearchOnOptionSelection, }: SearchState & {
|
|
38
40
|
selectedOptionFormatter: SelectedOptionFormatter;
|
|
41
|
+
resetSearchOnOptionSelection?: boolean;
|
|
39
42
|
}): {
|
|
40
43
|
inputValue: string;
|
|
41
|
-
setInputValue: (value:
|
|
44
|
+
setInputValue: (value: string) => void;
|
|
42
45
|
prevInputValue: import("react").MutableRefObject<string>;
|
|
43
|
-
onInputValueChange: (value:
|
|
46
|
+
onInputValueChange: (value: string) => void;
|
|
44
47
|
updateInputValue: (selectedItem?: ItemWithId) => void;
|
|
45
48
|
};
|
|
46
49
|
export declare function useHandleDeleteItem(setValue: Handler): (item?: ItemWithId) => (e?: MouseEvent<HTMLButtonElement>) => void;
|
|
@@ -34,16 +34,16 @@ function useHandleOnKeyDown({ setOpen, inputKeyDownNavigationHandler, onInputKey
|
|
|
34
34
|
onInputKeyDownProp === null || onInputKeyDownProp === void 0 ? void 0 : onInputKeyDownProp(e);
|
|
35
35
|
}, [inputKeyDownNavigationHandler, onInputKeyDownProp, setOpen]);
|
|
36
36
|
}
|
|
37
|
-
function useCopyButton({ copyButtonRef, showCopyButton, size, valueToCopy, onValueRequest, disabled, prefix = '', postfix = '', }) {
|
|
37
|
+
function useCopyButton({ copyButtonRef, showCopyButton, size, valueToCopy, onValueRequest, onCopyButtonClick, disabled, prefix = '', postfix = '', }) {
|
|
38
38
|
return (0, react_1.useMemo)(() => ({
|
|
39
39
|
id: 'copy',
|
|
40
40
|
active: true,
|
|
41
41
|
ref: copyButtonRef,
|
|
42
42
|
show: showCopyButton,
|
|
43
|
-
render: props => ((0, jsx_runtime_1.jsx)(helperComponents_1.ButtonCopyValue, Object.assign({}, props, { size: input_private_1.BUTTON_SIZE_MAP[size], valueToCopy: (prefix !== null && prefix !== void 0 ? prefix : '') + valueToCopy + (postfix !== null && postfix !== void 0 ? postfix : ''), onValueRequest: onValueRequest, disabled: disabled }))),
|
|
44
|
-
}), [copyButtonRef, disabled, onValueRequest, showCopyButton, size, valueToCopy, prefix, postfix]);
|
|
43
|
+
render: props => ((0, jsx_runtime_1.jsx)(helperComponents_1.ButtonCopyValue, Object.assign({}, props, { size: input_private_1.BUTTON_SIZE_MAP[size], valueToCopy: (prefix !== null && prefix !== void 0 ? prefix : '') + valueToCopy + (postfix !== null && postfix !== void 0 ? postfix : ''), onValueRequest: onValueRequest, onClick: onCopyButtonClick, disabled: disabled }))),
|
|
44
|
+
}), [copyButtonRef, disabled, onCopyButtonClick, onValueRequest, showCopyButton, size, valueToCopy, prefix, postfix]);
|
|
45
45
|
}
|
|
46
|
-
function useButtons({ readonly, showClearButton, showCopyButton, size, onClear, inputRef, valueToCopy = '', }) {
|
|
46
|
+
function useButtons({ readonly, showClearButton, showCopyButton, size, onClear, onCopyButtonClick, inputRef, valueToCopy = '', }) {
|
|
47
47
|
const clearButtonRef = (0, react_1.useRef)(null);
|
|
48
48
|
const copyButtonRef = (0, react_1.useRef)(null);
|
|
49
49
|
const buttonsRefs = [copyButtonRef.current, clearButtonRef.current];
|
|
@@ -58,6 +58,7 @@ function useButtons({ readonly, showClearButton, showCopyButton, size, onClear,
|
|
|
58
58
|
showCopyButton: readonly && showCopyButton,
|
|
59
59
|
size,
|
|
60
60
|
valueToCopy,
|
|
61
|
+
onCopyButtonClick,
|
|
61
62
|
});
|
|
62
63
|
const { onInputKeyDown: inputKeyDownNavigationHandler, postfixButtons } = (0, input_private_1.useButtonNavigation)({
|
|
63
64
|
inputRef,
|
|
@@ -68,16 +69,22 @@ function useButtons({ readonly, showClearButton, showCopyButton, size, onClear,
|
|
|
68
69
|
});
|
|
69
70
|
return { postfixButtons, inputKeyDownNavigationHandler, buttonsRefs };
|
|
70
71
|
}
|
|
71
|
-
function useSearchInput({ value, onChange, defaultValue, selectedOptionFormatter, }) {
|
|
72
|
-
const [inputValue = '',
|
|
72
|
+
function useSearchInput({ value, onChange, defaultValue, selectedOptionFormatter, resetSearchOnOptionSelection = true, }) {
|
|
73
|
+
const [inputValue = '', setInputValueState] = (0, utils_1.useValueControl)({ value, onChange, defaultValue });
|
|
73
74
|
const prevInputValue = (0, react_1.useRef)(inputValue);
|
|
74
75
|
const updateInputValue = (0, react_1.useCallback)((selectedItem) => {
|
|
75
76
|
const newInputValue = selectedOptionFormatter(selectedItem);
|
|
76
|
-
if (inputValue !== newInputValue || prevInputValue.current !== newInputValue) {
|
|
77
|
-
|
|
77
|
+
if (resetSearchOnOptionSelection && (inputValue !== newInputValue || prevInputValue.current !== newInputValue)) {
|
|
78
|
+
setInputValueState(newInputValue);
|
|
78
79
|
prevInputValue.current = newInputValue;
|
|
79
80
|
}
|
|
80
|
-
}, [inputValue, selectedOptionFormatter,
|
|
81
|
+
}, [inputValue, resetSearchOnOptionSelection, selectedOptionFormatter, setInputValueState]);
|
|
82
|
+
const setInputValue = (0, react_1.useCallback)((value) => {
|
|
83
|
+
const updatedValue = prevInputValue.current && value.includes(prevInputValue.current)
|
|
84
|
+
? value.replace(prevInputValue.current, '')
|
|
85
|
+
: value;
|
|
86
|
+
setInputValueState(updatedValue);
|
|
87
|
+
}, [setInputValueState]);
|
|
81
88
|
return { inputValue, setInputValue, prevInputValue, onInputValueChange: setInputValue, updateInputValue };
|
|
82
89
|
}
|
|
83
90
|
function useHandleDeleteItem(setValue) {
|
|
@@ -1,2 +1,4 @@
|
|
|
1
1
|
export { MobileFieldSelect } from './MobileFieldSelect';
|
|
2
2
|
export type { MobileFieldSelectSingleProps, MobileFieldSelectMultipleProps, MobileFieldSelectProps, OptionProps, BaseOptionProps, AccordionOptionProps, NestListOptionProps, GroupOptionProps, SelectedOptionFormatter, } from './types';
|
|
3
|
+
export type { FieldSelectMultipleAddCustomOptionTrigger, FieldSelectSingleAddCustomOptionTrigger, } from '@snack-uikit/fields';
|
|
4
|
+
export { getCustomOptionTriggerByCode, shouldHandleCustomOptionTrigger, useFieldSelectMultipleCustomOption, useFieldSelectSingleCustomOption, } from '@snack-uikit/fields';
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MobileFieldSelect = void 0;
|
|
3
|
+
exports.useFieldSelectSingleCustomOption = exports.useFieldSelectMultipleCustomOption = exports.shouldHandleCustomOptionTrigger = exports.getCustomOptionTriggerByCode = exports.MobileFieldSelect = void 0;
|
|
4
4
|
var MobileFieldSelect_1 = require("./MobileFieldSelect");
|
|
5
5
|
Object.defineProperty(exports, "MobileFieldSelect", { enumerable: true, get: function () { return MobileFieldSelect_1.MobileFieldSelect; } });
|
|
6
|
+
var fields_1 = require("@snack-uikit/fields");
|
|
7
|
+
Object.defineProperty(exports, "getCustomOptionTriggerByCode", { enumerable: true, get: function () { return fields_1.getCustomOptionTriggerByCode; } });
|
|
8
|
+
Object.defineProperty(exports, "shouldHandleCustomOptionTrigger", { enumerable: true, get: function () { return fields_1.shouldHandleCustomOptionTrigger; } });
|
|
9
|
+
Object.defineProperty(exports, "useFieldSelectMultipleCustomOption", { enumerable: true, get: function () { return fields_1.useFieldSelectMultipleCustomOption; } });
|
|
10
|
+
Object.defineProperty(exports, "useFieldSelectSingleCustomOption", { enumerable: true, get: function () { return fields_1.useFieldSelectSingleCustomOption; } });
|
|
@@ -46,6 +46,8 @@ type FiledSelectCommonProps = WithSupportProps<{
|
|
|
46
46
|
searchable?: boolean;
|
|
47
47
|
/** Отображение кнопки Копировать для поля (актуально только для `readonly = true`) */
|
|
48
48
|
showCopyButton?: boolean;
|
|
49
|
+
/** Колбек клика по кнопке Копировать для поля */
|
|
50
|
+
onCopyButtonClick?(): void;
|
|
49
51
|
/**
|
|
50
52
|
* Отображение кнопки очистки поля
|
|
51
53
|
* @default true
|
|
@@ -72,13 +74,17 @@ type FiledSelectCommonProps = WithSupportProps<{
|
|
|
72
74
|
enableFuzzySearch?: boolean;
|
|
73
75
|
autocomplete?: boolean;
|
|
74
76
|
open?: boolean;
|
|
77
|
+
/** Поведение строки поиска при выборе опции из списка, false необходимо при асинхронной подгрузке значений с бэка, в случае если надо поиск оставить как значение при отсутствии данных
|
|
78
|
+
* @default true
|
|
79
|
+
*/
|
|
80
|
+
resetSearchOnOptionSelection?: boolean;
|
|
75
81
|
onOpenChange?(open: boolean): void;
|
|
76
82
|
selectedOptionFormatter?: SelectedOptionFormatter;
|
|
77
|
-
}> & Pick<FieldSelectProps, 'addOptionByEnter'> & Pick<DroplistProps, 'dataError' | 'noDataState' | 'noResultsState' | 'errorDataState' | 'dataFiltered'>;
|
|
83
|
+
}> & Pick<FieldSelectProps, 'addOptionByEnter'> & Pick<DroplistProps, 'dataError' | 'noDataState' | 'noResultsState' | 'errorDataState' | 'dataFiltered' | 'untouchableScrollbars' | 'scrollToSelectedItem' | 'scrollRef' | 'scrollContainerRef' | 'onScroll'>;
|
|
78
84
|
export type MobileFieldSelectSingleProps = FieldSelectPrivateProps & Omit<SelectionSingleState, 'mode'> & WrapperProps & FiledSelectCommonProps & Pick<FieldSelectSingleProps, 'addCustomOptionTriggers'>;
|
|
79
85
|
export type MobileFieldSelectMultipleProps = FieldSelectPrivateProps & {
|
|
80
86
|
removeByBackspace?: boolean;
|
|
81
|
-
} & Omit<SelectionMultipleState, 'mode'> & Omit<FiledSelectCommonProps, 'showCopyButton'> & Pick<FieldSelectMultipleProps, 'addCustomOptionTriggers'>;
|
|
87
|
+
} & Omit<SelectionMultipleState, 'mode'> & Omit<FiledSelectCommonProps, 'showCopyButton' | 'onCopyButtonClick'> & Pick<FieldSelectMultipleProps, 'addCustomOptionTriggers'>;
|
|
82
88
|
export type MobileFieldSelectProps = (MobileFieldSelectSingleProps & {
|
|
83
89
|
selection?: 'single';
|
|
84
90
|
}) | (MobileFieldSelectMultipleProps & {
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { DroplistProps } from '@snack-uikit/list';
|
|
2
2
|
import { MobileFieldSelectProps } from '../types';
|
|
3
|
-
export declare function extractListProps({ dataError, noDataState, noResultsState, errorDataState, dataFiltered, loading, footer, widthStrategy, }: Partial<MobileFieldSelectProps>): Partial<DroplistProps>;
|
|
3
|
+
export declare function extractListProps({ dataError, noDataState, noResultsState, errorDataState, dataFiltered, loading, footer, widthStrategy, scrollToSelectedItem, scrollRef, scrollContainerRef, onScroll, untouchableScrollbars, }: Partial<MobileFieldSelectProps>): Partial<DroplistProps>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.extractListProps = extractListProps;
|
|
4
|
-
function extractListProps({ dataError, noDataState, noResultsState, errorDataState, dataFiltered, loading, footer, widthStrategy, }) {
|
|
4
|
+
function extractListProps({ dataError, noDataState, noResultsState, errorDataState, dataFiltered, loading, footer, widthStrategy, scrollToSelectedItem, scrollRef, scrollContainerRef, onScroll, untouchableScrollbars, }) {
|
|
5
5
|
return {
|
|
6
6
|
dataError,
|
|
7
7
|
noDataState,
|
|
@@ -11,6 +11,11 @@ function extractListProps({ dataError, noDataState, noResultsState, errorDataSta
|
|
|
11
11
|
loading,
|
|
12
12
|
footer,
|
|
13
13
|
widthStrategy,
|
|
14
|
+
scrollToSelectedItem,
|
|
15
|
+
scrollRef,
|
|
16
|
+
scrollContainerRef,
|
|
17
|
+
onScroll,
|
|
18
|
+
untouchableScrollbars,
|
|
14
19
|
trigger: 'clickAndFocusVisible',
|
|
15
20
|
placement: 'bottom',
|
|
16
21
|
'data-test-id': 'field-select__list',
|
|
@@ -33,7 +33,7 @@ const defaultSelectedOptionFormatter = item =>
|
|
|
33
33
|
// @ts-ignore
|
|
34
34
|
(item === null || item === void 0 ? void 0 : item.content.option) || '';
|
|
35
35
|
export const MobileFieldSelectMultiple = forwardRef((_a, ref) => {
|
|
36
|
-
var { id, name, placeholder, size = 's', options, virtualized, value: valueProp, defaultValue, onChange: onChangeProp, disabled = false, readonly = false, searchable: searchableProp = true, showClearButton = true, onKeyDown: onInputKeyDownProp, validationState = 'default', search, enableFuzzySearch = true, autocomplete = false, autoFocus, prefixIcon, prefix, postfix, removeByBackspace = false, addOptionByEnter = false, addCustomOptionTriggers, open: openProp, onOpenChange, selectedOptionFormatter = defaultSelectedOptionFormatter } = _a, rest = __rest(_a, ["id", "name", "placeholder", "size", "options", "virtualized", "value", "defaultValue", "onChange", "disabled", "readonly", "searchable", "showClearButton", "onKeyDown", "validationState", "search", "enableFuzzySearch", "autocomplete", "autoFocus", "prefixIcon", "prefix", "postfix", "removeByBackspace", "addOptionByEnter", "addCustomOptionTriggers", "open", "onOpenChange", "selectedOptionFormatter"]);
|
|
36
|
+
var { id, name, placeholder, size = 's', options, virtualized, value: valueProp, defaultValue, onChange: onChangeProp, disabled = false, readonly = false, searchable: searchableProp = true, showClearButton = true, onKeyDown: onInputKeyDownProp, validationState = 'default', search, enableFuzzySearch = true, autocomplete = false, autoFocus, prefixIcon, prefix, postfix, removeByBackspace = false, addOptionByEnter = false, addCustomOptionTriggers, open: openProp, onOpenChange, selectedOptionFormatter = defaultSelectedOptionFormatter, resetSearchOnOptionSelection = true } = _a, rest = __rest(_a, ["id", "name", "placeholder", "size", "options", "virtualized", "value", "defaultValue", "onChange", "disabled", "readonly", "searchable", "showClearButton", "onKeyDown", "validationState", "search", "enableFuzzySearch", "autocomplete", "autoFocus", "prefixIcon", "prefix", "postfix", "removeByBackspace", "addOptionByEnter", "addCustomOptionTriggers", "open", "onOpenChange", "selectedOptionFormatter", "resetSearchOnOptionSelection"]);
|
|
37
37
|
const { t } = useLocale('MobileFields');
|
|
38
38
|
const localRef = useRef(null);
|
|
39
39
|
const contentRef = useRef(null);
|
|
@@ -45,7 +45,8 @@ export const MobileFieldSelectMultiple = forwardRef((_a, ref) => {
|
|
|
45
45
|
});
|
|
46
46
|
const [{ selectedItems, items = [] }, setItems] = useState(() => updateMultipleItems({ options, value, currentItems: [], selectedItems: undefined }));
|
|
47
47
|
const { flattenItems } = useMemo(() => kindFlattenItems({ items }), [items]);
|
|
48
|
-
const { inputValue, setInputValue, prevInputValue, updateInputValue } = useSearchInput(Object.assign(Object.assign({}, search), { defaultValue: '', selectedOptionFormatter
|
|
48
|
+
const { inputValue, setInputValue, prevInputValue, updateInputValue } = useSearchInput(Object.assign(Object.assign({}, search), { defaultValue: '', selectedOptionFormatter,
|
|
49
|
+
resetSearchOnOptionSelection }));
|
|
49
50
|
const { resolvedAddCustomOptionTriggers, tryCommitCustomOptionFromInput } = useFieldSelectMultipleCustomOption({
|
|
50
51
|
addCustomOptionTriggers,
|
|
51
52
|
addOptionByEnter,
|
|
@@ -29,7 +29,7 @@ const defaultSelectedOptionFormatter = item =>
|
|
|
29
29
|
// @ts-expect-error
|
|
30
30
|
(item === null || item === void 0 ? void 0 : item.content.option) || '';
|
|
31
31
|
export const MobileFieldSelectSingle = forwardRef((_a, ref) => {
|
|
32
|
-
var { id, name, placeholder, size = 's', options, virtualized, value: valueProp, defaultValue, onChange: onChangeProp, disabled = false, readonly = false, searchable: searchableProp = true, showCopyButton = true, showClearButton = true, onKeyDown: onInputKeyDownProp, required = false, validationState = 'default', search, enableFuzzySearch = true, autocomplete = false, autoFocus, prefixIcon, prefix, postfix, addOptionByEnter = false, addCustomOptionTriggers, open: openProp, onOpenChange, selectedOptionFormatter = defaultSelectedOptionFormatter } = _a, rest = __rest(_a, ["id", "name", "placeholder", "size", "options", "virtualized", "value", "defaultValue", "onChange", "disabled", "readonly", "searchable", "showCopyButton", "showClearButton", "onKeyDown", "required", "validationState", "search", "enableFuzzySearch", "autocomplete", "autoFocus", "prefixIcon", "prefix", "postfix", "addOptionByEnter", "addCustomOptionTriggers", "open", "onOpenChange", "selectedOptionFormatter"]);
|
|
32
|
+
var { id, name, placeholder, size = 's', options, virtualized, value: valueProp, defaultValue, onChange: onChangeProp, disabled = false, readonly = false, searchable: searchableProp = true, showCopyButton = true, showClearButton = true, onKeyDown: onInputKeyDownProp, required = false, validationState = 'default', search, enableFuzzySearch = true, autocomplete = false, autoFocus, prefixIcon, prefix, postfix, addOptionByEnter = false, addCustomOptionTriggers, open: openProp, onOpenChange, selectedOptionFormatter = defaultSelectedOptionFormatter, resetSearchOnOptionSelection = true, onCopyButtonClick } = _a, rest = __rest(_a, ["id", "name", "placeholder", "size", "options", "virtualized", "value", "defaultValue", "onChange", "disabled", "readonly", "searchable", "showCopyButton", "showClearButton", "onKeyDown", "required", "validationState", "search", "enableFuzzySearch", "autocomplete", "autoFocus", "prefixIcon", "prefix", "postfix", "addOptionByEnter", "addCustomOptionTriggers", "open", "onOpenChange", "selectedOptionFormatter", "resetSearchOnOptionSelection", "onCopyButtonClick"]);
|
|
33
33
|
const localRef = useRef(null);
|
|
34
34
|
const [open = false, setOpen] = useValueControl({ value: openProp, onChange: onOpenChange });
|
|
35
35
|
const [value, setValue] = useValueControl({
|
|
@@ -38,7 +38,8 @@ export const MobileFieldSelectSingle = forwardRef((_a, ref) => {
|
|
|
38
38
|
onChange: onChangeProp,
|
|
39
39
|
});
|
|
40
40
|
const [{ selectedItem, items = [] }, setItems] = useState(() => updateItems({ options, value, currentItems: [], selectedItem: undefined }));
|
|
41
|
-
const { inputValue, setInputValue, prevInputValue } = useSearchInput(Object.assign(Object.assign({}, search), { selectedOptionFormatter
|
|
41
|
+
const { inputValue, setInputValue, prevInputValue } = useSearchInput(Object.assign(Object.assign({}, search), { selectedOptionFormatter,
|
|
42
|
+
resetSearchOnOptionSelection }));
|
|
42
43
|
const prevSelectedItem = useRef(selectedItem);
|
|
43
44
|
const prefixSettings = usePrefix({ prefix, disabled });
|
|
44
45
|
const postfixSettings = usePostfix({ postfix, disabled });
|
|
@@ -56,9 +57,11 @@ export const MobileFieldSelectSingle = forwardRef((_a, ref) => {
|
|
|
56
57
|
return;
|
|
57
58
|
}
|
|
58
59
|
prevSelectedItem.current = selectedItem;
|
|
59
|
-
|
|
60
|
+
if (resetSearchOnOptionSelection) {
|
|
61
|
+
setInputValue('');
|
|
62
|
+
}
|
|
60
63
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
61
|
-
}, [selectedItem, prevSelectedItem]);
|
|
64
|
+
}, [selectedItem, prevSelectedItem, resetSearchOnOptionSelection]);
|
|
62
65
|
const onClear = useCallback(() => {
|
|
63
66
|
var _a;
|
|
64
67
|
setValue(undefined);
|
|
@@ -75,6 +78,7 @@ export const MobileFieldSelectSingle = forwardRef((_a, ref) => {
|
|
|
75
78
|
showCopyButton,
|
|
76
79
|
inputRef: localRef,
|
|
77
80
|
onClear,
|
|
81
|
+
onCopyButtonClick,
|
|
78
82
|
valueToCopy: selectedOptionFormatter(selectedItem),
|
|
79
83
|
});
|
|
80
84
|
const handleSelectionChange = useCallback((newValue) => {
|
|
@@ -15,32 +15,35 @@ type UseCopyButtonProps = {
|
|
|
15
15
|
valueToCopy: string;
|
|
16
16
|
size: Size;
|
|
17
17
|
onValueRequest?(): AsyncValueRequest;
|
|
18
|
+
onCopyButtonClick?(): void;
|
|
18
19
|
disabled?: boolean;
|
|
19
20
|
prefix?: string;
|
|
20
21
|
postfix?: string;
|
|
21
22
|
};
|
|
22
|
-
export declare function useCopyButton({ copyButtonRef, showCopyButton, size, valueToCopy, onValueRequest, disabled, prefix, postfix, }: UseCopyButtonProps): ButtonProps;
|
|
23
|
+
export declare function useCopyButton({ copyButtonRef, showCopyButton, size, valueToCopy, onValueRequest, onCopyButtonClick, disabled, prefix, postfix, }: UseCopyButtonProps): ButtonProps;
|
|
23
24
|
type UseButtonsProps = {
|
|
24
25
|
readonly: boolean;
|
|
25
26
|
showClearButton: boolean;
|
|
26
27
|
showCopyButton: boolean;
|
|
27
28
|
size: 's' | 'm' | 'l';
|
|
28
29
|
onClear(): void;
|
|
30
|
+
onCopyButtonClick?(): void;
|
|
29
31
|
inputRef: RefObject<HTMLInputElement>;
|
|
30
32
|
valueToCopy?: string;
|
|
31
33
|
};
|
|
32
|
-
export declare function useButtons({ readonly, showClearButton, showCopyButton, size, onClear, inputRef, valueToCopy, }: UseButtonsProps): {
|
|
34
|
+
export declare function useButtons({ readonly, showClearButton, showCopyButton, size, onClear, onCopyButtonClick, inputRef, valueToCopy, }: UseButtonsProps): {
|
|
33
35
|
postfixButtons: import("react/jsx-runtime").JSX.Element | undefined;
|
|
34
36
|
inputKeyDownNavigationHandler: KeyboardEventHandler<HTMLInputElement>;
|
|
35
37
|
buttonsRefs: (Element | null)[];
|
|
36
38
|
};
|
|
37
|
-
export declare function useSearchInput({ value, onChange, defaultValue, selectedOptionFormatter, }: SearchState & {
|
|
39
|
+
export declare function useSearchInput({ value, onChange, defaultValue, selectedOptionFormatter, resetSearchOnOptionSelection, }: SearchState & {
|
|
38
40
|
selectedOptionFormatter: SelectedOptionFormatter;
|
|
41
|
+
resetSearchOnOptionSelection?: boolean;
|
|
39
42
|
}): {
|
|
40
43
|
inputValue: string;
|
|
41
|
-
setInputValue: (value:
|
|
44
|
+
setInputValue: (value: string) => void;
|
|
42
45
|
prevInputValue: import("react").MutableRefObject<string>;
|
|
43
|
-
onInputValueChange: (value:
|
|
46
|
+
onInputValueChange: (value: string) => void;
|
|
44
47
|
updateInputValue: (selectedItem?: ItemWithId) => void;
|
|
45
48
|
};
|
|
46
49
|
export declare function useHandleDeleteItem(setValue: Handler): (item?: ItemWithId) => (e?: MouseEvent<HTMLButtonElement>) => void;
|
|
@@ -27,16 +27,16 @@ export function useHandleOnKeyDown({ setOpen, inputKeyDownNavigationHandler, onI
|
|
|
27
27
|
onInputKeyDownProp === null || onInputKeyDownProp === void 0 ? void 0 : onInputKeyDownProp(e);
|
|
28
28
|
}, [inputKeyDownNavigationHandler, onInputKeyDownProp, setOpen]);
|
|
29
29
|
}
|
|
30
|
-
export function useCopyButton({ copyButtonRef, showCopyButton, size, valueToCopy, onValueRequest, disabled, prefix = '', postfix = '', }) {
|
|
30
|
+
export function useCopyButton({ copyButtonRef, showCopyButton, size, valueToCopy, onValueRequest, onCopyButtonClick, disabled, prefix = '', postfix = '', }) {
|
|
31
31
|
return useMemo(() => ({
|
|
32
32
|
id: 'copy',
|
|
33
33
|
active: true,
|
|
34
34
|
ref: copyButtonRef,
|
|
35
35
|
show: showCopyButton,
|
|
36
|
-
render: props => (_jsx(ButtonCopyValue, Object.assign({}, props, { size: BUTTON_SIZE_MAP[size], valueToCopy: (prefix !== null && prefix !== void 0 ? prefix : '') + valueToCopy + (postfix !== null && postfix !== void 0 ? postfix : ''), onValueRequest: onValueRequest, disabled: disabled }))),
|
|
37
|
-
}), [copyButtonRef, disabled, onValueRequest, showCopyButton, size, valueToCopy, prefix, postfix]);
|
|
36
|
+
render: props => (_jsx(ButtonCopyValue, Object.assign({}, props, { size: BUTTON_SIZE_MAP[size], valueToCopy: (prefix !== null && prefix !== void 0 ? prefix : '') + valueToCopy + (postfix !== null && postfix !== void 0 ? postfix : ''), onValueRequest: onValueRequest, onClick: onCopyButtonClick, disabled: disabled }))),
|
|
37
|
+
}), [copyButtonRef, disabled, onCopyButtonClick, onValueRequest, showCopyButton, size, valueToCopy, prefix, postfix]);
|
|
38
38
|
}
|
|
39
|
-
export function useButtons({ readonly, showClearButton, showCopyButton, size, onClear, inputRef, valueToCopy = '', }) {
|
|
39
|
+
export function useButtons({ readonly, showClearButton, showCopyButton, size, onClear, onCopyButtonClick, inputRef, valueToCopy = '', }) {
|
|
40
40
|
const clearButtonRef = useRef(null);
|
|
41
41
|
const copyButtonRef = useRef(null);
|
|
42
42
|
const buttonsRefs = [copyButtonRef.current, clearButtonRef.current];
|
|
@@ -51,6 +51,7 @@ export function useButtons({ readonly, showClearButton, showCopyButton, size, on
|
|
|
51
51
|
showCopyButton: readonly && showCopyButton,
|
|
52
52
|
size,
|
|
53
53
|
valueToCopy,
|
|
54
|
+
onCopyButtonClick,
|
|
54
55
|
});
|
|
55
56
|
const { onInputKeyDown: inputKeyDownNavigationHandler, postfixButtons } = useButtonNavigation({
|
|
56
57
|
inputRef,
|
|
@@ -61,16 +62,22 @@ export function useButtons({ readonly, showClearButton, showCopyButton, size, on
|
|
|
61
62
|
});
|
|
62
63
|
return { postfixButtons, inputKeyDownNavigationHandler, buttonsRefs };
|
|
63
64
|
}
|
|
64
|
-
export function useSearchInput({ value, onChange, defaultValue, selectedOptionFormatter, }) {
|
|
65
|
-
const [inputValue = '',
|
|
65
|
+
export function useSearchInput({ value, onChange, defaultValue, selectedOptionFormatter, resetSearchOnOptionSelection = true, }) {
|
|
66
|
+
const [inputValue = '', setInputValueState] = useValueControl({ value, onChange, defaultValue });
|
|
66
67
|
const prevInputValue = useRef(inputValue);
|
|
67
68
|
const updateInputValue = useCallback((selectedItem) => {
|
|
68
69
|
const newInputValue = selectedOptionFormatter(selectedItem);
|
|
69
|
-
if (inputValue !== newInputValue || prevInputValue.current !== newInputValue) {
|
|
70
|
-
|
|
70
|
+
if (resetSearchOnOptionSelection && (inputValue !== newInputValue || prevInputValue.current !== newInputValue)) {
|
|
71
|
+
setInputValueState(newInputValue);
|
|
71
72
|
prevInputValue.current = newInputValue;
|
|
72
73
|
}
|
|
73
|
-
}, [inputValue, selectedOptionFormatter,
|
|
74
|
+
}, [inputValue, resetSearchOnOptionSelection, selectedOptionFormatter, setInputValueState]);
|
|
75
|
+
const setInputValue = useCallback((value) => {
|
|
76
|
+
const updatedValue = prevInputValue.current && value.includes(prevInputValue.current)
|
|
77
|
+
? value.replace(prevInputValue.current, '')
|
|
78
|
+
: value;
|
|
79
|
+
setInputValueState(updatedValue);
|
|
80
|
+
}, [setInputValueState]);
|
|
74
81
|
return { inputValue, setInputValue, prevInputValue, onInputValueChange: setInputValue, updateInputValue };
|
|
75
82
|
}
|
|
76
83
|
export function useHandleDeleteItem(setValue) {
|
|
@@ -1,2 +1,4 @@
|
|
|
1
1
|
export { MobileFieldSelect } from './MobileFieldSelect';
|
|
2
2
|
export type { MobileFieldSelectSingleProps, MobileFieldSelectMultipleProps, MobileFieldSelectProps, OptionProps, BaseOptionProps, AccordionOptionProps, NestListOptionProps, GroupOptionProps, SelectedOptionFormatter, } from './types';
|
|
3
|
+
export type { FieldSelectMultipleAddCustomOptionTrigger, FieldSelectSingleAddCustomOptionTrigger, } from '@snack-uikit/fields';
|
|
4
|
+
export { getCustomOptionTriggerByCode, shouldHandleCustomOptionTrigger, useFieldSelectMultipleCustomOption, useFieldSelectSingleCustomOption, } from '@snack-uikit/fields';
|
|
@@ -46,6 +46,8 @@ type FiledSelectCommonProps = WithSupportProps<{
|
|
|
46
46
|
searchable?: boolean;
|
|
47
47
|
/** Отображение кнопки Копировать для поля (актуально только для `readonly = true`) */
|
|
48
48
|
showCopyButton?: boolean;
|
|
49
|
+
/** Колбек клика по кнопке Копировать для поля */
|
|
50
|
+
onCopyButtonClick?(): void;
|
|
49
51
|
/**
|
|
50
52
|
* Отображение кнопки очистки поля
|
|
51
53
|
* @default true
|
|
@@ -72,13 +74,17 @@ type FiledSelectCommonProps = WithSupportProps<{
|
|
|
72
74
|
enableFuzzySearch?: boolean;
|
|
73
75
|
autocomplete?: boolean;
|
|
74
76
|
open?: boolean;
|
|
77
|
+
/** Поведение строки поиска при выборе опции из списка, false необходимо при асинхронной подгрузке значений с бэка, в случае если надо поиск оставить как значение при отсутствии данных
|
|
78
|
+
* @default true
|
|
79
|
+
*/
|
|
80
|
+
resetSearchOnOptionSelection?: boolean;
|
|
75
81
|
onOpenChange?(open: boolean): void;
|
|
76
82
|
selectedOptionFormatter?: SelectedOptionFormatter;
|
|
77
|
-
}> & Pick<FieldSelectProps, 'addOptionByEnter'> & Pick<DroplistProps, 'dataError' | 'noDataState' | 'noResultsState' | 'errorDataState' | 'dataFiltered'>;
|
|
83
|
+
}> & Pick<FieldSelectProps, 'addOptionByEnter'> & Pick<DroplistProps, 'dataError' | 'noDataState' | 'noResultsState' | 'errorDataState' | 'dataFiltered' | 'untouchableScrollbars' | 'scrollToSelectedItem' | 'scrollRef' | 'scrollContainerRef' | 'onScroll'>;
|
|
78
84
|
export type MobileFieldSelectSingleProps = FieldSelectPrivateProps & Omit<SelectionSingleState, 'mode'> & WrapperProps & FiledSelectCommonProps & Pick<FieldSelectSingleProps, 'addCustomOptionTriggers'>;
|
|
79
85
|
export type MobileFieldSelectMultipleProps = FieldSelectPrivateProps & {
|
|
80
86
|
removeByBackspace?: boolean;
|
|
81
|
-
} & Omit<SelectionMultipleState, 'mode'> & Omit<FiledSelectCommonProps, 'showCopyButton'> & Pick<FieldSelectMultipleProps, 'addCustomOptionTriggers'>;
|
|
87
|
+
} & Omit<SelectionMultipleState, 'mode'> & Omit<FiledSelectCommonProps, 'showCopyButton' | 'onCopyButtonClick'> & Pick<FieldSelectMultipleProps, 'addCustomOptionTriggers'>;
|
|
82
88
|
export type MobileFieldSelectProps = (MobileFieldSelectSingleProps & {
|
|
83
89
|
selection?: 'single';
|
|
84
90
|
}) | (MobileFieldSelectMultipleProps & {
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { DroplistProps } from '@snack-uikit/list';
|
|
2
2
|
import { MobileFieldSelectProps } from '../types';
|
|
3
|
-
export declare function extractListProps({ dataError, noDataState, noResultsState, errorDataState, dataFiltered, loading, footer, widthStrategy, }: Partial<MobileFieldSelectProps>): Partial<DroplistProps>;
|
|
3
|
+
export declare function extractListProps({ dataError, noDataState, noResultsState, errorDataState, dataFiltered, loading, footer, widthStrategy, scrollToSelectedItem, scrollRef, scrollContainerRef, onScroll, untouchableScrollbars, }: Partial<MobileFieldSelectProps>): Partial<DroplistProps>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export function extractListProps({ dataError, noDataState, noResultsState, errorDataState, dataFiltered, loading, footer, widthStrategy, }) {
|
|
1
|
+
export function extractListProps({ dataError, noDataState, noResultsState, errorDataState, dataFiltered, loading, footer, widthStrategy, scrollToSelectedItem, scrollRef, scrollContainerRef, onScroll, untouchableScrollbars, }) {
|
|
2
2
|
return {
|
|
3
3
|
dataError,
|
|
4
4
|
noDataState,
|
|
@@ -8,6 +8,11 @@ export function extractListProps({ dataError, noDataState, noResultsState, error
|
|
|
8
8
|
loading,
|
|
9
9
|
footer,
|
|
10
10
|
widthStrategy,
|
|
11
|
+
scrollToSelectedItem,
|
|
12
|
+
scrollRef,
|
|
13
|
+
scrollContainerRef,
|
|
14
|
+
onScroll,
|
|
15
|
+
untouchableScrollbars,
|
|
11
16
|
trigger: 'clickAndFocusVisible',
|
|
12
17
|
placement: 'bottom',
|
|
13
18
|
'data-test-id': 'field-select__list',
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloud-ru/uikit-product-mobile-fields",
|
|
3
3
|
"title": "Mobile Fields",
|
|
4
|
-
"version": "2.2.
|
|
4
|
+
"version": "2.2.5-preview-0d3148a1.0",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"*.css",
|
|
7
7
|
"*.woff",
|
|
@@ -36,9 +36,9 @@
|
|
|
36
36
|
},
|
|
37
37
|
"scripts": {},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@cloud-ru/uikit-product-icons": "17.
|
|
40
|
-
"@cloud-ru/uikit-product-mobile-dropdown": "2.1.
|
|
41
|
-
"@cloud-ru/uikit-product-mobile-modal": "2.2.
|
|
39
|
+
"@cloud-ru/uikit-product-icons": "17.7.0",
|
|
40
|
+
"@cloud-ru/uikit-product-mobile-dropdown": "2.1.19",
|
|
41
|
+
"@cloud-ru/uikit-product-mobile-modal": "2.2.2",
|
|
42
42
|
"@cloud-ru/uikit-product-utils": "9.1.0",
|
|
43
43
|
"@snack-uikit/button": "0.19.15",
|
|
44
44
|
"@snack-uikit/calendar": "0.14.0",
|
|
@@ -62,5 +62,5 @@
|
|
|
62
62
|
"peerDependencies": {
|
|
63
63
|
"@cloud-ru/uikit-product-locale": "*"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "ce22cdd9963d59a470c371bea2171e95c87afbca"
|
|
66
66
|
}
|
|
@@ -74,6 +74,7 @@ export const MobileFieldSelectMultiple: ForwardRefExoticComponent<
|
|
|
74
74
|
open: openProp,
|
|
75
75
|
onOpenChange,
|
|
76
76
|
selectedOptionFormatter = defaultSelectedOptionFormatter,
|
|
77
|
+
resetSearchOnOptionSelection = true,
|
|
77
78
|
...rest
|
|
78
79
|
},
|
|
79
80
|
ref,
|
|
@@ -102,6 +103,7 @@ export const MobileFieldSelectMultiple: ForwardRefExoticComponent<
|
|
|
102
103
|
...search,
|
|
103
104
|
defaultValue: '',
|
|
104
105
|
selectedOptionFormatter,
|
|
106
|
+
resetSearchOnOptionSelection,
|
|
105
107
|
});
|
|
106
108
|
|
|
107
109
|
const { resolvedAddCustomOptionTriggers, tryCommitCustomOptionFromInput } = useFieldSelectMultipleCustomOption({
|
|
@@ -68,6 +68,8 @@ export const MobileFieldSelectSingle: ForwardRefExoticComponent<
|
|
|
68
68
|
open: openProp,
|
|
69
69
|
onOpenChange,
|
|
70
70
|
selectedOptionFormatter = defaultSelectedOptionFormatter,
|
|
71
|
+
resetSearchOnOptionSelection = true,
|
|
72
|
+
onCopyButtonClick,
|
|
71
73
|
...rest
|
|
72
74
|
},
|
|
73
75
|
ref,
|
|
@@ -89,6 +91,7 @@ export const MobileFieldSelectSingle: ForwardRefExoticComponent<
|
|
|
89
91
|
const { inputValue, setInputValue, prevInputValue } = useSearchInput({
|
|
90
92
|
...search,
|
|
91
93
|
selectedOptionFormatter,
|
|
94
|
+
resetSearchOnOptionSelection,
|
|
92
95
|
});
|
|
93
96
|
|
|
94
97
|
const prevSelectedItem = useRef<ItemWithId | undefined>(selectedItem);
|
|
@@ -117,10 +120,13 @@ export const MobileFieldSelectSingle: ForwardRefExoticComponent<
|
|
|
117
120
|
}
|
|
118
121
|
|
|
119
122
|
prevSelectedItem.current = selectedItem;
|
|
120
|
-
|
|
123
|
+
|
|
124
|
+
if (resetSearchOnOptionSelection) {
|
|
125
|
+
setInputValue('');
|
|
126
|
+
}
|
|
121
127
|
|
|
122
128
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
123
|
-
}, [selectedItem, prevSelectedItem]);
|
|
129
|
+
}, [selectedItem, prevSelectedItem, resetSearchOnOptionSelection]);
|
|
124
130
|
|
|
125
131
|
const onClear = useCallback(() => {
|
|
126
132
|
setValue(undefined);
|
|
@@ -139,6 +145,7 @@ export const MobileFieldSelectSingle: ForwardRefExoticComponent<
|
|
|
139
145
|
showCopyButton,
|
|
140
146
|
inputRef: localRef,
|
|
141
147
|
onClear,
|
|
148
|
+
onCopyButtonClick,
|
|
142
149
|
valueToCopy: selectedOptionFormatter(selectedItem),
|
|
143
150
|
});
|
|
144
151
|
|
|
@@ -55,6 +55,7 @@ type UseCopyButtonProps = {
|
|
|
55
55
|
valueToCopy: string;
|
|
56
56
|
size: Size;
|
|
57
57
|
onValueRequest?(): AsyncValueRequest;
|
|
58
|
+
onCopyButtonClick?(): void;
|
|
58
59
|
disabled?: boolean;
|
|
59
60
|
prefix?: string;
|
|
60
61
|
postfix?: string;
|
|
@@ -66,6 +67,7 @@ export function useCopyButton({
|
|
|
66
67
|
size,
|
|
67
68
|
valueToCopy,
|
|
68
69
|
onValueRequest,
|
|
70
|
+
onCopyButtonClick,
|
|
69
71
|
disabled,
|
|
70
72
|
prefix = '',
|
|
71
73
|
postfix = '',
|
|
@@ -82,11 +84,12 @@ export function useCopyButton({
|
|
|
82
84
|
size={BUTTON_SIZE_MAP[size]}
|
|
83
85
|
valueToCopy={(prefix ?? '') + valueToCopy + (postfix ?? '')}
|
|
84
86
|
onValueRequest={onValueRequest}
|
|
87
|
+
onClick={onCopyButtonClick}
|
|
85
88
|
disabled={disabled}
|
|
86
89
|
/>
|
|
87
90
|
),
|
|
88
91
|
}),
|
|
89
|
-
[copyButtonRef, disabled, onValueRequest, showCopyButton, size, valueToCopy, prefix, postfix],
|
|
92
|
+
[copyButtonRef, disabled, onCopyButtonClick, onValueRequest, showCopyButton, size, valueToCopy, prefix, postfix],
|
|
90
93
|
);
|
|
91
94
|
}
|
|
92
95
|
|
|
@@ -96,6 +99,7 @@ type UseButtonsProps = {
|
|
|
96
99
|
showCopyButton: boolean;
|
|
97
100
|
size: 's' | 'm' | 'l';
|
|
98
101
|
onClear(): void;
|
|
102
|
+
onCopyButtonClick?(): void;
|
|
99
103
|
inputRef: RefObject<HTMLInputElement>;
|
|
100
104
|
valueToCopy?: string;
|
|
101
105
|
};
|
|
@@ -106,6 +110,7 @@ export function useButtons({
|
|
|
106
110
|
showCopyButton,
|
|
107
111
|
size,
|
|
108
112
|
onClear,
|
|
113
|
+
onCopyButtonClick,
|
|
109
114
|
inputRef,
|
|
110
115
|
valueToCopy = '',
|
|
111
116
|
}: UseButtonsProps) {
|
|
@@ -125,6 +130,7 @@ export function useButtons({
|
|
|
125
130
|
showCopyButton: readonly && showCopyButton,
|
|
126
131
|
size,
|
|
127
132
|
valueToCopy,
|
|
133
|
+
onCopyButtonClick,
|
|
128
134
|
});
|
|
129
135
|
const { onInputKeyDown: inputKeyDownNavigationHandler, postfixButtons } = useButtonNavigation({
|
|
130
136
|
inputRef,
|
|
@@ -142,8 +148,9 @@ export function useSearchInput({
|
|
|
142
148
|
onChange,
|
|
143
149
|
defaultValue,
|
|
144
150
|
selectedOptionFormatter,
|
|
145
|
-
|
|
146
|
-
|
|
151
|
+
resetSearchOnOptionSelection = true,
|
|
152
|
+
}: SearchState & { selectedOptionFormatter: SelectedOptionFormatter; resetSearchOnOptionSelection?: boolean }) {
|
|
153
|
+
const [inputValue = '', setInputValueState] = useValueControl<string>({ value, onChange, defaultValue });
|
|
147
154
|
|
|
148
155
|
const prevInputValue = useRef<string>(inputValue);
|
|
149
156
|
|
|
@@ -151,13 +158,25 @@ export function useSearchInput({
|
|
|
151
158
|
(selectedItem?: ItemWithId) => {
|
|
152
159
|
const newInputValue = selectedOptionFormatter(selectedItem);
|
|
153
160
|
|
|
154
|
-
if (inputValue !== newInputValue || prevInputValue.current !== newInputValue) {
|
|
155
|
-
|
|
161
|
+
if (resetSearchOnOptionSelection && (inputValue !== newInputValue || prevInputValue.current !== newInputValue)) {
|
|
162
|
+
setInputValueState(newInputValue);
|
|
156
163
|
|
|
157
164
|
prevInputValue.current = newInputValue;
|
|
158
165
|
}
|
|
159
166
|
},
|
|
160
|
-
[inputValue, selectedOptionFormatter,
|
|
167
|
+
[inputValue, resetSearchOnOptionSelection, selectedOptionFormatter, setInputValueState],
|
|
168
|
+
);
|
|
169
|
+
|
|
170
|
+
const setInputValue = useCallback(
|
|
171
|
+
(value: string) => {
|
|
172
|
+
const updatedValue =
|
|
173
|
+
prevInputValue.current && value.includes(prevInputValue.current)
|
|
174
|
+
? value.replace(prevInputValue.current, '')
|
|
175
|
+
: value;
|
|
176
|
+
|
|
177
|
+
setInputValueState(updatedValue);
|
|
178
|
+
},
|
|
179
|
+
[setInputValueState],
|
|
161
180
|
);
|
|
162
181
|
|
|
163
182
|
return { inputValue, setInputValue, prevInputValue, onInputValueChange: setInputValue, updateInputValue };
|
|
@@ -11,3 +11,15 @@ export type {
|
|
|
11
11
|
GroupOptionProps,
|
|
12
12
|
SelectedOptionFormatter,
|
|
13
13
|
} from './types';
|
|
14
|
+
|
|
15
|
+
export type {
|
|
16
|
+
FieldSelectMultipleAddCustomOptionTrigger,
|
|
17
|
+
FieldSelectSingleAddCustomOptionTrigger,
|
|
18
|
+
} from '@snack-uikit/fields';
|
|
19
|
+
|
|
20
|
+
export {
|
|
21
|
+
getCustomOptionTriggerByCode,
|
|
22
|
+
shouldHandleCustomOptionTrigger,
|
|
23
|
+
useFieldSelectMultipleCustomOption,
|
|
24
|
+
useFieldSelectSingleCustomOption,
|
|
25
|
+
} from '@snack-uikit/fields';
|
|
@@ -94,6 +94,8 @@ type FiledSelectCommonProps = WithSupportProps<{
|
|
|
94
94
|
searchable?: boolean;
|
|
95
95
|
/** Отображение кнопки Копировать для поля (актуально только для `readonly = true`) */
|
|
96
96
|
showCopyButton?: boolean;
|
|
97
|
+
/** Колбек клика по кнопке Копировать для поля */
|
|
98
|
+
onCopyButtonClick?(): void;
|
|
97
99
|
/**
|
|
98
100
|
* Отображение кнопки очистки поля
|
|
99
101
|
* @default true
|
|
@@ -129,12 +131,29 @@ type FiledSelectCommonProps = WithSupportProps<{
|
|
|
129
131
|
|
|
130
132
|
open?: boolean;
|
|
131
133
|
|
|
134
|
+
/** Поведение строки поиска при выборе опции из списка, false необходимо при асинхронной подгрузке значений с бэка, в случае если надо поиск оставить как значение при отсутствии данных
|
|
135
|
+
* @default true
|
|
136
|
+
*/
|
|
137
|
+
resetSearchOnOptionSelection?: boolean;
|
|
138
|
+
|
|
132
139
|
onOpenChange?(open: boolean): void;
|
|
133
140
|
|
|
134
141
|
selectedOptionFormatter?: SelectedOptionFormatter;
|
|
135
142
|
}> &
|
|
136
143
|
Pick<FieldSelectProps, 'addOptionByEnter'> &
|
|
137
|
-
Pick<
|
|
144
|
+
Pick<
|
|
145
|
+
DroplistProps,
|
|
146
|
+
| 'dataError'
|
|
147
|
+
| 'noDataState'
|
|
148
|
+
| 'noResultsState'
|
|
149
|
+
| 'errorDataState'
|
|
150
|
+
| 'dataFiltered'
|
|
151
|
+
| 'untouchableScrollbars'
|
|
152
|
+
| 'scrollToSelectedItem'
|
|
153
|
+
| 'scrollRef'
|
|
154
|
+
| 'scrollContainerRef'
|
|
155
|
+
| 'onScroll'
|
|
156
|
+
>;
|
|
138
157
|
|
|
139
158
|
export type MobileFieldSelectSingleProps = FieldSelectPrivateProps &
|
|
140
159
|
Omit<SelectionSingleState, 'mode'> &
|
|
@@ -145,7 +164,7 @@ export type MobileFieldSelectSingleProps = FieldSelectPrivateProps &
|
|
|
145
164
|
export type MobileFieldSelectMultipleProps = FieldSelectPrivateProps & {
|
|
146
165
|
removeByBackspace?: boolean;
|
|
147
166
|
} & Omit<SelectionMultipleState, 'mode'> &
|
|
148
|
-
Omit<FiledSelectCommonProps, 'showCopyButton'> &
|
|
167
|
+
Omit<FiledSelectCommonProps, 'showCopyButton' | 'onCopyButtonClick'> &
|
|
149
168
|
Pick<FieldSelectMultipleProps, 'addCustomOptionTriggers'>;
|
|
150
169
|
|
|
151
170
|
export type MobileFieldSelectProps =
|
|
@@ -11,6 +11,11 @@ export function extractListProps({
|
|
|
11
11
|
loading,
|
|
12
12
|
footer,
|
|
13
13
|
widthStrategy,
|
|
14
|
+
scrollToSelectedItem,
|
|
15
|
+
scrollRef,
|
|
16
|
+
scrollContainerRef,
|
|
17
|
+
onScroll,
|
|
18
|
+
untouchableScrollbars,
|
|
14
19
|
}: Partial<MobileFieldSelectProps>): Partial<DroplistProps> {
|
|
15
20
|
return {
|
|
16
21
|
dataError,
|
|
@@ -21,6 +26,11 @@ export function extractListProps({
|
|
|
21
26
|
loading,
|
|
22
27
|
footer,
|
|
23
28
|
widthStrategy,
|
|
29
|
+
scrollToSelectedItem,
|
|
30
|
+
scrollRef,
|
|
31
|
+
scrollContainerRef,
|
|
32
|
+
onScroll,
|
|
33
|
+
untouchableScrollbars,
|
|
24
34
|
trigger: 'clickAndFocusVisible',
|
|
25
35
|
placement: 'bottom',
|
|
26
36
|
'data-test-id': 'field-select__list',
|