From b2eefd60aca499d2b2bb43dce627848736fc391e Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 25 Apr 2025 13:20:55 +0800
Subject: [PATCH] chore(Button): IsAsync parameter support wpf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(Button):修复WPF Blazor模式下Button组件IsAsync不工作

* chore: bump version beta03

Co-Authored-By: zglp <15925497+zglp@users.noreply.github.com>

---------

Co-authored-by: zglp <2499728776@qq.com>
Co-authored-by: Argo Zhang <argo@live.ca>
Co-authored-by: zglp <15925497+zglp@users.noreply.github.com>
# Conflicts:
#	src/BootstrapBlazor/BootstrapBlazor.csproj
#	src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
---
 src/BootstrapBlazor/Components/Button/Button.razor.cs    | 9 +--------
 src/BootstrapBlazor/Components/Button/CountButton.cs     | 2 +-
 .../Components/Button/PopConfirmButton.razor.cs          | 6 +-----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Button/Button.razor.cs b/src/BootstrapBlazor/Components/Button/Button.razor.cs
index 8a622fa6faa..60d91762c6e 100644
--- a/src/BootstrapBlazor/Components/Button/Button.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/Button.razor.cs
@@ -50,14 +50,7 @@ protected virtual async Task OnClickButton()
             IsDisabled = true;
         }
 
-        if (IsAsync)
-        {
-            await Task.Run(() => InvokeAsync(HandlerClick));
-        }
-        else
-        {
-            await HandlerClick();
-        }
+        await HandlerClick();
 
         // 恢复按钮
         if (IsAsync && ButtonType == ButtonType.Button)
diff --git a/src/BootstrapBlazor/Components/Button/CountButton.cs b/src/BootstrapBlazor/Components/Button/CountButton.cs
index f77faab7625..363a71c9ba4 100644
--- a/src/BootstrapBlazor/Components/Button/CountButton.cs
+++ b/src/BootstrapBlazor/Components/Button/CountButton.cs
@@ -36,7 +36,7 @@ protected override async Task OnClickButton()
         IsAsyncLoading = true;
         IsDisabled = true;
 
-        await Task.Run(() => InvokeAsync(HandlerClick));
+        await HandlerClick();
         await UpdateCount();
 
         IsDisabled = false;
diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
index aac36be9c63..7efc1e55bf0 100644
--- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
@@ -99,11 +99,7 @@ private async Task OnClickConfirm()
             IsDisabled = true;
             IsAsyncLoading = true;
             StateHasChanged();
-
-            if (OnConfirm != null)
-            {
-                await Task.Run(() => InvokeAsync(OnConfirm));
-            }
+            await OnConfirm();
 
             if (ButtonType == ButtonType.Submit)
             {