Added OnNavigatingFrom extension for popup related navigation

Directory.Build.props

@@ -24,7 +24,7 @@ https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitati
 
     <!-- MAUI Specific -->
     <MauiXamlInflator>SourceGen</MauiXamlInflator>
-    <MauiPackageVersion>10.0.41</MauiPackageVersion>
+    <MauiPackageVersion>10.0.51</MauiPackageVersion>
     <MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
     <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
     <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs

@@ -33,6 +33,15 @@ protected override async void OnNavigatedFrom(NavigatedFromEventArgs args)
 	{
 		base.OnNavigatedFrom(args);
 		if (args.IsDestinationPageACommunityToolkitPopupPage())
+		{
+			await Toast.Make("Popup Opened").Show();
+		}
+	}
+
+	protected override async void OnNavigatingFrom(NavigatingFromEventArgs args)
+	{
+		base.OnNavigatingFrom(args);
+		if (args.IsDestinationPageACommunityToolkitPopupPage())
 		{
 			await Toast.Make("Opening Popup").Show();
 		}

src/CommunityToolkit.Maui.UnitTests/Extensions/NavigatedFromEventArgsExtensionsTests.cs

@@ -7,7 +7,7 @@ namespace CommunityToolkit.Maui.UnitTests.Extensions;
 
 public class NavigatedFromEventArgsExtensionsTests : BaseViewTest
 {
-	[Fact]
+	[Fact(Timeout = (int)TestDuration.Medium)]
 	public async Task NavigatedFromEventArgsExtensions_IsDestinationPageACommunityToolkitPopupPage_ShouldReturnTrue()
 	{
 		// Arrange
@@ -36,11 +36,12 @@ public async Task NavigatedFromEventArgsExtensions_IsDestinationPageACommunityTo
 
 		void HandleNavigatedFromEventArgsReceived(object? sender, NavigatedFromEventArgs e)
 		{
+			shellContentPage.NavigatedFromEventArgsReceived -= HandleNavigatedFromEventArgsReceived;
 			isDestinationPageACommunityToolkitPopupPageTCS.SetResult(e.IsDestinationPageACommunityToolkitPopupPage());
 		}
 	}
 
-	[Fact]
+	[Fact(Timeout = (int)TestDuration.Medium)]
 	public async Task NavigatedFromEventArgsExtensions_IsDestinationPageACommunityToolkitPopupPage_ShouldReturnFalse()
 	{
 		// Arrange

src/CommunityToolkit.Maui.UnitTests/Extensions/NavigatedToEventArgsExtensionsTests.cs

@@ -7,7 +7,7 @@ namespace CommunityToolkit.Maui.UnitTests.Extensions;
 
 public class NavigatedToEventArgsExtensionsTests : BaseViewTest
 {
-	[Fact]
+	[Fact(Timeout = (int)TestDuration.Medium)]
 	public async Task NavigatedToEventArgsExtensions_WasPreviousPageACommunityToolkitPopupPage_ShouldReturnTrue()
 	{
 		// Arrange
@@ -38,12 +38,13 @@ void HandleNavigatedToEventArgsReceived(object? sender, NavigatedToEventArgs e)
 		{
 			if (e.PreviousPage != mainPage)
 			{
+				shellContentPage.NavigatedToEventArgsReceived -= HandleNavigatedToEventArgsReceived;
 				wasPreviousPageACommunityToolkitPopupPageTCS.SetResult(e.WasPreviousPageACommunityToolkitPopupPage());
 			}
 		}
 	}
 
-	[Fact]
+	[Fact(Timeout = (int)TestDuration.Medium)]
 	public async Task NavigatedToEventArgsExtensions_WasPreviousPageACommunityToolkitPopupPage_ShouldReturnFalse()
 	{
 		// Arrange

src/CommunityToolkit.Maui.UnitTests/Extensions/NavigatingFromEventArgsExtensionsTests.cs

@@ -0,0 +1,89 @@
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.UnitTests.Mocks;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Extensions;
+
+public class NavigatingFromEventArgsExtensionsTests : BaseViewTest
+{
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task NavigatingFromEventArgsExtensions_IsDestinationPageACommunityToolkitPopupPage_ShouldReturnTrue()
+	{
+		// Arrange
+		TaskCompletionSource<bool?> isDestinationPageACommunityToolkitPopupPageTCS = new();
+		var application = (MockApplication)ServiceProvider.GetRequiredService<IApplication>();
+		var popupService = ServiceProvider.GetRequiredService<IPopupService>();
+
+		var shell = (Shell)(application.Windows[0].Page ?? throw new InvalidOperationException("Unable to retrieve Shell"));
+		var mainPage = shell.CurrentPage;
+		var shellContentPage = new ShellContentPage();
+		shellContentPage.NavigatingFromEventArgsReceived += HandleNavigatingFromEventArgsReceived;
+
+		var shellParameters = new Dictionary<string, object>
+		{
+			{ nameof(ContentPage.BackgroundColor), Colors.Orange }
+		};
+
+		// Act
+		await mainPage.Navigation.PushAsync(shellContentPage);
+		await popupService.ShowPopupAsync<ShortLivedMockPageViewModel>(shell, null, shellParameters, TestContext.Current.CancellationToken);
+		bool? isDestinationPageACommunityToolkitPopupPage = await isDestinationPageACommunityToolkitPopupPageTCS.Task;
+
+		// Assert
+		Assert.True(isDestinationPageACommunityToolkitPopupPage);
+
+		void HandleNavigatingFromEventArgsReceived(object? sender, NavigatingFromEventArgs e)
+		{
+			ArgumentNullException.ThrowIfNull(sender);
+
+			if (sender is not ShellContentPage)
+			{
+				shellContentPage.NavigatingFromEventArgsReceived -= HandleNavigatingFromEventArgsReceived;
+				isDestinationPageACommunityToolkitPopupPageTCS.SetResult(e.IsDestinationPageACommunityToolkitPopupPage());
+			}
+		}
+	}
+
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task NavigatingFromEventArgsExtensions_IsDestinationPageACommunityToolkitPopupPage_ShouldReturnFalse()
+	{
+		// Arrange
+		MockApplication application = (MockApplication)ServiceProvider.GetRequiredService<IApplication>();
+
+		Shell shell = (Shell)(application.Windows[0].Page ?? throw new InvalidOperationException("Unable to retrieve Shell"));
+		Page mainPage = shell.CurrentPage;
+
+		ShellContentPage shellContentPage = new();
+		ShellContentPage anotherShellContentPage = new();
+
+		TaskCompletionSource<bool?> isDestinationPageACommunityToolkitPopupPageTCS = new();
+		shellContentPage.NavigatingFromEventArgsReceived += HandleNavigatingFromEventArgsReceived;
+
+		// Act
+		await mainPage.Navigation.PushAsync(shellContentPage);
+		await mainPage.Navigation.PushAsync(anotherShellContentPage);
+		bool? isDestinationPageACommunityToolkitPopupPage = await isDestinationPageACommunityToolkitPopupPageTCS.Task;
+
+		// Assert
+		Assert.False(isDestinationPageACommunityToolkitPopupPage);
+
+		void HandleNavigatingFromEventArgsReceived(object? sender, NavigatingFromEventArgs e)
+		{
+			ArgumentNullException.ThrowIfNull(sender);
+
+			shellContentPage.NavigatingFromEventArgsReceived -= HandleNavigatingFromEventArgsReceived;
+			isDestinationPageACommunityToolkitPopupPageTCS.SetResult(e.IsDestinationPageACommunityToolkitPopupPage());
+		}
+	}
+
+	sealed class ShellContentPage : ContentPage
+	{
+		public event EventHandler<NavigatingFromEventArgs>? NavigatingFromEventArgsReceived;
+
+		protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
+		{
+			base.OnNavigatingFrom(args);
+			NavigatingFromEventArgsReceived?.Invoke(this, args);
+		}
+	}
+}

src/CommunityToolkit.Maui/Extensions/NavigationEventArgsExtensions.cs

@@ -0,0 +1,30 @@
+using CommunityToolkit.Maui.Views;
+
+namespace CommunityToolkit.Maui.Extensions;
+
+/// <summary>
+/// Extension methods for <see cref="NavigatedFromEventArgs"/>, <see cref="NavigatedToEventArgs"/> and <see cref="NavigatingFromEventArgs"/>.
+/// </summary>
+public static class NavigationEventArgsExtensions
+{
+	/// <summary>
+	/// Determines if the destination page is the internal <see cref="PopupPage"/> wrapper used when displaying a Community Toolkit <see cref="Popup"/>.
+	/// </summary>
+	/// <param name="args">The current <see cref="NavigatedFromEventArgs"/>.</param>
+	/// <returns>A boolean indicating if the destination page is a <see cref="PopupPage"/> representing a Community Toolkit <see cref="Popup"/>.</returns>
+	public static bool IsDestinationPageACommunityToolkitPopupPage(this NavigatedFromEventArgs args) => args.DestinationPage is PopupPage;
+
+	/// <summary>
+	/// Determines whether the previous page was the internal <see cref="PopupPage"/> wrapper used when displaying a Community Toolkit <see cref="Popup"/>.
+	/// </summary>
+	/// <param name="args">The current <see cref="NavigatedToEventArgs"/>.</param>
+	/// <returns>A boolean indicating whether the previous page was a <see cref="PopupPage"/> representing a Community Toolkit <see cref="Popup"/>.</returns>
+	public static bool WasPreviousPageACommunityToolkitPopupPage(this NavigatedToEventArgs args) => args.PreviousPage is PopupPage;
+
+	/// <summary>
+	/// Determines if the destination page will be the internal <see cref="PopupPage"/> wrapper used when displaying a Community Toolkit <see cref="Popup"/>.
+	/// </summary>
+	/// <param name="args">The current <see cref="NavigatingFromEventArgs"/>.</param>
+	/// <returns>A boolean indicating if the destination page will be a <see cref="PopupPage"/> representing a Community Toolkit <see cref="Popup"/>.</returns>
+	public static bool IsDestinationPageACommunityToolkitPopupPage(this NavigatingFromEventArgs args) => args.DestinationPage is PopupPage;
+}