Skip to content

Improved validation handling for Array of validation functions. #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improved validation handling for Array of validation functions. #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions src/lib/InputComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,24 @@ export class InputComponent extends React.Component{

if(!!this.props.validationFunction) {
if(this.props.validationFunction.constructor === Array){
const validationQuickBail = this.props.validationQuickBail;
/*
validationFunction has to return an object in case of error,
true in case of successful validation
*/
this.props.validationFunction.map((valFn, i)=>{
const validationResults = this.props.validationFunction.reduce((result, valFn, i)=> {
//If quickbail is enabled, don't worry about any future validations if there is already a result
if (result.valid === false && validationQuickBail === true) return result;

let validationResult = valFn(value, this);
if(validationResult === true){
this.valid = (this.valid !== false)? validationResult : this.valid;
} else{
this.validationErrors.push(validationResult);
this.valid = false;
if ((validationResult instanceof Error) || (validationResult !== true && typeof validationResult !== 'undefined') || (validationResult === false)) {
result.validationErrors.push(validationResult);
result.valid = false;
}

})
return result;
}, {valid: undefined, validationErrors: []});
this.validationErrors = validationResults.validationErrors;
this.valid = (typeof validationResults.valid === 'undefined' ? true : validationResults.valid);
} else {
let validationResult = this.props.validationFunction(value, this);
if(validationResult === true){
Expand Down Expand Up @@ -204,8 +207,13 @@ export class InputComponent extends React.Component{
// placeholder:React.PropTypes.string,
// }

InputComponent.defaultProps = {
validationQuickBail: false,
}

InputComponent.propTypes = {
labelStyle: Text.propTypes.style,
inputStyle: TextInput.propTypes.style,
containerStyle: View.propTypes.style
containerStyle: View.propTypes.style,
validationQuickBail: React.PropTypes.bool
}