- fix long press back navigation

Author: PureWeen

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs

@@ -109,7 +109,22 @@ public bool ShouldPopItem(UINavigationBar _, UINavigationItem __)
 		[Export("navigationBar:didPopItem:")]
 		[Internals.Preserve(Conditional = true)]
 		bool DidPopItem(UINavigationBar _, UINavigationItem __)
-			=> PopRequested || SendPop();
+		{
+			if (_shellSection.Stack.Count == NavigationBar.Items.Length)
+				return true;
+
+			var pages = _shellSection.Stack.ToList();
+
+			_shellSection.SyncStackDownTo(pages[NavigationBar.Items.Length - 1]);
+
+			for (int i = pages.Count - 1; i >= NavigationBar.Items.Length; i--)
+			{
+				var page = pages[i];
+				DisposePage(page);
+			}
+
+			return true;
+		}
 
 		internal bool SendPop()
 		{
@@ -394,7 +409,6 @@ protected virtual void OnNavigationRequested(object sender, NavigationRequestedE
 
 		protected virtual async void OnPopRequested(NavigationRequestedEventArgs e)
 		{
-			PopRequested = true;
 			var page = e.Page;
 			var animated = e.Animated;
 
@@ -435,7 +449,6 @@ async void ProcessPopToRoot()
 
 		protected virtual async void OnPopToRootRequested(NavigationRequestedEventArgs e)
 		{
-			PopRequested = true;
 			var animated = e.Animated;
 			var task = new TaskCompletionSource<bool>();
 			var pages = _shellSection.Stack.ToList();
@@ -597,7 +610,6 @@ public override UIViewController[] PopToViewController(UIViewController viewCont
 		public override void PushViewController(UIViewController viewController, bool animated)
 		{
 			_pendingViewControllers = null;
-			PopRequested = false;
 			if (IsInMoreTab && ParentViewController is UITabBarController tabBarController)
 			{
 				tabBarController.MoreNavigationController.PushViewController(viewController, animated);
@@ -610,7 +622,6 @@ public override void PushViewController(UIViewController viewController, bool an
 
 		public override UIViewController PopViewController(bool animated)
 		{
-			PopRequested = true;
 			_pendingViewControllers = null;
 			if (IsInMoreTab && ParentViewController is UITabBarController tabBarController)
 			{

src/Controls/src/Core/Shell/ShellSection.cs

@@ -111,6 +111,32 @@ void IShellSectionController.SendInsetChanged(Thickness inset, double tabThickne
 			_lastTabThickness = tabThickness;
 		}
 
+		internal void SyncStackDownTo(Page page)
+		{
+			if (_navStack.Count <= 1)
+				throw new Exception("Nav Stack consistency error");
+
+			var oldStack = _navStack;
+
+			int index = oldStack.IndexOf(page);
+			_navStack = new List<Page> { null };
+
+			for (int i = 1; i <= index; i++)
+			{
+				_navStack.Add(oldStack[i]);
+			}
+
+			for (int i = index + 1; i < oldStack.Count; i++)
+				oldStack[i].SendDisappearing();
+
+			UpdateDisplayedPage();
+
+			for (int i = index + 1; i < oldStack.Count; i++)
+				RemovePage(oldStack[i]);
+
+			(Parent?.Parent as IShellController)?.UpdateCurrentState(ShellNavigationSource.Pop);
+		}
+
 		async void IShellSectionController.SendPopping(Task poppingCompleted)
 		{
 			if (_navStack.Count <= 1)