From b1155de93a5eb2129b0d049affbbf9f8e5e1dd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 12 Mar 2025 23:51:54 +0100
Subject: [PATCH 01/39] Added repro sample

---
 .../Issues/Issue21814FirstPage.xaml           | 32 +++++++++++
 .../Issues/Issue21814FirstPage.xaml.cs        | 53 +++++++++++++++++++
 .../Issues/Issue21814SecondPage.xaml          | 32 +++++++++++
 .../Issues/Issue21814SecondPage.xaml.cs       | 44 +++++++++++++++
 4 files changed, 161 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml
new file mode 100644
index 000000000000..b0bdd2ac7ca5
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<controls:TestContentPage xmlns:controls="clr-namespace:Maui.Controls.Sample.Issues"
+                          xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                          x:Class="Maui.Controls.Sample.Issues.Issue21814FirstPage">
+  <VerticalStackLayout
+    Padding="12">
+    <Button
+      x:Name="NavigateButton"
+      AutomationId="NavigateButton"
+      Text="Navigate to Second Page"
+      Clicked="OnNavigateButtonClicked"/>
+    <Label 
+      Text="NavigatedToEventArgs"
+      FontAttributes="Bold"/>
+    <Label 
+      x:Name="OnNavigatedToLabel"
+      AutomationId="OnNavigatedToLabel"/>
+    <Label 
+      Text="NavigatingFromEventArgs"
+      FontAttributes="Bold"/>
+    <Label 
+      x:Name="OnNavigatingFromLabel"
+      AutomationId="OnNavigatingFromLabel"/>
+    <Label 
+      Text="NavigatedFromEventArgs"
+      FontAttributes="Bold"/>
+    <Label 
+      x:Name="OnNavigatedFromLabel"
+      AutomationId="OnNavigatedFromLabel"/>
+  </VerticalStackLayout>
+</controls:TestContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml.cs
new file mode 100644
index 000000000000..e5da49383e85
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml.cs
@@ -0,0 +1,53 @@
+namespace Maui.Controls.Sample.Issues
+{
+	[Issue(IssueTracker.Github, 21814, "Add better parameters for navigation args", PlatformAffected.All)]
+	public class Issue21814 : NavigationPage
+	{
+		public Issue21814()
+		{
+			Navigation.PushAsync(new Issue21814FirstPage());
+		}
+	}
+
+	public partial class Issue21814FirstPage : TestContentPage
+	{
+		public Issue21814FirstPage()
+		{
+			InitializeComponent();
+		}
+
+		protected override void Init()
+		{
+
+		}
+
+		protected override void OnNavigatedTo(NavigatedToEventArgs args)
+		{
+			base.OnNavigatedTo(args);
+
+			var previousPage = args.PreviousPage?.GetType().Name ?? "Null";
+			OnNavigatedToLabel.Text = $"PreviousPage: {previousPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+		{
+			base.OnNavigatingFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			OnNavigatingFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+		{
+			base.OnNavigatedFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			OnNavigatedFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+
+		void OnNavigateButtonClicked(object sender, EventArgs e)
+		{
+			Navigation.PushAsync(new Issue21814SecondPage());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml
new file mode 100644
index 000000000000..df9af6d155bc
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<controls:TestContentPage xmlns:controls="clr-namespace:Maui.Controls.Sample.Issues"
+                          xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                          xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                          x:Class="Maui.Controls.Sample.Issues.Issue21814SecondPage">
+  <VerticalStackLayout
+  Padding="12">
+    <Button
+    x:Name="NavigateBackButton"
+    AutomationId="NavigateBackButton"
+    Text="Navigate Back"
+    Clicked="OnNavigateBackButtonClicked"/>
+    <Label 
+      Text="NavigatedToEventArgs"
+      FontAttributes="Bold"/>
+    <Label 
+      x:Name="OnNavigatedToLabel"
+      AutomationId="OnNavigatedToLabel"/>
+    <Label 
+      Text="NavigatingFromEventArgs"
+      FontAttributes="Bold"/>
+    <Label 
+      x:Name="OnNavigatingFromLabel"
+      AutomationId="OnNavigatingFromLabel"/>
+    <Label 
+      Text="NavigatedFromEventArgs"
+      FontAttributes="Bold"/>
+    <Label 
+      x:Name="OnNavigatedFromLabel"
+      AutomationId="OnNavigatedFromLabel"/>
+  </VerticalStackLayout>
+</controls:TestContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml.cs
new file mode 100644
index 000000000000..e52f543a5c5f
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml.cs
@@ -0,0 +1,44 @@
+namespace Maui.Controls.Sample.Issues
+{
+	public partial class Issue21814SecondPage : TestContentPage
+	{
+		public Issue21814SecondPage()
+		{
+			InitializeComponent();
+		}
+
+		protected override void Init()
+		{
+
+		}
+
+		protected override void OnNavigatedTo(NavigatedToEventArgs args)
+		{
+			base.OnNavigatedTo(args);
+
+			var previousPage = args.PreviousPage?.GetType().Name ?? "Null";
+			OnNavigatedToLabel.Text = $"PreviousPage: {previousPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+		{
+			base.OnNavigatingFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			OnNavigatingFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+		{
+			base.OnNavigatedFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			OnNavigatedFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+
+		void OnNavigateBackButtonClicked(object sender, EventArgs e)
+		{
+			Navigation.PopAsync();
+		}
+	}
+}
\ No newline at end of file

From 3aa95d5e2dd446b440bff72649770aaf221f00c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 12 Mar 2025 23:52:08 +0100
Subject: [PATCH 02/39] Added UITests

---
 .../Tests/Issues/Issue21814.cs                | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
new file mode 100644
index 000000000000..db8ab984dc98
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
@@ -0,0 +1,55 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue21814 : _IssuesUITest
+	{
+		public override string Issue => "Add better parameters for navigation args";
+
+		public Issue21814(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public void VerifyNavigationEventArgs()
+		{
+			App.WaitForElement("NavigateButton");
+
+			var navigatedToBeforeNavigate = App.FindElement("OnNavigatedToLabel").GetText();
+			Assert.That(navigatedToBeforeNavigate, Is.EqualTo("PreviousPage: Null, NavigationType: Initialize"));
+			
+			var navigatingFromBeforeNavigate = App.FindElement("OnNavigatingFromLabel").GetText();
+			Assert.That(navigatingFromBeforeNavigate, Is.EqualTo(string.Empty));
+
+			var navigatedFromBeforeNavigate = App.FindElement("OnNavigatedFromLabel").GetText();
+			Assert.That(navigatedFromBeforeNavigate, Is.EqualTo(string.Empty));
+
+			App.Tap("NavigateButton");
+
+			var navigatedToPage2 = App.FindElement("OnNavigatedToLabel").GetText();
+			Assert.That(navigatedToPage2, Is.EqualTo("PreviousPage: Issue21814FirstPage, NavigationType: Push"));
+
+			var navigatingFromPage2 = App.FindElement("OnNavigatingFromLabel").GetText();
+			Assert.That(navigatingFromPage2, Is.EqualTo(string.Empty));
+
+			var navigatedFromPage2 = App.FindElement("OnNavigatedFromLabel").GetText();
+			Assert.That(navigatedFromPage2, Is.EqualTo(string.Empty));
+
+			App.Tap("NavigateBackButton");
+
+			var navigatedToAfterNavigate = App.FindElement("OnNavigatedToLabel").GetText();
+			Assert.That(navigatedToAfterNavigate, Is.EqualTo("PreviousPage: Issue21814SecondPage, NavigationType: Pop"));
+
+			var navigatingFromAfterNavigate = App.FindElement("OnNavigatingFromLabel").GetText();
+			Assert.That(navigatingFromAfterNavigate, Is.EqualTo("DestinationPage: Issue21814SecondPage, NavigationType: Push"));
+
+			var navigatedFromAfterNavigate = App.FindElement("OnNavigatedFromLabel").GetText();
+			Assert.That(navigatedFromAfterNavigate, Is.EqualTo("DestinationPage: Issue21814SecondPage, NavigationType: Push"));
+
+		}
+	}
+}
\ No newline at end of file

From c54d71252338e96a361668480f8e9eb4abbc188f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 12 Mar 2025 23:52:20 +0100
Subject: [PATCH 03/39] Changes in navigation events parameters

---
 .../src/Core/FlyoutPage/FlyoutPage.cs         |  8 ++---
 src/Controls/src/Core/MultiPage.cs            |  4 +--
 src/Controls/src/Core/NavigationModel.cs      |  4 +--
 .../NavigationPage/NavigationPage.Legacy.cs   |  6 ++--
 .../src/Core/NavigationPage/NavigationPage.cs | 12 +++----
 .../src/Core/Page/NavigatedFromEventArgs.cs   |  6 ++--
 .../src/Core/Page/NavigatedToEventArgs.cs     |  6 ++--
 .../src/Core/Page/NavigatingFromEventArgs.cs  |  8 +++++
 .../ModalNavigationManager.cs                 |  8 ++---
 .../net-android/PublicAPI.Shipped.txt         |  1 -
 .../PublicAPI/net-ios/PublicAPI.Shipped.txt   |  1 -
 .../net-maccatalyst/PublicAPI.Shipped.txt     |  1 -
 .../net-windows/PublicAPI.Shipped.txt         |  1 -
 .../Core/PublicAPI/net/PublicAPI.Shipped.txt  |  1 -
 .../netstandard/PublicAPI.Shipped.txt         |  1 -
 src/Controls/src/Core/Shell/Shell.cs          | 31 +++++++++++++++++--
 16 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index 3896672fd087..ade043dba02b 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -54,7 +54,7 @@ public Page Detail
 
 				var previousDetail = _detail;
 				// TODO MAUI refine this to fire earlier
-				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs());
+				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs(previousDetail, NavigationType.PageSwap));
 
 				OnPropertyChanging();
 				if (_detail != null)
@@ -70,7 +70,7 @@ public Page Detail
 				}
 
 				previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(_detail, NavigationType.PageSwap));
-				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousDetail));
+				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousDetail, NavigationType.PageSwap));
 			}
 		}
 
@@ -109,7 +109,7 @@ public Page Flyout
 				// TODO MAUI refine this to fire earlier
 				var previousFlyout = _flyout;
 				// TODO MAUI refine this to fire earlier
-				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs());
+				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs(_flyout, NavigationType.PageSwap));
 
 				OnPropertyChanging();
 				if (_flyout != null)
@@ -125,7 +125,7 @@ public Page Flyout
 				}
 
 				previousFlyout?.SendNavigatedFrom(new NavigatedFromEventArgs(_flyout, NavigationType.PageSwap));
-				_flyout?.SendNavigatedTo(new NavigatedToEventArgs(previousFlyout));
+				_flyout?.SendNavigatedTo(new NavigatedToEventArgs(previousFlyout, NavigationType.PageSwap));
 			}
 		}
 
diff --git a/src/Controls/src/Core/MultiPage.cs b/src/Controls/src/Core/MultiPage.cs
index 57e9fec8c72f..f188e45f4925 100644
--- a/src/Controls/src/Core/MultiPage.cs
+++ b/src/Controls/src/Core/MultiPage.cs
@@ -85,7 +85,7 @@ public T CurrentPage
 				OnPropertyChanging();
 
 				// TODO: MAUI refine this to fire earlier
-				_current?.SendNavigatingFrom(new NavigatingFromEventArgs());
+				_current?.SendNavigatingFrom(new NavigatingFromEventArgs(_current, NavigationType.PageSwap));
 
 				_current = value;
 
@@ -98,7 +98,7 @@ public T CurrentPage
 					_current?.SendAppearing();
 
 				previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(_current, NavigationType.PageSwap));
-				_current?.SendNavigatedTo(new NavigatedToEventArgs(previousPage));
+				_current?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.PageSwap));
 			}
 		}
 
diff --git a/src/Controls/src/Core/NavigationModel.cs b/src/Controls/src/Core/NavigationModel.cs
index 6117db6dbc54..69c7cb55a171 100644
--- a/src/Controls/src/Core/NavigationModel.cs
+++ b/src/Controls/src/Core/NavigationModel.cs
@@ -113,7 +113,7 @@ public Page PopModal()
 				_navTree[0].Count > 0 &&
 				_navTree[0][0] is not Shell)
 			{
-				previousPage.SendNavigatingFrom(new NavigatingFromEventArgs());
+				previousPage.SendNavigatingFrom(new NavigatingFromEventArgs(CurrentPage, NavigationType.Pop));
 				previousPage.SendDisappearing();
 				CurrentPage.SendAppearing();
 			}
@@ -201,7 +201,7 @@ public void PushModal(Page page)
 				_navTree[0].Count > 0 &&
 				_navTree[0][0] is not Shell)
 			{
-				previousPage.SendNavigatingFrom(new NavigatingFromEventArgs());
+				previousPage.SendNavigatingFrom(new NavigatingFromEventArgs(page, NavigationType.Push));
 				previousPage.SendDisappearing();
 				page.SendAppearing();
 			}
diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
index 2262c4ed7eab..a61c22224fcd 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
@@ -25,7 +25,7 @@ async Task<Page> PopAsyncInner(
 
 			var page = (Page)InternalChildren.Last();
 			var previousPage = CurrentPage;
-			SendNavigating();
+			SendNavigating(NavigationType.Pop, previousPage);
 			var removedPage = await RemoveAsyncInner(page, animated, fast);
 			SendNavigated(previousPage, NavigationType.Pop);
 			return removedPage;
@@ -150,7 +150,7 @@ async Task PopToRootAsyncInner(bool animated)
 				return;
 
 			var previousPage = CurrentPage;
-			SendNavigating();
+			SendNavigating(NavigationType.PopToRoot, previousPage);
 			FireDisappearing(CurrentPage);
 			FireAppearing((Page)InternalChildren[0]);
 
@@ -183,7 +183,7 @@ async Task PushAsyncInner(Page page, bool animated)
 				return;
 
 			var previousPage = CurrentPage;
-			SendNavigating();
+			SendNavigating(NavigationType.Push, previousPage);
 			FireDisappearing(CurrentPage);
 			FireAppearing(page);
 
diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index 64c2b264d3a9..3bb6f6c9c1ef 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -377,12 +377,12 @@ protected override bool OnBackButtonPressed()
 		void SendNavigated(Page previousPage, NavigationType navigationType)
 		{
 			previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(CurrentPage, navigationType));
-			CurrentPage.SendNavigatedTo(new NavigatedToEventArgs(previousPage));
+			CurrentPage.SendNavigatedTo(new NavigatedToEventArgs(previousPage, navigationType));
 		}
 
-		void SendNavigating(Page navigatingFrom = null)
+		void SendNavigating(NavigationType navigationType, Page navigatingFrom = null)
 		{
-			(navigatingFrom ?? CurrentPage)?.SendNavigatingFrom(new NavigatingFromEventArgs());
+			(navigatingFrom ?? CurrentPage)?.SendNavigatingFrom(new NavigatingFromEventArgs(CurrentPage, navigationType));
 		}
 
 
@@ -792,7 +792,7 @@ await Owner.SendHandlerUpdateAsync(animated,
 					},
 					() =>
 					{
-						Owner.SendNavigating(currentPage);
+						Owner.SendNavigating(NavigationType.Pop, currentPage);
 						Owner.FireDisappearing(currentPage);
 						Owner.FireAppearing(newCurrentPage);
 					},
@@ -829,7 +829,7 @@ protected override Task OnPopToRootAsync(bool animated)
 					},
 					() =>
 					{
-						Owner.SendNavigating(previousPage);
+						Owner.SendNavigating(NavigationType.PopToRoot, previousPage);
 						Owner.FireDisappearing(previousPage);
 						Owner.FireAppearing(newPage);
 					},
@@ -854,7 +854,7 @@ protected override Task OnPushAsync(Page root, bool animated)
 					},
 					() =>
 					{
-						Owner.SendNavigating(previousPage);
+						Owner.SendNavigating(NavigationType.Push, previousPage);
 						Owner.FireDisappearing(previousPage);
 						Owner.FireAppearing(root);
 					},
diff --git a/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs b/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
index 887047b1c986..23d9e9e81080 100644
--- a/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
+++ b/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	internal enum NavigationType
+	public enum NavigationType
 	{
 		Push,
 		Pop,
@@ -17,9 +17,9 @@ internal enum NavigationType
 
 	public sealed class NavigatedFromEventArgs : EventArgs
 	{
-		internal NavigationType NavigationType { get; }
+		public NavigationType NavigationType { get; }
 
-		internal Page DestinationPage { get; }
+		public Page DestinationPage { get; }
 
 		internal NavigatedFromEventArgs(Page destinationPage, NavigationType navigationType)
 		{
diff --git a/src/Controls/src/Core/Page/NavigatedToEventArgs.cs b/src/Controls/src/Core/Page/NavigatedToEventArgs.cs
index ec336aa1e60f..aedaf0f3fc27 100644
--- a/src/Controls/src/Core/Page/NavigatedToEventArgs.cs
+++ b/src/Controls/src/Core/Page/NavigatedToEventArgs.cs
@@ -5,11 +5,13 @@ namespace Microsoft.Maui.Controls
 {
 	public sealed class NavigatedToEventArgs : EventArgs
 	{
-		internal NavigatedToEventArgs(Page previousPage)
+		internal NavigatedToEventArgs(Page previousPage, NavigationType navigationType)
 		{
 			PreviousPage = previousPage;
+			NavigationType = navigationType;
 		}
 
-		internal Page PreviousPage { get; }
+		public Page PreviousPage { get; }
+		public NavigationType NavigationType { get; }
 	}
 }
diff --git a/src/Controls/src/Core/Page/NavigatingFromEventArgs.cs b/src/Controls/src/Core/Page/NavigatingFromEventArgs.cs
index bd568dd419a9..5bc283f655df 100644
--- a/src/Controls/src/Core/Page/NavigatingFromEventArgs.cs
+++ b/src/Controls/src/Core/Page/NavigatingFromEventArgs.cs
@@ -5,6 +5,14 @@ namespace Microsoft.Maui.Controls
 {
 	public sealed class NavigatingFromEventArgs : EventArgs
 	{
+		internal NavigatingFromEventArgs(Page destinationPage, NavigationType navigationType)
+		{
+			DestinationPage = destinationPage;
+			NavigationType = navigationType;
+		}
 
+		public NavigationType NavigationType { get; }
+
+		public Page DestinationPage { get; }
 	}
 }
diff --git a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
index 16a4489cec0b..6d7e171801f9 100644
--- a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
+++ b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.cs
@@ -214,7 +214,7 @@ async Task SyncPlatformModalStackAsync()
 
 			if (FireLifeCycleEvents)
 			{
-				modal.SendNavigatingFrom(new NavigatingFromEventArgs());
+				modal.SendNavigatingFrom(new NavigatingFromEventArgs(CurrentPage, NavigationType.Pop));
 			}
 
 			modal.SendDisappearing();
@@ -244,7 +244,7 @@ async Task SyncPlatformModalStackAsync()
 			if (FireLifeCycleEvents)
 			{
 				modal.SendNavigatedFrom(new NavigatedFromEventArgs(CurrentPage, NavigationType.Pop));
-				CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(modal));
+				CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(modal, NavigationType.Pop));
 			}
 
 			if (!isPlatformReady)
@@ -265,7 +265,7 @@ public async Task PushModalAsync(Page modal, bool animated)
 
 			if (FireLifeCycleEvents)
 			{
-				previousPage?.SendNavigatingFrom(new NavigatingFromEventArgs());
+				previousPage?.SendNavigatingFrom(new NavigatingFromEventArgs(CurrentPage, NavigationType.Push));
 			}
 
 			if (_window.Page is Shell shell)
@@ -302,7 +302,7 @@ public async Task PushModalAsync(Page modal, bool animated)
 			if (FireLifeCycleEvents)
 			{
 				previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(CurrentPage, NavigationType.Push));
-				CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(previousPage));
+				CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Push));
 			}
 
 			_window.OnModalPushed(modal);
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
index 9a66200387d8..5afd80803de5 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -5959,7 +5959,6 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
-Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
index bc23fdcf7b0d..49175205a4b9 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
@@ -6155,7 +6155,6 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
-Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
index bc23fdcf7b0d..49175205a4b9 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
@@ -6155,7 +6155,6 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
-Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
index cf65d0893ede..ccd63e4ea678 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
@@ -5624,7 +5624,6 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
-Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
index 77dee329f41a..a83f5c13b9e8 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
@@ -5380,7 +5380,6 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
-Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
index 77dee329f41a..a83f5c13b9e8 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
@@ -5380,7 +5380,6 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
-Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index 895abbfc1447..0f938369564f 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -1618,7 +1618,7 @@ void SendNavigated(ShellNavigatedEventArgs args)
 			}
 
 			_previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(CurrentPage, navigationType));
-			CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(_previousPage));
+			CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(_previousPage, navigationType));
 			_previousPage = null;
 
 			if (CurrentPage != null)
@@ -1644,8 +1644,35 @@ void SendNavigating(ShellNavigatingEventArgs args)
 
 			if (!args.Cancelled)
 			{
+				NavigationType navigationType = NavigationType.PageSwap;
+
+				switch (args.Source)
+				{
+					case ShellNavigationSource.Pop:
+						navigationType = NavigationType.Pop;
+						break;
+					case ShellNavigationSource.ShellItemChanged:
+						navigationType = NavigationType.PageSwap;
+						break;
+					case ShellNavigationSource.ShellSectionChanged:
+						navigationType = NavigationType.PageSwap;
+						break;
+					case ShellNavigationSource.ShellContentChanged:
+						navigationType = NavigationType.PageSwap;
+						break;
+					case ShellNavigationSource.Push:
+						navigationType = NavigationType.Push;
+						break;
+					case ShellNavigationSource.PopToRoot:
+						navigationType = NavigationType.PopToRoot;
+						break;
+					case ShellNavigationSource.Insert:
+						navigationType = NavigationType.Insert;
+						break;
+				}
+
 				_previousPage = CurrentPage;
-				CurrentPage?.SendNavigatingFrom(new NavigatingFromEventArgs());
+				CurrentPage?.SendNavigatingFrom(new NavigatingFromEventArgs(CurrentPage, navigationType));
 			}
 		}
 

From 1143890c258182042607744a976ccb614f5df6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 14 Mar 2025 00:08:24 +0100
Subject: [PATCH 04/39] Fix failing UITest

---
 .../src/Core/NavigationPage/NavigationPage.cs        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index 3bb6f6c9c1ef..41527fc5b494 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -54,6 +54,7 @@ public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, I
 
 		INavigationPageController NavigationPageController => this;
 
+	
 		partial void Init();
 
 #if WINDOWS || ANDROID || TIZEN
@@ -63,6 +64,7 @@ public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, I
 #endif
 
 		bool _setForMaui;
+			
 		/// <include file="../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
 		public NavigationPage() : this(UseMauiHandler)
 		{
@@ -112,6 +114,8 @@ public Color BarTextColor
 
 		internal Task CurrentNavigationTask { get; set; }
 
+		internal NavigationType NavigationType { get; set; } = NavigationType.Initialize;
+
 		/// <include file="../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="//Member[@MemberName='Peek']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public Page Peek(int depth)
@@ -699,8 +703,7 @@ private protected override void OnHandlerChangedCore()
 				},
 				() =>
 				{
-					// TODO this is the wrong navigation type
-					SendNavigated(null, NavigationType.Initialize);
+					SendNavigated(null, NavigationType);
 				})
 				.FireAndForget(Handler);
 			}
@@ -750,6 +753,7 @@ protected override void OnInsertPageBefore(Page page, Page before)
 				Owner.SendHandlerUpdateAsync(false,
 					() =>
 					{
+						Owner.NavigationType = NavigationType.Insert;
 						int index = Owner.InternalChildren.IndexOf(before);
 						Owner.InternalChildren.Insert(index, page);
 
@@ -783,6 +787,7 @@ protected async override Task<Page> OnPopAsync(bool animated)
 				await Owner.SendHandlerUpdateAsync(animated,
 					() =>
 					{
+						Owner.NavigationType = NavigationType.Pop;
 						Owner.CurrentPage = newCurrentPage;
 						Owner.RemoveFromInnerChildren(currentPage);
 						if (currentPage.TitleView != null)
@@ -817,6 +822,7 @@ protected override Task OnPopToRootAsync(bool animated)
 				return Owner.SendHandlerUpdateAsync(animated,
 					() =>
 					{
+						Owner.NavigationType = NavigationType.PopToRoot;
 						var lastIndex = NavigationStack.Count - 1;
 						while (lastIndex > 0)
 						{
@@ -850,6 +856,7 @@ protected override Task OnPushAsync(Page root, bool animated)
 				return Owner.SendHandlerUpdateAsync(animated,
 					() =>
 					{
+						Owner.NavigationType = NavigationType.Push;
 						Owner.PushPage(root);
 					},
 					() =>
@@ -886,6 +893,7 @@ protected override void OnRemovePage(Page page)
 				Owner.SendHandlerUpdateAsync(false,
 					() =>
 					{
+						Owner.NavigationType = NavigationType.Remove;
 						Owner.RemoveFromInnerChildren(page);
 
 						if (Owner.RootPage == page)

From d4a48e18a93df7a1e4e314675ea0435ea11e6ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 18 Mar 2025 13:27:42 +0100
Subject: [PATCH 05/39] Fixed test

---
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
index db8ab984dc98..2438265b8f3f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
@@ -20,7 +20,7 @@ public void VerifyNavigationEventArgs()
 			App.WaitForElement("NavigateButton");
 
 			var navigatedToBeforeNavigate = App.FindElement("OnNavigatedToLabel").GetText();
-			Assert.That(navigatedToBeforeNavigate, Is.EqualTo("PreviousPage: Null, NavigationType: Initialize"));
+			Assert.That(navigatedToBeforeNavigate, Is.EqualTo("PreviousPage: Null, NavigationType: Push"));
 			
 			var navigatingFromBeforeNavigate = App.FindElement("OnNavigatingFromLabel").GetText();
 			Assert.That(navigatingFromBeforeNavigate, Is.EqualTo(string.Empty));

From 3f97a13d85c86dad6388c33fe169ac007054343e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 22 May 2025 15:45:11 +0200
Subject: [PATCH 06/39] Fixed test on iOS/Catalyst

---
 .../Issues/Issue21814FirstPage.xaml               |  9 ++++++---
 .../Issues/Issue21814SecondPage.xaml              |  9 ++++++---
 .../Tests/Issues/Issue21814.cs                    | 15 +++++++++------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml
index b0bdd2ac7ca5..46e320fa4de1 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FirstPage.xaml
@@ -15,18 +15,21 @@
       FontAttributes="Bold"/>
     <Label 
       x:Name="OnNavigatedToLabel"
-      AutomationId="OnNavigatedToLabel"/>
+      AutomationId="OnNavigatedToLabel"
+      Text="-"/>
     <Label 
       Text="NavigatingFromEventArgs"
       FontAttributes="Bold"/>
     <Label 
       x:Name="OnNavigatingFromLabel"
-      AutomationId="OnNavigatingFromLabel"/>
+      AutomationId="OnNavigatingFromLabel"
+      Text="-"/>
     <Label 
       Text="NavigatedFromEventArgs"
       FontAttributes="Bold"/>
     <Label 
       x:Name="OnNavigatedFromLabel"
-      AutomationId="OnNavigatedFromLabel"/>
+      AutomationId="OnNavigatedFromLabel"
+      Text="-"/>
   </VerticalStackLayout>
 </controls:TestContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml
index df9af6d155bc..7e18c4dc6bdb 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814SecondPage.xaml
@@ -15,18 +15,21 @@
       FontAttributes="Bold"/>
     <Label 
       x:Name="OnNavigatedToLabel"
-      AutomationId="OnNavigatedToLabel"/>
+      AutomationId="OnNavigatedToLabel"
+      Text="-"/>
     <Label 
       Text="NavigatingFromEventArgs"
       FontAttributes="Bold"/>
     <Label 
       x:Name="OnNavigatingFromLabel"
-      AutomationId="OnNavigatingFromLabel"/>
+      AutomationId="OnNavigatingFromLabel"
+      Text="-"/>
     <Label 
       Text="NavigatedFromEventArgs"
       FontAttributes="Bold"/>
     <Label 
       x:Name="OnNavigatedFromLabel"
-      AutomationId="OnNavigatedFromLabel"/>
+      AutomationId="OnNavigatedFromLabel"
+      Text="-"/>
   </VerticalStackLayout>
 </controls:TestContentPage>
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
index 2438265b8f3f..90c841c9ec6c 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
@@ -18,29 +18,32 @@ public Issue21814(TestDevice device) : base(device)
 		public void VerifyNavigationEventArgs()
 		{
 			App.WaitForElement("NavigateButton");
-
+			
+			App.WaitForElement("OnNavigatedToLabel");
 			var navigatedToBeforeNavigate = App.FindElement("OnNavigatedToLabel").GetText();
 			Assert.That(navigatedToBeforeNavigate, Is.EqualTo("PreviousPage: Null, NavigationType: Push"));
-			
+
 			var navigatingFromBeforeNavigate = App.FindElement("OnNavigatingFromLabel").GetText();
-			Assert.That(navigatingFromBeforeNavigate, Is.EqualTo(string.Empty));
+			Assert.That(navigatingFromBeforeNavigate, Is.EqualTo("-"));
 
 			var navigatedFromBeforeNavigate = App.FindElement("OnNavigatedFromLabel").GetText();
-			Assert.That(navigatedFromBeforeNavigate, Is.EqualTo(string.Empty));
+			Assert.That(navigatedFromBeforeNavigate, Is.EqualTo("-"));
 
 			App.Tap("NavigateButton");
 
+			App.WaitForElement("OnNavigatedToLabel");
 			var navigatedToPage2 = App.FindElement("OnNavigatedToLabel").GetText();
 			Assert.That(navigatedToPage2, Is.EqualTo("PreviousPage: Issue21814FirstPage, NavigationType: Push"));
 
 			var navigatingFromPage2 = App.FindElement("OnNavigatingFromLabel").GetText();
-			Assert.That(navigatingFromPage2, Is.EqualTo(string.Empty));
+			Assert.That(navigatingFromPage2, Is.EqualTo("-"));
 
 			var navigatedFromPage2 = App.FindElement("OnNavigatedFromLabel").GetText();
-			Assert.That(navigatedFromPage2, Is.EqualTo(string.Empty));
+			Assert.That(navigatedFromPage2, Is.EqualTo("-"));
 
 			App.Tap("NavigateBackButton");
 
+			App.WaitForElement("OnNavigatedToLabel");
 			var navigatedToAfterNavigate = App.FindElement("OnNavigatedToLabel").GetText();
 			Assert.That(navigatedToAfterNavigate, Is.EqualTo("PreviousPage: Issue21814SecondPage, NavigationType: Pop"));
 

From 55e498706af28c3bef60019b5a60187c427a6f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Jun 2025 12:20:54 +0200
Subject: [PATCH 07/39] Renamed NavigationType.PageSwap to
 NavigationType.Replace

---
 src/Controls/src/Core/FlyoutPage/FlyoutPage.cs   | 12 ++++++------
 src/Controls/src/Core/MultiPage.cs               |  6 +++---
 .../src/Core/Page/NavigatedFromEventArgs.cs      | 14 +-------------
 src/Controls/src/Core/Page/NavigationType.cs     | 12 ++++++++++++
 src/Controls/src/Core/Shell/Shell.cs             | 16 ++++++++--------
 5 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 src/Controls/src/Core/Page/NavigationType.cs

diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index ade043dba02b..b37520ec9963 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -54,7 +54,7 @@ public Page Detail
 
 				var previousDetail = _detail;
 				// TODO MAUI refine this to fire earlier
-				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs(previousDetail, NavigationType.PageSwap));
+				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs(previousDetail, NavigationType.Replace));
 
 				OnPropertyChanging();
 				if (_detail != null)
@@ -69,8 +69,8 @@ public Page Detail
 					_detail?.SendAppearing();
 				}
 
-				previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(_detail, NavigationType.PageSwap));
-				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousDetail, NavigationType.PageSwap));
+				previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(_detail, NavigationType.Replace));
+				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousDetail, NavigationType.Replace));
 			}
 		}
 
@@ -109,7 +109,7 @@ public Page Flyout
 				// TODO MAUI refine this to fire earlier
 				var previousFlyout = _flyout;
 				// TODO MAUI refine this to fire earlier
-				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs(_flyout, NavigationType.PageSwap));
+				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs(_flyout, NavigationType.Replace));
 
 				OnPropertyChanging();
 				if (_flyout != null)
@@ -124,8 +124,8 @@ public Page Flyout
 					_flyout?.SendAppearing();
 				}
 
-				previousFlyout?.SendNavigatedFrom(new NavigatedFromEventArgs(_flyout, NavigationType.PageSwap));
-				_flyout?.SendNavigatedTo(new NavigatedToEventArgs(previousFlyout, NavigationType.PageSwap));
+				previousFlyout?.SendNavigatedFrom(new NavigatedFromEventArgs(_flyout, NavigationType.Replace));
+				_flyout?.SendNavigatedTo(new NavigatedToEventArgs(previousFlyout, NavigationType.Replace));
 			}
 		}
 
diff --git a/src/Controls/src/Core/MultiPage.cs b/src/Controls/src/Core/MultiPage.cs
index f188e45f4925..37062847afeb 100644
--- a/src/Controls/src/Core/MultiPage.cs
+++ b/src/Controls/src/Core/MultiPage.cs
@@ -85,7 +85,7 @@ public T CurrentPage
 				OnPropertyChanging();
 
 				// TODO: MAUI refine this to fire earlier
-				_current?.SendNavigatingFrom(new NavigatingFromEventArgs(_current, NavigationType.PageSwap));
+				_current?.SendNavigatingFrom(new NavigatingFromEventArgs(_current, NavigationType.Replace));
 
 				_current = value;
 
@@ -97,8 +97,8 @@ public T CurrentPage
 				if (HasAppeared)
 					_current?.SendAppearing();
 
-				previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(_current, NavigationType.PageSwap));
-				_current?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.PageSwap));
+				previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(_current, NavigationType.Replace));
+				_current?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
 			}
 		}
 
diff --git a/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs b/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
index 23d9e9e81080..9c4803be231d 100644
--- a/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
+++ b/src/Controls/src/Core/Page/NavigatedFromEventArgs.cs
@@ -1,20 +1,8 @@
 #nullable disable
 using System;
-using Microsoft.Maui.Controls.Internals;
 
 namespace Microsoft.Maui.Controls
 {
-	public enum NavigationType
-	{
-		Push,
-		Pop,
-		PopToRoot,
-		Insert,
-		Remove,
-		PageSwap,
-		Initialize
-	}
-
 	public sealed class NavigatedFromEventArgs : EventArgs
 	{
 		public NavigationType NavigationType { get; }
@@ -27,4 +15,4 @@ internal NavigatedFromEventArgs(Page destinationPage, NavigationType navigationT
 			NavigationType = navigationType;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Page/NavigationType.cs b/src/Controls/src/Core/Page/NavigationType.cs
new file mode 100644
index 000000000000..4710ac314ac1
--- /dev/null
+++ b/src/Controls/src/Core/Page/NavigationType.cs
@@ -0,0 +1,12 @@
+namespace Microsoft.Maui.Controls;
+
+public enum NavigationType
+{
+	Push,
+	Pop,
+	PopToRoot,
+	Insert,
+	Remove,
+	Replace,
+	Initialize
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index 0f938369564f..fffb4b56a2b9 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -1590,7 +1590,7 @@ void SendNavigated(ShellNavigatedEventArgs args)
 			if (_previousPage != null)
 				_previousPage.PropertyChanged -= OnCurrentPagePropertyChanged;
 
-			NavigationType navigationType = NavigationType.PageSwap;
+			NavigationType navigationType = NavigationType.Replace;
 
 			switch (args.Source)
 			{
@@ -1598,13 +1598,13 @@ void SendNavigated(ShellNavigatedEventArgs args)
 					navigationType = NavigationType.Pop;
 					break;
 				case ShellNavigationSource.ShellItemChanged:
-					navigationType = NavigationType.PageSwap;
+					navigationType = NavigationType.Replace;
 					break;
 				case ShellNavigationSource.ShellSectionChanged:
-					navigationType = NavigationType.PageSwap;
+					navigationType = NavigationType.Replace;
 					break;
 				case ShellNavigationSource.ShellContentChanged:
-					navigationType = NavigationType.PageSwap;
+					navigationType = NavigationType.Replace;
 					break;
 				case ShellNavigationSource.Push:
 					navigationType = NavigationType.Push;
@@ -1644,7 +1644,7 @@ void SendNavigating(ShellNavigatingEventArgs args)
 
 			if (!args.Cancelled)
 			{
-				NavigationType navigationType = NavigationType.PageSwap;
+				NavigationType navigationType = NavigationType.Replace;
 
 				switch (args.Source)
 				{
@@ -1652,13 +1652,13 @@ void SendNavigating(ShellNavigatingEventArgs args)
 						navigationType = NavigationType.Pop;
 						break;
 					case ShellNavigationSource.ShellItemChanged:
-						navigationType = NavigationType.PageSwap;
+						navigationType = NavigationType.Replace;
 						break;
 					case ShellNavigationSource.ShellSectionChanged:
-						navigationType = NavigationType.PageSwap;
+						navigationType = NavigationType.Replace;
 						break;
 					case ShellNavigationSource.ShellContentChanged:
-						navigationType = NavigationType.PageSwap;
+						navigationType = NavigationType.Replace;
 						break;
 					case ShellNavigationSource.Push:
 						navigationType = NavigationType.Push;

From a612fdbeeb8b75fb4e49fd6fb939f509eff8bf04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Jun 2025 12:34:19 +0200
Subject: [PATCH 08/39] Removed NavigationType.Initialized

---
 src/Controls/src/Core/NavigationPage/NavigationPage.cs | 2 +-
 src/Controls/src/Core/Page/NavigationType.cs           | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index 41527fc5b494..725161d53268 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -114,7 +114,7 @@ public Color BarTextColor
 
 		internal Task CurrentNavigationTask { get; set; }
 
-		internal NavigationType NavigationType { get; set; } = NavigationType.Initialize;
+		internal NavigationType NavigationType { get; set; }
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="//Member[@MemberName='Peek']/Docs/*" />
 		[EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/src/Controls/src/Core/Page/NavigationType.cs b/src/Controls/src/Core/Page/NavigationType.cs
index 4710ac314ac1..f50899e73143 100644
--- a/src/Controls/src/Core/Page/NavigationType.cs
+++ b/src/Controls/src/Core/Page/NavigationType.cs
@@ -7,6 +7,5 @@ public enum NavigationType
 	PopToRoot,
 	Insert,
 	Remove,
-	Replace,
-	Initialize
+	Replace
 }
\ No newline at end of file

From 8624cb1f719f25597a56fc12a65682e012b42446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Jun 2025 13:55:37 +0200
Subject: [PATCH 09/39] Added two more samples, using tabs and flyout

---
 .../Issues/Issue21814FlyoutPage.cs            | 232 ++++++++++++++++++
 .../Issues/Issue21814TabbedPage.cs            | 183 ++++++++++++++
 2 files changed, 415 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue21814FlyoutPage.cs
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue21814TabbedPage.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FlyoutPage.cs
new file mode 100644
index 000000000000..73cf871c437f
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FlyoutPage.cs
@@ -0,0 +1,232 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[Issue(IssueTracker.Github, "21814_FlyoutPage", "Add better parameters for navigation args", PlatformAffected.All)]
+    public class Issue21814FlyoutPage : FlyoutPage
+    {
+        private readonly NavigationPage _navigationPage;
+
+        public Issue21814FlyoutPage()
+        {
+            Title = "Issue21814 FlyoutPage";
+
+            FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
+            
+            Flyout = new Issue21814FlyoutMenuPage(this);
+            
+            _navigationPage = new NavigationPage(new Issue21814FlyoutItem1());
+            Detail = _navigationPage;
+        }
+
+        public void NavigateTo(ContentPage page)
+        {
+            _navigationPage.Navigation.PushAsync(page);
+            IsPresented = false; // Close the flyout menu
+        }
+    }
+
+    public class Issue21814FlyoutMenuPage : ContentPage
+    {
+        private readonly Issue21814FlyoutPage _parentPage;
+
+        public Issue21814FlyoutMenuPage(Issue21814FlyoutPage parentPage)
+        {
+            _parentPage = parentPage;
+            Title = "Flyout Menu";
+
+            var listView = new ListView
+            {
+                ItemsSource = new[]
+                {
+                    "Item 1",
+                    "Item 2",
+                    "Item 3"
+                }
+            };
+
+            listView.ItemTapped += (sender, e) =>
+            {
+                switch (e.Item.ToString())
+                {
+                    case "Item 1":
+                        _parentPage.NavigateTo(new Issue21814FlyoutItem1());
+                        break;
+                    case "Item 2":
+                        _parentPage.NavigateTo(new Issue21814FlyoutItem2());
+                        break;
+                    case "Item 3":
+                        _parentPage.NavigateTo(new Issue21814FlyoutItem3());
+                        break;
+                }
+            };
+
+            Content = new StackLayout { Children = { listView } };
+        }
+    }
+
+    public class Issue21814FlyoutItem1 : ContentPage
+    {
+	    readonly Label _onNavigatedToLabel;
+	    readonly Label _onNavigatingFromLabel;
+	    readonly Label _onNavigatedFromLabel;
+	    
+        public Issue21814FlyoutItem1()
+        {
+            Title = "Item 1";
+            
+            _onNavigatedToLabel = new Label { Text = "-" };
+            _onNavigatingFromLabel = new Label { Text = "-" };
+            _onNavigatedFromLabel = new Label { Text = "-" };
+            
+            Content = new StackLayout
+            {
+	            Padding = 20,
+	            Children =
+	            {
+		            new Label { Text = "Item 1", FontAttributes = FontAttributes.Bold, FontSize = 18 },
+		            new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
+		            _onNavigatedToLabel,
+		            new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
+		            _onNavigatingFromLabel,
+		            new Label { Text = "OnNavigatedFrom", FontAttributes = FontAttributes.Bold },
+		            _onNavigatedFromLabel
+	            }
+            };
+        }
+        
+        protected override void OnNavigatedTo(NavigatedToEventArgs args)
+        {
+	        base.OnNavigatedTo(args);
+
+	        var previousPage = args.PreviousPage?.GetType().Name ?? "Null";
+	        _onNavigatedToLabel.Text = $"PreviousPage: {previousPage}, NavigationType: {args.NavigationType}";
+        }
+
+        protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+        {
+	        base.OnNavigatingFrom(args);
+
+	        var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+	        _onNavigatingFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+        }
+
+        protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+        {
+	        base.OnNavigatedFrom(args);
+
+	        var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+	        _onNavigatedFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+        }
+    }
+
+    public class Issue21814FlyoutItem2 : ContentPage
+    {
+	    readonly Label _onNavigatedToLabel;
+	    readonly Label _onNavigatingFromLabel;
+	    readonly Label _onNavigatedFromLabel;
+	    
+        public Issue21814FlyoutItem2()
+        {
+            Title = "Item 2";
+            
+            _onNavigatedToLabel = new Label { Text = "-" };
+            _onNavigatingFromLabel = new Label { Text = "-" };
+            _onNavigatedFromLabel = new Label { Text = "-" };
+            
+            Content = new StackLayout
+            {
+	            Padding = 20,
+	            Children =
+	            {
+		            new Label { Text = "Item 2", FontAttributes = FontAttributes.Bold, FontSize = 18 },
+		            new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
+		            _onNavigatedToLabel,
+		            new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
+		            _onNavigatingFromLabel,
+		            new Label { Text = "OnNavigatedFrom", FontAttributes = FontAttributes.Bold },
+		            _onNavigatedFromLabel
+	            }
+            };
+        }
+        
+        protected override void OnNavigatedTo(NavigatedToEventArgs args)
+        {
+	        base.OnNavigatedTo(args);
+
+	        var previousPage = args.PreviousPage?.GetType().Name ?? "Null";
+	        _onNavigatedToLabel.Text = $"PreviousPage: {previousPage}, NavigationType: {args.NavigationType}";
+        }
+
+        protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+        {
+	        base.OnNavigatingFrom(args);
+
+	        var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+	        _onNavigatingFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+        }
+
+        protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+        {
+	        base.OnNavigatedFrom(args);
+
+	        var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+	        _onNavigatedFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+        }
+    }
+
+    public class Issue21814FlyoutItem3 : ContentPage
+    {
+	    readonly Label _onNavigatedToLabel;
+	    readonly Label _onNavigatingFromLabel;
+	    readonly Label _onNavigatedFromLabel;
+	    
+        public Issue21814FlyoutItem3()
+        {
+            Title = "Item 3";
+            
+            _onNavigatedToLabel = new Label { Text = "-" };
+            _onNavigatingFromLabel = new Label { Text = "-" };
+            _onNavigatedFromLabel = new Label { Text = "-" };
+            
+            Content = new StackLayout
+            {
+	            Padding = 20,
+	            Children =
+	            {
+		            new Label { Text = "Item 3", FontAttributes = FontAttributes.Bold, FontSize = 18 },
+		            new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
+		            _onNavigatedToLabel,
+		            new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
+		            _onNavigatingFromLabel,
+		            new Label { Text = "OnNavigatedFrom", FontAttributes = FontAttributes.Bold },
+		            _onNavigatedFromLabel
+	            }
+            };
+        }
+        
+        protected override void OnNavigatedTo(NavigatedToEventArgs args)
+        {
+	        base.OnNavigatedTo(args);
+
+	        var previousPage = args.PreviousPage?.GetType().Name ?? "Null";
+	        _onNavigatedToLabel.Text = $"PreviousPage: {previousPage}, NavigationType: {args.NavigationType}";
+        }
+
+        protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+        {
+	        base.OnNavigatingFrom(args);
+
+	        var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+	        _onNavigatingFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+        }
+
+        protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+        {
+	        base.OnNavigatedFrom(args);
+
+	        var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+	        _onNavigatedFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814TabbedPage.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814TabbedPage.cs
new file mode 100644
index 000000000000..37ac08b8a10b
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814TabbedPage.cs
@@ -0,0 +1,183 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[Issue(IssueTracker.Github, "21814_TabbedPage", "Add better parameters for navigation args", PlatformAffected.All)]
+	public class Issue21814TabbedPage : TabbedPage
+	{
+		public Issue21814TabbedPage()
+		{
+			Title = "Issue21814 TabbedPage";
+
+			// Add the tabs
+			Children.Add(new Issue21814TabItem1());
+			Children.Add(new Issue21814TabItem2());
+			Children.Add(new Issue21814TabItem3());
+		}
+	}
+
+	public class Issue21814TabItem1 : ContentPage
+	{
+		readonly Label _onNavigatedToLabel;
+		readonly Label _onNavigatingFromLabel;
+		readonly Label _onNavigatedFromLabel;
+		
+		public Issue21814TabItem1()
+		{
+			Title = "Tab 1";
+			
+			_onNavigatedToLabel = new Label { Text = "-" };
+			_onNavigatingFromLabel = new Label { Text = "-" };
+			_onNavigatedFromLabel = new Label { Text = "-" };
+			
+			Content = new StackLayout
+			{
+				Padding = 20,
+				Children =
+				{
+					new Label { Text = "Tab 1 Content", FontSize = 18 },
+					new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
+					_onNavigatedToLabel,
+					new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
+					_onNavigatingFromLabel,
+					new Label { Text = "OnNavigatedFrom", FontAttributes = FontAttributes.Bold },
+					_onNavigatedFromLabel
+				}
+			};
+		}
+		
+		protected override void OnNavigatedTo(NavigatedToEventArgs args)
+		{
+			base.OnNavigatedTo(args);
+
+			var previousPage = args.PreviousPage?.GetType().Name ?? "Null";
+			_onNavigatedToLabel.Text = $"PreviousPage: {previousPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+		{
+			base.OnNavigatingFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			_onNavigatingFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+		{
+			base.OnNavigatedFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			_onNavigatedFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+	}
+
+	public class Issue21814TabItem2 : ContentPage
+	{
+		readonly Label _onNavigatedToLabel;
+		readonly Label _onNavigatingFromLabel;
+		readonly Label _onNavigatedFromLabel;
+		
+		public Issue21814TabItem2()
+		{
+			Title = "Tab 2";
+			
+			_onNavigatedToLabel = new Label { Text = "-" };
+			_onNavigatingFromLabel = new Label { Text = "-" };
+			_onNavigatedFromLabel = new Label { Text = "-" };
+			
+			Content = new StackLayout
+			{
+				Padding = 20,
+				Children =
+				{
+					new Label { Text = "Tab 2 Content", FontSize = 18 },
+					new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
+					_onNavigatedToLabel,
+					new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
+					_onNavigatingFromLabel,
+					new Label { Text = "OnNavigatedFrom", FontAttributes = FontAttributes.Bold },
+					_onNavigatedFromLabel
+				}
+			};
+		}
+		
+		protected override void OnNavigatedTo(NavigatedToEventArgs args)
+		{
+			base.OnNavigatedTo(args);
+
+			var previousPage = args.PreviousPage?.GetType().Name ?? "Null";
+			_onNavigatedToLabel.Text = $"PreviousPage: {previousPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+		{
+			base.OnNavigatingFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			_onNavigatingFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+		{
+			base.OnNavigatedFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			_onNavigatedFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+	}
+
+	public class Issue21814TabItem3 : ContentPage
+	{
+		readonly Label _onNavigatedToLabel;
+		readonly Label _onNavigatingFromLabel;
+		readonly Label _onNavigatedFromLabel;
+		
+		public Issue21814TabItem3()
+		{
+			Title = "Tab 3";
+			
+			_onNavigatedToLabel = new Label { Text = "-" };
+			_onNavigatingFromLabel = new Label { Text = "-" };
+			_onNavigatedFromLabel = new Label { Text = "-" };
+			
+			Content = new StackLayout
+			{
+				Padding = 20,
+				Children =
+				{
+					new Label { Text = "Tab 3 Content", FontSize = 18 },
+					new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
+					_onNavigatedToLabel,
+					new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
+					_onNavigatingFromLabel,
+					new Label { Text = "OnNavigatedFrom", FontAttributes = FontAttributes.Bold },
+					_onNavigatedFromLabel
+				}
+			};
+		}
+		
+		protected override void OnNavigatedTo(NavigatedToEventArgs args)
+		{
+			base.OnNavigatedTo(args);
+
+			var previousPage = args.PreviousPage?.GetType().Name ?? "Null";
+			_onNavigatedToLabel.Text = $"PreviousPage: {previousPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+		{
+			base.OnNavigatingFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			_onNavigatingFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+
+		protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+		{
+			base.OnNavigatedFrom(args);
+
+			var destinationPage = args.DestinationPage?.GetType().Name ?? "Null";
+			_onNavigatedFromLabel.Text = $"DestinationPage: {destinationPage}, NavigationType: {args.NavigationType}";
+		}
+	}
+}
\ No newline at end of file

From a22156cc0c3984590367c1860ad463a684a7d3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Jun 2025 14:23:51 +0200
Subject: [PATCH 10/39] Updated sample

---
 .../Issues/Issue21814TabbedPage.cs            | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814TabbedPage.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814TabbedPage.cs
index 37ac08b8a10b..4b847b13dd82 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814TabbedPage.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814TabbedPage.cs
@@ -2,7 +2,7 @@
 
 namespace Maui.Controls.Sample.Issues
 {
-	[Issue(IssueTracker.Github, "21814_TabbedPage", "Add better parameters for navigation args", PlatformAffected.All)]
+	[Issue(IssueTracker.Github, "21814_TabbedPage", "Add better parameters for navigation args (TabbedPage)", PlatformAffected.All)]
 	public class Issue21814TabbedPage : TabbedPage
 	{
 		public Issue21814TabbedPage()
@@ -26,16 +26,16 @@ public Issue21814TabItem1()
 		{
 			Title = "Tab 1";
 			
-			_onNavigatedToLabel = new Label { Text = "-" };
-			_onNavigatingFromLabel = new Label { Text = "-" };
-			_onNavigatedFromLabel = new Label { Text = "-" };
+			_onNavigatedToLabel = new Label { AutomationId = "Tab1OnNavigatedToLabel", Text = "-" };
+			_onNavigatingFromLabel = new Label { AutomationId = "Tab1OnNavigatingFromLabel", Text = "-" };
+			_onNavigatedFromLabel = new Label { AutomationId = "Tab1OnNavigatedFromLabel", Text = "-" };
 			
 			Content = new StackLayout
 			{
 				Padding = 20,
 				Children =
 				{
-					new Label { Text = "Tab 1 Content", FontSize = 18 },
+					new Label { AutomationId = "Tab1Content", Text = "Tab 1 Content", FontSize = 18 },
 					new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
 					_onNavigatedToLabel,
 					new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
@@ -81,16 +81,16 @@ public Issue21814TabItem2()
 		{
 			Title = "Tab 2";
 			
-			_onNavigatedToLabel = new Label { Text = "-" };
-			_onNavigatingFromLabel = new Label { Text = "-" };
-			_onNavigatedFromLabel = new Label { Text = "-" };
+			_onNavigatedToLabel = new Label { AutomationId = "Tab2OnNavigatedToLabel", Text = "-" };
+			_onNavigatingFromLabel = new Label { AutomationId = "Tab2OnNavigatingFromLabel", Text = "-" };
+			_onNavigatedFromLabel = new Label { AutomationId = "Tab2OnNavigatedFromLabel", Text = "-" };
 			
 			Content = new StackLayout
 			{
 				Padding = 20,
 				Children =
 				{
-					new Label { Text = "Tab 2 Content", FontSize = 18 },
+					new Label { AutomationId = "Tab2Content", Text = "Tab 2 Content", FontSize = 18 },
 					new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
 					_onNavigatedToLabel,
 					new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
@@ -136,16 +136,16 @@ public Issue21814TabItem3()
 		{
 			Title = "Tab 3";
 			
-			_onNavigatedToLabel = new Label { Text = "-" };
-			_onNavigatingFromLabel = new Label { Text = "-" };
-			_onNavigatedFromLabel = new Label { Text = "-" };
+			_onNavigatedToLabel = new Label { AutomationId = "Tab3OnNavigatedToLabel", Text = "-" };
+			_onNavigatingFromLabel = new Label { AutomationId = "Tab3OnNavigatingFromLabel", Text = "-" };
+			_onNavigatedFromLabel = new Label { AutomationId = "Tab3OnNavigatedFromLabel", Text = "-" };
 			
 			Content = new StackLayout
 			{
 				Padding = 20,
 				Children =
 				{
-					new Label { Text = "Tab 3 Content", FontSize = 18 },
+					new Label { AutomationId = "Tab3Content", Text = "Tab 3 Content", FontSize = 18 },
 					new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
 					_onNavigatedToLabel,
 					new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },

From be30c116475ef8e43983878410c0ac3fa3822f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Jun 2025 14:43:31 +0200
Subject: [PATCH 11/39] Create Issue21814TabbedPage.cs

---
 .../Tests/Issues/Issue21814TabbedPage.cs      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
new file mode 100644
index 000000000000..995bf6abf84b
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue21814TabbedPage : _IssuesUITest
+{
+	public Issue21814TabbedPage(TestDevice device) : base(device)
+	{
+	}
+
+	public override string Issue => "Add better parameters for navigation args (TabbedPage)";
+
+	[Test]
+	[Category(UITestCategories.Navigation)]
+	[Category(UITestCategories.TabbedPage)]
+	public void VerifyTabbedPageNavigationEventArgs()
+	{
+		App.WaitForElement("Tab1Content");
+	}
+}
\ No newline at end of file

From bcdcff7c6a3687a9861d9ee49f00caee8ab90be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Jun 2025 14:53:14 +0200
Subject: [PATCH 12/39] Updated flyout sample

---
 .../Issues/Issue21814FlyoutPage.cs            | 28 +++++++++----------
 .../Tests/Issues/Issue21814FlyoutPage.cs      | 23 +++++++++++++++
 2 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FlyoutPage.cs
index 73cf871c437f..5f6256774fab 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21814FlyoutPage.cs
@@ -2,7 +2,7 @@
 
 namespace Maui.Controls.Sample.Issues
 {
-	[Issue(IssueTracker.Github, "21814_FlyoutPage", "Add better parameters for navigation args", PlatformAffected.All)]
+	[Issue(IssueTracker.Github, "21814_FlyoutPage", "Add better parameters for navigation args (FlyoutPage)", PlatformAffected.All)]
     public class Issue21814FlyoutPage : FlyoutPage
     {
         private readonly NavigationPage _navigationPage;
@@ -28,7 +28,7 @@ public void NavigateTo(ContentPage page)
 
     public class Issue21814FlyoutMenuPage : ContentPage
     {
-        private readonly Issue21814FlyoutPage _parentPage;
+        readonly Issue21814FlyoutPage _parentPage;
 
         public Issue21814FlyoutMenuPage(Issue21814FlyoutPage parentPage)
         {
@@ -75,16 +75,16 @@ public Issue21814FlyoutItem1()
         {
             Title = "Item 1";
             
-            _onNavigatedToLabel = new Label { Text = "-" };
-            _onNavigatingFromLabel = new Label { Text = "-" };
-            _onNavigatedFromLabel = new Label { Text = "-" };
+            _onNavigatedToLabel = new Label { AutomationId = "FlyoutItem1OnNavigatedToLabel", Text = "-" };
+            _onNavigatingFromLabel = new Label { AutomationId = "FlyoutItem1OnNavigatingFromLabel", Text = "-" };
+            _onNavigatedFromLabel = new Label { AutomationId = "FlyoutItem1OnNavigatedFromLabel", Text = "-" };
             
             Content = new StackLayout
             {
 	            Padding = 20,
 	            Children =
 	            {
-		            new Label { Text = "Item 1", FontAttributes = FontAttributes.Bold, FontSize = 18 },
+		            new Label { AutomationId = "FlyoutContent1", Text = "Item 1", FontAttributes = FontAttributes.Bold, FontSize = 18 },
 		            new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
 		            _onNavigatedToLabel,
 		            new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
@@ -130,16 +130,16 @@ public Issue21814FlyoutItem2()
         {
             Title = "Item 2";
             
-            _onNavigatedToLabel = new Label { Text = "-" };
-            _onNavigatingFromLabel = new Label { Text = "-" };
-            _onNavigatedFromLabel = new Label { Text = "-" };
+            _onNavigatedToLabel = new Label { AutomationId = "FlyoutItem2OnNavigatedToLabel", Text = "-" };
+            _onNavigatingFromLabel = new Label { AutomationId = "FlyoutItem2OnNavigatingFromLabel", Text = "-" };
+            _onNavigatedFromLabel = new Label { AutomationId = "FlyoutItem2OnNavigatedFromLabel", Text = "-" };
             
             Content = new StackLayout
             {
 	            Padding = 20,
 	            Children =
 	            {
-		            new Label { Text = "Item 2", FontAttributes = FontAttributes.Bold, FontSize = 18 },
+		            new Label { AutomationId = "FlyoutContent2", Text = "Item 2", FontAttributes = FontAttributes.Bold, FontSize = 18 },
 		            new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
 		            _onNavigatedToLabel,
 		            new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
@@ -185,16 +185,16 @@ public Issue21814FlyoutItem3()
         {
             Title = "Item 3";
             
-            _onNavigatedToLabel = new Label { Text = "-" };
-            _onNavigatingFromLabel = new Label { Text = "-" };
-            _onNavigatedFromLabel = new Label { Text = "-" };
+            _onNavigatedToLabel = new Label { AutomationId = "FlyoutItem3OnNavigatedToLabel", Text = "-" };
+            _onNavigatingFromLabel = new Label { AutomationId = "FlyoutItem3OnNavigatingFromLabel", Text = "-" };
+            _onNavigatedFromLabel = new Label { AutomationId = "FlyoutItem3OnNavigatedFromLabel", Text = "-" };
             
             Content = new StackLayout
             {
 	            Padding = 20,
 	            Children =
 	            {
-		            new Label { Text = "Item 3", FontAttributes = FontAttributes.Bold, FontSize = 18 },
+		            new Label { AutomationId = "FlyoutContent3", Text = "Item 3", FontAttributes = FontAttributes.Bold, FontSize = 18 },
 		            new Label { Text = "OnNavigated", FontAttributes = FontAttributes.Bold, Margin = new Thickness(0, 12)},
 		            _onNavigatedToLabel,
 		            new Label { Text = "OnNavigatingFrom", FontAttributes = FontAttributes.Bold },
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
new file mode 100644
index 000000000000..a2b7f046d581
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue21814FlyoutPage : _IssuesUITest
+{
+	public Issue21814FlyoutPage(TestDevice device) : base(device)
+	{
+	}
+
+	public override string Issue => "Add better parameters for navigation args (FlyoutPage)";
+
+	[Test]
+	[Category(UITestCategories.Navigation)]
+	[Category(UITestCategories.FlyoutPage)]
+	public void VerifyFlyoutPageNavigationEventArgs()
+	{
+		App.WaitForElement("FlyoutContent1");
+	}
+}
\ No newline at end of file

From f5435820213757a58df7d3ca09b0fc8eed5adba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 5 Jun 2025 17:28:33 +0200
Subject: [PATCH 13/39] Adding more tests

---
 .../Tests/Issues/Issue21814FlyoutPage.cs                    | 6 +++++-
 .../Tests/Issues/Issue21814TabbedPage.cs                    | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index a2b7f046d581..98436b9854e4 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -16,8 +16,12 @@ public Issue21814FlyoutPage(TestDevice device) : base(device)
 	[Test]
 	[Category(UITestCategories.Navigation)]
 	[Category(UITestCategories.FlyoutPage)]
-	public void VerifyFlyoutPageNavigationEventArgs()
+	public void VerifyFlyoutPageInitialNavigationEventArgs()
 	{
 		App.WaitForElement("FlyoutContent1");
+		
+		App.WaitForElement("FlyoutItem1OnNavigatedToLabel");
+		var navigatedTo = App.FindElement("FlyoutItem1OnNavigatedToLabel").GetText();
+		Assert.That(navigatedTo, Is.EqualTo("PreviousPage: Null, NavigationType: Push"));
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
index 995bf6abf84b..013e67418884 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
@@ -19,5 +19,8 @@ public Issue21814TabbedPage(TestDevice device) : base(device)
 	public void VerifyTabbedPageNavigationEventArgs()
 	{
 		App.WaitForElement("Tab1Content");
-	}
+		
+		App.WaitForElement("Tab1OnNavigatedToLabel");
+		var navigatedTo = App.FindElement("Tab1OnNavigatedToLabel").GetText();
+		Assert.That(navigatedTo, Is.EqualTo("PreviousPage: Null, NavigationType: Replace"));}
 }
\ No newline at end of file

From 3d3dd2a3a1a004a49bd0482beb99e4e9bb387c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 6 Jun 2025 10:21:16 +0200
Subject: [PATCH 14/39] Added more TabbedPage tests

---
 .../Tests/Issues/Issue21814TabbedPage.cs      | 131 +++++++++++++++++-
 1 file changed, 124 insertions(+), 7 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
index 013e67418884..060a24e30cee 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using NUnit.Framework.Legacy;
 using UITest.Appium;
 using UITest.Core;
 
@@ -7,20 +6,138 @@ namespace Microsoft.Maui.TestCases.Tests.Issues;
 
 public class Issue21814TabbedPage : _IssuesUITest
 {
+	const string Tab1Content = "Tab1Content";
+	const string Tab2Content = "Tab2Content";
+	const string Tab3Content = "Tab3Content";
+
+	const string Tab1OnNavigatedToLabel = "Tab1OnNavigatedToLabel";
+	const string Tab1OnNavigatedFromLabel = "Tab1OnNavigatedFromLabel";
+
+	const string Tab2OnNavigatedToLabel = "Tab2OnNavigatedToLabel";
+	const string Tab2OnNavigatedFromLabel = "Tab2OnNavigatedFromLabel";
+
+	const string Tab3OnNavigatedToLabel = "Tab3OnNavigatedToLabel";
+	const string Tab3OnNavigatedFromLabel = "Tab3OnNavigatedFromLabel";
+
 	public Issue21814TabbedPage(TestDevice device) : base(device)
 	{
 	}
 
 	public override string Issue => "Add better parameters for navigation args (TabbedPage)";
 
-	[Test]
+	[Test, Order(1)]
 	[Category(UITestCategories.Navigation)]
 	[Category(UITestCategories.TabbedPage)]
-	public void VerifyTabbedPageNavigationEventArgs()
+	public void InitialTabLoadShowsCorrectNavigationInfo()
 	{
-		App.WaitForElement("Tab1Content");
+		// Verify Tab 1 is initially loaded and shows correct navigation info
+		App.WaitForElement(Tab1Content);
+
+		var onNavigatedToText = App.FindElement(Tab1OnNavigatedToLabel).GetText();
+		Assert.That(onNavigatedToText, Does.Contain("PreviousPage: Null"));
+		Assert.That(onNavigatedToText, Does.Contain("NavigationType: Replace"));
+
+		// Initially, OnNavigatedFrom should show "-"
+		var onNavigatedFromText = App.FindElement(Tab1OnNavigatedFromLabel).GetText();
+		Assert.That(onNavigatedFromText, Is.EqualTo("-"));
+	}
+
+	[Test, Order(2)]
+	[Category(UITestCategories.TabbedPage)]
+	[Category(UITestCategories.Navigation)]
+	public void NavigationFromTab1ToTab2ShowsCorrectParameters()
+	{
+		// Start on Tab 1
+		App.WaitForElement(Tab1Content);
+
+		// Navigate to Tab 2
+		App.TapTab("Tab 2");
+		App.WaitForElement(Tab2Content);
+
+		// Verify Tab 2 navigation parameters
+		var tab2OnNavigatedToText = App.FindElement(Tab2OnNavigatedToLabel).GetText();
+		Assert.That(tab2OnNavigatedToText, Does.Contain("PreviousPage: Issue21814TabItem1"));
+		Assert.That(tab2OnNavigatedToText, Does.Contain("NavigationType: Replace"));
+
+		// Go back to Tab 1 to check its OnNavigatingFrom and OnNavigatedFrom
+		App.TapTab("Tab 1");
+		App.WaitForElement(Tab1Content);
 		
-		App.WaitForElement("Tab1OnNavigatedToLabel");
-		var navigatedTo = App.FindElement("Tab1OnNavigatedToLabel").GetText();
-		Assert.That(navigatedTo, Is.EqualTo("PreviousPage: Null, NavigationType: Replace"));}
+		var tab1OnNavigatedFromText = App.FindElement(Tab1OnNavigatedFromLabel).GetText();
+		Assert.That(tab1OnNavigatedFromText, Does.Contain("DestinationPage: Issue21814TabItem2"));
+	}
+
+	[Test, Order(3)]
+	[Category(UITestCategories.TabbedPage)]
+	[Category(UITestCategories.Navigation)]
+	public void NavigationFromTab2ToTab3ShowsCorrectParameters()
+	{
+		// Navigate to Tab 2 first
+		App.TapTab("Tab 2");
+		App.WaitForElement(Tab2Content);
+
+		// Then navigate to Tab 3
+		App.TapTab("Tab 3");
+		App.WaitForElement(Tab3Content);
+
+		// Verify Tab 3 navigation parameters
+		var tab3OnNavigatedToText = App.FindElement(Tab3OnNavigatedToLabel).GetText();
+		Assert.That(tab3OnNavigatedToText, Does.Contain("PreviousPage: Issue21814TabItem2"));
+		Assert.That(tab3OnNavigatedToText, Does.Contain("NavigationType: Replace"));
+
+		// Go back to Tab 2 to verify its navigation from parameters
+		App.TapTab("Tab 2");
+		App.WaitForElement(Tab2Content);
+		
+		var tab2OnNavigatedFromText = App.FindElement(Tab2OnNavigatedFromLabel).GetText();
+		Assert.That(tab2OnNavigatedFromText, Does.Contain("DestinationPage: Issue21814TabItem3"));
+	}
+
+	[Test, Order(4)]
+	[Category(UITestCategories.TabbedPage)]
+	[Category(UITestCategories.Navigation)]
+	public void NavigationFromTab1ToTab3SkippingTab2ShowsCorrectParameters()
+	{
+		// Start on Tab 1
+		App.TapTab("Tab 1");
+		App.WaitForElement(Tab1Content);
+
+		// Navigate directly to Tab 3 (skipping Tab 2)
+		App.TapTab("Tab 3");
+		App.WaitForElement(Tab3Content);
+
+		// Verify Tab 3 shows Tab 1 as previous page
+		var tab3OnNavigatedToText = App.FindElement(Tab3OnNavigatedToLabel).GetText();
+		Assert.That(tab3OnNavigatedToText, Does.Contain("PreviousPage: Issue21814TabItem1"));
+		Assert.That(tab3OnNavigatedToText, Does.Contain("NavigationType: Replace"));
+
+		// Verify Tab 1's navigation from parameters point to Tab 3
+		App.TapTab("Tab 1");
+		App.WaitForElement(Tab1Content);
+		
+		var tab1OnNavigatedFromText = App.FindElement(Tab1OnNavigatedFromLabel).GetText();
+		Assert.That(tab1OnNavigatedFromText, Does.Contain("DestinationPage: Issue21814TabItem3"));
+	}
+	
+	[Test, Order(5)]
+	[Category(UITestCategories.TabbedPage)]
+	[Category(UITestCategories.Navigation)]
+	[Description("Edge case: Verify behavior when tapping the same tab multiple times")]
+	public void TappingSameTabMultipleTimesDoesNotTriggerNavigationEvents()
+	{
+		// Start on Tab 1
+		App.WaitForElement(Tab1Content);
+            
+		// Get initial state
+		var initialOnNavigatedFrom = App.FindElement(Tab1OnNavigatedFromLabel).GetText();
+            
+		// Tap Tab 1 multiple times (should not trigger navigation events)
+		App.TapTab("Tab 1");
+		App.TapTab("Tab 1");
+		App.TapTab("Tab 1");
+            
+		// Verify no navigation events were triggered
+		var currentOnNavigatedFrom = App.FindElement(Tab1OnNavigatedFromLabel).GetText();
+		Assert.That(currentOnNavigatedFrom, Is.EqualTo(initialOnNavigatedFrom));
+	}
 }
\ No newline at end of file

From 4ae778ab4a2e56fc9c4a32ca5ab564411478d38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 6 Jun 2025 10:53:36 +0200
Subject: [PATCH 15/39] More FlyoutPage tests

---
 .../Tests/Issues/Issue21814FlyoutPage.cs      | 77 +++++++++++++++++--
 1 file changed, 69 insertions(+), 8 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index 98436b9854e4..bc6acdb6a3d4 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using NUnit.Framework.Legacy;
 using UITest.Appium;
 using UITest.Core;
 
@@ -7,21 +6,83 @@ namespace Microsoft.Maui.TestCases.Tests.Issues;
 
 public class Issue21814FlyoutPage : _IssuesUITest
 {
+	const string FlyoutContent1 = "FlyoutContent1";
+	const string FlyoutContent2 = "FlyoutContent2";
+	const string FlyoutContent3 = "FlyoutContent3";
+
+	const string FlyoutItem1OnNavigatedToLabel = "FlyoutItem1OnNavigatedToLabel";
+	const string FlyoutItem1OnNavigatedFromLabel = "FlyoutItem1OnNavigatedFromLabel";
+
+	const string FlyoutItem2OnNavigatedToLabel = "FlyoutItem2OnNavigatedToLabel";
+	const string FlyoutItem2OnNavigatedFromLabel = "FlyoutItem2OnNavigatedFromLabel";
+
+	const string FlyoutItem3OnNavigatedToLabel = "FlyoutItem3OnNavigatedToLabel";
+	const string FlyoutItem3OnNavigatedFromLabel = "FlyoutItem3OnNavigatedFromLabel";
+
+	const string Item1MenuItem = "Item 1";
+	const string Item2MenuItem = "Item 2";
+	const string Item3MenuItem = "Item 3";
+
 	public Issue21814FlyoutPage(TestDevice device) : base(device)
 	{
 	}
 
 	public override string Issue => "Add better parameters for navigation args (FlyoutPage)";
 
-	[Test]
-	[Category(UITestCategories.Navigation)]
+	[Test, Order(1)]
 	[Category(UITestCategories.FlyoutPage)]
-	public void VerifyFlyoutPageInitialNavigationEventArgs()
+	[Category(UITestCategories.Navigation)]
+	public void InitialPageLoadShowsCorrectNavigationInfo()
 	{
+		// Verify Item 1 is initially loaded and shows correct navigation info
 		App.WaitForElement("FlyoutContent1");
-		
-		App.WaitForElement("FlyoutItem1OnNavigatedToLabel");
-		var navigatedTo = App.FindElement("FlyoutItem1OnNavigatedToLabel").GetText();
-		Assert.That(navigatedTo, Is.EqualTo("PreviousPage: Null, NavigationType: Push"));
+
+		var onNavigatedToText = App.FindElement(FlyoutItem1OnNavigatedToLabel).GetText();
+		Assert.That(onNavigatedToText, Does.Contain("PreviousPage: Null"));
+		Assert.That(onNavigatedToText, Does.Contain("NavigationType: Push"));
+
+		// Initially, OnNavigatingFrom and OnNavigatedFrom should show "-"
+		var onNavigatedFromText = App.FindElement(FlyoutItem1OnNavigatedFromLabel).GetText();
+		Assert.That(onNavigatedFromText, Is.EqualTo("-"));
+	}
+
+	[Test, Order(2)]
+	[Category(UITestCategories.FlyoutPage)]
+	[Category(UITestCategories.Navigation)]
+	public void NavigationFromItem1ToItem2ShowsCorrectParameters()
+	{
+		// Start on Item 1
+		App.WaitForElement(FlyoutContent1);
+
+		// Open flyout menu and navigate to Item 2
+		OpenFlyoutMenu();
+		App.Tap(Item2MenuItem);
+		App.WaitForElement(FlyoutContent2);
+
+		// Verify Item 2 navigation parameters
+		var item2OnNavigatedToText = App.FindElement(FlyoutItem2OnNavigatedToLabel).GetText();
+		Assert.That(item2OnNavigatedToText, Does.Contain("PreviousPage: Issue21814FlyoutItem1"));
+		Assert.That(item2OnNavigatedToText, Does.Contain("NavigationType: Push"));
+	}
+
+	[Test, Order(3)]
+	[Category(UITestCategories.FlyoutPage)]
+	[Category(UITestCategories.Navigation)]
+	public void NavigationFromItem2ToItem3ShowsCorrectParameters()
+	{
+		// Navigate to Item 3
+		OpenFlyoutMenu();
+		App.Tap(Item3MenuItem);
+		App.WaitForElement(FlyoutContent3);
+            
+		// Verify Item 3 navigation parameters
+		var item3OnNavigatedToText = App.FindElement(FlyoutItem3OnNavigatedToLabel).GetText();
+		Assert.That(item3OnNavigatedToText, Does.Contain("PreviousPage: Issue21814FlyoutItem1"));
+		Assert.That(item3OnNavigatedToText, Does.Contain("NavigationType: Push"));
+	}
+	
+	void OpenFlyoutMenu()
+	{
+		App.TapFlyoutPageIcon();
 	}
 }
\ No newline at end of file

From 8dfba1de36f8ffdfa37e4d80432a4bbff4c7ca04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 6 Jun 2025 10:55:49 +0200
Subject: [PATCH 16/39] Updated test

---
 .../TestCases.Shared.Tests/Tests/Issues/Issue21814.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
index 90c841c9ec6c..881b007b3afe 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814.cs
@@ -23,9 +23,6 @@ public void VerifyNavigationEventArgs()
 			var navigatedToBeforeNavigate = App.FindElement("OnNavigatedToLabel").GetText();
 			Assert.That(navigatedToBeforeNavigate, Is.EqualTo("PreviousPage: Null, NavigationType: Push"));
 
-			var navigatingFromBeforeNavigate = App.FindElement("OnNavigatingFromLabel").GetText();
-			Assert.That(navigatingFromBeforeNavigate, Is.EqualTo("-"));
-
 			var navigatedFromBeforeNavigate = App.FindElement("OnNavigatedFromLabel").GetText();
 			Assert.That(navigatedFromBeforeNavigate, Is.EqualTo("-"));
 
@@ -34,10 +31,7 @@ public void VerifyNavigationEventArgs()
 			App.WaitForElement("OnNavigatedToLabel");
 			var navigatedToPage2 = App.FindElement("OnNavigatedToLabel").GetText();
 			Assert.That(navigatedToPage2, Is.EqualTo("PreviousPage: Issue21814FirstPage, NavigationType: Push"));
-
-			var navigatingFromPage2 = App.FindElement("OnNavigatingFromLabel").GetText();
-			Assert.That(navigatingFromPage2, Is.EqualTo("-"));
-
+			
 			var navigatedFromPage2 = App.FindElement("OnNavigatedFromLabel").GetText();
 			Assert.That(navigatedFromPage2, Is.EqualTo("-"));
 
@@ -47,9 +41,6 @@ public void VerifyNavigationEventArgs()
 			var navigatedToAfterNavigate = App.FindElement("OnNavigatedToLabel").GetText();
 			Assert.That(navigatedToAfterNavigate, Is.EqualTo("PreviousPage: Issue21814SecondPage, NavigationType: Pop"));
 
-			var navigatingFromAfterNavigate = App.FindElement("OnNavigatingFromLabel").GetText();
-			Assert.That(navigatingFromAfterNavigate, Is.EqualTo("DestinationPage: Issue21814SecondPage, NavigationType: Push"));
-
 			var navigatedFromAfterNavigate = App.FindElement("OnNavigatedFromLabel").GetText();
 			Assert.That(navigatedFromAfterNavigate, Is.EqualTo("DestinationPage: Issue21814SecondPage, NavigationType: Push"));
 

From c45bf21258c632cb322259e94a40e6d3c57735ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 17 Jun 2025 13:25:02 +0200
Subject: [PATCH 17/39] Fixed tests

---
 .../TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index bc6acdb6a3d4..888770894a48 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -83,6 +83,6 @@ public void NavigationFromItem2ToItem3ShowsCorrectParameters()
 	
 	void OpenFlyoutMenu()
 	{
-		App.TapFlyoutPageIcon();
+		App.TapFlyoutPageIcon("Flyout Menu");
 	}
 }
\ No newline at end of file

From 20b8f52e53dbcf3bcc2a564ee3366ea65b7c1d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 26 Jun 2025 16:12:12 +0200
Subject: [PATCH 18/39] Use Replace with Tabs and FlyoutItems

---
 .../src/Core/NavigationPage/NavigationPage.cs | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index 725161d53268..6be5a38a7028 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -695,7 +695,9 @@ private protected override void OnHandlerChangedCore()
 				var visiblePage = Navigation.NavigationStack[NavigationStack.Count - 1];
 				RootPage = navStack[0];
 				CurrentPage = visiblePage;
-
+				
+				var navigationType = DetermineNavigationType();
+				
 				SendHandlerUpdateAsync(false, null,
 				() =>
 				{
@@ -703,7 +705,7 @@ private protected override void OnHandlerChangedCore()
 				},
 				() =>
 				{
-					SendNavigated(null, NavigationType);
+					SendNavigated(null, navigationType);
 				})
 				.FireAndForget(Handler);
 			}
@@ -715,7 +717,21 @@ private protected override void OnHandlerChangedCore()
 				((IStackNavigation)this).NavigationFinished(this.NavigationStack);
 			}
 		}
+		
+		NavigationType DetermineNavigationType()
+		{
+			var parentPages = this.GetParentPages();
+
+			bool hasTabOrFlyout = parentPages.Any(page => page is FlyoutPage or TabbedPage);
+    
+			if (hasTabOrFlyout)
+			{
+				return NavigationType.Replace;
+			}
 
+			return NavigationType.Push;
+		}
+		
 		// Once we get all platforms over to the new APIs
 		// we can just delete all the code inside NavigationPage.cs that fires "requested" events
 		class MauiNavigationImpl : NavigationProxy
@@ -851,23 +867,24 @@ protected override Task OnPushAsync(Page root, bool animated)
 				if (Owner.InternalChildren.Contains(root))
 					return Task.CompletedTask;
 
+				var navigationType = Owner.DetermineNavigationType();
 				var previousPage = Owner.CurrentPage;
 
 				return Owner.SendHandlerUpdateAsync(animated,
 					() =>
 					{
-						Owner.NavigationType = NavigationType.Push;
+						Owner.NavigationType = navigationType;
 						Owner.PushPage(root);
 					},
 					() =>
 					{
-						Owner.SendNavigating(NavigationType.Push, previousPage);
+						Owner.SendNavigating(navigationType, previousPage);
 						Owner.FireDisappearing(previousPage);
 						Owner.FireAppearing(root);
 					},
 					() =>
 					{
-						Owner.SendNavigated(previousPage, NavigationType.Push);
+						Owner.SendNavigated(previousPage, navigationType);
 						Owner?.Pushed?.Invoke(Owner, new NavigationEventArgs(root));
 					});
 			}

From c9c1a4edc94fe59e78e86c333643dc283f8c2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 27 Jun 2025 09:16:24 +0200
Subject: [PATCH 19/39] Fixed unit tests

---
 src/Controls/tests/Core.UnitTests/AlertManagerTests.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Controls/tests/Core.UnitTests/AlertManagerTests.cs b/src/Controls/tests/Core.UnitTests/AlertManagerTests.cs
index 0d52f54bf8da..ca33681ec6b2 100644
--- a/src/Controls/tests/Core.UnitTests/AlertManagerTests.cs
+++ b/src/Controls/tests/Core.UnitTests/AlertManagerTests.cs
@@ -96,7 +96,7 @@ public void BusySentWhenBusyPageAppears()
 			window.Page = page;
 
 			((IPageController)page).SendAppearing();
-			page.SendNavigatedTo(new NavigatedToEventArgs(null));
+			page.SendNavigatedTo(new NavigatedToEventArgs(null, NavigationType.Push));
 
 			sub.Received().OnPageBusy(Arg.Is(page), Arg.Is(true));
 		}
@@ -109,7 +109,7 @@ public void BusySentWhenBusyPageDisappears()
 			window.Page = page;
 
 			((IPageController)page).SendAppearing();
-			page.SendNavigatedTo(new NavigatedToEventArgs(null));
+			page.SendNavigatedTo(new NavigatedToEventArgs(null, NavigationType.Push));
 
 			sub.ClearReceivedCalls();
 
@@ -126,7 +126,7 @@ public void BusySentWhenBusyPageIsNoLongerBusy()
 			window.Page = page;
 
 			((IPageController)page).SendAppearing();
-			page.SendNavigatedTo(new NavigatedToEventArgs(null));
+			page.SendNavigatedTo(new NavigatedToEventArgs(null, NavigationType.Push));
 
 			sub.ClearReceivedCalls();
 
@@ -143,7 +143,7 @@ public void BusySentWhenVisiblePageSetToBusy()
 			window.Page = page;
 
 			((IPageController)page).SendAppearing();
-			page.SendNavigatedTo(new NavigatedToEventArgs(null));
+			page.SendNavigatedTo(new NavigatedToEventArgs(null, NavigationType.Push));
 
 			sub.ClearReceivedCalls();
 

From 2b3cc790d21c60fdfc32deaae33bc895787158ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 27 Jun 2025 12:36:03 +0200
Subject: [PATCH 20/39] Updated test

---
 .../Tests/Issues/Issue21814FlyoutPage.cs                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index 888770894a48..b8eae04c584e 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -39,7 +39,7 @@ public void InitialPageLoadShowsCorrectNavigationInfo()
 
 		var onNavigatedToText = App.FindElement(FlyoutItem1OnNavigatedToLabel).GetText();
 		Assert.That(onNavigatedToText, Does.Contain("PreviousPage: Null"));
-		Assert.That(onNavigatedToText, Does.Contain("NavigationType: Push"));
+		Assert.That(onNavigatedToText, Does.Contain("NavigationType: Replace"));
 
 		// Initially, OnNavigatingFrom and OnNavigatedFrom should show "-"
 		var onNavigatedFromText = App.FindElement(FlyoutItem1OnNavigatedFromLabel).GetText();
@@ -62,7 +62,7 @@ public void NavigationFromItem1ToItem2ShowsCorrectParameters()
 		// Verify Item 2 navigation parameters
 		var item2OnNavigatedToText = App.FindElement(FlyoutItem2OnNavigatedToLabel).GetText();
 		Assert.That(item2OnNavigatedToText, Does.Contain("PreviousPage: Issue21814FlyoutItem1"));
-		Assert.That(item2OnNavigatedToText, Does.Contain("NavigationType: Push"));
+		Assert.That(item2OnNavigatedToText, Does.Contain("NavigationType: Replace"));
 	}
 
 	[Test, Order(3)]
@@ -78,7 +78,7 @@ public void NavigationFromItem2ToItem3ShowsCorrectParameters()
 		// Verify Item 3 navigation parameters
 		var item3OnNavigatedToText = App.FindElement(FlyoutItem3OnNavigatedToLabel).GetText();
 		Assert.That(item3OnNavigatedToText, Does.Contain("PreviousPage: Issue21814FlyoutItem1"));
-		Assert.That(item3OnNavigatedToText, Does.Contain("NavigationType: Push"));
+		Assert.That(item3OnNavigatedToText, Does.Contain("NavigationType: Replace"));
 	}
 	
 	void OpenFlyoutMenu()

From 1223371a369e36a5b4082baeecc6db69faea37b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 30 Jun 2025 12:07:14 +0200
Subject: [PATCH 21/39] Fix iOS Flyout tests

---
 .../src/Core/NavigationPage/NavigationPage.Legacy.cs   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
index a61c22224fcd..1b8871dc921d 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs
@@ -183,7 +183,9 @@ async Task PushAsyncInner(Page page, bool animated)
 				return;
 
 			var previousPage = CurrentPage;
-			SendNavigating(NavigationType.Push, previousPage);
+			var navigationType = DetermineNavigationType();
+			
+			SendNavigating(navigationType, previousPage);
 			FireDisappearing(CurrentPage);
 			FireAppearing(page);
 
@@ -198,9 +200,9 @@ async Task PushAsyncInner(Page page, bool animated)
 
 				if (args.Task != null)
 					await args.Task;
-			}
-
-			SendNavigated(previousPage, NavigationType.Push);
+			} 
+			
+			SendNavigated(previousPage, navigationType);
 			Pushed?.Invoke(this, args);
 		}
 

From 631300c0e5d68a73c1084dc4b01e526241fab85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 30 Jun 2025 16:33:45 +0200
Subject: [PATCH 22/39] Changes in tests

---
 .../Tests/Issues/Issue21814FlyoutPage.cs                      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index b8eae04c584e..f26142e1f21f 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -70,6 +70,10 @@ public void NavigationFromItem1ToItem2ShowsCorrectParameters()
 	[Category(UITestCategories.Navigation)]
 	public void NavigationFromItem2ToItem3ShowsCorrectParameters()
 	{
+#if IOS || MACCATALYST
+		App.TapBackArrow("Item 1");
+#endif
+		
 		// Navigate to Item 3
 		OpenFlyoutMenu();
 		App.Tap(Item3MenuItem);

From 207e0755f3fa55466354a3ddd46a080fd1f83e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 2 Jul 2025 15:53:41 +0200
Subject: [PATCH 23/39] Fix test on Android

---
 .../Tests/Issues/Issue21814FlyoutPage.cs                      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index f26142e1f21f..0efcc2491bd4 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -70,7 +70,9 @@ public void NavigationFromItem1ToItem2ShowsCorrectParameters()
 	[Category(UITestCategories.Navigation)]
 	public void NavigationFromItem2ToItem3ShowsCorrectParameters()
 	{
-#if IOS || MACCATALYST
+#if ANDROID
+		App.TapBackArrow();
+#elif IOS || MACCATALYST
 		App.TapBackArrow("Item 1");
 #endif
 		

From 435fe31f54a5f3194000f6cd69e42e5f685b0c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 3 Jul 2025 13:51:52 +0200
Subject: [PATCH 24/39] Fixed Windows test

---
 .../TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index 0efcc2491bd4..e2d01c5fc2c7 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -70,7 +70,7 @@ public void NavigationFromItem1ToItem2ShowsCorrectParameters()
 	[Category(UITestCategories.Navigation)]
 	public void NavigationFromItem2ToItem3ShowsCorrectParameters()
 	{
-#if ANDROID
+#if ANDROID || WINDOWS
 		App.TapBackArrow();
 #elif IOS || MACCATALYST
 		App.TapBackArrow("Item 1");

From a5f5774e7d781f9dff2b8e0eb7aeffe9822fd4e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 14 Jul 2025 10:26:46 +0200
Subject: [PATCH 25/39] Fixed parameters in NavigatingFromEventArgs

---
 .../src/Core/FlyoutPage/FlyoutPage.cs         | 23 +++++++++++--------
 src/Controls/src/Core/MultiPage.cs            | 10 ++++----
 .../Tests/Issues/Issue21814FlyoutPage.cs      | 11 ++++++---
 .../Tests/Issues/Issue21814TabbedPage.cs      |  5 ++++
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index b37520ec9963..480b946bb497 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -53,9 +53,7 @@ public Page Detail
 					throw new InvalidOperationException("Detail must not already have a parent.");
 
 				var previousDetail = _detail;
-				// TODO MAUI refine this to fire earlier
-				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs(previousDetail, NavigationType.Replace));
-
+		
 				OnPropertyChanging();
 				if (_detail != null)
 					InternalChildren.Remove(_detail);
@@ -68,9 +66,15 @@ public Page Detail
 					previousDetail?.SendDisappearing();
 					_detail?.SendAppearing();
 				}
-
-				previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(_detail, NavigationType.Replace));
-				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousDetail, NavigationType.Replace));
+				
+				var destinationPage = _detail is NavigationPage currentNavPage ? currentNavPage.CurrentPage : _detail;
+				var previousPage = previousDetail is NavigationPage previousNavPage ? previousNavPage.CurrentPage : previousDetail;
+				
+				// TODO MAUI refine this to fire earlier
+				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage, NavigationType.Replace));
+				
+				previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(destinationPage, NavigationType.Replace));
+				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
 			}
 		}
 
@@ -108,8 +112,6 @@ public Page Flyout
 
 				// TODO MAUI refine this to fire earlier
 				var previousFlyout = _flyout;
-				// TODO MAUI refine this to fire earlier
-				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs(_flyout, NavigationType.Replace));
 
 				OnPropertyChanging();
 				if (_flyout != null)
@@ -123,7 +125,10 @@ public Page Flyout
 					previousFlyout?.SendDisappearing();
 					_flyout?.SendAppearing();
 				}
-
+				
+				// TODO MAUI refine this to fire earlier
+				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs(_flyout, NavigationType.Replace));
+				
 				previousFlyout?.SendNavigatedFrom(new NavigatedFromEventArgs(_flyout, NavigationType.Replace));
 				_flyout?.SendNavigatedTo(new NavigatedToEventArgs(previousFlyout, NavigationType.Replace));
 			}
diff --git a/src/Controls/src/Core/MultiPage.cs b/src/Controls/src/Core/MultiPage.cs
index 37062847afeb..b1ac1567ae54 100644
--- a/src/Controls/src/Core/MultiPage.cs
+++ b/src/Controls/src/Core/MultiPage.cs
@@ -83,10 +83,7 @@ public T CurrentPage
 
 				var previousPage = _current;
 				OnPropertyChanging();
-
-				// TODO: MAUI refine this to fire earlier
-				_current?.SendNavigatingFrom(new NavigatingFromEventArgs(_current, NavigationType.Replace));
-
+				
 				_current = value;
 
 				previousPage?.SendDisappearing();
@@ -96,7 +93,10 @@ public T CurrentPage
 
 				if (HasAppeared)
 					_current?.SendAppearing();
-
+				
+				// TODO: MAUI refine this to fire earlier
+				_current?.SendNavigatingFrom(new NavigatingFromEventArgs(_current, NavigationType.Replace));
+				
 				previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(_current, NavigationType.Replace));
 				_current?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
 			}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index e2d01c5fc2c7..e5fc9587f645 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -11,6 +11,7 @@ public class Issue21814FlyoutPage : _IssuesUITest
 	const string FlyoutContent3 = "FlyoutContent3";
 
 	const string FlyoutItem1OnNavigatedToLabel = "FlyoutItem1OnNavigatedToLabel";
+	const string FlyoutItem1OnNavigatingFromLabel = "FlyoutItem1OnNavigatingFromLabel";
 	const string FlyoutItem1OnNavigatedFromLabel = "FlyoutItem1OnNavigatedFromLabel";
 
 	const string FlyoutItem2OnNavigatedToLabel = "FlyoutItem2OnNavigatedToLabel";
@@ -37,6 +38,10 @@ public void InitialPageLoadShowsCorrectNavigationInfo()
 		// Verify Item 1 is initially loaded and shows correct navigation info
 		App.WaitForElement("FlyoutContent1");
 
+		var onNavigatingFromText = App.FindElement(FlyoutItem1OnNavigatingFromLabel).GetText();
+		Assert.That(onNavigatingFromText, Does.Contain("DestinationPage: Issue21814FlyoutItem1"));
+		Assert.That(onNavigatingFromText, Does.Contain("NavigationType: Replace"));
+
 		var onNavigatedToText = App.FindElement(FlyoutItem1OnNavigatedToLabel).GetText();
 		Assert.That(onNavigatedToText, Does.Contain("PreviousPage: Null"));
 		Assert.That(onNavigatedToText, Does.Contain("NavigationType: Replace"));
@@ -75,18 +80,18 @@ public void NavigationFromItem2ToItem3ShowsCorrectParameters()
 #elif IOS || MACCATALYST
 		App.TapBackArrow("Item 1");
 #endif
-		
+
 		// Navigate to Item 3
 		OpenFlyoutMenu();
 		App.Tap(Item3MenuItem);
 		App.WaitForElement(FlyoutContent3);
-            
+
 		// Verify Item 3 navigation parameters
 		var item3OnNavigatedToText = App.FindElement(FlyoutItem3OnNavigatedToLabel).GetText();
 		Assert.That(item3OnNavigatedToText, Does.Contain("PreviousPage: Issue21814FlyoutItem1"));
 		Assert.That(item3OnNavigatedToText, Does.Contain("NavigationType: Replace"));
 	}
-	
+
 	void OpenFlyoutMenu()
 	{
 		App.TapFlyoutPageIcon("Flyout Menu");
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
index 060a24e30cee..06380b0c000a 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
@@ -11,6 +11,7 @@ public class Issue21814TabbedPage : _IssuesUITest
 	const string Tab3Content = "Tab3Content";
 
 	const string Tab1OnNavigatedToLabel = "Tab1OnNavigatedToLabel";
+	const string Tab1OnNavigatingFromLabel = "Tab1OnNavigatingFromLabel";
 	const string Tab1OnNavigatedFromLabel = "Tab1OnNavigatedFromLabel";
 
 	const string Tab2OnNavigatedToLabel = "Tab2OnNavigatedToLabel";
@@ -33,6 +34,10 @@ public void InitialTabLoadShowsCorrectNavigationInfo()
 		// Verify Tab 1 is initially loaded and shows correct navigation info
 		App.WaitForElement(Tab1Content);
 
+		var onNavigatingFromText = App.FindElement(Tab1OnNavigatingFromLabel).GetText();
+		Assert.That(onNavigatingFromText, Does.Contain("DestinationPage: Issue21814TabItem1"));
+		Assert.That(onNavigatingFromText, Does.Contain("NavigationType: Replace"));
+		
 		var onNavigatedToText = App.FindElement(Tab1OnNavigatedToLabel).GetText();
 		Assert.That(onNavigatedToText, Does.Contain("PreviousPage: Null"));
 		Assert.That(onNavigatedToText, Does.Contain("NavigationType: Replace"));

From 882f728736314a8a3959c0ad030de836d0794211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 15 Jul 2025 15:50:11 +0200
Subject: [PATCH 26/39] Updated TabbedPage unit test

---
 .../tests/Core.UnitTests/PageLifeCycleTests.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs b/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
index 17f87861657a..4f67a2510de6 100644
--- a/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
@@ -102,16 +102,26 @@ public async Task TabbedPageBasicSelectionChanged()
 		[Fact]
 		public void TabbedPageInitialPage()
 		{
-			var firstPage = new LCPage() { Title = "First Page" };
-			var secondPage = new LCPage() { Title = "Second Page" };
+			var firstPage = new LCPage { Title = "First Page" };
+			var secondPage = new LCPage { Title = "Second Page" };
 			var tabbedPage = new TabbedPage().AddToTestWindow();
 
 			tabbedPage.Children.Add(firstPage);
 			tabbedPage.Children.Add(secondPage);
-			Assert.Null(firstPage.NavigatingFromArgs);
-			Assert.Null(firstPage.NavigatedFromArgs);
+			
 			Assert.NotNull(firstPage.NavigatedToArgs);
 			Assert.Null(firstPage.NavigatedToArgs.PreviousPage);
+
+			if (firstPage.NavigatingFromArgs is not null)
+			{
+				Assert.Same(firstPage, firstPage.NavigatingFromArgs.DestinationPage);
+				Assert.Equal(NavigationType.Replace, firstPage.NavigatingFromArgs.NavigationType);
+			}
+
+			if (firstPage.NavigatedFromArgs is not null)
+			{
+				Assert.Same(secondPage, firstPage.NavigatedFromArgs.DestinationPage);
+			}
 		}
 
 		[Fact]

From 97e282c45796c929d12890fafda563ade6e087c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 15 Jul 2025 16:47:22 +0200
Subject: [PATCH 27/39] Added more navigation unit tests

---
 .../Core.UnitTests/PageLifeCycleTests.cs      | 113 +++++++++++++++++-
 1 file changed, 112 insertions(+), 1 deletion(-)

diff --git a/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs b/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
index 4f67a2510de6..4fe88dd05c9c 100644
--- a/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
@@ -367,6 +367,117 @@ public async Task LoadedFiresOnInitialSubscription()
 			Assert.Equal(1, unLoadedCnt);
 		}
 
+		[Fact]
+		public async Task NavigationPageMultiplePushesAndPops()
+		{
+			var firstPage = new LCPage();
+			var secondPage = new LCPage();
+			var thirdPage = new LCPage();
+			var navigationPage = new TestNavigationPage(true, firstPage)
+				.AddToTestWindow();
+
+			// Push two pages
+			await navigationPage.PushAsync(secondPage);
+			await navigationPage.PushAsync(thirdPage);
+
+			// Verify event args after multiple pushes
+			Assert.NotNull(secondPage.NavigatingFromArgs);
+			Assert.NotNull(secondPage.NavigatedFromArgs);
+			Assert.NotNull(thirdPage.NavigatedToArgs);
+			Assert.Equal(secondPage, thirdPage.NavigatedToArgs.PreviousPage);
+			Assert.Equal(thirdPage, secondPage.NavigatedFromArgs.DestinationPage);
+
+			// Pop back to second page
+			await navigationPage.PopAsync();
+
+			Assert.NotNull(thirdPage.NavigatingFromArgs);
+			Assert.NotNull(thirdPage.NavigatedFromArgs);
+			Assert.NotNull(secondPage.NavigatedToArgs);
+			Assert.Equal(thirdPage, secondPage.NavigatedToArgs.PreviousPage);
+			Assert.Equal(secondPage, thirdPage.NavigatedFromArgs.DestinationPage);
+
+			// Verify Loaded/Unloaded counts
+			int secondPageLoadedCnt = 0;
+			int secondPageUnloadedCnt = 0;
+			secondPage.Loaded += (_, _) => secondPageLoadedCnt++;
+			secondPage.Unloaded += (_, _) => secondPageUnloadedCnt++;
+
+			// Initial subscription should trigger Loaded
+			Assert.Equal(1, secondPageLoadedCnt);
+			Assert.Equal(0, secondPageUnloadedCnt);
+
+			// Pop back to first page
+			await navigationPage.PopAsync();
+			Assert.Equal(1, secondPageLoadedCnt);
+			Assert.Equal(1, secondPageUnloadedCnt);
+		}
+
+		[Fact]
+		public async Task TabbedPageMultipleTabSwitches()
+		{
+			var firstPage = new LCPage { Title = "First Page" };
+			var secondPage = new LCPage { Title = "Second Page" };
+
+			var tabbedPage = new TabbedPage { Children = { firstPage, secondPage } }
+				.AddToTestWindow();
+
+			// Add load/unload counters for second page
+			int secondPageLoadedCnt = 0;
+			int secondPageUnloadedCnt = 0;
+			secondPage.Loaded += (_, _) => secondPageLoadedCnt++;
+			secondPage.Unloaded += (_, _) => secondPageUnloadedCnt++;
+
+			// Switch to second page
+			tabbedPage.CurrentPage = secondPage;
+			Assert.NotNull(firstPage.NavigatingFromArgs);
+			Assert.NotNull(firstPage.NavigatedFromArgs);
+			Assert.NotNull(secondPage.NavigatedToArgs);
+			Assert.Equal(firstPage, secondPage.NavigatedToArgs.PreviousPage);
+			Assert.Equal(secondPage, firstPage.NavigatedFromArgs.DestinationPage);
+
+			// Verify Loaded/Unloaded for second page
+			Assert.Equal(1, secondPageLoadedCnt);
+			Assert.Equal(0, secondPageUnloadedCnt);
+
+			// Switch back to first page
+			tabbedPage.CurrentPage = firstPage;
+			Assert.Equal(1, secondPageLoadedCnt);
+			// This assertion is currently failing due to unexpected unload behavior on navigation.
+			// See: https://github.com/dotnet/maui/issues/30627 for context and discussion.
+			//Assert.Equal(1, secondPageUnloadedCnt);
+		}
+
+		[Fact]
+		public async Task FlyoutPageMultipleDetailChanges()
+		{
+			var flyout = new LCPage { Title = "Flyout" };
+			var firstDetail = new LCPage { Title = "First Detail" };
+			var secondDetail = new LCPage { Title = "Second Detail" };
+			var flyoutPage = new FlyoutPage { Flyout = flyout, Detail = firstDetail }.AddToTestWindow();
+
+			// Change to second detail
+			flyoutPage.Detail = secondDetail;
+			Assert.NotNull(firstDetail.NavigatingFromArgs);
+			Assert.NotNull(firstDetail.NavigatedFromArgs);
+			Assert.NotNull(secondDetail.NavigatedToArgs);
+			Assert.Equal(firstDetail, secondDetail.NavigatedToArgs.PreviousPage);
+			Assert.Equal(secondDetail, firstDetail.NavigatedFromArgs.DestinationPage);
+
+			// Verify Loaded/Unloaded for second detail
+			int secondDetailLoadedCnt = 0;
+			int secondDetailUnloadedCnt = 0;
+			secondDetail.Loaded += (_, _) => secondDetailLoadedCnt++;
+			secondDetail.Unloaded += (_, _) => secondDetailUnloadedCnt++;
+
+			Assert.Equal(1, secondDetailLoadedCnt);
+			Assert.Equal(0, secondDetailUnloadedCnt);
+
+			// Change back to first detail
+			flyoutPage.Detail = firstDetail;
+			Assert.Equal(1, secondDetailLoadedCnt);
+			Assert.Equal(1, secondDetailUnloadedCnt);
+		}
+
 		public class LCPage : ContentPage
 		{
 			public NavigatedFromEventArgs NavigatedFromArgs { get; private set; }
@@ -413,4 +524,4 @@ protected override void OnNavigatedTo(NavigatedToEventArgs args)
 			}
 		}
 	}
-}
+}
\ No newline at end of file

From 6442596cd9ab42922e40440210a46aa79fd624c4 Mon Sep 17 00:00:00 2001
From: "Shane Neuville (HE/HIM)" <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 15:06:08 -0500
Subject: [PATCH 28/39] - fix publicapi.txt files

---
 .../src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt         | 1 +
 src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt    | 1 +
 .../src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt     | 1 +
 .../src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt         | 1 +
 src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt        | 1 +
 .../src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt         | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
index 5afd80803de5..9a66200387d8 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -5959,6 +5959,7 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
index 49175205a4b9..bc23fdcf7b0d 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Shipped.txt
@@ -6155,6 +6155,7 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
index 49175205a4b9..bc23fdcf7b0d 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
@@ -6155,6 +6155,7 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
index ccd63e4ea678..cf65d0893ede 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Shipped.txt
@@ -5624,6 +5624,7 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
index a83f5c13b9e8..77dee329f41a 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Shipped.txt
@@ -5380,6 +5380,7 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
index a83f5c13b9e8..77dee329f41a 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Shipped.txt
@@ -5380,6 +5380,7 @@ Microsoft.Maui.Controls.NavigableElement
 Microsoft.Maui.Controls.NavigatedFromEventArgs
 Microsoft.Maui.Controls.NavigatedToEventArgs
 Microsoft.Maui.Controls.NavigatingFromEventArgs
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
 Microsoft.Maui.Controls.NavigationEventArgs
 Microsoft.Maui.Controls.NavigationPage
 Microsoft.Maui.Controls.NavigationPage.NavigationPage() -> void

From 5cde60c97770301bf26d50dd04a9fc69d3d0b0dc Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 15:10:49 -0500
Subject: [PATCH 29/39] Update FlyoutPage.cs

---
 .../src/Core/FlyoutPage/FlyoutPage.cs         | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index 480b946bb497..c6d5c831a2de 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -52,7 +52,12 @@ public Page Detail
 				if (value.RealParent != null)
 					throw new InvalidOperationException("Detail must not already have a parent.");
 
-				var previousDetail = _detail;
+				var previousDetail = _detail;				
+				var destinationPage = _detail is NavigationPage currentNavPage ? currentNavPage.CurrentPage : _detail;
+				var previousPage = previousDetail is NavigationPage previousNavPage ? previousNavPage.CurrentPage : previousDetail;
+				
+				// TODO MAUI refine this to fire earlier
+				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage, NavigationType.Replace));
 		
 				OnPropertyChanging();
 				if (_detail != null)
@@ -66,13 +71,7 @@ public Page Detail
 					previousDetail?.SendDisappearing();
 					_detail?.SendAppearing();
 				}
-				
-				var destinationPage = _detail is NavigationPage currentNavPage ? currentNavPage.CurrentPage : _detail;
-				var previousPage = previousDetail is NavigationPage previousNavPage ? previousNavPage.CurrentPage : previousDetail;
-				
-				// TODO MAUI refine this to fire earlier
-				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage, NavigationType.Replace));
-				
+	
 				previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(destinationPage, NavigationType.Replace));
 				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
 			}
@@ -112,6 +111,9 @@ public Page Flyout
 
 				// TODO MAUI refine this to fire earlier
 				var previousFlyout = _flyout;
+				
+				// TODO MAUI refine this to fire earlier
+				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs(_flyout, NavigationType.Replace));
 
 				OnPropertyChanging();
 				if (_flyout != null)
@@ -126,9 +128,6 @@ public Page Flyout
 					_flyout?.SendAppearing();
 				}
 				
-				// TODO MAUI refine this to fire earlier
-				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs(_flyout, NavigationType.Replace));
-				
 				previousFlyout?.SendNavigatedFrom(new NavigatedFromEventArgs(_flyout, NavigationType.Replace));
 				_flyout?.SendNavigatedTo(new NavigatedToEventArgs(previousFlyout, NavigationType.Replace));
 			}

From a143401630d3211fc3c634601b6729ddd53174dc Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 15:12:51 -0500
Subject: [PATCH 30/39] Update FlyoutPage.cs

---
 src/Controls/src/Core/FlyoutPage/FlyoutPage.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index c6d5c831a2de..b3f47604c72f 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -57,7 +57,7 @@ public Page Detail
 				var previousPage = previousDetail is NavigationPage previousNavPage ? previousNavPage.CurrentPage : previousDetail;
 				
 				// TODO MAUI refine this to fire earlier
-				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage, NavigationType.Replace));
+				previousDetail?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
 		
 				OnPropertyChanging();
 				if (_detail != null)
@@ -113,7 +113,7 @@ public Page Flyout
 				var previousFlyout = _flyout;
 				
 				// TODO MAUI refine this to fire earlier
-				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs(_flyout, NavigationType.Replace));
+				previousFlyout?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
 
 				OnPropertyChanging();
 				if (_flyout != null)

From f6f4e700bf91c87a5a89178332b544d1374648ca Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 24 Jul 2025 15:14:06 -0500
Subject: [PATCH 31/39] Update MultiPage.cs

---
 src/Controls/src/Core/MultiPage.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Core/MultiPage.cs b/src/Controls/src/Core/MultiPage.cs
index b1ac1567ae54..77f2dbbb0169 100644
--- a/src/Controls/src/Core/MultiPage.cs
+++ b/src/Controls/src/Core/MultiPage.cs
@@ -83,6 +83,9 @@ public T CurrentPage
 
 				var previousPage = _current;
 				OnPropertyChanging();
+ 				
+				// TODO: MAUI refine this to fire earlier
+				_current?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
 				
 				_current = value;
 
@@ -94,8 +97,6 @@ public T CurrentPage
 				if (HasAppeared)
 					_current?.SendAppearing();
 				
-				// TODO: MAUI refine this to fire earlier
-				_current?.SendNavigatingFrom(new NavigatingFromEventArgs(_current, NavigationType.Replace));
 				
 				previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(_current, NavigationType.Replace));
 				_current?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
@@ -377,4 +378,4 @@ void UpdateCurrentPage()
 				CurrentPage = (T)SelectedItem;
 		}
 	}
-}
\ No newline at end of file
+}

From 78cd921bef091e3ad6a58ea0c54f83083148ec9d Mon Sep 17 00:00:00 2001
From: "Shane Neuville (HE/HIM)" <shneuvil@microsoft.com>
Date: Mon, 28 Jul 2025 14:30:23 -0500
Subject: [PATCH 32/39] - fix publicapi

---
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt  | 14 ++++++++++++++
 .../net-maccatalyst/PublicAPI.Unshipped.txt    | 14 ++++++++++++++
 .../net-windows/PublicAPI.Unshipped.txt        | 18 ++++++++++++++++--
 .../netstandard/PublicAPI.Unshipped.txt        | 14 ++++++++++++++
 .../net-windows/PublicAPI.Unshipped.txt        | 10 +++++-----
 5 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 054ddcc05bdc..ea64bf3a451f 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -100,6 +100,20 @@ Microsoft.Maui.Controls.LayoutConstraint.None = 0 -> Microsoft.Maui.Controls.Lay
 Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed = 2 -> Microsoft.Maui.Controls.LayoutConstraint
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter.MessagingCenter() -> void
+~Microsoft.Maui.Controls.NavigatedFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+Microsoft.Maui.Controls.NavigatedFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigatedToEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+~Microsoft.Maui.Controls.NavigatedToEventArgs.PreviousPage.get -> Microsoft.Maui.Controls.Page
+~Microsoft.Maui.Controls.NavigatingFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+*REMOVED*Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Insert = 3 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Pop = 1 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.PopToRoot = 2 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Push = 0 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Remove = 4 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Replace = 5 -> Microsoft.Maui.Controls.NavigationType
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, Microsoft.Maui.FlowDirection flowDirection, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayAlertAsync(string title, string message, string accept, string cancel) -> System.Threading.Tasks.Task<bool>
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index f7019d6cd768..3039f328cf95 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -100,6 +100,20 @@ Microsoft.Maui.Controls.LayoutConstraint.None = 0 -> Microsoft.Maui.Controls.Lay
 Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed = 2 -> Microsoft.Maui.Controls.LayoutConstraint
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter.MessagingCenter() -> void
+~Microsoft.Maui.Controls.NavigatedFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+Microsoft.Maui.Controls.NavigatedFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigatedToEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+~Microsoft.Maui.Controls.NavigatedToEventArgs.PreviousPage.get -> Microsoft.Maui.Controls.Page
+~Microsoft.Maui.Controls.NavigatingFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+*REMOVED*Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Insert = 3 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Pop = 1 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.PopToRoot = 2 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Push = 0 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Remove = 4 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Replace = 5 -> Microsoft.Maui.Controls.NavigationType
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, Microsoft.Maui.FlowDirection flowDirection, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayAlertAsync(string title, string message, string accept, string cancel) -> System.Threading.Tasks.Task<bool>
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index f2071345c830..10072f46d0c0 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -98,6 +98,20 @@ Microsoft.Maui.Controls.LayoutConstraint.None = 0 -> Microsoft.Maui.Controls.Lay
 Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed = 2 -> Microsoft.Maui.Controls.LayoutConstraint
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter.MessagingCenter() -> void
+~Microsoft.Maui.Controls.NavigatedFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+Microsoft.Maui.Controls.NavigatedFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigatedToEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+~Microsoft.Maui.Controls.NavigatedToEventArgs.PreviousPage.get -> Microsoft.Maui.Controls.Page
+~Microsoft.Maui.Controls.NavigatingFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+*REMOVED*Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Insert = 3 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Pop = 1 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.PopToRoot = 2 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Push = 0 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Remove = 4 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Replace = 5 -> Microsoft.Maui.Controls.NavigationType
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, Microsoft.Maui.FlowDirection flowDirection, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayAlertAsync(string title, string message, string accept, string cancel) -> System.Threading.Tasks.Task<bool>
@@ -182,6 +196,8 @@ Microsoft.Maui.Controls.Window.IsMaximizable.get -> bool
 Microsoft.Maui.Controls.Window.IsMaximizable.set -> void
 Microsoft.Maui.Controls.Window.IsMinimizable.get -> bool
 Microsoft.Maui.Controls.Window.IsMinimizable.set -> void
+Microsoft.Maui.Controls.Xaml.IXamlDataTypeProvider
+Microsoft.Maui.Controls.Xaml.IXamlDataTypeProvider.BindingDataType.get -> string!
 Microsoft.Maui.Controls.Xaml.Internals.AllowImplicitXmlnsDeclarationAttribute
 Microsoft.Maui.Controls.Xaml.Internals.AllowImplicitXmlnsDeclarationAttribute.Allow.get -> bool
 Microsoft.Maui.Controls.Xaml.Internals.AllowImplicitXmlnsDeclarationAttribute.AllowImplicitXmlnsDeclarationAttribute(bool allow = true) -> void
@@ -432,5 +448,3 @@ virtual Microsoft.Maui.Controls.BindableProperty.CreateDefaultValueDelegate<TDec
 ~virtual Microsoft.Maui.Controls.Internals.EvaluateJavaScriptDelegate.Invoke(string script) -> System.Threading.Tasks.Task<string>
 ~virtual Microsoft.Maui.Controls.PropertyChangingEventHandler.Invoke(object sender, Microsoft.Maui.Controls.PropertyChangingEventArgs e) -> void
 ~virtual Microsoft.Maui.Controls.VisualElement.ComputeConstraintForView(Microsoft.Maui.Controls.View view) -> void
-Microsoft.Maui.Controls.Xaml.IXamlDataTypeProvider
-Microsoft.Maui.Controls.Xaml.IXamlDataTypeProvider.BindingDataType.get -> string!
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 3ba79306f13d..54b7a671c78d 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -98,6 +98,20 @@ Microsoft.Maui.Controls.LayoutConstraint.None = 0 -> Microsoft.Maui.Controls.Lay
 Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed = 2 -> Microsoft.Maui.Controls.LayoutConstraint
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter.MessagingCenter() -> void
+~Microsoft.Maui.Controls.NavigatedFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+Microsoft.Maui.Controls.NavigatedFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigatedToEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+~Microsoft.Maui.Controls.NavigatedToEventArgs.PreviousPage.get -> Microsoft.Maui.Controls.Page
+~Microsoft.Maui.Controls.NavigatingFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+*REMOVED*Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Insert = 3 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Pop = 1 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.PopToRoot = 2 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Push = 0 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Remove = 4 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Replace = 5 -> Microsoft.Maui.Controls.NavigationType
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, Microsoft.Maui.FlowDirection flowDirection, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayAlertAsync(string title, string message, string accept, string cancel) -> System.Threading.Tasks.Task<bool>
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 79ac43508ee7..555f9aa99020 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -163,6 +163,11 @@ override Microsoft.Maui.SwipeViewSwipeStarted.Equals(object? obj) -> bool
 override Microsoft.Maui.SwipeViewSwipeStarted.GetHashCode() -> int
 override Microsoft.Maui.SwipeViewSwipeStarted.ToString() -> string!
 *REMOVED*readonly Microsoft.Maui.PropertyMapper._mapper -> System.Collections.Generic.Dictionary<string!, System.Action<Microsoft.Maui.IElementHandler!, Microsoft.Maui.IElement!>!>!
+static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequired(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Action! action) -> void
+static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequiredAsync(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Action! action) -> System.Threading.Tasks.Task!
+static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequiredAsync(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Func<System.Threading.Tasks.Task!>! action) -> System.Threading.Tasks.Task!
+static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequiredAsync<T>(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Func<System.Threading.Tasks.Task<T>!>! funcTask) -> System.Threading.Tasks.Task<T>!
+static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequiredAsync<T>(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Func<T>! func) -> System.Threading.Tasks.Task<T>!
 static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator !=(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
 static Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate.operator ==(Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? left, Microsoft.Maui.Handlers.ContextFlyoutItemHandlerUpdate? right) -> bool
 static Microsoft.Maui.Handlers.GraphicsViewHandler.MapBackground(Microsoft.Maui.Handlers.IGraphicsViewHandler! handler, Microsoft.Maui.IGraphicsView! graphicsView) -> void
@@ -183,11 +188,6 @@ static Microsoft.Maui.Handlers.WindowHandler.MapIsMinimizable(Microsoft.Maui.Han
 static Microsoft.Maui.Hosting.AppHostBuilderExtensions.ConfigureEnvironmentVariables(this Microsoft.Maui.Hosting.MauiAppBuilder! builder) -> Microsoft.Maui.Hosting.MauiAppBuilder!
 static Microsoft.Maui.Platform.CalendarDatePickerExtensions.ToDateFormat(this string! dateFormat) -> string!
 static Microsoft.Maui.Platform.DatePickerExtensions.UpdateBackground(this Microsoft.UI.Xaml.Controls.CalendarDatePicker! platformDatePicker, Microsoft.Maui.IDatePicker! datePicker) -> void
-static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequired(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Action! action) -> void
-static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequiredAsync(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Action! action) -> System.Threading.Tasks.Task!
-static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequiredAsync(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Func<System.Threading.Tasks.Task!>! action) -> System.Threading.Tasks.Task!
-static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequiredAsync<T>(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Func<T>! func) -> System.Threading.Tasks.Task<T>!
-static Microsoft.Maui.Dispatching.DispatcherExtensions.DispatchIfRequiredAsync<T>(this Microsoft.Maui.Dispatching.IDispatcher! dispatcher, System.Func<System.Threading.Tasks.Task<T>!>! funcTask) -> System.Threading.Tasks.Task<T>!
 *REMOVED*static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility horizontalScrollBarVisibility) -> void
 static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility visibility) -> void
 static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void

From a21aa12476500ba275ba436ab10e9e825238af38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 29 Jul 2025 13:42:46 +0200
Subject: [PATCH 33/39] More tests

---
 .../src/Core/FlyoutPage/FlyoutPage.cs         | 71 +++++++++++++++----
 .../Core.UnitTests/PageLifeCycleTests.cs      | 36 +++++++++-
 .../Tests/Issues/Issue21814FlyoutPage.cs      | 30 ++++++++
 3 files changed, 123 insertions(+), 14 deletions(-)

diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index b3f47604c72f..0ed9c34447fb 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -52,13 +52,34 @@ public Page Detail
 				if (value.RealParent != null)
 					throw new InvalidOperationException("Detail must not already have a parent.");
 
-				var previousDetail = _detail;				
-				var destinationPage = _detail is NavigationPage currentNavPage ? currentNavPage.CurrentPage : _detail;
-				var previousPage = previousDetail is NavigationPage previousNavPage ? previousNavPage.CurrentPage : previousDetail;
-				
-				// TODO MAUI refine this to fire earlier
-				previousDetail?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
-		
+				var previousDetail = _detail;
+				var destinationPage = value is NavigationPage destinationNavPage ? destinationNavPage.CurrentPage : value;
+				var previousPage = previousDetail is NavigationPage previousNavPage
+					? previousNavPage.CurrentPage
+					: previousDetail;
+
+				// Triggering NavigatingFrom event for the previous or initial Detail
+				if (previousDetail != null)
+				{
+					if (previousDetail is NavigationPage prevNavPage)
+						prevNavPage.CurrentPage?.SendNavigatingFrom(
+							new NavigatingFromEventArgs(destinationPage, NavigationType.Replace));
+					else
+						previousDetail?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
+				}
+				else if (value is NavigationPage currentNavPage)
+				{
+					// Triggering NavigatingFrom for initial Detail when it is a NavigationPage
+					currentNavPage.CurrentPage?.SendNavigatingFrom(
+						new NavigatingFromEventArgs(currentNavPage.CurrentPage, NavigationType.Replace)); // Initial Detail
+				}
+				else
+				{
+					// Triggering NavigatingFrom for initial Detail when it is not a NavigationPage
+					value?.SendNavigatingFrom(new NavigatingFromEventArgs(value,
+						NavigationType.Replace)); // Initial Detail
+				}
+
 				OnPropertyChanging();
 				if (_detail != null)
 					InternalChildren.Remove(_detail);
@@ -66,14 +87,38 @@ public Page Detail
 				InternalChildren.Add(_detail);
 				OnPropertyChanged();
 
-				if (this.HasAppeared)
+				// Handling Appearing and Disappearing events if the FlyoutPage has appeared
+				if (HasAppeared)
 				{
-					previousDetail?.SendDisappearing();
-					_detail?.SendAppearing();
+					// Triggering Disappearing for the previous Detail
+					if (previousDetail is NavigationPage prevNavPage)
+						prevNavPage.CurrentPage?.SendDisappearing();
+					else
+						previousDetail?.SendDisappearing();
+
+					// Triggering Appearing for the new Detail
+					if (_detail is NavigationPage detailNavPage)
+						detailNavPage.CurrentPage?.SendAppearing();
+					else
+						_detail?.SendAppearing();
 				}
-	
-				previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(destinationPage, NavigationType.Replace));
-				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
+
+				// Trigger NavigatedFrom for previousDetail, NavigatedTo for new Detail
+				if (previousDetail != null)
+				{
+					if (previousDetail is NavigationPage prevNavPage)
+						prevNavPage.CurrentPage?.SendNavigatedFrom(
+							new NavigatedFromEventArgs(destinationPage, NavigationType.Replace));
+					else
+						previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(destinationPage,
+							NavigationType.Replace));
+				}
+
+				if (_detail is NavigationPage newNavPage)
+					newNavPage.CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(previousPage,
+						NavigationType.Replace));
+				else
+					_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
 			}
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs b/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
index 4fe88dd05c9c..ec5eb90077fd 100644
--- a/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PageLifeCycleTests.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.Maui.Controls.Core.UnitTests
@@ -160,6 +161,39 @@ public async Task FlyoutPageDetailChanged()
 			Assert.Equal(secondPage, firstPage.NavigatedFromArgs.DestinationPage);
 		}
 
+        [Fact]
+        public async Task FlyoutPageToggleIsPresented()
+        {
+            // Testing toggling IsPresented in FlyoutPage without changing navigation events
+            var flyout = new LCPage { Title = "Flyout" };
+            var detail = new LCPage { Title = "Detail" };
+            var flyoutPage = new FlyoutPage { Flyout = flyout, Detail = detail }.AddToTestWindow();
+
+            // Clearing initial navigation args to focus on IsPresented toggle
+            detail.ClearNavigationArgs();
+            flyout.ClearNavigationArgs();
+
+            // Toggling IsPresented
+            flyoutPage.IsPresented = true;
+            await Task.Yield();
+            flyoutPage.IsPresented = false;
+            await Task.Yield();
+
+            // Verifying no navigation events are triggered
+            Assert.Null(flyout.NavigatingFromArgs);
+            Assert.Null(flyout.NavigatedFromArgs);
+            Assert.Null(flyout.NavigatedToArgs);
+            Assert.Null(detail.NavigatingFromArgs);
+            Assert.Null(detail.NavigatedFromArgs);
+            Assert.Null(detail.NavigatedToArgs);
+
+            // Verifying Loaded/Unloaded counts remain unchanged
+            Assert.Equal(1, flyout.AppearingCount);
+            Assert.Equal(0, flyout.DisappearingCount);
+            Assert.Equal(1, detail.AppearingCount);
+            Assert.Equal(0, detail.DisappearingCount);
+        }
+        
 		[Fact]
 		public async Task PushModalPage()
 		{
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index e5fc9587f645..107118b9ef56 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -75,6 +75,7 @@ public void NavigationFromItem1ToItem2ShowsCorrectParameters()
 	[Category(UITestCategories.Navigation)]
 	public void NavigationFromItem2ToItem3ShowsCorrectParameters()
 	{
+		// Starting on Item 1
 #if ANDROID || WINDOWS
 		App.TapBackArrow();
 #elif IOS || MACCATALYST
@@ -91,7 +92,36 @@ public void NavigationFromItem2ToItem3ShowsCorrectParameters()
 		Assert.That(item3OnNavigatedToText, Does.Contain("PreviousPage: Issue21814FlyoutItem1"));
 		Assert.That(item3OnNavigatedToText, Does.Contain("NavigationType: Replace"));
 	}
+	
+	[Test, Order(4)]
+	[Category(UITestCategories.FlyoutPage)]
+	[Category(UITestCategories.Navigation)]
+	public void PopNavigationPageAfterPush()
+	{
+#if ANDROID || WINDOWS
+		App.TapBackArrow();
+#elif IOS || MACCATALYST
+		App.TapBackArrow("Item 1");
+#endif
+		
+		// Navigating to Item 2
+		OpenFlyoutMenu();
+		App.Tap(Item2MenuItem);
+		App.WaitForElement(FlyoutContent2);
 
+		// Popping back to Item 1
+		App.Back();
+		App.WaitForElement(FlyoutContent1);
+
+		// Verifying navigation events for pop from Item 2 to Item 1
+		// Popping to Item 1 does not trigger OnNavigatedFrom for Item 1
+		// Item 1's OnNavigatedFrom remains from the earlier navigation to Item 2
+		var onNavigatedFromText = App.FindElement(FlyoutItem1OnNavigatedFromLabel).GetText();
+		Console.WriteLine($"Item2 OnNavigatedFrom: {onNavigatedFromText}");
+		Assert.That(onNavigatedFromText, Does.Contain("DestinationPage: Issue21814FlyoutItem2"));
+		Assert.That(onNavigatedFromText, Does.Contain("NavigationType: Replace"));
+	}
+	
 	void OpenFlyoutMenu()
 	{
 		App.TapFlyoutPageIcon("Flyout Menu");

From ed9319a69a4c3bac887d049b3337541279fcdaa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 29 Jul 2025 15:40:04 +0200
Subject: [PATCH 34/39] Fixed device test

---
 .../Elements/FlyoutPage/FlyoutPageTests.cs       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
index 55df11af20cf..6bc8f343e2bb 100644
--- a/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
+++ b/src/Controls/tests/DeviceTests/Elements/FlyoutPage/FlyoutPageTests.cs
@@ -67,11 +67,23 @@ await CreateHandlerAndAddToWindow<WindowHandlerStub>(new Window(flyoutPage), asy
 					// Set with new page
 					var navPage = new NavigationPage(new ContentPage()) { Title = "App Page" };
 					flyoutPage.Detail = navPage;
-					await OnNavigatedToAsync(navPage);
+          
+					// For NavigationPages, check the CurrentPage instead
+					var pageToCheck = navPage is NavigationPage np ? np.CurrentPage : navPage;
+					if (!pageToCheck.HasNavigatedTo)
+					{
+						await OnNavigatedToAsync(navPage);
+					}
 
 					// Set back to previous page
 					flyoutPage.Detail = currentDetailPage;
-					await OnNavigatedToAsync(currentDetailPage);
+          
+					// Check the current page again
+					var previousPageToCheck = currentDetailPage is NavigationPage cp ? cp.CurrentPage : currentDetailPage;
+					if (!previousPageToCheck.HasNavigatedTo)
+					{
+						await OnNavigatedToAsync(currentDetailPage);
+					}
 				});
 			});
 		}

From 97efceee7a9eff540646807dc48ff8135c85cbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 30 Jul 2025 10:54:29 +0200
Subject: [PATCH 35/39] Changes based on PR feedback, simplify FlyoutPage
 Detail

---
 .../src/Core/FlyoutPage/FlyoutPage.cs         | 63 ++++++-------------
 .../Tests/Issues/Issue21814FlyoutPage.cs      |  7 ++-
 2 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index 0ed9c34447fb..8a5d4e8de8e7 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -53,72 +53,49 @@ public Page Detail
 					throw new InvalidOperationException("Detail must not already have a parent.");
 
 				var previousDetail = _detail;
-				var destinationPage = value is NavigationPage destinationNavPage ? destinationNavPage.CurrentPage : value;
+
+				// Get the actual pages for navigation events (unwrap NavigationPages)
+				var destinationPage =
+					value is NavigationPage destinationNavPage ? destinationNavPage.CurrentPage : value;
 				var previousPage = previousDetail is NavigationPage previousNavPage
 					? previousNavPage.CurrentPage
 					: previousDetail;
 
-				// Triggering NavigatingFrom event for the previous or initial Detail
-				if (previousDetail != null)
-				{
-					if (previousDetail is NavigationPage prevNavPage)
-						prevNavPage.CurrentPage?.SendNavigatingFrom(
-							new NavigatingFromEventArgs(destinationPage, NavigationType.Replace));
-					else
-						previousDetail?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
-				}
-				else if (value is NavigationPage currentNavPage)
+				// Send NavigatingFrom event to the previous detail (if any)
+				if (previousDetail is not null)
 				{
-					// Triggering NavigatingFrom for initial Detail when it is a NavigationPage
-					currentNavPage.CurrentPage?.SendNavigatingFrom(
-						new NavigatingFromEventArgs(currentNavPage.CurrentPage, NavigationType.Replace)); // Initial Detail
+					previousDetail.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage,
+						NavigationType.Replace));
 				}
 				else
 				{
-					// Triggering NavigatingFrom for initial Detail when it is not a NavigationPage
-					value?.SendNavigatingFrom(new NavigatingFromEventArgs(value,
-						NavigationType.Replace)); // Initial Detail
+					// For initial detail, send NavigatingFrom to itself
+					value.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage, NavigationType.Replace));
 				}
 
+				// Update the detail property
 				OnPropertyChanging();
-				if (_detail != null)
+				if (_detail is not null)
 					InternalChildren.Remove(_detail);
 				_detail = value;
 				InternalChildren.Add(_detail);
 				OnPropertyChanged();
 
-				// Handling Appearing and Disappearing events if the FlyoutPage has appeared
+				// Handle Appearing/Disappearing events if the FlyoutPage has appeared
 				if (HasAppeared)
 				{
-					// Triggering Disappearing for the previous Detail
-					if (previousDetail is NavigationPage prevNavPage)
-						prevNavPage.CurrentPage?.SendDisappearing();
-					else
-						previousDetail?.SendDisappearing();
-
-					// Triggering Appearing for the new Detail
-					if (_detail is NavigationPage detailNavPage)
-						detailNavPage.CurrentPage?.SendAppearing();
-					else
-						_detail?.SendAppearing();
+					previousDetail?.SendDisappearing();
+					_detail?.SendAppearing();
 				}
 
-				// Trigger NavigatedFrom for previousDetail, NavigatedTo for new Detail
-				if (previousDetail != null)
+				// Send NavigatedFrom and NavigatedTo events
+				if (previousDetail is not null)
 				{
-					if (previousDetail is NavigationPage prevNavPage)
-						prevNavPage.CurrentPage?.SendNavigatedFrom(
-							new NavigatedFromEventArgs(destinationPage, NavigationType.Replace));
-					else
-						previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(destinationPage,
-							NavigationType.Replace));
+					previousDetail.SendNavigatedFrom(
+						new NavigatedFromEventArgs(destinationPage, NavigationType.Replace));
 				}
 
-				if (_detail is NavigationPage newNavPage)
-					newNavPage.CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(previousPage,
-						NavigationType.Replace));
-				else
-					_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
+				_detail.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
 			}
 		}
 
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index 107118b9ef56..177469031101 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -110,8 +110,11 @@ public void PopNavigationPageAfterPush()
 		App.WaitForElement(FlyoutContent2);
 
 		// Popping back to Item 1
-		App.Back();
-		App.WaitForElement(FlyoutContent1);
+#if ANDROID || WINDOWS
+		App.TapBackArrow();
+#elif IOS || MACCATALYST
+		App.TapBackArrow("Item 1");
+#endif
 
 		// Verifying navigation events for pop from Item 2 to Item 1
 		// Popping to Item 1 does not trigger OnNavigatedFrom for Item 1

From 98bb1cfa6083ba543f309a87e792bc8c61590fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 30 Jul 2025 12:54:57 +0200
Subject: [PATCH 36/39] More changes to fix a test

---
 src/Controls/src/Core/MultiPage.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/MultiPage.cs b/src/Controls/src/Core/MultiPage.cs
index 77f2dbbb0169..b1f9126e43ec 100644
--- a/src/Controls/src/Core/MultiPage.cs
+++ b/src/Controls/src/Core/MultiPage.cs
@@ -85,7 +85,17 @@ public T CurrentPage
 				OnPropertyChanging();
  				
 				// TODO: MAUI refine this to fire earlier
-				_current?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
+				
+				// Send NavigatingFrom to the previous page or to the new page if no previous page exists
+				if (_current is not null)
+				{
+					_current.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
+				}
+				else
+				{
+					// For initial page, send NavigatingFrom to itself
+					value?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
+				}
 				
 				_current = value;
 

From 4ad8eae22afd9cb4f4d03b863f69be299e34ba04 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Thu, 31 Jul 2025 17:12:42 +0100
Subject: [PATCH 37/39] [ci] Update the publicapi

---
 .../PublicAPI/net-android/PublicAPI.Unshipped.txt  | 14 ++++++++++++++
 .../Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt |  4 ++--
 .../net-maccatalyst/PublicAPI.Unshipped.txt        |  4 ++--
 .../src/Core/PublicAPI/net/PublicAPI.Unshipped.txt | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 189b0b3c615a..6d1a77194cde 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -112,6 +112,20 @@ Microsoft.Maui.Controls.LayoutConstraint.None = 0 -> Microsoft.Maui.Controls.Lay
 Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed = 2 -> Microsoft.Maui.Controls.LayoutConstraint
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter.MessagingCenter() -> void
+~Microsoft.Maui.Controls.NavigatedFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+Microsoft.Maui.Controls.NavigatedFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigatedToEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+~Microsoft.Maui.Controls.NavigatedToEventArgs.PreviousPage.get -> Microsoft.Maui.Controls.Page
+~Microsoft.Maui.Controls.NavigatingFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+*REMOVED*Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Insert = 3 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Pop = 1 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.PopToRoot = 2 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Push = 0 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Remove = 4 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Replace = 5 -> Microsoft.Maui.Controls.NavigationType
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, Microsoft.Maui.FlowDirection flowDirection, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayAlertAsync(string title, string message, string accept, string cancel) -> System.Threading.Tasks.Task<bool>
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index ea64bf3a451f..89366d6eb3e0 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -269,12 +269,11 @@ override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+~override Microsoft.Maui.Controls.Handlers.Compatibility.TabbedRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void
 override Microsoft.Maui.Controls.Handlers.Items.CarouselViewHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MovedToWindow() -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
 ~override Microsoft.Maui.Controls.HorizontalStackLayout.ComputeConstraintForView(Microsoft.Maui.Controls.View view) -> void
-~override Microsoft.Maui.Controls.Handlers.Compatibility.TabbedRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void
-~override Microsoft.Maui.Controls.Platform.Compatibility.ShellItemRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void
 override Microsoft.Maui.Controls.ImageSourceConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Controls.ImageSourceConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Controls.ImageSourceConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
@@ -295,6 +294,7 @@ override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertTo(System.Com
 override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
 override Microsoft.Maui.Controls.Picker.OnHandlerChanged() -> void
+~override Microsoft.Maui.Controls.Platform.Compatibility.ShellItemRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellPageRendererTracker.TitleViewContainer.WillMoveToSuperview(UIKit.UIView? newSuper) -> void
 override Microsoft.Maui.Controls.ReferenceTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Controls.ReferenceTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 3039f328cf95..89366d6eb3e0 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -269,11 +269,10 @@ override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertFrom(System.C
 override Microsoft.Maui.Controls.GridLengthTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Controls.GridLengthTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+~override Microsoft.Maui.Controls.Handlers.Compatibility.TabbedRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void
 override Microsoft.Maui.Controls.Handlers.Items.CarouselViewHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.MovedToWindow() -> void
 override Microsoft.Maui.Controls.Handlers.Items.MauiCollectionView.ScrollRectToVisible(CoreGraphics.CGRect rect, bool animated) -> void
-~override Microsoft.Maui.Controls.Handlers.Compatibility.TabbedRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void
-~override Microsoft.Maui.Controls.Platform.Compatibility.ShellItemRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void
 ~override Microsoft.Maui.Controls.HorizontalStackLayout.ComputeConstraintForView(Microsoft.Maui.Controls.View view) -> void
 override Microsoft.Maui.Controls.ImageSourceConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Controls.ImageSourceConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
@@ -295,6 +294,7 @@ override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertTo(System.Com
 override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
 override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
 override Microsoft.Maui.Controls.Picker.OnHandlerChanged() -> void
+~override Microsoft.Maui.Controls.Platform.Compatibility.ShellItemRenderer.TraitCollectionDidChange(UIKit.UITraitCollection previousTraitCollection) -> void
 override Microsoft.Maui.Controls.Platform.Compatibility.ShellPageRendererTracker.TitleViewContainer.WillMoveToSuperview(UIKit.UIView? newSuper) -> void
 override Microsoft.Maui.Controls.ReferenceTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
 override Microsoft.Maui.Controls.ReferenceTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 3ba79306f13d..54b7a671c78d 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -98,6 +98,20 @@ Microsoft.Maui.Controls.LayoutConstraint.None = 0 -> Microsoft.Maui.Controls.Lay
 Microsoft.Maui.Controls.LayoutConstraint.VerticallyFixed = 2 -> Microsoft.Maui.Controls.LayoutConstraint
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter
 *REMOVED*Microsoft.Maui.Controls.MessagingCenter.MessagingCenter() -> void
+~Microsoft.Maui.Controls.NavigatedFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+Microsoft.Maui.Controls.NavigatedFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigatedToEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+~Microsoft.Maui.Controls.NavigatedToEventArgs.PreviousPage.get -> Microsoft.Maui.Controls.Page
+~Microsoft.Maui.Controls.NavigatingFromEventArgs.DestinationPage.get -> Microsoft.Maui.Controls.Page
+*REMOVED*Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigatingFromEventArgs() -> void
+Microsoft.Maui.Controls.NavigatingFromEventArgs.NavigationType.get -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Insert = 3 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Pop = 1 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.PopToRoot = 2 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Push = 0 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Remove = 4 -> Microsoft.Maui.Controls.NavigationType
+Microsoft.Maui.Controls.NavigationType.Replace = 5 -> Microsoft.Maui.Controls.NavigationType
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, Microsoft.Maui.FlowDirection flowDirection, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons) -> System.Threading.Tasks.Task<string>
 ~Microsoft.Maui.Controls.Page.DisplayAlertAsync(string title, string message, string accept, string cancel) -> System.Threading.Tasks.Task<bool>

From c809393cfa32983904cc0c58ec95b5b123611dcf Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 1 Aug 2025 06:48:58 -0500
Subject: [PATCH 38/39] - remove navigatingfrom

---
 src/Controls/src/Core/FlyoutPage/FlyoutPage.cs | 5 -----
 src/Controls/src/Core/MultiPage.cs             | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index 8a5d4e8de8e7..7ba6ce706a3b 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -67,11 +67,6 @@ public Page Detail
 					previousDetail.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage,
 						NavigationType.Replace));
 				}
-				else
-				{
-					// For initial detail, send NavigatingFrom to itself
-					value.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage, NavigationType.Replace));
-				}
 
 				// Update the detail property
 				OnPropertyChanging();
diff --git a/src/Controls/src/Core/MultiPage.cs b/src/Controls/src/Core/MultiPage.cs
index b1f9126e43ec..27bc40bccce6 100644
--- a/src/Controls/src/Core/MultiPage.cs
+++ b/src/Controls/src/Core/MultiPage.cs
@@ -91,11 +91,6 @@ public T CurrentPage
 				{
 					_current.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
 				}
-				else
-				{
-					// For initial page, send NavigatingFrom to itself
-					value?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
-				}
 				
 				_current = value;
 

From ddc4874624d05f66e0d9f53e68481cea48d9c7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 1 Aug 2025 16:03:40 +0200
Subject: [PATCH 39/39] Updated tests

---
 .../Tests/Issues/Issue21814FlyoutPage.cs                 | 9 ++++-----
 .../Tests/Issues/Issue21814TabbedPage.cs                 | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
index 177469031101..08e5c9f911ef 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814FlyoutPage.cs
@@ -37,16 +37,15 @@ public void InitialPageLoadShowsCorrectNavigationInfo()
 	{
 		// Verify Item 1 is initially loaded and shows correct navigation info
 		App.WaitForElement("FlyoutContent1");
-
-		var onNavigatingFromText = App.FindElement(FlyoutItem1OnNavigatingFromLabel).GetText();
-		Assert.That(onNavigatingFromText, Does.Contain("DestinationPage: Issue21814FlyoutItem1"));
-		Assert.That(onNavigatingFromText, Does.Contain("NavigationType: Replace"));
-
+		
 		var onNavigatedToText = App.FindElement(FlyoutItem1OnNavigatedToLabel).GetText();
 		Assert.That(onNavigatedToText, Does.Contain("PreviousPage: Null"));
 		Assert.That(onNavigatedToText, Does.Contain("NavigationType: Replace"));
 
 		// Initially, OnNavigatingFrom and OnNavigatedFrom should show "-"
+		var onNavigatingFromText = App.FindElement(FlyoutItem1OnNavigatingFromLabel).GetText();
+		Assert.That(onNavigatingFromText, Does.Contain("-"));
+		
 		var onNavigatedFromText = App.FindElement(FlyoutItem1OnNavigatedFromLabel).GetText();
 		Assert.That(onNavigatedFromText, Is.EqualTo("-"));
 	}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
index 06380b0c000a..3c0c748955f7 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21814TabbedPage.cs
@@ -33,16 +33,15 @@ public void InitialTabLoadShowsCorrectNavigationInfo()
 	{
 		// Verify Tab 1 is initially loaded and shows correct navigation info
 		App.WaitForElement(Tab1Content);
-
-		var onNavigatingFromText = App.FindElement(Tab1OnNavigatingFromLabel).GetText();
-		Assert.That(onNavigatingFromText, Does.Contain("DestinationPage: Issue21814TabItem1"));
-		Assert.That(onNavigatingFromText, Does.Contain("NavigationType: Replace"));
 		
 		var onNavigatedToText = App.FindElement(Tab1OnNavigatedToLabel).GetText();
 		Assert.That(onNavigatedToText, Does.Contain("PreviousPage: Null"));
 		Assert.That(onNavigatedToText, Does.Contain("NavigationType: Replace"));
 
-		// Initially, OnNavigatedFrom should show "-"
+		// Initially, OnNavigatingFrom and OnNavigatedFrom should show "-"
+		var onNavigatingFromText = App.FindElement(Tab1OnNavigatingFromLabel).GetText();
+		Assert.That(onNavigatingFromText, Does.Contain("-"));
+		
 		var onNavigatedFromText = App.FindElement(Tab1OnNavigatedFromLabel).GetText();
 		Assert.That(onNavigatedFromText, Is.EqualTo("-"));
 	}