fix(flyout): open flyout on tap

(cherry picked from commit e81f61d)
unoplatform · Aug 9, 2023 · 78ba0bb · 78ba0bb
1 parent cb89661
commit 78ba0bb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/.../IntegrationTests/dxaml/controls/calendardatepicker/CalendarDatePickerIntegrationTests.cs b/.../IntegrationTests/dxaml/controls/calendardatepicker/CalendarDatePickerIntegrationTests.cs
@@ -3,8 +3,6 @@
 
 #pragma warning disable 168 // for cleanup imported member
 
-#if !WINDOWS_UWP
-
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.Foundation;
@@ -184,29 +182,18 @@ public async Task CanOpenFlyoutByTapping()
 			{
 				var cp = new CalendarDatePicker();
 
-				var rootPanel = XamlReader.Load(
-						"<Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml' " +
-						"      Width='400' Height='400' VerticalAlignment='Top' HorizontalAlignment='Left' Background='Navy'/>")
-					as Grid;
-
-				WindowHelper.WindowContent = rootPanel;
-
-				rootPanel!.Children.Append(cp);
+				WindowHelper.WindowContent = cp;
 
-				await WindowHelper.WaitForLoaded(cp);
 				await WindowHelper.WaitForIdle();
 
-				var root = GetTemplateChild(cp, "Root") as Grid;
 				var dateText = GetTemplateChild(cp, "DateText") as TextBlock;
-
-				Assert.IsNotNull(root);
-				Assert.IsNotNull(dateText);
-
+				var root = GetTemplateChild(cp, "Root") as Grid;
 				flyout = FlyoutBase.GetAttachedFlyout(root);
-				Assert.IsNotNull(flyout);
 
 				TestServices.InputHelper.Tap(dateText);
 				await WindowHelper.WaitForIdle();
+
+				Assert.IsTrue(flyout.IsOpen);
 			}
 			finally
 			{
@@ -319,7 +306,7 @@ await RunOnUIThread(() =>
 		}
 
 		[TestMethod]
-		[Ignore("https://github.com/unoplatform/uno/issues/10165")]
+		[RunsOnUIThread]
 		public async Task CanCloseFlyoutBySelectingADate()
 		{
 			TestCleanupWrapper cleanup;
@@ -331,7 +318,7 @@ public async Task CanCloseFlyoutBySelectingADate()
 			CalendarView calendarView = null;
 			CalendarDatePickerHelper helper = new CalendarDatePickerHelper();
 			await helper.PrepareLoadedEvent();
-			Windows.UI.Xaml.Controls.CalendarDatePicker cp = await helper.GetCalendarDatePicker();
+			CalendarDatePicker cp = await helper.GetCalendarDatePicker();
 
 			rootPanel = await CreateTestResources();
 
@@ -1000,4 +987,3 @@ await RunOnUIThread(() =>
 	}
 }
 
-#endif
diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/calendardatepicker_partial.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/calendardatepicker_partial.cs
@@ -78,6 +78,8 @@ public CalendarDatePicker()
 			m_shouldPerformActions = false;
 			m_isSelectedDatesChangingInternally = false;
 
+			Tapped += OnTap;
+
 			PrepareState();
 		}
 
@@ -696,6 +698,18 @@ protected override void OnKeyDown(KeyRoutedEventArgs pArgs)
 			return;
 		}
 
+		protected void OnTap(object sender, TappedRoutedEventArgs args)
+		{
+			if (!IsEnabled || args.Handled)
+			{
+				return;
+			}
+
+			IsCalendarOpen = true;
+			args.Handled = true;
+			UpdateVisualState();
+		}
+
 		protected override void OnPointerPressed(PointerRoutedEventArgs pArgs)
 		{
 			//CalendarDatePickerGenerated.OnPointerPressed(pArgs);