@iamproperty/components 7.6.3 → 7.6.4--beta2

package/assets/ts/components/std-address-lookup/std-address-lookup.component.ts

@@ -1786,6 +1786,38 @@ class iamSTDAddressLookup extends HTMLElement {
         }
       });
     }
+
+
+    // If inside conditional
+    
+
+    if(this.closest('.conditional')){
+
+
+      Array.from(this.querySelectorAll('[required]')).forEach((input) => {
+
+        input.setAttribute('data-conditional-required','true');
+        input.removeAttribute('required');
+      });
+      
+      Array.from(this.querySelectorAll('[data-required]')).forEach((input) => {
+
+        input.setAttribute('data-conditional-data-required','true');
+        input.removeAttribute('data-required');
+      });
+      
+      const conditionalStyles = window.getComputedStyle(this.closest('.conditional'));
+
+      if(conditionalStyles.getPropertyValue("display") == 'block'){
+        Array.from(this.querySelectorAll('[data-conditional-data-required]')).forEach((input) => {
+          input.setAttribute('data-required', 'true');
+        });
+        Array.from(this.querySelectorAll('[data-conditional-required]')).forEach((input) => {
+          input.setAttribute('required', 'true');
+        });
+      }
+    }
+
   }
 }
 

package/assets/ts/modules/helpers.ts

@@ -55,15 +55,18 @@ export const addGlobalEvents = (body): void => {
   });
 
   Array.from(document.querySelectorAll('form')).forEach((form) => {
-    form.addEventListener('submit', (event) => {
-      if (
-        form.querySelector(':invalid')
-      ) {
-        form.classList.add('was-validated');
-        form?.querySelector('input:invalid')?.scrollIntoView();
-        event.preventDefault();
-      }
-    });
+    
+    if(!form?.closest('iam-form')){
+      form.addEventListener('submit', (event) => {
+        if (
+          form.querySelector(':invalid')
+        ) {
+          form.classList.add('was-validated');
+          form?.querySelector('input:invalid')?.scrollIntoView();
+          event.preventDefault();
+        }
+      });
+    }
   });
   
   document.addEventListener('click', (event) => {
@@ -71,24 +74,26 @@ export const addGlobalEvents = (body): void => {
     if (event && event.target instanceof HTMLElement && event.target.matches('form button:not([type=button])')) {
       const form = event.target.closest('form');
 
-      // Reset password types
-      Array.from(form.querySelectorAll('[data-password-type]')).forEach((input) => {
-        input.setAttribute('type', 'password');
-      });
-
-      if (
-        form.querySelector(':invalid') ||
-        form.querySelector('.pwd-checker[data-strength="1"]') ||
-        form.querySelector('.pwd-checker[data-strength="2"]')
-      ) {
-        form.classList.add('was-validated');
-        form?.querySelector('input:invalid')?.scrollIntoView();
-        event.preventDefault();
-      }
-
-      if (form.querySelector('iam-multiselect[data-is-required][data-error]')) {
-        form.classList.add('was-validated');
-        event.preventDefault();
+      if(!form?.closest('iam-form')){
+        // Reset password types
+        Array.from(form.querySelectorAll('[data-password-type]')).forEach((input) => {
+          input.setAttribute('type', 'password');
+        });
+
+        if (
+          form.querySelector(':invalid') ||
+          form.querySelector('.pwd-checker[data-strength="1"]') ||
+          form.querySelector('.pwd-checker[data-strength="2"]')
+        ) {
+          form.classList.add('was-validated');
+          form?.querySelector('input:invalid')?.scrollIntoView();
+          event.preventDefault();
+        }
+
+        if (form.querySelector('iam-multiselect[data-is-required][data-error]')) {
+          form.classList.add('was-validated');
+          event.preventDefault();
+        }  
       }
     }
   });