From cb321f05b95c53ea15bfcd18a0d2b0df60bf67d1 Mon Sep 17 00:00:00 2001
From: Armagan Ersoz <broccolinisoup@github.com>
Date: Thu, 11 Jul 2024 12:21:13 +1000
Subject: [PATCH 1/2] Remove the external Tooltip from textinputinneraction

---
 .../components/TextInputInnerAction.tsx       | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/react/src/internal/components/TextInputInnerAction.tsx b/packages/react/src/internal/components/TextInputInnerAction.tsx
index 93ce1b7ba93..c4aa909d767 100644
--- a/packages/react/src/internal/components/TextInputInnerAction.tsx
+++ b/packages/react/src/internal/components/TextInputInnerAction.tsx
@@ -79,7 +79,16 @@ const ConditionalTooltip: React.FC<
 
 const TextInputAction = forwardRef<HTMLButtonElement, TextInputActionProps>(
   (
-    {'aria-label': ariaLabel, tooltipDirection, children, icon, sx: sxProp, variant = 'invisible', ...rest},
+    {
+      'aria-label': ariaLabel,
+      'aria-labelledby': ariaLabelledBy,
+      tooltipDirection,
+      children,
+      icon,
+      sx: sxProp,
+      variant = 'invisible',
+      ...rest
+    },
     forwardedRef,
   ) => {
     const sx =
@@ -92,13 +101,28 @@ const TextInputAction = forwardRef<HTMLButtonElement, TextInputActionProps>(
       console.warn('Use the `aria-label` prop to provide an accessible label for assistive technology')
     }
 
+    const accessibleLabel = ariaLabel
+      ? {'aria-label': ariaLabel}
+      : ariaLabelledBy
+      ? {'aria-labelledby': ariaLabelledBy}
+      : {
+          'aria-label': '',
+        }
+
     return (
       <Box as="span" className="TextInput-action" marginLeft={1} marginRight={1} lineHeight="0">
-        {icon && !children ? (
-          <Tooltip direction={tooltipDirection ?? 's'} text={ariaLabel ?? ''} type="label">
-            {/* @ts-ignore we intentionally do add aria-label to IconButton because Tooltip v2 adds an aria-labelledby instead. */}
-            <IconButton variant={variant} type="button" icon={icon} size="small" sx={sx} {...rest} ref={forwardedRef} />
-          </Tooltip>
+        {icon && !children && ariaLabel ? (
+          <IconButton
+            {...accessibleLabel}
+            tooltipDirection={tooltipDirection ?? 's'}
+            variant={variant}
+            type="button"
+            icon={icon}
+            size="small"
+            sx={sx}
+            {...rest}
+            ref={forwardedRef}
+          />
         ) : (
           <ConditionalTooltip aria-label={ariaLabel}>
             <Button variant={variant} type="button" sx={sx} {...rest} ref={forwardedRef}>

From 69244dd13f643fe65d537713695107fef8a18677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C4=9Fan?= <broccolinisoup@github.com>
Date: Thu, 11 Jul 2024 12:31:54 +1000
Subject: [PATCH 2/2] Create modern-carrots-check.md

---
 .changeset/modern-carrots-check.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/modern-carrots-check.md

diff --git a/.changeset/modern-carrots-check.md b/.changeset/modern-carrots-check.md
new file mode 100644
index 00000000000..7ef53275eaf
--- /dev/null
+++ b/.changeset/modern-carrots-check.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+TextInput: Refactor TextInputInnerAction to use the default icon button tooltip (No changes in the behaviour or DOM is expected)