Skip to content

Fix issue #836 #839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions blazorbootstrap/Components/Toasts/Toasts.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protected override async ValueTask DisposeAsyncCore(bool disposing)
Messages = null;

if (ToastService is not null)
ToastService.OnNotify -= OnNotify;
ToastService.OnNotify -= OnNotifyAsync;
}

await base.DisposeAsyncCore(disposing);
Expand All @@ -21,12 +21,12 @@ protected override async ValueTask DisposeAsyncCore(bool disposing)
protected override void OnInitialized()
{
if (ToastService is not null)
ToastService.OnNotify += OnNotify;
ToastService.OnNotify += OnNotifyAsync;

base.OnInitialized();
}

private void OnNotify(ToastMessage toastMessage)
private async Task OnNotifyAsync(ToastMessage toastMessage)
{
if (toastMessage is null)
return;
Expand All @@ -35,7 +35,7 @@ private void OnNotify(ToastMessage toastMessage)

Messages.Add(toastMessage);

StateHasChanged();
await InvokeAsync(StateHasChanged);
}

private void OnToastHiddenAsync(ToastEventArgs args)
Expand Down
17 changes: 14 additions & 3 deletions blazorbootstrap/Services/ToastService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,24 @@ public class ToastService
{
#region Events

internal event Action<ToastMessage> OnNotify = default!;

internal event Func<ToastMessage, Task> OnNotify = default!;
#endregion

#region Methods

public void Notify(ToastMessage toastMessage) => OnNotify?.Invoke(toastMessage);

public async Task NotifyAsync(ToastMessage toastMessage)
{
Delegate[] subscribers = OnNotify?.GetInvocationList() ?? Array.Empty<Delegate>();
if (subscribers.Length > 0)
{
await Task.WhenAll(subscribers.Select(d =>
{
Func<ToastMessage, Task> subscriber = (Func<ToastMessage, Task>)d;
return subscriber.Invoke(toastMessage);
}));
}
}
#endregion
}