Skip to content

fix(Table): toast popup delay parameter should be use global setting #5340

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 11, 2025
Merged

fix(Table): toast popup delay parameter should be use global setting #5340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 19 additions & 31 deletions src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,22 +598,16 @@ public async Task EditAsync()

private async Task ShowToastAsync(string title, string content, ToastCategory category = ToastCategory.Information)
{
var option = new ToastOption
{
Category = category,
Title = title,
Content = content
};
var option = GetToastOption(title);
option.Category = category;
option.Content = content;
await Toast.Show(option);
}

private async Task ShowDeleteToastAsync(string title, string content, ToastCategory category = ToastCategory.Information)
{
var option = new ToastOption
{
Category = category,
Title = title
};
var option = GetToastOption(title);
option.Category = category;
option.Content = string.Format(content, Math.Ceiling(option.Delay / 1000.0));
await Toast.Show(option);
}
Expand Down Expand Up @@ -673,11 +667,8 @@ protected async Task<bool> SaveModelAsync(EditContext context, ItemChangedType c
}
if (ShowToastAfterSaveOrDeleteModel)
{
var option = new ToastOption
{
Category = valid ? ToastCategory.Success : ToastCategory.Error,
Title = SaveButtonToastTitle
};
var option = GetToastOption(SaveButtonToastTitle);
option.Category = valid ? ToastCategory.Success : ToastCategory.Error;
option.Content = string.Format(SaveButtonToastResultContent, valid ? SuccessText : FailText, Math.Ceiling(option.Delay / 1000.0));
await Toast.Show(option);
}
Expand Down Expand Up @@ -1023,11 +1014,8 @@ protected async Task DeleteAsync()

if (ShowToastAfterSaveOrDeleteModel)
{
var option = new ToastOption()
{
Title = DeleteButtonToastTitle,
Category = ret ? ToastCategory.Success : ToastCategory.Error
};
var option = GetToastOption(DeleteButtonToastTitle);
option.Category = ret ? ToastCategory.Success : ToastCategory.Error;
option.Content = string.Format(DeleteButtonToastResultContent, ret ? SuccessText : FailText, Math.Ceiling(option.Delay / 1000.0));
await Toast.Show(option);
}
Expand Down Expand Up @@ -1137,11 +1125,8 @@ private async Task ExecuteExportAsync(Func<Task<bool>> callback)
}
else if (ShowToastBeforeExport)
{
var option = new ToastOption
{
Title = ExportToastTitle,
Category = ToastCategory.Information
};
var option = GetToastOption(ExportToastTitle);
option.Category = ToastCategory.Information;
option.Content = string.Format(ExportToastInProgressContent, Math.Ceiling(option.Delay / 1000.0));
await Toast.Show(option);
}
Expand All @@ -1154,16 +1139,19 @@ private async Task ExecuteExportAsync(Func<Task<bool>> callback)
}
else if (ShowToastAfterExport)
{
var option = new ToastOption
{
Title = ExportToastTitle,
Category = ret ? ToastCategory.Success : ToastCategory.Error
};
var option = GetToastOption(ExportToastTitle);
option.Category = ret ? ToastCategory.Success : ToastCategory.Error;
option.Content = string.Format(ExportToastContent, ret ? SuccessText : FailText, Math.Ceiling(option.Delay / 1000.0));
await Toast.Show(option);
}
}

private ToastOption GetToastOption(string title) => new()
{
Title = title,
Delay = Options.CurrentValue.ToastDelay
};

private Task ExportAsync() => ExecuteExportAsync(() => OnExportAsync != null
? OnExportAsync(new TableExportDataContext<TItem>(TableExportType.Unknown, Rows, GetVisibleColumns(), BuildQueryPageOptions()))
: TableExport.ExportAsync(Rows, GetVisibleColumns()));
Expand Down