feat: link component internal url test should include hash routes (#147…

…) (#148) Co-authored-by: Fran McDade <[email protected]>
DataBiosphere · Aug 7, 2024 · a797199 · a797199
1 parent 2f453dd
commit a797199
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/components/Links/common/utils.ts b/src/components/Links/common/utils.ts
@@ -7,7 +7,7 @@ import { Url, UrlObjectWithHrefAndQuery } from "./entities";
  * @returns true if the given link is an internal link.
  */
 export function isClientSideNavigation(link: string): boolean {
-  return /^\/(?!\/)/.test(link);
+  return /^\/(?!\/)|^#/.test(link);
 }
 
 /**

diff --git a/src/components/Links/components/Link/link.tsx b/src/components/Links/components/Link/link.tsx
@@ -36,6 +36,7 @@ export const Link = ({
   target,
   TypographyProps,
   url,
+  ...props /* Spread props to allow for specific MuiLink prop overrides. */
 }: LinkProps): JSX.Element => {
   if (isURLObjectWithHrefAndQuery(url)) {
     /* Internal navigation - explore link */
@@ -62,6 +63,7 @@ export const Link = ({
               target={target || ANCHOR_TARGET.SELF}
               onClick={onClick}
               {...TypographyProps}
+              {...props}
             >
               {label}
             </MLink>
@@ -82,6 +84,7 @@ export const Link = ({
             rel={REL_ATTRIBUTE.NO_OPENER_NO_REFERRER}
             target={target || ANCHOR_TARGET.BLANK}
             {...TypographyProps}
+            {...props}
           >
             {label}
           </MLink>
@@ -92,7 +95,12 @@ export const Link = ({
   }
   /* Invalid URL */
   return (
-    <MTypography component="span" variant="inherit" {...TypographyProps}>
+    <MTypography
+      component="span"
+      variant="inherit"
+      {...TypographyProps}
+      {...props}
+    >
       {label}
     </MTypography>
   );