Skip to content

Commit

Permalink
dont pass in base styles
Browse files Browse the repository at this point in the history
  • Loading branch information
langermank committed Nov 1, 2024
1 parent 25ebfca commit 84d1511
Showing 1 changed file with 12 additions and 17 deletions.
29 changes: 12 additions & 17 deletions packages/react/src/Button/ButtonBase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const ButtonBase = forwardRef(
>
<Box
as={Component}
sx={sxStyles}
sx={sxProp}
aria-disabled={loading ? true : undefined}
{...rest}
ref={innerRef}
Expand Down Expand Up @@ -198,13 +198,13 @@ const ButtonBase = forwardRef(
true,
)
: TrailingVisual
? renderModuleVisual(
TrailingVisual,
Boolean(loading) && !LeadingVisual,
'trailingVisual',
false,
)
: null
? renderModuleVisual(
TrailingVisual,
Boolean(loading) && !LeadingVisual,
'trailingVisual',
false,
)
: null
}
</Box>
{
Expand Down Expand Up @@ -314,13 +314,8 @@ const ButtonBase = forwardRef(
true,
)
: TrailingVisual
? renderModuleVisual(
TrailingVisual,
Boolean(loading) && !LeadingVisual,
'trailingVisual',
false,
)
: null
? renderModuleVisual(TrailingVisual, Boolean(loading) && !LeadingVisual, 'trailingVisual', false)
: null
}
</span>
{
Expand Down Expand Up @@ -425,8 +420,8 @@ const ButtonBase = forwardRef(
'trailingVisual',
)
: TrailingVisual
? renderVisual(TrailingVisual, Boolean(loading) && !LeadingVisual, 'trailingVisual')
: null
? renderVisual(TrailingVisual, Boolean(loading) && !LeadingVisual, 'trailingVisual')
: null
}
</Box>
{
Expand Down

0 comments on commit 84d1511

Please sign in to comment.