diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index cf2355f82..209cb3038 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -61,7 +61,6 @@ export type Flag = export interface FormController { register(field: any): void; values: ComputedRef>; - names: ComputedRef>; fields: ComputedRef>; schema?: Record>; } diff --git a/packages/core/src/useField.ts b/packages/core/src/useField.ts index 53b8817f6..a92ad9bc2 100644 --- a/packages/core/src/useField.ts +++ b/packages/core/src/useField.ts @@ -37,7 +37,6 @@ export function useField(fieldName: MaybeReactive, rules: RuleExpression const result = await validate(value.value, normalizedRules.value, { name: unwrap(fieldName), values: form?.values.value ?? {}, - names: form?.names.value ?? {}, bails, }); diff --git a/packages/core/src/useForm.ts b/packages/core/src/useForm.ts index eb51f5141..9fc52a2d2 100644 --- a/packages/core/src/useForm.ts +++ b/packages/core/src/useForm.ts @@ -8,6 +8,8 @@ interface FormOptions { initialValues?: Record; } +type FieldComposite = ReturnType; + export function useForm(opts?: FormOptions) { const fields: Ref = ref([]); const isSubmitting = ref(false); @@ -24,23 +26,15 @@ export function useForm(opts?: FormOptions) { }); const values = computed(() => { - return activeFields.value.reduce((acc: any, field: any) => { + return activeFields.value.reduce((acc: any, field) => { acc[field.name] = field.value; return acc; }, {}); }); - const names = computed(() => { - return fields.value.reduce((acc: any, field: any) => { - acc[field.name] = field.name; - - return acc; - }, {}); - }); - const controller: FormController = { - register(field: ReturnType) { + register(field: FieldComposite) { const name = unwrap(field.name); // Set the initial value for that field if (opts?.initialValues?.[name]) { @@ -51,7 +45,6 @@ export function useForm(opts?: FormOptions) { }, fields: fieldsById, values, - names, schema: opts?.validationSchema, }; @@ -66,7 +59,7 @@ export function useForm(opts?: FormOptions) { }; const errors = computed(() => { - return activeFields.value.reduce((acc: Record, field) => { + return activeFields.value.reduce((acc: Record, field) => { acc[field.name] = field.errorMessage; return acc; diff --git a/packages/core/src/validate.ts b/packages/core/src/validate.ts index 0bdcf1537..0e04c6506 100644 --- a/packages/core/src/validate.ts +++ b/packages/core/src/validate.ts @@ -14,13 +14,11 @@ interface FieldValidationContext { skipIfEmpty: boolean; forceRequired: boolean; crossTable: Record; - names: Record; } interface ValidationOptions { name?: string; values?: Record; - names?: Record; bails?: boolean; skipIfEmpty?: boolean; isInitial?: boolean; @@ -43,7 +41,6 @@ export async function validate( skipIfEmpty: skipIfEmpty ?? true, forceRequired: false, crossTable: options?.values || {}, - names: options?.names || {}, }; const result = await _validate(field, value);