Prevent TimePicker to overwrite date (#1691)

* Prevent TimePicker to overwrite date.

* Fix tests.

* Mild cleanup of unit tests.

Co-authored-by: Kevin Petit <[email protected]>
Co-authored-by: Kevin Bost <[email protected]>

Author: 3 people

MaterialDesignThemes.Wpf.Tests/TimePickerUnitTests.cs

@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
@@ -19,6 +20,17 @@ public TimePickerUnitTests()
             _timePicker.ApplyDefaultStyle();
         }
 
+        [StaFact]
+        [Description("Issue 1691")]
+        public void DontOverwriteDate()
+        {
+            var expectedDate = new DateTime(2000, 1, 1, 20, 0, 0);
+
+            _timePicker.SelectedTime = expectedDate;
+
+            Assert.Equal(_timePicker.SelectedTime, expectedDate);
+        }
+
         [StaTheory]
         [MemberData(nameof(GetDisplaysExpectedTextData))]
         public void DisplaysExpectedText(CultureInfo culture, DatePickerFormat format, bool is24Hour, bool withSeconds,
@@ -30,9 +42,7 @@ public void DisplaysExpectedText(CultureInfo culture, DatePickerFormat format, b
             _timePicker.WithSeconds = withSeconds;
             _timePicker.SelectedTime = selectedTime;
 
-
-            string currentTestString = $"{culture.ThreeLetterISOLanguageName} {(is24Hour ? "24 Hour" : "12 Hour")} {format} format {(withSeconds ? "with seconds" : "")}";
-            Assert.True(expectedText == _timePicker.Text, $"Expected '{expectedText}' but was '{_timePicker.Text}' - {currentTestString}");
+            Assert.Equal(expectedText, _timePicker.Text);
         }
 
         [StaTheory]
@@ -49,8 +59,7 @@ public void CanParseLocalizedTimeString(CultureInfo culture, DatePickerFormat fo
             textBox.Text = timeString;
             textBox.RaiseEvent(new RoutedEventArgs(UIElement.LostFocusEvent));
 
-            string currentTestString = $"{culture.ThreeLetterISOLanguageName} {(is24Hour ? "24 Hour" : "12 Hour")} {format} format {(withSeconds ? "with seconds" : "")}";
-            Assert.True(expectedTime == _timePicker.SelectedTime, $"Expected '{expectedTime}' but was '{_timePicker.SelectedTime}' - {currentTestString}");
+            Assert.Equal(expectedTime, _timePicker.SelectedTime);
         }
 
         public static IEnumerable<object[]> GetParseLocalizedTimeStringData()
@@ -65,7 +74,7 @@ public static IEnumerable<object[]> GetParseLocalizedTimeStringData()
                 var timeString = (string) data[5];
 
                 //Convert the date to Today
-                date = DateTime.Today.AddHours(date.Hour).AddMinutes(date.Minute).AddSeconds(withSeconds ? date.Second : 0);
+                date = DateTime.MinValue.AddHours(date.Hour).AddMinutes(date.Minute).AddSeconds(withSeconds ? date.Second : 0);
 
                 if (!is24Hour && date.Hour > 12 &&
                     (string.IsNullOrEmpty(culture.DateTimeFormat.AMDesignator) ||

MaterialDesignThemes.Wpf/TimePicker.cs

@@ -299,7 +299,7 @@ private void TextBoxOnLostFocus(object sender, RoutedEventArgs routedEventArgs)
             }
 
             if (IsTimeValid(_textBox.Text, out DateTime time))
-                SetCurrentValue(SelectedTimeProperty, time);
+                SetCurrentValue(SelectedTimeProperty, SelectedTime?.Date.Add(time.TimeOfDay) ?? time);
 
             else // Invalid time, jump back to previous good time
                 SetInvalidTime();
@@ -378,7 +378,7 @@ private void SetSelectedTime(bool beCautious = false)
                 ParseTime(_textBox.Text, t =>
                 {
                     if (!beCautious || DateTimeToString(t) == _textBox.Text)
-                        SetCurrentValue(SelectedTimeProperty, t);
+                        SetCurrentValue(SelectedTimeProperty, SelectedTime?.Date.Add(t.TimeOfDay) ?? t);
                 });
             }
             else
@@ -399,7 +399,7 @@ private bool IsTimeValid(string s, out DateTime time)
 
             return DateTime.TryParse(s,
                                      culture,
-                                     DateTimeStyles.AssumeLocal | DateTimeStyles.AllowWhiteSpaces,
+                                     DateTimeStyles.AssumeLocal | DateTimeStyles.AllowWhiteSpaces | DateTimeStyles.NoCurrentDateDefault,
                                      out time);
         }