Skip to content

Commit f16f0e1

Browse files
authored
fix(iconbutton): fix overriding of default sx prop
* refactor(button) Set deafault type of Button to button * perf(usePopup): fix dependency array * fix(iconbutton): fix overriding of default sx prop
1 parent 18b3d24 commit f16f0e1

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

src/components/button/index.tsx

+9-4
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,18 @@ const Button: FC<QuartzButtonProps> = ({
3131
loadingOnly,
3232
target,
3333
external,
34+
sx,
35+
type = 'button',
3436
...props
3537
}: QuartzButtonProps) => {
36-
const test = { ...props };
37-
test.sx = { ...test.sx, ...styles };
38-
3938
const component = (
40-
<RebassButton variant={intent} disabled={disabled || isLoading} {...test}>
39+
<RebassButton
40+
variant={intent}
41+
disabled={disabled || isLoading}
42+
sx={{ ...sx, ...styles }}
43+
type={type}
44+
{...props}
45+
>
4146
{icon && (!loadingOnly || !isLoading) && (
4247
<GetIcon icon={icon} size="md" color={buttonIntentToColor(intent)} />
4348
)}

src/components/icon-button/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ const IconButton: FC<IconButtonProps> = ({
2727
href,
2828
onClickIcon,
2929
target,
30+
sx,
3031
...props
3132
}: IconButtonProps) => {
3233
let component;
3334
if (tooltip) {
3435
component = (
3536
<Tooltip {...tooltipProps} disabled={disabled} mainText={tooltip}>
3637
<RebassButton
37-
sx={styles(disabled)}
38+
sx={{ ...styles(disabled), ...sx }}
3839
variant={`icon-${intent}`}
3940
disabled={disabled}
4041
{...props}

src/utils/usePopup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const usePopup = (isInitialOpen = false): UsePopup => {
77

88
const handleToggle = useCallback(() => {
99
setOpen((open) => !open);
10-
}, [isOpen, setOpen]);
10+
}, [setOpen]);
1111

1212
return [isOpen, handleToggle, setOpen];
1313
};

0 commit comments

Comments
 (0)