fix: provide yup object schema type to the useForm closes #2988

logaretm · Oct 18, 2020 · 29157f7 · 29157f7
1 parent 4d558d9
commit 29157f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -1,4 +1,5 @@
 import { ComputedRef, Ref } from 'vue';
+import { ObjectSchema } from 'yup';
 
 export interface ValidationResult {
   errors: string[];
@@ -34,7 +35,7 @@ export interface FormController {
   unregister(field: any): void;
   values: Record<string, any>;
   fields: ComputedRef<Record<string, any>>;
-  schema?: Record<string, GenericValidateFunction | string | Record<string, any>>;
+  schema?: Record<string, GenericValidateFunction | string | Record<string, any>> | ObjectSchema;
   validateSchema?: (shouldMutate?: boolean) => Promise<Record<string, ValidationResult>>;
   setFieldValue: (path: string, value: any) => void;
   setFieldError: (field: string, message: string) => void;

diff --git a/packages/core/src/useForm.ts b/packages/core/src/useForm.ts
@@ -1,5 +1,5 @@
 import { computed, ref, Ref, provide, reactive, onMounted, isRef, watch, ComputedRef } from 'vue';
-import type { ValidationError } from 'yup';
+import type { ObjectSchema, ValidationError } from 'yup';
 import type { useField } from './useField';
 import {
   FieldMeta,
@@ -15,7 +15,7 @@ import { getFromPath, isYupValidator, keysOf, setInPath, unsetPath } from './uti
 import { FormErrorsSymbol, FormInitialValues, FormSymbol } from './symbols';
 
 interface FormOptions {
-  validationSchema?: Record<string, GenericValidateFunction | string | Record<string, any>>;
+  validationSchema?: Record<string, GenericValidateFunction | string | Record<string, any>> | ObjectSchema;
   initialValues?: MaybeReactive<Record<string, any>>;
   validateOnMount?: boolean;
 }