OnMessageDismissed event trigger unexpectedly when I set the Animatio…

…nOut property with Delay. For solve this problem, I updated the 'DismissBefore' method with add listener to Animation.Completed event. With this update, OnMessageDimissed event trigger when AnimationOut fully completed
Enterwell · Oct 9, 2018 · 10f951c · 10f951c
1 parent 0ac533d
commit 10f951c
Showing 1 changed file with 44 additions and 2 deletions.
diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
@@ -231,7 +231,28 @@ private static Action<INotificationMessage> DismissBefore(
         {
             return call =>
             {
-                builder.Manager.Dismiss(builder.Message);
+                if (builder.Message is INotificationAnimation animatableMessage)
+                {
+                    var animation = animatableMessage.AnimationOut;
+                    if (animation != null && 
+                        animatableMessage.Animates && 
+                        animatableMessage.AnimatableElement != null && 
+                        animatableMessage.AnimationOutDependencyProperty != null)
+                    {
+                        animation.Completed += (s, a) => 
+                        {
+                            builder.Manager.Dismiss(builder.Message);
+                        };
+                    }
+                    else
+                    {
+                        builder.Manager.Dismiss(builder.Message);
+                    }
+                }
+                else
+                {
+                    builder.Manager.Dismiss(builder.Message);
+                }
                 callback?.Invoke(builder.Message);
             };
         }
@@ -251,7 +272,28 @@ private static Action<INotificationMessageButton> DismissBefore(
         {
             return button =>
             {
-                builder.Manager.Dismiss(builder.Message);
+                if (builder.Message is INotificationAnimation animatableMessage)
+                {
+                    var animation = animatableMessage.AnimationOut;
+                    if (animation != null && 
+                        animatableMessage.Animates && 
+                        animatableMessage.AnimatableElement != null && 
+                        animatableMessage.AnimationOutDependencyProperty != null)
+                    {
+                        animation.Completed += (s, a) => 
+                        {
+                            builder.Manager.Dismiss(builder.Message);
+                        };
+                    }
+                    else
+                    {
+                        builder.Manager.Dismiss(builder.Message);
+                    }
+                }
+                else
+                {
+                    builder.Manager.Dismiss(builder.Message);
+                }
                 callback?.Invoke(button);
             };
         }