New feature - PasswordBox styles with "reveal password" functionality

MainDemo.Wpf/DataGrids.xaml

@@ -11,31 +11,39 @@
     d:DesignHeight="300"
     d:DesignWidth="600"
     d:DataContext="{d:DesignInstance domain:ListsAndGridsViewModel}">
-    
+
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.DataGrid.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    
+
     <StackPanel>
-        <TextBlock
-            Style="{StaticResource MaterialDesignHeadline5TextBlock}"
-            Text="Custom Columns"/>
-
+        <StackPanel Orientation="Horizontal">
+            <TextBlock
+                Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                Text="Custom Columns"/>
+            <TextBlock
+                Style="{StaticResource MaterialDesignBody1TextBlock}" VerticalAlignment="Center"
+                Margin="25,0,10,0"
+                Text="SelectionUnit:"/>
+            <ComboBox x:Name="selectionUnitComboBox" ItemsSource="{Binding SelectionUnits}" SelectedIndex="0" VerticalAlignment="Center" />
+        </StackPanel>
+
         <smtx:XamlDisplay UniqueKey="grids_1">
             <DataGrid
                 ItemsSource="{Binding Items1}"
                 CanUserAddRows="False" AutoGenerateColumns="False"
-                HeadersVisibility="All">
+                HeadersVisibility="All"
+                SelectionUnit="{Binding ElementName=selectionUnitComboBox, Path=SelectedValue}">
                 <DataGrid.Resources>
                     <domain:BindingProxy
                         x:Key="DataContextProxy"
                         Data="{Binding}" />
                 </DataGrid.Resources>
-                
+
                 <DataGrid.Columns>
                     <DataGridCheckBoxColumn
                         Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" 
@@ -47,20 +55,20 @@
                                     IsChecked="{Binding Data.IsAllItems1Selected, Source={StaticResource DataContextProxy}}"/>
                             </Border>
                         </DataGridCheckBoxColumn.Header>
-                        
+
                         <DataGridCheckBoxColumn.HeaderStyle>
                             <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
                                 <Setter Property="HorizontalContentAlignment" Value="Center" />
                             </Style>
                         </DataGridCheckBoxColumn.HeaderStyle>
                     </DataGridCheckBoxColumn>
-                    
+
                     <DataGridTextColumn
                         Binding="{Binding Code}"
                         Header="Code"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
                         EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"/>
-                    
+
                     <!-- if you want to use the pop up style (MaterialDesignDataGridTextColumnPopupEditingStyle), you must use MaterialDataGridTextColumn -->
                     <materialDesign:DataGridTextColumn
                         Header="Name"
@@ -74,7 +82,7 @@
                             </Binding>
                         </materialDesign:DataGridTextColumn.Binding>
                     </materialDesign:DataGridTextColumn>
-                    
+
                     <!-- set a max length to get an indicator in the editor -->
                     <DataGridTextColumn
                         Header="Description"
@@ -88,7 +96,7 @@
                             </Binding>
                         </DataGridTextColumn.Binding>
                     </DataGridTextColumn>
-                    
+
                     <materialDesign:DataGridTextColumn
                         Binding="{Binding Numeric}"
                         Header="Number with long header"
@@ -109,7 +117,7 @@
                                 </Setter>
                             </Style>
                         </DataGridTextColumn.HeaderStyle>
-                        
+
                         <DataGridTextColumn.ElementStyle>
                             <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignDataGridTextColumnStyle}">
                                 <Setter Property="HorizontalAlignment" Value="Right" />
@@ -134,9 +142,20 @@
                     <materialDesign:DataGridComboBoxColumn
                         Header="ComboBox with long list"
                         SelectedValueBinding="{Binding Files}"
-                        ItemsSourceBinding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}, Path=DataContext.Files}">
+                        ItemsSourceBinding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}, Path=DataContext.Files}" />
 
-                    </materialDesign:DataGridComboBoxColumn>
+                    <DataGridTemplateColumn Header="Template Column">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate DataType="{x:Type domain:SelectableViewModel}">
+                                <TextBlock Text="{Binding Name}" FontStyle="Italic" FontSize="14" />
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                        <DataGridTemplateColumn.CellEditingTemplate>
+                            <DataTemplate DataType="{x:Type domain:SelectableViewModel}">
+                                <TextBox Text="{Binding Name}" Foreground="{DynamicResource SecondaryHueMidBrush}" />
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellEditingTemplate>
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
         </smtx:XamlDisplay>
@@ -145,24 +164,24 @@
             <materialDesign:PackIcon Kind="Information" Margin="0 0 5 0"/>
             <TextBlock>DataGridComboBoxColumns are virtualized by default in the library</TextBlock>
         </StackPanel>
-        
+
         <TextBlock
             Style="{StaticResource MaterialDesignHeadline5TextBlock}"
             Text="Auto Generated Columns"
             Margin="0 24 0 0"/>
-        
+
         <smtx:XamlDisplay UniqueKey="grids_2">
             <DataGrid
                 ItemsSource="{Binding Items2}"
                 CanUserAddRows="False"
                 SelectionUnit="Cell"
                 SelectionMode="Extended" />
         </smtx:XamlDisplay>
-        
+
         <TextBlock
             Style="{StaticResource MaterialDesignHeadline6TextBlock}"
             Text="Custom Padding" Margin="0 24 0 0"/>
-        
+
         <smtx:XamlDisplay UniqueKey="grids_3">
             <DataGrid
                 ItemsSource="{Binding Items3}"

MainDemo.Wpf/Domain/DemoItem.cs

@@ -1,61 +1,55 @@
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
+namespace MaterialDesignDemo.Domain;
 
-namespace MaterialDesignDemo.Domain
+public class DemoItem : ViewModelBase
 {
-    public class DemoItem : ViewModelBase
-    {
-        private readonly Type _contentType;
-        private readonly object? _dataContext;
+    private readonly Type _contentType;
+    private readonly object? _dataContext;
 
-        private object? _content;
-        private ScrollBarVisibility _horizontalScrollBarVisibilityRequirement;
-        private ScrollBarVisibility _verticalScrollBarVisibilityRequirement = ScrollBarVisibility.Auto;
-        private Thickness _marginRequirement = new(16);
+    private object? _content;
+    private ScrollBarVisibility _horizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Auto;
+    private ScrollBarVisibility _verticalScrollBarVisibilityRequirement = ScrollBarVisibility.Auto;
+    private Thickness _marginRequirement = new(16);
 
-        public DemoItem(string name, Type contentType, IEnumerable<DocumentationLink> documentation, object? dataContext = null)
-        {
-            Name = name;
-            _contentType = contentType;
-            _dataContext = dataContext;
-            Documentation = documentation;
-        }
+    public DemoItem(string name, Type contentType, IEnumerable<DocumentationLink> documentation, object? dataContext = null)
+    {
+        Name = name;
+        _contentType = contentType;
+        _dataContext = dataContext;
+        Documentation = documentation;
+    }
 
-        public string Name { get; }
+    public string Name { get; }
 
-        public IEnumerable<DocumentationLink> Documentation { get; }
+    public IEnumerable<DocumentationLink> Documentation { get; }
 
-        public object? Content => _content ??= CreateContent();
+    public object? Content => _content ??= CreateContent();
 
-        public ScrollBarVisibility HorizontalScrollBarVisibilityRequirement
-        {
-            get => _horizontalScrollBarVisibilityRequirement;
-            set => SetProperty(ref _horizontalScrollBarVisibilityRequirement, value);
-        }
+    public ScrollBarVisibility HorizontalScrollBarVisibilityRequirement
+    {
+        get => _horizontalScrollBarVisibilityRequirement;
+        set => SetProperty(ref _horizontalScrollBarVisibilityRequirement, value);
+    }
 
-        public ScrollBarVisibility VerticalScrollBarVisibilityRequirement
-        {
-            get => _verticalScrollBarVisibilityRequirement;
-            set => SetProperty(ref _verticalScrollBarVisibilityRequirement, value);
-        }
+    public ScrollBarVisibility VerticalScrollBarVisibilityRequirement
+    {
+        get => _verticalScrollBarVisibilityRequirement;
+        set => SetProperty(ref _verticalScrollBarVisibilityRequirement, value);
+    }
 
-        public Thickness MarginRequirement
-        {
-            get => _marginRequirement;
-            set => SetProperty(ref _marginRequirement, value);
-        }
+    public Thickness MarginRequirement
+    {
+        get => _marginRequirement;
+        set => SetProperty(ref _marginRequirement, value);
+    }
 
-        private object? CreateContent()
+    private object? CreateContent()
+    {
+        var content = Activator.CreateInstance(_contentType);
+        if (_dataContext != null && content is FrameworkElement element)
         {
-            var content = Activator.CreateInstance(_contentType);
-            if (_dataContext != null && content is FrameworkElement element)
-            {
-                element.DataContext = _dataContext;
-            }
-
-            return content;
+            element.DataContext = _dataContext;
         }
+
+        return content;
     }
 }

MainDemo.Wpf/Domain/FieldsViewModel.cs

@@ -1,9 +1,15 @@
-namespace MaterialDesignDemo.Domain
+namespace MaterialDesignDemo.Domain
 {
     public class FieldsViewModel : ViewModelBase
     {
         private string? _name;
         private string? _name2;
+        private string? _password1 = string.Empty;
+        private string? _password2 = "pre-filled";
+        private string? _password1Validated = "pre-filled";
+        private string? _password2Validated = "pre-filled";
+        private string? _text1;
+        private string? _text2;
 
         public string? Name
         {
@@ -17,7 +23,62 @@ public string? Name2
             set => SetProperty(ref _name2, value);
         }
 
+        public string? Text1
+        {
+            get => _text1;
+            set => SetProperty(ref _text1, value);
+        }
+
+        public string? Text2
+        {
+            get => _text2;
+            set => SetProperty(ref _text2, value);
+        }
+
+        public string? Password1
+        {
+            get => _password1;
+            set => SetProperty(ref _password1, value);
+        }
+
+        public string? Password2
+        {
+            get => _password2;
+            set => SetProperty(ref _password2, value);
+        }
+
+        public string? Password1Validated
+        {
+            get => _password1Validated;
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    throw new ArgumentException("Password cannot be empty");
+                SetProperty(ref _password1Validated, value);
+            }
+        }
+
+        public string? Password2Validated
+        {
+            get => _password2Validated;
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                    throw new ArgumentException("Password cannot be empty");
+                SetProperty(ref _password2Validated, value);
+            }
+        }
+
         public FieldsTestObject TestObject => new() { Name = "Mr. Test" };
+
+        public ICommand SetPassword1FromViewModelCommand { get; }
+        public ICommand SetPassword2FromViewModelCommand { get; }
+
+        public FieldsViewModel()
+        {
+            SetPassword1FromViewModelCommand = new AnotherCommandImplementation(_ => Password1 = "Set from code-behind!");
+            SetPassword2FromViewModelCommand = new AnotherCommandImplementation(_ => Password2 = "Set from code-behind!");
+        }
     }
 
     public class FieldsTestObject : ViewModelBase

MainDemo.Wpf/Domain/ListsAndGridsViewModel.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
@@ -89,5 +89,6 @@ private static ObservableCollection<SelectableViewModel> CreateData()
 
         public IList<string> Files { get; }
 
+        public IEnumerable<DataGridSelectionUnit> SelectionUnits => new[] { DataGridSelectionUnit.FullRow, DataGridSelectionUnit.Cell, DataGridSelectionUnit.CellOrRowHeader };
     }
 }