Adding .retouched prop to field + unit tests

Author: davidkpiano

src/reducers/form-reducer.js

@@ -204,11 +204,12 @@ function _createFormReducer(model, initialState) {
       case actionTypes.BLUR:
       case actionTypes.SET_TOUCHED: {
         const fieldState = setField(state, localPath, {
+          focus: false,
+          touched: true,
+          retouched: state.submitted || state.submitFailed,
           get blur() {
             return deprecateProp('blur', true);
           },
-          focus: false,
-          touched: true,
           get untouched() {
             return deprecateProp('untouched', false);
           },
@@ -227,6 +228,7 @@ function _createFormReducer(model, initialState) {
           pending: action.pending,
           submitted: false,
           submitFailed: false,
+          retouched: false,
         });
 
       case actionTypes.SET_VALIDITY: {

test/field-actions-spec.js

@@ -391,10 +391,75 @@ describe('field actions', () => {
         {
           touched: true,
           untouched: false,
+          retouched: false,
           focus: false,
           blur: true,
         });
     });
+
+    it('should set the retouched property to true upon touch after submit', () => {
+      const reducer = formReducer('test');
+      const state = reducer(undefined, actions.setSubmitted('test'));
+
+      assert.containSubset(
+        state,
+        {
+          submitted: true,
+          retouched: false,
+        }, 'not retouched yet');
+
+      assert.containSubset(
+        reducer(state, actions.setTouched('test')),
+        {
+          submitted: true,
+          retouched: true,
+        }, 'retouched after submit');
+    });
+
+    it('should set the retouched property to true upon touch after submit failed', () => {
+      const reducer = formReducer('test');
+      const state = reducer(undefined, actions.setSubmitFailed('test'));
+
+      assert.containSubset(
+        state,
+        {
+          submitted: false,
+          submitFailed: true,
+          retouched: false,
+        }, 'not retouched yet');
+
+      assert.containSubset(
+        reducer(state, actions.setTouched('test')),
+        {
+          submitted: false,
+          submitFailed: true,
+          retouched: true,
+        }, 'retouched after submit failed');
+    });
+
+    it('should set the retouched property to false when pending', () => {
+      const reducer = formReducer('test');
+      let state = reducer(undefined, actions.setSubmitted('test'));
+
+      state = reducer(state, actions.setTouched('test'));
+
+      assert.containSubset(
+        state,
+        {
+          submitted: true,
+          retouched: true,
+        }, 'retouched after submit and before pending');
+
+      state = reducer(state, actions.setPending('test'));
+
+      assert.containSubset(
+        state,
+        {
+          pending: true,
+          submitted: false,
+          retouched: false,
+        }, 'not retouched while pending');
+    });
   });
 
   describe('setUntouched()', () => {