Skip to content

fix(ButtonBase): remove leading, trailing props from being spread onto base butotn #3744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2023
Merged

fix(ButtonBase): remove leading, trailing props from being spread onto base butotn #3744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Button/ButtonBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ import {defaultSxProp} from '../utils/defaultSxProp'
const ButtonBase = forwardRef(
({children, as: Component = 'button', sx: sxProp = defaultSxProp, ...props}, forwardedRef): JSX.Element => {
const {
leadingIcon,
leadingVisual,
trailingIcon,
trailingVisual,
trailingAction: TrailingAction,
icon: Icon,
variant = 'default',
Expand All @@ -19,8 +23,8 @@ const ButtonBase = forwardRef(
block = false,
...rest
} = props
const LeadingVisual = props.leadingVisual ?? props.leadingIcon
const TrailingVisual = props.trailingVisual ?? props.trailingIcon
const LeadingVisual = leadingVisual ?? leadingIcon
const TrailingVisual = trailingVisual ?? trailingIcon

const innerRef = React.useRef<HTMLButtonElement>(null)
useRefObjectAsForwardedRef(forwardedRef, innerRef)
Expand Down