@vev/silke 1.1.8 → 1.1.10
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/.turbo/turbo-build.log +800 -0
- package/CHANGELOG.md +17 -0
- package/CLAUDE.md +102 -0
- package/dist/index.js +44 -40
- package/dist/index.js.LEGAL.txt +1 -1
- package/dist/styles.css +470 -254
- package/dist/types/components/index.d.ts +2 -0
- package/dist/types/components/silke-command-text-field/attachment-chip.d.ts +8 -0
- package/dist/types/components/silke-command-text-field/attachment-list.d.ts +15 -0
- package/dist/types/components/silke-command-text-field/file-utils.d.ts +33 -0
- package/dist/types/components/silke-command-text-field/file-utils.spec.d.ts +1 -0
- package/dist/types/components/silke-command-text-field/index.d.ts +6 -1
- package/dist/types/components/silke-command-text-field/silke-command-text-field.d.ts +23 -6
- package/dist/types/components/silke-command-text-field/utils.d.ts +14 -1
- package/dist/types/components/silke-conditions-input/utils.d.ts +1 -1
- package/dist/types/components/silke-css-number-field/silke-css-context.d.ts +2 -0
- package/dist/types/components/silke-css-number-field/silke-css-number-field.d.ts +2 -0
- package/dist/types/components/silke-css-number-field/utils.d.ts +1 -1
- package/dist/types/components/silke-form-schema/fields/group-field.d.ts +3 -0
- package/dist/types/components/silke-form-schema/fields/object-field.d.ts +1 -1
- package/dist/types/components/silke-form-schema/fields/popover-field.d.ts +3 -0
- package/dist/types/components/silke-form-schema/fields/utils/generate-image.d.ts +5 -0
- package/dist/types/components/silke-form-schema/fields/utils/index.d.ts +1 -1
- package/dist/types/components/silke-form-schema/silke-schema-field.d.ts +2 -1
- package/dist/types/components/silke-gradient-picker/index.d.ts +3 -0
- package/dist/types/components/silke-icon/silke-icon.d.ts +1 -1
- package/dist/types/components/silke-list/silke-list.d.ts +6 -1
- package/dist/types/components/silke-list/types.d.ts +2 -0
- package/dist/types/components/silke-shortcut-button/silke-shortcut-button.d.ts +4 -1
- package/dist/types/components/silke-theme-card/index.d.ts +1 -0
- package/dist/types/components/silke-theme-card/silke-theme-card.d.ts +18 -0
- package/dist/types/components/silke-theme-swatch/index.d.ts +1 -0
- package/dist/types/components/silke-theme-swatch/silke-theme-swatch.d.ts +11 -0
- package/dist/types/icons.d.ts +7 -2
- package/package.json +32 -20
- package/src/components/index.ts +2 -0
- package/src/components/silke-autocomplete-field/silke-autocomplete-popup-native.tsx +25 -18
- package/src/components/silke-button/silke-dropdown-button.mdx +1 -1
- package/src/components/silke-color-picker/color.ts +5 -3
- package/src/components/silke-color-swatches/silke-swatches.tsx +3 -3
- package/src/components/silke-command-text-field/attachment-chip.tsx +71 -0
- package/src/components/silke-command-text-field/attachment-list.tsx +72 -0
- package/src/components/silke-command-text-field/file-utils.spec.ts +148 -0
- package/src/components/silke-command-text-field/file-utils.ts +159 -0
- package/src/components/silke-command-text-field/index.ts +14 -0
- package/src/components/silke-command-text-field/silke-command-text-field.mdx +109 -13
- package/src/components/silke-command-text-field/silke-command-text-field.module.scss +65 -40
- package/src/components/silke-command-text-field/silke-command-text-field.tsx +113 -135
- package/src/components/silke-command-text-field/utils.spec.ts +109 -1
- package/src/components/silke-command-text-field/utils.ts +44 -7
- package/src/components/silke-css-number-field/silke-css-context.tsx +2 -0
- package/src/components/silke-css-number-field/silke-css-number-field.tsx +7 -4
- package/src/components/silke-css-number-field/utils.ts +8 -2
- package/src/components/silke-form-schema/fields/array-field-modal.tsx +69 -48
- package/src/components/silke-form-schema/fields/array-field.tsx +144 -130
- package/src/components/silke-form-schema/fields/color-field.tsx +118 -18
- package/src/components/silke-form-schema/fields/group-field.tsx +49 -0
- package/src/components/silke-form-schema/fields/icon-field.tsx +59 -39
- package/src/components/silke-form-schema/fields/image-field.tsx +50 -39
- package/src/components/silke-form-schema/fields/number-field.tsx +190 -116
- package/src/components/silke-form-schema/fields/object-field.tsx +2 -0
- package/src/components/silke-form-schema/fields/popover-field.tsx +65 -0
- package/src/components/silke-form-schema/fields/select-field.tsx +43 -30
- package/src/components/silke-form-schema/fields/string-field.tsx +1 -1
- package/src/components/silke-form-schema/fields/styles.scss +2 -39
- package/src/components/silke-form-schema/fields/toggle-field.tsx +48 -15
- package/src/components/silke-form-schema/fields/utils/generate-image.ts +20 -0
- package/src/components/silke-form-schema/fields/utils/generate-title.ts +1 -1
- package/src/components/silke-form-schema/fields/utils/index.ts +1 -1
- package/src/components/silke-form-schema/silke-form-schema.mdx +498 -311
- package/src/components/silke-form-schema/silke-schema-field.tsx +10 -3
- package/src/components/silke-form-schema/silke-schema-fields.tsx +9 -5
- package/src/components/silke-gradient-picker/index.ts +3 -0
- package/src/components/silke-icon/silke-icon.mdx +13 -1
- package/src/components/silke-icon/silke-icon.tsx +6 -2
- package/src/components/silke-list/silke-list.tsx +59 -26
- package/src/components/silke-list/types.ts +2 -0
- package/src/components/silke-navigation-link/silke-navigation-link.scss +1 -0
- package/src/components/silke-shortcut-button/silke-shortcut-button.scss +16 -0
- package/src/components/silke-shortcut-button/silke-shortcut-button.tsx +9 -0
- package/src/components/silke-slider/silke-slider.module.scss +1 -1
- package/src/components/silke-text-field/silke-text-field-outline.tsx +9 -6
- package/src/components/silke-text-field/silke-text-field.scss +3 -0
- package/src/components/silke-text-field/silke-text-field.tsx +1 -1
- package/src/components/silke-theme-card/index.ts +1 -0
- package/src/components/silke-theme-card/silke-theme-card.mdx +50 -0
- package/src/components/silke-theme-card/silke-theme-card.module.scss +82 -0
- package/src/components/silke-theme-card/silke-theme-card.tsx +82 -0
- package/src/components/silke-theme-swatch/index.ts +1 -0
- package/src/components/silke-theme-swatch/silke-theme-swatch.mdx +59 -0
- package/src/components/silke-theme-swatch/silke-theme-swatch.module.scss +108 -0
- package/src/components/silke-theme-swatch/silke-theme-swatch.tsx +49 -0
- package/src/components/silke-variables-wrapper/silke-variables-wrapper.tsx +9 -8
- package/src/icons.tsx +41 -7
- package/tsconfig.build.tsbuildinfo +1 -1
- package/project.json +0 -12
|
@@ -24,7 +24,21 @@ export type SilkeImageValue = {
|
|
|
24
24
|
name?: string;
|
|
25
25
|
};
|
|
26
26
|
|
|
27
|
-
export type
|
|
27
|
+
export type SilkeFileValue = {
|
|
28
|
+
type: 'file';
|
|
29
|
+
/** Base64-encoded file data */
|
|
30
|
+
data: string;
|
|
31
|
+
/** MIME type (e.g., 'text/csv', 'application/vnd.ms-excel') */
|
|
32
|
+
mimeType: string;
|
|
33
|
+
/** Filename */
|
|
34
|
+
name: string;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
export type SilkeCommandTextFieldValue =
|
|
38
|
+
| SilkeCommand
|
|
39
|
+
| SilkeTextValue
|
|
40
|
+
| SilkeImageValue
|
|
41
|
+
| SilkeFileValue;
|
|
28
42
|
|
|
29
43
|
/** Key direction mappings for navigation and editing */
|
|
30
44
|
export const KEY_DIRECTION: Record<string, number> = {
|
|
@@ -117,7 +131,7 @@ export function getActiveCommandIndex(
|
|
|
117
131
|
|
|
118
132
|
for (let i = 0; i < value.length; i++) {
|
|
119
133
|
const item = value[i];
|
|
120
|
-
if (item.type === 'image') continue; //
|
|
134
|
+
if (item.type === 'image' || item.type === 'file') continue; // Attachments have no text length
|
|
121
135
|
textLength += item.value?.length || 0;
|
|
122
136
|
if (item.type !== 'text') textLength++;
|
|
123
137
|
if (textLength > caretPos) return i;
|
|
@@ -134,14 +148,14 @@ export function getTextLength(value: SilkeCommandTextFieldValue[], index?: numbe
|
|
|
134
148
|
if (endIndex <= 0) return 0;
|
|
135
149
|
|
|
136
150
|
return value.slice(0, endIndex).reduce((acc, curr) => {
|
|
137
|
-
if (curr.type === 'image') return acc; //
|
|
151
|
+
if (curr.type === 'image' || curr.type === 'file') return acc; // Attachments have no text length
|
|
138
152
|
return acc + (curr.type === 'text' ? curr.value.length : curr.value.length + 1);
|
|
139
153
|
}, 0);
|
|
140
154
|
}
|
|
141
155
|
|
|
142
156
|
/** Get the rendered length of a single command/text value */
|
|
143
157
|
export function getItemLength(item: SilkeCommandTextFieldValue): number {
|
|
144
|
-
if (!item || item.type === 'image') return 0;
|
|
158
|
+
if (!item || item.type === 'image' || item.type === 'file') return 0;
|
|
145
159
|
return item.type === 'text' ? item.value.length : item.value.length + 1;
|
|
146
160
|
}
|
|
147
161
|
|
|
@@ -153,7 +167,10 @@ export function valueToHtml(
|
|
|
153
167
|
if (!value || value.length === 0) return '';
|
|
154
168
|
|
|
155
169
|
return value
|
|
156
|
-
.filter(
|
|
170
|
+
.filter(
|
|
171
|
+
(item): item is SilkeCommand | SilkeTextValue =>
|
|
172
|
+
item.type !== 'image' && item.type !== 'file',
|
|
173
|
+
)
|
|
157
174
|
.map((item) => {
|
|
158
175
|
const escapedValue = escapeHtml(item.value);
|
|
159
176
|
|
|
@@ -176,7 +193,9 @@ export function valueToHtml(
|
|
|
176
193
|
export function convertSilkeCommandsToString(value: SilkeCommandTextFieldValue[]): string {
|
|
177
194
|
if (!value) return '';
|
|
178
195
|
return value
|
|
179
|
-
.filter(
|
|
196
|
+
.filter(
|
|
197
|
+
(v): v is SilkeCommand | SilkeTextValue => v.type !== 'image' && v.type !== 'file',
|
|
198
|
+
)
|
|
180
199
|
.map((v) => (v.type === 'text' ? v.value : v.type + v.value))
|
|
181
200
|
.join('');
|
|
182
201
|
}
|
|
@@ -185,7 +204,13 @@ export function convertSilkeCommandsToString(value: SilkeCommandTextFieldValue[]
|
|
|
185
204
|
export function isSilkeCommand(
|
|
186
205
|
value: SilkeCommandTextFieldValue | undefined,
|
|
187
206
|
): value is SilkeCommand {
|
|
188
|
-
return
|
|
207
|
+
return (
|
|
208
|
+
value !== null &&
|
|
209
|
+
value !== undefined &&
|
|
210
|
+
value.type !== 'text' &&
|
|
211
|
+
value.type !== 'image' &&
|
|
212
|
+
value.type !== 'file'
|
|
213
|
+
);
|
|
189
214
|
}
|
|
190
215
|
|
|
191
216
|
/** Check if a command value is a text segment */
|
|
@@ -198,6 +223,18 @@ export function isImage(value: SilkeCommandTextFieldValue | undefined): value is
|
|
|
198
223
|
return value !== null && value !== undefined && value.type === 'image';
|
|
199
224
|
}
|
|
200
225
|
|
|
226
|
+
/** Check if a command value is a non-image file attachment */
|
|
227
|
+
export function isFile(value: SilkeCommandTextFieldValue | undefined): value is SilkeFileValue {
|
|
228
|
+
return value !== null && value !== undefined && value.type === 'file';
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
/** Check if a command value is any attachment (image or file) */
|
|
232
|
+
export function isAttachment(
|
|
233
|
+
value: SilkeCommandTextFieldValue | undefined,
|
|
234
|
+
): value is SilkeImageValue | SilkeFileValue {
|
|
235
|
+
return isImage(value) || isFile(value);
|
|
236
|
+
}
|
|
237
|
+
|
|
201
238
|
/**
|
|
202
239
|
* Calculate a match score for a command against a search query.
|
|
203
240
|
* Higher scores indicate better matches.
|
|
@@ -31,6 +31,8 @@ export type SilkeCssNumberFieldProps = FormFieldProps<string> &
|
|
|
31
31
|
options?: (SilkeOverflowMenuItem | 'divider')[];
|
|
32
32
|
min?: number;
|
|
33
33
|
max?: number;
|
|
34
|
+
/** Override the default decimal precision for the current format */
|
|
35
|
+
precision?: number;
|
|
34
36
|
autoFocus?: boolean;
|
|
35
37
|
allowAuto?: boolean | string;
|
|
36
38
|
disableVariables?: boolean;
|
|
@@ -57,6 +59,7 @@ export function SilkeCssNumberField(props: SilkeCssNumberFieldProps) {
|
|
|
57
59
|
value,
|
|
58
60
|
min,
|
|
59
61
|
max,
|
|
62
|
+
precision,
|
|
60
63
|
formats,
|
|
61
64
|
axis,
|
|
62
65
|
allowAuto,
|
|
@@ -153,7 +156,7 @@ export function SilkeCssNumberField(props: SilkeCssNumberFieldProps) {
|
|
|
153
156
|
format === ''
|
|
154
157
|
? `${number}`
|
|
155
158
|
: isNumber(number)
|
|
156
|
-
? roundCSSNumber(number, format).toString() + format
|
|
159
|
+
? roundCSSNumber(number, format, undefined, undefined, precision).toString() + format
|
|
157
160
|
: number + format,
|
|
158
161
|
);
|
|
159
162
|
}
|
|
@@ -162,7 +165,7 @@ export function SilkeCssNumberField(props: SilkeCssNumberFieldProps) {
|
|
|
162
165
|
const handleChange = (number: number | string, format: string) => {
|
|
163
166
|
const newValue = isString(number)
|
|
164
167
|
? number + format
|
|
165
|
-
: roundCSSNumber(number, format, min, max) + format;
|
|
168
|
+
: roundCSSNumber(number, format, min, max, precision) + format;
|
|
166
169
|
onChange(newValue);
|
|
167
170
|
};
|
|
168
171
|
|
|
@@ -199,7 +202,7 @@ export function SilkeCssNumberField(props: SilkeCssNumberFieldProps) {
|
|
|
199
202
|
const el = numberRef.current;
|
|
200
203
|
if (el && document.activeElement !== el) {
|
|
201
204
|
el.innerText = formatNumberForDisplay(
|
|
202
|
-
isNumber(number) ? roundCSSNumber(number, format).toString() + format : number + format,
|
|
205
|
+
isNumber(number) ? roundCSSNumber(number, format, undefined, undefined, precision).toString() + format : number + format,
|
|
203
206
|
);
|
|
204
207
|
}
|
|
205
208
|
}, [number, format, variables, isAuto, isMixed]);
|
|
@@ -226,7 +229,7 @@ export function SilkeCssNumberField(props: SilkeCssNumberFieldProps) {
|
|
|
226
229
|
const handleNumberStepRef = useCallbackRef((step: number) => {
|
|
227
230
|
const numberEl = numberRef.current;
|
|
228
231
|
if (!isString(number) && numberEl) {
|
|
229
|
-
const newNumber = roundCSSNumber(number + step, format, min, max);
|
|
232
|
+
const newNumber = roundCSSNumber(number + step, format, min, max, precision);
|
|
230
233
|
|
|
231
234
|
handleChange(newNumber, format);
|
|
232
235
|
numberEl.innerText = formatNumberForDisplay(newNumber.toString());
|
|
@@ -30,11 +30,17 @@ export const FORMAT_LABELS = {
|
|
|
30
30
|
s: 'Seconds',
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
-
export function roundCSSNumber(
|
|
33
|
+
export function roundCSSNumber(
|
|
34
|
+
value: number,
|
|
35
|
+
format: string,
|
|
36
|
+
min?: number,
|
|
37
|
+
max?: number,
|
|
38
|
+
precisionOverride?: number,
|
|
39
|
+
): number {
|
|
34
40
|
if (!isUndefined(min) && value < min) value = min;
|
|
35
41
|
else if (!isUndefined(max) && value > max) value = max;
|
|
36
42
|
|
|
37
|
-
const precision = get(FORMAT_PRECISION, format, 1);
|
|
43
|
+
const precision = precisionOverride ?? get(FORMAT_PRECISION, format, 1);
|
|
38
44
|
return round(value, precision);
|
|
39
45
|
}
|
|
40
46
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { RefObject, useCallback, useMemo, useRef } from 'react';
|
|
1
|
+
import React, { RefObject, useCallback, useEffect, useMemo, useRef } from 'react';
|
|
2
2
|
import { SilkeSchemaFields } from '../silke-schema-fields';
|
|
3
3
|
import { SilkeTextField } from '../../silke-text-field';
|
|
4
4
|
import { SilkePopover } from '../../silke-popover';
|
|
@@ -9,6 +9,7 @@ import { SilkeButton } from '../../silke-button';
|
|
|
9
9
|
import { generateTitle } from './utils';
|
|
10
10
|
import { VevProps } from '@vev/utils';
|
|
11
11
|
import { getSchemaDefaultValue } from '../schema-utils';
|
|
12
|
+
import { SilkeSchemaContext, useSchemaContext } from '../silke-schema-context';
|
|
12
13
|
import styles from './styles.scss';
|
|
13
14
|
|
|
14
15
|
type Props = {
|
|
@@ -32,6 +33,7 @@ export function ArrayFieldModal({
|
|
|
32
33
|
onDelete,
|
|
33
34
|
onClose,
|
|
34
35
|
}: Props) {
|
|
36
|
+
const schemaContext = useSchemaContext();
|
|
35
37
|
const valueRef = useRef<any>(value);
|
|
36
38
|
const fieldRefs = useRef<any>({});
|
|
37
39
|
|
|
@@ -39,7 +41,23 @@ export function ArrayFieldModal({
|
|
|
39
41
|
fieldRefs.current[name] = v;
|
|
40
42
|
}, []);
|
|
41
43
|
|
|
42
|
-
const defaultItemValue = useMemo(
|
|
44
|
+
const defaultItemValue = useMemo(
|
|
45
|
+
() => getSchemaDefaultValue(schema as VevProps | VevProps[]),
|
|
46
|
+
[schema],
|
|
47
|
+
);
|
|
48
|
+
|
|
49
|
+
const contentRef = useRef<HTMLDivElement>(null);
|
|
50
|
+
|
|
51
|
+
useEffect(() => {
|
|
52
|
+
// Focus the first input-like element when the popover opens
|
|
53
|
+
const timer = setTimeout(() => {
|
|
54
|
+
const el = contentRef.current?.querySelector<HTMLElement>(
|
|
55
|
+
'input, textarea, [contenteditable="true"], [role="textbox"]',
|
|
56
|
+
);
|
|
57
|
+
el?.focus();
|
|
58
|
+
}, 50);
|
|
59
|
+
return () => clearTimeout(timer);
|
|
60
|
+
}, [selected]);
|
|
43
61
|
|
|
44
62
|
const anchorRect = anchor.current.getBoundingClientRect();
|
|
45
63
|
const anchorPos: [number, number] = [anchorRect.left - 16, anchorRect.top];
|
|
@@ -50,56 +68,59 @@ export function ArrayFieldModal({
|
|
|
50
68
|
targetOrigin="top-right"
|
|
51
69
|
hide={selected === undefined}
|
|
52
70
|
zIndex={90}
|
|
71
|
+
contextId="silke-array-schema"
|
|
53
72
|
>
|
|
54
|
-
<
|
|
55
|
-
<SilkeBox
|
|
56
|
-
<SilkeBox
|
|
57
|
-
<
|
|
58
|
-
|
|
59
|
-
|
|
73
|
+
<SilkeSchemaContext context={schemaContext}>
|
|
74
|
+
<SilkeBox column bg="neutral-5" className={styles.arrayFieldModal} ref={contentRef}>
|
|
75
|
+
<SilkeBox pad="s" vAlign="center">
|
|
76
|
+
<SilkeBox hPad="s" vPad="s" flex>
|
|
77
|
+
<SilkeText weight="strong">
|
|
78
|
+
{generateTitle(value[selected], schema) || 'Untitled'}
|
|
79
|
+
</SilkeText>
|
|
80
|
+
</SilkeBox>
|
|
81
|
+
<SilkeButton disabled={disabled} icon="delete" kind="ghost" onClick={onDelete} />
|
|
82
|
+
<SilkeButton icon="close" kind="ghost" onClick={onClose} />
|
|
60
83
|
</SilkeBox>
|
|
61
|
-
<
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
update[selected] = val;
|
|
72
|
-
onChange(update);
|
|
73
|
-
}}
|
|
74
|
-
/>
|
|
75
|
-
) : (
|
|
76
|
-
<FormObjectProvider
|
|
77
|
-
errors={{}}
|
|
78
|
-
valueRef={valueRef}
|
|
79
|
-
value={value[selected] || defaultItemValue}
|
|
80
|
-
validate={() => { }}
|
|
81
|
-
onChange={(name, update) => {
|
|
82
|
-
const newValue = [...(value || [])];
|
|
83
|
-
newValue[selected] = {
|
|
84
|
-
...defaultItemValue,
|
|
85
|
-
...value[selected],
|
|
86
|
-
[name]: update,
|
|
87
|
-
};
|
|
88
|
-
onChange(newValue);
|
|
89
|
-
}}
|
|
90
|
-
register={registerField}
|
|
91
|
-
>
|
|
92
|
-
<SilkeSchemaFields
|
|
93
|
-
disabled={disabled}
|
|
94
|
-
schema={Array.isArray(schema) ? schema : [schema]}
|
|
95
|
-
value={value[selected] || defaultItemValue}
|
|
96
|
-
noPad
|
|
97
|
-
itemIndex={selected}
|
|
84
|
+
<SilkeBox hPad="m" gap="m" column vAlign="center">
|
|
85
|
+
{typeof schema === 'string' ? (
|
|
86
|
+
<SilkeTextField
|
|
87
|
+
value={(selected !== undefined && value[selected]) || ''}
|
|
88
|
+
type={(schema as any).of}
|
|
89
|
+
onChange={(val: string) => {
|
|
90
|
+
const update = [...(value || [])];
|
|
91
|
+
update[selected] = val;
|
|
92
|
+
onChange(update);
|
|
93
|
+
}}
|
|
98
94
|
/>
|
|
99
|
-
|
|
100
|
-
|
|
95
|
+
) : (
|
|
96
|
+
<FormObjectProvider
|
|
97
|
+
errors={{}}
|
|
98
|
+
valueRef={valueRef}
|
|
99
|
+
value={value[selected] || defaultItemValue}
|
|
100
|
+
validate={() => {}}
|
|
101
|
+
onChange={(name, update) => {
|
|
102
|
+
const newValue = [...(value || [])];
|
|
103
|
+
newValue[selected] = {
|
|
104
|
+
...defaultItemValue,
|
|
105
|
+
...value[selected],
|
|
106
|
+
[name]: update,
|
|
107
|
+
};
|
|
108
|
+
onChange(newValue);
|
|
109
|
+
}}
|
|
110
|
+
register={registerField}
|
|
111
|
+
>
|
|
112
|
+
<SilkeSchemaFields
|
|
113
|
+
disabled={disabled}
|
|
114
|
+
schema={Array.isArray(schema) ? schema : [schema]}
|
|
115
|
+
value={value[selected] || defaultItemValue}
|
|
116
|
+
noPad
|
|
117
|
+
itemIndex={selected}
|
|
118
|
+
/>
|
|
119
|
+
</FormObjectProvider>
|
|
120
|
+
)}
|
|
121
|
+
</SilkeBox>
|
|
101
122
|
</SilkeBox>
|
|
102
|
-
</
|
|
123
|
+
</SilkeSchemaContext>
|
|
103
124
|
</SilkePopover>
|
|
104
125
|
);
|
|
105
126
|
}
|
|
@@ -1,18 +1,76 @@
|
|
|
1
1
|
import { ArrayField as ArrayFieldType, SchemaFieldProps, VevProps } from '@vev/utils';
|
|
2
|
-
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
2
|
+
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
3
3
|
import { SilkeBox } from '../../silke-box';
|
|
4
4
|
import { SilkeButton } from '../../silke-button';
|
|
5
5
|
import { SilkeIcon } from '../../silke-icon';
|
|
6
|
-
import {
|
|
6
|
+
import { SilkeList } from '../../silke-list';
|
|
7
7
|
import { SilkeText, SilkeTextSmall } from '../../silke-text';
|
|
8
|
-
import styles from './styles.scss';
|
|
9
8
|
import { ArrayFieldModal } from './array-field-modal';
|
|
10
|
-
import { ArrayFieldInline } from './array-field-inline';
|
|
11
9
|
import { SilkeOverflowMenu } from '../../silke-overflow-menu';
|
|
12
|
-
import { generateImage, generateTitle } from './utils';
|
|
10
|
+
import { generateImage, generateTitle, getImageFieldUrl } from './utils';
|
|
13
11
|
import { isString, startCase } from 'lodash';
|
|
14
12
|
import { getTitle } from './utils/schema-util';
|
|
15
13
|
import { getSchemaDefaultValue } from '../schema-utils';
|
|
14
|
+
import type { SilkeListItemData } from '../../silke-list/types';
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Checks if `of` is a single field definition object (e.g. `{ type: 'string' }`)
|
|
18
|
+
* as opposed to a string literal like `'string'` or an array of VevProps.
|
|
19
|
+
*/
|
|
20
|
+
function isSingleFieldOf(of: any): of is VevProps {
|
|
21
|
+
return of && typeof of === 'object' && !Array.isArray(of) && 'type' in of;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Normalizes `schema.of` — converts the single-field shorthand `{ type: 'string' }`
|
|
26
|
+
* into the primitive string `'string'` for code paths that expect it, while preserving
|
|
27
|
+
* the full field definition for modal rendering.
|
|
28
|
+
*/
|
|
29
|
+
function getNormalizedOf(schema: ArrayFieldType): VevProps[] | 'string' | 'number' | 'object' {
|
|
30
|
+
if (isSingleFieldOf(schema.of)) {
|
|
31
|
+
if (schema.of.type === 'string' || schema.of.type === 'number') {
|
|
32
|
+
return schema.of.type;
|
|
33
|
+
}
|
|
34
|
+
return [schema.of];
|
|
35
|
+
}
|
|
36
|
+
return schema.of as any;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** Resolves a list item icon: emoji icon for image URLs, silke icon name for fallback. */
|
|
40
|
+
function resolveItemIcon(
|
|
41
|
+
item: any,
|
|
42
|
+
fieldSchema: VevProps | VevProps[] | string | undefined,
|
|
43
|
+
): any {
|
|
44
|
+
// Check preview/custom image first
|
|
45
|
+
const imageUrl = generateImage(item, fieldSchema);
|
|
46
|
+
if (imageUrl && isString(imageUrl)) {
|
|
47
|
+
return { type: 2, value: { url: imageUrl } };
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
// Check if any sub-field is an image field
|
|
51
|
+
if (typeof item === 'object' && item) {
|
|
52
|
+
const fieldUrl = getImageFieldUrl(item, fieldSchema);
|
|
53
|
+
if (isString(fieldUrl)) return { type: 2, value: { url: fieldUrl } };
|
|
54
|
+
if (fieldUrl === true) return 'image';
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** Finds the field schema for a given array item (handles multi-type `of`). */
|
|
61
|
+
function getFieldSchema(
|
|
62
|
+
item: any,
|
|
63
|
+
schema: ArrayFieldType,
|
|
64
|
+
): { fieldSchema: VevProps | VevProps[] | string | undefined; schemaType: string | undefined } {
|
|
65
|
+
const [schemaType] = typeof item === 'object' && item ? Object.keys(item) : [];
|
|
66
|
+
const normalizedOf = getNormalizedOf(schema);
|
|
67
|
+
const fieldSchema = Array.isArray(normalizedOf)
|
|
68
|
+
? normalizedOf.find((s: VevProps) => s.name === schemaType)
|
|
69
|
+
: normalizedOf === 'object' && schema.preview
|
|
70
|
+
? schema
|
|
71
|
+
: normalizedOf;
|
|
72
|
+
return { fieldSchema, schemaType };
|
|
73
|
+
}
|
|
16
74
|
|
|
17
75
|
const ArrayField = ({
|
|
18
76
|
value = [],
|
|
@@ -23,9 +81,6 @@ const ArrayField = ({
|
|
|
23
81
|
}: SchemaFieldProps<ArrayFieldType>) => {
|
|
24
82
|
const [selected, setSelected] = useState<number | undefined>(undefined);
|
|
25
83
|
const [schemaIndex, setSchemaIndex] = useState(0);
|
|
26
|
-
const isModal = true;
|
|
27
|
-
|
|
28
|
-
const listRefs = useRef<any[]>([]);
|
|
29
84
|
const headerRef = useRef<any>(null);
|
|
30
85
|
const valueRef = useRef(value);
|
|
31
86
|
|
|
@@ -47,157 +102,116 @@ const ArrayField = ({
|
|
|
47
102
|
const update = value.filter((_, i) => i !== selected);
|
|
48
103
|
onChange(update);
|
|
49
104
|
setSelected(undefined);
|
|
50
|
-
}, [onChange, value, selected
|
|
105
|
+
}, [onChange, value, selected]);
|
|
51
106
|
|
|
52
107
|
if (!Array.isArray(value)) value = [];
|
|
53
108
|
|
|
109
|
+
const isMultiType = Array.isArray(schema.of) && !isSingleFieldOf(schema.of) && schema.of.length > 1;
|
|
110
|
+
|
|
111
|
+
const listItems: SilkeListItemData[] = useMemo(
|
|
112
|
+
() =>
|
|
113
|
+
value.map((item, i) => {
|
|
114
|
+
const { fieldSchema, schemaType } = getFieldSchema(item, schema);
|
|
115
|
+
return {
|
|
116
|
+
label: typeof item === 'string' ? item : generateTitle(item, fieldSchema) || '',
|
|
117
|
+
icon: resolveItemIcon(item, fieldSchema),
|
|
118
|
+
active: selected === i,
|
|
119
|
+
children: <SilkeIcon icon="drag" data-drag-handle />,
|
|
120
|
+
onClick: () => {
|
|
121
|
+
if (isMultiType) {
|
|
122
|
+
const schemaValues = (schema.of as VevProps[]).map((s) => s.name);
|
|
123
|
+
setSchemaIndex(schemaValues.indexOf(schemaType!) || 0);
|
|
124
|
+
}
|
|
125
|
+
setSelected(i);
|
|
126
|
+
},
|
|
127
|
+
};
|
|
128
|
+
}),
|
|
129
|
+
[value, schema, selected, isMultiType],
|
|
130
|
+
);
|
|
131
|
+
|
|
132
|
+
const handleAddDefault = useCallback(() => {
|
|
133
|
+
const normalizedOf = getNormalizedOf(schema);
|
|
134
|
+
const defaultValue = Array.isArray(normalizedOf)
|
|
135
|
+
? getSchemaDefaultValue(normalizedOf[0])
|
|
136
|
+
: normalizedOf === 'object' && 'fields' in schema
|
|
137
|
+
? getSchemaDefaultValue(schema.fields)
|
|
138
|
+
: normalizedOf === 'number'
|
|
139
|
+
? 0
|
|
140
|
+
: '';
|
|
141
|
+
addItem(defaultValue);
|
|
142
|
+
}, [schema, addItem]);
|
|
143
|
+
|
|
54
144
|
return (
|
|
55
|
-
<SilkeBox column flex
|
|
56
|
-
<SilkeBox flex ref={headerRef}>
|
|
145
|
+
<SilkeBox column flex>
|
|
146
|
+
<SilkeBox flex ref={headerRef} vPad="s">
|
|
57
147
|
<SilkeBox flex vAlign="center">
|
|
58
148
|
<SilkeTextSmall weight="strong">{getTitle(schema)}</SilkeTextSmall>
|
|
59
149
|
</SilkeBox>
|
|
60
150
|
<SilkeBox align="end">
|
|
61
|
-
{
|
|
151
|
+
{isMultiType ? (
|
|
62
152
|
<SilkeOverflowMenu
|
|
63
|
-
size="
|
|
153
|
+
size="s"
|
|
64
154
|
icon="add"
|
|
65
155
|
disabled={disabled}
|
|
66
|
-
items={(schema.of as VevProps[]).map((item, i) => {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
<span className={styles.icon}>{icon}</span>
|
|
74
|
-
)
|
|
75
|
-
) : null;
|
|
76
|
-
|
|
77
|
-
return {
|
|
78
|
-
label: item.title || startCase(item.name),
|
|
79
|
-
icon: <Icon />,
|
|
80
|
-
onClick: () => {
|
|
81
|
-
setSchemaIndex(i);
|
|
82
|
-
addItem(getSchemaDefaultValue((schema.of as VevProps[])[i]));
|
|
83
|
-
},
|
|
84
|
-
};
|
|
85
|
-
})}
|
|
156
|
+
items={(schema.of as VevProps[]).map((item, i) => ({
|
|
157
|
+
label: item.title || startCase(item.name),
|
|
158
|
+
onClick: () => {
|
|
159
|
+
setSchemaIndex(i);
|
|
160
|
+
addItem(getSchemaDefaultValue((schema.of as VevProps[])[i]));
|
|
161
|
+
},
|
|
162
|
+
}))}
|
|
86
163
|
/>
|
|
87
164
|
) : (
|
|
88
165
|
<SilkeButton
|
|
89
166
|
icon="add"
|
|
90
167
|
kind="ghost"
|
|
91
|
-
size="
|
|
92
|
-
onClick={
|
|
93
|
-
const defaultValue =
|
|
94
|
-
Array.isArray(schema.of)
|
|
95
|
-
? getSchemaDefaultValue(schema.of[0])
|
|
96
|
-
: schema.of === 'object' && 'fields' in schema
|
|
97
|
-
? getSchemaDefaultValue(schema.fields)
|
|
98
|
-
: schema.of === 'number'
|
|
99
|
-
? 0
|
|
100
|
-
: '';
|
|
101
|
-
addItem(defaultValue);
|
|
102
|
-
}}
|
|
168
|
+
size="s"
|
|
169
|
+
onClick={handleAddDefault}
|
|
103
170
|
/>
|
|
104
171
|
)}
|
|
105
172
|
</SilkeBox>
|
|
106
173
|
</SilkeBox>
|
|
107
174
|
{schema.description && <SilkeText color="neutral-80">{schema.description}</SilkeText>}
|
|
108
|
-
{selected !== undefined &&
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
Array.isArray(schema.of)
|
|
175
|
+
{selected !== undefined && (
|
|
176
|
+
<ArrayFieldModal
|
|
177
|
+
anchor={headerRef}
|
|
178
|
+
value={value}
|
|
179
|
+
selected={selected}
|
|
180
|
+
disabled={disabled || readonly}
|
|
181
|
+
onChange={onChange}
|
|
182
|
+
onDelete={handleDeleteItem}
|
|
183
|
+
schema={
|
|
184
|
+
isSingleFieldOf(schema.of)
|
|
185
|
+
? schema.of.type
|
|
186
|
+
: Array.isArray(schema.of)
|
|
121
187
|
? schema.of[schemaIndex]
|
|
122
188
|
: schema.of === 'object'
|
|
123
189
|
? schema.fields
|
|
124
190
|
: schema.of
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
<ArrayFieldInline
|
|
130
|
-
value={value}
|
|
131
|
-
selected={selected}
|
|
132
|
-
disabled={disabled || readonly}
|
|
133
|
-
onChange={onChange}
|
|
134
|
-
onDelete={handleDeleteItem}
|
|
135
|
-
schema={Array.isArray(schema.of) ? schema.of[schemaIndex] : schema.of}
|
|
136
|
-
onClose={() => setSelected(undefined)}
|
|
137
|
-
/>
|
|
138
|
-
))}
|
|
191
|
+
}
|
|
192
|
+
onClose={() => setSelected(undefined)}
|
|
193
|
+
/>
|
|
194
|
+
)}
|
|
139
195
|
{!value.length && (
|
|
140
|
-
|
|
141
|
-
<
|
|
142
|
-
|
|
143
|
-
</SilkeBox>
|
|
144
|
-
</>
|
|
196
|
+
<SilkeBox>
|
|
197
|
+
<SilkeText color="neutral-40">No data</SilkeText>
|
|
198
|
+
</SilkeBox>
|
|
145
199
|
)}
|
|
146
|
-
|
|
147
|
-
<
|
|
148
|
-
items={
|
|
149
|
-
|
|
200
|
+
{value.length > 0 && (
|
|
201
|
+
<SilkeList
|
|
202
|
+
items={listItems}
|
|
203
|
+
size="s"
|
|
204
|
+
sortable
|
|
150
205
|
disabled={disabled || readonly}
|
|
151
|
-
onSort={
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
: schema.of;
|
|
158
|
-
const imageUrl = generateImage(item, fieldSchema);
|
|
159
|
-
|
|
160
|
-
return (
|
|
161
|
-
<SilkeBox
|
|
162
|
-
flex
|
|
163
|
-
column
|
|
164
|
-
ref={(el: HTMLDivElement) => (listRefs.current[i] = el)}
|
|
165
|
-
className={styles.arrayItem}
|
|
166
|
-
vPad="xs"
|
|
167
|
-
>
|
|
168
|
-
<SilkeBox vAlign="center" vPad="xxs">
|
|
169
|
-
<SilkeBox
|
|
170
|
-
flex
|
|
171
|
-
style={{ cursor: 'pointer' }}
|
|
172
|
-
onClick={() => {
|
|
173
|
-
if (Array.isArray(schema.of)) {
|
|
174
|
-
const schemaValues = schema.of.map((item) => item.name);
|
|
175
|
-
setSchemaIndex(schemaValues.indexOf(schemaType) || 0);
|
|
176
|
-
}
|
|
177
|
-
setSelected(i);
|
|
178
|
-
}}
|
|
179
|
-
>
|
|
180
|
-
{imageUrl &&
|
|
181
|
-
(isString(imageUrl) ? (
|
|
182
|
-
<img src={imageUrl} className={styles.image} />
|
|
183
|
-
) : (
|
|
184
|
-
<div className={styles.image}>{imageUrl}</div>
|
|
185
|
-
))}
|
|
186
|
-
<SilkeBox flex vAlign="center">
|
|
187
|
-
<SilkeTextSmall>
|
|
188
|
-
{typeof item === 'string' ? item : generateTitle(item, fieldSchema)}
|
|
189
|
-
</SilkeTextSmall>
|
|
190
|
-
</SilkeBox>
|
|
191
|
-
</SilkeBox>
|
|
192
|
-
<SilkeBox className={styles.arrayItemButtons}>
|
|
193
|
-
<SilkeIcon icon="drag" data-drag-handle />
|
|
194
|
-
</SilkeBox>
|
|
195
|
-
</SilkeBox>
|
|
196
|
-
</SilkeBox>
|
|
197
|
-
);
|
|
206
|
+
onSort={(sorted) => {
|
|
207
|
+
const reordered = (sorted as SilkeListItemData[]).map((item) => {
|
|
208
|
+
const idx = listItems.indexOf(item);
|
|
209
|
+
return value[idx];
|
|
210
|
+
});
|
|
211
|
+
onChange(reordered);
|
|
198
212
|
}}
|
|
199
|
-
|
|
200
|
-
|
|
213
|
+
/>
|
|
214
|
+
)}
|
|
201
215
|
</SilkeBox>
|
|
202
216
|
);
|
|
203
217
|
};
|