From df48fe6776e73c0289f3263d12d05b112c1ffae2 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Fri, 19 Apr 2024 09:35:26 -0500
Subject: [PATCH 1/4] Add UITest and use IsDescendant of ContainverVC

---
 .../Issues/Issue21630.xaml                    | 80 +++++++++++++++++++
 .../Issues/Issue21630.xaml.cs                 | 14 ++++
 .../tests/UITests/Tests/Issues/Issue21630.cs  | 37 +++++++++
 .../Platform/iOS/KeyboardAutoManagerScroll.cs |  3 +-
 4 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/Issue21630.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
new file mode 100644
index 000000000000..2b125f38818a
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
@@ -0,0 +1,80 @@
+<?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.Issue21630"
+             Title="Issue21630">
+
+    <NavigationPage.TitleView>
+        <HorizontalStackLayout Spacing="40">
+            <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="NavBarEntry"/>
+        </HorizontalStackLayout>
+    </NavigationPage.TitleView>
+
+    <CollectionView
+        SelectionMode="None"
+        BackgroundColor="white"
+        Margin="10.0">
+
+        <CollectionView.ItemsSource>
+            <x:Array Type="{x:Type x:String}">
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+            </x:Array>
+        </CollectionView.ItemsSource>
+
+        <CollectionView.ItemsLayout>
+            <LinearItemsLayout
+                Orientation="Vertical"
+                ItemSpacing="15"/>
+        </CollectionView.ItemsLayout>
+
+        <CollectionView.Header>
+            <VerticalStackLayout Spacing="20" Padding="10,20">
+                <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="HeaderEntry"/>
+            </VerticalStackLayout>
+        </CollectionView.Header>
+
+        <CollectionView.Footer>
+            <ContentView HeightRequest="100"></ContentView>
+        </CollectionView.Footer>
+
+        <CollectionView.ItemTemplate>
+            <DataTemplate x:DataType="x:String">
+                <Border
+                    StrokeThickness="0.6">
+                    <Label
+                        Text="{Binding}"
+                        FontSize="20"/>
+                </Border>
+            </DataTemplate>
+        </CollectionView.ItemTemplate>
+
+    </CollectionView>
+</ContentPage>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
new file mode 100644
index 000000000000..1866cb6335b8
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
@@ -0,0 +1,14 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 21630, "Entries in NavBar don't trigger keyboard scroll", PlatformAffected.iOS)]
+public partial class Issue21630 : ContentPage
+{
+	public Issue21630()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs
new file mode 100644
index 000000000000..c0a464ac12ee
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs
@@ -0,0 +1,37 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues;
+
+public class Issue21630 : _IssuesUITest
+{
+	public override string Issue => "Entries in NavBar don't trigger keyboard scroll";
+
+	public Issue21630(TestDevice device)
+		: base(device)
+	{ }
+
+    string NavBarEntry => "NavBarEntry";
+    string HeaderEntry => "HeaderEntry";
+
+    [Test]
+	public void NavBarEntryDoesNotTriggerKeyboardScroll()
+	{
+        var navBarEntry = App.WaitForElement(NavBarEntry);
+		var navBarLocation = navBarEntry.GetRect();
+		var headerEntry = App.WaitForElement(HeaderEntry);
+		var headerLocation = headerEntry.GetRect();
+
+        App.Click(NavBarEntry);
+
+        var newNavBarEntry = App.WaitForElement(NavBarEntry);
+		var newNavBarEntryLocation = newNavBarEntry.GetRect();
+        Assert.AreEqual(navBarLocation, newNavBarEntryLocation);
+
+        var newHeaderEntry = App.WaitForElement(HeaderEntry);
+		var newHeaderLocation = newHeaderEntry.GetRect();
+
+        Assert.AreEqual(headerLocation, newHeaderLocation);
+	}
+}
diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
index eb91ef75040f..f4dab2bcec15 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 ac0890eed1e99ac7f51ec52169afe53cc8121806 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Fri, 19 Apr 2024 13:49:03 -0500
Subject: [PATCH 2/4] Add button to focus entry in the navbar

---
 .../samples/Controls.Sample.UITests/Issues/Issue21630.xaml  | 3 ++-
 .../Controls.Sample.UITests/Issues/Issue21630.xaml.cs       | 6 ++++++
 src/Controls/tests/UITests/Tests/Issues/Issue21630.cs       | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
index 2b125f38818a..f86b392cd833 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
@@ -6,7 +6,7 @@
 
     <NavigationPage.TitleView>
         <HorizontalStackLayout Spacing="40">
-            <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="NavBarEntry"/>
+            <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="NavBarEntry" x:Name="NavBarEntry"/>
         </HorizontalStackLayout>
     </NavigationPage.TitleView>
 
@@ -58,6 +58,7 @@
         <CollectionView.Header>
             <VerticalStackLayout Spacing="20" Padding="10,20">
                 <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="HeaderEntry"/>
+                <Button Text="Focus NavBarEntry" Clicked="FocusNavBarEntry" AutomationId="FocusButton"/>
             </VerticalStackLayout>
         </CollectionView.Header>
 
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
index 1866cb6335b8..1ab4a27c7571 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
@@ -1,3 +1,4 @@
+using System;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Xaml;
 
@@ -11,4 +12,9 @@ public Issue21630()
 	{
 		InitializeComponent();
 	}
+
+	void FocusNavBarEntry (object sender, EventArgs e)
+	{
+		NavBarEntry.Focus();
+	}
 }
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs
index c0a464ac12ee..89419ea90467 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs
@@ -14,6 +14,7 @@ public Issue21630(TestDevice device)
 
     string NavBarEntry => "NavBarEntry";
     string HeaderEntry => "HeaderEntry";
+    string FocusButton => "FocusButton";
 
     [Test]
 	public void NavBarEntryDoesNotTriggerKeyboardScroll()
@@ -23,7 +24,7 @@ public void NavBarEntryDoesNotTriggerKeyboardScroll()
 		var headerEntry = App.WaitForElement(HeaderEntry);
 		var headerLocation = headerEntry.GetRect();
 
-        App.Click(NavBarEntry);
+        App.Click(FocusButton);
 
         var newNavBarEntry = App.WaitForElement(NavBarEntry);
 		var newNavBarEntryLocation = newNavBarEntry.GetRect();

From 23050897f5c3cbe8756f1d96b34ecc5b684deefe Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Tue, 23 Apr 2024 15:55:29 -0500
Subject: [PATCH 3/4] UITests working separately

---
 .../Issues/Issue21630.xaml                    | 77 +---------------
 .../Issues/Issue21630.xaml.cs                 | 16 +++-
 .../Issues/Issue21630_navPage.xaml            | 90 +++++++++++++++++++
 .../Issues/Issue21630_navPage.xaml.cs         | 46 ++++++++++
 .../Issues/Issue21630_shellPage.xaml          | 12 +++
 .../Issues/Issue21630_shellPage.xaml.cs       | 13 +++
 .../tests/UITests/Tests/Issues/Issue21630.cs  | 54 +++++++----
 .../Platform/iOS/KeyboardAutoManagerScroll.cs |  3 +-
 8 files changed, 217 insertions(+), 94 deletions(-)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
index f86b392cd833..72e84609c70d 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml
@@ -4,78 +4,9 @@
              x:Class="Maui.Controls.Sample.Issues.Issue21630"
              Title="Issue21630">
 
-    <NavigationPage.TitleView>
-        <HorizontalStackLayout Spacing="40">
-            <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="NavBarEntry" x:Name="NavBarEntry"/>
-        </HorizontalStackLayout>
-    </NavigationPage.TitleView>
+    <VerticalStackLayout>
+        <Button Text="Swap Main Page for NavigationPage" AutomationId="SwapNavigationPage" Clicked="SwapMainPageNav"/>
+        <Button Text="Swap Main Page for Shell Page" AutomationId="SwapShellPage" Clicked="SwapMainPageShell"/>
+    </VerticalStackLayout>
 
-    <CollectionView
-        SelectionMode="None"
-        BackgroundColor="white"
-        Margin="10.0">
-
-        <CollectionView.ItemsSource>
-            <x:Array Type="{x:Type x:String}">
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-                <x:String>asdf</x:String>
-            </x:Array>
-        </CollectionView.ItemsSource>
-
-        <CollectionView.ItemsLayout>
-            <LinearItemsLayout
-                Orientation="Vertical"
-                ItemSpacing="15"/>
-        </CollectionView.ItemsLayout>
-
-        <CollectionView.Header>
-            <VerticalStackLayout Spacing="20" Padding="10,20">
-                <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="HeaderEntry"/>
-                <Button Text="Focus NavBarEntry" Clicked="FocusNavBarEntry" AutomationId="FocusButton"/>
-            </VerticalStackLayout>
-        </CollectionView.Header>
-
-        <CollectionView.Footer>
-            <ContentView HeightRequest="100"></ContentView>
-        </CollectionView.Footer>
-
-        <CollectionView.ItemTemplate>
-            <DataTemplate x:DataType="x:String">
-                <Border
-                    StrokeThickness="0.6">
-                    <Label
-                        Text="{Binding}"
-                        FontSize="20"/>
-                </Border>
-            </DataTemplate>
-        </CollectionView.ItemTemplate>
-
-    </CollectionView>
 </ContentPage>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
index 1ab4a27c7571..6ab61a8406f1 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Xaml;
 
@@ -8,13 +10,23 @@ namespace Maui.Controls.Sample.Issues;
 [Issue(IssueTracker.Github, 21630, "Entries in NavBar don't trigger keyboard scroll", PlatformAffected.iOS)]
 public partial class Issue21630 : ContentPage
 {
+	Page _page;
+	List<Page> _modalStack;
+
 	public Issue21630()
 	{
 		InitializeComponent();
+		_page = Application.Current.MainPage;
+		_modalStack = Navigation.ModalStack.ToList();
+	}
+
+	void SwapMainPageNav (object sender, EventArgs e)
+	{
+		Application.Current.MainPage = new NavigationPage(new Issue21630_navPage(_page, _modalStack));
 	}
 
-	void FocusNavBarEntry (object sender, EventArgs e)
+	void SwapMainPageShell (object sender, EventArgs e)
 	{
-		NavBarEntry.Focus();
+		Application.Current.MainPage = new Issue21630_shellPage(_page);
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml
new file mode 100644
index 000000000000..d43d940470d4
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml
@@ -0,0 +1,90 @@
+<?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.Issue21630_navPage"
+             Title="Issue21630_navPage"
+             Shell.BackgroundColor="Green">
+
+    <NavigationPage.TitleView>
+        <HorizontalStackLayout Spacing="40">
+            <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="NavBarEntryNavigationPage" x:Name="NavBarEntryNav"/>
+        </HorizontalStackLayout>
+    </NavigationPage.TitleView>
+
+    <Shell.TitleView>
+        <HorizontalStackLayout Spacing="40">
+            <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="NavBarEntryShellPage" x:Name="NavBarEntryShell"/>
+        </HorizontalStackLayout>
+    </Shell.TitleView>
+
+    <CollectionView
+        SelectionMode="None"
+        BackgroundColor="white"
+        Margin="10.0">
+
+        <CollectionView.ItemsSource>
+            <x:Array Type="{x:Type x:String}">
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+                <x:String>asdf</x:String>
+            </x:Array>
+        </CollectionView.ItemsSource>
+
+        <CollectionView.ItemsLayout>
+            <LinearItemsLayout
+                Orientation="Vertical"
+                ItemSpacing="15"/>
+        </CollectionView.ItemsLayout>
+
+        <CollectionView.Header>
+            <VerticalStackLayout Spacing="20" Padding="10,20">
+                <Entry BackgroundColor="Yellow" Text="Input Entry" AutomationId="HeaderEntry"/>
+                <Button Text="Focus NavBarEntryNav" Clicked="FocusNavBarEntryNav" AutomationId="FocusButtonNavigationPage"/>
+                <Button Text="Focus NavBarEntryShell" Clicked="FocusNavBarEntryShell" AutomationId="FocusButtonShellPage"/>
+                <Button Text="Restore MainPage" Clicked="RestoreMainPage" AutomationId="RestoreMainPageButton"/>
+            </VerticalStackLayout>
+        </CollectionView.Header>
+
+        <CollectionView.Footer>
+            <ContentView HeightRequest="100"></ContentView>
+        </CollectionView.Footer>
+
+        <CollectionView.ItemTemplate>
+            <DataTemplate x:DataType="x:String">
+                <Border
+                    StrokeThickness="0.6">
+                    <Label
+                        Text="{Binding}"
+                        FontSize="20"/>
+                </Border>
+            </DataTemplate>
+        </CollectionView.ItemTemplate>
+
+    </CollectionView>
+</ContentPage>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs
new file mode 100644
index 000000000000..8f15f4b1ad9d
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues;
+
+public partial class Issue21630_navPage : ContentPage
+{
+	Page _page;
+	List<Page> _modalStack;
+
+	public Issue21630_navPage()
+	{
+		InitializeComponent();
+		_page = Shell.Current.BindingContext as Page;
+	}
+
+	public Issue21630_navPage(Page page, List<Page> modalStack)
+	{
+		InitializeComponent();
+		_page = page;
+		_modalStack = modalStack;
+	}
+
+	void FocusNavBarEntryNav (object sender, EventArgs e)
+	{
+		NavBarEntryNav.Focus();
+	}
+
+	void FocusNavBarEntryShell (object sender, EventArgs e)
+	{
+		NavBarEntryShell.Focus();
+	}
+
+	async void RestoreMainPage (object sender, EventArgs e)
+	{
+		Application.Current.MainPage = _page;
+		await Task.Yield();
+
+		foreach(var page in _modalStack)
+		{
+			await _page.Navigation.PushModalAsync(page);
+		}
+	}
+}
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml
new file mode 100644
index 000000000000..24b88105c362
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml
@@ -0,0 +1,12 @@
+<Shell
+    x:Class="Maui.Controls.Sample.Issues.Issue21630_shellPage"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:Maui.Controls.Sample.Issues"
+    Shell.FlyoutBehavior="Disabled">
+
+    <ShellContent
+        Title="Home"
+        ContentTemplate="{DataTemplate local:Issue21630_navPage}"
+        Route="Issue21630_navPage" />
+</Shell>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs
new file mode 100644
index 000000000000..6e612c724173
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs
@@ -0,0 +1,13 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues
+{
+	public partial class Issue21630_shellPage : Shell
+	{
+		public Issue21630_shellPage(Page page)
+		{
+			InitializeComponent();
+			BindingContext = page;
+		}
+	}
+}
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs
index 89419ea90467..eb7d23fdb132 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs
@@ -15,24 +15,44 @@ public Issue21630(TestDevice device)
     string NavBarEntry => "NavBarEntry";
     string HeaderEntry => "HeaderEntry";
     string FocusButton => "FocusButton";
+    string RestoreButton => "RestoreMainPageButton";
 
-    [Test]
-	public void NavBarEntryDoesNotTriggerKeyboardScroll()
+	[TestCase("SwapNavigationPage")]
+	[TestCase("SwapShellPage")]
+	public void NavBarEntryDoesNotTriggerKeyboardScroll(string scenario)
 	{
-        var navBarEntry = App.WaitForElement(NavBarEntry);
-		var navBarLocation = navBarEntry.GetRect();
-		var headerEntry = App.WaitForElement(HeaderEntry);
-		var headerLocation = headerEntry.GetRect();
-
-        App.Click(FocusButton);
-
-        var newNavBarEntry = App.WaitForElement(NavBarEntry);
-		var newNavBarEntryLocation = newNavBarEntry.GetRect();
-        Assert.AreEqual(navBarLocation, newNavBarEntryLocation);
-
-        var newHeaderEntry = App.WaitForElement(HeaderEntry);
-		var newHeaderLocation = newHeaderEntry.GetRect();
-
-        Assert.AreEqual(headerLocation, newHeaderLocation);
+		try
+		{
+			var scenarioSuffix = scenario == "SwapNavigationPage" ? "NavigationPage" : "ShellPage";
+
+			App.WaitForElement(scenario);
+			App.Click(scenario);
+
+			var navBarEntry = App.WaitForElement(NavBarEntry + scenarioSuffix);
+			var navBarLocation = navBarEntry.GetRect();
+			var headerEntry = App.WaitForElement(HeaderEntry);
+			var headerLocation = headerEntry.GetRect();
+
+			App.Click(FocusButton + scenarioSuffix);
+
+			var newNavBarEntry = App.WaitForElement(NavBarEntry + scenarioSuffix);
+			var newNavBarEntryLocation = newNavBarEntry.GetRect();
+			Assert.AreEqual(navBarLocation, newNavBarEntryLocation);
+
+			var newHeaderEntry = App.WaitForElement(HeaderEntry);
+			var newHeaderLocation = newHeaderEntry.GetRect();
+
+			Assert.AreEqual(headerLocation, newHeaderLocation);
+
+			App.WaitForElement(RestoreButton);
+			App.Click(RestoreButton);
+		}
+		catch
+		{
+			// Just in case these tests leave the app in an unreliable state
+			App.ResetApp();
+			FixtureSetup();
+			throw;
+		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
index f4dab2bcec15..eb91ef75040f 100644
--- a/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
+++ b/src/Core/src/Platform/iOS/KeyboardAutoManagerScroll.cs
@@ -299,8 +299,7 @@ internal static async Task AdjustPositionDebounce()
 	internal static void AdjustPosition()
 	{
 		if (ContainerView is null
-			|| (View is not UITextField && View is not UITextView)
-			|| !View.IsDescendantOfView(ContainerView))
+			|| (View is not UITextField && View is not UITextView))
 		{
 			IsKeyboardAutoScrollHandling = false;
 			return;

From d1c44acb5dca1b833f8417088ec48a9edc96e281 Mon Sep 17 00:00:00 2001
From: tj-devel709 <tj.devel709@gmail.com>
Date: Tue, 23 Apr 2024 17:17:32 -0500
Subject: [PATCH 4/4] Use the modal stack

---
 .../Controls.Sample.UITests/Issues/Issue21630.xaml.cs      | 7 ++++++-
 .../Issues/Issue21630_navPage.xaml.cs                      | 4 +++-
 .../Issues/Issue21630_shellPage.xaml.cs                    | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
index 6ab61a8406f1..b27ef44a8bff 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs
@@ -16,6 +16,11 @@ public partial class Issue21630 : ContentPage
 	public Issue21630()
 	{
 		InitializeComponent();
+		Loaded += OnLoaded;
+	}
+
+	private void OnLoaded(object sender, EventArgs e)
+	{
 		_page = Application.Current.MainPage;
 		_modalStack = Navigation.ModalStack.ToList();
 	}
@@ -27,6 +32,6 @@ void SwapMainPageNav (object sender, EventArgs e)
 
 	void SwapMainPageShell (object sender, EventArgs e)
 	{
-		Application.Current.MainPage = new Issue21630_shellPage(_page);
+		Application.Current.MainPage = new Issue21630_shellPage(_page, _modalStack);
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs
index 8f15f4b1ad9d..5b6302e7824f 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs
@@ -13,7 +13,9 @@ public partial class Issue21630_navPage : ContentPage
 	public Issue21630_navPage()
 	{
 		InitializeComponent();
-		_page = Shell.Current.BindingContext as Page;
+		var bc = (ValueTuple<Page, List<Page>>)Shell.Current.BindingContext;
+		_page = bc.Item1;
+		_modalStack = bc.Item2;
 	}
 
 	public Issue21630_navPage(Page page, List<Page> modalStack)
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs
index 6e612c724173..6fc33ae43263 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs
@@ -1,13 +1,14 @@
 using Microsoft.Maui.Controls;
+using System.Collections.Generic;
 
 namespace Maui.Controls.Sample.Issues
 {
 	public partial class Issue21630_shellPage : Shell
 	{
-		public Issue21630_shellPage(Page page)
+		public Issue21630_shellPage(Page page, List<Page> modalStack)
 		{
 			InitializeComponent();
-			BindingContext = page;
+			BindingContext = (page, modalStack);
 		}
 	}
 }