Merge branch 'main' into studder

Signed-off-by: celadaris <amorales13r@gmail.com>

Author: celadaris

src/BootstrapBlazor/BootstrapBlazor.csproj

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

src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs

@@ -118,6 +118,7 @@ protected override void OnInitialized()
         if (!string.IsNullOrEmpty(Value))
         {
             _filterItems = GetFilterItemsByValue(Value); // Use the new helper
+
             if (DisplayCount != null)
             {
                 _filterItems = [.. _filterItems.Take(DisplayCount.Value)];
@@ -240,6 +241,7 @@ public async Task PerformFilteringAndCommitValue(string val)
         else
         {
             // Use the helper method for standard filtering
+
             _filterItems = GetFilterItemsByValue(val);
         }
 
@@ -255,6 +257,15 @@ public async Task PerformFilteringAndCommitValue(string val)
         _shouldRender = true;
     }
 
+    private List<string> GetFilterItemsByValue(string val)
+    {
+        var comparison = IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+        var items = IsLikeMatch
+            ? Items.Where(s => s.Contains(val, comparison))
+            : Items.Where(s => s.StartsWith(val, comparison));
+        return [.. items];
+    }
+
     /// <summary>
     /// REMOVED: Original TriggerChange method.
     /// Its functionality (updating value, rendering dropdown) is now handled by

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

@@ -41,10 +41,12 @@ export function dispose(id) {
     Data.remove(id);
 
     if (watermark) {
-        const { ob } = watermark;
+        const { el, ob } = watermark;
         ob.disconnect();
 
         delete watermark.ob;
+        document.body.removeAttribute('data-bb-watermark');
+        el.remove();
     }
 }
 
@@ -102,13 +104,13 @@ const createWatermark = watermark => {
     if (mark) {
         mark.remove();
     }
+    el.appendChild(div);
 
-    if (bg.isPage) {
-        document.body.appendChild(div);
-    }
-    else {
-        el.appendChild(div);
+    if (options.isPage) {
+        document.body.setAttribute('data-bb-watermark', "true");
+        document.body.appendChild(el);
     }
+
     options.bg = bg;
     requestAnimationFrame(() => monitor(watermark));
 }
@@ -179,8 +181,12 @@ const monitor = watermark => {
 
 const clearWatermark = watermark => {
     const { el, ob } = watermark;
-    ob.disconnect();
-    el.innerHTML = '';
+    if (ob) {
+        ob.disconnect();
+    }
+    if (el) {
+        el.innerHTML = '';
+    }
 }
 
 const getWatermark = props => {

test/UnitTest/Components/AutoCompleteTest.cs

@@ -40,6 +40,23 @@ public async Task Items_Ok()
         Assert.Equal("Test", cut.Instance.Value);
     }
 
+    [Fact]
+    public void Value_Ok()
+    {
+        var cut = Context.RenderComponent<AutoComplete>(pb =>
+        {
+            pb.Add(a => a.Items, new List<string>() { "test1", "test12", "test123", "test1234" });
+            pb.Add(a => a.Value, "test12");
+            pb.Add(a => a.DisplayCount, 2);
+        });
+        var menus = cut.FindAll(".dropdown-item");
+
+        // 由于 Value = test12
+        // 并且设置了 DisplayCount = 2
+        // 候选项只有 2 个
+        Assert.Equal(2, menus.Count);
+    }
+
     [Fact]
     public void Debounce_Ok()
     {