From 9588b8cbb780a22bf2e1ea068acfe79f60934495 Mon Sep 17 00:00:00 2001
From: Takeshi <iwatakeshi@gmail.com>
Date: Sat, 24 Jan 2026 13:09:58 -0700
Subject: [PATCH] fix: TextBox template uses Grid instead of StackPanel for
 proper height stretching

The TextBox template was using StackPanel to wrap the content, which doesn't
stretch children to fill available space. This caused multiline TextBoxes
with explicit Height to only display ~36px of editable area instead of the
full height.

Changes:
- Replace outer StackPanel with Grid (RowDefinitions='Auto,*')
- Replace inner StackPanel with Grid (RowDefinitions='*,Auto')
- Add VerticalAlignment='Stretch' to Border
- Remove hard-coded Height binding (let it stretch naturally)
- Update style selector from StackPanel to Grid

This fixes issues when using TextBox with AcceptsReturn=true and explicit
Height for multiline text editing scenarios.
---
 src/ShadUI/Controls/TextBox/TextBox.axaml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/ShadUI/Controls/TextBox/TextBox.axaml b/src/ShadUI/Controls/TextBox/TextBox.axaml
index 13292079..3dce58ef 100644
--- a/src/ShadUI/Controls/TextBox/TextBox.axaml
+++ b/src/ShadUI/Controls/TextBox/TextBox.axaml
@@ -132,22 +132,26 @@
         <Setter Property="shadui:ControlAssist.MinHeight" Value="36" />
         <Setter Property="Template">
             <ControlTemplate>
-                <StackPanel Background="Transparent" Focusable="False">
+                <!-- Use Grid instead of StackPanel so content can stretch to fill available height -->
+                <Grid Background="Transparent" Focusable="False" RowDefinitions="Auto,*">
                     <TextBlock
+                        Grid.Row="0"
                         Classes="Small"
                         Cursor="Arrow"
                         IsVisible="{TemplateBinding UseFloatingWatermark}"
                         Margin="0,0,0,6"
                         Name="PART_Label"
                         Text="{TemplateBinding Watermark}" />
-                    <DataValidationErrors Focusable="False">
-                        <StackPanel>
+                    <DataValidationErrors Grid.Row="1" Focusable="False">
+                        <!-- Use Grid instead of StackPanel so Border can stretch to fill available height -->
+                        <Grid RowDefinitions="*,Auto">
                             <Border
+                                Grid.Row="0"
+                                VerticalAlignment="Stretch"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="{TemplateBinding CornerRadius}"
-                                Height="{TemplateBinding shadui:ControlAssist.Height}"
                                 MinHeight="{TemplateBinding shadui:ControlAssist.MinHeight}"
                                 Name="Border">
                                 <Grid ColumnDefinitions="Auto * Auto">
@@ -241,6 +245,7 @@
                                 </Grid>
                             </Border>
                             <TextBlock
+                                Grid.Row="1"
                                 Classes="Caption Muted"
                                 Cursor="Arrow"
                                 IsVisible="{TemplateBinding shadui:ControlAssist.Hint,
@@ -248,9 +253,9 @@
                                 Margin="0,4,0,0"
                                 Name="Hint"
                                 Text="{TemplateBinding shadui:ControlAssist.Hint}" />
-                        </StackPanel>
+                        </Grid>
                     </DataValidationErrors>
-                </StackPanel>
+                </Grid>
             </ControlTemplate>
         </Setter>
 
@@ -283,7 +288,7 @@
             </Style>
         </Style>
 
-        <Style Selector="^ /template/ StackPanel">
+        <Style Selector="^ /template/ Grid">
             <Setter Property="Cursor" Value="IBeam" />
         </Style>
         <Style Selector="^:disabled /template/ Border#Border">