Merge branch 'main' into feat-upload

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.4-beta03</Version>
+    <Version>9.6.4-beta05</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor.cs

@@ -187,22 +187,7 @@ private async Task<bool> OnBeforeStateChanged(CheckboxState state)
     private async Task OnStateChanged(SelectedItem<TValue> item, bool v)
     {
         item.Active = v;
-        var items = new List<TValue>();
-        if (Value != null)
-        {
-            items.AddRange(Value);
-        }
-
-        var val = items.Find(i => Equals(item.Value, i));
-        if (v && val == null)
-        {
-            items.Add(item.Value);
-        }
-        else
-        {
-            items.Remove(val!);
-        }
-
+        var items = Items.Where(i => i.Active).Select(i => i.Value).ToList();
         CurrentValue = items;
 
         if (OnSelectedChanged != null)

src/BootstrapBlazor/Components/Textarea/Textarea.razor.js

@@ -3,7 +3,7 @@ import Data from "../../modules/data.js"
 import EventHandler from "../../modules/event-handler.js"
 
 export function init(id) {
-    var el = document.getElementById(id);
+    const el = document.getElementById(id);
     const text = {
         prevMethod: '',
         element: el
@@ -14,7 +14,7 @@ export function init(id) {
         if (e.key === "Enter" || e.key === "NumpadEnter") {
             const useShiftEnter = el.getAttribute('data-bb-shift-enter') === 'true';
             const shiftKey = e.shiftKey;
-            if (shiftKey && useShiftEnter) {
+            if (useShiftEnter && shiftKey === false) {
                 e.preventDefault();
             }
         }

src/BootstrapBlazor/Components/Watermark/Watermark.razor.js

@@ -121,17 +121,7 @@ const monitor = watermark => {
         return;
     }
 
-    if (options.isPage === false && el.children.length !== 2) {
-        clearWatermark(watermark);
-        return;
-    }
-
-    const mark = options.isPage ? el.children[0] : el.children[1];
-    if (mark.className !== 'bb-watermark-bg') {
-        clearWatermark(watermark);
-        return;
-    }
-
+    const mark = el.querySelector('.bb-watermark-bg');
     const style = getComputedStyle(mark);
     const { display, opacity, position, inset, zIndex, zoom, transform, backgroundRepeat, backgroundImage, backgroundSize } = style;
     if (display !== 'block') {

test/UnitTest/Components/SelectTest.cs

@@ -1167,6 +1167,7 @@ public async Task OnBeforeSelectedItemChange_OK()
                 pb.Add(a => a.SwalCategory, SwalCategory.Question);
                 pb.Add(a => a.SwalTitle, "Swal-Title");
                 pb.Add(a => a.SwalContent, "Swal-Content");
+                pb.Add(a => a.ShowSwal, true);
                 pb.Add(a => a.OnBeforeSelectedItemChange, item => Task.FromResult(true));
                 pb.Add(a => a.OnSelectedItemChanged, item => Task.CompletedTask);
                 pb.Add(a => a.SwalFooter, "test-swal-footer");