Merge branch 'lroling8350-define-field-control-props'

Author: davidkpiano

src/components/field-component.js

@@ -102,11 +102,16 @@ function getControlType(control, props, options) {
 
 const defaultStrategy = {
   Control,
+  controlPropTypes: fieldPropTypes,
   getFieldFromState,
   actions,
 };
 
 function createFieldClass(customControlPropsMap = {}, s = defaultStrategy) {
+  // Use the fieldPropTypes if no controlProptypes have been defined to
+  // maintain backwards compatibiltiy.
+  const controlPropTypes = s.controlPropTypes || fieldPropTypes;
+
   function mapStateToProps(state, props) {
     const {
       model,
@@ -161,7 +166,7 @@ function createFieldClass(customControlPropsMap = {}, s = defaultStrategy) {
         mapProps = options.controlPropsMap[controlType],
       } = props;
 
-      const controlProps = pick(props, Object.keys(fieldPropTypes));
+      const controlProps = pick(props, Object.keys(controlPropTypes));
 
       if (!mapProps) {
         return React.cloneElement(
@@ -201,7 +206,7 @@ function createFieldClass(customControlPropsMap = {}, s = defaultStrategy) {
       } = this.props;
 
 
-      const allowedProps = omit(this.props, Object.keys(fieldPropTypes));
+      const allowedProps = omit(this.props, Object.keys(controlPropTypes));
       const renderableChildren = typeof children === 'function'
         ? children(fieldValue)
         : children;