[MacOS] Fixed the picker items do not appear when tapping on the picker after navigating through PushModalAsync

src/Controls/tests/TestCases.HostApp/Issues/Issue6101.cs

@@ -0,0 +1,65 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 6101, "Picker items do not appear when tapping on the picker while using PushModalAsync for navigation", PlatformAffected.macOS)]
+
+public class Issue6101Shell : Shell
+{
+	public Issue6101Shell()
+	{
+		FlyoutBehavior = FlyoutBehavior.Disabled;
+
+		ShellContent shellContent = new ShellContent
+		{
+			ContentTemplate = new DataTemplate(typeof(Issue6101)),
+			Route = "MainPage"
+		};
+
+		Items.Add(shellContent);
+	}
+
+	public class Issue6101 : ContentPage
+	{
+		public Issue6101()
+		{
+			Content = new StackLayout
+			{
+				Children =
+				{
+					new Button
+					{
+						Text = "Navigate to page that opens modal",
+						AutomationId = "Button",
+						Command = new Command(() => Navigation.PushModalAsync(new Issue6101Page1()))
+					}
+				}
+			};
+		}
+	}
+
+	public class Issue6101Page1 : ContentPage
+	{
+		public Issue6101Page1()
+		{
+			Content = new VerticalStackLayout()
+			{
+				Children =
+				{
+					new Picker
+					{
+						AutomationId = "Picker",
+						ItemsSource = new List<string> { "Item 1", "Item 2", "Item 3" } ,
+						SelectedIndex = 0,
+					}
+				}
+			};
+		}
+	}
+}
+
+
+
+
+
+
+
+

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue6101.cs

@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+    public class Issue6101 : _IssuesUITest
+    {
+        public override string Issue => "Picker items do not appear when tapping on the picker while using PushModalAsync for navigation";
+
+        public Issue6101(TestDevice device) : base(device)
+        {
+        }
+
+        [Test]
+        [Category(UITestCategories.Picker)]
+        public void ShouldAppearItemsWhenTappingOnPickerUsingPushModalAsync()
+        {
+            App.WaitForElement("Button");
+            App.Tap("Button");
+            App.WaitForElement("Picker");
+            App.Click("Picker");
+            VerifyScreenshot();
+        }
+    }
+}

src/Core/src/Handlers/Picker/PickerHandler.iOS.cs

@@ -86,11 +86,27 @@ void DisplayAlert(MauiPicker uITextField)
 			uITextField.EditingDidEnd += editingDidEndHandler;
 
 			var platformWindow = MauiContext?.GetPlatformWindow();
-			platformWindow?.BeginInvokeOnMainThread(() =>
+			if (platformWindow is null)
 			{
-				_ = platformWindow?.RootViewController?.PresentViewControllerAsync(pickerController, true);
+				return;
+			}
+
+			var currentViewController = GetCurrentViewController(platformWindow.RootViewController);
+			platformWindow.BeginInvokeOnMainThread(() =>
+			{
+				currentViewController?.PresentViewControllerAsync(pickerController, true);
 			});
 		}
+
+		static UIViewController? GetCurrentViewController(UIViewController? viewController)
+		{
+			while (viewController?.PresentedViewController != null)
+			{
+				viewController = viewController.PresentedViewController;
+			}
+
+			return viewController;
+		}
 #endif
 
 		internal bool UpdateImmediately { get; set; }