From bb77833a53af05a3fc008255e1ca608cc3909852 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Mon, 2 May 2022 17:28:49 +0800
Subject: [PATCH 1/3] feat: add IsAutoFocus on Button component

---
 .../Components/Button/Button.razor            |  2 +-
 .../Components/Button/Button.razor.cs         | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Button/Button.razor b/src/BootstrapBlazor/Components/Button/Button.razor
index c1b1960d1..7360f22f3 100644
--- a/src/BootstrapBlazor/Components/Button/Button.razor
+++ b/src/BootstrapBlazor/Components/Button/Button.razor
@@ -1,7 +1,7 @@
 @namespace BootstrapBlazor.Components
 @inherits ButtonBase
 
-<button @attributes="@AdditionalAttributes" type="@ButtonType.ToDescriptionString()" @onclick="@OnClickButton" id="@Id" class="@ClassName" disabled="@Disabled" role="button" aria-disabled="@Disabled" tabindex="@Tab" @onclick:stopPropagation="@StopPropagation">
+<button @attributes="@AdditionalAttributes" type="@ButtonType.ToDescriptionString()" @onclick="@OnClickButton" id="@Id" class="@ClassName" disabled="@Disabled" role="button" aria-disabled="@Disabled" tabindex="@Tab" @onclick:stopPropagation="@StopPropagation" @ref="ButtonElement">
     @if(!string.IsNullOrEmpty(ButtonIcon))
     {
         <i class="@ButtonIcon"></i>
diff --git a/src/BootstrapBlazor/Components/Button/Button.razor.cs b/src/BootstrapBlazor/Components/Button/Button.razor.cs
index b85434b47..496bb47b3 100644
--- a/src/BootstrapBlazor/Components/Button/Button.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/Button.razor.cs
@@ -12,6 +12,12 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public partial class Button
 {
+    /// <summary>
+    /// 获得/设置 是否自动获取焦点 默认 false 不自动获取焦点
+    /// </summary>
+    [Parameter]
+    public bool IsAutoFocus { get; set; }
+
     /// <summary>
     /// 按钮点击回调方法，内置支持 IsAsync 开关
     /// </summary>
@@ -23,6 +29,11 @@ public partial class Button
     [CascadingParameter]
     protected ValidateForm? ValidateForm { get; set; }
 
+    /// <summary>
+    /// 获得/设置 html button 实例
+    /// </summary>
+    protected ElementReference ButtonElement { get; set; }
+
     /// <summary>
     /// OnInitialized 方法
     /// </summary>
@@ -80,6 +91,30 @@ public partial class Button
         }
     }
 
+    /// <summary>
+    /// OnAfterRenderAsync 方法
+    /// </summary>
+    /// <param name="firstRender"></param>
+    /// <returns></returns>
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await base.OnAfterRenderAsync(firstRender);
+
+        if (firstRender)
+        {
+            if (IsAutoFocus)
+            {
+                await FocusAsync();
+            }
+        }
+    }
+
+    /// <summary>
+    /// 自动获得焦点方法
+    /// </summary>
+    /// <returns></returns>
+    public ValueTask FocusAsync() => ButtonElement.FocusAsync();
+
     /// <summary>
     /// 处理点击方法
     /// </summary>
-- 
Gitee


From 816dafcc6f8afa7bc0f5bd47c815ef1e31880154 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Mon, 2 May 2022 17:28:59 +0800
Subject: [PATCH 2/3] chore: bump version 6.5.19

---
 src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 59602f930..01e7753a8 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>6.5.18</Version>
+    <Version>6.5.19</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-- 
Gitee


From c8522c9461318932d13cb8ad3f2b049506ccf383 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Mon, 2 May 2022 17:32:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=20IsAutoFocus=20?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/ButtonTest.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/UnitTest/Components/ButtonTest.cs b/test/UnitTest/Components/ButtonTest.cs
index bd69746b4..f8376be47 100644
--- a/test/UnitTest/Components/ButtonTest.cs
+++ b/test/UnitTest/Components/ButtonTest.cs
@@ -6,7 +6,6 @@ using BootstrapBlazor.Shared;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
-using UnitTest.Extensions;
 
 namespace UnitTest.Components;
 
@@ -335,4 +334,13 @@ public class ButtonTest : BootstrapBlazorTestBase
         var cut = Context.RenderComponent<Button>();
         await cut.InvokeAsync(() => cut.Instance.RemoveTooltip());
     }
+
+    [Fact]
+    public void IsAutoFocus_Ok()
+    {
+        var cut = Context.RenderComponent<Button>(pb =>
+        {
+            pb.Add(a => a.IsAutoFocus, true);
+        });
+    }
 }
-- 
Gitee