From 33222829a2f8c2cba867d72858acd77e7fb7a364 Mon Sep 17 00:00:00 2001
From: Axemasta <33064621+Axemasta@users.noreply.github.com>
Date: Wed, 10 Apr 2024 11:29:41 +0100
Subject: [PATCH 1/9] Fix null reference when window is null

When using certain controls ie bottom sheets and search bars there can be a crash when the keyboard displays. Check for null & return early if it is.
---
 src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
index eb91ef75040f..c4eca913b0cf 100644
--- a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
+++ b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * This class is adapted from IQKeyboardManager which is an open-source
  * library implemented for iOS to handle Keyboard interactions with
  * UITextFields/UITextViews. Link to their MIT License can be found here:
@@ -311,6 +311,11 @@ internal static void AdjustPosition()
 		var rootViewOrigin = new CGPoint(ContainerView.Frame.GetMinX(), ContainerView.Frame.GetMinY());
 		var window = ContainerView.Window;
 
+		if (window is null)
+		{
+			return;
+		}
+
 		var intersectRect = CGRect.Intersect(KeyboardFrame, window.Frame);
 		var kbSize = intersectRect == CGRect.Empty ? new CGSize(KeyboardFrame.Width, 0) : intersectRect.Size;
 

From 33518148702f4fb24e6ded06547f6c3ce220e024 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Thu, 18 Apr 2024 09:21:21 -0500
Subject: [PATCH 2/9] set flag to false if returning

---
 src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
index c4eca913b0cf..d2da64137f4d 100644
--- a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
+++ b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
@@ -313,6 +313,7 @@ internal static void AdjustPosition()
 
 		if (window is null)
 		{
+			IsKeyboardAutoScrollHandling = false;
 			return;
 		}
 
@@ -412,7 +413,10 @@ internal static void AdjustPosition()
 		}
 
 		else if (cursorRect.Y >= topBoundary && cursorRect.Y < bottomBoundary)
+		{
+			IsKeyboardAutoScrollHandling = false;
 			return;
+		}
 
 		else if (cursorRect.Y > bottomBoundary)
 			move = cursorRect.Y - (nfloat)bottomBoundary;

From f1acf9f7068cad325e9042343e5bc886ccd08760 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Thu, 18 Apr 2024 09:27:12 -0500
Subject: [PATCH 3/9] remove change on line 1

---
 src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
index d2da64137f4d..312d2c66f6c4 100644
--- a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
+++ b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * This class is adapted from IQKeyboardManager which is an open-source
  * library implemented for iOS to handle Keyboard interactions with
  * UITextFields/UITextViews. Link to their MIT License can be found here:

From dd681083b4a568b7101dc670346b093fb98f51f2 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Fri, 19 Apr 2024 10:28:24 -0500
Subject: [PATCH 4/9] Add IsDescendant of ContainerVC

---
 src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
index 312d2c66f6c4..d4d33507e614 100644
--- a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
+++ b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
@@ -299,7 +299,8 @@ internal static async Task AdjustPositionDebounce()
 	internal static void AdjustPosition()
 	{
 		if (ContainerView is null
-			|| (View is not UITextField && View is not UITextView))
+			|| (View is not UITextField && View is not UITextView)
+			|| !View.IsDescendantOfView(ContainerView))
 		{
 			IsKeyboardAutoScrollHandling = false;
 			return;

From d5066639a5e599a4aec73facc881400c7c4144e1 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Fri, 19 Apr 2024 14:04:20 -0500
Subject: [PATCH 5/9] remove the extra IsKeyboardAutoScrollHandling flag

---
 src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
index d4d33507e614..96606e9548ee 100644
--- a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
+++ b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
@@ -415,7 +415,6 @@ internal static void AdjustPosition()
 
 		else if (cursorRect.Y >= topBoundary && cursorRect.Y < bottomBoundary)
 		{
-			IsKeyboardAutoScrollHandling = false;
 			return;
 		}
 

From bc5b351ccb935b1bf9a55a6f98384bec66b3e6f0 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Fri, 19 Apr 2024 14:11:13 -0500
Subject: [PATCH 6/9] remove extra style changes

---
 src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
index 96606e9548ee..729bd2cf66c8 100644
--- a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
+++ b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
@@ -414,9 +414,7 @@ internal static void AdjustPosition()
 		}
 
 		else if (cursorRect.Y >= topBoundary && cursorRect.Y < bottomBoundary)
-		{
 			return;
-		}
 
 		else if (cursorRect.Y > bottomBoundary)
 			move = cursorRect.Y - (nfloat)bottomBoundary;

From 67e5f2cc7d7db5af068222962288810659cf7ede Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Thu, 25 Apr 2024 09:45:26 -0500
Subject: [PATCH 7/9] Add UITest

---
 .../Issues/Issue21726.xaml                    |  10 ++
 .../Issues/Issue21726.xaml.cs                 | 103 ++++++++++++++++++
 .../tests/UITests/Tests/Issues/Issue21726.cs  |  37 +++++++
 3 files changed, 150 insertions(+)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/Issue21726.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml
new file mode 100644
index 000000000000..5c2a7f96439c
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue21726"
+             Title="Issue21726">
+    <VerticalStackLayout>
+        <Button Text="AddVC" AutomationId="AddVC" Clicked="AddVC"/>
+        <Label Background="Green" HeightRequest="100" WidthRequest="100" Text="SUCCESS" x:Name="successLabel" AutomationId="SuccessLabel" IsVisible="false"/>
+    </VerticalStackLayout>
+</ContentPage>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs
new file mode 100644
index 000000000000..8a4ec9180947
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Linq;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+using System.Threading.Tasks;
+
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 21726, "Modal with a bottom sheet should not crash iOS Keyboard Scroll", PlatformAffected.iOS)]
+public partial class Issue21726 : ContentPage
+{
+	public static bool Success = false;
+	public Issue21726()
+	{
+		InitializeComponent();
+	}
+
+	protected override void OnAppearing()
+	{
+		base.OnAppearing();
+		if (Success)
+			successLabel.IsVisible = true;
+	}
+
+	protected override void OnDisappearing()
+	{
+		base.OnDisappearing();
+		Success = false;
+	}
+
+	void AddVC (object sender, EventArgs e)
+	{
+#if IOS
+		var window = UIKit.UIApplication.SharedApplication
+        .ConnectedScenes
+        .OfType<UIKit.UIWindowScene>()
+        .SelectMany(s => s.Windows)
+        .FirstOrDefault(w => w.IsKeyWindow);
+
+		var rootVC = window?.RootViewController;
+		while (rootVC?.PresentedViewController != null)
+		{
+			rootVC = rootVC.PresentedViewController;
+		}
+
+		if (rootVC is not null) {
+			var testVC = new TestViewController();
+
+			var testNC = new UIKit.UINavigationController(testVC);
+
+			testNC.ModalPresentationStyle = UIKit.UIModalPresentationStyle.FullScreen;
+
+			rootVC.PresentViewController(testNC, true, null);
+		}
+#endif
+	}
+
+#if IOS
+	public class TestViewController: UIKit.UIViewController {
+
+		UIKit.UITextField TextField1;
+		UIKit.UIButton Button1;
+
+		public override void ViewDidLoad() {
+			base.ViewDidLoad();
+
+			View.BackgroundColor = UIKit.UIColor.White;
+
+			TextField1 = new UIKit.UITextField(new CoreGraphics.CGRect(20, 120, 200, 20));
+			TextField1.Placeholder = "TextField1";
+			TextField1.BorderStyle = UIKit.UITextBorderStyle.RoundedRect;
+
+			Button1 = new UIKit.UIButton(new CoreGraphics.CGRect(20, 320, 200, 40));
+			Button1.SetTitle("Dismiss", UIKit.UIControlState.Normal);
+			Button1.BackgroundColor = UIKit.UIColor.SystemBlue;
+			Button1.TouchUpInside += (sender, e) => {
+				DismissViewController(true, null);
+			};
+
+			View.AddSubview(TextField1);
+			View.AddSubview(Button1);
+		}
+
+		public override async void ViewDidAppear(bool animated) {
+			try
+			{
+				base.ViewDidAppear(animated);
+				TextField1.BecomeFirstResponder();
+				await Task.Delay(1000);
+				TextField1.ResignFirstResponder();
+				await Task.Delay(1000);
+				Button1.SendActionForControlEvents(UIKit.UIControlEvent.TouchUpInside);
+				Issue21726.Success = true;
+			}
+			catch
+			{
+				Issue21726.Success = false;
+			}
+		}
+	}
+#endif
+}
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs
new file mode 100644
index 000000000000..033e0beef119
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs
@@ -0,0 +1,37 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues
+{
+    public class Issue21726 : _IssuesUITest
+    {
+        public Issue21726(TestDevice device) : base(device)
+        {
+        }
+
+        public override string Issue => "Modal with a bottom sheet should not crash iOS Keyboard Scroll";
+
+        [Test]
+        public void PushViewControllerWithNullWindow()
+        {
+            App.WaitForElement("AddVC");
+
+            App.Click("AddVC");
+
+            App.WaitForElement("AddVC");
+
+            try
+            {
+                var didSucceed = App.WaitForElement("SuccessLabel");
+            }
+            catch
+            {
+                // Just in case these tests leave the app in an unreliable state
+                App.ResetApp();
+                FixtureSetup();
+                throw;
+            }
+        }
+    }
+}

From ac7c48000049f44d1096c0c335f95a8ae3654fe3 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Thu, 25 Apr 2024 12:00:17 -0500
Subject: [PATCH 8/9] Use UIView AccessibilityIdentifier on UITest

---
 .../Issues/Issue21726.xaml                    |  1 -
 .../Issues/Issue21726.xaml.cs                 | 48 +++++--------------
 .../tests/UITests/Tests/Issues/Issue21726.cs  | 13 +++--
 3 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml
index 5c2a7f96439c..9fe10a491ca7 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml
@@ -5,6 +5,5 @@
              Title="Issue21726">
     <VerticalStackLayout>
         <Button Text="AddVC" AutomationId="AddVC" Clicked="AddVC"/>
-        <Label Background="Green" HeightRequest="100" WidthRequest="100" Text="SUCCESS" x:Name="successLabel" AutomationId="SuccessLabel" IsVisible="false"/>
     </VerticalStackLayout>
 </ContentPage>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs
index 8a4ec9180947..e58a84fd5f1c 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs
@@ -10,25 +10,11 @@ namespace Maui.Controls.Sample.Issues;
 [Issue(IssueTracker.Github, 21726, "Modal with a bottom sheet should not crash iOS Keyboard Scroll", PlatformAffected.iOS)]
 public partial class Issue21726 : ContentPage
 {
-	public static bool Success = false;
 	public Issue21726()
 	{
 		InitializeComponent();
 	}
 
-	protected override void OnAppearing()
-	{
-		base.OnAppearing();
-		if (Success)
-			successLabel.IsVisible = true;
-	}
-
-	protected override void OnDisappearing()
-	{
-		base.OnDisappearing();
-		Success = false;
-	}
-
 	void AddVC (object sender, EventArgs e)
 	{
 #if IOS
@@ -47,9 +33,10 @@ void AddVC (object sender, EventArgs e)
 		if (rootVC is not null) {
 			var testVC = new TestViewController();
 
-			var testNC = new UIKit.UINavigationController(testVC);
-
-			testNC.ModalPresentationStyle = UIKit.UIModalPresentationStyle.FullScreen;
+			var testNC = new UIKit.UINavigationController(testVC)
+			{
+				ModalPresentationStyle = UIKit.UIModalPresentationStyle.FullScreen
+			};
 
 			rootVC.PresentViewController(testNC, true, null);
 		}
@@ -67,13 +54,17 @@ public override void ViewDidLoad() {
 
 			View.BackgroundColor = UIKit.UIColor.White;
 
-			TextField1 = new UIKit.UITextField(new CoreGraphics.CGRect(20, 120, 200, 20));
-			TextField1.Placeholder = "TextField1";
-			TextField1.BorderStyle = UIKit.UITextBorderStyle.RoundedRect;
+			TextField1 = new UIKit.UITextField(new CoreGraphics.CGRect(20, 120, 200, 20))
+			{
+				Placeholder = "TextField1",
+				BorderStyle = UIKit.UITextBorderStyle.RoundedRect,
+				AccessibilityIdentifier = "TextField1"
+			};
 
 			Button1 = new UIKit.UIButton(new CoreGraphics.CGRect(20, 320, 200, 40));
 			Button1.SetTitle("Dismiss", UIKit.UIControlState.Normal);
 			Button1.BackgroundColor = UIKit.UIColor.SystemBlue;
+			Button1.AccessibilityIdentifier = "Button1";
 			Button1.TouchUpInside += (sender, e) => {
 				DismissViewController(true, null);
 			};
@@ -81,23 +72,6 @@ public override void ViewDidLoad() {
 			View.AddSubview(TextField1);
 			View.AddSubview(Button1);
 		}
-
-		public override async void ViewDidAppear(bool animated) {
-			try
-			{
-				base.ViewDidAppear(animated);
-				TextField1.BecomeFirstResponder();
-				await Task.Delay(1000);
-				TextField1.ResignFirstResponder();
-				await Task.Delay(1000);
-				Button1.SendActionForControlEvents(UIKit.UIControlEvent.TouchUpInside);
-				Issue21726.Success = true;
-			}
-			catch
-			{
-				Issue21726.Success = false;
-			}
-		}
 	}
 #endif
 }
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs
index 033e0beef119..4fc9d75ccef2 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs
@@ -15,15 +15,14 @@ public Issue21726(TestDevice device) : base(device)
         [Test]
         public void PushViewControllerWithNullWindow()
         {
-            App.WaitForElement("AddVC");
-
-            App.Click("AddVC");
-
-            App.WaitForElement("AddVC");
-
             try
             {
-                var didSucceed = App.WaitForElement("SuccessLabel");
+                App.WaitForElement("AddVC");
+                App.Click("AddVC");
+                App.WaitForElement("TextField1").Click();
+                App.WaitForElement("Button1").Click();
+                var mainPageElement = App.WaitForElement("AddVC");
+                Assert.NotNull(mainPageElement);
             }
             catch
             {

From c35356218dceb332b8bc7a1fed0be33b57f6640b Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Fri, 26 Apr 2024 09:13:06 -0500
Subject: [PATCH 9/9] Add ignore in platform and remove catch in favor of
 rebasing main

---
 .../tests/UITests/Tests/Issues/Issue21726.cs  | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs
index 4fc9d75ccef2..86faa1e1ac83 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs
@@ -15,22 +15,14 @@ public Issue21726(TestDevice device) : base(device)
         [Test]
         public void PushViewControllerWithNullWindow()
         {
-            try
-            {
-                App.WaitForElement("AddVC");
-                App.Click("AddVC");
-                App.WaitForElement("TextField1").Click();
-                App.WaitForElement("Button1").Click();
-                var mainPageElement = App.WaitForElement("AddVC");
-                Assert.NotNull(mainPageElement);
-            }
-            catch
-            {
-                // Just in case these tests leave the app in an unreliable state
-                App.ResetApp();
-                FixtureSetup();
-                throw;
-            }
+            this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+            App.WaitForElement("AddVC");
+            App.Click("AddVC");
+            App.WaitForElement("TextField1").Click();
+            App.WaitForElement("Button1").Click();
+            var mainPageElement = App.WaitForElement("AddVC");
+            Assert.NotNull(mainPageElement);
         }
     }
 }