optimized-react-component-library-xyz123 2.8.5 → 2.8.7

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

@@ -3803,7 +3803,7 @@ var Navigation = ({
   menuLinks = [],
   openButtonRef = null,
   linkComponent: LinkComponent = (props) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("a", { ...props }),
-  setKeyboardNavigationClose
+  navigationCloseFocusId
 }) => {
   const closeMenuText = activatedLanguage === "sv" ? "St\xE4ng meny" : "Close menu";
   const navRef = (0, import_react16.useRef)(null);
@@ -3811,8 +3811,10 @@ var Navigation = ({
   const handleSubMenu = (label) => {
     setOpenSubMenu(openSubMenu === label ? null : label);
   };
-  const handleCloseButton = () => {
-    setIsMenyOpen && setIsMenyOpen(false);
+  const handleMenuClick = (typeOfInteraction) => {
+    var _a, _b;
+    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;
@@ -3875,7 +3877,7 @@ var Navigation = ({
           "button",
           {
             className: "pts-navigation-close-button",
-            onClick: handleCloseButton,
+            onClick: () => handleMenuClick("close"),
             type: "button",
             children: [
               /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("span", { "aria-hidden": "true", children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(CloseIcon, {}) }),
@@ -3894,7 +3896,7 @@ var Navigation = ({
                   LinkComponent,
                   {
                     onClick: () => {
-                      handleCloseButton();
+                      handleMenuClick("link");
                     },
                     href,
                     children: label[activatedLanguage]
@@ -3926,7 +3928,7 @@ var Navigation = ({
                     LinkComponent,
                     {
                       onClick: () => {
-                        handleCloseButton();
+                        handleMenuClick("link");
                       },
                       href: href2,
                       children: label2[activatedLanguage]
@@ -4036,12 +4038,10 @@ var NavigationHeader = ({
   };
   const [instruction, setInstruction] = (0, import_react18.useState)("");
   (0, import_react18.useEffect)(() => {
-    if (!hasBeenOpen) {
+    if (!isMenuOpen)
       return;
-    }
-    setInstruction(
-      isMenuOpen ? activatedLanguage === "sv" ? "Navigationsmenyn \xF6ppnades" : "Navigation menu opened" : activatedLanguage === "sv" ? "Navigationsmenyn st\xE4ngdes" : "Navigation menu closed"
-    );
+    const message = activatedLanguage === "sv" ? "Navigationsmenyn \xF6ppnades" : "Navigation menu opened";
+    setInstruction(message);
   }, [isMenuOpen, activatedLanguage]);
   const getMenuLabel = () => {
     const labels = {
@@ -4130,8 +4130,7 @@ var NavigationHeader = ({
           isOpen: isMenuOpen,
           openButtonRef: menuButtonFocusRef,
           linkComponent: LinkComponent,
-          setKeyboardNavigationClose: () => {
-          }
+          navigationCloseFocusId
         }
       )
     ] }),