allow popups to suppress validation #187

Author: ButchersBoy

MainDemo.Wpf/Domain/DialogsViewModel.cs

@@ -1,16 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Threading;
+using MaterialDesignColors.WpfExample.Domain;
 using MaterialDesignThemes.Wpf;
 
-namespace MaterialDesignColors.WpfExample.Domain
+namespace MaterialDesignDemo.Domain
 {
     public class DialogsViewModel : INotifyPropertyChanged
     {
@@ -33,7 +29,7 @@ private async void ExecuteRunDialog(object o)
             //let's set up a little MVVM, cos that's what the cool kids are doing:
             var view = new SampleDialog
             {
-                DataContext = new object()
+                DataContext = new SampleDialogViewModel()
             };
 
             //show the dialog
@@ -53,7 +49,7 @@ private async void ExecuteRunExtendedDialog(object o)
             //let's set up a little MVVM, cos that's what the cool kids are doing:
             var view = new SampleDialog
             {
-                DataContext = new object()
+                DataContext = new SampleDialogViewModel()
             };
 
             //show the dialog

MainDemo.Wpf/Domain/SampleDialog.xaml

@@ -6,6 +6,8 @@
              xmlns:local="clr-namespace:MaterialDesignColors.WpfExample.Domain"
              xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
+             xmlns:wpfExample="clr-namespace:MaterialDesignColors.WpfExample"
+             xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <Grid Margin="16">
@@ -17,10 +19,17 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <TextBlock>New contact:</TextBlock>
-        <TextBox wpf:TextFieldAssist.Hint="Name" Style="{DynamicResource MaterialDesignFloatingHintTextBox}"
+        <TextBox wpf:TextFieldAssist.Hint="Name" Style="{DynamicResource MaterialDesignFloatingHintTextBox}"                 
                  Margin="0 6 0 0"
-                 FontSize="18" Grid.Row="1"
-                 />
+                 FontSize="18" Grid.Row="1">
+            <TextBox.Text>
+                <Binding Path="Name" UpdateSourceTrigger="PropertyChanged">
+                    <Binding.ValidationRules>
+                        <materialDesignDemo:NotEmptyValidationRule ValidatesOnTargetUpdated="True" />
+                    </Binding.ValidationRules>
+                </Binding>
+            </TextBox.Text>
+        </TextBox>
         <TextBox wpf:TextFieldAssist.Hint="Number" Style="{DynamicResource MaterialDesignFloatingHintTextBox}"
                  Margin="0 8 0 0"
                  FontSize="16" Grid.Row="2"

MainDemo.Wpf/Domain/SampleDialogViewModel.cs

@@ -0,0 +1,27 @@
+using System;
+using System.ComponentModel;
+using MaterialDesignColors.WpfExample.Domain;
+
+namespace MaterialDesignDemo.Domain
+{
+    public class SampleDialogViewModel : INotifyPropertyChanged
+    {
+        private string _name;
+
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                this.MutateVerbose(ref _name, value, RaisePropertyChanged());
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private Action<PropertyChangedEventArgs> RaisePropertyChanged()
+        {
+            return args => PropertyChanged?.Invoke(this, args);
+        }
+    }
+}

MainDemo.Wpf/MainWindow.xaml

@@ -5,6 +5,7 @@
         xmlns:domain="clr-namespace:MaterialDesignColors.WpfExample.Domain"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"
         Title="Material Design in XAML" Height="800" Width="1100"
         TextElement.Foreground="{DynamicResource MaterialDesignBody}"
         TextElement.FontWeight="Regular"
@@ -146,7 +147,7 @@
                             <domain:DemoItem.Content>
                                 <wpfExample:Dialogs>
                                     <wpfExample:Dialogs.DataContext>
-                                        <domain:DialogsViewModel />
+                                        <domain1:DialogsViewModel />
                                     </wpfExample:Dialogs.DataContext>
                                 </wpfExample:Dialogs>
                             </domain:DemoItem.Content>

MainDemo.Wpf/MaterialDesignDemo.csproj

@@ -90,6 +90,7 @@
     <Compile Include="Domain\SampleDialog.xaml.cs">
       <DependentUpon>SampleDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Domain\SampleDialogViewModel.cs" />
     <Compile Include="Domain\SampleMessageDialog.xaml.cs">
       <DependentUpon>SampleMessageDialog.xaml</DependentUpon>
     </Compile>

MainDemo.Wpf/NotEmptyValidationRule.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Windows.Controls;
 
-namespace MaterialDesignColors.WpfExample
+namespace MaterialDesignDemo
 {
 	public class NotEmptyValidationRule : ValidationRule
 	{

MainDemo.Wpf/TextFields.xaml

@@ -6,6 +6,7 @@
              xmlns:wpfExample="clr-namespace:MaterialDesignColors.WpfExample"
              xmlns:domain="clr-namespace:MaterialDesignColors.WpfExample.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
              mc:Ignorable="d"               
              d:DesignHeight="300" d:DesignWidth="600" Loaded="UserControl_Loaded"
              d:DataContext="{d:DesignInstance domain:TextFieldsViewModel, d:IsDesignTimeCreatable=False}">
@@ -64,7 +65,7 @@
             <TextBox.Text>
                 <Binding Path="Name" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
-                        <wpfExample:NotEmptyValidationRule ValidatesOnTargetUpdated="True" />
+                        <materialDesignDemo:NotEmptyValidationRule ValidatesOnTargetUpdated="True" />
                     </Binding.ValidationRules>
                 </Binding>
             </TextBox.Text>

MaterialDesignThemes.Wpf/DialogHost.cs

@@ -224,8 +224,9 @@ public object Identifier
 
         private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var dialogHost = (DialogHost)dependencyObject;            
+            var dialogHost = (DialogHost)dependencyObject;
 
+            ValidationAssist.SetSuppress(dialogHost._popupContentControl, !dialogHost.IsOpen);
             VisualStateManager.GoToState(dialogHost, dialogHost.SelectState(), !TransitionAssist.GetDisableTransitions(dialogHost));
 
             if (!dialogHost.IsOpen)
@@ -441,7 +442,7 @@ internal void Close(object parameter)
         {
             var dialogClosingEventArgs = new DialogClosingEventArgs(_session, parameter, DialogClosingEvent);
 
-            _session.IsEnded = true;
+            _session.IsEnded = true;            
 
             //multiple ways of calling back that the dialog is closing:
             // * routed event
@@ -456,7 +457,7 @@ internal void Close(object parameter)
             if (!dialogClosingEventArgs.IsCancelled)
                 SetCurrentValue(IsOpenProperty, false);
             else
-                _session.IsEnded = false;
+                _session.IsEnded = false;            
 
             _closeDialogExecutionParameter = parameter;
         }
@@ -497,8 +498,8 @@ private void OpenDialogHandler(object sender, ExecutedRoutedEventArgs executedRo
 
                 DialogContent = executedRoutedEventArgs.Parameter;
             }
-
-            SetCurrentValue(IsOpenProperty, true);
+                        
+            ValidationAssist.SetSuppress(_popupContentControl, false);
 
             executedRoutedEventArgs.Handled = true;
         }

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml

@@ -39,6 +39,7 @@
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.OnlyShowOnFocus)}" Value="False"/>
                     <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="True"/>
+                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.Suppress)}" Value="False"/>
                 </MultiDataTrigger.Conditions>
                 <MultiDataTrigger.Setters>
                     <Setter TargetName="ValidationPopup" Property="IsOpen" Value="True"/>
@@ -49,6 +50,7 @@
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.OnlyShowOnFocus)}" Value="False"/>
                     <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.UsePopup)}" Value="False"/>
+                    <Condition Binding="{Binding ElementName=Placeholder, Path=AdornedElement.(wpf:ValidationAssist.Suppress)}" Value="False"/>
                 </MultiDataTrigger.Conditions>
                 <MultiDataTrigger.Setters>
                     <Setter TargetName="DefaultErrorViewer" Property="Visibility" Value="Visible"/>

MaterialDesignThemes.Wpf/ValidationAssist.cs

@@ -54,5 +54,29 @@ public static void SetUsePopup(DependencyObject element, bool value)
         }
 
         #endregion
+
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
+        public static readonly DependencyProperty SuppressProperty = DependencyProperty.RegisterAttached(
+            "Suppress", typeof (bool), typeof (ValidationAssist), new FrameworkPropertyMetadata(default(bool), FrameworkPropertyMetadataOptions.Inherits));
+
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
+        /// <param name="element"></param>
+        /// <param name="value"></param>
+        public static void SetSuppress(DependencyObject element, bool value)
+        {
+            element.SetValue(SuppressProperty, value);
+        }
+
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
+        public static bool GetSuppress(DependencyObject element)
+        {
+            return (bool) element.GetValue(SuppressProperty);
+        }
     }
 }