@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
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.FieldSelect = void 0;
|
|
7
7
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
8
|
+
const adaptive_1 = require("@cloud-ru/ds-adaptive");
|
|
8
9
|
const system_1 = require("@cloud-ru/ds-icons/interface/system");
|
|
9
10
|
const input_private_1 = require("@cloud-ru/ds-input-private");
|
|
10
11
|
const list_1 = require("@cloud-ru/ds-list");
|
|
@@ -34,6 +35,7 @@ exports.FieldSelect = (0, react_1.forwardRef)(function FieldSelect(props, ref) {
|
|
|
34
35
|
const onSingleChange = onChange;
|
|
35
36
|
const onMultipleChange = onChange;
|
|
36
37
|
const resolvedAutoFocus = (0, hooks_1.useAdaptiveAutoFocus)(autoFocus, layoutPresets);
|
|
38
|
+
const { layoutType } = (0, adaptive_1.useAdaptiveLayout)();
|
|
37
39
|
const inputRef = (0, react_1.useRef)(null);
|
|
38
40
|
// Отдельный ref на реальный <input>: `inputRef.current` перезаписывается span-обёрткой PopoverPrivate.
|
|
39
41
|
const inputElementRef = (0, react_1.useRef)(null);
|
|
@@ -79,6 +81,9 @@ exports.FieldSelect = (0, react_1.forwardRef)(function FieldSelect(props, ref) {
|
|
|
79
81
|
}, [multiple, value, multipleLocal]);
|
|
80
82
|
const effectiveValidationState = (0, react_1.useMemo)(() => (error ? field_decorator_1.VALIDATION_STATE.Error : validationState), [error, validationState]);
|
|
81
83
|
const allItems = (0, react_1.useMemo)(() => [...(pinTop ?? []), ...items, ...(pinBottom ?? [])], [items, pinTop, pinBottom]);
|
|
84
|
+
const mobileSearchable = (0, react_1.useMemo)(() => (searchable && (0, utils_2.flatten)(allItems).filter(item => !('items' in item)).length > 5) ||
|
|
85
|
+
autocomplete ||
|
|
86
|
+
(0, utils_2.resolveAddCustomOptionTriggers)({ allowCustomOption, addCustomOptionTriggers, multiple }).includes('enter'), [searchable, allItems, autocomplete, allowCustomOption, addCustomOptionTriggers, multiple]);
|
|
82
87
|
const selectedIds = (0, react_1.useMemo)(() => (0, utils_2.getSelectedIds)({ multiple, multipleValue, singleValue }), [multiple, multipleValue, singleValue]);
|
|
83
88
|
// Выбранное, которого нет в `items` (кастом по allowCustomOption, ленивая подгрузка) — в список, не только в чип.
|
|
84
89
|
const missingSelectedItems = (0, react_1.useMemo)(() => (0, utils_2.getMissingSelectedItems)(selectedIds, allItems), [selectedIds, allItems]);
|
|
@@ -448,5 +453,18 @@ exports.FieldSelect = (0, react_1.forwardRef)(function FieldSelect(props, ref) {
|
|
|
448
453
|
}), children: (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.acrylicBg, "aria-hidden": true }) }), (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.borderStateLayer, "data-state": 'borderOnBackground' }), (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.focusLayer })] }), (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.fieldContainer, children: (0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.contentWrapper, children: [iconBefore && (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.iconSlot, children: iconBefore }), (0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.inputLine, children: [prefix && (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.prefix, children: prefix }), hasChips ? ((0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_2.default.chipsRow, ref: contentRef, "data-test-id": constants_1.TEST_IDS.fieldSelectChips, children: [selectedPairs.map(pair => ((0, jsx_runtime_1.jsx)(tag_1.Tag, { label: formatPair(pair), size: utils_2.TAG_SIZE_MAP[size], appearance: pair.appearance ?? 'neutral', onDelete: disabled || readOnly || pair.disabled ? undefined : handleRemoveChip(pair.id) }, String(pair.id)))), searchInput, (0, jsx_runtime_1.jsx)("span", { ref: inputPlugRef, className: styles_module_scss_2.default.inputPlug, "aria-hidden": true, children: inputValue })] })) : (searchInput), postfixButtons && (
|
|
449
454
|
// eslint-disable-next-line jsx-a11y/no-static-element-interactions
|
|
450
455
|
(0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.postfixButtonsSlot, onMouseDown: shared_1.preventSlotMouseDown, onClick: shared_1.stopSlotClickPropagation, children: postfixButtons })), postfix && (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.postfix, children: postfix })] }), (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.iconSlot, children: (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_2.default.chevron, "data-open": open || undefined, "aria-hidden": true, children: (0, jsx_runtime_1.jsx)(system_1.ChevronDownSVG, {}) }) })] }) })] }));
|
|
451
|
-
return ((0, jsx_runtime_1.jsx)(field_decorator_1.FieldDecorator, { className: className, label: label, labelTooltip: labelTooltip, caption: caption, hint: hint, error: error, size: size, validationState: validationState, showHintIcon: showHintIcon, length: length, required: required, labelFor: id, disabled: disabled, readonly: readOnly, children: (0, jsx_runtime_1.jsx)(list_1.Droplist, { items: filteredItems, label: label,
|
|
456
|
+
return ((0, jsx_runtime_1.jsx)(field_decorator_1.FieldDecorator, { className: className, label: label, labelTooltip: labelTooltip, caption: caption, hint: hint, error: error, size: size, validationState: validationState, showHintIcon: showHintIcon, length: length, required: required, labelFor: id, disabled: disabled, readonly: readOnly, children: (0, jsx_runtime_1.jsx)(list_1.Droplist, { items: filteredItems, label: label, search: (0, adaptive_1.isMobileLayout)(layoutType) && mobileSearchable && !readOnly && !disabled
|
|
457
|
+
? {
|
|
458
|
+
value: inputValue,
|
|
459
|
+
onChange: handleInputChange,
|
|
460
|
+
onKeyDown: event => {
|
|
461
|
+
if (tryCommitFromKeyboard(event)) {
|
|
462
|
+
event.preventDefault();
|
|
463
|
+
event.stopPropagation();
|
|
464
|
+
}
|
|
465
|
+
},
|
|
466
|
+
placeholder,
|
|
467
|
+
loading,
|
|
468
|
+
}
|
|
469
|
+
: undefined, pinTop: filteredPinTop, pinBottom: filteredPinBottom, trigger: 'click', placement: placement, widthStrategy: widthStrategy, triggerElemRef: inputRef, listRef: listRef, size: size, open: open, onOpenChange: handleOpenChange, selection: droplistSelection, closeDroplistOnItemClick: closeDroplistOnItemClick, footer: footer, footerDivider: footerDivider, footerActiveElementsRefs: footerActiveElementsRefs, loading: loading, noDataState: noDataState, noResultsState: noResultsState, errorDataState: errorDataState, dataError: dataError, dataFiltered: dataFiltered ?? (searchable && typing && inputValue !== ''), virtualized: virtualized, scroll: true, scrollToSelectedItem: scrollToSelectedItem, limitedScrollHeight: limitedScrollHeight, untouchableScrollbars: untouchableScrollbars, closeOnPopstate: closeOnPopstate, "data-test-id": constants_1.TEST_IDS.fieldSelectList, children: trigger }) }));
|
|
452
470
|
});
|
|
@@ -25,7 +25,7 @@ export declare function useCustomOption({ allowCustomOption, addCustomOptionTrig
|
|
|
25
25
|
enableCloseCommit: () => void;
|
|
26
26
|
tryCommitOnClose: () => boolean;
|
|
27
27
|
tryCommitOnBlur: (event: FocusEvent<HTMLInputElement>) => CustomOptionBlurResult;
|
|
28
|
-
tryCommitFromKeyboard: (event: KeyboardEvent
|
|
28
|
+
tryCommitFromKeyboard: (event: Pick<KeyboardEvent, "key">) => boolean;
|
|
29
29
|
handleListSingleChange: (next: ItemId | undefined) => void;
|
|
30
30
|
handleListMultipleChange: (next: ItemId[]) => void;
|
|
31
31
|
};
|
|
@@ -96,6 +96,8 @@ type CommonSelectProps = FieldSelectDecoratorProps & DroplistPassthrough & {
|
|
|
96
96
|
widthStrategy?: DroplistProps['widthStrategy'];
|
|
97
97
|
/**
|
|
98
98
|
* Включить поиск/ввод в поле — пользователь печатает, список фильтруется по подстроке лейбла.
|
|
99
|
+
* На mobile поиск в sheet появляется при количестве вариантов больше 5.
|
|
100
|
+
* `autocomplete` и создание опции по Enter включают мобильный поиск независимо от количества вариантов.
|
|
99
101
|
* @default true
|
|
100
102
|
*/
|
|
101
103
|
searchable?: boolean;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
|
|
2
3
|
import { ChevronDownSVG } from '@cloud-ru/ds-icons/interface/system';
|
|
3
4
|
import { InputPrivate, useButtonNavigation, useClearButton } from '@cloud-ru/ds-input-private';
|
|
4
5
|
import { Droplist } from '@cloud-ru/ds-list';
|
|
@@ -16,7 +17,7 @@ import { copyTextToClipboard, getAcrylicProps, preventSlotMouseDown, stopSlotCli
|
|
|
16
17
|
import fieldStyles from '../shared/styles.module.css';
|
|
17
18
|
import { useCustomOption } from './hooks.js';
|
|
18
19
|
import styles from './styles.module.css';
|
|
19
|
-
import { extractAppearance, extractLabel, filterItems, findItem, flatten, getMissingSelectedItems, getSelectedIds, isMultiple, TAG_SIZE_MAP, } from './utils/index.js';
|
|
20
|
+
import { extractAppearance, extractLabel, filterItems, findItem, flatten, getMissingSelectedItems, getSelectedIds, isMultiple, resolveAddCustomOptionTriggers, TAG_SIZE_MAP, } from './utils/index.js';
|
|
20
21
|
export const FieldSelect = forwardRef(function FieldSelect(props, ref) {
|
|
21
22
|
const { label = '', labelTooltip, caption, hint, error, validationState = VALIDATION_STATE.Default, showHintIcon, length, required, size = SIZE.M, className, fieldClassName, items, pinTop, pinBottom, placeholder = '', iconBefore, prefix, postfix, disabled, readonly: readOnly, background = true, open: openProp, onOpenChange, placement, widthStrategy = 'eq', searchable = true, search, autocomplete = false, resetSearchOnOptionSelection = true, showClearButton = true, showCopyButton = true, onCopyButtonClick, id, name, autoFocus, layoutPresets, value, onChange, onFocus: onFocusProp, onBlur: onBlurProp, enableFuzzySearch = true, selectedOptionFormatter, footer, footerDivider, footerActiveElementsRefs, loading, noDataState, noResultsState, errorDataState, dataError, dataFiltered, virtualized, scrollToSelectedItem, limitedScrollHeight, untouchableScrollbars, closeOnPopstate, onKeyDown: onKeyDownProp, 'data-test-id': dataTestId = TEST_IDS.fieldSelect, } = props;
|
|
22
23
|
const multiple = isMultiple(props);
|
|
@@ -28,6 +29,7 @@ export const FieldSelect = forwardRef(function FieldSelect(props, ref) {
|
|
|
28
29
|
const onSingleChange = onChange;
|
|
29
30
|
const onMultipleChange = onChange;
|
|
30
31
|
const resolvedAutoFocus = useAdaptiveAutoFocus(autoFocus, layoutPresets);
|
|
32
|
+
const { layoutType } = useAdaptiveLayout();
|
|
31
33
|
const inputRef = useRef(null);
|
|
32
34
|
// Отдельный ref на реальный <input>: `inputRef.current` перезаписывается span-обёрткой PopoverPrivate.
|
|
33
35
|
const inputElementRef = useRef(null);
|
|
@@ -73,6 +75,9 @@ export const FieldSelect = forwardRef(function FieldSelect(props, ref) {
|
|
|
73
75
|
}, [multiple, value, multipleLocal]);
|
|
74
76
|
const effectiveValidationState = useMemo(() => (error ? VALIDATION_STATE.Error : validationState), [error, validationState]);
|
|
75
77
|
const allItems = useMemo(() => [...(pinTop ?? []), ...items, ...(pinBottom ?? [])], [items, pinTop, pinBottom]);
|
|
78
|
+
const mobileSearchable = useMemo(() => (searchable && flatten(allItems).filter(item => !('items' in item)).length > 5) ||
|
|
79
|
+
autocomplete ||
|
|
80
|
+
resolveAddCustomOptionTriggers({ allowCustomOption, addCustomOptionTriggers, multiple }).includes('enter'), [searchable, allItems, autocomplete, allowCustomOption, addCustomOptionTriggers, multiple]);
|
|
76
81
|
const selectedIds = useMemo(() => getSelectedIds({ multiple, multipleValue, singleValue }), [multiple, multipleValue, singleValue]);
|
|
77
82
|
// Выбранное, которого нет в `items` (кастом по allowCustomOption, ленивая подгрузка) — в список, не только в чип.
|
|
78
83
|
const missingSelectedItems = useMemo(() => getMissingSelectedItems(selectedIds, allItems), [selectedIds, allItems]);
|
|
@@ -442,5 +447,18 @@ export const FieldSelect = forwardRef(function FieldSelect(props, ref) {
|
|
|
442
447
|
}), children: _jsx("div", { className: fieldStyles.acrylicBg, "aria-hidden": true }) }), _jsx("div", { className: fieldStyles.borderStateLayer, "data-state": 'borderOnBackground' }), _jsx("div", { className: fieldStyles.focusLayer })] }), _jsx("div", { className: fieldStyles.fieldContainer, children: _jsxs("div", { className: fieldStyles.contentWrapper, children: [iconBefore && _jsx("div", { className: fieldStyles.iconSlot, children: iconBefore }), _jsxs("div", { className: fieldStyles.inputLine, children: [prefix && _jsx("span", { className: fieldStyles.prefix, children: prefix }), hasChips ? (_jsxs("div", { className: styles.chipsRow, ref: contentRef, "data-test-id": TEST_IDS.fieldSelectChips, children: [selectedPairs.map(pair => (_jsx(Tag, { label: formatPair(pair), size: TAG_SIZE_MAP[size], appearance: pair.appearance ?? 'neutral', onDelete: disabled || readOnly || pair.disabled ? undefined : handleRemoveChip(pair.id) }, String(pair.id)))), searchInput, _jsx("span", { ref: inputPlugRef, className: styles.inputPlug, "aria-hidden": true, children: inputValue })] })) : (searchInput), postfixButtons && (
|
|
443
448
|
// eslint-disable-next-line jsx-a11y/no-static-element-interactions
|
|
444
449
|
_jsx("span", { className: fieldStyles.postfixButtonsSlot, onMouseDown: preventSlotMouseDown, onClick: stopSlotClickPropagation, children: postfixButtons })), postfix && _jsx("span", { className: fieldStyles.postfix, children: postfix })] }), _jsx("div", { className: fieldStyles.iconSlot, children: _jsx("span", { className: styles.chevron, "data-open": open || undefined, "aria-hidden": true, children: _jsx(ChevronDownSVG, {}) }) })] }) })] }));
|
|
445
|
-
return (_jsx(FieldDecorator, { className: className, label: label, labelTooltip: labelTooltip, caption: caption, hint: hint, error: error, size: size, validationState: validationState, showHintIcon: showHintIcon, length: length, required: required, labelFor: id, disabled: disabled, readonly: readOnly, children: _jsx(Droplist, { items: filteredItems, label: label,
|
|
450
|
+
return (_jsx(FieldDecorator, { className: className, label: label, labelTooltip: labelTooltip, caption: caption, hint: hint, error: error, size: size, validationState: validationState, showHintIcon: showHintIcon, length: length, required: required, labelFor: id, disabled: disabled, readonly: readOnly, children: _jsx(Droplist, { items: filteredItems, label: label, search: isMobileLayout(layoutType) && mobileSearchable && !readOnly && !disabled
|
|
451
|
+
? {
|
|
452
|
+
value: inputValue,
|
|
453
|
+
onChange: handleInputChange,
|
|
454
|
+
onKeyDown: event => {
|
|
455
|
+
if (tryCommitFromKeyboard(event)) {
|
|
456
|
+
event.preventDefault();
|
|
457
|
+
event.stopPropagation();
|
|
458
|
+
}
|
|
459
|
+
},
|
|
460
|
+
placeholder,
|
|
461
|
+
loading,
|
|
462
|
+
}
|
|
463
|
+
: undefined, pinTop: filteredPinTop, pinBottom: filteredPinBottom, trigger: 'click', placement: placement, widthStrategy: widthStrategy, triggerElemRef: inputRef, listRef: listRef, size: size, open: open, onOpenChange: handleOpenChange, selection: droplistSelection, closeDroplistOnItemClick: closeDroplistOnItemClick, footer: footer, footerDivider: footerDivider, footerActiveElementsRefs: footerActiveElementsRefs, loading: loading, noDataState: noDataState, noResultsState: noResultsState, errorDataState: errorDataState, dataError: dataError, dataFiltered: dataFiltered ?? (searchable && typing && inputValue !== ''), virtualized: virtualized, scroll: true, scrollToSelectedItem: scrollToSelectedItem, limitedScrollHeight: limitedScrollHeight, untouchableScrollbars: untouchableScrollbars, closeOnPopstate: closeOnPopstate, "data-test-id": TEST_IDS.fieldSelectList, children: trigger }) }));
|
|
446
464
|
});
|
|
@@ -25,7 +25,7 @@ export declare function useCustomOption({ allowCustomOption, addCustomOptionTrig
|
|
|
25
25
|
enableCloseCommit: () => void;
|
|
26
26
|
tryCommitOnClose: () => boolean;
|
|
27
27
|
tryCommitOnBlur: (event: FocusEvent<HTMLInputElement>) => CustomOptionBlurResult;
|
|
28
|
-
tryCommitFromKeyboard: (event: KeyboardEvent
|
|
28
|
+
tryCommitFromKeyboard: (event: Pick<KeyboardEvent, "key">) => boolean;
|
|
29
29
|
handleListSingleChange: (next: ItemId | undefined) => void;
|
|
30
30
|
handleListMultipleChange: (next: ItemId[]) => void;
|
|
31
31
|
};
|
|
@@ -96,6 +96,8 @@ type CommonSelectProps = FieldSelectDecoratorProps & DroplistPassthrough & {
|
|
|
96
96
|
widthStrategy?: DroplistProps['widthStrategy'];
|
|
97
97
|
/**
|
|
98
98
|
* Включить поиск/ввод в поле — пользователь печатает, список фильтруется по подстроке лейбла.
|
|
99
|
+
* На mobile поиск в sheet появляется при количестве вариантов больше 5.
|
|
100
|
+
* `autocomplete` и создание опции по Enter включают мобильный поиск независимо от количества вариантов.
|
|
99
101
|
* @default true
|
|
100
102
|
*/
|
|
101
103
|
searchable?: boolean;
|