Re-enabling mapProps prop for Field component

Author: davidkpiano

src/components/field-component.js

@@ -114,7 +114,9 @@ function createFieldControlComponent(control, props, options) {
   }
 
   /* eslint-disable react/prop-types */
-  const mapProps = options.controlPropsMap[getControlType(control, options)];
+  const {
+    mapProps = options.controlPropsMap[getControlType(control, options)],
+  } = props;
 
   const controlProps = omit(props, ['children', 'className']);
 
@@ -211,6 +213,7 @@ function createFieldClass(customControlPropsMap = {}, defaultProps = {}) {
       PropTypes.object,
     ]),
     modelValue: PropTypes.any,
+    mapProps: PropTypes.func,
   };
 
   Field.defaultProps = {

test/field-component-spec.js

@@ -9,7 +9,7 @@ import capitalize from 'lodash/capitalize';
 import sinon from 'sinon';
 import createTestStore from 'redux-test-store';
 
-import { Field, actions, actionTypes, formReducer, modelReducer } from '../src';
+import { Field, actions, actionTypes, formReducer, modelReducer, controls } from '../src';
 
 describe('<Field /> component', () => {
   const textFieldElements = [
@@ -1568,4 +1568,39 @@ describe('<Field /> component', () => {
 
     assert.equal(input.name, 'another[name]');
   });
+
+  it('should allow a custom mapProps() prop for use in Control', () => {
+    const store = applyMiddleware(thunk)(createStore)(combineReducers({
+      test: modelReducer('test', { foo: 'initial' }),
+    }));
+
+    const CustomInput = (props) => (
+      <div><input {...props} /></div>
+    );
+
+    const field = TestUtils.renderIntoDocument(
+      <Provider store={store}>
+        <Field
+          model="test.foo"
+          mapProps={controls.text}
+        >
+          <CustomInput />
+        </Field>
+      </Provider>
+    );
+
+    const input = TestUtils.findRenderedDOMComponentWithTag(field, 'input');
+
+    assert.equal(input.value, 'initial');
+
+    input.value = 'new value';
+
+    TestUtils.Simulate.change(input);
+
+    assert.equal(input.value, 'new value');
+    assert.equal(
+      store.getState().test.foo,
+      'new value'
+    );
+  });
 });