optimized-react-component-library-xyz123 2.8.4 → 2.8.6

package/dist/index.mjs

@@ -3719,18 +3719,19 @@ var Navigation = ({
   activatedLanguage = "sv",
   menuLinks = [],
   openButtonRef = null,
-  linkComponent: LinkComponent = (props) => /* @__PURE__ */ jsx28("a", { ...props }),
-  setKeyboardNavigationClose
+  linkComponent: LinkComponent = (props) => /* @__PURE__ */ jsx28("a", { ...props })
+  //setKeyboardNavigationClose,
 }) => {
   const closeMenuText = activatedLanguage === "sv" ? "St\xE4ng meny" : "Close menu";
   const navRef = useRef3(null);
-  const firstVisitRef = useRef3(true);
   const [openSubMenu, setOpenSubMenu] = useState9(null);
   const handleSubMenu = (label) => {
     setOpenSubMenu(openSubMenu === label ? null : label);
   };
-  const handleCloseButton = () => {
+  const handleCloseButton = (type) => {
+    var _a, _b;
     setIsMenyOpen && setIsMenyOpen(false);
+    type === "close" ? (_a = openButtonRef == null ? void 0 : openButtonRef.current) == null ? void 0 : _a.focus() : (_b = document.getElementById("page-start")) == null ? void 0 : _b.focus();
   };
   useEffect13(() => {
     if (!isOpen || !navRef.current) return;
@@ -3740,7 +3741,9 @@ var Navigation = ({
     const firstElement = focusableElements[0];
     const lastElement = focusableElements[focusableElements.length - 1];
     if (!firstElement || !lastElement) return;
-    firstElement == null ? void 0 : firstElement.focus();
+    requestAnimationFrame(() => {
+      firstElement.focus();
+    });
     const handleKeyDown = (event) => {
       var _a;
       if (event.key === "Escape") {
@@ -3778,101 +3781,85 @@ var Navigation = ({
     }
     return "\xD6ppna undermeny f\xF6r " + label["sv"];
   };
-  const [instruction, setInstruction] = useState9("");
-  useEffect13(() => {
-    if (firstVisitRef.current) {
-      firstVisitRef.current = false;
-      return;
-    }
-    setInstruction(
-      isOpen ? activatedLanguage === "sv" ? "Navigationsmenyn \xF6ppnades" : "Navigation menu opened" : activatedLanguage === "sv" ? "Navigationsmenyn st\xE4ngdes" : "Navigation menu closed"
-    );
-  }, [isOpen, activatedLanguage]);
-  const handleLinkKeyDown = (event) => {
-    if (event.key === "Enter") {
-      setKeyboardNavigationClose == null ? void 0 : setKeyboardNavigationClose();
-    }
-  };
-  return /* @__PURE__ */ jsxs24(Fragment18, { children: [
-    /* @__PURE__ */ jsx28("div", { "aria-live": "polite", className: "sr-only", children: instruction }),
-    /* @__PURE__ */ jsxs24(
-      "nav",
-      {
-        id: "main-navigation",
-        ref: navRef,
-        "aria-label": activatedLanguage === "sv" ? "Huvudnavigation" : "Main navigation",
-        className: `pts-navigation-menu-container ${isOpen ? "open" : ""}`,
-        inert: !isOpen,
-        children: [
-          /* @__PURE__ */ jsx28("div", { className: "pts-navigation-close-container ", id: "menu-close", children: /* @__PURE__ */ jsxs24(
-            "button",
-            {
-              className: "pts-navigation-close-button",
-              onClick: handleCloseButton,
-              type: "button",
-              children: [
-                /* @__PURE__ */ jsx28("span", { "aria-hidden": "true", children: /* @__PURE__ */ jsx28(CloseIcon, {}) }),
-                /* @__PURE__ */ jsx28("span", { className: "pts-navigation-close-text", children: closeMenuText })
-              ]
-            }
-          ) }),
-          /* @__PURE__ */ jsx28("ul", { className: "pts-navigation-link-list", lang: activatedLanguage, children: menuLinks && menuLinks.map(({ label, href, children }, index) => /* @__PURE__ */ jsxs24(
-            "li",
-            {
-              className: `pts-navigation-link ${openSubMenu === label[activatedLanguage] ? "open" : ""}`,
-              lang: activatedLanguage,
-              children: [
-                /* @__PURE__ */ jsx28("div", { children: /* @__PURE__ */ jsxs24("div", { className: "pts-navigation-button", children: [
-                  /* @__PURE__ */ jsx28("span", { children: href && href.length === 0 ? /* @__PURE__ */ jsx28("span", { children: label[activatedLanguage] }) : /* @__PURE__ */ jsx28(
-                    LinkComponent,
-                    {
-                      onClick: handleCloseButton,
-                      href,
-                      onKeyDown: handleLinkKeyDown,
-                      children: label[activatedLanguage]
-                    }
-                  ) }),
-                  children && /* @__PURE__ */ jsx28(
-                    "button",
-                    {
-                      className: `pts-navigation-link-expand-button`,
-                      onClick: () => handleSubMenu(label[activatedLanguage]),
-                      "aria-label": getSubMenuAriaLabel(label),
-                      "aria-expanded": openSubMenu === label[activatedLanguage],
-                      "aria-controls": "sub-menu-" + index,
-                      type: "button",
-                      id: "menu-button-" + index,
-                      children: openSubMenu === label[activatedLanguage] ? /* @__PURE__ */ jsx28("span", { "aria-hidden": true, className: "pts-contract-icon", children: /* @__PURE__ */ jsx28(MinusIcon, {}) }) : /* @__PURE__ */ jsx28("span", { "aria-hidden": true, className: "pts-expand-icon", children: /* @__PURE__ */ jsx28(AddIcon, {}) })
-                    }
-                  )
-                ] }) }),
+  return /* @__PURE__ */ jsx28(Fragment18, { children: /* @__PURE__ */ jsxs24(
+    "nav",
+    {
+      id: "main-navigation",
+      ref: navRef,
+      "aria-label": activatedLanguage === "sv" ? "Huvudnavigation" : "Main navigation",
+      className: `pts-navigation-menu-container ${isOpen ? "open" : ""}`,
+      inert: !isOpen,
+      children: [
+        /* @__PURE__ */ jsx28("div", { className: "pts-navigation-close-container ", id: "menu-close", children: /* @__PURE__ */ jsxs24(
+          "button",
+          {
+            className: "pts-navigation-close-button",
+            onClick: () => handleCloseButton("close"),
+            type: "button",
+            children: [
+              /* @__PURE__ */ jsx28("span", { "aria-hidden": "true", children: /* @__PURE__ */ jsx28(CloseIcon, {}) }),
+              /* @__PURE__ */ jsx28("span", { className: "pts-navigation-close-text", children: closeMenuText })
+            ]
+          }
+        ) }),
+        /* @__PURE__ */ jsx28("ul", { className: "pts-navigation-link-list", lang: activatedLanguage, children: menuLinks && menuLinks.map(({ label, href, children }, index) => /* @__PURE__ */ jsxs24(
+          "li",
+          {
+            className: `pts-navigation-link ${openSubMenu === label[activatedLanguage] ? "open" : ""}`,
+            lang: activatedLanguage,
+            children: [
+              /* @__PURE__ */ jsx28("div", { children: /* @__PURE__ */ jsxs24("div", { className: "pts-navigation-button", children: [
+                /* @__PURE__ */ jsx28("span", { children: href && href.length === 0 ? /* @__PURE__ */ jsx28("span", { children: label[activatedLanguage] }) : /* @__PURE__ */ jsx28(
+                  LinkComponent,
+                  {
+                    onClick: () => {
+                      handleCloseButton("link");
+                    },
+                    href,
+                    children: label[activatedLanguage]
+                  }
+                ) }),
                 children && /* @__PURE__ */ jsx28(
-                  "div",
+                  "button",
                   {
-                    hidden: openSubMenu !== label[activatedLanguage],
-                    "aria-hidden": openSubMenu !== label[activatedLanguage],
-                    className: "pts-sub-navigation-container",
-                    id: "sub-menu-" + index,
-                    role: "region",
-                    children: /* @__PURE__ */ jsx28("ul", { className: "pts-sub-navigation-list", lang: activatedLanguage, children: children.map(({ label: label2, href: href2 }, index2) => /* @__PURE__ */ jsx28("li", { className: "pts-sub-navigation-item", lang: activatedLanguage, children: /* @__PURE__ */ jsx28(
-                      LinkComponent,
-                      {
-                        onClick: handleCloseButton,
-                        href: href2,
-                        onKeyDown: handleLinkKeyDown,
-                        children: label2[activatedLanguage]
-                      }
-                    ) }, "nav-child-" + index2)) })
+                    className: `pts-navigation-link-expand-button`,
+                    onClick: () => handleSubMenu(label[activatedLanguage]),
+                    "aria-label": getSubMenuAriaLabel(label),
+                    "aria-expanded": openSubMenu === label[activatedLanguage],
+                    "aria-controls": "sub-menu-" + index,
+                    type: "button",
+                    id: "menu-button-" + index,
+                    children: openSubMenu === label[activatedLanguage] ? /* @__PURE__ */ jsx28("span", { "aria-hidden": true, className: "pts-contract-icon", children: /* @__PURE__ */ jsx28(MinusIcon, {}) }) : /* @__PURE__ */ jsx28("span", { "aria-hidden": true, className: "pts-expand-icon", children: /* @__PURE__ */ jsx28(AddIcon, {}) })
                   }
                 )
-              ]
-            },
-            "nav-" + index
-          )) })
-        ]
-      }
-    )
-  ] });
+              ] }) }),
+              children && /* @__PURE__ */ jsx28(
+                "div",
+                {
+                  hidden: openSubMenu !== label[activatedLanguage],
+                  "aria-hidden": openSubMenu !== label[activatedLanguage],
+                  className: "pts-sub-navigation-container",
+                  id: "sub-menu-" + index,
+                  role: "region",
+                  children: /* @__PURE__ */ jsx28("ul", { className: "pts-sub-navigation-list", lang: activatedLanguage, children: children.map(({ label: label2, href: href2 }, index2) => /* @__PURE__ */ jsx28("li", { className: "pts-sub-navigation-item", lang: activatedLanguage, children: /* @__PURE__ */ jsx28(
+                    LinkComponent,
+                    {
+                      onClick: () => {
+                        handleCloseButton("link");
+                      },
+                      href: href2,
+                      children: label2[activatedLanguage]
+                    }
+                  ) }, "nav-child-" + index2)) })
+                }
+              )
+            ]
+          },
+          "nav-" + index
+        )) })
+      ]
+    }
+  ) });
 };
 var NavigationStandard_default = Navigation;
 
@@ -3943,7 +3930,6 @@ var NavigationHeader = ({
 }) => {
   const logoLink = activatedLanguage === "en" ? "https://pts.se/en" : "https://pts.se/";
   const hasHeadline = headline && headline.length > 0;
-  const menuButtonFocusRef = useRef4(null);
   const handleLanguageClick = () => {
     if (activatedLanguage === "sv") {
       SetActivatedLanguage("en");
@@ -3957,14 +3943,7 @@ var NavigationHeader = ({
   };
   const [isMenuOpen, setIsMenuOpen] = useState11(false);
   const [hasBeenOpen, setHasBeenOpen] = useState11(false);
-  const shouldRestoreFocusRef = useRef4(false);
-  useEffect14(() => {
-    var _a;
-    if (!isMenuOpen && navigationCloseFocusId && hasBeenOpen && shouldRestoreFocusRef.current) {
-      (_a = document.getElementById(navigationCloseFocusId)) == null ? void 0 : _a.focus();
-      shouldRestoreFocusRef.current = false;
-    }
-  }, [isMenuOpen, navigationCloseFocusId, hasBeenOpen]);
+  const menuButtonFocusRef = useRef4(null);
   const handleMenuClick = () => {
     setIsMenuOpen((prev) => {
       const open = !prev;
@@ -3974,6 +3953,15 @@ var NavigationHeader = ({
       return open;
     });
   };
+  const [instruction, setInstruction] = useState11("");
+  useEffect14(() => {
+    if (!hasBeenOpen) {
+      return;
+    }
+    setInstruction(
+      isMenuOpen ? activatedLanguage === "sv" ? "Navigationsmenyn \xF6ppnades" : "Navigation menu opened" : activatedLanguage === "sv" ? "Navigationsmenyn st\xE4ngdes" : "Navigation menu closed"
+    );
+  }, [isMenuOpen, activatedLanguage]);
   const getMenuLabel = () => {
     const labels = {
       sv: isMenuOpen ? "St\xE4ng meny" : "Meny",
@@ -4050,20 +4038,22 @@ var NavigationHeader = ({
         )
       ] }) })
     ] }) }),
-    useNavigationMenu && /* @__PURE__ */ jsx31(
-      NavigationStandard_default,
-      {
-        activatedLanguage,
-        setIsMenyOpen: setIsMenuOpen,
-        menuLinks,
-        isOpen: isMenuOpen,
-        openButtonRef: menuButtonFocusRef,
-        linkComponent: LinkComponent,
-        setKeyboardNavigationClose: () => {
-          shouldRestoreFocusRef.current = true;
+    useNavigationMenu && /* @__PURE__ */ jsxs27(Fragment19, { children: [
+      /* @__PURE__ */ jsx31("div", { "aria-live": "polite", className: "sr-only", children: instruction }),
+      /* @__PURE__ */ jsx31(
+        NavigationStandard_default,
+        {
+          activatedLanguage,
+          setIsMenyOpen: setIsMenuOpen,
+          menuLinks,
+          isOpen: isMenuOpen,
+          openButtonRef: menuButtonFocusRef,
+          linkComponent: LinkComponent,
+          setKeyboardNavigationClose: () => {
+          }
         }
-      }
-    ),
+      )
+    ] }),
     isMenuOpen && /* @__PURE__ */ jsx31(
       "div",
       {