From e9388bf21d97c922b9ef84b692826beb676a3a39 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 4 Nov 2022 16:04:16 +0100
Subject: [PATCH 01/23] Rewrite current UI test and add new UI test to test
 failing scenario

---
 .../Samples/PasswordBox/BoundPasswordBox.xaml | 19 ++++
 .../PasswordBox/BoundPasswordBox.xaml.cs      | 38 ++++++++
 .../PasswordBox/BoundPasswordBoxViewModel.cs  |  9 ++
 .../PasswordBox/BoundPasswordBoxWindow.xaml   | 10 +++
 .../BoundPasswordBoxWindow.xaml.cs            |  6 ++
 MaterialDesignThemes.UITests/TestBase.cs      |  2 +-
 .../WPF/PasswordBoxes/PasswordBoxTests.cs     | 87 ++++++++++++-------
 7 files changed, 140 insertions(+), 31 deletions(-)
 create mode 100644 MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBox.xaml
 create mode 100644 MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBox.xaml.cs
 create mode 100644 MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxViewModel.cs
 create mode 100644 MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
 create mode 100644 MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs

diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBox.xaml b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBox.xaml
new file mode 100644
index 0000000000..659abe14d7
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBox.xaml
@@ -0,0 +1,19 @@
+<UserControl x:Class="MaterialDesignThemes.UITests.Samples.PasswordBox.BoundPasswordBox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.PasswordBox"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance local:BoundPasswordBoxViewModel, IsDesignTimeCreatable=False}"
+             d:DesignHeight="450" d:DesignWidth="800">
+  <Grid>
+    <PasswordBox x:Name="PasswordBox"
+                 Width="400"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                 Style="{StaticResource {x:Type PasswordBox}}"
+                 materialDesign:PasswordBoxAssist.Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+  </Grid>
+</UserControl>
diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBox.xaml.cs b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBox.xaml.cs
new file mode 100644
index 0000000000..8cbb35c944
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBox.xaml.cs
@@ -0,0 +1,38 @@
+namespace MaterialDesignThemes.UITests.Samples.PasswordBox;
+
+public partial class BoundPasswordBox
+{
+    
+
+    public string? ViewModelPassword
+    {
+        get => ((BoundPasswordBoxViewModel) DataContext).Password;
+        set => ((BoundPasswordBoxViewModel) DataContext).Password = value;
+    }
+
+
+    private bool _useRevealStyle;
+    public bool UseRevealStyle
+    {
+        get => _useRevealStyle;
+        set
+        {
+            _useRevealStyle = value;
+            if (_useRevealStyle)
+            {
+                PasswordBox.Style = (Style)PasswordBox.FindResource("MaterialDesignFloatingHintRevealPasswordBox");
+            }
+            else
+            {
+                PasswordBox.ClearValue(StyleProperty);
+            }
+
+        }
+    }
+
+    public BoundPasswordBox()
+    {
+        DataContext = new BoundPasswordBoxViewModel();
+        InitializeComponent();
+    }
+}
diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxViewModel.cs b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxViewModel.cs
new file mode 100644
index 0000000000..3f7b2d1558
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxViewModel.cs
@@ -0,0 +1,9 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace MaterialDesignThemes.UITests.Samples.PasswordBox;
+
+internal partial class BoundPasswordBoxViewModel : ObservableObject
+{
+    [ObservableProperty]
+    private string? _password;
+}
diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
new file mode 100644
index 0000000000..e6ee451792
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
@@ -0,0 +1,10 @@
+<Window x:Class="MaterialDesignThemes.UITests.Samples.PasswordBox.BoundPasswordBoxWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.PasswordBox"
+        mc:Ignorable="d"
+        Title="BoundPasswordBoxWindow" Height="450" Width="800">
+    <local:BoundPasswordBox />
+</Window>
diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs
new file mode 100644
index 0000000000..f129d6381a
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs
@@ -0,0 +1,6 @@
+namespace MaterialDesignThemes.UITests.Samples.PasswordBox;
+
+public partial class BoundPasswordBoxWindow
+{
+    public BoundPasswordBoxWindow() => InitializeComponent();
+}
diff --git a/MaterialDesignThemes.UITests/TestBase.cs b/MaterialDesignThemes.UITests/TestBase.cs
index 58a327c25f..7237018674 100644
--- a/MaterialDesignThemes.UITests/TestBase.cs
+++ b/MaterialDesignThemes.UITests/TestBase.cs
@@ -41,7 +41,7 @@ protected async Task<IVisualElement> LoadUserControl<TControl>()
     public async Task InitializeAsync() =>
         App = await XamlTest.App.StartRemote(new AppOptions
         {
-            AllowVisualStudioDebuggerAttach = true,
+            AllowVisualStudioDebuggerAttach = false,
             LogMessage = message => Output.WriteLine(message)
         });
     public async Task DisposeAsync() => await App.DisposeAsync();
diff --git a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index 583cca816d..bac228fd66 100644
--- a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using MaterialDesignThemes.UITests.Samples.PasswordBox;
 
 namespace MaterialDesignThemes.UITests.WPF.PasswordBoxes
 {
@@ -83,42 +84,36 @@ await Wait.For(async () =>
         }
 
         [Fact]
-        [Description("PR 2828")]
+        [Description("PR 2828 and Issue 2930")]
         public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBinding()
         {
             await using var recorder = new TestRecorder(App);
 
-            var grid = await LoadXaml<Grid>(@"
-<Grid Margin=""30"">
-  <StackPanel Orientation=""Vertical"">
-    <TextBox x:Name=""BoundPassword"" />
-    <PasswordBox x:Name=""PasswordBox""
-         materialDesign:PasswordBoxAssist.Password=""{Binding ElementName=BoundPassword, Path=Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}""
-         Style=""{StaticResource MaterialDesignFloatingHintRevealPasswordBox}""/>
-  </StackPanel>
-</Grid>");
-            var boundPasswordTextBox = await grid.GetElement<TextBox>("BoundPassword"); // Serves as the "VM" in this test
-            var passwordBox = await grid.GetElement<PasswordBox>("PasswordBox");
+            await App.InitializeWithMaterialDesign();
+            IWindow window = await App.CreateWindow<BoundPasswordBoxWindow>();
+            var userControl = await window.GetElement<BoundPasswordBox>();
+            await userControl.SetProperty(nameof(BoundPasswordBox.UseRevealStyle), true);
+            var passwordBox = await userControl.GetElement<PasswordBox>("PasswordBox");
             var clearTextPasswordTextBox = await passwordBox.GetElement<TextBox>("RevealPasswordTextBox");
             var revealPasswordButton = await passwordBox.GetElement<ToggleButton>("RevealPasswordButton");
-
-            // Act 1 (Update in VM updates PasswordBox and RevealPasswordTextBox)
-            await boundPasswordTextBox.SendKeyboardInput($"1");
-            string? boundText1 = await boundPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
+            
+            // Act 1 (Update in PasswordBox updates VM and RevealPasswordTextBox)
+            await passwordBox.SendKeyboardInput($"1");
+            string? boundText1 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
             string? password1 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
             string? clearTextPassword1 = await clearTextPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
 
-            // Act 2 (Update in PasswordBox updates VM and RevealPasswordTextBox)
-            await passwordBox.SendKeyboardInput($"2");
-            string? boundText2 = await boundPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
-            string? password2 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
-            string? clearTextPassword2 = await clearTextPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
-
             // Act 2 (Update in RevealPasswordTextBox updates PasswordBox and VM)
             await revealPasswordButton.LeftClick();
             await Task.Delay(50);   // Wait for the "clear text TextBox" to become visible
-            await clearTextPasswordTextBox.SendKeyboardInput($"3");
-            string? boundText3 = await boundPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
+            await clearTextPasswordTextBox.SendKeyboardInput($"2");
+            string? boundText2 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
+            string? password2 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
+            string? clearTextPassword2 = await clearTextPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
+
+            // Act 3 (Update in VM updates PasswordBox and RevealPasswordTextBox)
+            await userControl.SetProperty(nameof(BoundPasswordBox.ViewModelPassword), "3");
+            string? boundText3 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
             string? password3 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
             string? clearTextPassword3 = await clearTextPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
 
@@ -127,13 +122,45 @@ public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBi
             Assert.Equal("1", password1);
             Assert.Equal("1", clearTextPassword1);
 
-            Assert.Equal("21", boundText2);
-            Assert.Equal("21", password2);
-            Assert.Equal("21", clearTextPassword2);
+            Assert.Equal("12", boundText2);
+            Assert.Equal("12", password2);
+            Assert.Equal("12", clearTextPassword2);
+
+            Assert.Equal("3", boundText3);
+            Assert.Equal("3", password3);
+            Assert.Equal("3", clearTextPassword3);
+
+            recorder.Success();
+        }
+
+        [Fact]
+        [Description("Issue 2930")]
+        public async Task PasswordBox_WithBoundPasswordProperty_RespectsBinding()
+        {
+            await using var recorder = new TestRecorder(App);
+
+            await App.InitializeWithMaterialDesign();
+            IWindow window = await App.CreateWindow<BoundPasswordBoxWindow>();
+            var userControl = await window.GetElement<BoundPasswordBox>();
+            await userControl.SetProperty(nameof(BoundPasswordBox.UseRevealStyle), false);
+            var passwordBox = await userControl.GetElement<PasswordBox>("PasswordBox");
+
+            // Act 1 (Update in PasswordBox updates VM)
+            await passwordBox.SendKeyboardInput($"1");
+            string? boundText1 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
+            string? password1 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
+
+            // Act 2 (Update in VM updates PasswordBox)
+            await userControl.SetProperty(nameof(BoundPasswordBox.ViewModelPassword), "2");
+            string? boundText2 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
+            string? password2 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
+
+            // Assert
+            Assert.Equal("1", boundText1);
+            Assert.Equal("1", password1);
 
-            Assert.Equal("321", boundText3);
-            Assert.Equal("321", password3);
-            Assert.Equal("321", clearTextPassword3);
+            Assert.Equal("2", boundText2);
+            Assert.Equal("2", password2);
 
             recorder.Success();
         }

From 4d9c23389bd16582276a68b65b4d2629e7107d57 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 4 Nov 2022 16:07:48 +0100
Subject: [PATCH 02/23] Refactor PasswordBoxAssist to use behavior

---
 Directory.packages.props                      |   3 +-
 .../MaterialDesignThemes.Wpf.csproj           |   3 +
 MaterialDesignThemes.Wpf/PasswordBoxAssist.cs |  82 +++++++-----
 .../StylizedBehaviorCollection.cs             |   8 ++
 MaterialDesignThemes.Wpf/StylizedBehaviors.cs | 122 ++++++++++++++++++
 .../MaterialDesignTheme.PasswordBox.xaml      |  22 +++-
 6 files changed, 206 insertions(+), 34 deletions(-)
 create mode 100644 MaterialDesignThemes.Wpf/StylizedBehaviorCollection.cs
 create mode 100644 MaterialDesignThemes.Wpf/StylizedBehaviors.cs

diff --git a/Directory.packages.props b/Directory.packages.props
index 7f4967fc05..291e6d227e 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -15,6 +15,7 @@
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="6.0.6" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageVersion Include="Microsoft.Toolkit.MVVM" Version="7.1.2" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.37" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="Shouldly" Version="4.1.0" />
     <PackageVersion Include="ShowMeTheXAML" Version="2.0.0" />
@@ -26,4 +27,4 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
index 69926b0470..7237e43629 100644
--- a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
+++ b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
@@ -24,6 +24,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
   </ItemGroup>
diff --git a/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs b/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
index b6efd5f9f5..8dd0d09ba3 100644
--- a/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
+++ b/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
@@ -1,8 +1,10 @@
-using System.Windows.Data;
+using System.Windows.Data;
+using System.Windows.Documents;
+using Microsoft.Xaml.Behaviors;
 
 namespace MaterialDesignThemes.Wpf;
 
-public static class PasswordBoxAssist
+public class PasswordBoxAssist : Behavior<PasswordBox>
 {
     public static readonly DependencyProperty PasswordMaskedIconProperty = DependencyProperty.RegisterAttached(
         "PasswordMaskedIcon", typeof(PackIconKind), typeof(PasswordBoxAssist), new FrameworkPropertyMetadata(PackIconKind.EyeOff, FrameworkPropertyMetadataOptions.Inherits));
@@ -24,45 +26,67 @@ public static class PasswordBoxAssist
     public static void SetPassword(DependencyObject element, string value) => element.SetValue(PasswordProperty, value);
     public static string GetPassword(DependencyObject element) => (string)element.GetValue(PasswordProperty);
 
-    // Internal attached DP used to initially wire up the connection between the masked PasswordBox content and the clear text TextBox content
-    internal static readonly DependencyProperty InitialPasswordProperty = DependencyProperty.RegisterAttached(
-        "InitialPassword", typeof(string), typeof(PasswordBoxAssist), new PropertyMetadata(default(string)));
-    internal static void SetInitialPassword(DependencyObject element, string value) => element.SetValue(InitialPasswordProperty, value);
-    internal static string GetInitialPassword(DependencyObject element) => (string)element.GetValue(InitialPasswordProperty);
+    private static readonly DependencyProperty IsChangingProperty = DependencyProperty.RegisterAttached(
+        "IsChanging", typeof(bool), typeof(PasswordBoxAssist), new UIPropertyMetadata(false));
+    private static void SetIsChanging(UIElement element, bool value) => element.SetValue(IsChangingProperty, value);
+    private static bool GetIsChanging(UIElement element) => (bool)element.GetValue(IsChangingProperty);
+    
+    private static readonly DependencyProperty SelectionProperty = DependencyProperty.RegisterAttached(
+        "Selection", typeof(TextSelection), typeof(PasswordBoxAssist), new UIPropertyMetadata(default(TextSelection)));
+    private static void SetSelection(DependencyObject obj, TextSelection? value) => obj.SetValue(SelectionProperty, value);
+    private static TextSelection? GetSelection(DependencyObject obj) => (TextSelection?)obj.GetValue(SelectionProperty);
 
-    private static readonly DependencyProperty IsPasswordInitializedProperty = DependencyProperty.RegisterAttached(
-        "IsPasswordInitialized", typeof(bool), typeof(PasswordBoxAssist), new PropertyMetadata(false));
+    private static readonly DependencyProperty RevealedPasswordTextBoxProperty = DependencyProperty.RegisterAttached(
+        "RevealedPasswordTextBox", typeof(TextBox), typeof(PasswordBoxAssist), new UIPropertyMetadata(default(TextBox)));
+    private static void SetRevealedPasswordTextBox(DependencyObject obj, TextBox? value) => obj.SetValue(RevealedPasswordTextBoxProperty, value);
+    private static TextBox? GetRevealedPasswordTextBox(DependencyObject obj) => (TextBox?)obj.GetValue(RevealedPasswordTextBoxProperty);
 
-    private static readonly DependencyProperty SettingPasswordProperty = DependencyProperty.RegisterAttached(
-        "SettingPassword", typeof(bool), typeof(PasswordBoxAssist), new PropertyMetadata(false));
 
-    private static void HandlePasswordChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    /// <summary>
+    /// Handles changes to the 'Password' attached property.
+    /// </summary>
+    private static void HandlePasswordChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
     {
-        if (d is not PasswordBox passwordBox)
-            return;
-
-        if ((bool)passwordBox.GetValue(SettingPasswordProperty))
-            return;
+        if (sender is PasswordBox targetPasswordBox)
+        {
+            targetPasswordBox.PasswordChanged -= PasswordBoxPasswordChanged;
+            if (!GetIsChanging(targetPasswordBox))
+            {
+                targetPasswordBox.Password = (string)e.NewValue;
+            }
+            targetPasswordBox.PasswordChanged += PasswordBoxPasswordChanged;
+        }
+    }
 
-        if (!(bool)passwordBox.GetValue(IsPasswordInitializedProperty))
+    /// <summary>
+    /// Handle the 'PasswordChanged'-event on the PasswordBox
+    /// </summary>
+    private static void PasswordBoxPasswordChanged(object sender, RoutedEventArgs e)
+    {
+        if (sender is PasswordBox passwordBox)
         {
-            passwordBox.SetValue(IsPasswordInitializedProperty, true);
-            WeakEventManager<PasswordBox, RoutedEventArgs>.AddHandler(passwordBox, nameof(PasswordBox.PasswordChanged), HandlePasswordChanged);
+            SetIsChanging(passwordBox, true);
+            SetPassword(passwordBox, passwordBox.Password);
+            SetIsChanging(passwordBox, false);
         }
-        passwordBox.Password = e.NewValue as string;
     }
 
-    private static void HandlePasswordChanged(object? sender, RoutedEventArgs e)
+    private void PasswordBoxLoaded(object sender, RoutedEventArgs e) => SetPassword(AssociatedObject, AssociatedObject.Password);
+    
+    protected override void OnAttached()
     {
-        if (sender is not PasswordBox passwordBox)
-            return;
+        base.OnAttached();
+        AssociatedObject.PasswordChanged += PasswordBoxPasswordChanged;
+        AssociatedObject.Loaded += PasswordBoxLoaded;
+    }
 
-        passwordBox.SetValue(SettingPasswordProperty, true);
-        string currentPassword = GetPassword(passwordBox);
-        if (currentPassword != passwordBox.Password)
+    protected override void OnDetaching()
+    {
+        if (AssociatedObject != null)
         {
-            SetPassword(passwordBox, passwordBox.Password);
+            AssociatedObject.Loaded -= PasswordBoxLoaded;
+            AssociatedObject.PasswordChanged -= PasswordBoxPasswordChanged;
         }
-        passwordBox.SetValue(SettingPasswordProperty, false);
+        base.OnDetaching();
     }
 }
diff --git a/MaterialDesignThemes.Wpf/StylizedBehaviorCollection.cs b/MaterialDesignThemes.Wpf/StylizedBehaviorCollection.cs
new file mode 100644
index 0000000000..fa627fe3e6
--- /dev/null
+++ b/MaterialDesignThemes.Wpf/StylizedBehaviorCollection.cs
@@ -0,0 +1,8 @@
+using Microsoft.Xaml.Behaviors;
+
+namespace MaterialDesignThemes.Wpf;
+
+public class StylizedBehaviorCollection : FreezableCollection<Behavior>
+{
+    protected override Freezable CreateInstanceCore() => new StylizedBehaviorCollection();
+}
diff --git a/MaterialDesignThemes.Wpf/StylizedBehaviors.cs b/MaterialDesignThemes.Wpf/StylizedBehaviors.cs
new file mode 100644
index 0000000000..ca72e4590d
--- /dev/null
+++ b/MaterialDesignThemes.Wpf/StylizedBehaviors.cs
@@ -0,0 +1,122 @@
+using Microsoft.Xaml.Behaviors;
+
+namespace MaterialDesignThemes.Wpf;
+
+internal class StylizedBehaviors
+{
+    private static readonly DependencyProperty OriginalBehaviorProperty = DependencyProperty.RegisterAttached(
+        "OriginalBehavior", typeof(Behavior), typeof(StylizedBehaviors), new UIPropertyMetadata(null));
+    private static void SetOriginalBehavior(DependencyObject obj, Behavior? value) => obj.SetValue(OriginalBehaviorProperty, value);
+    private static Behavior? GetOriginalBehavior(DependencyObject obj) => (Behavior?)obj.GetValue(OriginalBehaviorProperty);
+
+    internal static readonly DependencyProperty BehaviorsProperty = DependencyProperty.RegisterAttached(
+        "Behaviors", typeof(StylizedBehaviorCollection), typeof(StylizedBehaviors), new FrameworkPropertyMetadata(null, OnPropertyChanged));
+    internal static void SetBehaviors(DependencyObject uie, StylizedBehaviorCollection? value) => uie.SetValue(BehaviorsProperty, value);
+    internal static StylizedBehaviorCollection? GetBehaviors(DependencyObject uie) => (StylizedBehaviorCollection?)uie.GetValue(BehaviorsProperty);
+
+    private static void OnPropertyChanged(DependencyObject dpo, DependencyPropertyChangedEventArgs e)
+    {
+        if (dpo is not FrameworkElement frameworkElement)
+        {
+            return;
+        }
+
+        var newBehaviors = e.NewValue as StylizedBehaviorCollection;
+        var oldBehaviors = e.OldValue as StylizedBehaviorCollection;
+        if (newBehaviors == oldBehaviors)
+        {
+            return;
+        }
+
+        var itemBehaviors = Interaction.GetBehaviors(frameworkElement);
+        frameworkElement.Unloaded -= FrameworkElementUnloaded;
+        if (oldBehaviors != null)
+        {
+            foreach (var behavior in oldBehaviors)
+            {
+                int index = GetIndexOf(itemBehaviors, behavior);
+                if (index >= 0)
+                {
+                    itemBehaviors.RemoveAt(index);
+                }
+            }
+        }
+
+        if (newBehaviors != null)
+        {
+            foreach (var behavior in newBehaviors)
+            {
+                int index = GetIndexOf(itemBehaviors, behavior);
+                if (index < 0)
+                {
+                    var clone = (Behavior)behavior.Clone();
+                    SetOriginalBehavior(clone, behavior);
+                    itemBehaviors.Add(clone);
+                }
+            }
+        }
+
+        if (itemBehaviors.Count > 0)
+        {
+            frameworkElement.Unloaded += FrameworkElementUnloaded;
+        }
+    }
+
+    private static void FrameworkElementUnloaded(object sender, RoutedEventArgs e)
+    {
+        // BehaviorCollection doesn't call Detach, so we do this
+        if (sender is not FrameworkElement frameworkElement)
+        {
+            return;
+        }
+
+        var itemBehaviors = Interaction.GetBehaviors(frameworkElement);
+        foreach (var behavior in itemBehaviors)
+        {
+            behavior.Detach();
+        }
+
+        frameworkElement.Loaded += FrameworkElementLoaded;
+    }
+
+    private static void FrameworkElementLoaded(object sender, RoutedEventArgs e)
+    {
+        if (sender is not FrameworkElement frameworkElement)
+        {
+            return;
+        }
+
+        frameworkElement.Loaded -= FrameworkElementLoaded;
+        var itemBehaviors = Interaction.GetBehaviors(frameworkElement);
+        foreach (var behavior in itemBehaviors)
+        {
+            behavior.Attach(frameworkElement);
+        }
+    }
+
+    private static int GetIndexOf(BehaviorCollection itemBehaviors, Behavior behavior)
+    {
+        int index = -1;
+
+        var originalBehavior = GetOriginalBehavior(behavior);
+
+        for (int i = 0; i < itemBehaviors.Count; i++)
+        {
+            var currentBehavior = itemBehaviors[i];
+            if (currentBehavior == behavior || currentBehavior == originalBehavior)
+            {
+                index = i;
+                break;
+            }
+
+            var currentOriginalBehavior = GetOriginalBehavior(currentBehavior);
+            if (currentOriginalBehavior == behavior || currentOriginalBehavior == originalBehavior)
+            {
+                index = i;
+                break;
+            }
+        }
+
+        return index;
+    }
+}
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index f74378fa66..e062ddebaa 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -1,8 +1,10 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
                     xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
-                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
+                    xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
+                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
+                    xmlns:internalbehaviors="clr-namespace:MaterialDesignThemes.Wpf.Behaviors">
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Menu.xaml" />
@@ -443,6 +445,13 @@
     <Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterStyle" Value="{StaticResource MaterialDesignPasswordCharacterCounterTextBlock}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterVisibility" Value="Hidden" />
+    <Setter Property="wpf:StylizedBehaviors.Behaviors">
+      <Setter.Value>
+        <wpf:StylizedBehaviorCollection>
+          <wpf:PasswordBoxAssist />
+        </wpf:StylizedBehaviorCollection>
+      </Setter.Value>
+    </Setter>
   </Style>
 
   <Style x:Key="MaterialDesignFloatingHintPasswordBox"
@@ -946,13 +955,18 @@
     <Setter Property="internal:ClearText.HandlesClearCommand" Value="True" />
     <Setter Property="wpf:HintAssist.Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
     <Setter Property="wpf:HintAssist.HelperTextStyle" Value="{StaticResource MaterialDesignPasswordHelperTextBlock}" />
-    <Setter Property="wpf:PasswordBoxAssist.InitialPassword" Value="" />
     <Setter Property="wpf:PasswordBoxAssist.IsPasswordRevealed" Value="False" />
-    <Setter Property="wpf:PasswordBoxAssist.Password" Value="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:PasswordBoxAssist.InitialPassword)}" />
     <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMargin}" />
     <Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterStyle" Value="{StaticResource MaterialDesignPasswordCharacterCounterTextBlock}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterVisibility" Value="Hidden" />
+    <Setter Property="wpf:StylizedBehaviors.Behaviors">
+      <Setter.Value>
+        <wpf:StylizedBehaviorCollection>
+          <wpf:PasswordBoxAssist />
+        </wpf:StylizedBehaviorCollection>
+      </Setter.Value>
+    </Setter>
   </Style>
 
   <Style x:Key="MaterialDesignFloatingHintRevealPasswordBox"

From 90471babd006c791fd9746f1622ee923bc4df24e Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 4 Nov 2022 16:09:54 +0100
Subject: [PATCH 03/23] Refactor PasswordBox reveal style TextBox focus- and
 text selection code

The old focus code did not work that well because keyboard focus was not really possible to set via the Style. With the introduction of behaviors, we can now improve that a lot.
---
 .../PasswordBoxRevealTextBoxBehavior.cs       | 92 +++++++++++++++++++
 .../MaterialDesignTheme.PasswordBox.xaml      | 17 ++--
 2 files changed, 98 insertions(+), 11 deletions(-)
 create mode 100644 MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs

diff --git a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
new file mode 100644
index 0000000000..c9e76c8e5b
--- /dev/null
+++ b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
@@ -0,0 +1,92 @@
+using System.Reflection;
+using System.Windows.Documents;
+using Microsoft.Xaml.Behaviors;
+
+namespace MaterialDesignThemes.Wpf.Behaviors;
+
+internal class PasswordBoxRevealTextBoxBehavior : Behavior<TextBox>
+{
+    private static readonly DependencyProperty SelectionProperty = DependencyProperty.RegisterAttached(
+        "Selection", typeof(TextSelection), typeof(PasswordBoxRevealTextBoxBehavior), new UIPropertyMetadata(default(TextSelection)));
+    private static void SetSelection(DependencyObject obj, TextSelection? value) => obj.SetValue(SelectionProperty, value);
+    private static TextSelection? GetSelection(DependencyObject obj) => (TextSelection?)obj.GetValue(SelectionProperty);
+
+    internal static readonly DependencyProperty PasswordBoxProperty = DependencyProperty.Register(
+        nameof(PasswordBox), typeof(PasswordBox), typeof(PasswordBoxRevealTextBoxBehavior), new PropertyMetadata(default(PasswordBox)));
+
+    internal PasswordBox? PasswordBox
+    {
+        get => (PasswordBox) GetValue(PasswordBoxProperty);
+        set => SetValue(PasswordBoxProperty, value);
+    }
+
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        AssociatedObject.IsVisibleChanged += AssociatedObjectOnIsVisibleChanged;
+        if (PasswordBox != null)
+        {
+            var info = typeof(PasswordBox).GetProperty("Selection", BindingFlags.NonPublic | BindingFlags.Instance);
+            var selection = info?.GetValue(PasswordBox, null) as TextSelection;
+            SetSelection(AssociatedObject, selection);
+        }
+    }
+
+    protected override void OnDetaching()
+    {
+        base.OnDetaching();
+        if (AssociatedObject != null)
+        {
+            AssociatedObject.ClearValue(SelectionProperty);
+            AssociatedObject.IsVisibleChanged -= AssociatedObjectOnIsVisibleChanged;
+        }
+    }
+
+    private void AssociatedObjectOnIsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (AssociatedObject.IsVisible)
+        {
+            AssociatedObject.SelectionLength = 0;
+            var selection = GetPasswordBoxSelection();
+            AssociatedObject.SelectionStart = selection.SelectionStart;
+            AssociatedObject.SelectionLength = selection.SelectionEnd;
+            Keyboard.Focus(AssociatedObject);
+        }
+        else if (PasswordBox != null)
+        {
+            SetPasswordBoxSelection(AssociatedObject.SelectionStart, AssociatedObject.SelectionLength);
+            Keyboard.Focus(PasswordBox);
+        }
+    }
+
+    private PasswordBoxSelection GetPasswordBoxSelection()
+    {
+        var selection = GetSelection(AssociatedObject);
+        var typeTextRange = selection?.GetType().GetInterfaces().FirstOrDefault(i => i.Name == "ITextRange");
+        object? start = typeTextRange?.GetProperty("Start")?.GetGetMethod()?.Invoke(selection, null);
+        object? end = typeTextRange?.GetProperty("End")?.GetGetMethod()?.Invoke(selection, null);
+        int? startValue = start?.GetType().GetProperty("Offset", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(start, null) as int?;
+        int? endValue = end?.GetType().GetProperty("Offset", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(end, null) as int?;
+        int selectionStart = startValue.GetValueOrDefault(0);
+        int selectionLength = 0;
+        if (endValue.HasValue)
+        {
+            selectionLength = endValue.Value - startValue.GetValueOrDefault(0);
+        }
+        return new PasswordBoxSelection(selectionStart, selectionLength);
+    }
+
+    private void SetPasswordBoxSelection(int selectionStart, int selectionLength) => typeof(PasswordBox).GetMethod("Select", BindingFlags.Instance | BindingFlags.NonPublic)?.Invoke(PasswordBox, new object[] { selectionStart, selectionLength });
+
+    private struct PasswordBoxSelection
+    {
+        public readonly int SelectionStart;
+        public readonly int SelectionEnd;
+
+        public PasswordBoxSelection(int selectionStart, int selectionEnd)
+        {
+            SelectionStart = selectionStart;
+            SelectionEnd = selectionEnd;
+        }
+    }
+}
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index e062ddebaa..e1de662a0e 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
                     xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
@@ -640,7 +640,11 @@
                                Style="{StaticResource MaterialDesignRawTextBox}"
                                Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:PasswordBoxAssist.Password), UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
                                UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
-                               Visibility="{Binding ElementName=ContentGrid, Path=(wpf:PasswordBoxAssist.IsPasswordRevealed), Converter={StaticResource BooleanToVisibilityConverter}}" />
+                               Visibility="{Binding ElementName=ContentGrid, Path=(wpf:PasswordBoxAssist.IsPasswordRevealed), Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <behaviors:Interaction.Behaviors>
+                          <internalbehaviors:PasswordBoxRevealTextBoxBehavior PasswordBox="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                        </behaviors:Interaction.Behaviors>
+                      </TextBox>
                     </Grid>
 
                     <wpf:SmartHint x:Name="Hint"
@@ -723,15 +727,6 @@
             </Canvas>
           </Grid>
           <ControlTemplate.Triggers>
-            <!-- Transfer focus to the RevealPasswordTextBox when the password is revealed and the PasswordBox gains focus -->
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsFocused" Value="True" />
-                <Condition Property="wpf:PasswordBoxAssist.IsPasswordRevealed" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="ContentGrid" Property="FocusManager.FocusedElement" Value="{Binding ElementName=RevealPasswordTextBox}" />
-            </MultiTrigger>
-
             <MultiTrigger>
               <MultiTrigger.Conditions>
                 <Condition Property="wpf:HintAssist.IsFloating" Value="True" />

From 0a9f4f8502adc20c4458e4acbf2feb025f8bf9e4 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 4 Nov 2022 16:56:32 +0100
Subject: [PATCH 04/23] Undo wrong change in TestBase

---
 MaterialDesignThemes.UITests/TestBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.UITests/TestBase.cs b/MaterialDesignThemes.UITests/TestBase.cs
index 7237018674..58a327c25f 100644
--- a/MaterialDesignThemes.UITests/TestBase.cs
+++ b/MaterialDesignThemes.UITests/TestBase.cs
@@ -41,7 +41,7 @@ protected async Task<IVisualElement> LoadUserControl<TControl>()
     public async Task InitializeAsync() =>
         App = await XamlTest.App.StartRemote(new AppOptions
         {
-            AllowVisualStudioDebuggerAttach = false,
+            AllowVisualStudioDebuggerAttach = true,
             LogMessage = message => Output.WriteLine(message)
         });
     public async Task DisposeAsync() => await App.DisposeAsync();

From bc349fa948fb057502d2e4665658239290d19445 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 4 Nov 2022 17:05:03 +0100
Subject: [PATCH 05/23] Whitespace commit to force re-run

---
 .../WPF/PasswordBoxes/PasswordBoxTests.cs                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index bac228fd66..990438b564 100644
--- a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -163,6 +163,6 @@ public async Task PasswordBox_WithBoundPasswordProperty_RespectsBinding()
             Assert.Equal("2", password2);
 
             recorder.Success();
-        }
+        } 
     }
 }

From bd746b4316793b215c7c7192665ac9fab9397f88 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 4 Nov 2022 19:44:35 +0100
Subject: [PATCH 06/23] Increase delay in test

Test runs perfectly locally, so I don't understand why it fails in the pipeline
---
 .../WPF/PasswordBoxes/PasswordBoxTests.cs                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index 990438b564..403f9d4f85 100644
--- a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -105,7 +105,7 @@ public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBi
 
             // Act 2 (Update in RevealPasswordTextBox updates PasswordBox and VM)
             await revealPasswordButton.LeftClick();
-            await Task.Delay(50);   // Wait for the "clear text TextBox" to become visible
+            await Task.Delay(100);   // Wait for the "clear text TextBox" to become visible
             await clearTextPasswordTextBox.SendKeyboardInput($"2");
             string? boundText2 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
             string? password2 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));

From b282e6c3ec5da37b292003b07438c69d948a20c0 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 4 Nov 2022 19:58:04 +0100
Subject: [PATCH 07/23] Rollback of increased test delay

---
 .../WPF/PasswordBoxes/PasswordBoxTests.cs                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index 403f9d4f85..990438b564 100644
--- a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -105,7 +105,7 @@ public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBi
 
             // Act 2 (Update in RevealPasswordTextBox updates PasswordBox and VM)
             await revealPasswordButton.LeftClick();
-            await Task.Delay(100);   // Wait for the "clear text TextBox" to become visible
+            await Task.Delay(50);   // Wait for the "clear text TextBox" to become visible
             await clearTextPasswordTextBox.SendKeyboardInput($"2");
             string? boundText2 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
             string? password2 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));

From dda88f8449290b41b2db097785f656916885fb3c Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sat, 5 Nov 2022 09:17:16 +0100
Subject: [PATCH 08/23] Update
 MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs

Co-authored-by: Kevin B <Keboo@users.noreply.github.com>
---
 .../Behaviors/PasswordBoxRevealTextBoxBehavior.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
index c9e76c8e5b..a326b6f8a4 100644
--- a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
+++ b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
@@ -71,7 +71,7 @@ private PasswordBoxSelection GetPasswordBoxSelection()
         int selectionLength = 0;
         if (endValue.HasValue)
         {
-            selectionLength = endValue.Value - startValue.GetValueOrDefault(0);
+            selectionLength = endValue.Value - selectionStart;
         }
         return new PasswordBoxSelection(selectionStart, selectionLength);
     }

From 7d323862181430368142b7295cad9f783719df14 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sat, 5 Nov 2022 09:17:54 +0100
Subject: [PATCH 09/23] Update
 MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs

Co-authored-by: Kevin B <Keboo@users.noreply.github.com>
---
 .../Behaviors/PasswordBoxRevealTextBoxBehavior.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
index a326b6f8a4..291ebbe2e5 100644
--- a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
+++ b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
@@ -67,7 +67,7 @@ private PasswordBoxSelection GetPasswordBoxSelection()
         object? end = typeTextRange?.GetProperty("End")?.GetGetMethod()?.Invoke(selection, null);
         int? startValue = start?.GetType().GetProperty("Offset", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(start, null) as int?;
         int? endValue = end?.GetType().GetProperty("Offset", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(end, null) as int?;
-        int selectionStart = startValue.GetValueOrDefault(0);
+        int selectionStart = startValue ?? 0;
         int selectionLength = 0;
         if (endValue.HasValue)
         {

From e1ddcf84a2801ebe21d2f5dcb909cad27249c8f9 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sat, 5 Nov 2022 13:57:54 +0100
Subject: [PATCH 10/23] Extract PasswordBoxBehavior into its own class

---
 .../Behaviors/PasswordBoxBehavior.cs          | 24 +++++++++++++
 MaterialDesignThemes.Wpf/PasswordBoxAssist.cs | 34 +------------------
 .../MaterialDesignTheme.PasswordBox.xaml      |  4 +--
 3 files changed, 27 insertions(+), 35 deletions(-)
 create mode 100644 MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs

diff --git a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs
new file mode 100644
index 0000000000..a4e7d700e4
--- /dev/null
+++ b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs
@@ -0,0 +1,24 @@
+using Microsoft.Xaml.Behaviors;
+
+namespace MaterialDesignThemes.Wpf.Behaviors
+{
+    internal class PasswordBoxBehavior : Behavior<PasswordBox>
+    {
+        private void PasswordBoxLoaded(object sender, RoutedEventArgs e) => PasswordBoxAssist.SetPassword(AssociatedObject, AssociatedObject.Password);
+
+        protected override void OnAttached()
+        {
+            base.OnAttached();
+            AssociatedObject.Loaded += PasswordBoxLoaded;
+        }
+
+        protected override void OnDetaching()
+        {
+            if (AssociatedObject != null)
+            {
+                AssociatedObject.Loaded -= PasswordBoxLoaded;
+            }
+            base.OnDetaching();
+        }
+    }
+}
diff --git a/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs b/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
index 8dd0d09ba3..120ee78e0b 100644
--- a/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
+++ b/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
@@ -1,10 +1,8 @@
 using System.Windows.Data;
-using System.Windows.Documents;
-using Microsoft.Xaml.Behaviors;
 
 namespace MaterialDesignThemes.Wpf;
 
-public class PasswordBoxAssist : Behavior<PasswordBox>
+public static class PasswordBoxAssist
 {
     public static readonly DependencyProperty PasswordMaskedIconProperty = DependencyProperty.RegisterAttached(
         "PasswordMaskedIcon", typeof(PackIconKind), typeof(PasswordBoxAssist), new FrameworkPropertyMetadata(PackIconKind.EyeOff, FrameworkPropertyMetadataOptions.Inherits));
@@ -30,17 +28,6 @@ public class PasswordBoxAssist : Behavior<PasswordBox>
         "IsChanging", typeof(bool), typeof(PasswordBoxAssist), new UIPropertyMetadata(false));
     private static void SetIsChanging(UIElement element, bool value) => element.SetValue(IsChangingProperty, value);
     private static bool GetIsChanging(UIElement element) => (bool)element.GetValue(IsChangingProperty);
-    
-    private static readonly DependencyProperty SelectionProperty = DependencyProperty.RegisterAttached(
-        "Selection", typeof(TextSelection), typeof(PasswordBoxAssist), new UIPropertyMetadata(default(TextSelection)));
-    private static void SetSelection(DependencyObject obj, TextSelection? value) => obj.SetValue(SelectionProperty, value);
-    private static TextSelection? GetSelection(DependencyObject obj) => (TextSelection?)obj.GetValue(SelectionProperty);
-
-    private static readonly DependencyProperty RevealedPasswordTextBoxProperty = DependencyProperty.RegisterAttached(
-        "RevealedPasswordTextBox", typeof(TextBox), typeof(PasswordBoxAssist), new UIPropertyMetadata(default(TextBox)));
-    private static void SetRevealedPasswordTextBox(DependencyObject obj, TextBox? value) => obj.SetValue(RevealedPasswordTextBoxProperty, value);
-    private static TextBox? GetRevealedPasswordTextBox(DependencyObject obj) => (TextBox?)obj.GetValue(RevealedPasswordTextBoxProperty);
-
 
     /// <summary>
     /// Handles changes to the 'Password' attached property.
@@ -70,23 +57,4 @@ private static void PasswordBoxPasswordChanged(object sender, RoutedEventArgs e)
             SetIsChanging(passwordBox, false);
         }
     }
-
-    private void PasswordBoxLoaded(object sender, RoutedEventArgs e) => SetPassword(AssociatedObject, AssociatedObject.Password);
-    
-    protected override void OnAttached()
-    {
-        base.OnAttached();
-        AssociatedObject.PasswordChanged += PasswordBoxPasswordChanged;
-        AssociatedObject.Loaded += PasswordBoxLoaded;
-    }
-
-    protected override void OnDetaching()
-    {
-        if (AssociatedObject != null)
-        {
-            AssociatedObject.Loaded -= PasswordBoxLoaded;
-            AssociatedObject.PasswordChanged -= PasswordBoxPasswordChanged;
-        }
-        base.OnDetaching();
-    }
 }
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index e1de662a0e..0ec405c9dc 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -448,7 +448,7 @@
     <Setter Property="wpf:StylizedBehaviors.Behaviors">
       <Setter.Value>
         <wpf:StylizedBehaviorCollection>
-          <wpf:PasswordBoxAssist />
+          <internalbehaviors:PasswordBoxBehavior />
         </wpf:StylizedBehaviorCollection>
       </Setter.Value>
     </Setter>
@@ -958,7 +958,7 @@
     <Setter Property="wpf:StylizedBehaviors.Behaviors">
       <Setter.Value>
         <wpf:StylizedBehaviorCollection>
-          <wpf:PasswordBoxAssist />
+          <internalbehaviors:PasswordBoxBehavior />
         </wpf:StylizedBehaviorCollection>
       </Setter.Value>
     </Setter>

From 847d6ab6c091666fbe77a656e15eff537ea38f33 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sat, 5 Nov 2022 13:58:28 +0100
Subject: [PATCH 11/23] Cache PropertyInfos and MethodInfos in
 PasswordBoxRevealTextBoxBehavior

---
 .../PasswordBoxRevealTextBoxBehavior.cs       | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
index 291ebbe2e5..861c980aca 100644
--- a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
+++ b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxRevealTextBoxBehavior.cs
@@ -20,14 +20,30 @@ internal PasswordBox? PasswordBox
         set => SetValue(PasswordBoxProperty, value);
     }
 
+    private static PropertyInfo SelectionPropertyInfo { get; }
+    private static MethodInfo SelectMethodInfo { get; }
+    private static MethodInfo GetStartMethodInfo { get; }
+    private static MethodInfo GetEndMethodInfo { get; }
+    private static PropertyInfo GetOffsetPropertyInfo { get; }
+
+    static PasswordBoxRevealTextBoxBehavior()
+    {
+        SelectionPropertyInfo = typeof(PasswordBox).GetProperty("Selection", BindingFlags.NonPublic | BindingFlags.Instance) ?? throw new InvalidOperationException("Did not find 'Selection' property on PasswordBox");
+        SelectMethodInfo = typeof(PasswordBox).GetMethod("Select", BindingFlags.Instance | BindingFlags.NonPublic) ?? throw new InvalidOperationException("Did not find 'Select' method on PasswordBox");
+        Type iTextRange = typeof(PasswordBox).Assembly.GetType("System.Windows.Documents.ITextRange") ?? throw new InvalidOperationException("Failed to find ITextRange");
+        GetStartMethodInfo = iTextRange.GetProperty("Start")?.GetGetMethod() ?? throw new InvalidOperationException($"Failed to find 'Start' property on {iTextRange.FullName}");
+        GetEndMethodInfo = iTextRange.GetProperty("End")?.GetGetMethod() ?? throw new InvalidOperationException($"Failed to find 'End' property on {iTextRange.FullName}");
+        Type passwordTextPointer = typeof(PasswordBox).Assembly.GetType("System.Windows.Controls.PasswordTextPointer") ?? throw new InvalidOperationException("Failed to find PasswordTextPointer");
+        GetOffsetPropertyInfo = passwordTextPointer.GetProperty("Offset", BindingFlags.NonPublic | BindingFlags.Instance) ?? throw new InvalidOperationException("Failed to find 'Offset' property on PasswordTextPointer");
+    }
+
     protected override void OnAttached()
     {
         base.OnAttached();
         AssociatedObject.IsVisibleChanged += AssociatedObjectOnIsVisibleChanged;
         if (PasswordBox != null)
         {
-            var info = typeof(PasswordBox).GetProperty("Selection", BindingFlags.NonPublic | BindingFlags.Instance);
-            var selection = info?.GetValue(PasswordBox, null) as TextSelection;
+            var selection = SelectionPropertyInfo.GetValue(PasswordBox, null) as TextSelection;
             SetSelection(AssociatedObject, selection);
         }
     }
@@ -62,11 +78,10 @@ private void AssociatedObjectOnIsVisibleChanged(object sender, DependencyPropert
     private PasswordBoxSelection GetPasswordBoxSelection()
     {
         var selection = GetSelection(AssociatedObject);
-        var typeTextRange = selection?.GetType().GetInterfaces().FirstOrDefault(i => i.Name == "ITextRange");
-        object? start = typeTextRange?.GetProperty("Start")?.GetGetMethod()?.Invoke(selection, null);
-        object? end = typeTextRange?.GetProperty("End")?.GetGetMethod()?.Invoke(selection, null);
-        int? startValue = start?.GetType().GetProperty("Offset", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(start, null) as int?;
-        int? endValue = end?.GetType().GetProperty("Offset", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(end, null) as int?;
+        object? start = GetStartMethodInfo.Invoke(selection, null);
+        object? end = GetEndMethodInfo.Invoke(selection, null);
+        int? startValue = GetOffsetPropertyInfo.GetValue(start, null) as int?;
+        int? endValue = GetOffsetPropertyInfo.GetValue(end, null) as int?;
         int selectionStart = startValue ?? 0;
         int selectionLength = 0;
         if (endValue.HasValue)
@@ -76,17 +91,7 @@ private PasswordBoxSelection GetPasswordBoxSelection()
         return new PasswordBoxSelection(selectionStart, selectionLength);
     }
 
-    private void SetPasswordBoxSelection(int selectionStart, int selectionLength) => typeof(PasswordBox).GetMethod("Select", BindingFlags.Instance | BindingFlags.NonPublic)?.Invoke(PasswordBox, new object[] { selectionStart, selectionLength });
+    private void SetPasswordBoxSelection(int selectionStart, int selectionLength) => SelectMethodInfo.Invoke(PasswordBox, new object[] { selectionStart, selectionLength });
 
-    private struct PasswordBoxSelection
-    {
-        public readonly int SelectionStart;
-        public readonly int SelectionEnd;
-
-        public PasswordBoxSelection(int selectionStart, int selectionEnd)
-        {
-            SelectionStart = selectionStart;
-            SelectionEnd = selectionEnd;
-        }
-    }
+    private record struct PasswordBoxSelection(int SelectionStart, int SelectionEnd);
 }

From 417c69c2a4f774f88bb0bde96d82ba11a8b803f7 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sat, 5 Nov 2022 14:07:49 +0100
Subject: [PATCH 12/23] Selecting minimum required version of dependency and
 updating nuspec

I am unsure whether we can go down to an even older version - potentially supporting a broader audience.
---
 Directory.packages.props    | 2 +-
 MaterialDesignThemes.nuspec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Directory.packages.props b/Directory.packages.props
index 291e6d227e..880a979331 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -15,7 +15,7 @@
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="6.0.6" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageVersion Include="Microsoft.Toolkit.MVVM" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.37" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="Shouldly" Version="4.1.0" />
     <PackageVersion Include="ShowMeTheXAML" Version="2.0.0" />
diff --git a/MaterialDesignThemes.nuspec b/MaterialDesignThemes.nuspec
index 984ed606e8..9453f098da 100644
--- a/MaterialDesignThemes.nuspec
+++ b/MaterialDesignThemes.nuspec
@@ -17,12 +17,15 @@
     <dependencies>
       <group targetFramework="net462">
         <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.31" />
       </group>
       <group targetFramework="netcoreapp3.1">
         <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.31" />
       </group>
       <group targetFramework="net6.0">
         <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.31" />
       </group>
     </dependencies>
   </metadata>
@@ -34,4 +37,4 @@
     <file src="MaterialDesignThemes.Wpf\MaterialDesignThemes.targets" target="build" />
     <file src="MaterialDesignThemes.Wpf\VisualStudioToolsManifest.xml" target="tools" />
   </files>
-</package>
\ No newline at end of file
+</package>

From 4b78de64a9de6def7f03517f8f91ce7adc4c1296 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sun, 6 Nov 2022 14:19:00 +0100
Subject: [PATCH 13/23] Convert Password binding to opt-in feature

Previously, the attached property was updated based on the PasswordChanged event regardless of whether the user had setup a binding or not. Now it is only wired up if there is a binding, or the "reveal" style has been applied (where it is a necessary evil).
---
 MaterialDesignThemes.Wpf/PasswordBoxAssist.cs          | 10 +++++++++-
 .../Themes/MaterialDesignTheme.PasswordBox.xaml        |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs b/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
index 120ee78e0b..bee25b856d 100644
--- a/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
+++ b/MaterialDesignThemes.Wpf/PasswordBoxAssist.cs
@@ -29,13 +29,21 @@ public static class PasswordBoxAssist
     private static void SetIsChanging(UIElement element, bool value) => element.SetValue(IsChangingProperty, value);
     private static bool GetIsChanging(UIElement element) => (bool)element.GetValue(IsChangingProperty);
 
+    // Attached property used by the "reveal" Style to enforce the wiring-up of the PasswordChanged event handler; needed for the "reveal" TextBox.
+    internal static readonly DependencyProperty SuppressBindingGuardProperty = DependencyProperty.RegisterAttached(
+        "SuppressBindingGuard", typeof(bool), typeof(PasswordBoxAssist), new PropertyMetadata(default(bool)));
+    internal static void SetSuppressBindingGuard(DependencyObject element, bool value) => element.SetValue(SuppressBindingGuardProperty, value);
+    internal static bool GetSuppressBindingGuard(DependencyObject element) => (bool) element.GetValue(SuppressBindingGuardProperty);
+
     /// <summary>
     /// Handles changes to the 'Password' attached property.
     /// </summary>
     private static void HandlePasswordChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
     {
-        if (sender is PasswordBox targetPasswordBox)
+        if (sender is PasswordBox targetPasswordBox &&
+            (GetSuppressBindingGuard(targetPasswordBox) || BindingOperations.GetBindingBase(targetPasswordBox, PasswordProperty) != null))
         {
+            // If the PasswordBox is either "reveal" style (ie. SuppressBindingGuard=true) or the user has set a binding on the attached property, we wire up the PasswordChanged event handler.
             targetPasswordBox.PasswordChanged -= PasswordBoxPasswordChanged;
             if (!GetIsChanging(targetPasswordBox))
             {
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index 0ec405c9dc..5ac70ed528 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -955,6 +955,7 @@
     <Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterStyle" Value="{StaticResource MaterialDesignPasswordCharacterCounterTextBlock}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterVisibility" Value="Hidden" />
+    <Setter Property="wpf:PasswordBoxAssist.SuppressBindingGuard" Value="True" />
     <Setter Property="wpf:StylizedBehaviors.Behaviors">
       <Setter.Value>
         <wpf:StylizedBehaviorCollection>

From 3fdb918591f3a18e655da9e953816cc870328b2a Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sun, 6 Nov 2022 14:32:15 +0100
Subject: [PATCH 14/23] File scoped namespace

---
 .../Behaviors/PasswordBoxBehavior.cs          | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs
index a4e7d700e4..9647a11a5f 100644
--- a/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs
+++ b/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs
@@ -1,24 +1,23 @@
 using Microsoft.Xaml.Behaviors;
 
-namespace MaterialDesignThemes.Wpf.Behaviors
+namespace MaterialDesignThemes.Wpf.Behaviors;
+
+internal class PasswordBoxBehavior : Behavior<PasswordBox>
 {
-    internal class PasswordBoxBehavior : Behavior<PasswordBox>
-    {
-        private void PasswordBoxLoaded(object sender, RoutedEventArgs e) => PasswordBoxAssist.SetPassword(AssociatedObject, AssociatedObject.Password);
+    private void PasswordBoxLoaded(object sender, RoutedEventArgs e) => PasswordBoxAssist.SetPassword(AssociatedObject, AssociatedObject.Password);
 
-        protected override void OnAttached()
-        {
-            base.OnAttached();
-            AssociatedObject.Loaded += PasswordBoxLoaded;
-        }
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        AssociatedObject.Loaded += PasswordBoxLoaded;
+    }
 
-        protected override void OnDetaching()
+    protected override void OnDetaching()
+    {
+        if (AssociatedObject != null)
         {
-            if (AssociatedObject != null)
-            {
-                AssociatedObject.Loaded -= PasswordBoxLoaded;
-            }
-            base.OnDetaching();
+            AssociatedObject.Loaded -= PasswordBoxLoaded;
         }
+        base.OnDetaching();
     }
 }

From e89ce216e80404a662194473e1f7043868786bf1 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sun, 6 Nov 2022 14:32:39 +0100
Subject: [PATCH 15/23] Behavior classes renames and change from internal to
 public

---
 .../BehaviorCollection.cs                     |  8 +++++++
 ...tylizedBehaviors.cs => BehaviorsAssist.cs} | 21 +++++++++++--------
 .../StylizedBehaviorCollection.cs             |  8 -------
 3 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 MaterialDesignThemes.Wpf/BehaviorCollection.cs
 rename MaterialDesignThemes.Wpf/{StylizedBehaviors.cs => BehaviorsAssist.cs} (74%)
 delete mode 100644 MaterialDesignThemes.Wpf/StylizedBehaviorCollection.cs

diff --git a/MaterialDesignThemes.Wpf/BehaviorCollection.cs b/MaterialDesignThemes.Wpf/BehaviorCollection.cs
new file mode 100644
index 0000000000..51de8c5161
--- /dev/null
+++ b/MaterialDesignThemes.Wpf/BehaviorCollection.cs
@@ -0,0 +1,8 @@
+using Microsoft.Xaml.Behaviors;
+
+namespace MaterialDesignThemes.Wpf;
+
+public class BehaviorCollection : FreezableCollection<Behavior>
+{
+    protected override Freezable CreateInstanceCore() => new BehaviorCollection();
+}
diff --git a/MaterialDesignThemes.Wpf/StylizedBehaviors.cs b/MaterialDesignThemes.Wpf/BehaviorsAssist.cs
similarity index 74%
rename from MaterialDesignThemes.Wpf/StylizedBehaviors.cs
rename to MaterialDesignThemes.Wpf/BehaviorsAssist.cs
index ca72e4590d..0dcbb04596 100644
--- a/MaterialDesignThemes.Wpf/StylizedBehaviors.cs
+++ b/MaterialDesignThemes.Wpf/BehaviorsAssist.cs
@@ -2,17 +2,20 @@
 
 namespace MaterialDesignThemes.Wpf;
 
-internal class StylizedBehaviors
+/* This class is a copy of the StylizedBehaviors.cs from the MahApps.Metro repository with very few changes to it:
+ * https://github.com/MahApps/MahApps.Metro/blob/6bce9f8733318a7f1f50ff112f834e917e766ae8/src/MahApps.Metro/Behaviors/StylizedBehaviors.cs
+ */
+public static class BehaviorsAssist
 {
     private static readonly DependencyProperty OriginalBehaviorProperty = DependencyProperty.RegisterAttached(
-        "OriginalBehavior", typeof(Behavior), typeof(StylizedBehaviors), new UIPropertyMetadata(null));
+        "OriginalBehavior", typeof(Behavior), typeof(BehaviorsAssist), new UIPropertyMetadata(null));
     private static void SetOriginalBehavior(DependencyObject obj, Behavior? value) => obj.SetValue(OriginalBehaviorProperty, value);
     private static Behavior? GetOriginalBehavior(DependencyObject obj) => (Behavior?)obj.GetValue(OriginalBehaviorProperty);
 
-    internal static readonly DependencyProperty BehaviorsProperty = DependencyProperty.RegisterAttached(
-        "Behaviors", typeof(StylizedBehaviorCollection), typeof(StylizedBehaviors), new FrameworkPropertyMetadata(null, OnPropertyChanged));
-    internal static void SetBehaviors(DependencyObject uie, StylizedBehaviorCollection? value) => uie.SetValue(BehaviorsProperty, value);
-    internal static StylizedBehaviorCollection? GetBehaviors(DependencyObject uie) => (StylizedBehaviorCollection?)uie.GetValue(BehaviorsProperty);
+    public static readonly DependencyProperty BehaviorsProperty = DependencyProperty.RegisterAttached(
+        "Behaviors", typeof(BehaviorCollection), typeof(BehaviorsAssist), new FrameworkPropertyMetadata(null, OnPropertyChanged));
+    public static void SetBehaviors(DependencyObject uie, BehaviorCollection? value) => uie.SetValue(BehaviorsProperty, value);
+    public static BehaviorCollection? GetBehaviors(DependencyObject uie) => (BehaviorCollection?)uie.GetValue(BehaviorsProperty);
 
     private static void OnPropertyChanged(DependencyObject dpo, DependencyPropertyChangedEventArgs e)
     {
@@ -21,8 +24,8 @@ private static void OnPropertyChanged(DependencyObject dpo, DependencyPropertyCh
             return;
         }
 
-        var newBehaviors = e.NewValue as StylizedBehaviorCollection;
-        var oldBehaviors = e.OldValue as StylizedBehaviorCollection;
+        var newBehaviors = e.NewValue as BehaviorCollection;
+        var oldBehaviors = e.OldValue as BehaviorCollection;
         if (newBehaviors == oldBehaviors)
         {
             return;
@@ -94,7 +97,7 @@ private static void FrameworkElementLoaded(object sender, RoutedEventArgs e)
         }
     }
 
-    private static int GetIndexOf(BehaviorCollection itemBehaviors, Behavior behavior)
+    private static int GetIndexOf(Microsoft.Xaml.Behaviors.BehaviorCollection itemBehaviors, Behavior behavior)
     {
         int index = -1;
 
diff --git a/MaterialDesignThemes.Wpf/StylizedBehaviorCollection.cs b/MaterialDesignThemes.Wpf/StylizedBehaviorCollection.cs
deleted file mode 100644
index fa627fe3e6..0000000000
--- a/MaterialDesignThemes.Wpf/StylizedBehaviorCollection.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Microsoft.Xaml.Behaviors;
-
-namespace MaterialDesignThemes.Wpf;
-
-public class StylizedBehaviorCollection : FreezableCollection<Behavior>
-{
-    protected override Freezable CreateInstanceCore() => new StylizedBehaviorCollection();
-}

From 21d73732314f5d906ef1927896062da4a86ed7cc Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Sun, 6 Nov 2022 14:34:25 +0100
Subject: [PATCH 16/23] Use latest version of Xaml.Behaviors and update nuspec
 file

---
 Directory.packages.props    | 2 +-
 MaterialDesignThemes.nuspec | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.packages.props b/Directory.packages.props
index 880a979331..83570d5c7e 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -15,7 +15,7 @@
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="6.0.6" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageVersion Include="Microsoft.Toolkit.MVVM" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="Shouldly" Version="4.1.0" />
     <PackageVersion Include="ShowMeTheXAML" Version="2.0.0" />
diff --git a/MaterialDesignThemes.nuspec b/MaterialDesignThemes.nuspec
index 9453f098da..a32b60437a 100644
--- a/MaterialDesignThemes.nuspec
+++ b/MaterialDesignThemes.nuspec
@@ -17,15 +17,15 @@
     <dependencies>
       <group targetFramework="net462">
         <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.31" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="[1.1.39, 2.0)" />
       </group>
       <group targetFramework="netcoreapp3.1">
         <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.31" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="[1.1.39, 2.0)" />
       </group>
       <group targetFramework="net6.0">
         <dependency id="MaterialDesignColors" version="[1.2.1, 2.0)" />
-        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.31" />
+        <dependency id="Microsoft.Xaml.Behaviors.Wpf" version="[1.1.39, 2.0)" />
       </group>
     </dependencies>
   </metadata>

From da46c378acaefb6f495014d99f8c83fe0dcd048c Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Sun, 6 Nov 2022 21:17:19 -0800
Subject: [PATCH 17/23] Attempting fix of pipeline

---
 .../Themes/MaterialDesignTheme.PasswordBox.xaml      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index 5ac70ed528..3619296618 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -445,11 +445,11 @@
     <Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterStyle" Value="{StaticResource MaterialDesignPasswordCharacterCounterTextBlock}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterVisibility" Value="Hidden" />
-    <Setter Property="wpf:StylizedBehaviors.Behaviors">
+    <Setter Property="wpf:BehaviorsAssist.Behaviors">
       <Setter.Value>
-        <wpf:StylizedBehaviorCollection>
+        <wpf:BehaviorCollection>
           <internalbehaviors:PasswordBoxBehavior />
-        </wpf:StylizedBehaviorCollection>
+        </wpf:BehaviorCollection>
       </Setter.Value>
     </Setter>
   </Style>
@@ -956,11 +956,11 @@
     <Setter Property="wpf:TextFieldAssist.CharacterCounterStyle" Value="{StaticResource MaterialDesignPasswordCharacterCounterTextBlock}" />
     <Setter Property="wpf:TextFieldAssist.CharacterCounterVisibility" Value="Hidden" />
     <Setter Property="wpf:PasswordBoxAssist.SuppressBindingGuard" Value="True" />
-    <Setter Property="wpf:StylizedBehaviors.Behaviors">
+    <Setter Property="wpf:BehaviorsAssist.Behaviors">
       <Setter.Value>
-        <wpf:StylizedBehaviorCollection>
+        <wpf:BehaviorCollection>
           <internalbehaviors:PasswordBoxBehavior />
-        </wpf:StylizedBehaviorCollection>
+        </wpf:BehaviorCollection>
       </Setter.Value>
     </Setter>
   </Style>

From 81248834052e390f69f8e837673fafc621f72b3b Mon Sep 17 00:00:00 2001
From: Kevin Bost <kitokeboo@gmail.com>
Date: Mon, 7 Nov 2022 00:50:49 -0800
Subject: [PATCH 18/23] Adding screenshots for debugging

---
 .../WPF/PasswordBoxes/PasswordBoxTests.cs                      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index 990438b564..3e0b9bc641 100644
--- a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -102,10 +102,13 @@ public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBi
             string? boundText1 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
             string? password1 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
             string? clearTextPassword1 = await clearTextPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
+            await recorder.SaveScreenshot();
 
             // Act 2 (Update in RevealPasswordTextBox updates PasswordBox and VM)
             await revealPasswordButton.LeftClick();
+            await recorder.SaveScreenshot();
             await Task.Delay(50);   // Wait for the "clear text TextBox" to become visible
+            await recorder.SaveScreenshot();
             await clearTextPasswordTextBox.SendKeyboardInput($"2");
             string? boundText2 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
             string? password2 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));

From fac1639237ed30b3d6bdd0ea6e856f28eef2bc87 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 7 Nov 2022 21:00:14 +0100
Subject: [PATCH 19/23] Attempt at fixing failing UI test

---
 .../Samples/PasswordBox/BoundPasswordBoxWindow.xaml      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
index e6ee451792..f2c448af7c 100644
--- a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
@@ -4,7 +4,16 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.PasswordBox"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         mc:Ignorable="d"
+        Background="{DynamicResource MaterialDesignPaper}"
+        FontFamily="{materialDesign:MaterialDesignFont}"
+        TextElement.FontSize="13"
+        TextElement.FontWeight="Regular"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextOptions.TextFormattingMode="Ideal"
+        TextOptions.TextRenderingMode="Auto"
+        WindowStartupLocation="CenterScreen"
         Title="BoundPasswordBoxWindow" Height="450" Width="800">
     <local:BoundPasswordBox />
 </Window>

From b52a9cec7beb4d64826bb4113545c8ff5b340406 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 7 Nov 2022 21:18:24 +0100
Subject: [PATCH 20/23] Adding more screenshots for debugging

---
 .../WPF/PasswordBoxes/PasswordBoxTests.cs                     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index 3e0b9bc641..a72b8e9c98 100644
--- a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -91,12 +91,14 @@ public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBi
 
             await App.InitializeWithMaterialDesign();
             IWindow window = await App.CreateWindow<BoundPasswordBoxWindow>();
+            await recorder.SaveScreenshot();
             var userControl = await window.GetElement<BoundPasswordBox>();
             await userControl.SetProperty(nameof(BoundPasswordBox.UseRevealStyle), true);
             var passwordBox = await userControl.GetElement<PasswordBox>("PasswordBox");
             var clearTextPasswordTextBox = await passwordBox.GetElement<TextBox>("RevealPasswordTextBox");
             var revealPasswordButton = await passwordBox.GetElement<ToggleButton>("RevealPasswordButton");
-            
+            await recorder.SaveScreenshot();
+
             // Act 1 (Update in PasswordBox updates VM and RevealPasswordTextBox)
             await passwordBox.SendKeyboardInput($"1");
             string? boundText1 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));

From 100bad6af418e0de236d2e00d0a139dd6094bdc3 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 7 Nov 2022 21:32:28 +0100
Subject: [PATCH 21/23] Activate test window on loaded event

---
 .../Samples/PasswordBox/BoundPasswordBoxWindow.xaml             | 1 +
 .../Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs          | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
index f2c448af7c..a63cc41486 100644
--- a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
@@ -14,6 +14,7 @@
         TextOptions.TextFormattingMode="Ideal"
         TextOptions.TextRenderingMode="Auto"
         WindowStartupLocation="CenterScreen"
+        Loaded="BoundPasswordBoxWindow_OnLoaded"
         Title="BoundPasswordBoxWindow" Height="450" Width="800">
     <local:BoundPasswordBox />
 </Window>
diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs
index f129d6381a..c97320eac8 100644
--- a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs
@@ -3,4 +3,6 @@
 public partial class BoundPasswordBoxWindow
 {
     public BoundPasswordBoxWindow() => InitializeComponent();
+
+    private void BoundPasswordBoxWindow_OnLoaded(object sender, RoutedEventArgs e) => Activate();
 }

From bfbd3d54a69d6eae03c7d67fd37e7d5b2916885f Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 7 Nov 2022 21:47:31 +0100
Subject: [PATCH 22/23] Yet another attempt at getting test window shown

---
 .../Samples/PasswordBox/BoundPasswordBoxWindow.xaml       | 6 ++++--
 .../Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs    | 8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
index a63cc41486..da1370246a 100644
--- a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
@@ -6,6 +6,9 @@
         xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.PasswordBox"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         mc:Ignorable="d"
+        Width="1100"
+        Height="800"
+        Title="BoundPasswordBoxWindow"
         Background="{DynamicResource MaterialDesignPaper}"
         FontFamily="{materialDesign:MaterialDesignFont}"
         TextElement.FontSize="13"
@@ -14,7 +17,6 @@
         TextOptions.TextFormattingMode="Ideal"
         TextOptions.TextRenderingMode="Auto"
         WindowStartupLocation="CenterScreen"
-        Loaded="BoundPasswordBoxWindow_OnLoaded"
-        Title="BoundPasswordBoxWindow" Height="450" Width="800">
+        Loaded="BoundPasswordBoxWindow_OnLoaded">
     <local:BoundPasswordBox />
 </Window>
diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs
index c97320eac8..b4bae3721a 100644
--- a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml.cs
@@ -4,5 +4,11 @@ public partial class BoundPasswordBoxWindow
 {
     public BoundPasswordBoxWindow() => InitializeComponent();
 
-    private void BoundPasswordBoxWindow_OnLoaded(object sender, RoutedEventArgs e) => Activate();
+    private void BoundPasswordBoxWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Activate();
+        Topmost = true;
+        Topmost = false;
+        Focus();
+    }
 }

From afbc7300cf7828db4afa8d3326f880665febded1 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Mon, 7 Nov 2022 21:59:24 +0100
Subject: [PATCH 23/23] Removing debugging screenshots

---
 .../Samples/PasswordBox/BoundPasswordBoxWindow.xaml          | 4 ++--
 .../WPF/PasswordBoxes/PasswordBoxTests.cs                    | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
index da1370246a..251c50acc1 100644
--- a/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
+++ b/MaterialDesignThemes.UITests/Samples/PasswordBox/BoundPasswordBoxWindow.xaml
@@ -6,8 +6,8 @@
         xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.PasswordBox"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         mc:Ignorable="d"
-        Width="1100"
-        Height="800"
+        Height="450"
+        Width="800"
         Title="BoundPasswordBoxWindow"
         Background="{DynamicResource MaterialDesignPaper}"
         FontFamily="{materialDesign:MaterialDesignFont}"
diff --git a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index a72b8e9c98..a8b72dca81 100644
--- a/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -91,26 +91,21 @@ public async Task RevealPasswordBox_WithBoundPasswordProperty_RespectsThreeWayBi
 
             await App.InitializeWithMaterialDesign();
             IWindow window = await App.CreateWindow<BoundPasswordBoxWindow>();
-            await recorder.SaveScreenshot();
             var userControl = await window.GetElement<BoundPasswordBox>();
             await userControl.SetProperty(nameof(BoundPasswordBox.UseRevealStyle), true);
             var passwordBox = await userControl.GetElement<PasswordBox>("PasswordBox");
             var clearTextPasswordTextBox = await passwordBox.GetElement<TextBox>("RevealPasswordTextBox");
             var revealPasswordButton = await passwordBox.GetElement<ToggleButton>("RevealPasswordButton");
-            await recorder.SaveScreenshot();
 
             // Act 1 (Update in PasswordBox updates VM and RevealPasswordTextBox)
             await passwordBox.SendKeyboardInput($"1");
             string? boundText1 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
             string? password1 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));
             string? clearTextPassword1 = await clearTextPasswordTextBox.GetProperty<string>(TextBox.TextProperty);
-            await recorder.SaveScreenshot();
 
             // Act 2 (Update in RevealPasswordTextBox updates PasswordBox and VM)
             await revealPasswordButton.LeftClick();
-            await recorder.SaveScreenshot();
             await Task.Delay(50);   // Wait for the "clear text TextBox" to become visible
-            await recorder.SaveScreenshot();
             await clearTextPasswordTextBox.SendKeyboardInput($"2");
             string? boundText2 = await userControl.GetProperty<string>(nameof(BoundPasswordBox.ViewModelPassword));
             string? password2 = await passwordBox.GetProperty<string>(nameof(PasswordBox.Password));