Fixing actions.reset behavior for dynamically added fields. Fixes #798, fixes #791

Author: davidkpiano

src/utils/create-field.js

@@ -40,11 +40,11 @@ export function updateFieldState(existingFieldState, updatedFieldState) {
 
 export default function createFieldState(model, value, customInitialFieldState) {
   return {
+    initialValue: value,
     ...initialFieldState,
     ...customInitialFieldState,
     model,
     value,
-    initialValue: value,
   };
 }
 

test/form-reducer-spec.js

@@ -291,4 +291,25 @@ describe('formReducer()', () => {
       assert.equal(touchedState.bar.initialValue, 'initial');
     });
   });
+
+  describe('form reset after dynamically adding fields', () => {
+    const initialState = { filters: {} };
+    const reducer = formReducer('test', initialState);
+    const firstState = reducer(undefined, { type: 'any' });
+    const addedState = reducer(firstState, actions.change('test.filters.one', true));
+
+    it('form initial value should not change when adding fields', () => {
+      assert.deepEqual(addedState.filters.$form.initialValue, {});
+      assert.deepEqual(addedState.filters.$form.value, { one: true });
+      assert.isDefined(addedState.filters.one);
+    });
+
+    it('form should reset completely to its initial value', () => {
+      const resetState = reducer(addedState, actions.reset('test.filters'));
+
+      assert.deepEqual(resetState.filters.$form.initialValue, {});
+      assert.deepEqual(resetState.filters.$form.value, {});
+      assert.isUndefined(resetState.filters.one);
+    });
+  });
 });