From 00a4c0c5ec95f41f5864567108cb4baa7b6eacbe Mon Sep 17 00:00:00 2001
From: textGamex <textgamex@outlook.com>
Date: Wed, 5 Jun 2024 04:16:55 +0800
Subject: [PATCH] fix: TextBox, NumberBox, PasswordBox  Placeholder Not Working
 Properly. (#1109)

---
 src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml  | 18 +++----
 .../Controls/PasswordBox/PasswordBox.cs       | 12 +----
 .../Controls/PasswordBox/PasswordBox.xaml     | 10 ++--
 src/Wpf.Ui/Controls/TextBox/TextBox.cs        | 47 +++++++++++++++----
 src/Wpf.Ui/Controls/TextBox/TextBox.xaml      |  2 +-
 5 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
index 361a9bb5b..58f36f9a1 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
+++ b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
@@ -54,10 +54,10 @@
                     <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
                         <Border
                             x:Name="ContentBorder"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
                             Width="{TemplateBinding Width}"
                             Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
                             Padding="0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
@@ -82,8 +82,8 @@
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding Icon}"
                                     FontSize="16"
-                                    IsTabStop="False"
-                                    Foreground="{TemplateBinding Foreground}" />
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False" />
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
                                     <controls:PassiveScrollViewer
                                         x:Name="PART_ContentHost"
@@ -115,8 +115,8 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="clear"
                                     Cursor="Arrow"
-                                    IsTabStop="False"
-                                    Foreground="{DynamicResource TextControlButtonForeground}">
+                                    Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="Dismiss24" />
                                     </controls:Button.Icon>
@@ -178,8 +178,8 @@
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding Icon}"
                                     FontSize="16"
-                                    IsTabStop="False"
-                                    Foreground="{TemplateBinding Foreground}" />
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False" />
                             </Grid>
                         </Border>
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
@@ -192,7 +192,7 @@
                             CornerRadius="{TemplateBinding Border.CornerRadius}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="PlaceholderEnabled" Value="False">
+                        <Trigger Property="CurrentPlaceholderEnabled" Value="False">
                             <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="ShowClearButton" Value="False">
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.cs b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.cs
index d49a0d341..e4be9da26 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.cs
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.cs
@@ -88,7 +88,7 @@ public bool IsPasswordRevealed
     }
 
     /// <summary>
-    /// Gets or sets a value indicating whether whether to display the  password reveal button.
+    /// Gets or sets a value indicating whether to display the password reveal button.
     /// </summary>
     public bool RevealButtonEnabled
     {
@@ -125,15 +125,7 @@ protected override void OnTextChanged(TextChangedEventArgs e)
         }
         else
         {
-            if (PlaceholderEnabled && Text.Length > 0)
-            {
-                SetCurrentValue(PlaceholderEnabledProperty, false);
-            }
-
-            if (!PlaceholderEnabled && Text.Length < 1)
-            {
-                SetCurrentValue(PlaceholderEnabledProperty, true);
-            }
+            SetPlaceholderTextVisibility();
 
             RevealClearButton();
         }
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
index 871698bba..346b8a68d 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
@@ -204,8 +204,8 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="clear"
                                     Cursor="Arrow"
-                                    IsTabStop="False"
-                                    Foreground="{DynamicResource TextControlButtonForeground}">
+                                    Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Dismiss24" />
                                     </controls:Button.Icon>
@@ -228,8 +228,8 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="reveal"
                                     Cursor="Arrow"
-                                    IsTabStop="False"
-                                    Foreground="{DynamicResource TextControlButtonForeground}">
+                                    Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Eye24" />
                                     </controls:Button.Icon>
@@ -256,7 +256,7 @@
                             CornerRadius="{TemplateBinding Border.CornerRadius}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="PlaceholderEnabled" Value="False">
+                        <Trigger Property="CurrentPlaceholderEnabled" Value="False">
                             <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="ShowClearButton" Value="False">
diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.cs b/src/Wpf.Ui/Controls/TextBox/TextBox.cs
index e33781008..befd9169f 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.cs
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.cs
@@ -48,6 +48,13 @@ public class TextBox : System.Windows.Controls.TextBox
         new PropertyMetadata(true)
     );
 
+    /// <summary>Identifies the <see cref="CurrentPlaceholderEnabled"/> dependency property.</summary>
+    public static readonly DependencyProperty CurrentPlaceholderEnabledProperty = DependencyProperty.Register(
+        nameof(CurrentPlaceholderEnabled),
+        typeof(bool),
+        typeof(TextBox),
+        new PropertyMetadata(true));
+
     /// <summary>Identifies the <see cref="ClearButtonEnabled"/> dependency property.</summary>
     public static readonly DependencyProperty ClearButtonEnabledProperty = DependencyProperty.Register(
         nameof(ClearButtonEnabled),
@@ -99,7 +106,7 @@ public ElementPlacement IconPlacement
     }
 
     /// <summary>
-    /// Gets or sets numbers pattern.
+    /// Gets or sets placeholder text.
     /// </summary>
     public string PlaceholderText
     {
@@ -108,7 +115,7 @@ public string PlaceholderText
     }
 
     /// <summary>
-    /// Gets or sets a value indicating whether to display the placeholder text.
+    /// Gets or sets a value indicating whether to enable the placeholder text.
     /// </summary>
     public bool PlaceholderEnabled
     {
@@ -116,6 +123,15 @@ public bool PlaceholderEnabled
         set => SetValue(PlaceholderEnabledProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether to display the placeholder text.
+    /// </summary>
+    public bool CurrentPlaceholderEnabled
+    {
+        get => (bool)GetValue(CurrentPlaceholderEnabledProperty);
+        protected set => SetValue(CurrentPlaceholderEnabledProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets a value indicating whether to enable the clear button.
     /// </summary>
@@ -154,6 +170,7 @@ public bool IsTextSelectionEnabled
     public TextBox()
     {
         SetValue(TemplateButtonCommandProperty, new RelayCommand<string>(OnTemplateButtonClick));
+        CurrentPlaceholderEnabled = PlaceholderEnabled;
     }
 
     /// <inheritdoc />
@@ -161,17 +178,29 @@ protected override void OnTextChanged(TextChangedEventArgs e)
     {
         base.OnTextChanged(e);
 
-        if (PlaceholderEnabled && Text.Length > 0)
+        SetPlaceholderTextVisibility();
+
+        RevealClearButton();
+    }
+
+    protected void SetPlaceholderTextVisibility()
+    {
+        if (PlaceholderEnabled)
         {
-            SetCurrentValue(PlaceholderEnabledProperty, false);
+            if (CurrentPlaceholderEnabled && Text.Length > 0)
+            {
+                SetCurrentValue(CurrentPlaceholderEnabledProperty, false);
+            }
+
+            if (!CurrentPlaceholderEnabled && Text.Length < 1)
+            {
+                SetCurrentValue(CurrentPlaceholderEnabledProperty, true);
+            }
         }
-
-        if (!PlaceholderEnabled && Text.Length < 1)
+        else
         {
-            SetCurrentValue(PlaceholderEnabledProperty, true);
+            SetCurrentValue(CurrentPlaceholderEnabledProperty, false);
         }
-
-        RevealClearButton();
     }
 
     /// <inheritdoc />
diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
index 8e197b9c0..4fc1e5940 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -214,7 +214,7 @@
                 CornerRadius="{TemplateBinding Border.CornerRadius}" />
         </Grid>
         <ControlTemplate.Triggers>
-            <Trigger Property="PlaceholderEnabled" Value="False">
+            <Trigger Property="CurrentPlaceholderEnabled" Value="False">
                 <Setter TargetName="PlaceholderTextBox" Property="Visibility" Value="Collapsed" />
             </Trigger>
             <Trigger Property="ShowClearButton" Value="False">