Merge branch 'main' into refactor-otp

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.5.11-beta07</Version>
+    <Version>9.5.11-beta06</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Timer/Timer.razor.cs

@@ -43,8 +43,6 @@ public partial class Timer
 
     private CancellationTokenSource CancelTokenSource { get; set; } = new();
 
-    private AutoResetEvent ResetEvent { get; } = new(false);
-
     private bool Vibrate { get; set; }
 
     /// <summary>
@@ -185,29 +183,23 @@ private async Task OnStart(TimeSpan val)
             CancelTokenSource = new CancellationTokenSource();
         }
 
-        while (!CancelTokenSource.IsCancellationRequested && CurrentTimespan > TimeSpan.Zero)
+        while (CancelTokenSource is { IsCancellationRequested: false } && CurrentTimespan > TimeSpan.Zero)
         {
             try
             {
                 await Task.Delay(1000, CancelTokenSource.Token);
-            }
-            catch (TaskCanceledException) { }
-
-            if (!CancelTokenSource.IsCancellationRequested)
-            {
-                CurrentTimespan = CurrentTimespan.Subtract(TimeSpan.FromSeconds(1));
-                StateHasChanged();
-            }
-
-            if (IsPause)
-            {
-                ResetEvent.WaitOne();
-                AlertTime = DateTime.Now.Add(CurrentTimespan).ToString("HH:mm:ss");
 
-                // 重建 CancelToken
-                CancelTokenSource.Dispose();
-                CancelTokenSource = new CancellationTokenSource();
+                if (IsPause)
+                {
+                    AlertTime = DateTime.Now.Add(CurrentTimespan).ToString("HH:mm:ss");
+                }
+                else
+                {
+                    CurrentTimespan = CurrentTimespan.Subtract(TimeSpan.FromSeconds(1));
+                    StateHasChanged();
+                }
             }
+            catch (TaskCanceledException) { }
         }
 
         if (CurrentTimespan == TimeSpan.Zero)
@@ -229,14 +221,6 @@ private async Task OnStart(TimeSpan val)
     private void OnClickPause()
     {
         IsPause = !IsPause;
-        if (!IsPause)
-        {
-            ResetEvent.Set();
-        }
-        else
-        {
-            CancelTokenSource.Cancel();
-        }
     }
 
     private string GetPauseText() => IsPause ? ResumeText : PauseText;
@@ -262,7 +246,6 @@ protected override async ValueTask DisposeAsync(bool disposing)
             CancelTokenSource.Cancel();
             CancelTokenSource.Dispose();
 
-            ResetEvent.Dispose();
             if (Module != null)
             {
                 await Module.DisposeAsync();

test/UnitTest/Components/InputTest.cs

@@ -324,6 +324,22 @@ public void InputGroup_Width()
         cut.MarkupMatches("<div class=\"input-group\"><div class=\"input-group-text\" required=\"true\" style=\"--bb-input-group-label-width: 120px;\"><span>BootstrapInputGroup</span></div></div>");
     }
 
+    [Fact]
+    public void InputGroup_ChildContent()
+    {
+        var cut = Context.RenderComponent<BootstrapInputGroup>(builder =>
+        {
+            builder.Add(s => s.ChildContent, new RenderFragment(builder =>
+            {
+                builder.OpenComponent<BootstrapInputGroupLabel>(0);
+                builder.AddAttribute(1, nameof(BootstrapInputGroupLabel.ChildContent), new RenderFragment(builder => builder.AddContent(0, "child-content")));
+                builder.CloseComponent();
+            }));
+        });
+
+        cut.Contains("child-content");
+    }
+
     [Theory]
     [InlineData(Alignment.Center, "center")]
     [InlineData(Alignment.Right, "end")]

test/UnitTest/Components/TimerTest.cs

@@ -138,6 +138,7 @@ public async Task OnCancel_Ok()
         Assert.True(buttons[1].ClassList.Contains("btn-warning"));
         Assert.Equal("暂停", buttons[1].GetInnerText());
         await cut.InvokeAsync(() => buttons[1].Click());
+        await Task.Delay(1000);
 
         // resume
         buttons = cut.FindAll(".timer-buttons button");