@cagovweb/state-template 6.3.1-beta7 → 6.3.1-beta9

package/dist/js/cagov.core.js

@@ -1,4 +1,4 @@
-var StateTemplateNpmPackageVersion="6.3.1-beta7";
+var StateTemplateNpmPackageVersion="6.3.1-beta9";
 /*!
   * Bootstrap v5.3.0 (https://getbootstrap.com/)
   * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
@@ -8702,19 +8702,6 @@ window.addEventListener("load", () => {
 
   const regularHeader = document.querySelector("header");
 
-  /**
-   * True if child is descendant of the parent
-   * @param {HTMLElement} parent
-   * @param {HTMLElement} child
-   * @returns {boolean}
-   */
-  const checkParent = (parent, child) =>
-    child?.parentElement
-      ? child.parentElement === parent
-        ? true
-        : checkParent(parent, child.parentElement)
-      : false;
-
   // reset navigation function
   const NavReset = () => {
     //RESET
@@ -8731,8 +8718,6 @@ window.addEventListener("load", () => {
       .querySelectorAll(".second-level-link")
       .forEach((/**@type {HTMLElement} */ el) => (el.tabIndex = -1));
 
-
-
     document
       .querySelectorAll(".rotate")
       .forEach(
@@ -8753,14 +8738,13 @@ window.addEventListener("load", () => {
       )
     );
 
-    const getAllFirstLevelNavLinks = () =>
+  const getAllFirstLevelNavLinks = () =>
     /** @type { NodeListOf<HTMLElement>} */ (
       navSearchCont.querySelectorAll(
-        'a.first-level-link, button.first-level-btn'
+        "a.first-level-link, button.first-level-btn"
       )
     );
 
-
   // Escape key event listener
   document.addEventListener("keydown", e => {
     if (navSearchCont.classList.contains("visible")) {
@@ -8783,12 +8767,10 @@ window.addEventListener("load", () => {
   // Close menu on focusout (tabbing out) event (if target is outside of mobile menu and ignore if focus target is navToggleBtn button)
   navSearchCont.addEventListener("focusout", e => {
     if (checkIfMobileView()) {
-      if (
-        !checkParent(
-          /** @type {HTMLElement} **/ (e.currentTarget),
-          /** @type {HTMLElement} **/ (e.relatedTarget)
-        )
-      ) {
+      const child = /** @type {Node} **/ (e.relatedTarget);
+      const parent = /** @type {Node} **/ (e.currentTarget);
+
+      if (child && !parent.contains(child)) {
         closeMenu();
       }
     }
@@ -8824,12 +8806,16 @@ window.addEventListener("load", () => {
 
   // Button click close menu function
   const closeMenu = () => {
-    navSearchCont.classList.remove("visible");
+    if (navSearchCont.classList.contains("visible")) {
+      navSearchCont.classList.remove("visible");
+
+      //Set focus only when close actually happens
+      navToggleBtn.focus();
+    }
+
     navSearchCont.classList.add("not-visible");
 
     setClosed();
-
-    navToggleBtn.focus();
   };
 
   const setClosed = () => {
@@ -8855,8 +8841,9 @@ window.addEventListener("load", () => {
   // Button Click event
   navMobileMenuToggleBtn.addEventListener("click", closeMenu);
 
-  const mobileCheck = () => {  
+  const mobileCheck = () => {
     NavReset();
+
     // desktop
     if (isDesktopWidth()) {
       getAllFirstLevelNavLinks().forEach(el => el.removeAttribute("tabindex"));
@@ -8868,6 +8855,19 @@ window.addEventListener("load", () => {
     }
   };
 
+  // Close mobile nav if click outside of nav
+  regularHeader.addEventListener("mouseup", e => {
+    // if the target of the click isn't the navigation container nor a descendant of the navigation
+    if (checkIfMobileView()) {
+      if (
+        navSearchCont !== e.target &&
+        !navSearchCont?.contains(/**@type {Node} */ (e.target))
+      ) {
+        closeMenu();
+      }
+    }
+  });
+
   // on resize function (hide mobile nav)
   window.addEventListener("resize", mobileCheck);