reverted Link.tsx changes & updated url.ts isHrefActive() behavior

Author: 0xOZ

src/components/Link.tsx

@@ -58,12 +58,11 @@ export const BaseLink = forwardRef(function Link(
   ref
 ) {
   const { asPath } = useRouter()
-  const cleanAsPath = asPath.replace(/#.*/, "");
   const { flipForRtl } = useRtlFlip()
 
   let href = (to ?? hrefProp) as string
 
-  const isActive = url.isHrefActive(href, cleanAsPath, isPartiallyActive)
+  const isActive = url.isHrefActive(href, asPath, isPartiallyActive)
   const isDiscordInvite = url.isDiscordInvite(href)
   const isPdf = url.isPdf(href)
   const isExternal = url.isExternal(href)

src/lib/utils/url.ts

@@ -28,17 +28,18 @@ export const sanitizeHitUrl = (url: string): string =>
     .replace("#content", "")
     .replace("#top", "")
 
+// remove any query params or hashes from the path
+export const cleanPath = (path: string): string => path.replace(/[$#].+$/, "")
+
 export const isHrefActive = (
   href: string,
   pathname: string,
   isPartiallyActive?: boolean
-) => (isPartiallyActive ? pathname.startsWith(href) : pathname === href)
+) =>
+  isPartiallyActive ? pathname.startsWith(href) : cleanPath(pathname) === href
 
 export const isHash = (href: string): boolean => href.startsWith("#")
 
-// remove any query params or hashes from the path
-export const cleanPath = (path: string): string => path.replace(/[$#].+$/, "")
-
 export const addSlashes = (href: string): string => {
   if (isExternal(href)) return href
   return join("/", href, "/")