File tree 3 files changed +12
-6
lines changed
3 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -31,13 +31,18 @@ const Button: FC<QuartzButtonProps> = ({
31
31
loadingOnly,
32
32
target,
33
33
external,
34
+ sx,
35
+ type = 'button' ,
34
36
...props
35
37
} : QuartzButtonProps ) => {
36
- const test = { ...props } ;
37
- test . sx = { ...test . sx , ...styles } ;
38
-
39
38
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
+ >
41
46
{ icon && ( ! loadingOnly || ! isLoading ) && (
42
47
< GetIcon icon = { icon } size = "md" color = { buttonIntentToColor ( intent ) } />
43
48
) }
Original file line number Diff line number Diff line change @@ -27,14 +27,15 @@ const IconButton: FC<IconButtonProps> = ({
27
27
href,
28
28
onClickIcon,
29
29
target,
30
+ sx,
30
31
...props
31
32
} : IconButtonProps ) => {
32
33
let component ;
33
34
if ( tooltip ) {
34
35
component = (
35
36
< Tooltip { ...tooltipProps } disabled = { disabled } mainText = { tooltip } >
36
37
< RebassButton
37
- sx = { styles ( disabled ) }
38
+ sx = { { ... styles ( disabled ) , ... sx } }
38
39
variant = { `icon-${ intent } ` }
39
40
disabled = { disabled }
40
41
{ ...props }
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ const usePopup = (isInitialOpen = false): UsePopup => {
7
7
8
8
const handleToggle = useCallback ( ( ) => {
9
9
setOpen ( ( open ) => ! open ) ;
10
- } , [ isOpen , setOpen ] ) ;
10
+ } , [ setOpen ] ) ;
11
11
12
12
return [ isOpen , handleToggle , setOpen ] ;
13
13
} ;
You can’t perform that action at this time.
0 commit comments