[SmartHint] Follow up - make behavior and supporting APs public (#3689)

nicolaihenriksen · web-flow · commit 9ec7e2adc061 · 2024-10-08T21:28:36.000-07:00
* Ensure behavior triggers AP change on initial binding

* Make helper APs public

* Apply renamed APs
diff --git a/src/MaterialDesignThemes.Wpf/Behaviors/TextBoxLineCountBehavior.cs b/src/MaterialDesignThemes.Wpf/Behaviors/TextBoxLineCountBehavior.cs
@@ -3,27 +3,32 @@
 namespace MaterialDesignThemes.Wpf.Behaviors;
 
 /// <summary>
-/// Internal behavior exposing the <see cref="TextBox.LineCount"/> (non-DP) as an attached property which we can bind to
+/// Behavior exposing the <see cref="TextBox.LineCount"/> (non-DP) as attached properties which are bindable from XAML.
 /// </summary>
-internal class TextBoxLineCountBehavior : Behavior<TextBox>
+public class TextBoxLineCountBehavior : Behavior<TextBox>
 {
-    private void AssociatedObjectOnTextChanged(object sender, TextChangedEventArgs e)
+    private void AssociatedObjectOnTextChanged(object sender, TextChangedEventArgs e) => UpdateAttachedProperties();
+    private void AssociatedObjectOnLayoutUpdated(object? sender, EventArgs e) => UpdateAttachedProperties();
+
+    private void UpdateAttachedProperties()
     {
-        AssociatedObject.SetCurrentValue(TextFieldAssist.LineCountProperty, AssociatedObject.LineCount);
-        AssociatedObject.SetCurrentValue(TextFieldAssist.IsMultiLineProperty, AssociatedObject.LineCount > 1);
+        AssociatedObject.SetCurrentValue(TextFieldAssist.TextBoxLineCountProperty, AssociatedObject.LineCount);
+        AssociatedObject.SetCurrentValue(TextFieldAssist.TextBoxIsMultiLineProperty, AssociatedObject.LineCount > 1);
     }
 
     protected override void OnAttached()
     {
         base.OnAttached();
         AssociatedObject.TextChanged += AssociatedObjectOnTextChanged;
+        AssociatedObject.LayoutUpdated += AssociatedObjectOnLayoutUpdated;
     }
 
     protected override void OnDetaching()
     {
         if (AssociatedObject != null)
         {
             AssociatedObject.TextChanged -= AssociatedObjectOnTextChanged;
+            AssociatedObject.LayoutUpdated -= AssociatedObjectOnLayoutUpdated;
         }
         base.OnDetaching();
     }
diff --git a/src/MaterialDesignThemes.Wpf/TextFieldAssist.cs b/src/MaterialDesignThemes.Wpf/TextFieldAssist.cs
@@ -368,19 +368,19 @@ public static void SetOutlinedBorderActiveThickness(DependencyObject element, Th
     public static Thickness GetOutlinedBorderActiveThickness(DependencyObject element)
         => (Thickness)element.GetValue(OutlinedBorderActiveThicknessProperty);
 
-    internal static readonly DependencyProperty LineCountProperty = DependencyProperty.RegisterAttached(
-        "LineCount", typeof(int), typeof(TextFieldAssist), new PropertyMetadata(0));
-    internal static void SetLineCount(DependencyObject element, int value)
-        => element.SetValue(LineCountProperty, value);
-    internal static int GetLineCount(DependencyObject element)
-        => (int) element.GetValue(LineCountProperty);
-
-    internal static readonly DependencyProperty IsMultiLineProperty = DependencyProperty.RegisterAttached(
-        "IsMultiLine", typeof(bool), typeof(TextFieldAssist), new PropertyMetadata(false));
-    internal static void SetIsMultiLine(DependencyObject element, bool value)
-        => element.SetValue(IsMultiLineProperty, value);
-    internal static bool GetIsMultiLine(DependencyObject element)
-        => (bool) element.GetValue(IsMultiLineProperty);
+    public static readonly DependencyProperty TextBoxLineCountProperty = DependencyProperty.RegisterAttached(
+        "TextBoxLineCount", typeof(int), typeof(TextFieldAssist), new PropertyMetadata(0));
+    public static void SetTextBoxLineCount(DependencyObject element, int value)
+        => element.SetValue(TextBoxLineCountProperty, value);
+    public static int GetTextBoxLineCount(DependencyObject element)
+        => (int) element.GetValue(TextBoxLineCountProperty);
+
+    public static readonly DependencyProperty TextBoxIsMultiLineProperty = DependencyProperty.RegisterAttached(
+        "TextBoxIsMultiLine", typeof(bool), typeof(TextFieldAssist), new PropertyMetadata(false));
+    public static void SetTextBoxIsMultiLine(DependencyObject element, bool value)
+        => element.SetValue(TextBoxIsMultiLineProperty, value);
+    public static bool GetTextBoxIsMultiLine(DependencyObject element)
+        => (bool) element.GetValue(TextBoxIsMultiLineProperty);
 
     #region Methods
 
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml
@@ -328,7 +328,7 @@
             <MultiTrigger>
               <MultiTrigger.Conditions>
                 <Condition Property="VerticalContentAlignment" Value="Stretch" />
-                <Condition Property="wpf:TextFieldAssist.IsMultiLine" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.TextBoxIsMultiLine" Value="True" />
               </MultiTrigger.Conditions>
               <Setter TargetName="PrefixTextBlock" Property="VerticalAlignment" Value="Stretch" />
               <Setter TargetName="SuffixTextBlock" Property="VerticalAlignment" Value="Stretch" />
@@ -516,7 +516,7 @@
                   <MultiBinding Converter="{StaticResource FloatingHintInitialVerticalOffsetConverter}">
                     <Binding ElementName="PART_ContentHost" Path="ActualHeight" />
                     <Binding ElementName="Hint" Path="ActualHeight" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.LineCount)" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.TextBoxLineCount)" />
                   </MultiBinding>
                 </Setter.Value>
               </Setter>
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
@@ -340,7 +340,7 @@
             <MultiTrigger>
               <MultiTrigger.Conditions>
                 <Condition Property="VerticalContentAlignment" Value="Stretch" />
-                <Condition Property="wpf:TextFieldAssist.IsMultiLine" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.TextBoxIsMultiLine" Value="True" />
               </MultiTrigger.Conditions>
               <Setter TargetName="PrefixTextBlock" Property="VerticalAlignment" Value="Stretch" />
               <Setter TargetName="SuffixTextBlock" Property="VerticalAlignment" Value="Stretch" />
@@ -522,7 +522,7 @@
                   <MultiBinding Converter="{StaticResource FloatingHintInitialVerticalOffsetConverter}">
                     <Binding ElementName="PART_ContentHost" Path="ActualHeight" />
                     <Binding ElementName="Hint" Path="ActualHeight" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.LineCount)" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.TextBoxLineCount)" />
                   </MultiBinding>
                 </Setter.Value>
               </Setter>

Original file line number	Diff line number	Diff line change
`@@ -3,27 +3,32 @@`
`3`	`3`	`namespace MaterialDesignThemes.Wpf.Behaviors;`
`4`	`4`
`5`	`5`	`/// <summary>`
`6`		`-/// Internal behavior exposing the <see cref="TextBox.LineCount"/> (non-DP) as an attached property which we can bind to`
	`6`	`+/// Behavior exposing the <see cref="TextBox.LineCount"/> (non-DP) as attached properties which are bindable from XAML.`
`7`	`7`	`/// </summary>`
`8`		`-internal class TextBoxLineCountBehavior : Behavior<TextBox>`
	`8`	`+public class TextBoxLineCountBehavior : Behavior<TextBox>`
`9`	`9`	`{`
`10`		`- private void AssociatedObjectOnTextChanged(object sender, TextChangedEventArgs e)`
	`10`	`+ private void AssociatedObjectOnTextChanged(object sender, TextChangedEventArgs e) => UpdateAttachedProperties();`
	`11`	`+ private void AssociatedObjectOnLayoutUpdated(object? sender, EventArgs e) => UpdateAttachedProperties();`
	`12`	`+`
	`13`	`+ private void UpdateAttachedProperties()`
`11`	`14`	`{`
`12`		`- AssociatedObject.SetCurrentValue(TextFieldAssist.LineCountProperty, AssociatedObject.LineCount);`
`13`		`- AssociatedObject.SetCurrentValue(TextFieldAssist.IsMultiLineProperty, AssociatedObject.LineCount > 1);`
	`15`	`+ AssociatedObject.SetCurrentValue(TextFieldAssist.TextBoxLineCountProperty, AssociatedObject.LineCount);`
	`16`	`+ AssociatedObject.SetCurrentValue(TextFieldAssist.TextBoxIsMultiLineProperty, AssociatedObject.LineCount > 1);`
`14`	`17`	`}`
`15`	`18`
`16`	`19`	`protected override void OnAttached()`
`17`	`20`	`{`
`18`	`21`	`base.OnAttached();`
`19`	`22`	`AssociatedObject.TextChanged += AssociatedObjectOnTextChanged;`
	`23`	`+ AssociatedObject.LayoutUpdated += AssociatedObjectOnLayoutUpdated;`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`protected override void OnDetaching()`
`23`	`27`	`{`
`24`	`28`	`if (AssociatedObject != null)`
`25`	`29`	`{`
`26`	`30`	`AssociatedObject.TextChanged -= AssociatedObjectOnTextChanged;`
	`31`	`+ AssociatedObject.LayoutUpdated -= AssociatedObjectOnLayoutUpdated;`
`27`	`32`	`}`
`28`	`33`	`base.OnDetaching();`
`29`	`34`	`}`