Merge pull request unoplatform#13634 from ramezgerges/focus_flyout_child

fix(flyout): focus flyout child on open

src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ContentDialog/UnoSamples_Tests.ContentDialog.cs

@@ -399,6 +399,7 @@ public void ContentDialog_Simple_NotLightDismissible()
 
 			// tapping outside of dialog
 			var dialogRect = _app.GetLogicalRect(dialogSpace);
+			var dialogRectangle = dialogRect.ToRectangle(); // we need this later after the dialog is closed
 			_app.TapCoordinates(dialogRect.CenterX, dialogRect.Bottom + 50);
 			var dialogStillOpenedScreenshot = CurrentTestTakeScreenShot("2 ContentDialog Still Opened");
 
@@ -407,11 +408,13 @@ public void ContentDialog_Simple_NotLightDismissible()
 			_app.Wait(seconds: 1);
 			var dialogClosedScreenshot = CurrentTestTakeScreenShot("3 ContentDialog Closed");
 
+			// Test only to the left of the TextBox, which can have a blinking cursor and might fail the screenshot tests
+			var testRect = new Rectangle(0, 0, (int)dialogRectangle.X + 10, dialogOpenedScreenshot.Height);
+
 			// compare
 			ImageAssert.AreNotEqual(initialScreenshot, dialogOpenedScreenshot);
-			ImageAssert.AreEqual(dialogOpenedScreenshot, dialogStillOpenedScreenshot);
+			ImageAssert.AreEqual(dialogOpenedScreenshot, dialogStillOpenedScreenshot, testRect);
 			ImageAssert.AreNotEqual(dialogStillOpenedScreenshot, dialogClosedScreenshot);
-
 		}
 
 		[Test]

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Flyout.cs

@@ -610,6 +610,7 @@ public async Task When_Flyout_Has_Focusable_Child()
 			stackPanel.Children.Add(button);
 			TestServices.WindowHelper.WindowContent = stackPanel;
 			await TestServices.WindowHelper.WaitForIdle();
+			await TestServices.WindowHelper.WaitForLoaded(button);
 
 			var flyout = new Flyout();
 			var flyoutButton = new Button() { Content = "Flyout content" };
@@ -621,9 +622,9 @@ public async Task When_Flyout_Has_Focusable_Child()
 
 			FlyoutBase.ShowAttachedFlyout(button);
 			await TestServices.WindowHelper.WaitForIdle();
+			await TestServices.WindowHelper.WaitForLoaded(flyoutButton);
 
-			var focused = FocusManager.GetFocusedElement(TestServices.WindowHelper.XamlRoot);
-			Assert.IsInstanceOfType(focused, typeof(Popup));
+			Assert.AreEqual(flyoutButton, FocusManager.GetFocusedElement(TestServices.WindowHelper.XamlRoot));
 
 			flyout.Hide();
 			await TestServices.WindowHelper.WaitForIdle();

src/Uno.UI/UI/Xaml/Controls/Popup/Popup.Base.cs

@@ -109,8 +109,6 @@ partial void OnIsOpenChangedPartial(bool oldIsOpen, bool newIsOpen)
 					Focus(FocusState.Programmatic);
 				}
 			}
-
-			Opened?.Invoke(this, newIsOpen);
 		}
 		else
 		{
@@ -131,8 +129,6 @@ partial void OnIsOpenChangedPartial(bool oldIsOpen, bool newIsOpen)
 			{
 				elementToFocus.Focus(FocusState.Programmatic);
 			}
-
-			Closed?.Invoke(this, newIsOpen);
 		}
 	}
 

src/Uno.UI/UI/Xaml/Controls/Popup/Popup.WithPopupRoot.cs

@@ -91,17 +91,30 @@ partial void OnIsOpenChangedPartialNative(bool oldIsOpen, bool newIsOpen)
 				}
 #endif
 
+				// It's important for PopupPanel to be visible before the popup is opened so that
+				// child controls can be IsFocusable, which depends on all ancestors (including PopupPanel)
+				// being visible
+				PopupPanel.Visibility = Visibility.Visible;
+
 				var currentXamlRoot = XamlRoot ?? Child?.XamlRoot ?? WinUICoreServices.Instance.ContentRootCoordinator.CoreWindowContentRoot.XamlRoot;
 				_closePopup.Disposable = currentXamlRoot?.OpenPopup(this);
 
-				PopupPanel.Visibility = Visibility.Visible;
 			}
 			else
 			{
 				_closePopup.Disposable = null;
 				PopupPanel.Visibility = Visibility.Collapsed;
 			}
 		}
+
+		if (newIsOpen)
+		{
+			Opened?.Invoke(this, newIsOpen);
+		}
+		else
+		{
+			Closed?.Invoke(this, newIsOpen);
+		}
 	}
 
 #if __ANDROID__