@dnanpm/ui-components 0.7.0 → 0.9.0

package/dist/components/MainNavigation/MainNavigation.cjs

@@ -11,6 +11,7 @@ const MainNavigation_module = require("./MainNavigation.module.css.cjs");
 const MainNavigation_utils = require("./MainNavigation.utils.cjs");
 const cn = require("../../utils/cn/cn.cjs");
 const Button = require("../Button/Button.cjs");
+const Drawer = require("../Drawer/Drawer.cjs");
 const IconButton = require("../IconButton/IconButton.cjs");
 const defaultOrganizations = [];
 const defaultItems = [];
@@ -21,25 +22,30 @@ const mobileBodyScrollLockClass = "dds-un-scrollable";
 const defaultOverflowCategoryLabel = "Muut kategoriat";
 const desktopMinWidthMediaQuery = "(min-width: 1024px)";
 const defaultRenderLink = (props) => /* @__PURE__ */ jsxRuntime.jsx("a", { ...props });
+const defaultRenderLanguageLink = (props) => /* @__PURE__ */ jsxRuntime.jsx("a", { ...props });
 const MainNavigation = ({
   organizations = defaultOrganizations,
   items = defaultItems,
-  loginHref = "#",
   loginLabel = "Kirjaudu",
   logoHref = "/",
-  languageSelectorLabel = "FI",
+  languages,
+  renderLanguageLink = defaultRenderLanguageLink,
   searchLabel = "Haku",
   cartLabel = "Ostoskori",
-  showLanguageSelector = false,
-  showSearch = false,
-  showCart = false,
   cartCounter,
   cartCounterLabel = "tuotetta ostoskorissa",
-  onLanguageSelectorClick,
-  onSearchClick,
-  onCartClick,
-  mobileMenuOpenAriaLabel = "Avaa valikko",
-  mobileMenuCloseAriaLabel = "Sulje valikko",
+  defaultCartOpen = false,
+  cartOpen,
+  onCartOpenChange,
+  defaultOpenDropdown,
+  onSearchOpenChange,
+  onLanguageOpenChange,
+  onLoginOpenChange,
+  searchDropdownContent,
+  loginDropdownContent,
+  cartContent,
+  mobileMenuOpenAriaLabel = "Avaa päävalikko",
+  mobileMenuCloseAriaLabel = "Sulje päävalikko",
   organizationStripAriaLabel = "Sivustot",
   logoAriaLabel = "Siirry etusivulle",
   mobilePrimaryNavigationAriaLabel = "Päävalikko",
@@ -61,8 +67,17 @@ const MainNavigation = ({
   const [openTopLevelItemIndex, setOpenTopLevelItemIndex] = react.useState(
     defaultOpenItemIndex
   );
-  const [isDesktopHeaderOpen, setIsDesktopHeaderOpen] = react.useState(true);
+  const [isHeaderOpen, setIsHeaderOpen] = react.useState(true);
   const [mobileActiveCategoryIndex, setMobileActiveCategoryIndex] = react.useState(null);
+  const [internalCartOpen, setInternalCartOpen] = react.useState(defaultCartOpen);
+  const isCartControlled = cartOpen !== void 0;
+  const isCartOpen = cartOpen ?? internalCartOpen;
+  const hasInitialNavigationSurface = (cartOpen ?? defaultCartOpen) || defaultMobileMenuOpen || defaultOpenItemIndex != null && items[defaultOpenItemIndex]?.panel != null;
+  const [openUtilityDropdown, setOpenUtilityDropdown] = react.useState(hasInitialNavigationSurface ? null : defaultOpenDropdown ?? null);
+  const openUtilityDropdownRef = react.useRef(openUtilityDropdown);
+  const searchDropdownId = react.useId();
+  const languageDropdownId = react.useId();
+  const loginDropdownId = react.useId();
   const [isMobileSecondPanelClosing, setIsMobileSecondPanelClosing] = react.useState(false);
   const [isMobileThirdPanelClosing, setIsMobileThirdPanelClosing] = react.useState(false);
   const mobileSecondPanelCloseTimeoutRef = react.useRef(null);
@@ -78,6 +93,9 @@ const MainNavigation = ({
   );
   const headerElementRef = react.useRef(null);
   const desktopPanelTriggerButtonRefs = react.useRef([]);
+  const searchTriggerRef = react.useRef(null);
+  const languageTriggerRef = react.useRef(null);
+  const loginTriggerRef = react.useRef(null);
   const mobilePrimaryNavRef = react.useRef(null);
   const mobileMenuToggleButtonRef = react.useRef(null);
   const mobileModalPanelRef = react.useRef(null);
@@ -87,9 +105,14 @@ const MainNavigation = ({
   const mobileLevelTwoCategoryButtonRefs = react.useRef([]);
   const focusMobilePanelBackOnOpenRef = react.useRef(false);
   const focusMobileThirdPanelBackOnOpenRef = react.useRef(false);
+  const lastInteractionWasKeyboardRef = react.useRef(false);
   const focusReturnToMobileCategoryTimeoutRef = react.useRef(
     null
   );
+  const mobileMenuOpenRef = react.useRef(mobileMenuOpen);
+  const openTopLevelItemIndexRef = react.useRef(openTopLevelItemIndex);
+  const lastAppliedViewportModeRef = react.useRef(null);
+  const internalCartOpenRef = react.useRef(internalCartOpen);
   const setHeaderRef = react.useCallback(
     (node) => {
       headerElementRef.current = node;
@@ -132,19 +155,18 @@ const MainNavigation = ({
     let previousScrollY = window.pageYOffset;
     let headerHeight = parseFloat(window.getComputedStyle(headerElement).height.replace("px", "")) || headerElement.offsetHeight;
     const openHeader = () => {
-      setIsDesktopHeaderOpen(true);
+      setIsHeaderOpen(true);
     };
     const closeHeader = () => {
-      setIsDesktopHeaderOpen(false);
+      setIsHeaderOpen(false);
+    };
+    const headerHasVisibleFocus = () => {
+      const active = document.activeElement;
+      return lastInteractionWasKeyboardRef.current && active instanceof HTMLElement && headerElement.contains(active);
     };
     const handleScroll = () => {
       const currentScrollY = window.pageYOffset;
-      if (!desktopQuery.matches) {
-        openHeader();
-        previousScrollY = currentScrollY;
-        return;
-      }
-      if (mobileMenuOpen || openTopLevelItemIndex != null) {
+      if (mobileMenuOpen || openTopLevelItemIndex != null || openUtilityDropdown != null || headerHasVisibleFocus()) {
         openHeader();
         previousScrollY = currentScrollY;
         return;
@@ -158,6 +180,11 @@ const MainNavigation = ({
       }
       previousScrollY = currentScrollY;
     };
+    const handleFocusIn = () => {
+      if (headerHasVisibleFocus()) {
+        openHeader();
+      }
+    };
     const handleViewportChange = () => {
       openHeader();
       previousScrollY = window.pageYOffset;
@@ -165,14 +192,33 @@ const MainNavigation = ({
     };
     window.addEventListener("scroll", handleScroll, { passive: true });
     window.addEventListener("resize", handleViewportChange);
+    document.addEventListener("focusin", handleFocusIn);
     desktopQuery.addEventListener("change", handleViewportChange);
     handleScroll();
     return () => {
       window.removeEventListener("scroll", handleScroll);
       window.removeEventListener("resize", handleViewportChange);
+      document.removeEventListener("focusin", handleFocusIn);
       desktopQuery.removeEventListener("change", handleViewportChange);
     };
-  }, [mobileMenuOpen, openTopLevelItemIndex]);
+  }, [mobileMenuOpen, openTopLevelItemIndex, openUtilityDropdown]);
+  react.useEffect(() => {
+    if (typeof document === "undefined") {
+      return;
+    }
+    const handleKeyDown = () => {
+      lastInteractionWasKeyboardRef.current = true;
+    };
+    const handlePointerDown = () => {
+      lastInteractionWasKeyboardRef.current = false;
+    };
+    document.addEventListener("keydown", handleKeyDown, true);
+    document.addEventListener("pointerdown", handlePointerDown, true);
+    return () => {
+      document.removeEventListener("keydown", handleKeyDown, true);
+      document.removeEventListener("pointerdown", handlePointerDown, true);
+    };
+  }, []);
   react.useEffect(() => {
     const browserWindow = globalThis.window;
     const browserDocument = globalThis.document;
@@ -210,6 +256,11 @@ const MainNavigation = ({
     }
     const desktopQuery = window.matchMedia(desktopMinWidthMediaQuery);
     const applyViewportModeChange = ({ matches: isDesktopViewport2 }) => {
+      const viewportMode = isDesktopViewport2 ? "desktop" : "mobile";
+      if (lastAppliedViewportModeRef.current === viewportMode) {
+        return;
+      }
+      lastAppliedViewportModeRef.current = viewportMode;
       if (isDesktopViewport2) {
         clearTimeout(mobileSecondPanelCloseTimeoutRef.current ?? void 0);
         mobileSecondPanelCloseTimeoutRef.current = null;
@@ -217,23 +268,23 @@ const MainNavigation = ({
         mobileThirdPanelCloseTimeoutRef.current = null;
         clearTimeout(resetMobileThirdPanelScrollTimeoutRef.current ?? void 0);
         resetMobileThirdPanelScrollTimeoutRef.current = null;
-        setMobileMenuOpen((previous) => {
-          if (previous) {
-            onMobileMenuToggle?.(false);
-          }
-          return false;
-        });
+        const wasMobileMenuOpen = mobileMenuOpenRef.current;
+        mobileMenuOpenRef.current = false;
+        if (wasMobileMenuOpen) {
+          onMobileMenuToggle?.(false);
+        }
+        setMobileMenuOpen(false);
         setMobileActiveCategoryIndex(null);
         setIsMobileSecondPanelClosing(false);
         setIsMobileThirdPanelClosing(false);
         return;
       }
-      setOpenTopLevelItemIndex((previous) => {
-        if (previous !== null) {
-          onDesktopItemToggle?.(null);
-        }
-        return null;
-      });
+      const hadOpenDesktopItem = openTopLevelItemIndexRef.current !== null;
+      openTopLevelItemIndexRef.current = null;
+      if (hadOpenDesktopItem) {
+        onDesktopItemToggle?.(null);
+      }
+      setOpenTopLevelItemIndex(null);
     };
     applyViewportModeChange(desktopQuery);
     desktopQuery.addEventListener("change", applyViewportModeChange);
@@ -242,6 +293,7 @@ const MainNavigation = ({
     };
   }, [onDesktopItemToggle, onMobileMenuToggle]);
   const resetMobilePanelState = react.useCallback(() => {
+    openTopLevelItemIndexRef.current = null;
     setOpenTopLevelItemIndex(null);
     setMobileActiveCategoryIndex(null);
     setIsMobileSecondPanelClosing(false);
@@ -258,20 +310,20 @@ const MainNavigation = ({
       return;
     }
     const shouldAnimateMobileClose = mobileMenuOpen;
+    const wasMobileMenuOpen = mobileMenuOpenRef.current;
+    const openDesktopItemIndex = openTopLevelItemIndexRef.current;
+    mobileMenuOpenRef.current = false;
+    openTopLevelItemIndexRef.current = null;
+    if (wasMobileMenuOpen) {
+      onMobileMenuToggle?.(false);
+    }
+    if (openDesktopItemIndex !== null) {
+      onDesktopItemToggle?.(null);
+    }
     clearTimeout(mobileMenuCloseResetTimeoutRef.current ?? void 0);
     setIsMobileMenuClosing(shouldAnimateMobileClose);
-    setMobileMenuOpen((previous) => {
-      if (previous) {
-        onMobileMenuToggle?.(false);
-      }
-      return false;
-    });
-    setOpenTopLevelItemIndex((previous) => {
-      if (previous !== null) {
-        onDesktopItemToggle?.(null);
-      }
-      return null;
-    });
+    setMobileMenuOpen(false);
+    setOpenTopLevelItemIndex(null);
     if (shouldAnimateMobileClose) {
       mobileMenuCloseResetTimeoutRef.current = setTimeout(() => {
         resetMobilePanelState();
@@ -294,19 +346,21 @@ const MainNavigation = ({
       closeMobileMenu();
       return;
     }
+    closeUtilityDropdown();
+    mobileMenuOpenRef.current = true;
     setMobileMenuOpen(true);
     setIsMobileMenuClosing(false);
     onMobileMenuToggle?.(true);
   };
   const toggleTopLevelItem = (index) => {
-    setOpenTopLevelItemIndex((previous) => {
-      const next = previous === index ? null : index;
-      setMobileActiveCategoryIndex(null);
-      setIsMobileSecondPanelClosing(false);
-      setIsMobileThirdPanelClosing(false);
-      onDesktopItemToggle?.(next);
-      return next;
-    });
+    closeUtilityDropdown();
+    const next = openTopLevelItemIndex === index ? null : index;
+    openTopLevelItemIndexRef.current = next;
+    setOpenTopLevelItemIndex(next);
+    setMobileActiveCategoryIndex(null);
+    setIsMobileSecondPanelClosing(false);
+    setIsMobileThirdPanelClosing(false);
+    onDesktopItemToggle?.(next);
   };
   const isDesktopViewport = react.useCallback(() => {
     return MainNavigation_utils.isDesktopViewportByEnvironment(globalThis.window);
@@ -358,6 +412,23 @@ const MainNavigation = ({
     },
     [getDesktopPanelInteractiveElements, isFocusable]
   );
+  const getUtilityDropdownFocusLoopElements = react.useCallback(
+    (kind) => {
+      const focusLoopElements = /* @__PURE__ */ new Set();
+      const triggerButton = kind === "search" ? searchTriggerRef.current : kind === "language" ? languageTriggerRef.current : loginTriggerRef.current;
+      if (triggerButton != null && isFocusable(triggerButton)) {
+        focusLoopElements.add(triggerButton);
+      }
+      getFocusableElements(
+        headerElementRef.current,
+        `.${MainNavigation_module["main-navigation__dropdown"]} a[href], .${MainNavigation_module["main-navigation__dropdown"]} button:not([disabled]), .${MainNavigation_module["main-navigation__dropdown"]} input:not([disabled]), .${MainNavigation_module["main-navigation__dropdown"]} select:not([disabled]), .${MainNavigation_module["main-navigation__dropdown"]} textarea:not([disabled]), .${MainNavigation_module["main-navigation__dropdown"]} [tabindex]:not([tabindex="-1"])`
+      ).forEach((element) => {
+        focusLoopElements.add(element);
+      });
+      return Array.from(focusLoopElements);
+    },
+    [getFocusableElements, isFocusable]
+  );
   const getMobileFocusableElements = react.useCallback(() => {
     const focusableElements = [];
     const addFocusableElements = (elements) => {
@@ -401,6 +472,26 @@ const MainNavigation = ({
       resetMobileThirdPanelScrollTimeoutRef.current = null;
     }, 0);
   }, []);
+  const notifyUtilityOpenChange = react.useCallback(
+    (kind, open) => {
+      if (kind === "search") {
+        onSearchOpenChange?.(open);
+      } else if (kind === "language") {
+        onLanguageOpenChange?.(open);
+      } else {
+        onLoginOpenChange?.(open);
+      }
+    },
+    [onLanguageOpenChange, onLoginOpenChange, onSearchOpenChange]
+  );
+  const closeUtilityDropdown = react.useCallback(() => {
+    const openDropdown = openUtilityDropdownRef.current;
+    if (openDropdown != null) {
+      openUtilityDropdownRef.current = null;
+      notifyUtilityOpenChange(openDropdown, false);
+    }
+    setOpenUtilityDropdown(null);
+  }, [notifyUtilityOpenChange]);
   const closeMenus = react.useCallback(() => {
     clearTimeout(mobileSecondPanelCloseTimeoutRef.current ?? void 0);
     mobileSecondPanelCloseTimeoutRef.current = null;
@@ -416,8 +507,14 @@ const MainNavigation = ({
     focusReturnToMobileTopLevelItemTimeoutRef.current = null;
     clearTimeout(focusReturnToMobileCategoryTimeoutRef.current ?? void 0);
     focusReturnToMobileCategoryTimeoutRef.current = null;
+    const openDropdown = openUtilityDropdownRef.current;
+    if (openDropdown != null) {
+      openUtilityDropdownRef.current = null;
+      notifyUtilityOpenChange(openDropdown, false);
+    }
+    setOpenUtilityDropdown(null);
     closeMobileMenu();
-  }, [closeMobileMenu]);
+  }, [closeMobileMenu, notifyUtilityOpenChange]);
   const closeMobilePanel = react.useCallback(
     ({
       isClosing,
@@ -466,9 +563,87 @@ const MainNavigation = ({
   const openItem = openTopLevelItemIndex != null ? items[openTopLevelItemIndex] : void 0;
   const openPanel = openItem?.panel;
   const isMobilePanelClosingOut = isMobileMenuClosing && !mobileMenuOpen;
-  const showPageOverlay = mobileMenuOpen || openPanel != null || isMobilePanelClosingOut;
   const isOverlayClosingOut = isMobilePanelClosingOut && openPanel == null;
+  const showSearch = searchDropdownContent != null && typeof searchDropdownContent !== "boolean";
+  const showLogin = loginDropdownContent != null && typeof loginDropdownContent !== "boolean";
+  const showCart = cartContent != null && typeof cartContent !== "boolean";
   const cartAccessibleLabel = cartCounter != null ? `${cartLabel} ${cartCounter} ${cartCounterLabel}` : cartLabel;
+  const currentLanguage = languages?.find((language) => language.current) ?? languages?.[0];
+  const alternativeLanguages = currentLanguage != null ? (languages ?? []).filter((language) => language.code !== currentLanguage.code) : [];
+  const showLanguage = currentLanguage != null && alternativeLanguages.length > 0;
+  const languageAnnouncements = currentLanguage != null ? MainNavigation_utils.getLanguageToggleAnnouncements(
+    (languages ?? []).map((language) => language.code),
+    currentLanguage.code
+  ) : [];
+  const activeUtilityDropdown = openUtilityDropdown === "search" && showSearch ? "search" : openUtilityDropdown === "language" && showLanguage ? "language" : openUtilityDropdown === "login" && showLogin ? "login" : null;
+  const isSearchOpen = activeUtilityDropdown === "search";
+  const isLanguageOpen = activeUtilityDropdown === "language";
+  const isLoginOpen = activeUtilityDropdown === "login";
+  const showPageOverlay = mobileMenuOpen || openPanel != null || isMobilePanelClosingOut || activeUtilityDropdown != null;
+  const toggleUtilityDropdown = (kind) => {
+    const previous = openUtilityDropdown;
+    const next = previous === kind ? null : kind;
+    if (previous != null && previous !== next) {
+      notifyUtilityOpenChange(previous, false);
+    }
+    if (next != null) {
+      notifyUtilityOpenChange(next, true);
+      closeMobileMenu();
+      if (isCartOpen) {
+        if (!isCartControlled) {
+          internalCartOpenRef.current = false;
+          setInternalCartOpen(false);
+        }
+        onCartOpenChange?.(false);
+      }
+    }
+    openUtilityDropdownRef.current = next;
+    setOpenUtilityDropdown(next);
+  };
+  const handleLanguageClick = () => {
+    toggleUtilityDropdown("language");
+  };
+  const handleSearchClick = () => {
+    toggleUtilityDropdown("search");
+  };
+  const handleLoginClick = () => {
+    toggleUtilityDropdown("login");
+  };
+  const handleCartClick = () => {
+    const next = !isCartOpen;
+    if (next) {
+      closeMenus();
+    }
+    if (!isCartControlled) {
+      internalCartOpenRef.current = next;
+      setInternalCartOpen(next);
+    }
+    onCartOpenChange?.(next);
+  };
+  const handleCartOpenChange = (open) => {
+    if (!isCartControlled) {
+      internalCartOpenRef.current = open;
+      setInternalCartOpen(open);
+    }
+    onCartOpenChange?.(open);
+  };
+  react.useEffect(() => {
+    if (isCartOpen) {
+      closeMenus();
+    }
+  }, [closeMenus, isCartOpen]);
+  react.useEffect(() => {
+    if (openUtilityDropdown != null && activeUtilityDropdown == null) {
+      closeUtilityDropdown();
+    }
+  }, [activeUtilityDropdown, closeUtilityDropdown, openUtilityDropdown]);
+  react.useEffect(() => {
+    if (!showCart && !isCartControlled && internalCartOpen && internalCartOpenRef.current) {
+      internalCartOpenRef.current = false;
+      setInternalCartOpen(false);
+      onCartOpenChange?.(false);
+    }
+  }, [internalCartOpen, isCartControlled, onCartOpenChange, showCart]);
   react.useEffect(() => {
     if (!showPageOverlay) {
       return;
@@ -568,8 +743,7 @@ const MainNavigation = ({
                 type: "button",
                 className: cn.cn(
                   MainNavigation_module["main-navigation__mobile-back-item"],
-                  focus_module.default.focusableInset,
-                  focus_module.default.focusableRadiusSm
+                  focus_module.default.focusableInset
                 ),
                 onClick: () => closeMobilePanel({
                   isClosing: isMobileSecondPanelClosing,
@@ -577,6 +751,7 @@ const MainNavigation = ({
                   closeTimeoutRef: mobileSecondPanelCloseTimeoutRef,
                   onClosed: () => {
                     const closedTopLevelItemIndex = openTopLevelItemIndex;
+                    openTopLevelItemIndexRef.current = null;
                     setOpenTopLevelItemIndex(null);
                     setMobileActiveCategoryIndex(null);
                     onDesktopItemToggle?.(null);
@@ -663,8 +838,7 @@ const MainNavigation = ({
                         type: "button",
                         className: cn.cn(
                           MainNavigation_module["main-navigation__mobile-level-2-category-button"],
-                          focus_module.default.focusableInset,
-                          focus_module.default.focusableRadiusSm
+                          focus_module.default.focusableInset
                         ),
                         onClick: () => openMobileCategoryPanel(index),
                         onKeyDown: (event) => {
@@ -703,8 +877,7 @@ const MainNavigation = ({
                       type: "button",
                       className: cn.cn(
                         MainNavigation_module["main-navigation__mobile-back-item"],
-                        focus_module.default.focusableInset,
-                        focus_module.default.focusableRadiusSm
+                        focus_module.default.focusableInset
                       ),
                       onClick: () => closeMobilePanel({
                         isClosing: isMobileThirdPanelClosing,
@@ -747,8 +920,7 @@ const MainNavigation = ({
                         link,
                         className: cn.cn(
                           MainNavigation_module["main-navigation__mobile-level-3-link"],
-                          focus_module.default.focusableInset,
-                          focus_module.default.focusableRadiusSm
+                          focus_module.default.focusableInset
                         ),
                         children: link.label
                       })
@@ -789,7 +961,6 @@ const MainNavigation = ({
                     className: cn.cn(
                       MainNavigation_module["main-navigation__panel-link"],
                       focus_module.default.focusableInset,
-                      focus_module.default.focusableRadiusSm,
                       textDecoration_module.default.underlineLinkOnHover,
                       isInCurrentPage && MainNavigation_module["main-navigation__panel-link--current"]
                     ),
@@ -827,8 +998,7 @@ const MainNavigation = ({
                   className: cn.cn(
                     MainNavigation_module["main-navigation__feature-link"],
                     textDecoration_module.default.underlineLinkOnHover,
-                    focus_module.default.focusableInset,
-                    focus_module.default.focusableRadiusSm
+                    focus_module.default.focusableInset
                   ),
                   children: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
                     isExternalFeatureLink ? /* @__PURE__ */ jsxRuntime.jsx(
@@ -880,7 +1050,6 @@ const MainNavigation = ({
         className: cn.cn(
           MainNavigation_module["main-navigation__item-toggle"],
           focus_module.default.focusableInset,
-          focus_module.default.focusableRadiusSm,
           isCurrentPathItem && MainNavigation_module["main-navigation__item-toggle--current"],
           isOpen && MainNavigation_module["main-navigation__item-toggle--open"]
         ),
@@ -906,7 +1075,6 @@ const MainNavigation = ({
       className: cn.cn(
         MainNavigation_module["main-navigation__item-link"],
         focus_module.default.focusableInset,
-        focus_module.default.focusableRadiusSm,
         isCurrentPathItem && MainNavigation_module["main-navigation__item-link--current"]
       ),
       ariaCurrent: isCurrentPathItem ? "page" : void 0,
@@ -919,7 +1087,7 @@ const MainNavigation = ({
       ref: setHeaderRef,
       className: cn.cn(
         MainNavigation_module["main-navigation"],
-        isDesktopHeaderOpen && MainNavigation_module["main-navigation--open"],
+        isHeaderOpen && MainNavigation_module["main-navigation--open"],
         mobileMenuOpen && MainNavigation_module["main-navigation--menu-open"],
         isMobileMenuClosing && MainNavigation_module["main-navigation--menu-closing"],
         showPageOverlay && MainNavigation_module["main-navigation--overlay"],
@@ -929,6 +1097,21 @@ const MainNavigation = ({
       ),
       ...props,
       onKeyDown: (event) => {
+        if (event.key === "Tab" && activeUtilityDropdown != null) {
+          const focusLoopElements = getUtilityDropdownFocusLoopElements(activeUtilityDropdown);
+          if (focusLoopElements.length > 1) {
+            event.preventDefault();
+            const currentIndex = focusLoopElements.indexOf(
+              document.activeElement
+            );
+            const direction = event.shiftKey ? -1 : 1;
+            const nextIndex = currentIndex === -1 ? event.shiftKey ? focusLoopElements.length - 1 : 0 : (currentIndex + direction + focusLoopElements.length) % focusLoopElements.length;
+            focusLoopElements[nextIndex]?.focus();
+          } else {
+            closeUtilityDropdown();
+          }
+          return;
+        }
         if (event.key === "Tab" && mobileMenuOpen && !isDesktopViewport()) {
           const focusableElements = getMobileFocusableElements();
           if (focusableElements.length > 0) {
@@ -956,7 +1139,12 @@ const MainNavigation = ({
           }
         }
         if (event.key === "Escape") {
+          const utilityDropdownToRestore = activeUtilityDropdown;
           closeMenus();
+          if (utilityDropdownToRestore != null) {
+            const triggerButton = utilityDropdownToRestore === "search" ? searchTriggerRef.current : utilityDropdownToRestore === "language" ? languageTriggerRef.current : loginTriggerRef.current;
+            triggerButton?.focus();
+          }
         }
         props.onKeyDown?.(event);
       },
@@ -981,11 +1169,7 @@ const MainNavigation = ({
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: MainNavigation_module["main-navigation__navbar"], children: [
           renderUtilityLink({
             href: MainNavigation_utils.toNavigableHref(logoHref),
-            className: cn.cn(
-              MainNavigation_module["main-navigation__logo"],
-              focus_module.default.focusable,
-              focus_module.default.focusableRadiusSm
-            ),
+            className: cn.cn(MainNavigation_module["main-navigation__logo"], focus_module.default.focusable),
             "aria-label": logoAriaLabel,
             children: /* @__PURE__ */ jsxRuntime.jsx("img", { src: defaultLogoSrc, alt: "", "aria-hidden": "true" })
           }),
@@ -1012,51 +1196,116 @@ const MainNavigation = ({
             }
           ),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: MainNavigation_module["main-navigation__icon-nav"], children: [
-            showLanguageSelector && /* @__PURE__ */ jsxRuntime.jsxs(
-              "button",
-              {
-                type: "button",
-                className: cn.cn(
-                  MainNavigation_module["main-navigation__icon-nav-item"],
-                  focus_module.default.focusableInset,
-                  focus_module.default.focusableRadiusSm
-                ),
-                "aria-label": languageSelectorLabel,
-                onClick: onLanguageSelectorClick,
-                children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(icons.Globe, {}),
-                  /* @__PURE__ */ jsxRuntime.jsx("span", { className: MainNavigation_module["main-navigation__icon-nav-label"], children: languageSelectorLabel })
-                ]
-              }
-            ),
-            showSearch && /* @__PURE__ */ jsxRuntime.jsxs(
-              "button",
-              {
-                type: "button",
-                className: cn.cn(
-                  MainNavigation_module["main-navigation__icon-nav-item"],
-                  focus_module.default.focusableInset,
-                  focus_module.default.focusableRadiusSm
+            showLanguage && currentLanguage != null && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: MainNavigation_module["main-navigation__utility"], children: [
+              /* @__PURE__ */ jsxRuntime.jsxs(
+                "button",
+                {
+                  ref: languageTriggerRef,
+                  type: "button",
+                  className: cn.cn(
+                    MainNavigation_module["main-navigation__icon-nav-item"],
+                    isLanguageOpen && MainNavigation_module["main-navigation__icon-nav-item--active"],
+                    focus_module.default.focusableInset
+                  ),
+                  "aria-expanded": isLanguageOpen,
+                  "aria-controls": isLanguageOpen ? languageDropdownId : void 0,
+                  onClick: handleLanguageClick,
+                  children: [
+                    /* @__PURE__ */ jsxRuntime.jsx(icons.Globe, { "aria-hidden": "true" }),
+                    /* @__PURE__ */ jsxRuntime.jsx(
+                      "span",
+                      {
+                        "aria-hidden": "true",
+                        className: MainNavigation_module["main-navigation__icon-nav-label"],
+                        children: currentLanguage.code.toUpperCase()
+                      }
+                    ),
+                    /* @__PURE__ */ jsxRuntime.jsx("span", { className: MainNavigation_module["main-navigation__sr-only"], children: languageAnnouncements.map((announcement, index) => /* @__PURE__ */ jsxRuntime.jsxs(react.Fragment, { children: [
+                      index > 0 ? " " : null,
+                      /* @__PURE__ */ jsxRuntime.jsx("span", { lang: announcement.lang, children: announcement.text })
+                    ] }, announcement.lang)) })
+                  ]
+                }
+              ),
+              isLanguageOpen && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  "span",
+                  {
+                    "aria-hidden": "true",
+                    className: MainNavigation_module["main-navigation__dropdown-caret"]
+                  }
                 ),
-                "aria-label": searchLabel,
-                onClick: onSearchClick,
-                children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(icons.Search, {}),
-                  /* @__PURE__ */ jsxRuntime.jsx("span", { className: MainNavigation_module["main-navigation__icon-nav-label"], children: searchLabel })
-                ]
-              }
-            ),
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  "div",
+                  {
+                    id: languageDropdownId,
+                    className: cn.cn(
+                      MainNavigation_module["main-navigation__dropdown"],
+                      MainNavigation_module["main-navigation__dropdown--language"],
+                      elevation_module.default.elevationMedium
+                    ),
+                    children: /* @__PURE__ */ jsxRuntime.jsx("ul", { className: MainNavigation_module["main-navigation__language-list"], children: alternativeLanguages.map((language) => /* @__PURE__ */ jsxRuntime.jsx(
+                      "li",
+                      {
+                        className: MainNavigation_module["main-navigation__language-list-item"],
+                        children: renderLanguageLink({
+                          href: MainNavigation_utils.toNavigableHref(language.href),
+                          lang: language.code,
+                          "aria-label": language.ariaLabel ?? MainNavigation_utils.languageLinkAriaLabels[language.code],
+                          className: cn.cn(
+                            MainNavigation_module["main-navigation__language-link"],
+                            focus_module.default.focusable
+                          ),
+                          children: language.code.toUpperCase()
+                        })
+                      },
+                      language.code
+                    )) })
+                  }
+                )
+              ] })
+            ] }),
+            showSearch && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: MainNavigation_module["main-navigation__utility"], children: [
+              /* @__PURE__ */ jsxRuntime.jsxs(
+                "button",
+                {
+                  ref: searchTriggerRef,
+                  type: "button",
+                  className: cn.cn(
+                    MainNavigation_module["main-navigation__icon-nav-item"],
+                    isSearchOpen && MainNavigation_module["main-navigation__icon-nav-item--active"],
+                    focus_module.default.focusableInset
+                  ),
+                  "aria-label": searchLabel,
+                  "aria-expanded": isSearchOpen,
+                  "aria-controls": isSearchOpen ? searchDropdownId : void 0,
+                  onClick: handleSearchClick,
+                  children: [
+                    /* @__PURE__ */ jsxRuntime.jsx(icons.Search, {}),
+                    /* @__PURE__ */ jsxRuntime.jsx("span", { className: MainNavigation_module["main-navigation__icon-nav-label"], children: searchLabel })
+                  ]
+                }
+              ),
+              isSearchOpen && /* @__PURE__ */ jsxRuntime.jsx(
+                "span",
+                {
+                  "aria-hidden": "true",
+                  className: MainNavigation_module["main-navigation__dropdown-caret"]
+                }
+              )
+            ] }),
             showCart && /* @__PURE__ */ jsxRuntime.jsxs(
               "button",
               {
                 type: "button",
                 className: cn.cn(
                   MainNavigation_module["main-navigation__icon-nav-item"],
-                  focus_module.default.focusableInset,
-                  focus_module.default.focusableRadiusSm
+                  isCartOpen && MainNavigation_module["main-navigation__icon-nav-item--active"],
+                  focus_module.default.focusableInset
                 ),
                 "aria-label": cartAccessibleLabel,
-                onClick: onCartClick,
+                "aria-expanded": isCartOpen,
+                onClick: handleCartClick,
                 children: [
                   /* @__PURE__ */ jsxRuntime.jsx(icons.Cart, {}),
                   /* @__PURE__ */ jsxRuntime.jsx("span", { className: MainNavigation_module["main-navigation__icon-nav-label"], children: cartLabel }),
@@ -1071,16 +1320,53 @@ const MainNavigation = ({
                 ]
               }
             ),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Button.Button,
-              {
-                href: MainNavigation_utils.toNavigableHref(loginHref),
-                size: "small",
-                renderLink: renderUtilityLink,
-                children: loginLabel
-              }
-            )
+            showLogin && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: MainNavigation_module["main-navigation__utility"], children: [
+              /* @__PURE__ */ jsxRuntime.jsx(
+                Button.Button,
+                {
+                  ref: loginTriggerRef,
+                  size: "small",
+                  "aria-expanded": isLoginOpen,
+                  "aria-controls": isLoginOpen ? loginDropdownId : void 0,
+                  onClick: handleLoginClick,
+                  children: loginLabel
+                }
+              ),
+              isLoginOpen && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  "span",
+                  {
+                    "aria-hidden": "true",
+                    className: MainNavigation_module["main-navigation__dropdown-caret"]
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  "div",
+                  {
+                    id: loginDropdownId,
+                    className: cn.cn(
+                      MainNavigation_module["main-navigation__dropdown"],
+                      MainNavigation_module["main-navigation__dropdown--login"],
+                      elevation_module.default.elevationMedium
+                    ),
+                    children: loginDropdownContent
+                  }
+                )
+              ] })
+            ] })
           ] }),
+          showSearch && isSearchOpen && /* @__PURE__ */ jsxRuntime.jsx(
+            "div",
+            {
+              id: searchDropdownId,
+              className: cn.cn(
+                MainNavigation_module["main-navigation__dropdown"],
+                MainNavigation_module["main-navigation__dropdown--search"],
+                elevation_module.default.elevationMedium
+              ),
+              children: searchDropdownContent
+            }
+          ),
           /* @__PURE__ */ jsxRuntime.jsx(
             "button",
             {
@@ -1089,8 +1375,7 @@ const MainNavigation = ({
               className: cn.cn(
                 MainNavigation_module["main-navigation__menu-toggle"],
                 mobileMenuOpen && MainNavigation_module["main-navigation__menu-toggle--open"],
-                focus_module.default.focusableInset,
-                focus_module.default.focusableRadiusSm
+                focus_module.default.focusableInset
               ),
               "aria-label": mobileMenuOpen ? mobileMenuCloseAriaLabel : mobileMenuOpenAriaLabel,
               "aria-expanded": mobileMenuOpen,
@@ -1101,6 +1386,16 @@ const MainNavigation = ({
         ] }),
         !mobileMenuOpen && renderPanel(
           cn.cn(MainNavigation_module["main-navigation__panel"], MainNavigation_module["main-navigation__panel--desktop"])
+        ),
+        showCart && /* @__PURE__ */ jsxRuntime.jsx(
+          Drawer.Drawer,
+          {
+            open: isCartOpen,
+            onOpenChange: handleCartOpenChange,
+            title: cartLabel,
+            size: "small",
+            children: cartContent
+          }
         )
       ]
     }