formsy-material-ui
Advanced tools
Comparing version
## Changelog | ||
* 0.6.0 Support material-ui ^0.17.0 & formsy-react ^0.19.0 | ||
* 0.5.5 revert FormsyText internal value setting method | ||
* 0.5.4 use FormsyText internal _value to allow external setValue calls | ||
@@ -5,0 +8,0 @@ support requiredError on FormsyDate |
@@ -84,8 +84,10 @@ 'use strict'; | ||
render: function render() { | ||
var _props = this.props, | ||
defaultValue = _props.defaultValue, | ||
onFocus = _props.onFocus, | ||
value = _props.value, | ||
rest = _objectWithoutProperties(_props, ['defaultValue', 'onFocus', 'value']); | ||
var _props = this.props; | ||
var defaultValue = _props.defaultValue; | ||
var // eslint-disable-line no-unused-vars | ||
onFocus = _props.onFocus; | ||
var value = _props.value; | ||
var rest = _objectWithoutProperties(_props, ['defaultValue', 'onFocus', 'value']); | ||
return _react2.default.createElement(_AutoComplete2.default, _extends({ | ||
@@ -92,0 +94,0 @@ disabled: this.isFormDisabled() |
@@ -54,9 +54,13 @@ 'use strict'; | ||
render: function render() { | ||
var _props = this.props, | ||
defaultChecked = _props.defaultChecked, | ||
validations = _props.validations, | ||
validationErrors = _props.validationErrors, | ||
validationError = _props.validationError, | ||
rest = _objectWithoutProperties(_props, ['defaultChecked', 'validations', 'validationErrors', 'validationError']); | ||
var _props = this.props; | ||
var defaultChecked = _props.defaultChecked; | ||
var // eslint-disable-line no-unused-vars | ||
validations = _props.validations; | ||
var // eslint-disable-line no-unused-vars | ||
validationErrors = _props.validationErrors; | ||
var // eslint-disable-line no-unused-vars | ||
validationError = _props.validationError; | ||
var rest = _objectWithoutProperties(_props, ['defaultChecked', 'validations', 'validationErrors', 'validationError']); | ||
var value = this.getValue(); | ||
@@ -63,0 +67,0 @@ |
@@ -62,15 +62,20 @@ 'use strict'; | ||
render: function render() { | ||
var _props = this.props, | ||
defaultDate = _props.defaultDate, | ||
validations = _props.validations, | ||
validationErrors = _props.validationErrors, | ||
validationError = _props.validationError, | ||
requiredError = _props.requiredError, | ||
rest = _objectWithoutProperties(_props, ['defaultDate', 'validations', 'validationErrors', 'validationError', 'requiredError']); | ||
var _props = this.props; | ||
var defaultDate = _props.defaultDate; | ||
var // eslint-disable-line no-unused-vars | ||
validations = _props.validations; | ||
var // eslint-disable-line no-unused-vars | ||
validationErrors = _props.validationErrors; | ||
var // eslint-disable-line no-unused-vars | ||
validationError = _props.validationError; | ||
var // eslint-disable-line no-unused-vars | ||
requiredError = _props.requiredError; | ||
var isRequired = this.isRequired, | ||
isPristine = this.isPristine, | ||
isValid = this.isValid, | ||
isFormSubmitted = this.isFormSubmitted; | ||
var rest = _objectWithoutProperties(_props, ['defaultDate', 'validations', 'validationErrors', 'validationError', 'requiredError']); | ||
var isRequired = this.isRequired; | ||
var isPristine = this.isPristine; | ||
var isValid = this.isValid; | ||
var isFormSubmitted = this.isFormSubmitted; | ||
var isRequiredError = isRequired() && !isPristine() && !isValid() && isFormSubmitted() && requiredError; | ||
@@ -77,0 +82,0 @@ var errorText = this.getErrorMessage() || isRequiredError; |
@@ -54,10 +54,15 @@ 'use strict'; | ||
render: function render() { | ||
var _props = this.props, | ||
validations = _props.validations, | ||
validationError = _props.validationError, | ||
validationErrors = _props.validationErrors, | ||
defaultSelected = _props.defaultSelected, | ||
value = _props.value, | ||
rest = _objectWithoutProperties(_props, ['validations', 'validationError', 'validationErrors', 'defaultSelected', 'value']); | ||
var _props = this.props; | ||
var validations = _props.validations; | ||
var // eslint-disable-line no-unused-vars, prefer-const | ||
validationError = _props.validationError; | ||
var // eslint-disable-line no-unused-vars, prefer-const | ||
validationErrors = _props.validationErrors; | ||
var // eslint-disable-line no-unused-vars, prefer-const | ||
defaultSelected = _props.defaultSelected; | ||
var // eslint-disable-line prefer-const | ||
value = _props.value; | ||
var rest = _objectWithoutProperties(_props, ['validations', 'validationError', 'validationErrors', 'defaultSelected', 'value']); | ||
// remove unknown props from children | ||
@@ -67,8 +72,11 @@ | ||
var children = _react2.default.Children.map(this.props.children, function (radio) { | ||
var _radio$props = radio.props, | ||
validations = _radio$props.validations, | ||
validationError = _radio$props.validationError, | ||
validationErrors = _radio$props.validationErrors, | ||
rest = _objectWithoutProperties(_radio$props, ['validations', 'validationError', 'validationErrors']); | ||
var _radio$props = radio.props; | ||
var validations = _radio$props.validations; | ||
var // eslint-disable-line no-unused-vars | ||
validationError = _radio$props.validationError; | ||
var // eslint-disable-line no-unused-vars | ||
validationErrors = _radio$props.validationErrors; | ||
var rest = _objectWithoutProperties(_radio$props, ['validations', 'validationError', 'validationErrors']); | ||
return _react2.default.createElement(_RadioButton.RadioButton, rest); | ||
@@ -75,0 +83,0 @@ }); |
@@ -64,15 +64,17 @@ 'use strict'; | ||
var value = this.props.value; | ||
var _props = this.props; | ||
var validations = _props.validations; | ||
var // eslint-disable-line no-unused-vars | ||
validationError = _props.validationError; | ||
var // eslint-disable-line no-unused-vars | ||
validationErrors = _props.validationErrors; | ||
var _props = this.props, | ||
validations = _props.validations, | ||
validationError = _props.validationError, | ||
validationErrors = _props.validationErrors, | ||
rest = _objectWithoutProperties(_props, ['validations', 'validationError', 'validationErrors']); | ||
var rest = _objectWithoutProperties(_props, ['validations', 'validationError', 'validationErrors']); | ||
value = this.state.hasChanged ? this.getValue() : value; | ||
var requiredError = this.props.requiredError; | ||
var isRequired = this.isRequired, | ||
isPristine = this.isPristine, | ||
isValid = this.isValid, | ||
isFormSubmitted = this.isFormSubmitted; | ||
var isRequired = this.isRequired; | ||
var isPristine = this.isPristine; | ||
var isValid = this.isValid; | ||
var isFormSubmitted = this.isFormSubmitted; | ||
@@ -79,0 +81,0 @@ var isRequiredError = isRequired() && !isPristine() && !isValid() && isFormSubmitted() && requiredError; |
@@ -90,3 +90,3 @@ 'use strict'; | ||
controlledValue: function controlledValue() { | ||
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; | ||
var props = arguments.length <= 0 || arguments[0] === undefined ? this.props : arguments[0]; | ||
@@ -96,3 +96,3 @@ return props.value || props.defaultValue || ''; | ||
validationColor: function validationColor() { | ||
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; | ||
var props = arguments.length <= 0 || arguments[0] === undefined ? this.props : arguments[0]; | ||
@@ -139,19 +139,25 @@ return props.validationColor || '#4CAF50'; | ||
render: function render() { | ||
var _props = this.props, | ||
defaultValue = _props.defaultValue, | ||
requiredError = _props.requiredError, | ||
underlineFocusStyle = _props.underlineFocusStyle, | ||
underlineStyle = _props.underlineStyle, | ||
updateImmediately = _props.updateImmediately, | ||
validations = _props.validations, | ||
validationError = _props.validationError, | ||
validationErrors = _props.validationErrors, | ||
value = _props.value, | ||
rest = _objectWithoutProperties(_props, ['defaultValue', 'requiredError', 'underlineFocusStyle', 'underlineStyle', 'updateImmediately', 'validations', 'validationError', 'validationErrors', 'value']); | ||
var _props = this.props; | ||
var defaultValue = _props.defaultValue; | ||
var // eslint-disable-line no-unused-vars | ||
requiredError = _props.requiredError; | ||
var underlineFocusStyle = _props.underlineFocusStyle; | ||
var underlineStyle = _props.underlineStyle; | ||
var updateImmediately = _props.updateImmediately; | ||
var // eslint-disable-line no-unused-vars | ||
validations = _props.validations; | ||
var // eslint-disable-line no-unused-vars | ||
validationError = _props.validationError; | ||
var // eslint-disable-line no-unused-vars | ||
validationErrors = _props.validationErrors; | ||
var // eslint-disable-line no-unused-vars | ||
value = _props.value; | ||
var isRequired = this.isRequired, | ||
isPristine = this.isPristine, | ||
isValid = this.isValid, | ||
isFormSubmitted = this.isFormSubmitted; | ||
var rest = _objectWithoutProperties(_props, ['defaultValue', 'requiredError', 'underlineFocusStyle', 'underlineStyle', 'updateImmediately', 'validations', 'validationError', 'validationErrors', 'value']); | ||
var isRequired = this.isRequired; | ||
var isPristine = this.isPristine; | ||
var isValid = this.isValid; | ||
var isFormSubmitted = this.isFormSubmitted; | ||
var isRequiredError = isRequired() && !isPristine() && !isValid() && isFormSubmitted() && requiredError; | ||
@@ -158,0 +164,0 @@ var errorText = this.getErrorMessage() || isRequiredError; |
@@ -61,9 +61,13 @@ 'use strict'; | ||
render: function render() { | ||
var _props = this.props, | ||
defaultTime = _props.defaultTime, | ||
validations = _props.validations, | ||
validationError = _props.validationError, | ||
validationErrors = _props.validationErrors, | ||
rest = _objectWithoutProperties(_props, ['defaultTime', 'validations', 'validationError', 'validationErrors']); | ||
var _props = this.props; | ||
var defaultTime = _props.defaultTime; | ||
var // eslint-disable-line no-unused-vars | ||
validations = _props.validations; | ||
var // eslint-disable-line no-unused-vars | ||
validationError = _props.validationError; | ||
var // eslint-disable-line no-unused-vars | ||
validationErrors = _props.validationErrors; | ||
var rest = _objectWithoutProperties(_props, ['defaultTime', 'validations', 'validationError', 'validationErrors']); | ||
return _react2.default.createElement(_TimePicker2.default, _extends({ | ||
@@ -70,0 +74,0 @@ disabled: this.isFormDisabled() |
@@ -54,9 +54,12 @@ 'use strict'; | ||
render: function render() { | ||
var _props = this.props, | ||
defaultToggled = _props.defaultToggled, | ||
validations = _props.validations, | ||
validationError = _props.validationError, | ||
validationErrors = _props.validationErrors, | ||
rest = _objectWithoutProperties(_props, ['defaultToggled', 'validations', 'validationError', 'validationErrors']); | ||
var _props = this.props; | ||
var defaultToggled = _props.defaultToggled; | ||
var validations = _props.validations; | ||
var // eslint-disable-line no-unused-vars | ||
validationError = _props.validationError; | ||
var // eslint-disable-line no-unused-vars | ||
validationErrors = _props.validationErrors; | ||
var rest = _objectWithoutProperties(_props, ['defaultToggled', 'validations', 'validationError', 'validationErrors']); | ||
var value = this.getValue(); | ||
@@ -63,0 +66,0 @@ |
{ | ||
"name": "formsy-material-ui", | ||
"version": "0.5.5", | ||
"version": "0.6.0", | ||
"description": "A formsy-react compatibility wrapper for Material-UI form components.", | ||
@@ -25,4 +25,4 @@ "main": "./lib/index.js", | ||
"peerDependencies": { | ||
"formsy-react": "^0.18.0", | ||
"material-ui": "^0.16.0", | ||
"formsy-react": "^0.19.0", | ||
"material-ui": "^0.17.0", | ||
"react": "^15.0.0", | ||
@@ -47,3 +47,3 @@ "react-dom": "^15.0.0" | ||
"eslint-plugin-react": "^4.0.0", | ||
"formsy-react": "^0.18.0", | ||
"formsy-react": "^0.19.0", | ||
"json-loader": "^0.5.4", | ||
@@ -60,3 +60,3 @@ "karma": "^0.13.19", | ||
"karma-webpack": "^1.7.0", | ||
"material-ui": "^0.16.0", | ||
"material-ui": "^0.17.0", | ||
"mocha": "^2.4.5", | ||
@@ -63,0 +63,0 @@ "phantomjs-prebuilt": "^2.1.4", |
@@ -8,3 +8,3 @@ # formsy-material-ui [](https://badge.fury.io/js/formsy-material-ui) [](https://travis-ci.org/mbrookes/formsy-material-ui) | ||
To add formsy-material-ui to you package.json and install it, run: | ||
To and install formsy-material-ui and add it to your `package.json`, run: | ||
@@ -80,1 +80,7 @@ ``` | ||
Thanks to our [contributors](https://github.com/mbrookes/formsy-material-ui/graphs/contributors). | ||
## Alternatives | ||
Here are some alternative solutions you might also wish to consider: | ||
- [react-material-ui-form-validator](https://github.com/NewOldMax/react-material-ui-form-validator) | ||
- Redux Form [Material-UI example](http://redux-form.com/6.1.1/examples/material-ui/) |
62095
2.46%1221
2.18%85
7.59%