From 5b3f3d2795aa291d8172c84dbdd187fcab5fad64 Mon Sep 17 00:00:00 2001
From: Josh Black <joshblack@github.com>
Date: Wed, 12 Aug 2026 09:29:20 -0500
Subject: [PATCH 1/2] Migrate Text root to mergeProps

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 84a0d8ca-13d3-4cb2-ab24-18fa2d9a8a14
---
 packages/react/src/Text/Text.tsx | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/react/src/Text/Text.tsx b/packages/react/src/Text/Text.tsx
index 7bc199f10b8..35c9fea9557 100644
--- a/packages/react/src/Text/Text.tsx
+++ b/packages/react/src/Text/Text.tsx
@@ -3,6 +3,7 @@ import type React from 'react'
 import {type ForwardedRef} from 'react'
 import classes from './Text.module.css'
 import {fixedForwardRef, type PolymorphicProps} from '../utils/modern-polymorphic'
+import {mergeProps} from '../utils/mergeProps'
 
 export type TextProps<As extends React.ElementType = 'span'> = PolymorphicProps<
   As,
@@ -21,13 +22,17 @@ function Text<As extends React.ElementType>(props: TextProps<As>, ref: Forwarded
 
   return (
     <Component
-      className={clsx(className, classes.Text)}
-      data-component="Text"
-      data-size={size}
-      data-weight={weight}
-      data-white-space={whiteSpace}
-      {...rest}
       ref={ref}
+      {...mergeProps(
+        {
+          className: clsx(classes.Text, className),
+          'data-component': 'Text',
+          'data-size': size,
+          'data-weight': weight,
+          'data-white-space': whiteSpace,
+        },
+        rest,
+      )}
     />
   )
 }

From 30a75da791ceb02a9b470353fa027b331cb8b0b3 Mon Sep 17 00:00:00 2001
From: Josh Black <joshblack@github.com>
Date: Thu, 13 Aug 2026 16:20:06 -0500
Subject: [PATCH 2/2] Update TextInputWithTokens snapshot

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 565aa678-84c7-41f4-9281-17b47f3885ff
---
 .../__snapshots__/TextInputWithTokens.test.tsx.snap           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/TextInputWithTokens/__snapshots__/TextInputWithTokens.test.tsx.snap b/packages/react/src/TextInputWithTokens/__snapshots__/TextInputWithTokens.test.tsx.snap
index e281566982b..44c031c6f53 100644
--- a/packages/react/src/TextInputWithTokens/__snapshots__/TextInputWithTokens.test.tsx.snap
+++ b/packages/react/src/TextInputWithTokens/__snapshots__/TextInputWithTokens.test.tsx.snap
@@ -1088,7 +1088,7 @@ exports[`TextInputWithTokens > renders a truncated set of tokens 1`] = `
             </span>
           </span>
           <span
-            class="prc-TextInputWithTokens-OverflowCountXLarge-zydSJ prc-Text-Text-jAl-N"
+            class="prc-Text-Text-jAl-N prc-TextInputWithTokens-OverflowCountXLarge-zydSJ"
             data-component="TextInputWithTokens.OverflowCount"
           >
             +
@@ -1217,7 +1217,7 @@ exports[`TextInputWithTokens > renders a truncated set of tokens 1`] = `
           </span>
         </span>
         <span
-          class="prc-TextInputWithTokens-OverflowCountXLarge-zydSJ prc-Text-Text-jAl-N"
+          class="prc-Text-Text-jAl-N prc-TextInputWithTokens-OverflowCountXLarge-zydSJ"
           data-component="TextInputWithTokens.OverflowCount"
         >
           +