Merge pull request #1024 from joshacheson/master

Fix setInitial form state shape malformation (#1006)

Author: davidkpiano

src/reducers/form-actions-reducer.js

@@ -37,19 +37,19 @@ const resetFieldState = (field, customInitialFieldState) => {
   );
 };
 
-const setInitialFieldState = (customInitialFieldState) => (field, key) => {
+const setInitialFieldState = (customInitialFieldState) => field => {
   if (!isPlainObject(field)) return field;
 
-  if (key === '$form') {
-    return updateFieldState(customInitialFieldState, {
-      value: field.value,
-      model: field.model,
-    });
-  }
-
   if (field.$form) {
-    return mapValues(field, (fieldState) =>
-      resetFieldState(fieldState, customInitialFieldState));
+    // eslint-disable-next-line arrow-body-style
+    return mapValues(field, (fieldState, key) => {
+      return key === '$form'
+        ? updateFieldState(customInitialFieldState, {
+          value: field.value,
+          model: field.model,
+        })
+        : resetFieldState(fieldState, customInitialFieldState);
+    });
   }
 
   return updateFieldState(customInitialFieldState, {

test/field-actions-spec.js

@@ -1107,6 +1107,14 @@ Object.keys(testContexts).forEach((testKey) => {
             value: 'changed',
           });
       });
+
+      it('should maintain the expected state shape in sub forms', () => {
+        const reducer = formReducer('test', { somePrimitive: 1, someArray: [] });
+
+        const changedState = reducer(undefined, actions.setInitial('test'));
+
+        assert.isUndefined(changedState.someArray.$form.$form);
+      });
     });
 
     describe('resetValidity() and resetErrors()', () => {