From ec2202e2ef7ca32dde79ec030cca6fe9cf13ad30 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 06:01:15 +0000
Subject: [PATCH 1/4] Initial plan


From 2d2f2afec1f32630cb27fa761342d76bcbab8284 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 06:10:49 +0000
Subject: [PATCH 2/4] Add ClearButton support for TextArea with ClearButton
 class combination

Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com>
---
 demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml |  1 +
 src/Semi.Avalonia/Controls/TextBox.axaml        | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
index 025216f..2ba6d0b 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
@@ -48,6 +48,7 @@
                     IsEnabled="False" />
             </StackPanel>
             <TextBox Width="300" Classes="TextArea" Watermark="TextArea TextBox" />
+            <TextBox Width="300" Classes="TextArea ClearButton" Text="TextArea with ClearButton - text should be clearable" />
             <TextBox
                 Width="300"
                 Theme="{StaticResource LooklessTextBox}"
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 6b40063..b213046 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -170,6 +170,14 @@
                 <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
+        <Style Selector="^.TextArea.clearButton, ^.TextArea.ClearButton">
+            <Style Selector="^[IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+            <Style Selector="^[IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+        </Style>
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Setter Property="PasswordChar" Value="•" />
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">
@@ -378,6 +386,14 @@
                 <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
+        <Style Selector="^.TextArea.clearButton, ^.TextArea.ClearButton">
+            <Style Selector="^[IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+            <Style Selector="^[IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+        </Style>
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Setter Property="PasswordChar" Value="•" />
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">

From c2a072041d8ea1a9d45dbb6bd1bdffcc156c6969 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 06:43:39 +0000
Subject: [PATCH 3/4] Remove AcceptsReturn=False condition and add TextArea
 ClearButton top alignment

Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com>
---
 src/Semi.Avalonia/Controls/TextBox.axaml | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index b213046..4870bc5 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -163,14 +163,6 @@
         </Style>
 
         <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-        </Style>
-        <Style Selector="^.TextArea.clearButton, ^.TextArea.ClearButton">
             <Style Selector="^[IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
                 <Setter Property="IsVisible" Value="True" />
             </Style>
@@ -178,6 +170,9 @@
                 <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
+        <Style Selector="^.TextArea.clearButton /template/ Button#PART_ClearButton, ^.TextArea.ClearButton /template/ Button#PART_ClearButton">
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Setter Property="PasswordChar" Value="•" />
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">
@@ -379,14 +374,6 @@
         </Style>
 
         <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-        </Style>
-        <Style Selector="^.TextArea.clearButton, ^.TextArea.ClearButton">
             <Style Selector="^[IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
                 <Setter Property="IsVisible" Value="True" />
             </Style>
@@ -394,6 +381,9 @@
                 <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
+        <Style Selector="^.TextArea.clearButton /template/ Button#PART_ClearButton, ^.TextArea.ClearButton /template/ Button#PART_ClearButton">
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Setter Property="PasswordChar" Value="•" />
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">

From 59576d4cfdb3d678deb3149c6e3055a17fdc09a0 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 25 Jul 2025 15:46:38 +0800
Subject: [PATCH 4/4] fix: enhance ClearButton visibility and functionality in
 TextArea styles.

---
 src/Semi.Avalonia/Controls/TextBox.axaml | 68 ++++++++++++++++++------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 4870bc5..6d28020 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -163,16 +163,15 @@
         </Style>
 
         <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^[IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^[IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
+            <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:not(:empty)">
+                <Style Selector="^:pointerover,^:focus">
+                    <Style Selector="^ /template/ Button#PART_ClearButton">
+                        <Setter Property="IsVisible" Value="True" />
+                    </Style>
+                </Style>
             </Style>
         </Style>
-        <Style Selector="^.TextArea.clearButton /template/ Button#PART_ClearButton, ^.TextArea.ClearButton /template/ Button#PART_ClearButton">
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
+
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Setter Property="PasswordChar" Value="•" />
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">
@@ -225,9 +224,27 @@
         <Style Selector="^.TextArea">
             <Setter Property="AcceptsReturn" Value="True" />
             <Setter Property="VerticalContentAlignment" Value="Top" />
+            <Setter Property="TextWrapping" Value="Wrap" />
             <Setter Property="Padding" Value="{DynamicResource TextBoxTextAreaContentPadding}" />
             <Setter Property="MinHeight" Value="{DynamicResource TextBoxTextAreaHeight}" />
             <Setter Property="TextInputOptions.ReturnKeyType" Value="Return" />
+            <Style Selector="^.clearButton, ^.ClearButton">
+                <Style Selector="^ /template/ Button#PART_ClearButton">
+                    <Setter Property="VerticalAlignment" Value="Top" />
+                    <Setter Property="IsVisible" Value="True" />
+                    <Setter Property="IsTabStop" Value="False" />
+                    <Setter Property="IsEnabled" Value="False" />
+                    <Setter Property="Opacity" Value="0" />
+                </Style>
+                <Style Selector="^[IsReadOnly=False]:not(:empty)">
+                    <Style Selector="^:pointerover,^:focus">
+                        <Style Selector="^ /template/ Button#PART_ClearButton">
+                            <Setter Property="IsEnabled" Value="True" />
+                            <Setter Property="Opacity" Value="1" />
+                        </Style>
+                    </Style>
+                </Style>
+            </Style>
         </Style>
     </ControlTheme>
 
@@ -374,16 +391,15 @@
         </Style>
 
         <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^[IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^[IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
+            <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:not(:empty)">
+                <Style Selector="^:pointerover,^:focus">
+                    <Style Selector="^ /template/ Button#PART_ClearButton">
+                        <Setter Property="IsVisible" Value="True" />
+                    </Style>
+                </Style>
             </Style>
         </Style>
-        <Style Selector="^.TextArea.clearButton /template/ Button#PART_ClearButton, ^.TextArea.ClearButton /template/ Button#PART_ClearButton">
-            <Setter Property="VerticalAlignment" Value="Top" />
-        </Style>
+
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Setter Property="PasswordChar" Value="•" />
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">
@@ -436,9 +452,27 @@
         <Style Selector="^.TextArea">
             <Setter Property="AcceptsReturn" Value="True" />
             <Setter Property="VerticalContentAlignment" Value="Top" />
+            <Setter Property="TextWrapping" Value="Wrap" />
             <Setter Property="Padding" Value="{DynamicResource TextBoxTextAreaContentPadding}" />
             <Setter Property="MinHeight" Value="{DynamicResource TextBoxTextAreaHeight}" />
             <Setter Property="TextInputOptions.ReturnKeyType" Value="Return" />
+            <Style Selector="^.clearButton, ^.ClearButton">
+                <Style Selector="^ /template/ Button#PART_ClearButton">
+                    <Setter Property="VerticalAlignment" Value="Top" />
+                    <Setter Property="IsVisible" Value="True" />
+                    <Setter Property="IsTabStop" Value="False" />
+                    <Setter Property="IsEnabled" Value="False" />
+                    <Setter Property="Opacity" Value="0" />
+                </Style>
+                <Style Selector="^[IsReadOnly=False]:not(:empty)">
+                    <Style Selector="^:pointerover,^:focus">
+                        <Style Selector="^ /template/ Button#PART_ClearButton">
+                            <Setter Property="IsEnabled" Value="True" />
+                            <Setter Property="Opacity" Value="1" />
+                        </Style>
+                    </Style>
+                </Style>
+            </Style>
         </Style>
     </ControlTheme>
 
@@ -554,4 +588,4 @@
         </Style>
     </ControlTheme>
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file