From bc79643b52a6b9cb010bd99dbeeec78702d1f5b7 Mon Sep 17 00:00:00 2001
From: hpierre74 <pierrehuyghe.pro@gmail.com>
Date: Tue, 11 Jan 2022 12:52:59 +0100
Subject: [PATCH 1/2] fix(libs/form-builder): use the right field rules

---
 libs/form-builder/src/lib/formBuilder.tsx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/libs/form-builder/src/lib/formBuilder.tsx b/libs/form-builder/src/lib/formBuilder.tsx
index 94892d8..6528d73 100644
--- a/libs/form-builder/src/lib/formBuilder.tsx
+++ b/libs/form-builder/src/lib/formBuilder.tsx
@@ -13,7 +13,7 @@ import { DevTool } from '@hookform/devtools';
 
 import _ from 'lodash';
 
-import { Dictionary, ExtraValidation, FormSchema } from './types';
+import { Dictionary, ExtraValidation, FormSchema, Validations } from './types';
 import { useAutoFocus } from './hooks/useAutoFocus.hook';
 import { useIsFormStepValid } from './hooks/useIsFormStepValid';
 
@@ -23,7 +23,7 @@ import { handleFormBuilderError } from './utils/handleFormBuilderError.util';
 import { Stepper } from './components/stepper.component';
 import { FormField } from './components/formField.component';
 import { SubmitField } from './components/submitField.component';
-import { getFieldRules } from './utils/validation.utils';
+import { getFieldRules, FieldRules } from './utils/validation.utils';
 import { PreviousStepField } from './components/previousStepField.component';
 
 const EMPTY_OBJECT = {} as const;
@@ -94,7 +94,7 @@ export function FormBuilder({
             [fieldId]: getFieldRules({ validation, extraValidation })
           };
         },
-        {}
+        {} as { [key: string]: FieldRules }
       ),
     [extraValidation, fields, fieldsById]
   );
@@ -143,18 +143,13 @@ export function FormBuilder({
                 const { type, id, defaultValue, meta, validation } =
                   fields[fieldId];
 
-                const validationRules = getFieldRules({
-                  validation,
-                  extraValidation
-                });
-
                 return (
                   <Controller
                     key={id}
                     name={id}
                     control={control}
                     defaultValue={defaultValue}
-                    rules={validationRules}
+                    rules={validationRulesById[fieldId]}
                     render={({ field }) => (
                       <FormField
                         id={id}

From bb69d073d0331cfb23f45495d38cdf9be6b5f972 Mon Sep 17 00:00:00 2001
From: hpierre74 <pierrehuyghe.pro@gmail.com>
Date: Tue, 11 Jan 2022 12:58:24 +0100
Subject: [PATCH 2/2] refactor: remove unused var

---
 libs/form-builder/src/lib/formBuilder.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/form-builder/src/lib/formBuilder.tsx b/libs/form-builder/src/lib/formBuilder.tsx
index 6528d73..5d5110e 100644
--- a/libs/form-builder/src/lib/formBuilder.tsx
+++ b/libs/form-builder/src/lib/formBuilder.tsx
@@ -13,7 +13,7 @@ import { DevTool } from '@hookform/devtools';
 
 import _ from 'lodash';
 
-import { Dictionary, ExtraValidation, FormSchema, Validations } from './types';
+import { Dictionary, ExtraValidation, FormSchema } from './types';
 import { useAutoFocus } from './hooks/useAutoFocus.hook';
 import { useIsFormStepValid } from './hooks/useIsFormStepValid';
 
@@ -61,7 +61,6 @@ export function FormBuilder({
     getValues,
     setValue,
     trigger,
-    watch,
     setFocus
   } = useForm<FieldValues>({
     mode: behavior,