@campxdev/shared 1.7.2 → 1.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/Form/Form.tsx

@@ -17,9 +17,9 @@ interface FormProps extends Omit<RenderFormProps, 'control'> {
   previousData?: any
   onCancel?: () => void
   postFunction: (body: any) => Promise<AxiosResponse>
-  onPostSuccess: (response: any) => void
-  onPostError: (error: any) => void
-  onFormError: (error: any) => void
+  onPostSuccess?: (response: any) => void
+  onPostError?: (error: any) => void
+  onFormError?: (error: any) => void
 }
 
 export default function Form({
@@ -43,7 +43,11 @@ export default function Form({
   const [error, setError] = useState<any>(null)
   const { control, watch, handleSubmit } = useForm({
     defaultValues: previousData ? previousData : null,
-    resolver: yupResolver(generateYupSchema([fields])),
+    resolver: yupResolver(
+      generateYupSchema({
+        fieldGroups: fields as any,
+      }),
+    ),
   })
 
   const { mutate, isLoading: posting } = useMutation(postFunction, {

package/src/components/Form/RenderForm.tsx

@@ -9,11 +9,12 @@ import {
   FormTextField,
 } from '../HookForm'
 
-export const generateYupSchema = (
-  normalFieldGroups: any[][],
-  fieldArrayGroups?: any[],
-) => {
-  const flatArray = normalFieldGroups.flat()
+export const generateYupSchema = (options: {
+  fieldGroups: any[][]
+  fieldArrayGroups?: any[]
+  extraValidations?: any
+}) => {
+  const flatArray = options.fieldGroups.flat()
 
   const validations = flatArray
     ?.filter(
@@ -28,7 +29,7 @@ export const generateYupSchema = (
       }
     }, {})
 
-  return yup.object().shape(validations)
+  return yup.object().shape({ ...validations, ...options.extraValidations })
 }
 
 type FormTypes =