songtianlun/prmbr-image-mksaas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: optimize navbar menu link active status

Browse Source
This commit is contained in:
javayhu 2025-06-07 23:36:18 +08:00
parent 9b7c1387f9
commit 00dcd7ce61
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/layout/navbar-mobile.tsx
View File

@ -103,7 +103,7 @@ export function NavbarMobile({
aria-expanded={open}
aria-label="Toggle Mobile Menu"
onClick={handleToggleMobileMenu}
className="size-8 flex aspect-square h-fit select-none items-center
className="size-8 flex aspect-square h-fit select-none items-center
justify-center rounded-md border cursor-pointer"
>
{open ? (
@ -118,7 +118,7 @@ export function NavbarMobile({
{/* mobile menu */}
{open && (
<Portal asChild>
{/* if we don't add RemoveScroll component, the underlying
{/* if we don't add RemoveScroll component, the underlying
page will scroll when we scroll the mobile menu */}
<RemoveScroll allowPinchZoom enabled>
{/* Only render MainMobileMenu when not in loading state */}
@ -188,10 +188,15 @@ function MainMobileMenu({ userLoggedIn, onLinkClicked }: MainMobileMenuProps) {
<ul className="w-full px-4">
{menuLinks?.map((item) => {
const isActive = item.href
? localePathname.startsWith(item.href)
? item.href === '/'
? localePathname === '/'
: localePathname.startsWith(item.href)
: item.items?.some(
(subItem) =>
subItem.href && localePathname.startsWith(subItem.href)
subItem.href &&
(subItem.href === '/'
? localePathname === '/'
: localePathname.startsWith(subItem.href))
);
return (

4
src/components/layout/navbar.tsx
View File

@ -193,7 +193,9 @@ export function Navbar({ scroll }: NavBarProps) {
asChild
active={
item.href
? localePathname.startsWith(item.href)
? item.href === '/'
? localePathname === '/'
: localePathname.startsWith(item.href)
: false
}
className={customNavigationMenuTriggerStyle}