Merge 4466860 into cc436be

Availity · Oct 10, 2018 · d7c5baf · d7c5baf
2 parents cc436be + 4466860
commit d7c5baf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/AvForm.js b/src/AvForm.js
@@ -462,7 +462,11 @@ export default class AvForm extends InputContainer {
                 return reject(new Error(`Invalid input validation rule: "${rule}"`));
               }
 
-              ruleResult = AvValidator[rule](val, context, ruleProp[rule], input, callback);
+              if (ruleProp[rule].enabled === false) {
+                ruleResult = true;
+              } else {
+                ruleResult = AvValidator[rule](val, context, ruleProp[rule], input, callback);
+              }
             }
 
             if (ruleResult && typeof ruleResult.then === 'function'){

diff --git a/src/AvValidator/required.js b/src/AvValidator/required.js
@@ -1,5 +1,5 @@
 import { isEmpty } from './utils';
 
-export default function validate(value, context, {errorMessage = false} = {}) {
-  return !isEmpty(value) || errorMessage || false;
+export default function validate(value, context, {value: enabled = true, errorMessage = false} = {}) {
+  return !enabled || !isEmpty(value) || errorMessage || false;
 }