Merge pull request #2342 from Basaingeal/release/v5.5.0

Release/v5.5.0

Author: Basaingeal

.eslintignore

@@ -1 +1,3 @@
-*.cjs
+*.cjs
+
+wwwroot

.github/dependabot.yml

@@ -1,24 +1,5 @@
 version: 2
 updates:
-- package-ecosystem: nuget
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  target-branch: develop
-  ignore:
-  - dependency-name: Microsoft.AspNetCore.Components
-    versions:
-    - 5.0.2
-    - 5.0.3
-    - 5.0.4
-    - 5.0.5
-  - dependency-name: Microsoft.AspNetCore.Components.Web
-    versions:
-    - 5.0.2
-    - 5.0.3
-    - 5.0.4
-    - 5.0.5
 - package-ecosystem: npm
   directory: "/"
   schedule:

.prettierrc

@@ -1,3 +1,2 @@
 {
-  "printWidth": 100
 }

CHANGELOG.md

@@ -1,23 +1,12 @@
-# v5.4.0
+# v5.5.0
 
 ## Notable changes
 
-### Remove explicit .NET Core 3.1 support
+### `InputAutoFocus` property
 
-This library no longer targets .NET Core 3.1 as it is no longer a supported version of .NET. The library still targets .NET Standard 2.0, so apps that are still on .NET Core 3.1 should still be able to use it.
+This release includes the new `inputAutoFocus` options property introduced by the `sweetalert2` library.
+By setting this to `false`, the input on the alert will not be auto-focused. (`true` by default)
 
-### Public `IAsyncSweetAlertService` interface
-
-The `IAsyncSweetAlertService` interface has been made public by request. (https://github.com/Basaingeal/Razor.SweetAlert2/issues/2183)
-
-### Protestware
-
-The author of the `sweetalert2` library added protestware concerning the war between Russia and Ukraine. (https://github.com/sweetalert2/sweetalert2/pull/2462) ([SNYK: Undesired Behavior in sweetalert2](https://security.snyk.io/vuln/SNYK-JS-SWEETALERT2-2774674))
-
-This protestware was recently updated to auto-play the Ukrainian national anthem in addition to disabling all user events. This library will now detect when the `<audio>` element that plays the anthem has been added to the document, and removes it.
-  
 ## Dependencies
 
-- bump `sweetalert2` to `11.6.15`
-- bump `@sweetalert2/themes` to `5.0.15`
-
+- bump `sweetalert2` to `11.7.3`

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.6.15
+      Currently using sweetalert2@11.7.3
     </Description>
     <Copyright>Michael J. Currie</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -21,9 +21,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>
       bump sweetalert2
-      bump @sweetalert2/themes
-      removed explicit support for .NET Core 3.1
-      made IAsyncSweetAlertService interface public
+      add InputAutoFocus property
     </PackageReleaseNotes>
   </PropertyGroup>
 
@@ -44,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0.*">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Models/SweetAlertOptionPOCO.cs

@@ -143,6 +143,8 @@ internal class SweetAlertOptionPOCO
 
         [JsonPropertyName("inputOptions")] public IDictionary<string, string> InputOptions { get; set; }
 
+        [JsonPropertyName("inputAutoFocus")] public bool? InputAutoFocus { get; set; }
+
         [JsonPropertyName("inputAutoTrim")] public bool? InputAutoTrim { get; set; }
 
         [JsonPropertyName("inputAttributes")] public IDictionary<string, string> InputAttributes { get; set; }

Models/SweetAlertOptions.cs

@@ -379,6 +379,12 @@ public SweetAlertOptions(string title)
         public IDictionary<string, string> InputOptions { get; set; }
 #pragma warning restore CA2227 // Collection properties should be read only
 
+        /// <summary>
+        ///     Automatically focus the input when popup is shown.
+        ///     <para>Set this parameter to `false` to disable auto-focusing.</para>
+        /// </summary>
+        public bool? InputAutoFocus { get; set; }
+
         /// <summary>
         ///     Automatically remove whitespaces from both ends of a result string.
         ///     <para>Set this parameter to false to disable auto-trimming.</para>
@@ -539,6 +545,7 @@ internal SweetAlertOptionPOCO ToPOCO()
                 InputPlaceholder = InputPlaceholder,
                 InputValue = InputValue,
                 InputOptions = InputOptions,
+                InputAutoFocus = InputAutoFocus,
                 InputAutoTrim = InputAutoTrim,
                 InputAttributes = InputAttributes,
                 InputValidator = InputValidator != null,

Services/SweetAlertOptionsMixingService.cs

@@ -68,6 +68,7 @@ internal static SweetAlertOptions Mix(SweetAlertOptions oldSettings, SweetAlertO
                 InputPlaceholder = newSettings.InputPlaceholder ?? oldSettings.InputPlaceholder,
                 InputValue = newSettings.InputValue ?? oldSettings.InputValue,
                 InputOptions = newSettings.InputOptions ?? oldSettings.InputOptions,
+                InputAutoFocus = newSettings.InputAutoFocus ?? oldSettings.InputAutoFocus,
                 InputAutoTrim = newSettings.InputAutoTrim ?? oldSettings.InputAutoTrim,
                 InputAttributes = newSettings.InputAttributes ?? oldSettings.InputAttributes,
                 InputValidator = newSettings.InputValidator ?? oldSettings.InputValidator,