From 71719a2610245b7c9bb46288b612dd280d8a8254 Mon Sep 17 00:00:00 2001
From: Daniel Lu <dl1644@gmail.com>
Date: Mon, 17 Aug 2026 17:07:47 -0700
Subject: [PATCH 1/2] fix: auto set static color auto and fix tokenfield docs
 regex for IME

---
 .../@react-spectrum/ai/src/PromptField.tsx    | 60 +++++++++++--------
 .../s2-docs/pages/react-aria/TokenField.mdx   |  6 +-
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/packages/@react-spectrum/ai/src/PromptField.tsx b/packages/@react-spectrum/ai/src/PromptField.tsx
index 83958e2f52a..025fa42b848 100644
--- a/packages/@react-spectrum/ai/src/PromptField.tsx
+++ b/packages/@react-spectrum/ai/src/PromptField.tsx
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/s2/ActionButton';
+import {ActionButton, ActionButtonContext} from '@react-spectrum/s2/ActionButton';
 import Attach from '@react-spectrum/s2/icons/Attach';
 import {Attachment, AttachmentList, AttachmentListProps} from './AttachmentList';
 import {Autocomplete} from 'react-aria-components/Autocomplete';
-import {Button} from '@react-spectrum/s2/Button';
+import {Button, ButtonContext} from '@react-spectrum/s2/Button';
 import {Cell} from './loader/data';
 import {CenterBaseline} from '@react-spectrum/s2/CenterBaseline';
 import {color, css, space, style, StyleString} from '@react-spectrum/s2/style' with {type: 'macro'};
@@ -39,6 +39,7 @@ import {Image, Text} from '@react-spectrum/s2/Card';
 import intlMessages from '../intl/*.json';
 import {isFileDropItem, useDrop} from 'react-aria-components/useDrop';
 import {Link} from '@react-spectrum/s2/Link';
+import {LinkButtonContext} from '@react-spectrum/s2/LinkButton';
 import {Menu, MenuItem, MenuItemProps, MenuTrigger} from '@react-spectrum/s2/Menu';
 import Microphone from '@react-spectrum/s2/icons/Microphone';
 import {PixelLoader} from './loader/react';
@@ -53,10 +54,11 @@ import {
 } from 'react-stately/useTokenFieldState';
 import {PromptFieldContainer} from './PromptFieldContainer';
 import {PromptFocusContext} from './Chat';
+import {Provider} from 'react-aria-components/slots';
 import Send from '@react-spectrum/s2/icons/ArrowUpSend';
 import {setTokenFieldSelection} from 'react-aria/useTokenField';
 import Stop from '@react-spectrum/s2/icons/StopProcessing';
-import {ToggleButton} from '@react-spectrum/s2/ToggleButton';
+import {ToggleButton, ToggleButtonContext} from '@react-spectrum/s2/ToggleButton';
 import {
   Token,
   TokenField,
@@ -337,28 +339,36 @@ export const PromptField = forwardRef(function PromptField(
         onAddAttachments,
         onRemoveAttachments
       }}>
-      <div ref={domRef} {...focusWithinProps}>
-        <PromptFieldContainer
-          {...dropProps}
-          role="group"
-          variant={variant}
-          brandColor={brandColor}
-          isGenerating={isGenerating ?? false}
-          isDropTarget={isDropTarget}
-          styles={styles}
-          inputRef={inputRef}>
-          {children}
-        </PromptFieldContainer>
-        <p className={style({font: 'ui-sm', textAlign: 'center'})}>
-          {stringFormatter.format('promptfield.aiDisclaimer')}{' '}
-          <Link
-            variant="secondary"
-            href="https://www.adobe.com/legal/licenses-terms/adobe-gen-ai-user-guidelines.html"
-            target="_blank">
-            {stringFormatter.format('promptfield.aiUserGuidlines')}
-          </Link>
-        </p>
-      </div>
+      <Provider
+        values={[
+          [ButtonContext, {staticColor: 'auto'}],
+          [LinkButtonContext, {staticColor: 'auto'}],
+          [ActionButtonContext, {staticColor: 'auto'}],
+          [ToggleButtonContext, {staticColor: 'auto'}]
+        ]}>
+        <div ref={domRef} {...focusWithinProps}>
+          <PromptFieldContainer
+            {...dropProps}
+            role="group"
+            variant={variant}
+            brandColor={brandColor}
+            isGenerating={isGenerating ?? false}
+            isDropTarget={isDropTarget}
+            styles={styles}
+            inputRef={inputRef}>
+            {children}
+          </PromptFieldContainer>
+          <p className={style({font: 'ui-sm', textAlign: 'center'})}>
+            {stringFormatter.format('promptfield.aiDisclaimer')}{' '}
+            <Link
+              variant="secondary"
+              href="https://www.adobe.com/legal/licenses-terms/adobe-gen-ai-user-guidelines.html"
+              target="_blank">
+              {stringFormatter.format('promptfield.aiUserGuidlines')}
+            </Link>
+          </p>
+        </div>
+      </Provider>
     </PromptFieldContext.Provider>
   );
 });
diff --git a/packages/dev/s2-docs/pages/react-aria/TokenField.mdx b/packages/dev/s2-docs/pages/react-aria/TokenField.mdx
index b634f87a538..f4202f5619b 100644
--- a/packages/dev/s2-docs/pages/react-aria/TokenField.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/TokenField.mdx
@@ -23,7 +23,7 @@ export const description = 'Allows users to enter text with inline tokens such a
     /* PROPS */
     defaultValue={TokenizingFieldValue.tokenize(
       'This example automatically tokenizes #hashtags and @usernames in the text.',
-      /(?<=\s|^)[#@]\S+(?=\s)/g
+      /(?<=[\s\u200B]|^)[#@][^\s\u200B]+(?=[\s\u200B])/g
     )}>
     {segment => <Token>{segment.text}</Token>}
   </TokenField>
@@ -38,7 +38,7 @@ export const description = 'Allows users to enter text with inline tokens such a
     /* PROPS */
     defaultValue={TokenizingFieldValue.tokenize(
       'This example automatically tokenizes #hashtags and @usernames in the text.',
-      /(?<=\s|^)[#@]\S+(?=\s)/g
+      /(?<=[\s\u200B]|^)[#@][^\s\u200B]+(?=[\s\u200B])/g
     )}>
     {segment => <Token>{segment.text}</Token>}
   </TokenField>
@@ -90,7 +90,7 @@ import {TokenizingFieldValue} from './TokenizingFieldValue';
   allowsNewlines
   defaultValue={TokenizingFieldValue.tokenize(
     'This example automatically tokenizes #hashtags and @usernames in the text.',
-    /(?<=\s|^)[#@]\S+(?=\s)/g
+    /(?<=[\s\u200B]|^)[#@][^\s\u200B]+(?=[\s\u200B])/g
   )}
   label="Message">
   {segment => <Token>{segment.text}</Token>}

From e990685bc04f15caafee4bd125daf7b0dbc00d56 Mon Sep 17 00:00:00 2001
From: Daniel Lu <dl1644@gmail.com>
Date: Mon, 17 Aug 2026 17:21:10 -0700
Subject: [PATCH 2/2] forgot to commit

---
 packages/dev/s2-docs/pages/react-aria/TagFieldValue.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dev/s2-docs/pages/react-aria/TagFieldValue.ts b/packages/dev/s2-docs/pages/react-aria/TagFieldValue.ts
index fd98151fdac..4c4bd0c5413 100644
--- a/packages/dev/s2-docs/pages/react-aria/TagFieldValue.ts
+++ b/packages/dev/s2-docs/pages/react-aria/TagFieldValue.ts
@@ -2,7 +2,7 @@ import {type TokenFieldSegment, TokenFieldValue} from 'react-aria-components/Tok
 
 export class TagFieldValue extends TokenFieldValue {
   tokenize(text: string): TokenFieldSegment[] {
-    let parts = text.split(/[, \n]/);
+    let parts = text.split(/[,\s\u200B]/);
 
     let segments: TokenFieldSegment[] = parts.map((part, i) => {
       if (i === parts.length - 1 || part.length === 0) {