Merge branch 'next' into jw/ecr-viewer-page

CDCgov · Nov 20, 2024 · 9f8355f · 9f8355f
2 parents 5b96075 + 472c2a7
commit 9f8355f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/app/components/NavigationLink/NavigationLink.tsx b/src/app/components/NavigationLink/NavigationLink.tsx
@@ -12,9 +12,15 @@ export function NavigationLink({
   onClick,
 }: NavigationLinkProps) {
   const pathname = usePathname();
-  const isActive = pathname === href;
+  const isActive = pathname.includes(href.toString());
+
   return (
-    <Link href={href} passHref onClick={onClick}>
+    <Link
+      href={href}
+      passHref
+      onClick={onClick}
+      {...(isActive ? { 'aria-current': 'page' } : {})}
+    >
       <span
         className={classNames('text-white', {
           underline: isActive,