From 387e0a7cd1865306d5b7880fbfab8e8b4060cb68 Mon Sep 17 00:00:00 2001 From: Josh Black Date: Thu, 14 Sep 2023 12:22:17 -0500 Subject: [PATCH] fix(ButtonBase): remove leading, trailing props from being spread onto base button --- src/Button/ButtonBase.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Button/ButtonBase.tsx b/src/Button/ButtonBase.tsx index bf11edff9e2..6ae4ae4b274 100644 --- a/src/Button/ButtonBase.tsx +++ b/src/Button/ButtonBase.tsx @@ -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', @@ -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(null) useRefObjectAsForwardedRef(forwardedRef, innerRef)