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

package/dist/index.d.mts

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

package/dist/index.d.ts

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

package/dist/index.js

@@ -1507,7 +1507,7 @@ var MenuIcon = () => /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("svg", { wid
   /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("line", { x1: "0.666504", y1: "7", x2: "20.6665", y2: "7", stroke: "#6E3282", strokeWidth: "2" }),
   /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("line", { x1: "0.666504", y1: "13", x2: "20.6665", y2: "13", stroke: "#6E3282", strokeWidth: "2" })
 ] });
-var ExpandIcon = () => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", width: "24", height: "16", viewBox: "0 0 16 16", fill: "none", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+var ExpandIcon = () => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
   "path",
   {
     fillRule: "evenodd",
@@ -1516,7 +1516,7 @@ var ExpandIcon = () => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("svg", { xm
     fill: "white"
   }
 ) });
-var CollapseIcon = () => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", width: "24", height: "16", viewBox: "0 0 16 16", fill: "none", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+var CollapseIcon = () => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
   "path",
   {
     fillRule: "evenodd",
@@ -3802,7 +3802,8 @@ var Navigation = ({
   activatedLanguage = "sv",
   menuLinks = [],
   openButtonRef = null,
-  linkComponent: LinkComponent = (props) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("a", { ...props })
+  linkComponent: LinkComponent = (props) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("a", { ...props }),
+  setKeyboardNavigationClose
 }) => {
   const closeMenuText = activatedLanguage === "sv" ? "St\xE4ng meny" : "Close menu";
   const navRef = (0, import_react16.useRef)(null);
@@ -3860,15 +3861,23 @@ var Navigation = ({
     }
     return "\xD6ppna undermeny f\xF6r " + label["sv"];
   };
-  const setInstruction = () => {
+  const [instruction, setInstruction] = (0, import_react16.useState)("");
+  (0, import_react16.useEffect)(() => {
     if (firstVisitRef.current) {
       firstVisitRef.current = false;
-      return "";
+      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 isOpen ? activatedLanguage === "sv" ? "Navigationsmenyn \xF6ppnades" : "Navigation menu opened" : activatedLanguage === "sv" ? "Navigationsmenyn st\xE4ngdes" : "Navigation menu closed";
   };
   return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(import_jsx_runtime28.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { "aria-live": "polite", className: "sr-only", children: setInstruction() }),
+    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { "aria-live": "polite", className: "sr-only", children: instruction }),
     /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
       "nav",
       {
@@ -3897,7 +3906,15 @@ var Navigation = ({
               lang: activatedLanguage,
               children: [
                 /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: "pts-navigation-button", children: [
-                  /* @__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, href, children: label[activatedLanguage] }) }),
+                  /* @__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,
+                      href,
+                      onKeyDown: handleLinkKeyDown,
+                      children: label[activatedLanguage]
+                    }
+                  ) }),
                   children && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
                     "button",
                     {
@@ -3920,7 +3937,15 @@ var Navigation = ({
                     className: "pts-sub-navigation-container",
                     id: "sub-menu-" + index,
                     role: "region",
-                    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, href: href2, children: label2[activatedLanguage] }) }, "nav-child-" + index2)) })
+                    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,
+                        href: href2,
+                        onKeyDown: handleLinkKeyDown,
+                        children: label2[activatedLanguage]
+                      }
+                    ) }, "nav-child-" + index2)) })
                   }
                 )
               ]
@@ -4015,14 +4040,14 @@ var NavigationHeader = ({
   };
   const [isMenuOpen, setIsMenuOpen] = (0, import_react18.useState)(false);
   const [hasBeenOpen, setHasBeenOpen] = (0, import_react18.useState)(false);
+  const shouldRestoreFocusRef = (0, import_react18.useRef)(false);
   (0, import_react18.useEffect)(() => {
     var _a;
-    console.log(navigationCloseFocusId);
-    if (!isMenuOpen && navigationCloseFocusId && hasBeenOpen) {
+    if (!isMenuOpen && navigationCloseFocusId && hasBeenOpen && shouldRestoreFocusRef.current) {
       (_a = document.getElementById(navigationCloseFocusId)) == null ? void 0 : _a.focus();
-      console.log(navigationCloseFocusId, document.getElementById(navigationCloseFocusId));
+      shouldRestoreFocusRef.current = false;
     }
-  }, [isMenuOpen]);
+  }, [isMenuOpen, navigationCloseFocusId, hasBeenOpen]);
   const handleMenuClick = () => {
     setIsMenuOpen((prev) => {
       const open = !prev;
@@ -4116,7 +4141,10 @@ var NavigationHeader = ({
         menuLinks,
         isOpen: isMenuOpen,
         openButtonRef: menuButtonFocusRef,
-        linkComponent: LinkComponent
+        linkComponent: LinkComponent,
+        setKeyboardNavigationClose: () => {
+          shouldRestoreFocusRef.current = true;
+        }
       }
     ),
     isMenuOpen && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
@@ -4290,7 +4318,7 @@ var Collapse = ({
         "aria-controls": contentId,
         children: [
           `${isOpen ? closeLabel : openLabel} ${title}`,
-          /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: "pts-open-close-icon", "aria-hidden": "true", children: isOpen ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(CollapseIcon, {}) : /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ExpandIcon, {}) })
+          /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: "pts-collapse-open-close-icon", "aria-hidden": "true", children: isOpen ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(CollapseIcon, {}) : /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ExpandIcon, {}) })
         ]
       }
     ),