From b82d8438732449e4035ebc36e3d1be62ecd9a557 Mon Sep 17 00:00:00 2001
From: Taylor Jones <tay1orjones@users.noreply.github.com>
Date: Tue, 16 Apr 2024 10:46:19 -0500
Subject: [PATCH] fix(button): only use tooltipAlignment if button hasIconOnly
 (#16169)

Co-authored-by: Alison Joseph <alison.joseph@us.ibm.com>
---
 packages/react/src/components/Button/Button.tsx              | 4 +++-
 .../react/src/components/Button/__tests__/Button-test.js     | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/components/Button/Button.tsx b/packages/react/src/components/Button/Button.tsx
index b75384839f93..7a0c6ce373cf 100644
--- a/packages/react/src/components/Button/Button.tsx
+++ b/packages/react/src/components/Button/Button.tsx
@@ -154,7 +154,9 @@ const Button = React.forwardRef(function Button<T extends React.ElementType>(
   const iconOnlyImage = !ButtonImageElement ? null : <ButtonImageElement />;
 
   if (!isIconOnlyButton(hasIconOnly, kind)) {
-    return <ButtonBase ref={ref} {...props} />;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { tooltipAlignment, ...propsWithoutTooltipAlignment } = props;
+    return <ButtonBase ref={ref} {...propsWithoutTooltipAlignment} />;
   } else {
     let align: PopoverAlignment | undefined = undefined;
 
diff --git a/packages/react/src/components/Button/__tests__/Button-test.js b/packages/react/src/components/Button/__tests__/Button-test.js
index 458ef2e99c37..1ab3809bd59e 100644
--- a/packages/react/src/components/Button/__tests__/Button-test.js
+++ b/packages/react/src/components/Button/__tests__/Button-test.js
@@ -80,6 +80,11 @@ describe('Button', () => {
     );
   });
 
+  it('should not error on tooltipAlignment even when hasIconOnly=false', () => {
+    render(<Button tooltipAlignment="start" />);
+    expect(screen.getByRole('button')).toBeInTheDocument();
+  });
+
   it.each([
     ['primary', 'cds--btn'],
     ['secondary', 'cds--btn--secondary'],