Fixing #123

lib/Wrapper.js

@@ -272,7 +272,7 @@ exports.default = function (Component) {
  };
 
  WrappedComponent.defaultProps = {
- innerRef: function innerRef() {},
+ innerRef: null,
  required: false,
  validationError: '',
  validationErrors: {},

lib/index.js

@@ -224,7 +224,7 @@ var Formsy = function (_React$Component) {
  }
 
  if (isRequired) {
- var error = validationErrors[requiredResults.success[0]];
+ var error = validationErrors[requiredResults.success[0]] || validationError;
  return error ? [error] : null;
  }
 

src/Wrapper.js

@@ -216,6 +216,7 @@ export default (Component) => {
  };
 
  WrappedComponent.defaultProps = {
+ innerRef: null,
  required: false,
  validationError: '',
  validationErrors: {},

src/index.js

@@ -190,7 +190,7 @@ class Formsy extends React.Component {
  }
 
  if (isRequired) {
- const error = validationErrors[requiredResults.success[0]];
+ const error = validationErrors[requiredResults.success[0]] || validationError;
  return error ? [error] : null;
  }
 

tests/Element-spec.js

@@ -472,6 +472,30 @@ export default {
 
  },
 
+ 'should return the validationError if the field is invalid and required rule is true': function (test) {
+
+ class TestForm extends React.Component {
+ render() {
+ return (
+ <Formsy>
+ <TestInput name="A"
+ validationError='Field is required'
+ required
+ />
+ </Formsy>
+ );
+ }
+ }
+ const form = TestUtils.renderIntoDocument(<TestForm/>);
+
+ const inputComponent = TestUtils.findRenderedComponentWithType(form, TestInput);
+ test.equal(inputComponent.isValid(), false);
+ test.equal(inputComponent.getErrorMessage(), 'Field is required');
+
+ test.done();
+
+ },
+
  'should handle objects and arrays as values': function (test) {
 
  class TestForm extends React.Component {