Mostly replacing icepick for form-related state (WIP)

Author: davidkpiano

src/reducers/form-actions-reducer.js

@@ -15,8 +15,8 @@ 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 i from 'icepick';
-import { fieldOrForm, getMeta } from '../utils/create-field';
+import { fieldOrForm, getMeta, updateFieldState } from '../utils/create-field';
+import assocIn from '../utils/assoc-in';
 
 const resetFieldState = (field) => {
   if (!isPlainObject(field)) return field;
@@ -43,15 +43,15 @@ const setInitialFieldState = (field, key) => {
   if (!isPlainObject(field)) return field;
 
   if (key === '$form') {
-    return i.assign(initialFieldState, {
+    return updateFieldState(initialFieldState, {
       value: field.value,
       model: field.model,
     });
   }
 
   if (field.$form) return mapValues(field, resetFieldState);
 
-  return i.assign(initialFieldState, {
+  return updateFieldState(initialFieldState, {
     value: field.value,
     model: field.model,
   });
@@ -296,7 +296,7 @@ export default function formActionsReducer(state, action, localPath) {
 
     case actionTypes.RESET: {
       return localPath.length
-        ? i.setIn(state, localPath, resetFieldState(field))
+        ? assocIn(state, localPath, resetFieldState(field))
         : resetFieldState(field);
     }
 

src/utils/assoc-in.js

@@ -0,0 +1,35 @@
+import identity from './identity';
+
+function objClone(obj) {
+  const keys = Object.keys(obj);
+  const length = keys.length;
+  const result = {};
+  let index = 0;
+  let key;
+
+  for (; index < length; index += 1) {
+    key = keys[index];
+    result[key] = obj[key];
+  }
+  return result;
+}
+
+export function assoc(state, key, value) {
+  const newState = objClone(state);
+
+  newState[key] = value;
+
+  return newState;
+}
+
+export default function assocIn(state, path, value, fn = identity) {
+  if (!path.length) return value;
+
+  const key0 = path[0];
+
+  if (path.length === 1) {
+    return fn(assoc(state, key0, value));
+  }
+
+  return fn(assoc(state, key0, assocIn(state[key0] || {}, path.slice(1), value, fn)));
+}

src/utils/update-field.js

@@ -3,43 +3,9 @@ import get from './get';
 import mapValues from './map-values';
 import { createInitialState } from '../reducers/form-reducer';
 import { updateFieldState } from './create-field';
-import identity from './identity';
+import assocIn from './assoc-in';
 import invariant from 'invariant';
 
-function objClone(obj) {
-  const keys = Object.keys(obj);
-  const length = keys.length;
-  const result = {};
-  let index = 0;
-  let key;
-
-  for (; index < length; index += 1) {
-    key = keys[index];
-    result[key] = obj[key];
-  }
-  return result;
-}
-
-function assoc(state, key, value) {
-  const newState = objClone(state);
-
-  newState[key] = value;
-
-  return newState;
-}
-
-function assocIn(state, path, value, fn = identity) {
-  if (!path.length) return value;
-
-  const key0 = path[0];
-
-  if (path.length === 1) {
-    return fn(assoc(state, key0, value));
-  }
-
-  return fn(assoc(state, key0, assocIn(state[key0] || {}, path.slice(1), value, fn)));
-}
-
 function tempInitialState(path, initialValue = null) {
   if (path.length === 1) return { [path[0]]: initialValue };
 

src/utils/update-parent-forms.js

@@ -1,5 +1,7 @@
 import i from 'icepick';
 import get from './get';
+import assocIn from './assoc-in';
+// import { updateFieldState } from './create-field';
 
 export default function updateParentForms(state, localPath, updater) {
   const parentLocalPath = localPath.slice(0, -1);
@@ -16,7 +18,9 @@ export default function updateParentForms(state, localPath, updater) {
     ? updater(value)
     : updater;
 
-  const newState = i.setIn(state, [...parentLocalPath, '$form'], i.merge(form, updatedValue));
+  // const updatedForm = updateFieldState(form, updatedValue);
+
+  const newState = assocIn(state, [...parentLocalPath, '$form'], i.merge(form, updatedValue));
 
   if (!parentLocalPath.length) return newState;
 

src/utils/update-sub-fields.js

@@ -1,5 +1,6 @@
 import get from './get';
-import i from 'icepick';
+import assocIn from './assoc-in';
+import { updateFieldState } from './create-field';
 
 function updateSubField(subField, newSubState) {
   // Form
@@ -9,7 +10,7 @@ function updateSubField(subField, newSubState) {
 
     Object.keys(subField).forEach((key) => {
       if (key === '$form') {
-        result.$form = i.assign(subField.$form, newSubState);
+        result.$form = updateFieldState(subField.$form, newSubState);
       } else {
         result[key] = updateSubField(subField[key], newSubState);
       }
@@ -19,7 +20,7 @@ function updateSubField(subField, newSubState) {
   }
 
   // Field
-  return i.assign(subField, newSubState);
+  return updateFieldState(subField, newSubState);
 }
 
 export default function updateSubFields(state, localPath, newState) {
@@ -42,5 +43,5 @@ export default function updateSubFields(state, localPath, newState) {
 
   if (!localPath.length) return updatedField;
 
-  return i.assocIn(state, localPath, updatedField);
+  return assocIn(state, localPath, updatedField);
 }