Merge pull request #584 from dave-clover/resetValidity-on-unmount

tweaks to resetValidity

Author: davidkpiano

src/components/control-component.js

@@ -183,7 +183,7 @@ function createControlClass(customControlPropsMap = {}, s = defaultStrategy) {
         const keys = Object.keys(validators)
           .concat(Object.keys(errors), this.willValidate ? validityKeys : []);
 
-        dispatch(actions.setValidity(model, omit(fieldValue.validity, keys)));
+        dispatch(actions.resetValidity(model, keys));
       }
     }
 

src/reducers/form-actions-reducer.js

@@ -196,19 +196,22 @@ export default function formActionsReducer(state, action, localPath) {
     case actionTypes.RESET_VALIDITY: {
       let validity = { ...fieldState.validity };
       let errors = { ...fieldState.errors };
+      let valid;
 
       if (action.omitKeys) {
         action.omitKeys.forEach((key) => {
           delete validity[key];
           delete errors[key];
         });
+        valid = isValidityValid(validity);
       } else {
         validity = initialFieldState.validity;
         errors = initialFieldState.errors;
+        valid = initialFieldState.valid;
       }
 
       fieldUpdates = {
-        valid: initialFieldState.valid,
+        valid,
         validity,
         errors,
       };

test/control-component-spec.js

@@ -1632,6 +1632,42 @@ Object.keys(testContexts).forEach((testKey) => {
 
         assert.isTrue(store.getState().testForm.foo.valid);
       });
+
+      it('should not clobber other non-field-specific validators', () => {
+        const initialState = getInitialState({});
+        const store = testCreateStore({
+          test: modelReducer('test', initialState),
+          testForm: formReducer('test', initialState),
+        });
+
+        store.dispatch(actions.setValidity('test.foo', {
+          validator: false,
+        }));
+
+        const container = document.createElement('div');
+
+        class WrappedControl extends React.Component {
+          componentWillUnmount() {
+            store.dispatch(actions.setErrors('test.foo', {}));
+          }
+
+          render() {
+            return <Control.input model="test.foo" />;
+          }
+        }
+
+        ReactDOM.render(
+          <Provider store={store}>
+            <WrappedControl />
+          </Provider>,
+          container);
+
+        assert.isFalse(store.getState().testForm.foo.validity.validator);
+
+        ReactDOM.unmountComponentAtNode(container);
+
+        assert.isUndefined(store.getState().testForm.foo.validity.validator);
+      });
     });
 
     describe('with <Control.reset>', () => {

test/field-component-spec.js

@@ -1995,6 +1995,42 @@ Object.keys(testContexts).forEach((testKey) => {
 
         assert.isTrue(store.getState().testForm.foo.valid);
       });
+
+      it('should not clobber other non-field-specific validators', () => {
+        const initialState = {};
+        const store = testCreateStore({
+          test: modelReducer('test', initialState),
+          testForm: formReducer('test', initialState),
+        });
+
+        store.dispatch(actions.setValidity('test.foo', {
+          validator: false,
+        }));
+
+        const container = document.createElement('div');
+
+        class WrappedControl extends React.Component {
+          componentWillUnmount() {
+            store.dispatch(actions.setErrors('test.foo', {}));
+          }
+
+          render() {
+            return <Field model="test.foo" />;
+          }
+        }
+
+        ReactDOM.render(
+          <Provider store={store}>
+            <WrappedControl />
+          </Provider>,
+          container);
+
+        assert.isFalse(store.getState().testForm.foo.validity.validator);
+
+        ReactDOM.unmountComponentAtNode(container);
+
+        assert.isUndefined(store.getState().testForm.foo.validity.validator);
+      });
     });
 
     describe('with input type="reset"', () => {