1.1.4 build

formsy · Mar 5, 2018 · 6cfdc9a · 6cfdc9a
1 parent 5caa3a3
commit 6cfdc9a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/lib/Wrapper.js b/lib/Wrapper.js
@@ -62,7 +62,7 @@ var convertValidationsToObject = function convertValidationsToObject(validations
 var propTypes = {
   innerRef: _propTypes2.default.func,
   name: _propTypes2.default.string.isRequired,
-  required: _propTypes2.default.bool,
+  required: _propTypes2.default.oneOfType([_propTypes2.default.bool, _propTypes2.default.object, _propTypes2.default.string]),
   validations: _propTypes2.default.oneOfType([_propTypes2.default.object, _propTypes2.default.string]),
   value: _propTypes2.default.any // eslint-disable-line react/forbid-prop-types
 };

diff --git a/lib/index.js b/lib/index.js
@@ -394,7 +394,9 @@ var Formsy = function (_React$Component) {
       return _react2.default.createElement('form', _extends({
         onReset: _this.resetInternal,
         onSubmit: _this.submit
-      }, nonFormsyProps), _this.props.children);
+      }, nonFormsyProps, {
+        disabled: false
+      }), _this.props.children);
     };
 
     _this.state = {

diff --git a/lib/validationRules.js b/lib/validationRules.js
@@ -12,7 +12,7 @@ var isEmpty = function isEmpty(value) {
 
 var validations = {
   isDefaultRequiredValue: function isDefaultRequiredValue(values, value) {
-    return value === undefined || value === '';
+    return value === undefined || value === null || value === '';
   },
   isExisty: function isExisty(values, value) {
     return _isExisty(value);