@vendure/dashboard 3.5.2-master-202512040233 → 3.5.2-master-202512180239

package/src/lib/components/data-input/datetime-input.tsx

@@ -185,7 +185,7 @@ function bcpTagToDatePickerLocale(
         case 'pt-BR':
             return module.ptBR;
         default: {
-            const lang = tag.split('-').at(0);
+            const lang = tag.split('-')[0];
             return lang ? module[lang as keyof typeof module] : undefined;
         }
     }

package/src/lib/components/data-input/number-input.tsx

@@ -3,11 +3,14 @@ import { Input } from '@/vdb/components/ui/input.js';
 
 import { DashboardFormComponentProps } from '@/vdb/framework/form-engine/form-engine-types.js';
 import { isReadonlyField } from '@/vdb/framework/form-engine/utils.js';
+import { ReactNode } from 'react';
 
 export type NumberInputProps = DashboardFormComponentProps & {
     min?: number;
     max?: number;
     step?: number;
+    prefix?: ReactNode;
+    suffix?: ReactNode;
 };
 
 /**
@@ -17,28 +20,43 @@ export type NumberInputProps = DashboardFormComponentProps & {
  * @docsCategory form-components
  * @docsPage NumberInput
  */
-export function NumberInput({ fieldDef, onChange, ...fieldProps }: Readonly<NumberInputProps>) {
+export function NumberInput({
+    fieldDef,
+    onChange,
+    prefix: overridePrefix,
+    suffix: overrideSuffix,
+    ...fieldProps
+}: Readonly<NumberInputProps>) {
     const readOnly = fieldProps.disabled || isReadonlyField(fieldDef);
     const isFloat = fieldDef ? fieldDef.type === 'float' : false;
     const min = fieldProps.min ?? fieldDef?.ui?.min;
     const max = fieldProps.max ?? fieldDef?.ui?.max;
     const step = fieldProps.step ?? (fieldDef?.ui?.step || (isFloat ? 0.01 : 1));
-    const prefix = fieldDef?.ui?.prefix;
-    const suffix = fieldDef?.ui?.suffix;
+    const prefix = overridePrefix ?? fieldDef?.ui?.prefix;
+    const suffix = overrideSuffix ?? fieldDef?.ui?.suffix;
     const shouldUseAffixedInput = prefix || suffix;
+    const value = fieldProps.value ?? '';
     const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         if (readOnly) return;
-        const numValue = e.target.valueAsNumber;
+
+        let numValue = e.target.valueAsNumber;
+
+        if (Number.isNaN(numValue) && e.target.value) {
+            const normalized = e.target.value.replace(',', '.');
+            numValue = Number(normalized);
+        }
+
         if (Number.isNaN(numValue)) {
             onChange(null);
         } else {
-            onChange(e.target.valueAsNumber);
+            onChange(numValue);
         }
     };
     if (shouldUseAffixedInput) {
         return (
             <AffixedInput
                 {...fieldProps}
+                value={value}
                 type="number"
                 onChange={handleChange}
                 min={min}
@@ -57,6 +75,7 @@ export function NumberInput({ fieldDef, onChange, ...fieldProps }: Readonly<Numb
             type="number"
             onChange={handleChange}
             {...fieldProps}
+            value={value}
             min={min}
             max={max}
             step={step}

package/src/lib/components/data-input/relation-selector.tsx

@@ -28,7 +28,7 @@ export interface RelationSelectorConfig<T = any> {
     /** Number of items to load per page */
     pageSize?: number;
     /** Placeholder text for the search input */
-    placeholder?: React.ReactNode;
+    placeholder?: string;
     /** Whether to enable multi-select mode */
     multiple?: boolean;
     /** Custom filter function for search */

package/src/lib/components/data-input/struct-form-input.tsx

@@ -20,7 +20,7 @@ import {
     StructCustomFieldConfig,
     StructField,
 } from '@/vdb/framework/form-engine/form-engine-types.js';
-import { isStructFieldConfig } from '@/vdb/framework/form-engine/utils.js';
+import { isReadonlyField, isStructFieldConfig } from '@/vdb/framework/form-engine/utils.js';
 import { useUserSettings } from '@/vdb/hooks/use-user-settings.js';
 import { CustomFieldListInput } from './custom-field-list-input.js';
 import { DateTimeInput } from './datetime-input.js';
@@ -98,185 +98,61 @@ export function StructFormInput({ fieldDef, ...field }: Readonly<DashboardFormCo
         return input?.find(t => t.languageCode === displayLanguage)?.value;
     };
 
-    const isReadonly = fieldDef?.readonly === true;
-
-    // Helper function to render individual struct field inputs
-    const renderStructFieldInput = (
-        structField: StructField,
-        inputField: ControllerRenderProps<any, any>,
-    ) => {
-        const isList = structField.list ?? false;
-
-        // Helper function to render single input for a struct field
-        const renderSingleStructInput = (singleField: ControllerRenderProps<any, any>) => {
-            switch (structField.type) {
-                case 'string': {
-                    // Check if the field has options (dropdown)
-                    const stringField = structField as any; // GraphQL union types need casting
-                    if (stringField.options && stringField.options.length > 0) {
-                        return (
-                            <SelectWithOptions {...singleField} fieldDef={stringField} isListField={false} />
-                        );
-                    }
-                    return (
-                        <Input
-                            value={singleField.value ?? ''}
-                            onChange={e => singleField.onChange(e.target.value)}
-                            onBlur={singleField.onBlur}
-                            name={singleField.name}
-                            disabled={isReadonly}
-                        />
-                    );
-                }
-                case 'int':
-                case 'float': {
-                    const isFloat = structField.type === 'float';
-                    const numericField = structField as any; // GraphQL union types need casting
-                    const min = isFloat ? numericField.floatMin : numericField.intMin;
-                    const max = isFloat ? numericField.floatMax : numericField.intMax;
-                    const step = isFloat ? numericField.floatStep : numericField.intStep;
-
-                    return (
-                        <Input
-                            type="number"
-                            value={singleField.value ?? ''}
-                            onChange={e => {
-                                const value = e.target.valueAsNumber;
-                                singleField.onChange(isNaN(value) ? undefined : value);
-                            }}
-                            onBlur={singleField.onBlur}
-                            name={singleField.name}
-                            disabled={isReadonly}
-                            min={min}
-                            max={max}
-                            step={step}
-                        />
-                    );
-                }
-                case 'boolean':
-                    return (
-                        <Switch
-                            checked={singleField.value}
-                            onCheckedChange={singleField.onChange}
-                            disabled={isReadonly}
-                        />
-                    );
-                case 'datetime':
-                    return <DateTimeInput {...singleField} />;
-                default:
-                    return (
-                        <Input
-                            value={singleField.value ?? ''}
-                            onChange={e => singleField.onChange(e.target.value)}
-                            onBlur={singleField.onBlur}
-                            name={singleField.name}
-                            disabled={isReadonly}
-                        />
-                    );
-            }
-        };
-
-        // Handle string fields with options (dropdown) - already handles list case with multi-select
-        if (structField.type === 'string') {
-            const stringField = structField as any; // GraphQL union types need casting
-            if (stringField.options && stringField.options.length > 0) {
-                return (
-                    <SelectWithOptions
-                        {...inputField}
-                        fieldDef={stringField}
-                        disabled={isReadonly}
-                        isListField={isList}
-                    />
-                );
-            }
-        }
-
-        // For list struct fields, wrap with list input
-        if (isList) {
-            const getDefaultValue = () => {
-                switch (structField.type) {
-                    case 'string':
-                        return '';
-                    case 'int':
-                    case 'float':
-                        return 0;
-                    case 'boolean':
-                        return false;
-                    case 'datetime':
-                        return '';
-                    default:
-                        return '';
-                }
-            };
-
-            // Determine if the field type needs full width
-            const needsFullWidth = structField.type === 'text' || structField.type === 'localeText';
-
-            return (
-                <CustomFieldListInput
-                    {...inputField}
-                    disabled={isReadonly}
-                    renderInput={(index, listItemField) => renderSingleStructInput(listItemField)}
-                    defaultValue={getDefaultValue()}
-                />
-            );
-        }
-
-        // For non-list fields, render directly
-        return renderSingleStructInput(inputField);
-    };
+    const isReadonly = isReadonlyField(fieldDef);
 
     // Edit mode - memoized to prevent focus loss from re-renders
     const EditMode = useMemo(
-        () => (
-            <div className="space-y-4 border rounded-md p-4">
-                {!isReadonly && (
-                    <div className="flex justify-end">
-                        <Button
-                            variant="ghost"
-                            size="sm"
-                            onClick={() => setIsEditing(false)}
-                            className="h-8 w-8 p-0 text-muted-foreground hover:text-foreground"
-                        >
-                            <CheckIcon className="h-4 w-4" />
-                            <span className="sr-only">Done</span>
-                        </Button>
-                    </div>
-                )}
-                {fieldDef?.fields?.map(structField => (
-                    <FormField
-                        key={structField.name}
-                        control={control}
-                        name={`${field.name}.${structField.name}`}
-                        render={({ field: structInputField }) => (
-                            <FormItem>
-                                <div className="flex items-baseline gap-4">
-                                    <div className="flex-1">
-                                        <FormLabel>
-                                            {getTranslation(structField.label) ?? structField.name}
-                                        </FormLabel>
-                                        {getTranslation(structField.description) && (
-                                            <FormDescription>
-                                                {getTranslation(structField.description)}
-                                            </FormDescription>
-                                        )}
+        () =>
+            fieldDef && isStructFieldConfig(fieldDef) ? (
+                <div className="space-y-4 border rounded-md p-4">
+                    {!isReadonly && (
+                        <div className="flex justify-end">
+                            <Button
+                                variant="ghost"
+                                size="sm"
+                                onClick={() => setIsEditing(false)}
+                                className="h-8 w-8 p-0 text-muted-foreground hover:text-foreground"
+                            >
+                                <CheckIcon className="h-4 w-4" />
+                                <span className="sr-only">Done</span>
+                            </Button>
+                        </div>
+                    )}
+                    {fieldDef?.fields.map(structField => (
+                        <FormField
+                            key={structField.name}
+                            control={control}
+                            name={`${field.name}.${structField.name}`}
+                            render={({ field: structInputField }) => (
+                                <FormItem>
+                                    <div className="flex items-baseline gap-4">
+                                        <div className="flex-1">
+                                            <FormLabel>
+                                                {getTranslation(structField.label) ?? structField.name}
+                                            </FormLabel>
+                                            {getTranslation(structField.description) && (
+                                                <FormDescription>
+                                                    {getTranslation(structField.description)}
+                                                </FormDescription>
+                                            )}
+                                        </div>
+                                        <div className="flex-[2]">
+                                            <FormControl>
+                                                {renderStructFieldInput(structField, structInputField)}
+                                            </FormControl>
+                                            <FormMessage />
+                                        </div>
                                     </div>
-                                    <div className="flex-[2]">
-                                        <FormControl>
-                                            {renderStructFieldInput(structField, structInputField)}
-                                        </FormControl>
-                                        <FormMessage />
-                                    </div>
-                                </div>
-                            </FormItem>
-                        )}
-                    />
-                ))}
-            </div>
-        ),
-        [fieldDef, control, field.name, getTranslation, renderStructFieldInput, isReadonly],
+                                </FormItem>
+                            )}
+                        />
+                    ))}
+                </div>
+            ) : null,
+        [fieldDef, control, field.name, getTranslation, isReadonly],
     );
 
+    // Early return if not a struct field config
     if (!fieldDef || !isStructFieldConfig(fieldDef)) {
         return null;
     }
@@ -317,3 +193,128 @@ export function StructFormInput({ fieldDef, ...field }: Readonly<DashboardFormCo
         />
     );
 }
+
+// Helper function to render individual struct field inputs
+const renderStructFieldInput = (
+    structField: StructField,
+    inputField: ControllerRenderProps<any, any>,
+    isReadonly: boolean = false,
+) => {
+    const isList = structField.list ?? false;
+
+    // Helper function to render single input for a struct field
+    const renderSingleStructInput = (singleField: ControllerRenderProps<any, any>) => {
+        switch (structField.type) {
+            case 'string': {
+                // Check if the field has options (dropdown)
+                const stringField = structField as any; // GraphQL union types need casting
+                if (stringField.options && stringField.options.length > 0) {
+                    return <SelectWithOptions {...singleField} fieldDef={stringField} isListField={false} />;
+                }
+                return (
+                    <Input
+                        value={singleField.value ?? ''}
+                        onChange={e => singleField.onChange(e.target.value)}
+                        onBlur={singleField.onBlur}
+                        name={singleField.name}
+                        disabled={isReadonly}
+                    />
+                );
+            }
+            case 'int':
+            case 'float': {
+                const isFloat = structField.type === 'float';
+                const numericField = structField as any; // GraphQL union types need casting
+                const min = isFloat ? numericField.floatMin : numericField.intMin;
+                const max = isFloat ? numericField.floatMax : numericField.intMax;
+                const step = isFloat ? numericField.floatStep : numericField.intStep;
+
+                return (
+                    <Input
+                        type="number"
+                        value={singleField.value ?? ''}
+                        onChange={e => {
+                            const value = e.target.valueAsNumber;
+                            singleField.onChange(isNaN(value) ? undefined : value);
+                        }}
+                        onBlur={singleField.onBlur}
+                        name={singleField.name}
+                        disabled={isReadonly}
+                        min={min}
+                        max={max}
+                        step={step}
+                    />
+                );
+            }
+            case 'boolean':
+                return (
+                    <Switch
+                        checked={singleField.value}
+                        onCheckedChange={singleField.onChange}
+                        disabled={isReadonly}
+                    />
+                );
+            case 'datetime':
+                return <DateTimeInput {...singleField} />;
+            default:
+                return (
+                    <Input
+                        value={singleField.value ?? ''}
+                        onChange={e => singleField.onChange(e.target.value)}
+                        onBlur={singleField.onBlur}
+                        name={singleField.name}
+                        disabled={isReadonly}
+                    />
+                );
+        }
+    };
+
+    // Handle string fields with options (dropdown) - already handles list case with multi-select
+    if (structField.type === 'string') {
+        const stringField = structField as any; // GraphQL union types need casting
+        if (stringField.options && stringField.options.length > 0) {
+            return (
+                <SelectWithOptions
+                    {...inputField}
+                    fieldDef={stringField}
+                    disabled={isReadonly}
+                    isListField={isList}
+                />
+            );
+        }
+    }
+
+    // For list struct fields, wrap with list input
+    if (isList) {
+        const getDefaultValue = () => {
+            switch (structField.type) {
+                case 'string':
+                    return '';
+                case 'int':
+                case 'float':
+                    return 0;
+                case 'boolean':
+                    return false;
+                case 'datetime':
+                    return '';
+                default:
+                    return '';
+            }
+        };
+
+        // Determine if the field type needs full width
+        const needsFullWidth = structField.type === 'text' || structField.type === 'localeText';
+
+        return (
+            <CustomFieldListInput
+                {...inputField}
+                disabled={isReadonly}
+                renderInput={(index, listItemField) => renderSingleStructInput(listItemField)}
+                defaultValue={getDefaultValue()}
+            />
+        );
+    }
+
+    // For non-list fields, render directly
+    return renderSingleStructInput(inputField);
+};