Commit 2523d966 authored by boojack's avatar boojack

chore(web): improve navigation accessibility

parent fee7fcd6
...@@ -69,9 +69,10 @@ const Navigation = (props: Props) => { ...@@ -69,9 +69,10 @@ const Navigation = (props: Props) => {
icon: <UserCircleIcon className="w-6 h-auto shrink-0" />, icon: <UserCircleIcon className="w-6 h-auto shrink-0" />,
}; };
const navLinks: NavLinkItem[] = currentUser const primaryNavLinks: NavLinkItem[] = currentUser
? [homeNavLink, exploreNavLink, attachmentsNavLink, inboxNavLink] ? [homeNavLink, exploreNavLink, attachmentsNavLink, inboxNavLink]
: [exploreNavLink, signInNavLink]; : [exploreNavLink, signInNavLink];
const inboxAriaLabel = unreadCount > 0 ? `${t("common.inbox")}, ${unreadCount} unread` : t("common.inbox");
return ( return (
<header className={cn("w-full h-full overflow-auto flex flex-col justify-between items-start gap-4", className)}> <header className={cn("w-full h-full overflow-auto flex flex-col justify-between items-start gap-4", className)}>
...@@ -79,24 +80,25 @@ const Navigation = (props: Props) => { ...@@ -79,24 +80,25 @@ const Navigation = (props: Props) => {
<NavLink className="mb-3 cursor-default" to={currentUser ? Routes.ROOT : Routes.EXPLORE}> <NavLink className="mb-3 cursor-default" to={currentUser ? Routes.ROOT : Routes.EXPLORE}>
<MemosLogo collapsed={collapsed} /> <MemosLogo collapsed={collapsed} />
</NavLink> </NavLink>
{navLinks.map((navLink) => ( <TooltipProvider>
<NavLink {primaryNavLinks.map((navLink) => (
className={({ isActive }) => <NavLink
cn( className={({ isActive }) =>
"px-2 py-2 rounded-2xl border flex flex-row items-center text-lg text-sidebar-foreground transition-colors", cn(
collapsed ? "" : "w-full px-4", "px-2 py-2 rounded-2xl border flex flex-row items-center text-lg text-sidebar-foreground transition-colors",
isActive collapsed ? "" : "w-full px-4",
? "bg-sidebar-accent text-sidebar-accent-foreground border-sidebar-accent-border drop-shadow" isActive
: "border-transparent hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:border-sidebar-accent-border opacity-80", ? "bg-sidebar-accent text-sidebar-accent-foreground border-sidebar-accent-border drop-shadow"
) : "border-transparent hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:border-sidebar-accent-border opacity-80",
} )
key={navLink.id} }
to={navLink.path} key={navLink.id}
id={navLink.id} to={navLink.path}
viewTransition id={navLink.id}
> aria-label={navLink.id === "header-inbox" ? inboxAriaLabel : undefined}
{props.collapsed ? ( viewTransition
<TooltipProvider> >
{props.collapsed ? (
<Tooltip> <Tooltip>
<TooltipTrigger asChild> <TooltipTrigger asChild>
<div>{navLink.icon}</div> <div>{navLink.icon}</div>
...@@ -105,13 +107,13 @@ const Navigation = (props: Props) => { ...@@ -105,13 +107,13 @@ const Navigation = (props: Props) => {
<p>{navLink.title}</p> <p>{navLink.title}</p>
</TooltipContent> </TooltipContent>
</Tooltip> </Tooltip>
</TooltipProvider> ) : (
) : ( navLink.icon
navLink.icon )}
)} {!props.collapsed && <span className="ml-3 truncate">{navLink.title}</span>}
{!props.collapsed && <span className="ml-3 truncate">{navLink.title}</span>} </NavLink>
</NavLink> ))}
))} </TooltipProvider>
</div> </div>
{currentUser && ( {currentUser && (
<div className={cn("w-full flex flex-col justify-end", props.collapsed ? "items-center" : "items-start pl-3")}> <div className={cn("w-full flex flex-col justify-end", props.collapsed ? "items-center" : "items-start pl-3")}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment