@cloud-ru/ds-fields 3.0.8-preview-06965406.0 → 3.0.8
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 +6 -0
- package/README.md +1 -1
- package/dist/cjs/components/FieldSecure/FieldSecure.js +8 -8
- package/dist/cjs/components/FieldSelect/FieldSelect.js +1 -19
- package/dist/cjs/components/FieldSelect/hooks.d.ts +1 -1
- package/dist/cjs/components/FieldSelect/types.d.ts +0 -1
- package/dist/cjs/components/FieldStepper/FieldStepper.js +3 -2
- package/dist/esm/components/FieldSecure/FieldSecure.js +8 -8
- package/dist/esm/components/FieldSelect/FieldSelect.js +2 -20
- package/dist/esm/components/FieldSelect/hooks.d.ts +1 -1
- package/dist/esm/components/FieldSelect/types.d.ts +0 -1
- package/dist/esm/components/FieldStepper/FieldStepper.js +3 -2
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +20 -20
- package/src/components/FieldSecure/FieldSecure.tsx +9 -9
- package/src/components/FieldSelect/FieldSelect.tsx +0 -26
- package/src/components/FieldSelect/hooks.ts +1 -1
- package/src/components/FieldSelect/types.ts +0 -1
- package/src/components/FieldStepper/FieldStepper.tsx +4 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloud-ru/ds-fields",
|
|
3
|
-
"version": "3.0.8
|
|
3
|
+
"version": "3.0.8",
|
|
4
4
|
"description": "Поля ввода с единой обёрткой label/caption/hint/error и общими осями size/validationState — текст, пароль, число, ползунок, дата, время, выбор, цвет.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -39,24 +39,24 @@
|
|
|
39
39
|
"classnames": "^2.5.1",
|
|
40
40
|
"merge-refs": "^2.0.0",
|
|
41
41
|
"react-textarea-autosize": "^8.5.9",
|
|
42
|
-
"@cloud-ru/ds-adaptive": "1.0.3",
|
|
43
|
-
"@cloud-ru/ds-
|
|
44
|
-
"@cloud-ru/ds-
|
|
45
|
-
"@cloud-ru/ds-
|
|
46
|
-
"@cloud-ru/ds-
|
|
47
|
-
"@cloud-ru/ds-divider": "1.0.3",
|
|
48
|
-
"@cloud-ru/ds-dropdown": "1.1.
|
|
49
|
-
"@cloud-ru/ds-
|
|
50
|
-
"@cloud-ru/ds-
|
|
51
|
-
"@cloud-ru/ds-
|
|
52
|
-
"@cloud-ru/ds-
|
|
53
|
-
"@cloud-ru/ds-
|
|
54
|
-
"@cloud-ru/ds-
|
|
55
|
-
"@cloud-ru/ds-
|
|
56
|
-
"@cloud-ru/ds-
|
|
57
|
-
"@cloud-ru/ds-
|
|
58
|
-
"@cloud-ru/ds-
|
|
59
|
-
"@cloud-ru/ds-
|
|
60
|
-
"@cloud-ru/ds-
|
|
42
|
+
"@cloud-ru/ds-adaptive": "^1.0.3",
|
|
43
|
+
"@cloud-ru/ds-bottom-sheet": "^2.0.9",
|
|
44
|
+
"@cloud-ru/ds-button": "^1.0.5",
|
|
45
|
+
"@cloud-ru/ds-calendar": "^1.1.21",
|
|
46
|
+
"@cloud-ru/ds-color-picker": "^1.0.21",
|
|
47
|
+
"@cloud-ru/ds-divider": "^1.0.3",
|
|
48
|
+
"@cloud-ru/ds-dropdown": "^1.1.10",
|
|
49
|
+
"@cloud-ru/ds-field-decorator": "^1.1.9",
|
|
50
|
+
"@cloud-ru/ds-icons": "^1.7.2",
|
|
51
|
+
"@cloud-ru/ds-input-private": "^1.0.15",
|
|
52
|
+
"@cloud-ru/ds-list": "^3.0.7",
|
|
53
|
+
"@cloud-ru/ds-loader": "^1.0.4",
|
|
54
|
+
"@cloud-ru/ds-materials": "^2.0.2",
|
|
55
|
+
"@cloud-ru/ds-scroll": "^1.0.6",
|
|
56
|
+
"@cloud-ru/ds-skeleton": "^1.0.3",
|
|
57
|
+
"@cloud-ru/ds-slider": "^1.0.17",
|
|
58
|
+
"@cloud-ru/ds-tag": "^1.1.20",
|
|
59
|
+
"@cloud-ru/ds-tooltip": "^1.0.17",
|
|
60
|
+
"@cloud-ru/ds-utils": "^1.3.0"
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -146,25 +146,25 @@ export const FieldSecure = forwardRef<HTMLInputElement, FieldSecureProps>(functi
|
|
|
146
146
|
[onChange, setValue],
|
|
147
147
|
);
|
|
148
148
|
|
|
149
|
-
const ensureAsyncValue = useCallback(async (): Promise<
|
|
149
|
+
const ensureAsyncValue = useCallback(async (): Promise<boolean> => {
|
|
150
150
|
if (!asyncValueGetter || isAsyncLoaded) {
|
|
151
|
-
return
|
|
151
|
+
return true;
|
|
152
152
|
}
|
|
153
153
|
setIsLoading(true);
|
|
154
154
|
try {
|
|
155
155
|
const next = await asyncValueGetter();
|
|
156
156
|
setIsAsyncLoaded(true);
|
|
157
157
|
emitChange(next);
|
|
158
|
-
return
|
|
158
|
+
return true;
|
|
159
159
|
} catch {
|
|
160
|
-
return
|
|
160
|
+
return false;
|
|
161
161
|
} finally {
|
|
162
162
|
setIsLoading(false);
|
|
163
163
|
}
|
|
164
|
-
}, [asyncValueGetter, emitChange, isAsyncLoaded
|
|
164
|
+
}, [asyncValueGetter, emitChange, isAsyncLoaded]);
|
|
165
165
|
|
|
166
166
|
const toggleHidden = useCallback(() => {
|
|
167
|
-
ensureAsyncValue().then(
|
|
167
|
+
ensureAsyncValue().then(success => {
|
|
168
168
|
if (!success) {
|
|
169
169
|
return;
|
|
170
170
|
}
|
|
@@ -198,14 +198,14 @@ export const FieldSecure = forwardRef<HTMLInputElement, FieldSecureProps>(functi
|
|
|
198
198
|
|
|
199
199
|
const onCopy = useCallback(
|
|
200
200
|
() =>
|
|
201
|
-
ensureAsyncValue().then(async
|
|
202
|
-
const copied =
|
|
201
|
+
ensureAsyncValue().then(async success => {
|
|
202
|
+
const copied = success && (await copyTextToClipboard(stringValue));
|
|
203
203
|
if (copied) {
|
|
204
204
|
onCopyButtonClick?.();
|
|
205
205
|
}
|
|
206
206
|
return copied;
|
|
207
207
|
}),
|
|
208
|
-
[ensureAsyncValue, onCopyButtonClick],
|
|
208
|
+
[ensureAsyncValue, onCopyButtonClick, stringValue],
|
|
209
209
|
);
|
|
210
210
|
|
|
211
211
|
const copyButtonSettings = useCopyButton({
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
|
|
2
1
|
import { ChevronDownSVG } from '@cloud-ru/ds-icons/interface/system';
|
|
3
2
|
import { InputPrivate, useButtonNavigation, useClearButton } from '@cloud-ru/ds-input-private';
|
|
4
3
|
import { Droplist, ItemId } from '@cloud-ru/ds-list';
|
|
@@ -46,7 +45,6 @@ import {
|
|
|
46
45
|
getMissingSelectedItems,
|
|
47
46
|
getSelectedIds,
|
|
48
47
|
isMultiple,
|
|
49
|
-
resolveAddCustomOptionTriggers,
|
|
50
48
|
TAG_SIZE_MAP,
|
|
51
49
|
WithIdContent,
|
|
52
50
|
} from './utils';
|
|
@@ -124,7 +122,6 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
|
|
|
124
122
|
const onMultipleChange = onChange as FieldSelectMultipleProps['onChange'];
|
|
125
123
|
|
|
126
124
|
const resolvedAutoFocus = useAdaptiveAutoFocus(autoFocus, layoutPresets);
|
|
127
|
-
const { layoutType } = useAdaptiveLayout();
|
|
128
125
|
|
|
129
126
|
const inputRef = useRef<HTMLInputElement>(null);
|
|
130
127
|
// Отдельный ref на реальный <input>: `inputRef.current` перезаписывается span-обёрткой PopoverPrivate.
|
|
@@ -189,13 +186,6 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
|
|
|
189
186
|
);
|
|
190
187
|
|
|
191
188
|
const allItems = useMemo(() => [...(pinTop ?? []), ...items, ...(pinBottom ?? [])], [items, pinTop, pinBottom]);
|
|
192
|
-
const mobileSearchable = useMemo(
|
|
193
|
-
() =>
|
|
194
|
-
searchable ||
|
|
195
|
-
autocomplete ||
|
|
196
|
-
resolveAddCustomOptionTriggers({ allowCustomOption, addCustomOptionTriggers, multiple }).includes('enter'),
|
|
197
|
-
[searchable, autocomplete, allowCustomOption, addCustomOptionTriggers, multiple],
|
|
198
|
-
);
|
|
199
189
|
|
|
200
190
|
const selectedIds = useMemo(
|
|
201
191
|
() => getSelectedIds({ multiple, multipleValue, singleValue }),
|
|
@@ -809,22 +799,6 @@ export const FieldSelect = forwardRef<HTMLInputElement, FieldSelectProps>(functi
|
|
|
809
799
|
<Droplist
|
|
810
800
|
items={filteredItems}
|
|
811
801
|
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
|
-
}
|
|
828
802
|
pinTop={filteredPinTop}
|
|
829
803
|
pinBottom={filteredPinBottom}
|
|
830
804
|
trigger='click'
|
|
@@ -133,7 +133,7 @@ export function useCustomOption({
|
|
|
133
133
|
);
|
|
134
134
|
|
|
135
135
|
const tryCommitFromKeyboard = useCallback(
|
|
136
|
-
(event:
|
|
136
|
+
(event: KeyboardEvent<HTMLInputElement>) => {
|
|
137
137
|
const trigger = getCustomOptionTriggerByKey(event.key);
|
|
138
138
|
|
|
139
139
|
return trigger !== undefined && tryCommit(trigger);
|
|
@@ -123,7 +123,6 @@ type CommonSelectProps = FieldSelectDecoratorProps &
|
|
|
123
123
|
widthStrategy?: DroplistProps['widthStrategy'];
|
|
124
124
|
/**
|
|
125
125
|
* Включить поиск/ввод в поле — пользователь печатает, список фильтруется по подстроке лейбла.
|
|
126
|
-
* `autocomplete` и создание опции по Enter также включают мобильный поиск.
|
|
127
126
|
* @default true
|
|
128
127
|
*/
|
|
129
128
|
searchable?: boolean;
|
|
@@ -205,10 +205,10 @@ export const FieldStepper = forwardRef<HTMLInputElement, FieldStepperProps>(func
|
|
|
205
205
|
|
|
206
206
|
const handleInputChange = useCallback(
|
|
207
207
|
(raw: string, event?: ChangeEvent<HTMLInputElement>) => {
|
|
208
|
-
if (raw === '
|
|
208
|
+
if (raw === '-') {
|
|
209
209
|
return;
|
|
210
210
|
}
|
|
211
|
-
const parsed = Number(raw);
|
|
211
|
+
const parsed = raw === '' ? 0 : Number(raw);
|
|
212
212
|
if (Number.isNaN(parsed)) {
|
|
213
213
|
return;
|
|
214
214
|
}
|
|
@@ -230,6 +230,8 @@ export const FieldStepper = forwardRef<HTMLInputElement, FieldStepperProps>(func
|
|
|
230
230
|
|
|
231
231
|
const handleBlur = useCallback(
|
|
232
232
|
(event: FocusEvent<HTMLInputElement>) => {
|
|
233
|
+
setFocusVisible(false);
|
|
234
|
+
|
|
233
235
|
if (!allowMoreThanLimits) {
|
|
234
236
|
if (typeof max === 'number' && value > max) {
|
|
235
237
|
setValue(max);
|