Fix invalid state of form and refactor code

fabian-hiller · Nov 2, 2022 · c1a55d1 · c1a55d1
1 parent 13b5767
commit c1a55d1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/packages/solid/CHANGELOG.md b/packages/solid/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to the library will be documented in this file.
 - Add `clearResponse`, `hasField` and `hasFieldArray` method
 - Improve and refactor `getValues`, `reset` and `validate` method
 - Add missing export of `setError` and `setValue` method
+- Fix invalid state of form (field arrays were not considered before)
 
 ## v0.3.0 (October 30, 2022)
 

diff --git a/packages/solid/src/methods/setError.ts b/packages/solid/src/methods/setError.ts
@@ -46,8 +46,9 @@ export function setError<
       // Update invalid state of form
       form.internal.setInvalid(
         !!error ||
-          [...form.internal.fields].some(
-            ([_, field]) => field.getActive() && field.getError()
+          [...form.internal.fields, ...form.internal.fieldArrays].some(
+            ([, fieldOrFieldArray]) =>
+              fieldOrFieldArray.getActive() && fieldOrFieldArray.getError()
           )
       );
     });

diff --git a/packages/solid/src/methods/validate.ts b/packages/solid/src/methods/validate.ts
@@ -124,8 +124,9 @@ export async function validate<
 
       // Update invalid state of form
       form.internal.setInvalid(
-        [...form.internal.fields].some(
-          ([_, field]) => field.getActive() && field.getError()
+        [...form.internal.fields, ...form.internal.fieldArrays].some(
+          ([, fieldOrFieldArray]) =>
+            fieldOrFieldArray.getActive() && fieldOrFieldArray.getError()
         )
       );
 

diff --git a/packages/solid/src/utils/updateDirty.ts b/packages/solid/src/utils/updateDirty.ts
@@ -17,7 +17,7 @@ export function updateDirty<TFieldValues extends FieldValues>(
     form.internal.setDirty(
       dirty ||
         [...form.internal.fields, ...form.internal.fieldArrays].some(
-          ([_, field]) => field.getActive() && field.getDirty()
+          ([, field]) => field.getActive() && field.getDirty()
         )
     );
   });

diff --git a/packages/solid/src/utils/updateState.ts b/packages/solid/src/utils/updateState.ts
@@ -17,18 +17,18 @@ export function updateState<TFieldValues extends FieldValues>(
   // Ignores tracking of reactive dependencies
   untrack(() => {
     // Check each field and field array and update state if necessary
-    for (const [_, field] of [
+    for (const [, fieldOrFieldArray] of [
       ...form.internal.fields,
       ...form.internal.fieldArrays,
     ]) {
-      if (field.getActive()) {
-        if (field.getTouched()) {
+      if (fieldOrFieldArray.getActive()) {
+        if (fieldOrFieldArray.getTouched()) {
           touched = true;
         }
-        if (field.getDirty()) {
+        if (fieldOrFieldArray.getDirty()) {
           dirty = true;
         }
-        if (field.getError()) {
+        if (fieldOrFieldArray.getError()) {
           invalid = true;
         }
       }