From 34ad8753caed7f936f034b83a188a3fde8d32f1b Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Tue, 24 Nov 2020 10:52:14 +0100 Subject: [PATCH 1/2] Update to Blazorise 0.9.3-preview2 --- .../src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj | 6 +++--- .../MyCompanyName.MyProjectName.Blazor.csproj | 4 ++-- .../MyProjectNameBlazorModule.cs | 7 ------- .../MyCompanyName.MyProjectName.Blazor.Host.csproj | 4 ++-- .../MyProjectNameBlazorHostModule.cs | 7 ------- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj index bd69ecdf35..b87f698e0b 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj +++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 56c9a2cb8a..48029e8f3d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index dec205bdae..81304962fb 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -100,12 +100,5 @@ namespace MyCompanyName.MyProjectName.Blazor options.AddMaps(); }); } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - context.ServiceProvider - .UseBootstrapProviders() - .UseFontAwesomeIcons(); - } } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj index d3f461c8c6..9090e83e62 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs index 35de1c6673..7fdc824b09 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs @@ -95,12 +95,5 @@ namespace MyCompanyName.MyProjectName.Blazor.Host options.AddMaps(); }); } - - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - context.ServiceProvider - .UseBootstrapProviders() - .UseFontAwesomeIcons(); - } } } From 747107e43d1baf9a57f8f28028f9f2dfcc746f9b Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Tue, 24 Nov 2020 10:52:53 +0100 Subject: [PATCH 2/2] Fixed breaking change on SnackbarStack --- .../Components/UiNotificationAlert.razor | 2 +- .../Components/UiNotificationAlert.razor.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor index 8edd037e15..a1a60b2c9c 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor.cs index 7413b59009..0b527d6de2 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Blazorise; using Blazorise.Snackbar; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; @@ -47,7 +48,7 @@ namespace Volo.Abp.BlazoriseUI.Components UiNotificationService.NotificationReceived += OnNotificationReceived; } - protected virtual void OnNotificationReceived(object sender, UiNotificationEventArgs e) + protected virtual async void OnNotificationReceived(object sender, UiNotificationEventArgs e) { NotificationType = e.NotificationType; Message = e.Message; @@ -56,7 +57,11 @@ namespace Volo.Abp.BlazoriseUI.Components var okButtonText = Options?.OkButtonText?.Localize(StringLocalizerFactory); - SnackbarStack.Push(Message, GetSnackbarColor( e.NotificationType ), okButtonText); + await SnackbarStack.PushAsync(Message, Title, GetSnackbarColor( e.NotificationType ), (options) => + { + options.CloseButtonIcon = IconName.Times; + options.ActionButtonText = okButtonText; + }); } public virtual void Dispose()