@thecb/components 10.9.0-beta.13 → 10.9.0-beta.14

package/dist/index.cjs.js

@@ -26403,13 +26403,26 @@ var useToastNotification = function useToastNotification() {
   };
 };
 
+function useConditionallyAddValidator(condition, validatorFn, addValidator, removeValidator) {
+  React.useEffect(function () {
+    if (condition) {
+      addValidator(validatorFn());
+    }
+    return function () {
+      // Remove validator when component unmounts
+      removeValidator(validatorFn());
+    };
+  }, [condition, addValidator, removeValidator]);
+}
+
 
 
 var index$5 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   useOutsideClick: useOutsideClickHook,
   useScrollTo: useScrollTo,
-  useToastNotification: useToastNotification
+  useToastNotification: useToastNotification,
+  useConditionallyAddValidator: useConditionallyAddValidator
 });
 
 var hoverColor$4 = "#116285";
@@ -41774,7 +41787,6 @@ var EmailForm = function EmailForm(_ref) {
     walletCheckboxMarked = _ref.walletCheckboxMarked,
     _ref$isRequired = _ref.isRequired,
     isRequired = _ref$isRequired === void 0 ? false : _ref$isRequired;
-  console.log("🚀 ~  isRequired:", isRequired);
   if (clearOnDismount) {
     React.useEffect(function () {
       return function () {
@@ -41782,23 +41794,8 @@ var EmailForm = function EmailForm(_ref) {
       };
     }, []);
   }
+  useConditionallyAddValidator(isRequired, required, actions.fields.email.addValidator, actions.fields.email.removeValidator);
   var emailFieldErrorMessages = _defineProperty(_defineProperty({}, required.error, "Email address is required"), isProbablyEmail.error, "Invalid email address");
-  React.useEffect(function () {
-    debugger;
-    if (isRequired) {
-      console.log('adding email validator');
-      actions.fields.email.addValidator(required());
-    }
-    // else {
-    //   console.log('removing email validator')
-    //   actions.fields.email.removeValidator(required());
-    // }
-    return function () {
-      console.log('removing email validator');
-      // If the form is not rendered it should not be required.
-      actions.fields.email.removeValidator(required());
-    };
-  }, [isRequired]);
   return /*#__PURE__*/React__default.createElement(FormContainer$1, {
     variant: variant,
     role: "form",
@@ -49033,23 +49030,8 @@ var PhoneForm = function PhoneForm(_ref) {
       };
     }, []);
   }
+  useConditionallyAddValidator(isRequired, required, actions.fields.phone.addValidator, actions.fields.phone.removeValidator);
   var phoneErrorMessage = _defineProperty(_defineProperty({}, required.error, "Phone number is required"), hasLength.error, "Phone number must be 10 digits");
-  React.useEffect(function () {
-    if (isRequired) {
-      console.log("adding phone validator");
-      actions.fields.phone.addValidator(required());
-    }
-    // else {
-    //   debugger;
-    //   console.log('removing phone validator 1')
-    //   actions.fields.phone.removeValidator(required());
-    // }
-    return function () {
-      console.log("removing phone validator 2");
-      // If the form is not rendered it should not be required.
-      actions.fields.phone.removeValidator(required());
-    };
-  }, [isRequired]);
   return /*#__PURE__*/React__default.createElement(FormContainer$1, {
     variant: variant,
     role: "form",