Skip to content

Commit

Permalink
fix(button.tsx): make prop theme work (#746)
Browse files Browse the repository at this point in the history
fix(button.tsx): fix: make prop theme work

Co-authored-by: Tinh Le Duc <[email protected]>
  • Loading branch information
ductinhkzz and ductinhkx97 authored May 22, 2023
1 parent e3e2112 commit 1b07a76
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/lib/components/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ const ButtonComponent = forwardRef<HTMLButtonElement | HTMLAnchorElement, Button
},
ref,
) => {
const { buttonGroup: groupTheme, button: theme } = mergeDeep(useTheme().theme, customTheme);
const { buttonGroup: groupTheme, button: buttonTheme } = useTheme().theme;
const theme = mergeDeep(buttonTheme, customTheme);

const isLink = typeof href !== 'undefined';
const Component = isLink ? 'a' : 'button';
Expand Down

0 comments on commit 1b07a76

Please sign in to comment.