Do not pass default mapProps into custom components + unit test

Author: davidkpiano

src/components/control-component.js

@@ -112,6 +112,7 @@ const defaultStrategy = {
 
 function createControlClass(s = defaultStrategy) {
   const emptyControlProps = {};
+  const emptyMapProps = {};
 
   class Control extends Component {
     constructor(props) {
@@ -204,9 +205,11 @@ function createControlClass(s = defaultStrategy) {
 
           return value;
         });
+      } else if (typeof mapProps === 'function') {
+        return mapProps(originalProps);
       }
 
-      return mapProps(originalProps);
+      return emptyMapProps;
     }
 
     getChangeAction(event) {
@@ -310,7 +313,7 @@ function createControlClass(s = defaultStrategy) {
         props: { fieldValue },
       } = this;
 
-      if (!node || !node.willValidate) {
+      if (!node || (node && !node.willValidate)) {
         this.willValidate = false;
         return null;
       }
@@ -540,9 +543,10 @@ function createControlClass(s = defaultStrategy) {
     attachNode() {
       const node = findDOMNode && findDOMNode(this);
 
-      if (node) this.node = node;
-
-      this.willValidate = node.willValidate;
+      if (node) {
+        this.node = node;
+        this.willValidate = node.willValidate;
+      }
     }
 
     validate(options) {
@@ -617,7 +621,6 @@ function createControlClass(s = defaultStrategy) {
     controlProps: emptyControlProps,
     ignore: [],
     dynamic: false,
-    mapProps: controlPropsMap.default,
     component: 'input',
     withField: true,
     persist: false,
@@ -653,10 +656,10 @@ function createControlClass(s = defaultStrategy) {
   /* eslint-disable react/prop-types */
   const DefaultConnectedControl = (props) => (
     <ConnectedControl
-      mapProps={{
-        ...controlPropsMap.default,
-        ...props.mapProps,
-      }}
+      mapProps={props.component
+        ? props.mapProps
+        : controlPropsMap.default
+      }
       {...omit(props, 'mapProps')}
     />
   );

test/control-component-spec.js

@@ -2046,6 +2046,9 @@ Object.keys(testContexts).forEach((testKey) => {
         <Control
           model="user.extraData"
           component={ExtraData}
+          mapProps={{
+            value: ({ modelValue }) => modelValue,
+          }}
         />, store);
 
       const div = TestUtils.findRenderedDOMComponentWithTag(control, 'div');

test/custom-control-component-spec.js

@@ -348,4 +348,27 @@ describe('custom <Control /> components', () => {
 
     assert.equal(input.className.trim(), 'touched');
   });
+
+  it('should not pass default mapped props to custom controls', (done) => {
+    const store = testCreateStore({
+      testForm: formReducer('test'),
+      test: modelReducer('test', { foo: 'bar' }),
+    });
+
+    const CustomControl = (props) => {
+      assert.notProperty(props, 'onChange');
+      done();
+
+      return null;
+    };
+
+    TestUtils.renderIntoDocument(
+      <Provider store={store}>
+        <Control
+          model="test.foo"
+          component={CustomControl}
+        />
+      </Provider>
+    );
+  });
 });