Removing use of i.merge in update-field

Author: davidkpiano

src/reducers/form-actions-reducer.js

@@ -74,6 +74,7 @@ export default function formActionsReducer(state, action, localPath) {
   const fieldState = field && field.$form
     ? field.$form
     : field;
+
   const { intents } = fieldState;
 
   let fieldUpdates = {};

src/utils/create-field.js

@@ -4,11 +4,16 @@ import mapValues from './map-values';
 
 /* eslint-disable no-use-before-define */
 export function fieldOrForm(model, value, customInitialFieldState) {
+  // TODO: create toModel()
+  const stringModel = Array.isArray(model)
+    ? model.join('.')
+    : model;
+
   if (Array.isArray(value) || isPlainObject(value)) {
-    return createFormState(model, value, customInitialFieldState);
+    return createFormState(stringModel, value, customInitialFieldState);
   }
 
-  return createFieldState(model, value, customInitialFieldState);
+  return createFieldState(stringModel, value, customInitialFieldState);
 }
 /* eslint-enable no-use-before-define */
 
@@ -58,3 +63,19 @@ 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,19 +1,9 @@
-import i from 'icepick';
 import get from './get';
 import mapValues from './map-values';
-import { createInitialState } from '../reducers/form-reducer';
-import { updateFieldState } from './create-field';
+import { updateFieldState, fieldOrForm } 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;
@@ -24,10 +14,9 @@ export function getFieldAndForm(formState, modelPath) {
 
   if (!field) {
     const initialValue = get(formState.$form.initialValue, modelPath);
+    const formModel = formState.$form.model;
 
-    form = i.merge(createInitialState(
-      formState.$form.model,
-      tempInitialState(modelPath, initialValue)), formState);
+    form = assocIn(formState, modelPath, fieldOrForm([formModel, ...modelPath], initialValue));
 
     field = get(form, modelPath);
   }