Merge branch 'master' of github.com:davidkpiano/react-redux-form

Author: davidkpiano

docs/api/Control.md

@@ -369,7 +369,7 @@ _(Boolean)_: Signifies that the field state (validation, etc.) should not persis
 ## `getValue={(event, props) => ...}` {#prop-getValue}
 _(Function)_: Determines the value given the `event` (from `onChange`) and optionally the control component's `props`.
 
-By default, the `getValue` function returns the value by hecking if the `event` is a DOM event.
+By default, the `getValue` function returns the value by checking if the `event` is a DOM event.
 - If so, it returns `event.target.value`
 - If not, it returns the `event`.
 

src/reducers/form-actions-reducer.js

@@ -265,6 +265,13 @@ export function createFormActionsReducer(options) {
           retouched: false,
         };
 
+        subFieldUpdates = {
+          pending: action.pending,
+          submitted: false,
+          submitFailed: false,
+          retouched: false,
+        };
+
         parentFormUpdates = { pending: action.pending };
 
         break;
@@ -361,9 +368,11 @@ export function createFormActionsReducer(options) {
           // If the form is invalid (due to async validity)
           // but its fields are valid and the value has changed,
           // the form should be "valid" again.
-          if ((!parentForm.$form.validity
-              || !parentForm.$form.validity
-              || !Object.keys(parentForm.$form.validity).length)
+          const validityIsBool = typeof parentForm.$form.validity === 'boolean';
+          const isInvalid = validityIsBool
+            ? !parentForm.$form.validity
+            : !Object.keys(parentForm.$form.validity).length;
+          if (isInvalid
             && !parentForm.$form.valid
             && isValid(parentForm, { async: false })) {
             return {

test/form-reducer-actions-spec.js

@@ -255,6 +255,9 @@ describe('formReducer() (V1)', () => {
             ...initialFieldState,
             retouched: true,
           },
+          name: {
+            ...initialFieldState,
+          },
         },
         expectedForm: {
           pending: true,
@@ -265,6 +268,12 @@ describe('formReducer() (V1)', () => {
           submitFailed: false,
           retouched: false,
         },
+        expectedSubField: {
+          pending: true,
+          submitted: false,
+          submitFailed: false,
+          retouched: false,
+        },
       },
     ],
     [actionTypes.SET_VALIDITY]: [