fix: close #1149

src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs

@@ -357,11 +357,6 @@ public class DateTimePicker : Control, IDataInput
         _popup.Closed += PopupClosed;
         _popup.Child = _calendarWithClock;
 
-        if (IsDropDownOpen)
-        {
-            _popup.IsOpen = true;
-        }
-
         _dropDownButton.Click += DropDownButton_Click;
         _dropDownButton.MouseLeave += DropDownButton_MouseLeave;
 

src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs

@@ -79,7 +79,6 @@ public class TimePicker : Control, IDataInput
 
     public TimePicker()
     {
-        Clock = new Clock();
         CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
         {
             SetCurrentValue(SelectedTimeProperty, null);
@@ -142,13 +141,12 @@ public class TimePicker : Control, IDataInput
             typeof(TimePicker),
             new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));
 
-    private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue) =>
-        d is TimePicker
-        {
-            IsEnabled: false
-        }
+    private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue)
+    {
+        return d is TimePicker { IsEnabled: false }
             ? false
             : baseValue;
+    }      
 
     private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
@@ -351,6 +349,7 @@ public class TimePicker : Control, IDataInput
         {
             oldClock.SelectedTimeChanged -= ctl.Clock_SelectedTimeChanged;
             oldClock.Confirmed -= ctl.Clock_Confirmed;
+            ctl.SetPopupChild(null);
         }
 
         if (e.NewValue is ClockBase newClock)
@@ -358,6 +357,7 @@ public class TimePicker : Control, IDataInput
             newClock.ShowConfirmButton = true;
             newClock.SelectedTimeChanged += ctl.Clock_SelectedTimeChanged;
             newClock.Confirmed += ctl.Clock_Confirmed;
+            ctl.SetPopupChild(newClock);
         }
     }
 
@@ -454,11 +454,6 @@ public class TimePicker : Control, IDataInput
         _popup.Closed += PopupClosed;
         _popup.Child = Clock;
 
-        if (IsDropDownOpen)
-        {
-            _popup.IsOpen = true;
-        }
-
         _dropDownButton.Click += DropDownButton_Click;
         _dropDownButton.MouseLeave += DropDownButton_MouseLeave;
 
@@ -496,6 +491,8 @@ public class TimePicker : Control, IDataInput
             }
         }
 
+        EnsureClock();
+
         if (selectedTime is null)
         {
             _originalSelectedTime ??= DateTime.Now;
@@ -517,12 +514,14 @@ public class TimePicker : Control, IDataInput
     {
         var handler = ClockClosed;
         handler?.Invoke(this, e);
+        Clock?.OnClockClosed();
     }
 
     protected virtual void OnClockOpened(RoutedEventArgs e)
     {
         var handler = ClockOpened;
         handler?.Invoke(this, e);
+        Clock?.OnClockOpened();
     }
 
     #endregion Protected Methods
@@ -792,5 +791,24 @@ public class TimePicker : Control, IDataInput
         }
     }
 
+    private void EnsureClock()
+    {
+        if (Clock is not null)
+        {
+            return;
+        }
+
+        SetCurrentValue(ClockProperty, new Clock());
+        SetPopupChild(Clock);
+    }
+
+    private void SetPopupChild(UIElement element)
+    {
+        if (_popup is not null)
+        {
+            _popup.Child = Clock;
+        }
+    }
+
     #endregion Private Methods
 }

src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs

@@ -102,4 +102,12 @@ public abstract class ClockBase : Control
     internal abstract void Update(DateTime time);
 
     protected void Clock_SelectedTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedTime = e.Info;
+
+    public virtual void OnClockClosed()
+    {        
+    }
+
+    public virtual void OnClockOpened()
+    {       
+    }
 }

src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs

@@ -29,6 +29,8 @@ public class ListClock : ClockBase
 
     #endregion Data
 
+    public override void OnClockOpened() => ScrollIntoView();
+
     public override void OnApplyTemplate()
     {
         AppliedTemplate = false;
@@ -94,6 +96,27 @@ public class ListClock : ClockBase
         }
     }
 
+    /// <summary>
+    ///     更新
+    /// </summary>
+    /// <param name="time"></param>
+    internal override void Update(DateTime time)
+    {
+        if (!AppliedTemplate) return;
+
+        var h = time.Hour;
+        var m = time.Minute;
+        var s = time.Second;
+
+        _hourList.SelectedIndex = h;
+        _minuteList.SelectedIndex = m;
+        _secondList.SelectedIndex = s;
+
+        ScrollIntoView();
+
+        DisplayTime = time;
+    }
+
     private void HourList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
 
     private void MinuteList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
@@ -124,26 +147,10 @@ public class ListClock : ClockBase
         }
     }
 
-    /// <summary>
-    ///     更新
-    /// </summary>
-    /// <param name="time"></param>
-    internal override void Update(DateTime time)
+    private void ScrollIntoView()
     {
-        if (!AppliedTemplate) return;
-
-        var h = time.Hour;
-        var m = time.Minute;
-        var s = time.Second;
-
-        _hourList.SelectedIndex = h;
-        _minuteList.SelectedIndex = m;
-        _secondList.SelectedIndex = s;
-
         _hourList.ScrollIntoView(_hourList.SelectedItem);
         _minuteList.ScrollIntoView(_minuteList.SelectedItem);
         _secondList.ScrollIntoView(_secondList.SelectedItem);
-
-        DisplayTime = time;
     }
 }