@cloud-ru/ds-fields 2.5.9-preview-10cf17ae.0 → 3.0.1
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 +10 -0
- package/README.md +2 -1
- package/dist/cjs/components/FieldSelect/FieldSelect.js +136 -65
- package/dist/cjs/components/FieldSelect/constants.d.ts +15 -0
- package/dist/cjs/components/FieldSelect/constants.js +32 -1
- package/dist/cjs/components/FieldSelect/hooks.d.ts +32 -0
- package/dist/cjs/components/FieldSelect/hooks.js +94 -0
- package/dist/cjs/components/FieldSelect/types.d.ts +24 -8
- package/dist/cjs/components/FieldSelect/utils/customOption.d.ts +20 -0
- package/dist/cjs/components/FieldSelect/utils/customOption.js +48 -0
- package/dist/cjs/components/FieldSelect/utils/extract.d.ts +11 -0
- package/dist/cjs/components/FieldSelect/utils/extract.js +39 -0
- package/dist/cjs/components/FieldSelect/utils/filter.d.ts +3 -0
- package/dist/cjs/components/FieldSelect/utils/filter.js +40 -0
- package/dist/cjs/components/FieldSelect/utils/index.d.ts +6 -0
- package/dist/cjs/components/FieldSelect/utils/index.js +22 -0
- package/dist/cjs/components/FieldSelect/utils/items.d.ts +9 -0
- package/dist/cjs/components/FieldSelect/utils/items.js +47 -0
- package/dist/cjs/components/FieldSelect/utils/selection.d.ts +11 -0
- package/dist/cjs/components/FieldSelect/utils/selection.js +18 -0
- package/dist/cjs/components/FieldSelect/utils/tagSize.d.ts +4 -0
- package/dist/cjs/components/FieldSelect/utils/tagSize.js +5 -0
- package/dist/esm/components/FieldSelect/FieldSelect.js +138 -67
- package/dist/esm/components/FieldSelect/constants.d.ts +15 -0
- package/dist/esm/components/FieldSelect/constants.js +31 -0
- package/dist/esm/components/FieldSelect/hooks.d.ts +32 -0
- package/dist/esm/components/FieldSelect/hooks.js +91 -0
- package/dist/esm/components/FieldSelect/types.d.ts +24 -8
- package/dist/esm/components/FieldSelect/utils/customOption.d.ts +20 -0
- package/dist/esm/components/FieldSelect/utils/customOption.js +41 -0
- package/dist/esm/components/FieldSelect/utils/extract.d.ts +11 -0
- package/dist/esm/components/FieldSelect/utils/extract.js +34 -0
- package/dist/esm/components/FieldSelect/utils/filter.d.ts +3 -0
- package/dist/esm/components/FieldSelect/utils/filter.js +36 -0
- package/dist/esm/components/FieldSelect/utils/index.d.ts +6 -0
- package/dist/esm/components/FieldSelect/utils/index.js +6 -0
- package/dist/esm/components/FieldSelect/utils/items.d.ts +9 -0
- package/dist/esm/components/FieldSelect/utils/items.js +41 -0
- package/dist/esm/components/FieldSelect/utils/selection.d.ts +11 -0
- package/dist/esm/components/FieldSelect/utils/selection.js +14 -0
- package/dist/esm/components/FieldSelect/utils/tagSize.d.ts +4 -0
- package/dist/esm/components/FieldSelect/utils/tagSize.js +2 -0
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +20 -20
- package/src/components/FieldSelect/FieldSelect.tsx +190 -82
- package/src/components/FieldSelect/constants.ts +36 -0
- package/src/components/FieldSelect/hooks.ts +170 -0
- package/src/components/FieldSelect/types.ts +80 -53
- package/src/components/FieldSelect/utils/customOption.ts +69 -0
- package/src/components/FieldSelect/utils/extract.ts +49 -0
- package/src/components/FieldSelect/utils/filter.ts +51 -0
- package/src/components/FieldSelect/utils/index.ts +6 -0
- package/src/components/FieldSelect/utils/items.ts +58 -0
- package/src/components/FieldSelect/utils/selection.ts +25 -0
- package/src/components/FieldSelect/utils/tagSize.ts +5 -0
- package/dist/cjs/components/FieldSelect/utils.d.ts +0 -19
- package/dist/cjs/components/FieldSelect/utils.js +0 -103
- package/dist/esm/components/FieldSelect/utils.d.ts +0 -19
- package/dist/esm/components/FieldSelect/utils.js +0 -92
- package/src/components/FieldSelect/utils.ts +0 -132
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
import { ItemId } from '@cloud-ru/ds-list';
|
|
2
|
+
import { isBrowser } from '@cloud-ru/ds-utils';
|
|
3
|
+
import { FocusEvent, KeyboardEvent, RefObject, useCallback, useMemo, useRef } from 'react';
|
|
4
|
+
|
|
5
|
+
import { ADD_CUSTOM_OPTION_TRIGGER } from './constants';
|
|
6
|
+
import { FieldSelectAddCustomOptionTrigger } from './types';
|
|
7
|
+
import {
|
|
8
|
+
getCustomOptionTriggerByKey,
|
|
9
|
+
isCustomOptionBlurInsideField,
|
|
10
|
+
resolveAddCustomOptionTriggers,
|
|
11
|
+
shouldCommitCustomOptionOnClose,
|
|
12
|
+
shouldHandleCustomOptionTrigger,
|
|
13
|
+
} from './utils';
|
|
14
|
+
|
|
15
|
+
/** Результат blur: фокус остался внутри поля, ввод зафиксирован, или коммитить было нечего. */
|
|
16
|
+
type CustomOptionBlurResult = 'inside' | 'committed' | 'skipped';
|
|
17
|
+
|
|
18
|
+
type UseCustomOptionParams = {
|
|
19
|
+
allowCustomOption: boolean;
|
|
20
|
+
addCustomOptionTriggers: readonly FieldSelectAddCustomOptionTrigger[] | undefined;
|
|
21
|
+
multiple: boolean;
|
|
22
|
+
inputValue: string;
|
|
23
|
+
typing: boolean;
|
|
24
|
+
multipleValue: ItemId[];
|
|
25
|
+
commitSingle(value: ItemId | undefined): void;
|
|
26
|
+
commitMultiple(value: ItemId[]): void;
|
|
27
|
+
resetSearch(): void;
|
|
28
|
+
inputElementRef: RefObject<HTMLInputElement | null>;
|
|
29
|
+
clearButtonRef: RefObject<HTMLButtonElement | null>;
|
|
30
|
+
copyButtonRef: RefObject<HTMLButtonElement | null>;
|
|
31
|
+
footerActiveElementsRefs?: RefObject<HTMLElement>[];
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
/** Фиксация произвольного ввода как выбранной опции: триггеры, blur, закрытие списка. */
|
|
35
|
+
export function useCustomOption({
|
|
36
|
+
allowCustomOption,
|
|
37
|
+
addCustomOptionTriggers,
|
|
38
|
+
multiple,
|
|
39
|
+
inputValue,
|
|
40
|
+
typing,
|
|
41
|
+
multipleValue,
|
|
42
|
+
commitSingle,
|
|
43
|
+
commitMultiple,
|
|
44
|
+
resetSearch,
|
|
45
|
+
inputElementRef,
|
|
46
|
+
clearButtonRef,
|
|
47
|
+
copyButtonRef,
|
|
48
|
+
footerActiveElementsRefs,
|
|
49
|
+
}: UseCustomOptionParams) {
|
|
50
|
+
const listRef = useRef<HTMLElement>(null);
|
|
51
|
+
const skipCloseCommitRef = useRef(false);
|
|
52
|
+
const skipBlurCommitRef = useRef(false);
|
|
53
|
+
|
|
54
|
+
const resolvedTriggers = useMemo(
|
|
55
|
+
() =>
|
|
56
|
+
resolveAddCustomOptionTriggers({
|
|
57
|
+
allowCustomOption,
|
|
58
|
+
addCustomOptionTriggers,
|
|
59
|
+
multiple,
|
|
60
|
+
}),
|
|
61
|
+
[allowCustomOption, addCustomOptionTriggers, multiple],
|
|
62
|
+
);
|
|
63
|
+
|
|
64
|
+
const tryCommit = useCallback(
|
|
65
|
+
(trigger: FieldSelectAddCustomOptionTrigger) => {
|
|
66
|
+
if (!typing || !shouldHandleCustomOptionTrigger(trigger, resolvedTriggers) || inputValue === '') {
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
if (multiple) {
|
|
71
|
+
if (multipleValue.includes(inputValue)) {
|
|
72
|
+
resetSearch();
|
|
73
|
+
} else {
|
|
74
|
+
commitMultiple([...multipleValue, inputValue]);
|
|
75
|
+
}
|
|
76
|
+
} else {
|
|
77
|
+
commitSingle(inputValue);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
return true;
|
|
81
|
+
},
|
|
82
|
+
[typing, resolvedTriggers, inputValue, multiple, multipleValue, commitMultiple, commitSingle, resetSearch],
|
|
83
|
+
);
|
|
84
|
+
|
|
85
|
+
const suppressCloseCommit = useCallback(() => {
|
|
86
|
+
skipCloseCommitRef.current = true;
|
|
87
|
+
skipBlurCommitRef.current = true;
|
|
88
|
+
}, []);
|
|
89
|
+
|
|
90
|
+
const enableCloseCommit = useCallback(() => {
|
|
91
|
+
skipCloseCommitRef.current = false;
|
|
92
|
+
skipBlurCommitRef.current = false;
|
|
93
|
+
}, []);
|
|
94
|
+
|
|
95
|
+
const tryCommitOnClose = useCallback(() => {
|
|
96
|
+
const skipped = skipCloseCommitRef.current;
|
|
97
|
+
const shouldCommit = shouldCommitCustomOptionOnClose({
|
|
98
|
+
skip: skipped,
|
|
99
|
+
inputElement: inputElementRef.current,
|
|
100
|
+
activeElement: isBrowser() ? document.activeElement : null,
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
if (skipped) {
|
|
104
|
+
queueMicrotask(() => {
|
|
105
|
+
skipCloseCommitRef.current = false;
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
return shouldCommit && tryCommit(ADD_CUSTOM_OPTION_TRIGGER.Blur);
|
|
110
|
+
}, [inputElementRef, tryCommit]);
|
|
111
|
+
|
|
112
|
+
const tryCommitOnBlur = useCallback(
|
|
113
|
+
(event: FocusEvent<HTMLInputElement>): CustomOptionBlurResult => {
|
|
114
|
+
if (skipBlurCommitRef.current) {
|
|
115
|
+
skipBlurCommitRef.current = false;
|
|
116
|
+
return 'skipped';
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
if (
|
|
120
|
+
isCustomOptionBlurInsideField(event.relatedTarget, [
|
|
121
|
+
listRef.current,
|
|
122
|
+
clearButtonRef.current,
|
|
123
|
+
copyButtonRef.current,
|
|
124
|
+
...(footerActiveElementsRefs?.map(ref => ref.current) ?? []),
|
|
125
|
+
])
|
|
126
|
+
) {
|
|
127
|
+
return 'inside';
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
return tryCommit(ADD_CUSTOM_OPTION_TRIGGER.Blur) ? 'committed' : 'skipped';
|
|
131
|
+
},
|
|
132
|
+
[clearButtonRef, copyButtonRef, footerActiveElementsRefs, tryCommit],
|
|
133
|
+
);
|
|
134
|
+
|
|
135
|
+
const tryCommitFromKeyboard = useCallback(
|
|
136
|
+
(event: KeyboardEvent<HTMLInputElement>) => {
|
|
137
|
+
const trigger = getCustomOptionTriggerByKey(event.key);
|
|
138
|
+
|
|
139
|
+
return trigger !== undefined && tryCommit(trigger);
|
|
140
|
+
},
|
|
141
|
+
[tryCommit],
|
|
142
|
+
);
|
|
143
|
+
|
|
144
|
+
const handleListSingleChange = useCallback(
|
|
145
|
+
(next: ItemId | undefined) => {
|
|
146
|
+
skipCloseCommitRef.current = true;
|
|
147
|
+
commitSingle(next);
|
|
148
|
+
},
|
|
149
|
+
[commitSingle],
|
|
150
|
+
);
|
|
151
|
+
|
|
152
|
+
const handleListMultipleChange = useCallback(
|
|
153
|
+
(next: ItemId[]) => {
|
|
154
|
+
skipCloseCommitRef.current = true;
|
|
155
|
+
commitMultiple(next);
|
|
156
|
+
},
|
|
157
|
+
[commitMultiple],
|
|
158
|
+
);
|
|
159
|
+
|
|
160
|
+
return {
|
|
161
|
+
listRef,
|
|
162
|
+
suppressCloseCommit,
|
|
163
|
+
enableCloseCommit,
|
|
164
|
+
tryCommitOnClose,
|
|
165
|
+
tryCommitOnBlur,
|
|
166
|
+
tryCommitFromKeyboard,
|
|
167
|
+
handleListSingleChange,
|
|
168
|
+
handleListMultipleChange,
|
|
169
|
+
};
|
|
170
|
+
}
|
|
@@ -5,11 +5,41 @@ import { ValueOf } from '@cloud-ru/ds-utils';
|
|
|
5
5
|
import { FocusEvent, KeyboardEvent, ReactNode } from 'react';
|
|
6
6
|
|
|
7
7
|
import { FieldLayoutPresets } from '../../hooks';
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
ADD_CUSTOM_OPTION_TRIGGER,
|
|
10
|
+
ADD_CUSTOM_OPTION_TRIGGERS_MULTIPLE_ALLOWED,
|
|
11
|
+
ADD_CUSTOM_OPTION_TRIGGERS_SINGLE_ALLOWED,
|
|
12
|
+
SELECTION_MODE,
|
|
13
|
+
} from './constants';
|
|
9
14
|
|
|
10
15
|
/** Режим выбора FieldSelect: одно значение или несколько. */
|
|
11
16
|
export type Selection = ValueOf<typeof SELECTION_MODE>;
|
|
12
17
|
|
|
18
|
+
/** Событие, по которому произвольный ввод фиксируется как выбранная опция. */
|
|
19
|
+
export type FieldSelectAddCustomOptionTrigger = ValueOf<typeof ADD_CUSTOM_OPTION_TRIGGER>;
|
|
20
|
+
|
|
21
|
+
/** Триггеры кастомной опции в режиме `single`. */
|
|
22
|
+
export type FieldSelectSingleAddCustomOptionTrigger = (typeof ADD_CUSTOM_OPTION_TRIGGERS_SINGLE_ALLOWED)[number];
|
|
23
|
+
|
|
24
|
+
/** Триггеры кастомной опции в режиме `multiple`. */
|
|
25
|
+
export type FieldSelectMultipleAddCustomOptionTrigger = (typeof ADD_CUSTOM_OPTION_TRIGGERS_MULTIPLE_ALLOWED)[number];
|
|
26
|
+
|
|
27
|
+
type CustomOptionProps<CustomOptionTrigger extends FieldSelectAddCustomOptionTrigger> = {
|
|
28
|
+
/**
|
|
29
|
+
* Разрешить фиксировать произвольный ввод из строки поиска как выбранную опцию
|
|
30
|
+
* (значение, которого нет в `items`).
|
|
31
|
+
* @default false
|
|
32
|
+
*/
|
|
33
|
+
allowCustomOption?: boolean;
|
|
34
|
+
/**
|
|
35
|
+
* События, по которым произвольный ввод фиксируется как выбранная опция.
|
|
36
|
+
* Учитывается только при `allowCustomOption={true}`.
|
|
37
|
+
* Если не задан — используются все триггеры режима (`single`: enter, blur; `multiple`: enter, blur, space, comma).
|
|
38
|
+
* Триггеры, недоступные в текущем `selection`, игнорируются.
|
|
39
|
+
*/
|
|
40
|
+
addCustomOptionTriggers?: CustomOptionTrigger[];
|
|
41
|
+
};
|
|
42
|
+
|
|
13
43
|
// ItemProps — union с рекурсивными группами, поэтому раздаём поле по всем веткам.
|
|
14
44
|
type WithTagAppearance<T> = T extends { items: ItemProps[] }
|
|
15
45
|
? Omit<T, 'items'> & { appearance?: TagAppearance; items: WithTagAppearance<ItemProps>[] }
|
|
@@ -114,11 +144,6 @@ type CommonSelectProps = FieldSelectDecoratorProps &
|
|
|
114
144
|
* @default false
|
|
115
145
|
*/
|
|
116
146
|
autocomplete?: boolean;
|
|
117
|
-
/**
|
|
118
|
-
* Зафиксировать введённый текст как новый выбор по `Enter` (создание опции «на лету»).
|
|
119
|
-
* @default false
|
|
120
|
-
*/
|
|
121
|
-
addOptionByEnter?: boolean;
|
|
122
147
|
/**
|
|
123
148
|
* Сбрасывать строку поиска к выбранному значению после выбора. `false` нужен при асинхронной
|
|
124
149
|
* подгрузке (оставить введённый запрос как значение, пока данные не пришли).
|
|
@@ -170,53 +195,55 @@ type CommonSelectProps = FieldSelectDecoratorProps &
|
|
|
170
195
|
'data-test-id'?: string;
|
|
171
196
|
};
|
|
172
197
|
|
|
173
|
-
export type FieldSelectSingleProps = CommonSelectProps &
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
198
|
+
export type FieldSelectSingleProps = CommonSelectProps &
|
|
199
|
+
CustomOptionProps<FieldSelectSingleAddCustomOptionTrigger> & {
|
|
200
|
+
/** Режим выбора. По умолчанию `'single'`. */
|
|
201
|
+
selection?: typeof SELECTION_MODE.Single;
|
|
202
|
+
/** Управляемое значение. Пустая строка трактуется как «значение не выбрано». */
|
|
203
|
+
value?: ItemId;
|
|
204
|
+
/** Неуправляемое значение по умолчанию. Пустая строка трактуется как «значение не выбрано». */
|
|
205
|
+
defaultValue?: ItemId;
|
|
206
|
+
/** Колбек смены значения */
|
|
207
|
+
onChange?(value: ItemId | undefined): void;
|
|
208
|
+
/**
|
|
209
|
+
* Закрывать дроплист после клика на айтем.
|
|
210
|
+
* @default true
|
|
211
|
+
*/
|
|
212
|
+
closeDroplistOnItemClick?: boolean;
|
|
213
|
+
};
|
|
188
214
|
|
|
189
|
-
export type FieldSelectMultipleProps = CommonSelectProps &
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
215
|
+
export type FieldSelectMultipleProps = CommonSelectProps &
|
|
216
|
+
CustomOptionProps<FieldSelectMultipleAddCustomOptionTrigger> & {
|
|
217
|
+
/** Режим выбора */
|
|
218
|
+
selection: typeof SELECTION_MODE.Multiple;
|
|
219
|
+
/** Управляемые значения */
|
|
220
|
+
value?: ItemId[];
|
|
221
|
+
/** Неуправляемые значения по умолчанию */
|
|
222
|
+
defaultValue?: ItemId[];
|
|
223
|
+
/** Колбек смены значений */
|
|
224
|
+
onChange?(value: ItemId[]): void;
|
|
225
|
+
/**
|
|
226
|
+
* Форматтер строки выбранных значений (используется, если `chips=false`).
|
|
227
|
+
* @default — список лейблов через `, `
|
|
228
|
+
*/
|
|
229
|
+
formatSelected?(selected: { id: ItemId; label: string }[]): string;
|
|
230
|
+
/**
|
|
231
|
+
* Отображать выбранные значения как чипы (`@cloud-ru/ds-tag`) внутри поля. Если `false`,
|
|
232
|
+
* показывает строку из `formatSelected` либо comma-joined.
|
|
233
|
+
* @default true
|
|
234
|
+
*/
|
|
235
|
+
chips?: boolean;
|
|
236
|
+
/**
|
|
237
|
+
* Удалять последний чип по `Backspace`, когда строка ввода пустая.
|
|
238
|
+
* Работает только при `chips=true` и `searchable=true`.
|
|
239
|
+
* @default true
|
|
240
|
+
*/
|
|
241
|
+
removeByBackspace?: boolean;
|
|
242
|
+
/**
|
|
243
|
+
* Закрывать дроплист после клика на айтем.
|
|
244
|
+
* @default false
|
|
245
|
+
*/
|
|
246
|
+
closeDroplistOnItemClick?: boolean;
|
|
247
|
+
};
|
|
221
248
|
|
|
222
249
|
export type FieldSelectProps = FieldSelectSingleProps | FieldSelectMultipleProps;
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import {
|
|
2
|
+
ADD_CUSTOM_OPTION_TRIGGER,
|
|
3
|
+
ADD_CUSTOM_OPTION_TRIGGERS_MULTIPLE_ALLOWED,
|
|
4
|
+
ADD_CUSTOM_OPTION_TRIGGERS_MULTIPLE_DEFAULT,
|
|
5
|
+
ADD_CUSTOM_OPTION_TRIGGERS_SINGLE_ALLOWED,
|
|
6
|
+
ADD_CUSTOM_OPTION_TRIGGERS_SINGLE_DEFAULT,
|
|
7
|
+
} from '../constants';
|
|
8
|
+
import { FieldSelectAddCustomOptionTrigger, FieldSelectMultipleAddCustomOptionTrigger } from '../types';
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Сопоставляет клавишу с триггером кастомной опции (`enter` / `space` / `comma`).
|
|
12
|
+
* Сначала `KeyboardEvent.code`, затем `key` — если `code` пустой или не из словаря (`','` без `Comma`).
|
|
13
|
+
*/
|
|
14
|
+
export function getCustomOptionTriggerByKey(key: string): FieldSelectMultipleAddCustomOptionTrigger | undefined {
|
|
15
|
+
switch (key) {
|
|
16
|
+
case 'Enter':
|
|
17
|
+
return ADD_CUSTOM_OPTION_TRIGGER.Enter;
|
|
18
|
+
case ' ':
|
|
19
|
+
return ADD_CUSTOM_OPTION_TRIGGER.Space;
|
|
20
|
+
case ',':
|
|
21
|
+
return ADD_CUSTOM_OPTION_TRIGGER.Comma;
|
|
22
|
+
default:
|
|
23
|
+
return undefined;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export function shouldHandleCustomOptionTrigger(
|
|
28
|
+
trigger: FieldSelectAddCustomOptionTrigger | undefined,
|
|
29
|
+
availableTriggers: readonly FieldSelectAddCustomOptionTrigger[],
|
|
30
|
+
): trigger is FieldSelectAddCustomOptionTrigger {
|
|
31
|
+
return trigger !== undefined && availableTriggers.includes(trigger);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export function resolveAddCustomOptionTriggers(params: {
|
|
35
|
+
allowCustomOption: boolean;
|
|
36
|
+
addCustomOptionTriggers: readonly FieldSelectAddCustomOptionTrigger[] | undefined;
|
|
37
|
+
multiple?: boolean;
|
|
38
|
+
}): readonly FieldSelectAddCustomOptionTrigger[] {
|
|
39
|
+
if (params.allowCustomOption) {
|
|
40
|
+
const defaultTriggers = params.multiple
|
|
41
|
+
? ADD_CUSTOM_OPTION_TRIGGERS_MULTIPLE_DEFAULT
|
|
42
|
+
: ADD_CUSTOM_OPTION_TRIGGERS_SINGLE_DEFAULT;
|
|
43
|
+
const allowedTriggers: readonly FieldSelectAddCustomOptionTrigger[] = params.multiple
|
|
44
|
+
? ADD_CUSTOM_OPTION_TRIGGERS_MULTIPLE_ALLOWED
|
|
45
|
+
: ADD_CUSTOM_OPTION_TRIGGERS_SINGLE_ALLOWED;
|
|
46
|
+
const availableTriggers = params.addCustomOptionTriggers ?? defaultTriggers;
|
|
47
|
+
|
|
48
|
+
return availableTriggers.filter(trigger => allowedTriggers.includes(trigger));
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
return [];
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/** Фокус ушёл на дроплист, футер или postfix — кастомную опцию на blur фиксировать не нужно. */
|
|
55
|
+
export function isCustomOptionBlurInsideField(
|
|
56
|
+
relatedTarget: EventTarget | null,
|
|
57
|
+
nodes: (Node | null | undefined)[],
|
|
58
|
+
): boolean {
|
|
59
|
+
return relatedTarget instanceof Node && nodes.some(node => Boolean(node?.contains(relatedTarget)));
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/** Клик снаружи закрывает список, не снимая фокус с input — blur не придёт. */
|
|
63
|
+
export function shouldCommitCustomOptionOnClose(params: {
|
|
64
|
+
skip: boolean;
|
|
65
|
+
inputElement: Element | null;
|
|
66
|
+
activeElement: Element | null;
|
|
67
|
+
}): boolean {
|
|
68
|
+
return !params.skip && params.activeElement !== null && params.activeElement === params.inputElement;
|
|
69
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { ItemId } from '@cloud-ru/ds-list';
|
|
2
|
+
import { Appearance as TagAppearance } from '@cloud-ru/ds-tag';
|
|
3
|
+
|
|
4
|
+
export type WithIdContent = { id?: ItemId; content?: unknown; disabled?: boolean; appearance?: TagAppearance };
|
|
5
|
+
|
|
6
|
+
export function extractLabel(item: WithIdContent): string {
|
|
7
|
+
const { content, id } = item;
|
|
8
|
+
|
|
9
|
+
if (!content) {
|
|
10
|
+
return String(id ?? '');
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
if (typeof content === 'string' || typeof content === 'number') {
|
|
14
|
+
return String(content);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
if (typeof content === 'object' && content !== null && 'label' in content) {
|
|
18
|
+
return String((content as { label: unknown }).label);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
return String(id ?? '');
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
// Текст для поиска: лейбл (option) + caption + description — паритет с легаси `useSearch`,
|
|
25
|
+
// который матчил запрос по всем трём полям контента, а не только по лейблу.
|
|
26
|
+
export function extractSearchText(item: WithIdContent): string {
|
|
27
|
+
const parts = [extractLabel(item)];
|
|
28
|
+
const { content } = item;
|
|
29
|
+
|
|
30
|
+
if (content && typeof content === 'object') {
|
|
31
|
+
const c = content as { caption?: unknown; description?: unknown };
|
|
32
|
+
|
|
33
|
+
if (typeof c.caption === 'string') {
|
|
34
|
+
parts.push(c.caption);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
if (typeof c.description === 'string') {
|
|
38
|
+
parts.push(c.description);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
return parts.join(' ');
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
// Цвет тега выбранного значения (multiple) — паритет с легаси `option.appearance`.
|
|
46
|
+
// Проверка типа нужна и при типизированном поле: items часто приходят из ответа бэкенда.
|
|
47
|
+
export function extractAppearance(item?: WithIdContent): TagAppearance | undefined {
|
|
48
|
+
return typeof item?.appearance === 'string' ? item.appearance : undefined;
|
|
49
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { FieldSelectItem } from '../types';
|
|
2
|
+
import { extractSearchText, WithIdContent } from './extract';
|
|
3
|
+
|
|
4
|
+
// Subsequence-fuzzy: символы запроса должны встречаться в строке в исходном порядке.
|
|
5
|
+
// Пример: query=`lge` matches `Large` (L → r → arg → e).
|
|
6
|
+
export function isFuzzyMatch(haystack: string, needle: string): boolean {
|
|
7
|
+
if (!needle) {
|
|
8
|
+
return true;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
let i = 0;
|
|
12
|
+
|
|
13
|
+
for (const ch of haystack) {
|
|
14
|
+
if (ch === needle[i]) {
|
|
15
|
+
i += 1;
|
|
16
|
+
|
|
17
|
+
if (i === needle.length) {
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function filterItems(items: FieldSelectItem[], query: string, fuzzy: boolean): FieldSelectItem[] {
|
|
27
|
+
if (!query) {
|
|
28
|
+
return items;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
const q = query.toLowerCase();
|
|
32
|
+
|
|
33
|
+
const matches = (item: FieldSelectItem): boolean => {
|
|
34
|
+
const text = extractSearchText(item as WithIdContent).toLowerCase();
|
|
35
|
+
|
|
36
|
+
return fuzzy ? isFuzzyMatch(text, q) : text.includes(q);
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
const walk = (list: FieldSelectItem[]): FieldSelectItem[] =>
|
|
40
|
+
list.flatMap(item => {
|
|
41
|
+
if ('items' in item && Array.isArray(item.items)) {
|
|
42
|
+
const filteredChildren = walk(item.items as FieldSelectItem[]);
|
|
43
|
+
|
|
44
|
+
return filteredChildren.length > 0 ? [{ ...item, items: filteredChildren } as FieldSelectItem] : [];
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
return matches(item) ? [item] : [];
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
return walk(items);
|
|
51
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { ItemId } from '@cloud-ru/ds-list';
|
|
2
|
+
|
|
3
|
+
import { FieldSelectItem } from '../types';
|
|
4
|
+
import { WithIdContent } from './extract';
|
|
5
|
+
|
|
6
|
+
export function flatten(items: FieldSelectItem[]): WithIdContent[] {
|
|
7
|
+
const out: WithIdContent[] = [];
|
|
8
|
+
|
|
9
|
+
for (const item of items) {
|
|
10
|
+
out.push(item as WithIdContent);
|
|
11
|
+
|
|
12
|
+
if ('items' in item && Array.isArray(item.items)) {
|
|
13
|
+
out.push(...flatten(item.items as FieldSelectItem[]));
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
return out;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export function findItem(items: FieldSelectItem[], id: ItemId): WithIdContent | undefined {
|
|
21
|
+
for (const item of flatten(items)) {
|
|
22
|
+
if (item.id === id) {
|
|
23
|
+
return item;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
return undefined;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/** Айтем для выбранного значения, которого нет в `items` (кастомная опция, ленивая подгрузка). */
|
|
31
|
+
export function createPlaceholderItem(id: ItemId): FieldSelectItem {
|
|
32
|
+
return { id, content: { label: String(id) } };
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** Выбранные id, которых нет в дереве айтемов — в дроплист их нужно добавить отдельно. */
|
|
36
|
+
export function getMissingSelectedItems(selectedIds: ItemId[], allItems: FieldSelectItem[]): FieldSelectItem[] {
|
|
37
|
+
if (selectedIds.length === 0) {
|
|
38
|
+
return [];
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const existingIds = new Set<ItemId>();
|
|
42
|
+
|
|
43
|
+
for (const item of flatten(allItems)) {
|
|
44
|
+
if (item.id !== undefined) {
|
|
45
|
+
existingIds.add(item.id);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
const missing: FieldSelectItem[] = [];
|
|
50
|
+
|
|
51
|
+
for (const id of selectedIds) {
|
|
52
|
+
if (id !== '' && !existingIds.has(id)) {
|
|
53
|
+
missing.push(createPlaceholderItem(id));
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
return missing;
|
|
58
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { ItemId } from '@cloud-ru/ds-list';
|
|
2
|
+
|
|
3
|
+
import { SELECTION_MODE } from '../constants';
|
|
4
|
+
import { FieldSelectMultipleProps, Selection } from '../types';
|
|
5
|
+
|
|
6
|
+
export function isMultiple(props: { selection?: Selection }): props is FieldSelectMultipleProps {
|
|
7
|
+
return props.selection === SELECTION_MODE.Multiple;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
/** Выбранные id в нормализованном виде: массив и для `single`, и для `multiple`. */
|
|
11
|
+
export function getSelectedIds(params: {
|
|
12
|
+
multiple: boolean;
|
|
13
|
+
multipleValue: ItemId[];
|
|
14
|
+
singleValue: ItemId | undefined;
|
|
15
|
+
}): ItemId[] {
|
|
16
|
+
if (params.multiple) {
|
|
17
|
+
return params.multipleValue;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
if (params.singleValue === undefined) {
|
|
21
|
+
return [];
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
return [params.singleValue];
|
|
25
|
+
}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Size } from '@cloud-ru/ds-field-decorator';
|
|
2
|
+
import { Size as TagSize } from '@cloud-ru/ds-tag';
|
|
3
|
+
|
|
4
|
+
/** Соответствие размера поля размеру чипа выбранного значения (`selection='multiple'`). */
|
|
5
|
+
export const TAG_SIZE_MAP: Record<Size, TagSize> = { s: 'xs', m: 'xs', l: 's' };
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import { Size } from '@cloud-ru/ds-field-decorator';
|
|
2
|
-
import { ItemId } from '@cloud-ru/ds-list';
|
|
3
|
-
import { Appearance as TagAppearance, Size as TagSize } from '@cloud-ru/ds-tag';
|
|
4
|
-
import { FieldSelectItem, FieldSelectMultipleProps, FieldSelectProps } from './types';
|
|
5
|
-
export declare const TAG_SIZE_MAP: Record<Size, TagSize>;
|
|
6
|
-
export type WithIdContent = {
|
|
7
|
-
id?: ItemId;
|
|
8
|
-
content?: unknown;
|
|
9
|
-
disabled?: boolean;
|
|
10
|
-
appearance?: TagAppearance;
|
|
11
|
-
};
|
|
12
|
-
export declare function extractLabel(item: WithIdContent): string;
|
|
13
|
-
export declare function extractSearchText(item: WithIdContent): string;
|
|
14
|
-
export declare function extractAppearance(item?: WithIdContent): TagAppearance | undefined;
|
|
15
|
-
export declare function flatten(items: FieldSelectItem[]): WithIdContent[];
|
|
16
|
-
export declare function findItem(items: FieldSelectItem[], id: ItemId): WithIdContent | undefined;
|
|
17
|
-
export declare function isFuzzyMatch(haystack: string, needle: string): boolean;
|
|
18
|
-
export declare function filterItems(items: FieldSelectItem[], query: string, fuzzy: boolean): FieldSelectItem[];
|
|
19
|
-
export declare function isMultiple(props: FieldSelectProps): props is FieldSelectMultipleProps;
|