Removing ad-hoc caching mechanism and fixing logic for setInitial. Fixes #782

Author: davidkpiano

src/reducers/form-actions-reducer.js

@@ -15,7 +15,7 @@ import isValidityInvalid from '../utils/is-validity-invalid';
 import fieldActions from '../actions/field-actions';
 import toPath from '../utils/to-path';
 import initialFieldState from '../constants/initial-field-state';
-import { fieldOrForm, getMeta, updateFieldState } from '../utils/create-field';
+import { getMeta, fieldOrForm, updateFieldState } from '../utils/create-field';
 import assocIn from '../utils/assoc-in';
 import getFormValue from '../utils/get-form-value';
 
@@ -30,7 +30,6 @@ const resetFieldState = (field, customInitialFieldState) => {
     intents.push({ type: 'load' });
     resetValue = loadedValue;
   }
-
   return fieldOrForm(
     getMeta(field, 'model'),
     resetValue,
@@ -48,7 +47,10 @@ const setInitialFieldState = (customInitialFieldState) => (field, key) => {
     });
   }
 
-  if (field.$form) return mapValues(field, resetFieldState);
+  if (field.$form) {
+    return mapValues(field, (fieldState) =>
+      resetFieldState(fieldState, customInitialFieldState));
+  }
 
   return updateFieldState(customInitialFieldState, {
     value: field.value,
@@ -359,8 +361,7 @@ 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 ((!Object.keys(parentForm.$form.validity).length
-              || !parentForm.$form.validity)
+          if ((!parentForm.$form.validity || !Object.keys(parentForm.$form.validity).length)
             && !parentForm.$form.valid
             && isValid(parentForm, { async: false })) {
             return {

src/reducers/form/change-action-reducer.js

@@ -135,9 +135,7 @@ export default function changeActionReducer(state, action, localPath) {
   const updatedState = assocIn(state, localPath, updatedField, (form) => {
     if (!form.$form) return form;
 
-    const formValue = action.state
-      ? get(action.state, form.$form.model)
-      : getFormValue(form);
+    const formValue = getFormValue(form);
 
     const formUpdates = {
       ...form.$form,

src/reducers/forms-reducer.js

@@ -24,26 +24,6 @@ const defaultStrategy = {
   toJS: identity,
 };
 
-const modelCache = {};
-
-function cacheModelState(state) {
-  const cacheId = Date.now();
-
-  modelCache[cacheId] = state;
-
-  return cacheId;
-}
-
-function cacheReducer(reducer, model, cacheId) {
-  return (state, action) => {
-    const newState = reducer(state, action);
-
-    modelCache[cacheId][model] = newState;
-
-    return newState;
-  };
-}
-
 function createFormCombiner(strategy = defaultStrategy) {
   function createForms(forms, model = '', options = {}) {
     const formKeys = Object.keys(forms);
@@ -59,8 +39,6 @@ function createFormCombiner(strategy = defaultStrategy) {
       ...formOptions,
     } = optionsWithDefaults;
 
-    const cacheId = cacheModelState({});
-
     formKeys.forEach((formKey) => {
       const formValue = forms[formKey];
       const subModel = getSubModelString(model, formKey);
@@ -73,12 +51,10 @@ function createFormCombiner(strategy = defaultStrategy) {
           initialState = null;
         }
 
-        modelReducers[formKey] = cacheReducer(
-          strategy.modeled(formValue, subModel), subModel, cacheId);
+        modelReducers[formKey] = strategy.modeled(formValue, subModel);
         initialFormState[formKey] = initialState;
       } else {
-        modelReducers[formKey] = cacheReducer(
-          strategy.modelReducer(subModel, formValue), subModel, cacheId);
+        modelReducers[formKey] = strategy.modelReducer(subModel, formValue);
         initialFormState[formKey] = strategy.toJS(formValue);
       }
     });
@@ -88,7 +64,7 @@ function createFormCombiner(strategy = defaultStrategy) {
       [key]: (state, action) => strategy.formReducer(model, initialFormState, {
         plugins,
         ...formOptions,
-      })(state, { ...action, state: Object.assign({}, modelCache[cacheId]) }),
+      })(state, action),
     };
   }