diff --git a/packages/react/src/Button/Button.tsx b/packages/react/src/Button/Button.tsx index 30f64bd9d67..080d67fd329 100644 --- a/packages/react/src/Button/Button.tsx +++ b/packages/react/src/Button/Button.tsx @@ -2,10 +2,11 @@ import {forwardRef, type JSX} from 'react' import type {ButtonProps} from './types' import {ButtonBase} from './ButtonBase' import type {ForwardRefComponent as PolymorphicForwardRefComponent} from '../utils/polymorphic' +import {mergeProps} from '../utils/mergeProps' const ButtonComponent = forwardRef(({children, ...props}, forwardedRef): JSX.Element => { return ( - + {children} ) diff --git a/packages/react/src/Button/IconButton.tsx b/packages/react/src/Button/IconButton.tsx index b48d54475a5..617e751044f 100644 --- a/packages/react/src/Button/IconButton.tsx +++ b/packages/react/src/Button/IconButton.tsx @@ -6,6 +6,7 @@ import {Tooltip} from '../TooltipV2/Tooltip' import {TooltipContext} from '../TooltipV2/TooltipContext' import {TooltipContext as TooltipContextV1} from '../Tooltip/TooltipContext' import classes from './ButtonBase.module.css' +import {mergeProps} from '../utils/mergeProps' import {clsx} from 'clsx' const IconButton = forwardRef( @@ -43,15 +44,19 @@ const IconButton = forwardRef( if (withoutTooltip) { return ( ) } else { @@ -66,14 +71,18 @@ const IconButton = forwardRef( _privateDisableTooltip={hasActivePopup} > ) diff --git a/packages/react/src/Button/LinkButton.tsx b/packages/react/src/Button/LinkButton.tsx index a617581fa8b..b15aed99ca2 100644 --- a/packages/react/src/Button/LinkButton.tsx +++ b/packages/react/src/Button/LinkButton.tsx @@ -2,12 +2,13 @@ import {forwardRef, type JSX} from 'react' import type {LinkButtonProps as BaseLinkButtonProps, ButtonProps} from './types' import {ButtonBase} from './ButtonBase' import type {ForwardRefComponent as PolymorphicForwardRefComponent} from '../utils/polymorphic' +import {mergeProps} from '../utils/mergeProps' export type LinkButtonProps = BaseLinkButtonProps & ButtonProps const LinkButton = forwardRef(({children, as: Component = 'a', ...props}, forwardedRef): JSX.Element => { return ( - + {children} )