Merge pull request #6330 from abpframework/stsrki-rel-4.0-blazorise-0…

….9.3-p2 Stsrki rel 4.0 blazorise 0.9.3 p2
abpframework · Nov 24, 2020 · 869bc26 · 869bc26
2 parents 05a1a89 + 747107e
commit 869bc26
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 24 deletions.
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/UiNotificationAlert.razor
@@ -1 +1 @@
-<SnackbarStack @ref="SnackbarStack" Location="SnackbarStackLocation.Right" Multiline="true" Closed="@OnSnackbarClosed" />
+<SnackbarStack @ref="SnackbarStack" Location="SnackbarStackLocation.Right" Multiline="true" DelayCloseOnClick="true" DelayCloseOnClickInterval="10000" Closed="@OnSnackbarClosed" />
diff --git 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 @@ protected override void OnInitialized()
             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 @@ protected virtual void OnNotificationReceived(object sender, UiNotificationEvent
 
             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()

diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
@@ -12,9 +12,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise" Version="0.9.2-rc4" />
-        <PackageReference Include="Blazorise.DataGrid" Version="0.9.2-rc4" />
-        <PackageReference Include="Blazorise.Snackbar" Version="0.9.2-rc4" />
+        <PackageReference Include="Blazorise" Version="0.9.3-preview2" />
+        <PackageReference Include="Blazorise.DataGrid" Version="0.9.3-preview2" />
+        <PackageReference Include="Blazorise.Snackbar" Version="0.9.3-preview2" />
     </ItemGroup>
 
 </Project>
diff --git a/...net-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/...net-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.2-rc4" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.2-rc4" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3-preview2" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3-preview2" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" />
   </ItemGroup>

diff --git a/...lates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/...lates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
@@ -100,12 +100,5 @@ private void ConfigureAutoMapper(ServiceConfigurationContext context)
                 options.AddMaps<MyProjectNameBlazorModule>();
             });
         }
-
-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            context.ServiceProvider
-                .UseBootstrapProviders()
-                .UseFontAwesomeIcons();
-        }
     }
 }
diff --git a/...st/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj b/...st/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.2-rc4" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.2-rc4" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3-preview2" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3-preview2" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly"  Version="5.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" />
   </ItemGroup>

diff --git a/...aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs b/...aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyProjectNameBlazorHostModule.cs
@@ -95,12 +95,5 @@ private void ConfigureAutoMapper(ServiceConfigurationContext context)
                 options.AddMaps<MyProjectNameBlazorHostModule>();
             });
         }
-
-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            context.ServiceProvider
-                .UseBootstrapProviders()
-                .UseFontAwesomeIcons();
-        }
     }
 }