Merge pull request #1831 from Basaingeal/release/v5.2.0

Release/v5.2.0

Author: Basaingeal

CHANGELOG.md

@@ -1,8 +1,14 @@
-# v5.1.0
+# v5.2.0
 
-## .NET 6 multi-targetting enabled
+## 🎉 New Features
+
+### Additional `SweetAlertOptions` properties
+
+- `Color`
+- `CustomClass.TimerProgressBar`
+  
 ## Dependencies
 
-- bump `sweetalert2` to `11.1.9`
-- bump `@sweetalert2/themes` to `5.0.7`
+- bump `sweetalert2` to `11.4.4`
+- bump `@sweetalert2/themes` to `5.0.10`
 

CurrieTechnologies.Razor.SweetAlert2.csproj

@@ -9,7 +9,7 @@
     <Description>
       A Razor class library for interacting with SweetAlert2.
       Use in Blazor Server Apps or Blazor WebAssembly Apps.
-      Currently using sweetalert2@11.1.7
+      Currently using sweetalert2@11.4.4
     </Description>
     <Copyright>Michael J. Currie</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -20,8 +20,8 @@
     <PackageTags>Blazor SweetAlert SweetAlert2 JSInterop Server Razor</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>
-      .NET 6 support
       bump sweetalert2
+      bump @sweetalert2/themes
     </PackageReleaseNotes>
   </PropertyGroup>
 
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Models/SweetAlertCustomClass.cs

@@ -49,5 +49,7 @@ public SweetAlertCustomClass(string popup)
         [JsonPropertyName("loader")] public string Loader { get; set; }
 
         [JsonPropertyName("footer")] public string Footer { get; set; }
+
+        [JsonPropertyName("timerProgressBar")] public string TimerProgressBar { get; set; }
     }
 }

Models/SweetAlertOptionPOCO.cs

@@ -33,6 +33,8 @@ internal class SweetAlertOptionPOCO
 
         [JsonPropertyName("padding")] public string Padding { get; set; }
 
+        [JsonPropertyName("color")] public string Color { get; set; }
+
         [JsonPropertyName("background")] public string Background { get; set; }
 
         [JsonPropertyName("position")] public string Position { get; set; }

Models/SweetAlertOptions.cs

@@ -109,6 +109,11 @@ public SweetAlertOptions(string title)
         /// </summary>
         public string Padding { get; set; }
 
+        /// <summary>
+        ///     Popup color for title, content and footer (CSS `color` property).
+        /// </summary>
+        public string Color { get; set; }
+
         /// <summary>
         ///     Modal window background (CSS background property).
         /// </summary>
@@ -331,18 +336,18 @@ public SweetAlertOptions(string title)
 
 #pragma warning disable CA1056 // Uri properties should not be strings
         /// <summary>
-        ///     Add a customized icon for the modal. Should contain a string with the path or URL to the image.
+        ///     Add an image to the popup. Should contain a string with the path or URL to the image.
         /// </summary>
         public string ImageUrl { get; set; }
 #pragma warning restore CA1056 // Uri properties should not be strings
 
         /// <summary>
-        ///     If imageUrl is set, you can specify imageWidth to describes image width in px.
+        ///     If imageUrl is set, you can specify imageWidth to describes image width.
         /// </summary>
         public double? ImageWidth { get; set; }
 
         /// <summary>
-        ///     If imageUrl is set, you can specify imageHeight to describes image height in px.
+        ///     If imageUrl is set, you can specify imageHeight to describes image height.
         /// </summary>
         public double? ImageHeight { get; set; }
 
@@ -485,6 +490,7 @@ internal SweetAlertOptionPOCO ToPOCO()
                 Input = Input?.ToString(),
                 Width = Width,
                 Padding = Padding,
+                Color = Color,
                 Background = Background,
                 Position = Position?.ToString(),
                 Grow = Grow?.ToString(),

Services/SweetAlertOptionsMixingService.cs

@@ -19,6 +19,7 @@ internal static SweetAlertOptions Mix(SweetAlertOptions oldSettings, SweetAlertO
                 Input = newSettings.Input ?? oldSettings.Input,
                 Width = newSettings.Width ?? oldSettings.Width,
                 Padding = newSettings.Padding ?? oldSettings.Padding,
+                Color = newSettings.Color ?? oldSettings.Color,
                 Background = newSettings.Background ?? oldSettings.Background,
                 Position = newSettings.Position ?? oldSettings.Position,
                 Grow = newSettings.Grow ?? oldSettings.Grow,