From 4b2852f0e11e22f80a59b4e5182be5e0e090b2db Mon Sep 17 00:00:00 2001
From: Dariusz Komosinski <darek.komosinski@gmail.com>
Date: Fri, 4 Jun 2021 14:08:30 +0200
Subject: [PATCH 1/2] Fix light dismiss overlay intercepting titlebar hit
 tests.

---
 src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
index d886b67241..8a340aac5e 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
@@ -117,7 +117,7 @@ namespace Avalonia.Win32
                             {
                                 var visual = window.Renderer.HitTestFirst(position, _owner as Window, x =>
                                 {
-                                    if (x is IInputElement ie && !ie.IsHitTestVisible)
+                                    if (x is IInputElement ie && (!ie.IsHitTestVisible || !ie.IsVisible))
                                     {
                                         return false;
                                     }

From 12c37270eeedb6fecf620f06a74e85b60514f3ac Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Sun, 6 Jun 2021 12:27:14 -0400
Subject: [PATCH 2/2] SelectedDate and SelectedTime => TwoWay by default Fixes
 #3407

---
 src/Avalonia.Controls/DateTimePickers/DatePicker.cs | 4 +++-
 src/Avalonia.Controls/DateTimePickers/TimePicker.cs | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
index 8d893154eb..43bc7d1df9 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
@@ -2,6 +2,7 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using Avalonia.Interactivity;
 using System;
 using System.Collections.Generic;
@@ -88,7 +89,8 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly DirectProperty<DatePicker, DateTimeOffset?> SelectedDateProperty =
             AvaloniaProperty.RegisterDirect<DatePicker, DateTimeOffset?>(nameof(SelectedDate), 
-                x => x.SelectedDate, (x, v) => x.SelectedDate = v);
+                x => x.SelectedDate, (x, v) => x.SelectedDate = v,
+                defaultBindingMode: BindingMode.TwoWay);
 
         // Template Items
         private Button _flyoutButton;
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
index d0cf772c01..6b3f66912f 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
@@ -2,6 +2,7 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using System;
 using System.Globalization;
 
@@ -44,7 +45,8 @@ namespace Avalonia.Controls
         /// </summary>
         public static readonly DirectProperty<TimePicker, TimeSpan?> SelectedTimeProperty =
             AvaloniaProperty.RegisterDirect<TimePicker, TimeSpan?>(nameof(SelectedTime),
-                x => x.SelectedTime, (x, v) => x.SelectedTime = v);
+                x => x.SelectedTime, (x, v) => x.SelectedTime = v,
+                defaultBindingMode: BindingMode.TwoWay);
 
         // Template Items
         private TimePickerPresenter _presenter;