From 0dcc3e5e46f7e0ff59342c5620069d456fc53a6c Mon Sep 17 00:00:00 2001
From: SatyamSetia <satyam7991@gmail.com>
Date: Wed, 1 Nov 2023 16:27:39 +0530
Subject: [PATCH] fix: close mobile nav on blur of nav list

---
 components/Header/Header.tsx         | 13 ++++++-------
 components/Layout/Layout.tsx         | 15 +++++++++------
 components/Nav/NavItem.tsx           |  5 ++++-
 components/Nav/NavPrimaryMobile.tsx  | 17 +++++++++++++----
 stories/Header.stories.tsx           |  2 +-
 stories/NavPrimaryMobile.stories.tsx |  2 +-
 6 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx
index 57ee4d6..ebaafc4 100644
--- a/components/Header/Header.tsx
+++ b/components/Header/Header.tsx
@@ -6,10 +6,10 @@ import styles from "./Header.module.css"
 
 export interface IHeaderProps {
 	handleNavClick: () => void
-	showNavMobile: boolean
+	isNavMobileOpen: boolean
 }
 
-export const Header = ({ handleNavClick, showNavMobile }: IHeaderProps) => {
+export const Header = ({ handleNavClick, isNavMobileOpen }: IHeaderProps) => {
 	return (
 		<>
 			<header>
@@ -21,12 +21,11 @@ export const Header = ({ handleNavClick, showNavMobile }: IHeaderProps) => {
 							className={styles.hamburgerBtn}
 							onClick={handleNavClick}
 							aria-label="Navigation menu"
-							aria-expanded={showNavMobile}>
-							{!showNavMobile && (
-								<IoMenuSharp size="1.5rem" aria-hidden="true" />
-							)}
-							{showNavMobile && (
+							aria-expanded={isNavMobileOpen}>
+							{isNavMobileOpen ? (
 								<IoCloseSharp size="1.5rem" aria-hidden="true" />
+							) : (
+								<IoMenuSharp size="1.5rem" aria-hidden="true" />
 							)}
 						</button>
 					</div>
diff --git a/components/Layout/Layout.tsx b/components/Layout/Layout.tsx
index 3d04903..90693a0 100644
--- a/components/Layout/Layout.tsx
+++ b/components/Layout/Layout.tsx
@@ -12,22 +12,25 @@ interface ILayoutProps {
 }
 
 export const Layout = ({ activeNavLink, children }: ILayoutProps) => {
-	const [showNavMobile, setShowNavMobile] = useState<boolean>(false)
+	const [isNavMobileOpen, setIsNavMobileOpen] = useState<boolean>(false)
 
-	const handleNavClick = () => {
-		setShowNavMobile((prevState) => !prevState)
+	const toggleNavMobileOpen = () => {
+		setIsNavMobileOpen((prevState) => !prevState)
 	}
 
 	return (
 		<>
 			<SkipLink />
-			<Header handleNavClick={handleNavClick} showNavMobile={showNavMobile} />
+			<Header
+				handleNavClick={toggleNavMobileOpen}
+				isNavMobileOpen={isNavMobileOpen}
+			/>
 			<div className={styles.layoutContainer}>
 				<NavPrimary activeNavLink={activeNavLink} />
-				{showNavMobile && (
+				{isNavMobileOpen && (
 					<NavPrimaryMobile
 						activeNavLink={activeNavLink}
-						handleNavClick={handleNavClick}
+						closeNavMobile={toggleNavMobileOpen} // since, closeNavMobile prop can only be called when <NavPrimaryMobile /> is in open state so, toggleNavMobileOpen handler can be used for closing nav mobile.
 					/>
 				)}
 				<div className={styles.columnContainer}>
diff --git a/components/Nav/NavItem.tsx b/components/Nav/NavItem.tsx
index 92c5a27..16abb04 100644
--- a/components/Nav/NavItem.tsx
+++ b/components/Nav/NavItem.tsx
@@ -5,12 +5,14 @@ import { IPage } from "../../data/pages"
 export interface INavItemProps {
 	page: IPage
 	activeNavLink: string
+	isLastNavItem?: boolean
 	handleNavClick?: () => void
 }
 
 export const NavItem = ({
 	page,
 	activeNavLink,
+	isLastNavItem = false,
 	handleNavClick,
 }: INavItemProps) => {
 	const isLinkActive = activeNavLink === page.href
@@ -19,7 +21,8 @@ export const NavItem = ({
 			<Link href={page.href}>
 				<a
 					onClick={handleNavClick}
-					aria-current={isLinkActive ? "page" : false}>
+					aria-current={isLinkActive ? "page" : false}
+					data-last-nav-item={isLastNavItem}>
 					{page.name}
 				</a>
 			</Link>
diff --git a/components/Nav/NavPrimaryMobile.tsx b/components/Nav/NavPrimaryMobile.tsx
index 4650a70..9ccbe44 100644
--- a/components/Nav/NavPrimaryMobile.tsx
+++ b/components/Nav/NavPrimaryMobile.tsx
@@ -1,25 +1,34 @@
+import { FocusEvent, useCallback } from "react"
 import { NavItem } from "./NavItem"
 import { pages } from "../../data/pages"
 import styles from "./NavPrimary.module.css"
 
 export interface INavProps {
 	activeNavLink: string
-	handleNavClick: () => void
+	closeNavMobile: () => void
 }
 
 export const NavPrimaryMobile = ({
 	activeNavLink,
-	handleNavClick,
+	closeNavMobile,
 }: INavProps) => {
+	const handleNavBlur = useCallback((event: FocusEvent<HTMLAnchorElement>) => {
+		const isLastNavItem = /true/i.test(event.target.dataset?.lastNavItem ?? "")
+		if (isLastNavItem) closeNavMobile()
+	}, [])
 	return (
-		<nav aria-label="Primary" className={styles.navPrimaryMobile}>
+		<nav
+			aria-label="Primary"
+			className={styles.navPrimaryMobile}
+			onBlur={handleNavBlur}>
 			<ul className={styles.navList}>
 				{pages.map((page, index) => (
 					<NavItem
 						key={page.name + index}
 						page={page}
 						activeNavLink={activeNavLink}
-						handleNavClick={handleNavClick}
+						handleNavClick={closeNavMobile}
+						isLastNavItem={pages.length === index + 1}
 					/>
 				))}
 			</ul>
diff --git a/stories/Header.stories.tsx b/stories/Header.stories.tsx
index e21f164..32163c8 100644
--- a/stories/Header.stories.tsx
+++ b/stories/Header.stories.tsx
@@ -14,6 +14,6 @@ export const DesktopHeader = Template.bind({})
 DesktopHeader.args = {
 	headerTitle: "Page Title",
 	handleNavClick: () => true,
-	showNavMobile: false,
+	isNavMobileOpen: false,
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 } as IHeaderProps
diff --git a/stories/NavPrimaryMobile.stories.tsx b/stories/NavPrimaryMobile.stories.tsx
index f91419c..2e55d34 100644
--- a/stories/NavPrimaryMobile.stories.tsx
+++ b/stories/NavPrimaryMobile.stories.tsx
@@ -15,6 +15,6 @@ export const MobilePrimaryNav = Template.bind({})
 
 MobilePrimaryNav.args = {
 	activeNavLink: "/",
-	handleNavClick: () => true,
+	closeNavMobile: () => true,
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 } as INavProps