Separating out utilities getField, making track default export, adding initialFieldState to constants

Author: davidkpiano

src/components/control-component.js

@@ -23,7 +23,7 @@ import validityKeys from '../constants/validity-keys';
 import { dispatchBatchIfNeeded } from '../actions/batch-actions';
 import resolveModel from '../utils/resolve-model';
 import isNative from '../utils/is-native';
-import { initialFieldState } from '../reducers/form-reducer';
+import initialFieldState from '../constants/initial-field-state';
 
 const findDOMNode = !isNative
   ? require('react-dom').findDOMNode

src/components/errors-component.js

@@ -13,7 +13,7 @@ import getFieldFromState from '../utils/get-field-from-state';
 import getModel from '../utils/get-model';
 import isValid from '../form/is-valid';
 import resolveModel from '../utils/resolve-model';
-import { initialFieldState } from '../reducers/form-reducer';
+import initialFieldState from '../constants/initial-field-state';
 
 function showErrors(field, form, show = true) {
   if (typeof show === 'function') {

src/components/field-component.js

@@ -15,7 +15,7 @@ import shallowCompareWithoutChildren from '../utils/shallow-compare-without-chil
 import getModel from '../utils/get-model';
 import getFieldFromState from '../utils/get-field-from-state';
 import resolveModel from '../utils/resolve-model';
-import { initialFieldState } from '../reducers/form-reducer';
+import initialFieldState from '../constants/initial-field-state';
 
 const fieldPropTypes = {
   model: PropTypes.oneOfType([

src/components/form-component.js

@@ -13,7 +13,7 @@ import invertValidity from '../utils/invert-validity';
 import invertValidators from '../utils/invert-validators';
 import getForm from '../utils/get-form';
 import getModel from '../utils/get-model';
-import { getField } from '../reducers/form-reducer';
+import getField from '../utils/get-field';
 import isValid from '../form/is-valid';
 import deepCompareChildren from '../utils/deep-compare-children';
 

src/constants/initial-field-state.js

@@ -0,0 +1,16 @@
+const initialFieldState = {
+  focus: false,
+  pending: false,
+  pristine: true,
+  submitted: false,
+  submitFailed: false,
+  retouched: false,
+  touched: false,
+  valid: true,
+  validating: false,
+  validated: false,
+  validity: {},
+  errors: {},
+};
+
+export default initialFieldState;

src/index.js

@@ -12,17 +12,14 @@ import controlPropsMap from './constants/control-props-map';
 import modeled from './enhancers/modeled-enhancer';
 import batched from './enhancers/batched-enhancer';
 
-import formReducer, {
-  initialFieldState,
-  getField,
-} from './reducers/form-reducer';
+import formReducer from './reducers/form-reducer';
+import initialFieldState from './constants/initial-field-state';
 import combineForms from './reducers/forms-reducer';
 
 import modelReducer from './reducers/model-reducer';
 
-import {
-  track,
-} from './utils/track';
+import track from './utils/track';
+import getField from './utils/get-field';
 
 import form from './form';
 

src/reducers/form-reducer.js

@@ -7,6 +7,7 @@ import mapValues from '../utils/map-values';
 import toPath from '../utils/to-path';
 import composeReducers from '../utils/compose-reducers';
 import createBatchReducer from '../enhancers/batched-enhancer';
+import initialFieldState from '../constants/initial-field-state';
 
 import changeActionReducer from './form/change-action-reducer';
 import setValidityActionReducer from './form/set-validity-action-reducer';
@@ -21,40 +22,6 @@ import submittedActionReducer from './form/submitted-action-reducer';
 import submitFailedActionReducer from './form/submit-failed-action-reducer';
 import resetActionReducer from './form/reset-action-reducer';
 
-export const initialFieldState = {
-  focus: false,
-  pending: false,
-  pristine: true,
-  submitted: false,
-  submitFailed: false,
-  retouched: false,
-  touched: false,
-  valid: true,
-  validating: false,
-  validated: false,
-  validity: {},
-  errors: {},
-};
-
-export function getField(state, path) {
-  if (process.env.NODE_ENV !== 'production') {
-    if (!isPlainObject(state)) {
-      throw new Error(`Could not retrieve field '${path}' `
-        + 'from an invalid/empty form state.');
-    }
-  }
-
-  if (!path.length && state.$form) {
-    return state.$form;
-  }
-
-  const result = _get(state, path, initialFieldState);
-
-  if ('$form' in result) return result.$form;
-
-  return result;
-}
-
 function getSubModelString(model, subModel) {
   if (!model) return subModel;
 

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

@@ -5,7 +5,8 @@ import shallowEqual from '../../utils/shallow-equal';
 import isPlainObject from 'lodash/isPlainObject';
 import compact from 'lodash/compact';
 import mapValues from '../../utils/map-values';
-import { initialFieldState, createInitialState } from '../form-reducer';
+import { createInitialState } from '../form-reducer';
+import initialFieldState from '../../constants/initial-field-state';
 
 
 function updateFieldValue(field, action) {

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

@@ -1,6 +1,6 @@
 import actionTypes from '../../action-types';
 import updateField from '../../utils/update-field';
-import { initialFieldState } from '../form-reducer';
+import initialFieldState from '../../constants/initial-field-state';
 
 export default function resetActionReducer(state, action, localPath) {
   if (action.type !== actionTypes.RESET

src/reducers/form/reset-validity-action-reducer.js

@@ -1,6 +1,6 @@
 import actionTypes from '../../action-types';
 import updateField from '../../utils/update-field';
-import { initialFieldState } from '../form-reducer';
+import initialFieldState from '../../constants/initial-field-state';
 
 export default function resetValidityActionReducer(state, action, localPath) {
   if (action.type !== actionTypes.RESET_VALIDITY) {