From 02a51262e1ae69235276c173b6efe3cea20995ef Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Wed, 15 Apr 2026 12:35:54 -0500
Subject: [PATCH 1/2] fix(TextArea): fix empty S2 TextArea height jumping when
 overlays are open

---
 .../s2/stories/TextField.stories.tsx          | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/@react-spectrum/s2/stories/TextField.stories.tsx b/packages/@react-spectrum/s2/stories/TextField.stories.tsx
index 475241e8560..d3e0aea9110 100644
--- a/packages/@react-spectrum/s2/stories/TextField.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/TextField.stories.tsx
@@ -103,6 +103,27 @@ export const TextAreaExample: StoryTextArea = {
   }
 };
 
+export const TextAreaContextualHelpExample: StoryTextArea = {
+  render: (args) => (
+    <TextArea
+      {...args}
+      contextualHelp={
+        <ContextualHelp>
+          <Heading>Share your thoughts!</Heading>
+          <Content>
+            <Text>
+              Your comment will be visible to other users.
+            </Text>
+          </Content>
+        </ContextualHelp>
+      } />
+  ),
+  args: {
+    label: 'Comment',
+    placeholder: 'Enter a comment'
+  }
+};
+
 export const CustomWidth: StoryTextField = {
   render: (args) => <TextField {...args} styles={style({width: 384})} />,
   args: {

From cf57c94a4591c140b12630dace2f61f4918ffa59 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Wed, 15 Apr 2026 14:34:08 -0500
Subject: [PATCH 2/2] adjust fieldGroup to use `alignItems: 'start'`

---
 packages/@react-spectrum/s2/src/TextField.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/s2/src/TextField.tsx b/packages/@react-spectrum/s2/src/TextField.tsx
index 08587e52826..e018f384545 100644
--- a/packages/@react-spectrum/s2/src/TextField.tsx
+++ b/packages/@react-spectrum/s2/src/TextField.tsx
@@ -74,7 +74,7 @@ export const TextArea = forwardRef(function TextArea(props: TextAreaProps, ref:
       {...props}
       ref={ref}
       fieldGroupCss={style({
-        alignItems: 'baseline',
+        alignItems: 'start',
         height: 'auto'
       })}>
       <TextAreaInput />