(WIP) deprecating use of redux-thunk internally

Author: davidkpiano

src/actions/model-actions.js

@@ -85,9 +85,7 @@ export function createModelActions(s = defaultStrategies) {
 
   const toggle = createModifierAction((value) => !value, undefined, 1);
 
-  const check = (model, value) => (dispatch, getState) => {
-    const modelValue = s.get(getState(), model);
-
+  const checkWithValue = (model, value, modelValue) => {
     if (isMulti(model)) {
       const valueWithItem = modelValue || s.array;
       const valueWithoutItem = (valueWithItem || s.array)
@@ -96,10 +94,18 @@ export function createModelActions(s = defaultStrategies) {
         ? s.push(valueWithItem, value)
         : valueWithoutItem;
 
-      dispatch(change(model, multiValue));
-    } else {
-      dispatch(change(model, !modelValue));
+      return change(model, multiValue);
     }
+
+    return change(model, !modelValue);
+  };
+
+  const check = (model, value) => (dispatch, getState) => {
+    const modelValue = s.get(getState(), model);
+
+    const action = checkWithValue(model, value, modelValue);
+
+    dispatch(action);
   };
 
   const filter = createModifierAction((value, iteratee) => value.filter(iteratee), s.array, 2);
@@ -151,6 +157,7 @@ export function createModelActions(s = defaultStrategies) {
     push,
     toggle,
     check,
+    checkWithValue,
     filter,
     reset,
     map,

src/components/control-component.js

@@ -173,7 +173,7 @@ function createControlClass(customControlPropsMap = {}, s = defaultStrategy) {
         const keys = Object.keys(validators)
           .concat(Object.keys(errors));
 
-        dispatch(actions.resetValidity(model, keys));
+        dispatch(actions.setValidity(model, omit(fieldValue.validity, keys)));
       }
     }
 
@@ -207,13 +207,14 @@ function createControlClass(customControlPropsMap = {}, s = defaultStrategy) {
     getChangeAction(event) {
       const {
         model,
+        modelValue,
         changeAction,
       } = this.props;
       const value = this.readOnlyValue
         ? getReadOnlyValue(this.props)
         : event;
 
-      return changeAction(model, getValue(value));
+      return changeAction(model, getValue(value), modelValue);
     }
 
     getValidateAction(value, eventName) {
@@ -651,7 +652,7 @@ function createControlClass(customControlPropsMap = {}, s = defaultStrategy) {
         ...controlPropsMap.checkbox,
         ...props.mapProps,
       }}
-      changeAction={props.changeAction || s.actions.check}
+      changeAction={props.changeAction || s.actions.checkWithValue}
       {...omit(props, 'mapProps')}
     />
   );

src/components/field-component.js

@@ -126,7 +126,7 @@ function createFieldClass(customControlPropsMap = {}, s = defaultStrategy) {
   // TODO: refactor
   const defaultControlPropsMap = {
     checkbox: {
-      changeAction: s.actions.check,
+      changeAction: s.actions.checkWithValue,
     },
   };
 

src/components/form-component.js

@@ -284,10 +284,20 @@ function createFormClass(s = defaultStrategy) {
         ? merge(invertValidators(validators), errorValidators)
         : errorValidators;
 
+      const fieldsValidity = mapValues(finalErrorValidators, (validator, field) => {
+        const fieldValue = field
+          ? s.get(modelValue, field)
+          : modelValue;
+
+        const fieldValidity = getValidity(validator, fieldValue);
+
+        return fieldValidity;
+      });
+
       dispatch(s.actions.batch(model, [
-        s.actions.validateFieldsErrors(
+        s.actions.setFieldsErrors(
           model,
-          finalErrorValidators
+          fieldsValidity
         ),
         s.actions.addIntent(model, { type: 'submit' }),
       ]));