@saas-ui/forms 0.6.0-next.0 → 0.6.0

package/src/fields.tsx

@@ -1,12 +1,12 @@
 import * as React from 'react'
 
+import { Form } from './form'
 import { FormLayout } from './layout'
 import { Field, FieldProps } from './field'
 
 import { ArrayField } from './array-field'
 import { ObjectField } from './object-field'
 import { FieldResolver } from './field-resolver'
-import { defaultFieldResolver } from './field-resolver'
 
 export interface FieldsProps {
   schema: any
@@ -29,7 +29,7 @@ export const Fields: React.FC<FieldsProps> = ({
   ...props
 }) => {
   const resolver = React.useMemo(
-    () => fieldResolver || defaultFieldResolver(schema),
+    () => fieldResolver || Form.getFieldResolver(schema),
     [schema, fieldResolver]
   )
 

package/src/form.tsx

@@ -10,7 +10,11 @@ import {
   FieldValues,
   SubmitHandler,
   SubmitErrorHandler,
+  UnpackNestedValue,
+  ResolverOptions,
+  ResolverResult,
 } from 'react-hook-form'
+import { objectFieldResolver, FieldResolver } from './field-resolver'
 
 export type { UseFormReturn, FieldValues, SubmitHandler }
 
@@ -77,6 +81,10 @@ export const Form = forwardRef(
       delayError,
     }
 
+    if (schema && !resolver) {
+      form.resolver = Form.getResolver?.(schema)
+    }
+
     const methods = useForm<TFieldValues>(form)
     const { handleSubmit } = methods
 
@@ -95,8 +103,23 @@ export const Form = forwardRef(
       </FormProvider>
     )
   }
-) as <TFieldValues extends FieldValues>(
+) as (<TFieldValues extends FieldValues>(
   props: FormProps<TFieldValues> & {
     ref?: React.ForwardedRef<UseFormReturn<TFieldValues>>
   }
-) => React.ReactElement
+) => React.ReactElement) & {
+  getResolver?: GetResolver
+  getFieldResolver: GetFieldResolver
+}
+
+Form.getFieldResolver = objectFieldResolver
+
+export type GetResolver = (
+  schema: any
+) => <TFieldValues extends FieldValues, TContext>(
+  values: UnpackNestedValue<TFieldValues>,
+  context: TContext | undefined,
+  options: ResolverOptions<TFieldValues>
+) => Promise<ResolverResult<TFieldValues>>
+
+export type GetFieldResolver = (schema: any) => FieldResolver

package/yup/package.json

@@ -3,10 +3,17 @@
   "description": "Saas UI Forms field resolver: yup",
   "version": "1.0.0",
   "private": true,
-  "source": "src/index.ts",
-  "main": "./dist/index.js",
-  "module": "./dist/index.modern.js",
-  "types": "./dist/index.d.ts",
+  "source": "./src/index.ts",
+  "exports": {
+    ".": {
+      "require": "./../dist/yup/index.js",
+      "types": "./../dist/yup/src/index.d.ts",
+      "default": "./../dist/yup/index.modern.js"
+    }
+  },
+  "main": "../dist/yup/index.js",
+  "module": "../dist/yup/index.modern.js",
+  "types": "../dist/yup/src/index.d.ts",
   "author": "Eelco Wiersma <eelco@appulse.nl>",
   "license": "MIT",
   "peerDependencies": {