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,7 +80,8 @@ const Navigation = (props: Props) => { ...@@ -79,7 +80,8 @@ 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>
{primaryNavLinks.map((navLink) => (
<NavLink <NavLink
className={({ isActive }) => className={({ isActive }) =>
cn( cn(
...@@ -93,10 +95,10 @@ const Navigation = (props: Props) => { ...@@ -93,10 +95,10 @@ const Navigation = (props: Props) => {
key={navLink.id} key={navLink.id}
to={navLink.path} to={navLink.path}
id={navLink.id} id={navLink.id}
aria-label={navLink.id === "header-inbox" ? inboxAriaLabel : undefined}
viewTransition viewTransition
> >
{props.collapsed ? ( {props.collapsed ? (
<TooltipProvider>
<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