Skip to content

Commit

Permalink
fix: drag to re-arrange custom columns not working (#1299)
Browse files Browse the repository at this point in the history
resolves: #1282

Broken by #1013. Can't use prop spreading with our Button component,
added support for spreading.
Needs silverheels cherry-pick.
  • Loading branch information
dsmmcken committed May 16, 2023
1 parent 0e3eb2c commit 79ca688
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions packages/components/src/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
tabIndex,
'data-testid': dataTestId,
'aria-label': ariaLabel,
...rest
} = props;

const iconOnly = Boolean(icon && children == null);
Expand Down Expand Up @@ -167,6 +168,8 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
disabled={disabled}
tabIndex={tabIndex}
aria-label={ariaLabelString}
// eslint-disable-next-line react/jsx-props-no-spreading
{...rest}
>
{icon && iconElem}
{children}
Expand Down

0 comments on commit 79ca688

Please sign in to comment.