Strategy refactoring and deprecating createFieldClass

Author: davidkpiano

src/components/control-component.js

@@ -83,15 +83,20 @@ const propTypes = {
   component: PropTypes.any,
   dispatch: PropTypes.func,
   parser: PropTypes.func,
-  getter: PropTypes.func,
   ignore: PropTypes.oneOfType([
     PropTypes.arrayOf(PropTypes.string),
     PropTypes.string,
   ]),
   dynamic: PropTypes.bool,
 };
 
-function createControlClass(customControlPropsMap = {}, defaultProps = {}) {
+const defaultStrategy = {
+  get: _get,
+  getFieldFromState,
+  actions,
+};
+
+function createControlClass(customControlPropsMap = {}, s = defaultStrategy) {
   const controlPropsMap = {
     ...defaultControlPropsMap,
     ...customControlPropsMap,
@@ -592,34 +597,30 @@ function createControlClass(customControlPropsMap = {}, defaultProps = {}) {
   Control.propTypes = propTypes;
 
   Control.defaultProps = {
-    changeAction: actions.change,
+    changeAction: s.actions.change,
     updateOn: 'change',
     asyncValidateOn: 'blur',
     parser: identity,
     controlProps: emptyControlProps,
-    getter: _get,
-    getFieldFromState,
     ignore: [],
     dynamic: false,
     mapProps: controlPropsMap.default,
     component: 'input',
-    ...defaultProps,
   };
 
   function mapStateToProps(state, props) {
     const {
       model,
-      getter = Control.defaultProps.getter,
       controlProps = omit(props, Object.keys(propTypes)),
     } = props;
 
     const modelString = getModel(model, state);
-    const fieldValue = getFieldFromState(state, modelString)
+    const fieldValue = s.getFieldFromState(state, modelString)
       || initialFieldState;
 
     return {
       model: modelString,
-      modelValue: getter(state, modelString),
+      modelValue: s.get(state, modelString),
       fieldValue,
       controlProps,
     };

src/components/field-component.js

@@ -57,30 +57,11 @@ const fieldPropTypes = {
   componentMap: PropTypes.object,
   dynamic: PropTypes.bool,
   dispatch: PropTypes.func,
-  getter: PropTypes.func,
 
   // Calculated props
   fieldValue: PropTypes.object,
-
-  // TODO: refactor
-  getFieldFromState: PropTypes.func,
 };
 
-function mapStateToProps(state, props) {
-  const {
-    model,
-  } = props;
-
-  const modelString = getModel(model, state);
-  const fieldValue = getFieldFromState(state, modelString)
-    || initialFieldState;
-
-  return {
-    model: modelString,
-    fieldValue,
-  };
-}
-
 function getControlType(control, props, options) {
   const { controlPropsMap: _controlPropsMap } = options;
 
@@ -113,7 +94,27 @@ function getControlType(control, props, options) {
   }
 }
 
-function createFieldClass(customControlPropsMap = {}, defaultProps = {}) {
+const defaultStrategy = {
+  Control,
+  getFieldFromState,
+};
+
+function createFieldClass(customControlPropsMap = {}, s = defaultStrategy) {
+  function mapStateToProps(state, props) {
+    const {
+      model,
+    } = props;
+
+    const modelString = getModel(model, state);
+    const fieldValue = s.getFieldFromState(state, modelString)
+      || initialFieldState;
+
+    return {
+      model: modelString,
+      fieldValue,
+    };
+  }
+
   const options = {
     controlPropsMap: {
       ...controlPropsMap,
@@ -156,15 +157,15 @@ function createFieldClass(customControlPropsMap = {}, defaultProps = {}) {
         );
       }
 
-      return (
-        <Control
-          {...controlProps}
-          control={control}
-          controlProps={control.props}
-          component={control.type}
-          mapProps={mapProps}
-        />
-      );
+      return React.createElement(
+        s.Control,
+        {
+          ...controlProps,
+          control,
+          controlProps: control.props,
+          component: control.type,
+          mapProps,
+        });
     }
 
     mapChildrenToControl(children) {
@@ -217,9 +218,6 @@ function createFieldClass(customControlPropsMap = {}, defaultProps = {}) {
     changeAction: actions.change,
     dynamic: true,
     component: 'div',
-    getter: _get,
-    getFieldFromState,
-    ...defaultProps,
   };
 
   return resolveModel(connect(mapStateToProps)(Field));

src/immutable.js

@@ -115,17 +115,18 @@ const immutableActions = {
 const immutableModelReducer = createModeler(immutableStrategy);
 const immutableModelReducerEnhancer = createModelReducerEnhancer(immutableModelReducer);
 const immutableControlPropsMap = createControlPropsMap(immutableStrategy);
-const ImmutableField = createFieldClass(immutableControlPropsMap, {
-  getter: immutableGetFromState,
+const ImmutableControl = createControlClass(immutableControlPropsMap, {
+  get: immutableGetFromState,
   getFieldFromState: immutableGetFieldFromState,
-  changeAction: immutableModelActions.change,
+  actions: immutableModelActions,
 });
-const ImmutableErrors = createErrorsClass(immutableStrategy);
-const ImmutableControl = createControlClass(immutableControlPropsMap, {
+const ImmutableField = createFieldClass(immutableControlPropsMap, {
+  Control: ImmutableControl,
   getter: immutableGetFromState,
   getFieldFromState: immutableGetFieldFromState,
   changeAction: immutableModelActions.change,
 });
+const ImmutableErrors = createErrorsClass(immutableStrategy);
 const ImmutableForm = createFormClass({
   ...immutableStrategy,
   actions: immutableActions,