diff --git a/src/BootstrapBlazor/Components/Toast/Toast.razor.js b/src/BootstrapBlazor/Components/Toast/Toast.razor.js
index 79be9cfe0db..eebf36cc650 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,24 @@ 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;
+ queueMicrotask(() => {
+ if (e.defaultPrevented) {
+ toast.closing = false;
+ }
+ });
+ }
+ })
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 +80,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();
}
///
diff --git a/test/UnitTest/Components/ToastTest.cs b/test/UnitTest/Components/ToastTest.cs
index f0142d6d1c2..29caf7da15f 100644
--- a/test/UnitTest/Components/ToastTest.cs
+++ b/test/UnitTest/Components/ToastTest.cs
@@ -256,6 +256,57 @@ public async Task OnCloseAsync_Ok()
Assert.True(close);
}
+ [Fact]
+ public async Task Close_WithoutCallback_Ok()
+ {
+ var cut = Context.Render();
+ var service = Context.Services.GetRequiredService();
+ var option = new ToastOption();
+ await service.Show(option);
+
+ Assert.Single(cut.FindComponents());
+
+ await cut.InvokeAsync(() => cut.Instance.Close(option));
+
+ Assert.Empty(cut.FindComponents());
+ }
+
+ [Fact]
+ public async Task Close_IgnoresConcurrentCall()
+ {
+ var closeStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var continueClose = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var closeCount = 0;
+ var cut = Context.Render();
+ var service = Context.Services.GetRequiredService();
+ var option = new ToastOption()
+ {
+ OnCloseAsync = async () =>
+ {
+ closeCount++;
+ closeStarted.TrySetResult();
+ await continueClose.Task;
+ }
+ };
+ await service.Show(option);
+
+ var firstClose = cut.InvokeAsync(() => cut.Instance.Close(option));
+ Task secondClose = Task.CompletedTask;
+ try
+ {
+ await closeStarted.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
+ secondClose = cut.InvokeAsync(() => cut.Instance.Close(option));
+ Assert.Equal(1, closeCount);
+ Assert.Empty(cut.FindComponents());
+ }
+ finally
+ {
+ continueClose.TrySetResult();
+ }
+
+ await Task.WhenAll(firstClose, secondClose);
+ }
+
[Fact]
public void StyleString_Ok()
{