Reverting last commit

Author: davidkpiano

src/utils/create-field.js

@@ -63,19 +63,3 @@ export function createFormState(model, values, customInitialFieldState, options
 
   return state;
 }
-
-export function insertFormField(form, fieldModelPath, fieldValue) {
-  const subPath = fieldModelPath[0];
-
-  if (form[subPath]) {
-    return {
-      ...form,
-      [subPath]: insertFormField(form[subPath], fieldModelPath.slice(1), fieldValue[subPath]),
-    };
-  }
-
-  return {
-    ...form,
-    [subPath]: fieldOrForm(subPath, fieldValue),
-  };
-}

src/utils/update-field.js

@@ -1,9 +1,19 @@
+import i from 'icepick';
 import get from './get';
 import mapValues from './map-values';
-import { updateFieldState, fieldOrForm } from './create-field';
+import { createInitialState } from '../reducers/form-reducer';
+import { updateFieldState } from './create-field';
 import assocIn from './assoc-in';
 import invariant from 'invariant';
 
+function tempInitialState(path, initialValue = null) {
+  if (path.length === 1) return { [path[0]]: initialValue };
+
+  return {
+    [path[0]]: tempInitialState(path.slice(1), initialValue),
+  };
+}
+
 export function getFieldAndForm(formState, modelPath) {
   let field = get(formState, modelPath);
   let form = formState;
@@ -14,9 +24,10 @@ export function getFieldAndForm(formState, modelPath) {
 
   if (!field) {
     const initialValue = get(formState.$form.initialValue, modelPath);
-    const formModel = formState.$form.model;
 
-    form = assocIn(formState, modelPath, fieldOrForm([formModel, ...modelPath], initialValue));
+    form = i.merge(createInitialState(
+      formState.$form.model,
+      tempInitialState(modelPath, initialValue)), formState);
 
     field = get(form, modelPath);
   }