From f1968c95bc20860001562f48dadf6980f4242f74 Mon Sep 17 00:00:00 2001
From: Abel John <9206066+abeljohn@users.noreply.github.com>
Date: Wed, 23 Jul 2025 17:25:31 -0700
Subject: [PATCH 1/3] remove tabIndex set in useTooltipTrigger

---
 packages/@react-aria/tooltip/src/useTooltipTrigger.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@react-aria/tooltip/src/useTooltipTrigger.ts b/packages/@react-aria/tooltip/src/useTooltipTrigger.ts
index 5ccfb801b17..4fa5bd7ec1d 100644
--- a/packages/@react-aria/tooltip/src/useTooltipTrigger.ts
+++ b/packages/@react-aria/tooltip/src/useTooltipTrigger.ts
@@ -139,9 +139,9 @@ export function useTooltipTrigger(props: TooltipTriggerProps, state: TooltipTrig
       'aria-describedby': state.isOpen ? tooltipId : undefined,
       ...mergeProps(focusableProps, hoverProps, {
         onPointerDown: onPressStart,
-        onKeyDown: onPressStart,
-        tabIndex: undefined
-      })
+        onKeyDown: onPressStart
+      }),
+      tabIndex: undefined
     },
     tooltipProps: {
       id: tooltipId

From a975733dc29d8ffa82538a8f03a138608320e621 Mon Sep 17 00:00:00 2001
From: Robert Snow <snowystinger@gmail.com>
Date: Thu, 24 Jul 2025 11:31:45 +1000
Subject: [PATCH 2/3] add test

---
 .../react-aria-components/test/Tooltip.test.js     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/react-aria-components/test/Tooltip.test.js b/packages/react-aria-components/test/Tooltip.test.js
index 249124a234b..498ebc65e79 100644
--- a/packages/react-aria-components/test/Tooltip.test.js
+++ b/packages/react-aria-components/test/Tooltip.test.js
@@ -312,4 +312,18 @@ describe('Tooltip', () => {
     let tooltip = getByRole('tooltip');
     expect(tooltip).toBeInTheDocument();
   });
+
+  it('should not override child properties', async () => {
+    let {getByRole} = render(
+      <TooltipTrigger>
+        <Button excludeFromTabOrder>
+          Check my tabindex
+        </Button>
+        <Tooltip>hello world</Tooltip>
+      </TooltipTrigger>
+    );
+
+    let button = getByRole('button');
+    expect(button).toHaveAttribute('tabindex', '-1');
+  });
 });

From fd7c7d306745a3aab43bf36efa668f6823526174 Mon Sep 17 00:00:00 2001
From: Robert Snow <snowystinger@gmail.com>
Date: Thu, 24 Jul 2025 11:34:37 +1000
Subject: [PATCH 3/3] add the opposite test as well

---
 .../react-aria-components/test/Tooltip.test.js   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/react-aria-components/test/Tooltip.test.js b/packages/react-aria-components/test/Tooltip.test.js
index 498ebc65e79..b958c419df6 100644
--- a/packages/react-aria-components/test/Tooltip.test.js
+++ b/packages/react-aria-components/test/Tooltip.test.js
@@ -313,7 +313,7 @@ describe('Tooltip', () => {
     expect(tooltip).toBeInTheDocument();
   });
 
-  it('should not override child properties', async () => {
+  it('should not override child properties for excludeFromTabOrder', async () => {
     let {getByRole} = render(
       <TooltipTrigger>
         <Button excludeFromTabOrder>
@@ -326,4 +326,18 @@ describe('Tooltip', () => {
     let button = getByRole('button');
     expect(button).toHaveAttribute('tabindex', '-1');
   });
+
+  it('should not override child properties', async () => {
+    let {getByRole} = render(
+      <TooltipTrigger>
+        <Button>
+          Check my tabindex
+        </Button>
+        <Tooltip>hello world</Tooltip>
+      </TooltipTrigger>
+    );
+
+    let button = getByRole('button');
+    expect(button).toHaveAttribute('tabindex', '0');
+  });
 });