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'); }); } diff --git a/test/UnitTest/Components/MessageTest.cs b/test/UnitTest/Components/MessageTest.cs index 4cfd18a6690..f5a827877a1 100644 --- a/test/UnitTest/Components/MessageTest.cs +++ b/test/UnitTest/Components/MessageTest.cs @@ -95,9 +95,10 @@ await cut.InvokeAsync(() => service.Show(new MessageOption() Assert.NotNull(alert); Assert.NotNull(alert.Id); - await cut.Instance.Dismiss(alert.Id); + var alertId = alert.Id; + await cut.Instance.Dismiss(alertId); await cut.Instance.Dismiss("test_id"); - await cut.InvokeAsync(() => cut.Instance.Clear(alert.Id)); + await cut.InvokeAsync(() => cut.Instance.Clear(alertId)); await cut.InvokeAsync(() => service.Show(new MessageOption() {