feat(SweetAlert): support trigger OnCloseAsync when set IsAutoHide to true (#5040)

* refactor: 精简代码

* refactor: 增加注释

* refactor: 增加资源释放

* refactor: 支持 OnCloseAsync 回调方法

* test: 增加单元测试

* chore: bump version 9.2.4

Co-Authored-By: Alex chow <[email protected]>

---------

Co-authored-by: Alex chow <[email protected]>
Co-authored-by: ice6 <[email protected]>

Author: 3 people

src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs

@@ -102,7 +102,7 @@ public class SwalOption : PopupOptionBase
     public Func<Task>? OnConfirmAsync { get; set; }
 
     /// <summary>
-    /// 
+    /// 构造函数
     /// </summary>
     public SwalOption()
     {

src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs

@@ -88,10 +88,16 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
                 {
                     if (DelayToken.IsCancellationRequested)
                     {
+                        DelayToken.Dispose();
                         DelayToken = new();
                     }
                     await Task.Delay(Delay, DelayToken.Token);
                     await ModalContainer.Close();
+
+                    if (OnCloseCallbackAsync != null)
+                    {
+                        await OnCloseCallbackAsync();
+                    }
                 }
                 catch (TaskCanceledException) { }
             }
@@ -100,6 +106,8 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
     private bool AutoHideCheck() => IsAutoHide && Delay > 0;
 
+    private Func<Task>? OnCloseCallbackAsync = null;
+
     private async Task Show(SwalOption option)
     {
         if (!IsShowDialog)
@@ -121,6 +129,8 @@ private async Task Show(SwalOption option)
 
             DialogParameter = parameters;
 
+            OnCloseCallbackAsync = AutoHideCheck() ? option.OnCloseAsync : null;
+
             // 渲染 UI 准备弹窗 Dialog
             await InvokeAsync(StateHasChanged);
         }

src/BootstrapBlazor/Components/SweetAlert/SweetContext.cs

@@ -16,9 +16,5 @@ internal class SweetContext
     /// 获得/设置 弹窗任务上下文
     /// </summary>
     [NotNull]
-#if NET7_0_OR_GREATER
-    public required TaskCompletionSource<bool>? ConfirmTask { get; init; }
-#else
-    public TaskCompletionSource<bool>? ConfirmTask { get; set; }
-#endif
+    public TaskCompletionSource<bool>? ConfirmTask { get; init; }
 }

test/UnitTest/Components/SwalTest.cs

@@ -271,7 +271,11 @@ public void Show_Ok()
             Content = "I am auto hide",
             IsAutoHide = true,
             ForceDelay = true,
-            Delay = 500
+            Delay = 500,
+            OnCloseAsync = () =>
+            {
+                return Task.CompletedTask;
+            }
         }));
         Thread.Sleep(150);
         // 弹窗显示