Bugfixes.

NewOldMax · Feb 23, 2017 · 44bd22c · 44bd22c
1 parent b761978
commit 44bd22c
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/Readme.md b/Readme.md
@@ -153,7 +153,7 @@ import { ValidatorComponent } from 'react-material-ui-form-validator';
 export default class CustomCheckboxValidator extends ValidatorComponent {
 
     render() {
-        const { errorMessage, validators, requiredError, ...rest } = this.props;
+        const { errorMessages, validators, requiredError, ...rest } = this.props;
         const { isValid } = this.state;
         const errorMessage = !isValid && this.getErrorMessage();
         return (

diff --git a/lib/AutoCompleteValidator.js b/lib/AutoCompleteValidator.js
@@ -44,10 +44,10 @@ var AutoCompleteValidator = function (_ValidatorComponent) {
         value: function render() {
             // eslint-disable-next-line
             var _props = this.props,
-                errorMessage = _props.errorMessage,
+                errorMessages = _props.errorMessages,
                 validators = _props.validators,
                 requiredError = _props.requiredError,
-                rest = _objectWithoutProperties(_props, ['errorMessage', 'validators', 'requiredError']);
+                rest = _objectWithoutProperties(_props, ['errorMessages', 'validators', 'requiredError']);
 
             var isValid = this.state.isValid;
 

diff --git a/lib/DateValidator.js b/lib/DateValidator.js
@@ -44,10 +44,10 @@ var DateValidator = function (_ValidatorComponent) {
         value: function render() {
             // eslint-disable-next-line
             var _props = this.props,
-                errorMessage = _props.errorMessage,
+                errorMessages = _props.errorMessages,
                 validators = _props.validators,
                 requiredError = _props.requiredError,
-                rest = _objectWithoutProperties(_props, ['errorMessage', 'validators', 'requiredError']);
+                rest = _objectWithoutProperties(_props, ['errorMessages', 'validators', 'requiredError']);
 
             var isValid = this.state.isValid;
 

diff --git a/lib/SelectValidator.js b/lib/SelectValidator.js
@@ -44,10 +44,10 @@ var SelectValidator = function (_ValidatorComponent) {
         value: function render() {
             // eslint-disable-next-line
             var _props = this.props,
-                errorMessage = _props.errorMessage,
+                errorMessages = _props.errorMessages,
                 validators = _props.validators,
                 requiredError = _props.requiredError,
-                rest = _objectWithoutProperties(_props, ['errorMessage', 'validators', 'requiredError']);
+                rest = _objectWithoutProperties(_props, ['errorMessages', 'validators', 'requiredError']);
 
             var isValid = this.state.isValid;
 

diff --git a/lib/TextValidator.js b/lib/TextValidator.js
@@ -44,10 +44,10 @@ var TextValidator = function (_ValidatorComponent) {
         value: function render() {
             // eslint-disable-next-line
             var _props = this.props,
-                errorMessage = _props.errorMessage,
+                errorMessages = _props.errorMessages,
                 validators = _props.validators,
                 requiredError = _props.requiredError,
-                rest = _objectWithoutProperties(_props, ['errorMessage', 'validators', 'requiredError']);
+                rest = _objectWithoutProperties(_props, ['errorMessages', 'validators', 'requiredError']);
 
             var isValid = this.state.isValid;
 

diff --git a/lib/TimeValidator.js b/lib/TimeValidator.js
@@ -44,10 +44,10 @@ var TimeValidator = function (_ValidatorComponent) {
         value: function render() {
             // eslint-disable-next-line
             var _props = this.props,
-                errorMessage = _props.errorMessage,
+                errorMessages = _props.errorMessages,
                 validators = _props.validators,
                 requiredError = _props.requiredError,
-                rest = _objectWithoutProperties(_props, ['errorMessage', 'validators', 'requiredError']);
+                rest = _objectWithoutProperties(_props, ['errorMessages', 'validators', 'requiredError']);
 
             var isValid = this.state.isValid;
 

diff --git a/lib/ValidatorComponent.js b/lib/ValidatorComponent.js
@@ -43,7 +43,7 @@ var ValidatorComponent = function (_React$Component) {
         };
 
         _this.validate = _this.validate.bind(_this);
-        _this.getErrorMessages = _this.getErrorMessages.bind(_this);
+        _this.getErrorMessage = _this.getErrorMessage.bind(_this);
         _this.makeInvalid = _this.makeInvalid.bind(_this);
         _this.instantValidate = true;
         _this.configure = _this.configure.bind(_this);
@@ -71,8 +71,8 @@ var ValidatorComponent = function (_React$Component) {
             this.context.form.detachFromForm(this);
         }
     }, {
-        key: 'getErrorMessages',
-        value: function getErrorMessages() {
+        key: 'getErrorMessage',
+        value: function getErrorMessage() {
             var type = _typeof(this.state.errorMessages);
 
             if (type === 'string') {
@@ -143,7 +143,7 @@ ValidatorComponent.propTypes = {
     errorMessages: _react2.default.PropTypes.array,
     validators: _react2.default.PropTypes.array,
     name: _react2.default.PropTypes.string,
-    value: _react2.default.PropTypes.oneOf([_react2.default.PropTypes.string, _react2.default.PropTypes.number]).isRequired
+    value: _react2.default.PropTypes.oneOfType([_react2.default.PropTypes.string, _react2.default.PropTypes.number]).isRequired
 };
 
 ValidatorComponent.defaultProps = {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-material-ui-form-validator",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "description": "Simple validator for forms designed with material-ui components.",
   "main": "./lib/index.js",
   "scripts": {

diff --git a/src/AutoCompleteValidator.jsx b/src/AutoCompleteValidator.jsx
@@ -6,7 +6,7 @@ export default class AutoCompleteValidator extends ValidatorComponent {
 
     render() {
         // eslint-disable-next-line
-        const { errorMessage, validators, requiredError, ...rest } = this.props;
+        const { errorMessages, validators, requiredError, ...rest } = this.props;
         const { isValid } = this.state;
         return (
             <AutoComplete

diff --git a/src/DateValidator.jsx b/src/DateValidator.jsx
@@ -6,7 +6,7 @@ export default class DateValidator extends ValidatorComponent {
 
     render() {
         // eslint-disable-next-line
-        const { errorMessage, validators, requiredError, ...rest } = this.props;
+        const { errorMessages, validators, requiredError, ...rest } = this.props;
         const { isValid } = this.state;
         return (
             <DatePicker

diff --git a/src/SelectValidator.jsx b/src/SelectValidator.jsx
@@ -6,7 +6,7 @@ export default class SelectValidator extends ValidatorComponent {
 
     render() {
         // eslint-disable-next-line
-        const { errorMessage, validators, requiredError, ...rest } = this.props;
+        const { errorMessages, validators, requiredError, ...rest } = this.props;
         const { isValid } = this.state;
         return (
             <SelectField

diff --git a/src/TextValidator.jsx b/src/TextValidator.jsx
@@ -6,7 +6,7 @@ export default class TextValidator extends ValidatorComponent {
 
     render() {
         // eslint-disable-next-line
-        const { errorMessage, validators, requiredError, ...rest } = this.props;
+        const { errorMessages, validators, requiredError, ...rest } = this.props;
         const { isValid } = this.state;
         return (
             <TextField

diff --git a/src/TimeValidator.jsx b/src/TimeValidator.jsx
@@ -6,7 +6,7 @@ export default class TimeValidator extends ValidatorComponent {
 
     render() {
         // eslint-disable-next-line
-        const { errorMessage, validators, requiredError, ...rest } = this.props;
+        const { errorMessages, validators, requiredError, ...rest } = this.props;
         const { isValid } = this.state;
         return (
             <TimePicker

diff --git a/src/ValidatorComponent.jsx b/src/ValidatorComponent.jsx
@@ -103,7 +103,7 @@ ValidatorComponent.propTypes = {
     errorMessages: React.PropTypes.array,
     validators: React.PropTypes.array,
     name: React.PropTypes.string,
-    value: React.PropTypes.oneOf([
+    value: React.PropTypes.oneOfType([
         React.PropTypes.string,
         React.PropTypes.number,
     ]).isRequired,