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

package/dist/index.d.mts

@@ -849,7 +849,7 @@ interface NavigationProps {
     isOpen: boolean;
     openButtonRef: RefObject<HTMLButtonElement | null>;
     linkComponent?: ElementType;
-    setKeyboardNavigationClose?: () => void;
+    navigationCloseFocusId?: string;
 }
 type Locale = 'sv' | 'en';
 type Label = Record<Locale, string>;

package/dist/index.d.ts

@@ -849,7 +849,7 @@ interface NavigationProps {
     isOpen: boolean;
     openButtonRef: RefObject<HTMLButtonElement | null>;
     linkComponent?: ElementType;
-    setKeyboardNavigationClose?: () => void;
+    navigationCloseFocusId?: string;
 }
 type Locale = 'sv' | 'en';
 type Label = Record<Locale, string>;

package/dist/index.js

@@ -3802,8 +3802,8 @@ var Navigation = ({
   activatedLanguage = "sv",
   menuLinks = [],
   openButtonRef = null,
-  linkComponent: LinkComponent = (props) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("a", { ...props })
-  //setKeyboardNavigationClose,
+  linkComponent: LinkComponent = (props) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("a", { ...props }),
+  navigationCloseFocusId
 }) => {
   const closeMenuText = activatedLanguage === "sv" ? "St\xE4ng meny" : "Close menu";
   const navRef = (0, import_react16.useRef)(null);
@@ -3811,10 +3811,10 @@ var Navigation = ({
   const handleSubMenu = (label) => {
     setOpenSubMenu(openSubMenu === label ? null : label);
   };
-  const handleCloseButton = (type) => {
+  const handleMenuClick = (typeOfInteraction) => {
     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();
+    setIsMenyOpen == null ? void 0 : setIsMenyOpen(false);
+    typeOfInteraction === "close" ? (_a = openButtonRef == null ? void 0 : openButtonRef.current) == null ? void 0 : _a.focus() : navigationCloseFocusId && ((_b = document.getElementById(navigationCloseFocusId)) == null ? void 0 : _b.focus());
   };
   (0, import_react16.useEffect)(() => {
     if (!isOpen || !navRef.current) return;
@@ -3872,12 +3872,13 @@ var Navigation = ({
       "aria-label": activatedLanguage === "sv" ? "Huvudnavigation" : "Main navigation",
       className: `pts-navigation-menu-container ${isOpen ? "open" : ""}`,
       inert: !isOpen,
+      "aria-expanded": isOpen,
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: "pts-navigation-close-container ", id: "menu-close", children: /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
           "button",
           {
             className: "pts-navigation-close-button",
-            onClick: () => handleCloseButton("close"),
+            onClick: () => handleMenuClick("close"),
             type: "button",
             children: [
               /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("span", { "aria-hidden": "true", children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(CloseIcon, {}) }),
@@ -3895,9 +3896,7 @@ var Navigation = ({
                 /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("span", { children: href && href.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("span", { children: label[activatedLanguage] }) : /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
                   LinkComponent,
                   {
-                    onClick: () => {
-                      handleCloseButton("link");
-                    },
+                    onClick: () => handleMenuClick("link"),
                     href,
                     children: label[activatedLanguage]
                   }
@@ -3927,9 +3926,7 @@ var Navigation = ({
                   children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("ul", { className: "pts-sub-navigation-list", lang: activatedLanguage, children: children.map(({ label: label2, href: href2 }, index2) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("li", { className: "pts-sub-navigation-item", lang: activatedLanguage, children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
                     LinkComponent,
                     {
-                      onClick: () => {
-                        handleCloseButton("link");
-                      },
+                      onClick: () => handleMenuClick("link"),
                       href: href2,
                       children: label2[activatedLanguage]
                     }
@@ -4025,26 +4022,10 @@ var NavigationHeader = ({
     else return "Svenska";
   };
   const [isMenuOpen, setIsMenuOpen] = (0, import_react18.useState)(false);
-  const [hasBeenOpen, setHasBeenOpen] = (0, import_react18.useState)(false);
   const menuButtonFocusRef = (0, import_react18.useRef)(null);
   const handleMenuClick = () => {
-    setIsMenuOpen((prev) => {
-      const open = !prev;
-      if (open) {
-        setHasBeenOpen(true);
-      }
-      return open;
-    });
+    setIsMenuOpen((prev) => !prev);
   };
-  const [instruction, setInstruction] = (0, import_react18.useState)("");
-  (0, import_react18.useEffect)(() => {
-    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",
@@ -4121,22 +4102,18 @@ var NavigationHeader = ({
         )
       ] }) })
     ] }) }),
-    useNavigationMenu && /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(import_jsx_runtime31.Fragment, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { "aria-live": "polite", className: "sr-only", children: instruction }),
-      /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
-        NavigationStandard_default,
-        {
-          activatedLanguage,
-          setIsMenyOpen: setIsMenuOpen,
-          menuLinks,
-          isOpen: isMenuOpen,
-          openButtonRef: menuButtonFocusRef,
-          linkComponent: LinkComponent,
-          setKeyboardNavigationClose: () => {
-          }
-        }
-      )
-    ] }),
+    useNavigationMenu && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(import_jsx_runtime31.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+      NavigationStandard_default,
+      {
+        activatedLanguage,
+        setIsMenyOpen: setIsMenuOpen,
+        menuLinks,
+        isOpen: isMenuOpen,
+        openButtonRef: menuButtonFocusRef,
+        linkComponent: LinkComponent,
+        navigationCloseFocusId
+      }
+    ) }),
     isMenuOpen && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
       "div",
       {