feat(TableCellPopConfirmButton): support IsKeepDisabled parameter (#6571)

* chore: bump version 9.9.2-beta03

* refactor: 增加 IsKeepDisabled 参数支持

* feat: 增加 IsKeepDisabled 参数

* test: 更新单元测试

* test: 增加代码覆盖率

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

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

src/BootstrapBlazor/Components/Dropdown/Dropdown.razor

@@ -9,7 +9,7 @@
 }
 <div @attributes="@AdditionalAttributes" id="@Id" class="@DirectionClassName">
     <DynamicElement TagName="button" type="button" class="@ButtonClassName" data-bs-toggle="@DropdownToggle" disabled="@Disabled"
-                    TriggerClick="ShowSplit" OnClick="OnClickButton">
+                    TriggerClick="ShowSplit" OnClick="OnClickButton" PreventDefault="false" StopPropagation="false">
         @if (ButtonTemplate == null)
         {
             @if (_isAsyncLoading)

src/BootstrapBlazor/Components/Table/TableExtensionButton.razor

@@ -10,14 +10,16 @@
         {
             case TableCellButton { IsShow: true } b:
                 <Button AdditionalAttributes="b.AdditionalAttributes" Size="b.Size"
-                        Color="@b.Color" Icon="@b.Icon" Text="@b.Text" IsAsync="@b.IsAsync"
+                        Color="@b.Color" Icon="@b.Icon" Text="@b.Text"
+                        IsAsync="@b.IsAsync" IsKeepDisabled="b.IsKeepDisabled"
                         TooltipText="@b.TooltipText" TooltipPlacement="@b.TooltipPlacement"
                         TooltipTrigger="@b.TooltipTrigger" ChildContent="@b.ChildContent"
                         OnClickWithoutRender="() => OnClick(b)" IsDisabled="b.IsDisabled"></Button>
                 break;
             case TableCellPopConfirmButton { IsShow: true } pb:
                 <PopConfirmButton AdditionalAttributes="pb.AdditionalAttributes"
-                                  Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text" IsAsync="@pb.IsAsync"
+                                  Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text"
+                                  IsAsync="@pb.IsAsync" IsKeepDisabled="pb.IsKeepDisabled"
                                   Size="pb.Size" ShowShadow="@pb.ShowShadow" IsDisabled="@pb.IsDisabled"
                                   IsBlock="@pb.IsBlock" IsOutline="@pb.IsOutline"
                                   OnBeforeClick="@pb.OnBeforeClick" OnClose="@pb.OnClose" OnConfirm="() => OnClickConfirm(pb)"

src/BootstrapBlazor/Extensions/DownloadServiceExtensions.cs

@@ -49,7 +49,7 @@ public static async Task DownloadFolderAsync(this DownloadService download, stri
         var destZipFile = $"{directoryName}.zip";
         ZipFile.CreateFromDirectory(folder, destZipFile);
 
-        using var stream = new FileStream(destZipFile, FileMode.Open);
+        await using var stream = new FileStream(destZipFile, FileMode.Open);
         await download.DownloadFromStreamAsync(new DownloadOption() { FileName = downloadFileName, FileStream = stream });
     }
 

test/UnitTest/Components/DownloadTest.cs

@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
 
-using Microsoft.JSInterop;
-
 namespace UnitTest.Components;
 
 public class DownloadTest : BootstrapBlazorTestBase
@@ -96,6 +94,18 @@ public async Task DownloadFromStreamAsync_Null()
         });
         var btn = cut.Find("button");
         await Assert.ThrowsAsync<InvalidOperationException>(() => cut.InvokeAsync(() => btn.Click()));
+
+        var trigger = cut.FindComponent<Button>();
+        trigger.SetParametersAndRender(pb =>
+        {
+            pb.Add(a => a.OnClick, async () =>
+            {
+                var stream = new MemoryStream();
+                await downloadService.DownloadFromStreamAsync("", stream);
+            });
+        });
+        btn = cut.Find("button");
+        await Assert.ThrowsAsync<InvalidOperationException>(() => cut.InvokeAsync(() => btn.Click()));
     }
 
     [Fact]
@@ -131,7 +141,7 @@ public async Task DownloadFolderAsync_Ok()
         {
             File.Delete(zipFile);
         }
-        using var fs = File.Create(fileName);
+        await using var fs = File.Create(fileName);
         fs.Close();
         btn = cut.Find("button");
         await cut.InvokeAsync(() => btn.Click());
@@ -175,5 +185,16 @@ public async Task DownloadFromUrlAsync_Null()
         });
         var btn = cut.Find("button");
         await Assert.ThrowsAsync<InvalidOperationException>(() => cut.InvokeAsync(() => btn.Click()));
+
+        var trigger = cut.FindComponent<Button>();
+        trigger.SetParametersAndRender(pb =>
+        {
+            pb.Add(a => a.OnClick, async () =>
+            {
+                await downloadService.DownloadFromUrlAsync("", "./favicon.png");
+            });
+        });
+        btn = cut.Find("button");
+        await Assert.ThrowsAsync<InvalidOperationException>(() => cut.InvokeAsync(() => btn.Click()));
     }
 }