fix(useFieldArray): nested field array not working

wellyshen · Jul 27, 2021 · 7d46221 · 7d46221
1 parent e3eb173
commit 7d46221
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/.changeset/six-cherries-boil.md b/.changeset/six-cherries-boil.md
@@ -0,0 +1,5 @@
+---
+"react-cool-form": patch
+---
+
+fix(useFieldArray): nested field array not working
diff --git a/src/useFieldArray.ts b/src/useFieldArray.ts
@@ -66,11 +66,13 @@ export default <T = any, V extends FormValues = FormValues>(
   const [fields, setFields] = useState<string[]>(getFields(true));
 
   const updateFields = useCallback(() => {
-    setFields(getFields());
-    setNodesOrValues(getState("values"), {
-      shouldSetValues: false,
-      fields: Object.keys(fieldArrayRef.current[name].fields),
-    });
+    if (fieldArrayRef.current[name]) {
+      setFields(getFields());
+      setNodesOrValues(getState("values"), {
+        shouldSetValues: false,
+        fields: Object.keys(fieldArrayRef.current[name].fields),
+      });
+    }
   }, [fieldArrayRef, getFields, getState, name, setNodesOrValues]);
 
   useEffect(() => {
@@ -106,8 +108,8 @@ export default <T = any, V extends FormValues = FormValues>(
       let state = getState();
 
       (["values", "touched", "errors", "dirty"] as Keys[]).forEach((key) => {
-        const value = state[key][name];
-        const fieldsLength = state.values[name]?.length;
+        const value = get(state[key], name);
+        const fieldsLength = get(state.values, name)?.length;
 
         if (
           key === "values" ||
@@ -117,15 +119,12 @@ export default <T = any, V extends FormValues = FormValues>(
         )
           state = set(
             state,
-            key,
-            {
-              ...state[key],
-              [name]: handler(
-                Array.isArray(value) ? [...value] : [],
-                key,
-                fieldsLength ? fieldsLength - 1 : 0
-              ),
-            },
+            `${key}.${name}`,
+            handler(
+              Array.isArray(value) ? [...value] : [],
+              key,
+              fieldsLength ? fieldsLength - 1 : 0
+            ),
             true
           );
       });