From 9ba0c59eff562452a136077724d80c2259f9af76 Mon Sep 17 00:00:00 2001
From: Hisham Aburaqibah <haburaqibah@giga.ly>
Date: Wed, 7 Oct 2026 18:16:29 +0200
Subject: [PATCH] fix: close navmenu on navigation

---
 apps/web/app/components/ui/Navigation/DesktopNav.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/web/app/components/ui/Navigation/DesktopNav.tsx b/apps/web/app/components/ui/Navigation/DesktopNav.tsx
index 0f2842e..f96d7a8 100644
--- a/apps/web/app/components/ui/Navigation/DesktopNav.tsx
+++ b/apps/web/app/components/ui/Navigation/DesktopNav.tsx
@@ -153,6 +153,8 @@ export function DesktopNav({
 
   useEffect(() => clearCloseTimer, [clearCloseTimer]);
 
+  useEffect(() => closeGroup(), [pathname, closeGroup]);
+
   const columnLinks = useCallback((groupId: string): HTMLElement[] => {
     const nav = navRef.current;
     if (!nav) return [];
@@ -490,6 +492,7 @@ export function DesktopNav({
                         <Link
                           to={child.href}
                           data-nav-sublink=""
+                          onClick={closeGroup}
                           aria-current={
                             isCurrentPath(child.href, pathname) ? "page" : undefined
                           }
@@ -520,6 +523,7 @@ export function DesktopNav({
                       isCurrentPath(item.href, pathname) ? "page" : undefined
                     }
                     onFocus={closeGroup}
+                    onClick={closeGroup}
                     className={cx(
                       "body-sm-bold whitespace-nowrap pb-[2px] no-underline",
                       /* Same rest/hover/current treatment as a group trigger. */