imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate email on registration to new validation

Browse source
This commit is contained in:
J. Ryan Stinnett 2019-04-18 22:53:46 +01:00
parent 1cbb4be6f7
commit 9064875312
4 changed files with 65 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/views/elements/Validation.js
View file

@ -50,7 +50,10 @@ export default function withValidation({ description, rules }) {
if (!rule.key || !rule.test) {
continue;
}
const ruleValid = rule.test({ value, allowEmpty });
// We're setting `this` to whichever component hold the validation
// function. That allows rules to access the state of the component.
// eslint-disable-next-line babel/no-invalid-this
const ruleValid = rule.test.call(this, { value, allowEmpty });
valid = valid && ruleValid;
if (ruleValid && rule.valid) {
// If the rule's result is valid and has text to show for
@ -101,10 +104,13 @@ export default function withValidation({ description, rules }) {
summary = <div className="mx_Validation_description">{description()}</div>;
}
const feedback = <div className="mx_Validation">
{summary}
{details}
</div>;
let feedback;
if (summary || details) {
feedback = <div className="mx_Validation">
{summary}
{details}
</div>;
}
return {
valid,