Skip to content
Merged
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
29 changes: 22 additions & 7 deletions src/BootstrapBlazor/Components/Message/Message.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,25 @@ protected override void OnInitialized()

private string GetItemId(MessageOption option) => $"{Id}_{option.GetHashCode()}";

private string? _msgId;
private readonly HashSet<MessageOption> _pendingMessages = [];

/// <summary>
/// <inheritdoc/>
/// </summary>
/// <param name="firstRender"></param>
protected override async Task OnAfterRenderAsync(bool firstRender)
{
var messages = _pendingMessages.ToArray();
_pendingMessages.Clear();
Comment thread
ArgoZhang marked this conversation as resolved.
Resolved

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));
}
}
}

Expand All @@ -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);
}

Expand All @@ -120,6 +127,7 @@ public void Clear(string id)
if (option != null)
{
_messages.Remove(option);
_pendingMessages.Remove(option);
}

StateHasChanged();
Expand All @@ -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();
}
}

Expand Down
34 changes: 17 additions & 17 deletions src/BootstrapBlazor/Components/Message/Message.razor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand All @@ -35,7 +50,7 @@ export function show(id, msgId) {

const elapsed = ts - start;
if (elapsed > delay) {
close();
close("Clear");
}
else {
msgItem.animationId = requestAnimationFrame(autoCloseAnimation);
Expand All @@ -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');
});
}

Expand Down
5 changes: 3 additions & 2 deletions test/UnitTest/Components/MessageTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Loading