Merge pull request #275 from sirdoombox/main

Fixed a few bugs in toasts.

SukiUI.Demo/Features/ControlsLibrary/Toasts/ToastsView.axaml

@@ -28,6 +28,7 @@
                     <HyperlinkButton
                         NavigateUri="https://github.com/kikipoulet/SukiUI/blob/main/SukiUI.Demo/Features/ControlsLibrary/Toasts/ToastsViewModel.cs"
                         Content="Source Here." />
+                    <Button Command="{Binding DismissAllToastsCommand}" Content="Click To Dismiss All Active Toasts" HorizontalAlignment="Left" Classes="Flat"/>
                 </StackPanel>
             </suki:GroupBox>
         </suki:GlassCard>

SukiUI.Demo/Features/ControlsLibrary/Toasts/ToastsViewModel.cs

@@ -107,4 +107,7 @@ void ShowCallbackToast()
 
     [RelayCommand]
     private void ShowToastWindow() => new ToastWindowDemo(toastManager).Show();
+
+    [RelayCommand]
+    private void DismissAllToasts() => toastManager.DismissAll();
 }

SukiUI/Controls/Hosts/SukiToastHost.cs

@@ -106,8 +106,11 @@ private void DetachManagerEvents(ISukiToastManager oldManager)
         private void ManagerOnToastDismissed(object sender, SukiToastManagerEventArgs args) => 
             ClearToast(args.Toast);
 
-        private void ManagerOnAllToastsDismissed(object sender, EventArgs e) => 
-            Items.Clear();
+        private void ManagerOnAllToastsDismissed(object sender, EventArgs e)
+        {
+            foreach(var toast in Items)
+                ClearToast((ISukiToast)toast!);
+        }
 
         private void ManagerOnToastQueued(object sender, SukiToastManagerEventArgs args)
         {
@@ -120,7 +123,7 @@ private void ManagerOnToastQueued(object sender, SukiToastManagerEventArgs args)
 
         private void ClearToast(ISukiToast toast)
         {
-            if (!Items.Contains(toast)) return;
+            if (Manager.IsDismissed(toast)) return;
             toast.AnimateDismiss();
             Task.Delay(300).ContinueWith(_ =>
             {

SukiUI/Controls/SukiToast.axaml.cs

@@ -59,6 +59,8 @@ public ObservableCollection<object> ActionButtons
         get => GetValue(ActionButtonsProperty);
         set => SetValue(ActionButtonsProperty, value);
     }
+
+    public Action<ISukiToast>? DelayDismissAction { get; set; }
 
     public SukiToast()
     {
@@ -102,6 +104,7 @@ public ISukiToast ResetToDefault()
         ActionButtons.Clear();
         OnDismissed = null;
         OnClicked = null;
+        DelayDismissAction = null;
         DockPanel.SetDock(this, Dock.Bottom);
         return this;
     }

SukiUI/Toasts/ISukiToast.cs

@@ -19,5 +19,10 @@ public interface ISukiToast
         void AnimateShow();
         void AnimateDismiss();
         ISukiToast ResetToDefault();
+        /// <summary>
+        /// This is what's called when a delay based dismiss is used.
+        /// This is tracked so that it can be disposed of when the toast is dismissed by other means.
+        /// </summary>
+        Action<ISukiToast>? DelayDismissAction { get; set; }
     }
 }

SukiUI/Toasts/ISukiToastManager.cs

@@ -45,5 +45,10 @@ public interface ISukiToastManager
         /// Dismisses all toasts from the stack immediately.
         /// </summary>
         void DismissAll();
+
+        /// <summary>
+        /// Checks to see if a <see cref="ISukiToast"/> has already been dismissed from the stack.
+        /// </summary>
+        bool IsDismissed(ISukiToast toast);
     }
 }

SukiUI/Toasts/SukiToastBuilder.cs

@@ -54,8 +54,16 @@ public void SetType(NotificationType type)
         }
 
 
-        public void Delay(TimeSpan delay, Action<ISukiToast> action) => 
-            Task.Delay(delay).ContinueWith(_ => action(Toast), TaskScheduler.FromCurrentSynchronizationContext());
+        public void Delay(TimeSpan delay, Action<ISukiToast> action)
+        {
+            Toast.DelayDismissAction = action;
+            Task.Delay(delay).ContinueWith(_ =>
+                {
+                    if (Toast.DelayDismissAction != action) return;
+                    Toast.DelayDismissAction.Invoke(Toast);
+                }, 
+                TaskScheduler.FromCurrentSynchronizationContext());
+        }
 
         public void SetOnDismiss(Action<ISukiToast> action) => Toast.OnDismissed = action;
 

SukiUI/Toasts/SukiToastManager.cs

@@ -4,12 +4,13 @@
 
 namespace SukiUI.Toasts
 {
+    // It's important that events are raised BEFORE removing them from the manager so that the animation only plays once.
     public class SukiToastManager : ISukiToastManager
     {
         public event SukiToastManagerEventHandler? OnToastQueued;
         public event SukiToastManagerEventHandler? OnToastDismissed;
         public event EventHandler? OnAllToastsDismissed;
-        
+
         private readonly List<ISukiToast> _toasts = new();
 
         public void Queue(ISukiToast toast)
@@ -20,34 +21,36 @@ public void Queue(ISukiToast toast)
 
         public void Dismiss(ISukiToast toast)
         {
-            if(!_toasts.Remove(toast)) return;
+            if (!_toasts.Contains(toast)) return;
             OnToastDismissed?.Invoke(this, new SukiToastManagerEventArgs(toast));
+            _toasts.Remove(toast);
         }
 
         public void Dismiss(int count)
         {
             if (!_toasts.Any()) return;
-            if(count > _toasts.Count) count = _toasts.Count;
+            if (count > _toasts.Count) count = _toasts.Count;
             for (var i = 0; i < count; i++)
             {
                 var removed = _toasts[i];
-                _toasts.RemoveAt(i);
                 OnToastDismissed?.Invoke(this, new SukiToastManagerEventArgs(removed));
+                _toasts.RemoveAt(i);
             }
         }
 
         public void EnsureMaximum(int maxAllowed)
         {
-            Console.WriteLine($"{maxAllowed} - {_toasts.Count}");
             if (_toasts.Count <= maxAllowed) return;
             Dismiss(_toasts.Count - maxAllowed);
         }
 
         public void DismissAll()
         {
             if (!_toasts.Any()) return;
-            _toasts.Clear();
             OnAllToastsDismissed?.Invoke(this, EventArgs.Empty);
+            _toasts.Clear();
         }
+
+        public bool IsDismissed(ISukiToast toast) => !_toasts.Contains(toast);
     }
 }