From da97dad6253f6723fde6974799ef68ed8252f258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sofia=20Sj=C3=B6blad?= <ssjoblad@spotify.com>
Date: Tue, 7 Oct 2025 16:20:49 +0200
Subject: [PATCH] Revert "Merge pull request #31230 from
 backstage/bui-fix-tooltip"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 60c5db13568fe1acbb2a7c64298d11e6a1d98647, reversing
changes made to 47f5d67bea83b3179f2540ad18a06cb44fabc5b9.

Signed-off-by: Sofia Sjöblad <ssjoblad@spotify.com>
---
 .changeset/moody-singers-deny.md                 |  5 -----
 .../ui/src/components/Button/Button.stories.tsx  | 10 ----------
 packages/ui/src/components/Button/Button.tsx     | 16 ++--------------
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 .changeset/moody-singers-deny.md

diff --git a/.changeset/moody-singers-deny.md b/.changeset/moody-singers-deny.md
deleted file mode 100644
index 28072baf4b..0000000000
--- a/.changeset/moody-singers-deny.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/ui': patch
----
-
-Enable tooltips on disabled buttons with automatic wrapper
diff --git a/packages/ui/src/components/Button/Button.stories.tsx b/packages/ui/src/components/Button/Button.stories.tsx
index 1604c04eb4..db8e999f98 100644
--- a/packages/ui/src/components/Button/Button.stories.tsx
+++ b/packages/ui/src/components/Button/Button.stories.tsx
@@ -19,7 +19,6 @@ import { Button } from './Button';
 import { Flex } from '../Flex';
 import { Text } from '../Text';
 import { Icon } from '../Icon';
-import { Tooltip, TooltipTrigger } from '../Tooltip';
 
 const meta = {
   title: 'Backstage UI/Button',
@@ -217,12 +216,3 @@ export const Playground: Story = {
     </Flex>
   ),
 };
-
-export const DisabledWithTooltips: Story = {
-  render: () => (
-    <TooltipTrigger>
-      <Button isDisabled>Save</Button>
-      <Tooltip>Why this is disabled</Tooltip>
-    </TooltipTrigger>
-  ),
-};
diff --git a/packages/ui/src/components/Button/Button.tsx b/packages/ui/src/components/Button/Button.tsx
index 9f658fd00a..40879e51ed 100644
--- a/packages/ui/src/components/Button/Button.tsx
+++ b/packages/ui/src/components/Button/Button.tsx
@@ -16,7 +16,7 @@
 
 import clsx from 'clsx';
 import { forwardRef, Ref } from 'react';
-import { Button as RAButton, Focusable } from 'react-aria-components';
+import { Button as RAButton } from 'react-aria-components';
 import type { ButtonProps } from './types';
 import { useStyles } from '../../hooks/useStyles';
 
@@ -30,7 +30,6 @@ export const Button = forwardRef(
       iconEnd,
       children,
       className,
-      isDisabled,
       ...rest
     } = props;
 
@@ -39,29 +38,18 @@ export const Button = forwardRef(
       variant,
     });
 
-    const btn = (
+    return (
       <RAButton
         className={clsx(classNames.root, className)}
         ref={ref}
         {...dataAttributes}
         {...rest}
-        isDisabled={!!isDisabled}
       >
         {iconStart}
         {children}
         {iconEnd}
       </RAButton>
     );
-
-    return isDisabled ? (
-      <Focusable>
-        <span role="button" tabIndex={0} style={{ display: 'inline-flex' }}>
-          {btn}
-        </span>
-      </Focusable>
-    ) : (
-      btn
-    );
   },
 );