Reverting last change, using <Control.custom> instead. Fixes #743

Author: davidkpiano

src/components/control-component.js

@@ -656,14 +656,16 @@ function createControlClass(s = defaultStrategy) {
   /* eslint-disable react/prop-types */
   const DefaultConnectedControl = (props) => (
     <ConnectedControl
-      mapProps={props.component
-        ? props.mapProps
-        : controlPropsMap.default
-      }
+      mapProps={{
+        ...controlPropsMap.default,
+        ...props.mapProps,
+      }}
       {...omit(props, 'mapProps')}
     />
   );
 
+  DefaultConnectedControl.custom = ConnectedControl;
+
   DefaultConnectedControl.input = (props) => (
     <ConnectedControl
       component="input"

test/custom-control-component-spec.js

@@ -364,7 +364,7 @@ describe('custom <Control /> components', () => {
 
     TestUtils.renderIntoDocument(
       <Provider store={store}>
-        <Control
+        <Control.custom
           model="test.foo"
           component={CustomControl}
         />