From 05e4795778fd58d9285651c0443b2511f30ab0a2 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 17 Nov 2026 17:03:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?chore:=20=E6=8F=90=E4=BA=A4=20Message=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Message/Message.razor.cs | 29 ++++++++++++---- .../Components/Message/Message.razor.js | 34 +++++++++---------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/BootstrapBlazor/Components/Message/Message.razor.cs b/src/BootstrapBlazor/Components/Message/Message.razor.cs index 3deb0b0ceec..0cb13b23618 100644 --- a/src/BootstrapBlazor/Components/Message/Message.razor.cs +++ b/src/BootstrapBlazor/Components/Message/Message.razor.cs @@ -68,7 +68,7 @@ protected override void OnInitialized() private string GetItemId(MessageOption option) => $"{Id}_{option.GetHashCode()}"; - private string? _msgId; + private readonly HashSet _pendingMessages = []; /// /// @@ -76,11 +76,17 @@ protected override void OnInitialized() /// protected override async Task OnAfterRenderAsync(bool firstRender) { + var messages = _pendingMessages.ToArray(); + _pendingMessages.Clear(); + await base.OnAfterRenderAsync(firstRender); - if (!string.IsNullOrEmpty(_msgId)) + foreach (var option in messages) { - await InvokeVoidAsync("show", Id, _msgId); + if (_messages.Contains(option)) + { + await InvokeVoidAsync("show", Id, GetItemId(option)); + } } } @@ -99,13 +105,14 @@ private async Task Show(MessageOption option) if (option.ShowMode == MessageShowMode.Single) { _messages.Clear(); + _pendingMessages.Clear(); } if (!_messages.Contains(option)) { _messages.Add(option); } - _msgId = GetItemId(option); + _pendingMessages.Add(option); await InvokeAsync(StateHasChanged); } @@ -120,6 +127,7 @@ public void Clear(string id) if (option != null) { _messages.Remove(option); + _pendingMessages.Remove(option); } StateHasChanged(); @@ -133,11 +141,18 @@ public void Clear(string id) public async ValueTask Dismiss(string id) { var option = _messages.Find(i => GetItemId(i) == id); - if (option is { OnDismiss: not null }) + if (option == null) + { + return; + } + + _messages.Remove(option); + _pendingMessages.Remove(option); + await InvokeAsync(StateHasChanged); + + if (option.OnDismiss != 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 8429a614422..34cd02f3920 100644 --- a/src/BootstrapBlazor/Components/Message/Message.razor.js +++ b/src/BootstrapBlazor/Components/Message/Message.razor.js @@ -24,6 +24,21 @@ export function show(id, msgId) { return; } + const close = method => { + if (!msg.items.includes(msgItem)) { + return; + } + + if (msgItem.animationId) { + cancelAnimationFrame(msgItem.animationId); + msgItem.animationId = null; + } + EventHandler.off(el, 'click'); + el.classList.add("d-none"); + msg.items = msg.items.filter(i => i !== msgItem); + return msg.invoke.invokeMethodAsync(method, msgId); + }; + const autoHide = el.getAttribute('data-bb-autohide') === 'true'; if (autoHide) { const delay = parseInt(el.getAttribute('data-bb-delay')); @@ -35,7 +50,7 @@ export function show(id, msgId) { const elapsed = ts - start; if (elapsed > delay) { - close(); + close("Clear"); } else { msgItem.animationId = requestAnimationFrame(autoCloseAnimation); @@ -45,26 +60,11 @@ export function show(id, msgId) { } el.classList.add('show'); - const close = () => { - el.classList.add("d-none"); - - msg.items = msg.items.filter(i => i.el.id !== msgId); - msg.invoke.invokeMethodAsync("Clear", msgId); - }; - EventHandler.on(el, 'click', '.btn-close', async e => { e.preventDefault(); e.stopPropagation(); - 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); - } + await close('Dismiss'); }); } From a5b2ae3cb0f6682afbd93ba0607087e0924d5dc0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 17 Nov 2026 17:03:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=E6=8F=90=E4=BA=A4=20Swal=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SweetAlert/SweetAlertBody.razor.cs | 44 ++++++++++++------- .../Extensions/SwalExtensions.cs | 18 +++++++- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs b/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs index 443a26ffe0c..3cf47206669 100644 --- a/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs +++ b/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs @@ -174,29 +174,41 @@ protected override void OnParametersSet() ConfirmButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.SweetAlertConfirmIcon); } - private async Task OnClickClose() - { - if (OnCloseAsync != null) - { - await OnCloseAsync(); - } + private bool _isClosing; - if (CloseModal != null) - { - await CloseModal(); - } - } + private bool _actionCompleted; + + private Task OnClickClose() => CloseAsync(OnCloseAsync); + + private Task OnClickConfirm() => CloseAsync(OnConfirmAsync); - private async Task OnClickConfirm() + private async Task CloseAsync(Func? callback) { - if (OnConfirmAsync != null) + if (_isClosing) { - await OnConfirmAsync(); + return; } - if (CloseModal != null) + _isClosing = true; + try + { + if (!_actionCompleted) + { + if (callback != null) + { + await callback(); + } + _actionCompleted = true; + } + + if (CloseModal != null) + { + await CloseModal(); + } + } + finally { - await CloseModal(); + _isClosing = false; } } } diff --git a/src/BootstrapBlazor/Extensions/SwalExtensions.cs b/src/BootstrapBlazor/Extensions/SwalExtensions.cs index b68b9f4634b..3e82e99fe91 100644 --- a/src/BootstrapBlazor/Extensions/SwalExtensions.cs +++ b/src/BootstrapBlazor/Extensions/SwalExtensions.cs @@ -14,15 +14,29 @@ public static class SwalExtensions /// /// 异步回调方法 /// 异步callback method + /// 已有弹窗显示时忽略新请求并返回 false。 + /// Ignores a new request and returns false while a popup is already displayed. /// /// /// /// 指定弹窗组件 默认为 null 使用 组件内置弹窗组件指定弹窗component default is为 null 使用 component内置弹窗component public static async Task ShowModal(this SwalService service, SwalOption option, SweetAlert? swal = null) { + var isConfirm = option.IsConfirm; option.IsConfirm = true; - await service.Show(option, swal); - return await option.ConfirmContext.ConfirmTask.Task; + var previousContext = option.ConfirmContext; + // An accepted request assigns its context before awaiting rendering. + var showTask = service.Show(option, swal); + var context = option.ConfirmContext; + await showTask; + + if (context == null || context == previousContext) + { + option.IsConfirm = isConfirm; + return false; + } + + return await context.ConfirmTask.Task; } /// From 98c0511c94fa3ab9dc15b73cf0e17a35d7500dbb Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 17 Nov 2026 17:03:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=20Toast=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Toast/Toast.razor.js | 20 ++++++++++++++++--- .../Components/Toast/ToastContainer.razor.cs | 8 ++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/BootstrapBlazor/Components/Toast/Toast.razor.js b/src/BootstrapBlazor/Components/Toast/Toast.razor.js index 79be9cfe0db..10ad7ca03e1 100644 --- a/src/BootstrapBlazor/Components/Toast/Toast.razor.js +++ b/src/BootstrapBlazor/Components/Toast/Toast.razor.js @@ -1,4 +1,4 @@ -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) { @@ -12,7 +12,9 @@ export function init(id, invoke, callback) { showProgress: () => { return toast.toast._config.autohide }, - progressElement + progressElement, + closing: false, + closed: false } Data.set(id, toast); @@ -26,8 +28,19 @@ export function init(id, invoke, callback) { progressElement.style.width = '100%' } }) + EventHandler.on(el, 'hide.bs.toast', e => { + if (toast.closing) { + e.preventDefault(); + } + else { + toast.closing = true; + } + }) EventHandler.on(el, 'hidden.bs.toast', () => { - invoke.invokeMethodAsync(toast.callback) + if (!toast.closed) { + toast.closed = true; + invoke.invokeMethodAsync(toast.callback) + } }) EventHandler.on(progressElement, 'transitionend', e => { if (toast.toast._config.autohide === false) { @@ -62,6 +75,7 @@ export function dispose(id) { const { element, progressElement } = toast; EventHandler.off(element, 'shown.bs.toast'); + EventHandler.off(element, 'hide.bs.toast'); EventHandler.off(element, 'hidden.bs.toast'); EventHandler.off(progressElement, 'transitionend'); diff --git a/src/BootstrapBlazor/Components/Toast/ToastContainer.razor.cs b/src/BootstrapBlazor/Components/Toast/ToastContainer.razor.cs index 1b0683098e5..07fb1defc08 100644 --- a/src/BootstrapBlazor/Components/Toast/ToastContainer.razor.cs +++ b/src/BootstrapBlazor/Components/Toast/ToastContainer.razor.cs @@ -82,12 +82,16 @@ private async Task Show(ToastOption option) /// public async Task Close(ToastOption option) { + if (!Toasts.Remove(option)) + { + return; + } + + StateHasChanged(); if (option.OnCloseAsync != null) { await option.OnCloseAsync(); } - Toasts.Remove(option); - StateHasChanged(); } /// From f884b221effc138960eca6db7c84fd532b574105 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 17 Nov 2026 21:02:03 +0800 Subject: [PATCH 4/4] =?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/SwalTest.cs | 109 +++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/test/UnitTest/Components/SwalTest.cs b/test/UnitTest/Components/SwalTest.cs index 97b7975ea39..13204349eec 100644 --- a/test/UnitTest/Components/SwalTest.cs +++ b/test/UnitTest/Components/SwalTest.cs @@ -7,6 +7,115 @@ namespace UnitTest.Components; public class SwalTest : BootstrapBlazorTestBase { + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task ShowModal_ReturnsConfirmationResult_Ok(bool expected) + { + var cut = Context.Render(pb => + { + pb.AddChildContent(); + }); + var swal = cut.FindComponent().Instance.SwalService; + var option = new SwalOption(); + var modalTask = Task.FromResult(false); + + await cut.InvokeAsync(() => + { + modalTask = swal.ShowModal(option); + }); + + var modal = cut.FindComponents().Last(); + await cut.InvokeAsync(() => cut.Find(expected ? ".btn-danger" : ".btn-secondary").Click()); + await cut.InvokeAsync(() => modal.Instance.CloseCallback()); + + Assert.Equal(expected, await modalTask); + Assert.True(option.IsConfirm); + } + + [Fact] + public async Task ShowModal_IgnoresRequestsWhileBusy_Ok() + { + var cut = Context.Render(pb => + { + pb.AddChildContent(); + }); + var swal = cut.FindComponent().Instance.SwalService; + var option = new SwalOption() + { + Content = "Active Swal" + }; + var modalTask = Task.FromResult(false); + + await cut.InvokeAsync(() => + { + modalTask = swal.ShowModal(option); + }); + + var newOption = new SwalOption() + { + Content = "Ignored Swal" + }; + var newRequestTask = Task.FromResult(true); + await cut.InvokeAsync(() => + { + newRequestTask = swal.ShowModal(newOption); + }); + + Assert.False(await newRequestTask); + Assert.False(newOption.IsConfirm); + + var repeatedRequestTask = Task.FromResult(true); + await cut.InvokeAsync(() => + { + repeatedRequestTask = swal.ShowModal(option); + }); + + Assert.False(await repeatedRequestTask); + Assert.True(option.IsConfirm); + Assert.Contains("Active Swal", cut.Markup); + Assert.DoesNotContain("Ignored Swal", cut.Markup); + + var modal = cut.FindComponents().Last(); + await cut.InvokeAsync(() => cut.Find(".btn-danger").Click()); + await cut.InvokeAsync(() => modal.Instance.CloseCallback()); + + Assert.True(await modalTask); + } + + [Fact] + public async Task CloseAsync_IgnoresConcurrentCall_Ok() + { + var callbackStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var continueCallback = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var callbackCount = 0; + var cut = Context.Render(pb => + { + pb.Add(a => a.IsConfirm, true); + pb.Add(a => a.OnConfirmAsync, async () => + { + callbackCount++; + callbackStarted.TrySetResult(); + await continueCallback.Task; + }); + }); + + var firstClick = cut.InvokeAsync(() => cut.Find(".btn-danger").Click()); + try + { + await callbackStarted.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken); + await cut.InvokeAsync(() => cut.Find(".btn-danger").Click()); + + Assert.Equal(1, callbackCount); + } + finally + { + continueCallback.TrySetResult(); + } + + await firstClick; + } + [Fact] public void Show_Ok() {