Watch Initial Values (#228)

Author: mckaragoz

CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/Watch/WatchTest.razor

@@ -0,0 +1,9 @@
+@namespace MudExtensions.UnitTests.TestComponents
+@using MudExtensions.Enums;
+
+<MudWatch Mode="WatchMode.StopWatch" @bind-Value="_value" Wheel="false" ShowHour="true" ShowMinute="true" ShowSecond="true" ShowMillisecond="false" Typo="Typo.h6" />
+
+@code
+{
+    TimeSpan _value = new TimeSpan(1, 0, 0);
+}

CodeBeam.MudBlazor.Extensions.UnitTests/Components/WatchTests.cs

@@ -0,0 +1,23 @@
+using Bunit;
+using MudExtensions.UnitTests.Components;
+using ComponentViewer.Docs.Pages.Components;
+using FluentAssertions;
+using MudBlazor;
+using MudExtensions;
+using MudExtensions.UnitTests.TestComponents;
+
+namespace MudExtensions.UnitTests.Components
+{
+    [TestFixture]
+    public class WatchTests : BunitTest
+    {
+        [Test]
+        public void WatchInitialValueTest()
+        {
+            var comp = Context.RenderComponent<WatchTest>();
+            var watch = comp.FindComponent<MudWatch>();
+            watch.Instance.Value.Should().Be(new TimeSpan(1, 0, 0));
+        }
+
+    }
+}

CodeBeam.MudBlazor.Extensions/Components/Watch/MudWatch.razor.cs

@@ -37,18 +37,20 @@ protected override void OnInitialized()
             {
                 Value = CountdownTime;
             }
-            else if (Mode == WatchMode.StopWatch)
-            {
-                Value = TimeSpan.FromSeconds(0);
-            }
 
             if (Mode == WatchMode.Watch)
             {
                 SetWatchMode(Mode).AndForgetExt();
                 Start();
             }
+            if (Mode == WatchMode.StopWatch)
+            {
+                _initialValue = Value;
+            }
         }
 
+        TimeSpan _initialValue = new();
+
         TimeSpan _value;
         [Parameter]
         public TimeSpan Value 
@@ -61,6 +63,7 @@ public TimeSpan Value
                     return;
                 }
                 _value = value;
+                InvokeAsync(() => ValueChanged.InvokeAsync(_value)).AndForgetExt();
                 SetInternalValues();
             }
         }
@@ -171,7 +174,7 @@ public WatchMode Mode
         /// </summary>
         [Parameter]
         [Category(CategoryTypes.FormComponent.Behavior)]
-        public EventCallback ValueChanged { get; set; }
+        public EventCallback<TimeSpan> ValueChanged { get; set; }
 
         /// <summary>
         /// Fires when countdown reach to 0.
@@ -250,7 +253,8 @@ public async void Elapse(object sender, System.Timers.ElapsedEventArgs args)
             else
             {
                 int oldSecondValue = ((int)Value.TotalSeconds);
-                Value = TimeSpan.FromMilliseconds(_stopwatch.ElapsedMilliseconds);
+                Value = _initialValue + TimeSpan.FromMilliseconds(_stopwatch.ElapsedMilliseconds);
+
             }
 #pragma warning disable CS4014
             if (Wheel)
@@ -284,10 +288,14 @@ public async Task Stop()
             if (Mode == WatchMode.CountDown)
             {
                 Value = CountdownTime - TimeSpan.FromMilliseconds(_stopwatch.ElapsedMilliseconds);
+                if (Value < TimeSpan.Zero)
+                {
+                    Value = TimeSpan.Zero;
+                }
             }
             else if (Mode == WatchMode.StopWatch)
             {
-                Value = TimeSpan.FromMilliseconds(_stopwatch.ElapsedMilliseconds);
+                Value = _initialValue + TimeSpan.FromMilliseconds(_stopwatch.ElapsedMilliseconds);
             }
 
             await InvokeAsync(StateHasChanged);
@@ -310,7 +318,7 @@ public async Task Reset()
             else
             {
                 _stopwatch.Reset();
-                Value = TimeSpan.Zero;
+                Value = _initialValue;
                 LapRecords.Clear();
                 await LapRecordsChanged.InvokeAsync();
             }

ComponentViewer.Docs/Pages/Examples/WatchExample1.razor

@@ -8,7 +8,6 @@
             <MudWatch @ref="_watch" Interval="TimeSpan.FromMilliseconds(1)" Mode="_watchMode" LapRecords="_lapRecords" LapRecordsChanged="@(() => Snackbar.Add("Lap updated."))"
                       Wheel="_wheel" ShowHour="_showHour" ShowMinute="_showMinute" ShowSecond="_showSecond" ShowMillisecond="_showMillisecond"
                       Delimiter="@_delimiter" Typo="_typo" TypoMillisecond="_typoMillisecond" Color="_color" CountdownCompleted="@(() => Snackbar.Add("Completed"))" />
-
             <MudStack Row="true">
                 <MudButton OnClick="@(() => _watch.Start())">Start</MudButton>
                 <MudButton OnClick="@(() => _watch.Stop())">Stop</MudButton>
@@ -70,10 +69,11 @@
     bool _showHour = true;
     bool _showMinute = true;
     bool _showSecond = true;
-    bool _showMillisecond = true;
+    bool _showMillisecond = false;
     string _delimiter = ":";
     Typo _typo = Typo.h6;
     Typo _typoMillisecond = Typo.h6;
     Color _color;
     List<LapRecord> _lapRecords = new();
+    TimeSpan _value = new TimeSpan(0, 0, 0);
 }