From 018f053ded251caca7dd2644d44812b18c19e97c Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sat, 19 Mar 2022 13:32:00 +0800
Subject: [PATCH 1/5] test: add test for message

---
 test/UnitTest/Components/MessageTest.cs | 41 +++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 test/UnitTest/Components/MessageTest.cs

diff --git a/test/UnitTest/Components/MessageTest.cs b/test/UnitTest/Components/MessageTest.cs
new file mode 100644
index 000000000..e924e3821
--- /dev/null
+++ b/test/UnitTest/Components/MessageTest.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace UnitTest.Components;
+
+public class MessageTest : BootstrapBlazorTestBase
+{
+    [Fact]
+    public async Task Message_Ok()
+    {
+        var service = Context.Services.GetRequiredService<MessageService>();
+        var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
+        {
+            pb.AddChildContent<Button>(pb =>
+            {
+                pb.Add(a => a.OnClick, async () =>
+                {
+                    await service.Show(new MessageOption()
+                    {
+                        Color = Color.Danger,
+                        Content = "Test Content",
+                        Delay = 4000,
+                        ForceDelay = false,
+                        Icon = "fa fa-fa",
+                        IsAutoHide = true,
+                        ShowBar = true,
+                        ShowDismiss = true
+                    });
+                });
+            });
+        });
+        var btn = cut.Find("button");
+        await cut.InvokeAsync(() => btn.Click());
+
+        var btnClose = cut.Find(".btn-close");
+        await cut.InvokeAsync(() => btnClose.Click());
+    }
+}
-- 
Gitee


From c406db8db79d45742b6a5c329877f5ad7fc69fe5 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sat, 19 Mar 2022 13:44:31 +0800
Subject: [PATCH 2/5] test: add set placement test

---
 test/UnitTest/Components/MessageTest.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/UnitTest/Components/MessageTest.cs b/test/UnitTest/Components/MessageTest.cs
index e924e3821..c8f50dff3 100644
--- a/test/UnitTest/Components/MessageTest.cs
+++ b/test/UnitTest/Components/MessageTest.cs
@@ -35,7 +35,19 @@ public class MessageTest : BootstrapBlazorTestBase
         var btn = cut.Find("button");
         await cut.InvokeAsync(() => btn.Click());
 
-        var btnClose = cut.Find(".btn-close");
-        await cut.InvokeAsync(() => btnClose.Click());
+        var message = cut.FindComponent<Message>();
+        await message.InvokeAsync(() => message.Instance.Clear());
+    }
+
+    [Fact]
+    public async Task SetPlacement_Ok()
+    {
+        var cut = Context.RenderComponent<Message>(pb =>
+        {
+            pb.Add(a => a.Placement, Placement.Left);
+        });
+
+        await cut.InvokeAsync(() => cut.Instance.SetPlacement(Placement.Top));
+        Assert.Equal(Placement.Top, cut.Instance.Placement);
     }
 }
-- 
Gitee


From 39e32d74b760df0b96b2d895e128464e68494a90 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sat, 19 Mar 2022 14:06:51 +0800
Subject: [PATCH 3/5] test: add OnDismiss test

---
 test/UnitTest/Components/MessageTest.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/UnitTest/Components/MessageTest.cs b/test/UnitTest/Components/MessageTest.cs
index c8f50dff3..c7aaea04f 100644
--- a/test/UnitTest/Components/MessageTest.cs
+++ b/test/UnitTest/Components/MessageTest.cs
@@ -11,6 +11,7 @@ public class MessageTest : BootstrapBlazorTestBase
     [Fact]
     public async Task Message_Ok()
     {
+        var dismiss = false;
         var service = Context.Services.GetRequiredService<MessageService>();
         var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
         {
@@ -27,7 +28,12 @@ public class MessageTest : BootstrapBlazorTestBase
                         Icon = "fa fa-fa",
                         IsAutoHide = true,
                         ShowBar = true,
-                        ShowDismiss = true
+                        ShowDismiss = true,
+                        OnDismiss = () =>
+                        {
+                            dismiss = true;
+                            return Task.CompletedTask;
+                        }
                     });
                 });
             });
@@ -35,6 +41,10 @@ public class MessageTest : BootstrapBlazorTestBase
         var btn = cut.Find("button");
         await cut.InvokeAsync(() => btn.Click());
 
+        var btnClose = cut.Find(".btn-close");
+        await cut.InvokeAsync(() => btnClose.Click());
+        Assert.True(dismiss);
+
         var message = cut.FindComponent<Message>();
         await message.InvokeAsync(() => message.Instance.Clear());
     }
-- 
Gitee


From 51390a2f4e3fc12a94d8dcb94c214c83e005a877 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sat, 19 Mar 2022 14:07:08 +0800
Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/MessageService.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/MessageService.cs b/src/BootstrapBlazor/Components/Message/MessageService.cs
index 342b31677..47b98ccdf 100644
--- a/src/BootstrapBlazor/Components/Message/MessageService.cs
+++ b/src/BootstrapBlazor/Components/Message/MessageService.cs
@@ -31,11 +31,13 @@ public class MessageService : BootstrapServiceBase<MessageOption>, IDisposable
     /// <param name="message">指定弹窗组件 默认为 null 使用 <see cref="BootstrapBlazorRoot"/> 组件内置弹窗组件</param>
     public async Task Show(MessageOption option, Message? message = null)
     {
-        if (!option.ForceDelay && _option.MessageDelay != 0)
+        if (!option.ForceDelay)
         {
-            option.Delay = _option.MessageDelay;
+            if (_option.MessageDelay != 0)
+            {
+                option.Delay = _option.MessageDelay;
+            }
         }
-
         await Invoke(option, message);
     }
 
-- 
Gitee


From fe90921dfa13ff94f4b4bc02af1425b63c6b0bd6 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sat, 19 Mar 2022 14:07:34 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20OnDismiss=20?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=A7=94=E6=89=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Message/Message.razor                |  2 +-
 .../Components/Message/Message.razor.cs             |  8 ++++++++
 .../Components/Message/MessageOption.cs             | 13 +++++++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor b/src/BootstrapBlazor/Components/Message/Message.razor
index 03aabd69a..56436b567 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor
+++ b/src/BootstrapBlazor/Components/Message/Message.razor
@@ -5,7 +5,7 @@
     <CascadingValue Value="this" IsFixed="true">
         @foreach (var item in GetMessages())
         {
-            <MessageItem @key="item" Icon="@item.Icon" Color="@item.Color" Content="@item.Content" Delay="@item.Delay" ShowBar="@item.ShowBar" ShowDismiss="@item.ShowDismiss" IsAutoHide="@item.IsAutoHide" />
+            <MessageItem @key="item" Icon="@item.Icon" Color="@item.Color" Content="@item.Content" Delay="@item.Delay" ShowBar="@item.ShowBar" ShowDismiss="@item.ShowDismiss" IsAutoHide="@item.IsAutoHide" OnDismiss="() => OnDismiss(item)" />
         }
     </CascadingValue>
 </div>
diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index 7ec1fea12..868bd6db7 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -87,6 +87,14 @@ public partial class Message : IDisposable
         await InvokeAsync(StateHasChanged);
     }
 
+    private static async Task OnDismiss(MessageOption option)
+    {
+        if (option.OnDismiss != null)
+        {
+            await option.OnDismiss();
+        }
+    }
+
     private List<MessageOption> GetMessages()
     {
         if (Placement != Placement.Top)
diff --git a/src/BootstrapBlazor/Components/Message/MessageOption.cs b/src/BootstrapBlazor/Components/Message/MessageOption.cs
index bf8bf1650..a1d50a657 100644
--- a/src/BootstrapBlazor/Components/Message/MessageOption.cs
+++ b/src/BootstrapBlazor/Components/Message/MessageOption.cs
@@ -10,22 +10,27 @@ namespace BootstrapBlazor.Components;
 public class MessageOption : PopupOptionBase
 {
     /// <summary>
-    /// 获得/设置 颜色
+    /// 获得/设置 颜色 默认 Primary
     /// </summary>
     public Color Color { get; set; } = Color.Primary;
 
     /// <summary>
-    /// 获得/设置 是否显示关闭按钮
+    /// 获得/设置 是否显示关闭按钮 默认 false
     /// </summary>
     public bool ShowDismiss { get; set; }
 
     /// <summary>
-    /// 获得/设置 显示图标
+    /// 获得/设置 显示图标 默认 null
     /// </summary>
     public string? Icon { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否显示左侧 Bar
+    /// 获得/设置 是否显示左侧 Bar 默认 false
     /// </summary>
     public bool ShowBar { get; set; }
+
+    /// <summary>
+    /// 获得/设置 关闭当前 MessageItem 回调委托 默认 null
+    /// </summary>
+    public Func<Task>? OnDismiss { get; set; }
 }
-- 
Gitee