[DatePicker] Change OnSelectedDateAsync logic (#2233)

* Fixes #2197 * Minify code * Remove ?? * Add UNIT-Test --------- Co-authored-by: Denis Voituron <dvoituron@outlook.com> Co-authored-by: Vincent Baaij <vnbaaij@outlook.com>
microsoft · Jun 20, 2024 · 804ebc0 · 804ebc0
1 parent b8e1aa5
commit 804ebc0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/Core/Components/DateTime/FluentDatePicker.razor.cs b/src/Core/Components/DateTime/FluentDatePicker.razor.cs
@@ -66,10 +66,15 @@ protected async Task OnSelectedDateAsync(DateTime? value)
     {
         Opened = false;
 
-        var updatedValue = Value?.TimeOfDay != TimeSpan.Zero
-            ? (value ?? DateTime.MinValue).Date + Value?.TimeOfDay
-            : value;
+        DateTime? updatedValue = value;
 
+        if (Value is not null && value is not null)
+        {
+            updatedValue = Value?.TimeOfDay != TimeSpan.Zero
+            ? value?.Date + Value?.TimeOfDay
+            : value;
+        }
+
         await OnSelectedDateHandlerAsync(updatedValue);
     }
 

diff --git a/tests/Core/DateTime/FluentDatePickerTests.cs b/tests/Core/DateTime/FluentDatePickerTests.cs
@@ -202,4 +202,27 @@ public void FluentCalendar_DisabledDate()
         // Assert
         calendar.Verify();
     }
+
+    [Fact]
+    public void FluentDatePicker_ChangeValueWhenDefaultIsNull()
+    {
+        // Arrange
+        using var ctx = new TestContext();
+        ctx.JSInterop.Mode = JSRuntimeMode.Loose;
+        ctx.Services.AddSingleton(LibraryConfiguration);
+
+        // Act
+        var picker = ctx.RenderComponent<FluentDatePicker>(parameters =>
+        {
+            parameters.Add(p => p.Value, null);
+        });
+
+        var textField = picker.Find("fluent-text-field");
+
+        // Set a new date value
+        textField.Change("2022-03-12");
+
+        // Assert
+        Assert.Equal(System.DateTime.Parse("2022-03-12"), picker.Instance.Value);
+    }
 }