@cloud-ru/ds-fields 3.0.8-preview-c62bb6c8.0 → 3.0.8-preview-a132b2c9.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/dist/cjs/components/FieldSelect/FieldSelect.js +19 -1
- package/dist/cjs/components/FieldSelect/hooks.d.ts +1 -1
- package/dist/cjs/components/FieldSelect/types.d.ts +2 -0
- package/dist/esm/components/FieldSelect/FieldSelect.js +20 -2
- package/dist/esm/components/FieldSelect/hooks.d.ts +1 -1
- package/dist/esm/components/FieldSelect/types.d.ts +2 -0
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/components/FieldSelect/FieldSelect.tsx +26 -0
- package/src/components/FieldSelect/hooks.ts +1 -1
- package/src/components/FieldSelect/types.ts +2 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloud-ru/ds-fields",
|
|
3
|
-
"version": "3.0.8-preview-
|
|
3
|
+
"version": "3.0.8-preview-a132b2c9.0",
|
|
4
4
|
"description": "Поля ввода с единой обёрткой label/caption/hint/error и общими осями size/validationState — текст, пароль, число, ползунок, дата, время, выбор, цвет.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -40,22 +40,22 @@
|
|
|
40
40
|
"merge-refs": "^2.0.0",
|
|
41
41
|
"react-textarea-autosize": "^8.5.9",
|
|
42
42
|
"@cloud-ru/ds-adaptive": "1.0.3",
|
|
43
|
-
"@cloud-ru/ds-bottom-sheet": "2.0.10-preview-c62bb6c8.0",
|
|
44
43
|
"@cloud-ru/ds-button": "1.0.5",
|
|
45
|
-
"@cloud-ru/ds-
|
|
46
|
-
"@cloud-ru/ds-
|
|
44
|
+
"@cloud-ru/ds-bottom-sheet": "2.0.10-preview-a132b2c9.0",
|
|
45
|
+
"@cloud-ru/ds-calendar": "1.1.22-preview-a132b2c9.0",
|
|
47
46
|
"@cloud-ru/ds-divider": "1.0.3",
|
|
48
|
-
"@cloud-ru/ds-
|
|
47
|
+
"@cloud-ru/ds-color-picker": "1.0.21",
|
|
48
|
+
"@cloud-ru/ds-dropdown": "1.1.11-preview-a132b2c9.0",
|
|
49
49
|
"@cloud-ru/ds-field-decorator": "1.1.9",
|
|
50
50
|
"@cloud-ru/ds-icons": "1.7.2",
|
|
51
|
-
"@cloud-ru/ds-list": "3.0.8-preview-
|
|
52
|
-
"@cloud-ru/ds-loader": "1.0.4",
|
|
51
|
+
"@cloud-ru/ds-list": "3.0.8-preview-a132b2c9.0",
|
|
53
52
|
"@cloud-ru/ds-input-private": "1.0.15",
|
|
54
|
-
"@cloud-ru/ds-
|
|
55
|
-
"@cloud-ru/ds-scroll": "1.0.6",
|
|
53
|
+
"@cloud-ru/ds-loader": "1.0.4",
|
|
56
54
|
"@cloud-ru/ds-skeleton": "1.0.3",
|
|
55
|
+
"@cloud-ru/ds-materials": "2.0.2",
|
|
57
56
|
"@cloud-ru/ds-slider": "1.0.17",
|
|
58
|
-
"@cloud-ru/ds-
|
|
57
|
+
"@cloud-ru/ds-scroll": "1.0.6",
|
|
58
|
+
"@cloud-ru/ds-tag": "1.1.21-preview-a132b2c9.0",
|
|
59
59
|
"@cloud-ru/ds-tooltip": "1.0.17",
|
|
60
60
|
"@cloud-ru/ds-utils": "1.3.0"
|
|
61
61
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
|
|
1
2
|
import { ChevronDownSVG } from '@cloud-ru/ds-icons/interface/system';
|
|
2
3
|
import { InputPrivate, useButtonNavigation, useClearButton } from '@cloud-ru/ds-input-private';
|
|
3
4
|
import { Droplist, ItemId } from '@cloud-ru/ds-list';
|
|
@@ -45,6 +46,7 @@ import {
|
|
|
45
46
|
getMissingSelectedItems,
|
|
46
47
|
getSelectedIds,
|
|
47
48
|
isMultiple,
|
|
49
|
+
resolveAddCustomOptionTriggers,
|
|
48
50
|
TAG_SIZE_MAP,
|
|
49
51
|
WithIdContent,
|
|
50
52
|
} from './utils';
|
|
@@ -122,6 +124,7 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
|
|
|
122
124
|
const onMultipleChange = onChange as FieldSelectMultipleProps['onChange'];
|
|
123
125
|
|
|
124
126
|
const resolvedAutoFocus = useAdaptiveAutoFocus(autoFocus, layoutPresets);
|
|
127
|
+
const { layoutType } = useAdaptiveLayout();
|
|
125
128
|
|
|
126
129
|
const inputRef = useRef<HTMLInputElement>(null);
|
|
127
130
|
// Отдельный ref на реальный <input>: `inputRef.current` перезаписывается span-обёрткой PopoverPrivate.
|
|
@@ -186,6 +189,13 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
|
|
|
186
189
|
);
|
|
187
190
|
|
|
188
191
|
const allItems = useMemo(() => [...(pinTop ?? []), ...items, ...(pinBottom ?? [])], [items, pinTop, pinBottom]);
|
|
192
|
+
const mobileSearchable = useMemo(
|
|
193
|
+
() =>
|
|
194
|
+
(searchable && flatten(allItems).filter(item => !('items' in item)).length > 5) ||
|
|
195
|
+
autocomplete ||
|
|
196
|
+
resolveAddCustomOptionTriggers({ allowCustomOption, addCustomOptionTriggers, multiple }).includes('enter'),
|
|
197
|
+
[searchable, allItems, autocomplete, allowCustomOption, addCustomOptionTriggers, multiple],
|
|
198
|
+
);
|
|
189
199
|
|
|
190
200
|
const selectedIds = useMemo(
|
|
191
201
|
() => getSelectedIds({ multiple, multipleValue, singleValue }),
|
|
@@ -799,6 +809,22 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
|
|
|
799
809
|
<Droplist
|
|
800
810
|
items={filteredItems}
|
|
801
811
|
label={label}
|
|
812
|
+
search={
|
|
813
|
+
isMobileLayout(layoutType) && mobileSearchable && !readOnly && !disabled
|
|
814
|
+
? {
|
|
815
|
+
value: inputValue,
|
|
816
|
+
onChange: handleInputChange,
|
|
817
|
+
onKeyDown: event => {
|
|
818
|
+
if (tryCommitFromKeyboard(event)) {
|
|
819
|
+
event.preventDefault();
|
|
820
|
+
event.stopPropagation();
|
|
821
|
+
}
|
|
822
|
+
},
|
|
823
|
+
placeholder,
|
|
824
|
+
loading,
|
|
825
|
+
}
|
|
826
|
+
: undefined
|
|
827
|
+
}
|
|
802
828
|
pinTop={filteredPinTop}
|
|
803
829
|
pinBottom={filteredPinBottom}
|
|
804
830
|
trigger='click'
|
|
@@ -133,7 +133,7 @@ export function useCustomOption({
|
|
|
133
133
|
);
|
|
134
134
|
|
|
135
135
|
const tryCommitFromKeyboard = useCallback(
|
|
136
|
-
(event: KeyboardEvent
|
|
136
|
+
(event: Pick<KeyboardEvent, 'key'>) => {
|
|
137
137
|
const trigger = getCustomOptionTriggerByKey(event.key);
|
|
138
138
|
|
|
139
139
|
return trigger !== undefined && tryCommit(trigger);
|
|
@@ -123,6 +123,8 @@ type CommonSelectProps = FieldSelectDecoratorProps &
|
|
|
123
123
|
widthStrategy?: DroplistProps['widthStrategy'];
|
|
124
124
|
/**
|
|
125
125
|
* Включить поиск/ввод в поле — пользователь печатает, список фильтруется по подстроке лейбла.
|
|
126
|
+
* На mobile поиск в sheet появляется при количестве вариантов больше 5.
|
|
127
|
+
* `autocomplete` и создание опции по Enter включают мобильный поиск независимо от количества вариантов.
|
|
126
128
|
* @default true
|
|
127
129
|
*/
|
|
128
130
|
searchable?: boolean;
|