Merge pull request #246 from smartive-education/feature/navibutton-2

fix: NaviButton
ost-cas-fee-adv-22-23 · Mar 14, 2023 · d1d248e · d1d248e
2 parents 09fb8b8 + eb51506
commit d1d248e
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/packages/design-system-component-library-yeahyeahyeah/components/button/NaviButton.tsx b/packages/design-system-component-library-yeahyeahyeah/components/button/NaviButton.tsx
@@ -29,7 +29,7 @@ export const NaviButton = <
 }: NaviButtonProps<T>) => {
   const Icon = createIcon(icon);
 
-  return (
+  return !onClick ? (
     <Link {...(props as any)} href={href}>
       <StyledButton aria-label={label} onClick={onClick}>
         {variant === 'default' && (
@@ -41,6 +41,16 @@ export const NaviButton = <
         {variant === 'profile' && children}
       </StyledButton>
     </Link>
+  ) : (
+    <StyledButton aria-label={label} onClick={onClick}>
+      {variant === 'default' && (
+        <>
+          <Icon />
+          <Span>{label}</Span>
+        </>
+      )}
+      {variant === 'profile' && children}
+    </StyledButton>
   );
 };