From 30ad21c4e8feb1a4c8878ef67c031efdae52dedd Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Mon, 10 Nov 2025 16:52:39 +0800
Subject: [PATCH 01/19] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Samples/Messages.razor         | 17 +++++++++++----
 .../Components/Samples/Messages.razor.cs      | 21 ++++++++++++-------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Messages.razor b/src/BootstrapBlazor.Server/Components/Samples/Messages.razor
index 08226ed497a..a59eb727112 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Messages.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Messages.razor
@@ -1,4 +1,4 @@
-@page "/message"
+@page "/message"
 @inject IStringLocalizer<Messages> Localizer
 @inject MessageService MessageService
 
@@ -20,8 +20,18 @@ private MessageService? MessageService { get; set; }
 });</Pre>
 
 <DemoBlock Title="@Localizer["MessagesNormalTitle"]" Introduction="@Localizer["MessagesNormalIntro"]" Name="Normal">
-    <button class="btn btn-primary" @onclick="@ShowMessage">@Localizer["MessagesMessagePrompt"]</button>
-    <Message @ref="Message" Placement="Placement.Bottom" />
+    <section ignore class="row form-inline g-3">
+        <div class="col-12">
+            <BootstrapInputGroup>
+                <BootstrapInputGroupLabel DisplayText="Placement"></BootstrapInputGroupLabel>
+                <RadioList @bind-Value="@_placement" Items="@_items"></RadioList>
+            </BootstrapInputGroup>
+        </div>
+        <div class="col-12">
+            <button class="btn btn-primary" @onclick="@ShowMessage">@Localizer["MessagesMessagePrompt"]</button>
+        </div>
+    </section>
+    <Message @ref="Message" Placement="@Placement"></Message>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MessagesAsyncTitle"]" Introduction="@Localizer["MessagesAsyncIntro"]" Name="Async">
@@ -70,7 +80,6 @@ private MessageService? MessageService { get; set; }
 
 <DemoBlock Title="@Localizer["MessagesTemplateTitle"]" Introduction="@Localizer["MessagesTemplateIntro"]" Name="Template">
     <button class="btn btn-primary" @onclick="@ShowTemplateMessage">@Localizer["MessagesTemplatePrompt"]</button>
-    <Message @ref="Message1" Placement="Placement.Bottom" />
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MessagesShowModeTitle"]" Introduction="@Localizer["MessagesShowModeIntro"]" Name="ShowMode">
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Messages.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Messages.razor.cs
index 4821c6f7a4e..83936905a9f 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Messages.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Messages.razor.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -18,13 +18,20 @@ public sealed partial class Messages
 
     private readonly MessageOption _option = new();
 
+    private long _count = 0;
+
+    private string _placement = "Top";
+
+    private readonly List<SelectedItem> _items = [new SelectedItem("Top", "Top"), new SelectedItem("Bottom", "Bottom")];
+
+    private Placement Placement => _placement == "Top" ? Placement.Top : Placement.Bottom;
+
     private async Task ShowMessage()
     {
-        Message.SetPlacement(Placement.Top);
         await MessageService.Show(new MessageOption()
         {
-            Content = "This is a reminder message"
-        });
+            Content = $"This is a reminder message {_count++}"
+        }, Message);
     }
 
     private async Task ShowAsyncMessage()
@@ -97,7 +104,7 @@ private async Task ShowBottomMessage()
     {
         await MessageService.Show(new MessageOption()
         {
-            Content = $"This is a reminder message - {DateTime.Now:mm:ss}",
+            Content = $"This is a reminder message - {_count++}",
             Icon = "fa-solid fa-circle-info",
         }, Message1);
     }
@@ -111,13 +118,11 @@ await MessageService.Show(new MessageOption()
         });
     }
 
-    private int lastCount = 0;
-
     private Task ShowLastOnlyMessage() => MessageService.Show(new MessageOption()
     {
         ShowShadow = true,
         ShowMode = MessageShowMode.Single,
-        Content = lastCount++.ToString()
+        Content = $"This is a reminder message - {_count++}"
     });
 
     private static AttributeItem[] GetAttributes() =>

From d8d926ef81335ef9533e20718641cca8ff5618fc Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Mon, 10 Nov 2025 16:52:46 +0800
Subject: [PATCH 02/19] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 exclusion.dic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exclusion.dic b/exclusion.dic
index 3186ef2244d..0fc48031e95 100644
--- a/exclusion.dic
+++ b/exclusion.dic
@@ -121,3 +121,4 @@ dotx
 Modbus
 Protocol
 vditor
+alertdialog

From 5551e77374086b4e04848d1a7f31acfe10888e28 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Mon, 10 Nov 2025 16:53:12 +0800
Subject: [PATCH 03/19] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Message/Message.razor          | 64 +++++--------------
 .../Components/Message/Message.razor.cs       | 14 +++-
 2 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor b/src/BootstrapBlazor/Components/Message/Message.razor
index 98f64631cb2..9218d260bed 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor
+++ b/src/BootstrapBlazor/Components/Message/Message.razor
@@ -1,59 +1,29 @@
-@namespace BootstrapBlazor.Components
+@namespace BootstrapBlazor.Components
 @inherits BootstrapModuleComponentBase
 @attribute [BootstrapModuleAutoLoader(JSObjectReference = true)]
 
 <div id="@Id" class="@ClassString" style="@StyleName" role="alert">
-    @if (Placement == Placement.Top)
+    @foreach (var item in GetMessages())
     {
-        foreach (var item in _messages)
-        {
-            <div @key="item" id="@GetItemId(item)" role="alertdialog" class="@GetItemClassString(item)" data-bb-autohide="@GetAutoHideString(item)" data-bb-delay="@item.Delay">
-                @if (!string.IsNullOrEmpty(item.Icon))
+        <div @key="item" id="@GetItemId(item)" role="alertdialog" class="@GetItemClassString(item)" data-bb-autohide="@GetAutoHideString(item)" data-bb-delay="@item.Delay">
+            @if (!string.IsNullOrEmpty(item.Icon))
+            {
+                <i class="@item.Icon"></i>
+            }
+            <div>
+                @if (item.ChildContent != null)
                 {
-                    <i class="@item.Icon"></i>
+                    @item.ChildContent
                 }
-                <div>
-                    @if (item.ChildContent != null)
-                    {
-                        @item.ChildContent
-                    }
-                    else
-                    {
-                        @item.Content
-                    }
-                </div>
-                @if (item.ShowDismiss)
+                else
                 {
-                    <button type="button" class="btn-close" aria-label="close"></button>
+                    @item.Content
                 }
             </div>
-        }
-    }
-    else
-    {
-        for (var index = _messages.Count; index > 0; index--)
-        {
-            var item = _messages[index - 1];
-            <div @key="item" id="@GetItemId(item)" role="alertdialog" class="@GetItemClassString(item)" data-bb-autohide="@GetAutoHideString(item)" data-bb-delay="@item.Delay">
-                @if (!string.IsNullOrEmpty(item.Icon))
-                {
-                    <i class="@item.Icon"></i>
-                }
-                <div>
-                    @if (item.ChildContent != null)
-                    {
-                        @item.ChildContent
-                    }
-                    else
-                    {
-                        @item.Content
-                    }
-                </div>
-                @if (item.ShowDismiss)
-                {
-                    <button type="button" class="btn-close" aria-label="close"></button>
-                }
-            </div>
-        }
+            @if (item.ShowDismiss)
+            {
+                <button type="button" class="btn-close" aria-label="close"></button>
+            }
+        </div>
     }
 </div>
diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index e70cfd1667e..6650af7e62a 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -85,6 +85,18 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         }
     }
 
+    private List<MessageOption> GetMessages()
+    {
+        if(Placement == Placement.Top)
+        {
+            return _messages;
+        }
+
+        var messages = new List<MessageOption>(_messages);
+        messages.Reverse();
+        return messages;
+    }
+
     /// <summary>
     /// 设置 Toast 容器位置方法
     /// </summary>

From e270070d728d8a13a2ff4d9c8fd270fb3447de82 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 09:33:54 +0800
Subject: [PATCH 04/19] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20Clear=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index 6650af7e62a..f5766f9f737 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -55,7 +55,7 @@ protected override void OnInitialized()
     /// <inheritdoc/>
     /// </summary>
     /// <returns></returns>
-    protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, nameof(Clear));
+    protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop);
 
     private static string? GetAutoHideString(MessageOption option) => option.IsAutoHide ? "true" : null;
 

From 178fac84f26704314f4443f6d8db10c6ca4a78cb Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:21:22 +0800
Subject: [PATCH 05/19] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 exclusion.dic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exclusion.dic b/exclusion.dic
index 0fc48031e95..34a15eb8ae0 100644
--- a/exclusion.dic
+++ b/exclusion.dic
@@ -122,3 +122,4 @@ Modbus
 Protocol
 vditor
 alertdialog
+blazorbootstrap

From d87ea23c652ac202a55036dcb7a7c545db569d6d Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:22:07 +0800
Subject: [PATCH 06/19] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E9=85=8D=E7=BD=AE=E8=87=AA=E5=8A=A8=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF=E8=AE=BE=E7=BD=AE?=
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            | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor b/src/BootstrapBlazor/Components/Message/Message.razor
index 9218d260bed..43134af9b9f 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor
+++ b/src/BootstrapBlazor/Components/Message/Message.razor
@@ -5,7 +5,7 @@
 <div id="@Id" class="@ClassString" style="@StyleName" role="alert">
     @foreach (var item in GetMessages())
     {
-        <div @key="item" id="@GetItemId(item)" role="alertdialog" class="@GetItemClassString(item)" data-bb-autohide="@GetAutoHideString(item)" data-bb-delay="@item.Delay">
+        <div @key="item" id="@GetItemId(item)" role="alertdialog" class="@GetItemClassString(item)" data-bb-autohide="@GetAutoHideString(item)" data-bb-delay="@GetDelayString(item)">
             @if (!string.IsNullOrEmpty(item.Icon))
             {
                 <i class="@item.Icon"></i>
diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index f5766f9f737..19dbe275142 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -40,6 +40,10 @@ public partial class Message
     [NotNull]
     public MessageService? MessageService { get; set; }
 
+    [Inject]
+    [NotNull]
+    private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -66,6 +70,16 @@ protected override void OnInitialized()
         .AddClass("alert-bar", option.ShowBar)
         .Build();
 
+    private string GetDelayString(MessageOption option) => GetDelay(option).ToString(CultureInfo.InvariantCulture);
+
+    private int GetDelay(MessageOption option) => option.ForceDelay
+        ? option.Delay
+        : GetOptionsDelay(option);
+
+    private int GetOptionsDelay(MessageOption option) => Options.CurrentValue.MessageDelay == 0
+        ? option.Delay
+        : Options.CurrentValue.MessageDelay;
+
     private string GetItemId(MessageOption option) => $"{Id}_{option.GetHashCode()}";
 
     private string? _msgId;

From 1068ab689e5935596a81366e5c83da5d9c271466 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:22:19 +0800
Subject: [PATCH 07/19] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index 19dbe275142..a15056fe6ff 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -112,7 +112,7 @@ private List<MessageOption> GetMessages()
     }
 
     /// <summary>
-    /// 设置 Toast 容器位置方法
+    /// 设置 容器位置方法
     /// </summary>
     /// <param name="placement"></param>
     public void SetPlacement(Placement placement)

From 6ace02d62f63ab7df949cb854f23eab2fa152211 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:22:33 +0800
Subject: [PATCH 08/19] =?UTF-8?q?feat:=20=E7=B2=BE=E7=AE=80=E5=8F=8D?=
 =?UTF-8?q?=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index a15056fe6ff..89a921f4647 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -101,13 +101,12 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
     private List<MessageOption> GetMessages()
     {
-        if(Placement == Placement.Top)
+        var messages = new List<MessageOption>(_messages);
+        if (Placement == Placement.Bottom)
         {
-            return _messages;
+            messages.Reverse();
         }
 
-        var messages = new List<MessageOption>(_messages);
-        messages.Reverse();
         return messages;
     }
 

From 13c83f610448584ecd1c74ccf2d25d582ceabe7d Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:22:57 +0800
Subject: [PATCH 09/19] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20Clear=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Message/Message.razor.cs                | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index 89a921f4647..33854078165 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -139,11 +139,15 @@ private async Task Show(MessageOption option)
     /// 清除 Message 方法 由 JSInvoke 触发
     /// </summary>
     [JSInvokable]
-    public Task Clear()
+    public void Clear(string id)
     {
-        _messages.Clear();
+        var option = _messages.Find(i => GetItemId(i) == id);
+        if (option != null)
+        {
+            _messages.Remove(option);
+        }
+
         StateHasChanged();
-        return Task.CompletedTask;
     }
 
     /// <summary>

From 52b901b1de6ed1d8cf40833dbbc9795edc52f685 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:23:15 +0800
Subject: [PATCH 10/19] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index 33854078165..7442e07d5aa 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
+using System.Globalization;
+
 namespace BootstrapBlazor.Components;
 
 /// <summary>

From 52e7f31802ba023689c42d229816313d0d404d1b Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:24:01 +0800
Subject: [PATCH 11/19] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20init=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.js b/src/BootstrapBlazor/Components/Message/Message.razor.js
index 77638478b86..51a3dbec4bf 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.js
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.js
@@ -1,9 +1,9 @@
-import Data from "../../modules/data.js"
+import Data from "../../modules/data.js"
 import EventHandler from "../../modules/event-handler.js"
 
-export function init(id, invoke, callback) {
+export function init(id, invoke) {
     const el = document.getElementById(id)
-    const msg = { el, invoke, callback, items: [] }
+    const msg = { el, invoke, items: [] }
     Data.set(id, msg)
 }
 

From acb92953f6f8639b408a08e90de5092731f70844 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:28:21 +0800
Subject: [PATCH 12/19] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=20Dismiss?=
 =?UTF-8?q?=20=E9=80=BB=E8=BE=91=E6=8F=90=E9=AB=98=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.cs | 4 +++-
 src/BootstrapBlazor/Components/Message/Message.razor.js | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index 7442e07d5aa..47579aec690 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -157,12 +157,14 @@ public void Clear(string id)
     /// </summary>
     /// <param name="id"></param>
     [JSInvokable]
-    public async Task Dismiss(string id)
+    public async ValueTask Dismiss(string id)
     {
         var option = _messages.Find(i => GetItemId(i) == id);
         if (option is { OnDismiss: not null })
         {
             await option.OnDismiss();
+            _messages.Remove(option);
+            StateHasChanged();
         }
     }
 
diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.js b/src/BootstrapBlazor/Components/Message/Message.razor.js
index 51a3dbec4bf..a0080159eb7 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.js
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.js
@@ -58,16 +58,17 @@ export function show(id, msgId) {
         }, 500);
     };
 
-    EventHandler.on(el, 'click', '.btn-close', e => {
+    EventHandler.on(el, 'click', '.btn-close', async e => {
         e.preventDefault();
         e.stopPropagation();
 
         const alert = e.delegateTarget.closest('.alert');
         if (alert) {
+            alert.classList.add("d-none");
             const alertId = alert.getAttribute('id');
-            msg.invoke.invokeMethodAsync('Dismiss', alertId);
+            msg.items = msg.items.filter(i => i.el.id !== alertId);
+            await msg.invoke.invokeMethodAsync('Dismiss', alertId);
         }
-        close();
     });
 }
 

From 0c6cb443f932fbb69c0f5f405e6e21d13e8a5a32 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:46:50 +0800
Subject: [PATCH 13/19] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E6=B6=88=E6=81=AF=E6=9C=AA=E6=B8=85=E9=99=A4=20dom=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index 47579aec690..b827afb2877 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -132,8 +132,8 @@ private async Task Show(MessageOption option)
         if (!_messages.Contains(option))
         {
             _messages.Add(option);
-            _msgId = GetItemId(option);
         }
+        _msgId = GetItemId(option);
         await InvokeAsync(StateHasChanged);
     }
 

From 964663d185e5c36b7a20a19d24e5d7f9a239aed2 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:47:57 +0800
Subject: [PATCH 14/19] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Message/Message.razor.js               | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.js b/src/BootstrapBlazor/Components/Message/Message.razor.js
index a0080159eb7..a488e37a657 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.js
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.js
@@ -47,15 +47,10 @@ export function show(id, msgId) {
 
     const close = () => {
         EventHandler.off(el, 'click')
-        el.classList.remove('show');
-        const hideHandler = setTimeout(function () {
-            clearTimeout(hideHandler);
+        el.classList.add("d-none");
 
-            msg.items.pop();
-            if (msg.items.length === 0) {
-                msg.invoke.invokeMethodAsync(msg.callback);
-            }
-        }, 500);
+        msg.items = msg.items.filter(i => i.el.id !== msgId);
+        msg.invoke.invokeMethodAsync("Clear", msgId);
     };
 
     EventHandler.on(el, 'click', '.btn-close', async e => {

From aeb989e3766bea9250a7eb1dacfdcf6143b3724d Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 10:50:15 +0800
Subject: [PATCH 15/19] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20click=20?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A7=94=E6=89=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.js b/src/BootstrapBlazor/Components/Message/Message.razor.js
index a488e37a657..0a765f2d2e5 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.js
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.js
@@ -46,7 +46,6 @@ export function show(id, msgId) {
     el.classList.add('show');
 
     const close = () => {
-        EventHandler.off(el, 'click')
         el.classList.add("d-none");
 
         msg.items = msg.items.filter(i => i.el.id !== msgId);
@@ -59,7 +58,9 @@ export function show(id, msgId) {
 
         const alert = e.delegateTarget.closest('.alert');
         if (alert) {
+            EventHandler.off(el, 'click')
             alert.classList.add("d-none");
+
             const alertId = alert.getAttribute('id');
             msg.items = msg.items.filter(i => i.el.id !== alertId);
             await msg.invoke.invokeMethodAsync('Dismiss', alertId);

From a25b6dccf39183668b45f5c530442a8e485647e0 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 11:23:56 +0800
Subject: [PATCH 16/19] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
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          | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor b/src/BootstrapBlazor/Components/Message/Message.razor
index 43134af9b9f..9218d260bed 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor
+++ b/src/BootstrapBlazor/Components/Message/Message.razor
@@ -5,7 +5,7 @@
 <div id="@Id" class="@ClassString" style="@StyleName" role="alert">
     @foreach (var item in GetMessages())
     {
-        <div @key="item" id="@GetItemId(item)" role="alertdialog" class="@GetItemClassString(item)" data-bb-autohide="@GetAutoHideString(item)" data-bb-delay="@GetDelayString(item)">
+        <div @key="item" id="@GetItemId(item)" role="alertdialog" class="@GetItemClassString(item)" data-bb-autohide="@GetAutoHideString(item)" data-bb-delay="@item.Delay">
             @if (!string.IsNullOrEmpty(item.Icon))
             {
                 <i class="@item.Icon"></i>
diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index b827afb2877..57ba30efc4b 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
-using System.Globalization;
-
 namespace BootstrapBlazor.Components;
 
 /// <summary>
@@ -42,10 +40,6 @@ public partial class Message
     [NotNull]
     public MessageService? MessageService { get; set; }
 
-    [Inject]
-    [NotNull]
-    private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -72,16 +66,6 @@ protected override void OnInitialized()
         .AddClass("alert-bar", option.ShowBar)
         .Build();
 
-    private string GetDelayString(MessageOption option) => GetDelay(option).ToString(CultureInfo.InvariantCulture);
-
-    private int GetDelay(MessageOption option) => option.ForceDelay
-        ? option.Delay
-        : GetOptionsDelay(option);
-
-    private int GetOptionsDelay(MessageOption option) => Options.CurrentValue.MessageDelay == 0
-        ? option.Delay
-        : Options.CurrentValue.MessageDelay;
-
     private string GetItemId(MessageOption option) => $"{Id}_{option.GetHashCode()}";
 
     private string? _msgId;

From 898d8f12c56d86002ec7ffe1761e5cf2ad50a0b5 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 11:24:20 +0800
Subject: [PATCH 17/19] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/MessageTest.cs | 49 ++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/test/UnitTest/Components/MessageTest.cs b/test/UnitTest/Components/MessageTest.cs
index 4879e4cd552..502c24cac5f 100644
--- a/test/UnitTest/Components/MessageTest.cs
+++ b/test/UnitTest/Components/MessageTest.cs
@@ -1,9 +1,10 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.Extensions.Options;
 
 namespace UnitTest.Components;
 
@@ -57,10 +58,8 @@ await cut.InvokeAsync(() =>
         Assert.NotNull(alert.Id);
 
         var message = cut.FindComponent<Message>();
-        await message.Instance.Dismiss(alert.Id);
+        await cut.InvokeAsync(() => message.Instance.Dismiss(alert.Id));
         Assert.True(dismiss);
-
-        await cut.InvokeAsync(() => message.Instance.Clear());
     }
 
     [Fact]
@@ -98,7 +97,7 @@ await cut.InvokeAsync(() => service.Show(new MessageOption()
 
         await cut.Instance.Dismiss(alert.Id);
         await cut.Instance.Dismiss("test_id");
-        await cut.InvokeAsync(() => cut.Instance.Clear());
+        await cut.InvokeAsync(() => cut.Instance.Clear(alert.Id));
 
         await cut.InvokeAsync(() => service.Show(new MessageOption()
         {
@@ -133,4 +132,44 @@ await cut.InvokeAsync(() => service.Show(new MessageOption()
             ShowMode = MessageShowMode.Single
         }, cut.Instance));
     }
+
+    [Fact]
+    public async Task ForceDelay_Ok()
+    {
+        var service = Context.Services.GetRequiredService<MessageService>();
+        var cut = Context.RenderComponent<Message>();
+        var option = new MessageOption()
+        {
+            Content = "Test Content",
+            IsAutoHide = false,
+            ShowDismiss = true,
+            Icon = "fa-solid fa-font-awesome",
+            ForceDelay = true,
+            Delay = 2000
+        };
+        await cut.InvokeAsync(() => service.Show(option, cut.Instance));
+        Assert.Contains("data-bb-delay=\"2000\"", cut.Markup);
+
+        var alert = cut.Find(".alert");
+        Assert.NotNull(alert);
+        Assert.NotNull(alert.Id);
+        await cut.InvokeAsync(() => cut.Instance.Clear(alert.Id));
+
+        option.ForceDelay = false;
+        await cut.InvokeAsync(() => service.Show(option, cut.Instance));
+        Assert.Contains("data-bb-delay=\"4000\"", cut.Markup);
+        await cut.InvokeAsync(() => cut.Instance.Clear(alert.Id));
+
+        // 更新 Options 值
+        var options = Context.Services.GetRequiredService<IOptionsMonitor<BootstrapBlazorOptions>>();
+        options.CurrentValue.MessageDelay = 1000;
+        await cut.InvokeAsync(() => service.Show(option, cut.Instance));
+        Assert.Contains("data-bb-delay=\"1000\"", cut.Markup);
+        await cut.InvokeAsync(() => cut.Instance.Clear(alert.Id));
+
+        options.CurrentValue.MessageDelay = 0;
+        await cut.InvokeAsync(() => service.Show(option, cut.Instance));
+        Assert.Contains("data-bb-delay=\"1000\"", cut.Markup);
+        await cut.InvokeAsync(() => cut.Instance.Clear(alert.Id));
+    }
 }

From 8143f1f83a932cd09963da23e38551c2e4077b2f Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 12:45:10 +0800
Subject: [PATCH 18/19] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
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           | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor b/src/BootstrapBlazor/Components/Message/Message.razor
index 9218d260bed..fcdb43ec9e3 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor
+++ b/src/BootstrapBlazor/Components/Message/Message.razor
@@ -3,7 +3,7 @@
 @attribute [BootstrapModuleAutoLoader(JSObjectReference = true)]
 
 <div id="@Id" class="@ClassString" style="@StyleName" role="alert">
-    @foreach (var item in GetMessages())
+    @foreach (var item in MessagesForRender)
     {
         <div @key="item" id="@GetItemId(item)" role="alertdialog" class="@GetItemClassString(item)" data-bb-autohide="@GetAutoHideString(item)" data-bb-delay="@item.Delay">
             @if (!string.IsNullOrEmpty(item.Icon))
diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs
index 57ba30efc4b..c5493e6aac1 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.cs
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs
@@ -27,6 +27,10 @@ public partial class Message
 
     private readonly List<MessageOption> _messages = [];
 
+    private IEnumerable<MessageOption> MessagesForRender => Placement == Placement.Bottom
+        ? _messages.AsEnumerable().Reverse()
+        : _messages;
+
     /// <summary>
     /// 获得/设置 显示位置 默认为 Top
     /// </summary>
@@ -85,17 +89,6 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         }
     }
 
-    private List<MessageOption> GetMessages()
-    {
-        var messages = new List<MessageOption>(_messages);
-        if (Placement == Placement.Bottom)
-        {
-            messages.Reverse();
-        }
-
-        return messages;
-    }
-
     /// <summary>
     /// 设置 容器位置方法
     /// </summary>

From d894f8f5924e993ab3b68f5b7e080e856d7ca69f Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Tue, 11 Nov 2025 12:45:19 +0800
Subject: [PATCH 19/19] =?UTF-8?q?perf:=20=E6=8F=90=E9=AB=98=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Message/Message.razor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.js b/src/BootstrapBlazor/Components/Message/Message.razor.js
index 0a765f2d2e5..8429a614422 100644
--- a/src/BootstrapBlazor/Components/Message/Message.razor.js
+++ b/src/BootstrapBlazor/Components/Message/Message.razor.js
@@ -8,12 +8,12 @@ export function init(id, invoke) {
 }
 
 export function show(id, msgId) {
-    const msg = Data.get(id)
     const el = document.getElementById(msgId)
     if (el === null) {
         return
     }
 
+    const msg = Data.get(id)
     let msgItem = msg.items.find(i => i.el.id === msgId)
     if (msgItem === void 0) {
         msgItem = { el, animationId: null }
@@ -21,7 +21,7 @@ export function show(id, msgId) {
     }
 
     if (msgItem.animationId) {
-        cancelAnimationFrame(msgItem.animationId);
+        return;
     }
 
     const autoHide = el.getAttribute('data-bb-autohide') === 'true';