From d6a363ded9503f2e692af22c9ebd4d7a1445eb3c Mon Sep 17 00:00:00 2001
From: Pedro Jesus <pedrojesus@Pedros-MacBook-Pro.local>
Date: Mon, 27 Oct 2025 23:45:43 -0300
Subject: [PATCH 1/7] remove navBar

---
 src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index fc00b1ae89..235feb699b 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -1,9 +1,7 @@
 using System.ComponentModel;
 using System.Globalization;
-using System.Windows.Input;
 using CommunityToolkit.Maui.Converters;
 using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Extensions;
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Controls.Shapes;
@@ -66,6 +64,7 @@ public PopupPage(Popup popup, IPopupOptions? popupOptions)
 
 		Shell.SetPresentationMode(this, PresentationMode.ModalNotAnimated);
 		On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.OverFullScreen);
+		Microsoft.Maui.Controls.NavigationPage.SetHasNavigationBar(this, false);
 	}
 
 	public event EventHandler<IPopupResult>? PopupClosed;
@@ -85,7 +84,8 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 
 		if (popupPageToClose is null)
 		{
-			throw new PopupNotFoundException();
+			await Navigation.PopModalAsync();
+			return;
 		}
 
 		if (Navigation.ModalStack[^1] is Microsoft.Maui.Controls.Page currentVisibleModalPage

From d70a248b98a504328d27b73c2297f3582b5d5ad5 Mon Sep 17 00:00:00 2001
From: Pedro Jesus <pedrojesus@Pedros-MacBook-Pro.local>
Date: Tue, 28 Oct 2025 00:12:17 -0300
Subject: [PATCH 2/7] fix navigation

---
 .../Views/Popup/PopupPage.shared.cs           | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index 235feb699b..0adc361161 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -5,6 +5,8 @@
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Controls.Shapes;
+using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
+using Page = Microsoft.Maui.Controls.Page;
 
 namespace CommunityToolkit.Maui.Views;
 
@@ -64,7 +66,7 @@ public PopupPage(Popup popup, IPopupOptions? popupOptions)
 
 		Shell.SetPresentationMode(this, PresentationMode.ModalNotAnimated);
 		On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.OverFullScreen);
-		Microsoft.Maui.Controls.NavigationPage.SetHasNavigationBar(this, false);
+		NavigationPage.SetHasNavigationBar(this, false);
 	}
 
 	public event EventHandler<IPopupResult>? PopupClosed;
@@ -84,7 +86,7 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 
 		if (popupPageToClose is null)
 		{
-			await Navigation.PopModalAsync();
+			await FindPopupPage();
 			return;
 		}
 
@@ -213,6 +215,32 @@ void HandleTapGestureRecognizerTapped(object? sender, TappedEventArgs e)
 		}
 	}
 
+	Task<Page> FindPopupPage()
+	{
+		var stack = Navigation.ModalStack;
+
+		if (stack.Count is 0)
+		{
+			throw new PopupNotFoundException();
+		}
+
+		var page = stack[^1];
+
+		switch (page)
+		{
+			case IPageContainer<Page> container:
+				if (container.CurrentPage is not PopupPage)
+				{
+					throw new PopupNotFoundException();
+				}
+				break;
+			case not PopupPage:
+				throw new PopupNotFoundException();
+		}
+
+		return Navigation.PopModalAsync(false);
+	}
+
 	internal sealed partial class PopupPageLayout : Grid
 	{
 		public PopupPageLayout(in Popup popupContent, in IPopupOptions options)

From c72fd41edd2d48d92aa59608098015f094dfa64f Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:05:42 -0800
Subject: [PATCH 3/7] Add Sample

---
 .../Pages/Views/Popup/PopupsPage.xaml         |  2 ++
 .../Pages/Views/Popup/PopupsPage.xaml.cs      | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml
index 82ca4cb591..46d0348745 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml
@@ -35,6 +35,8 @@
                 <Button Text="Updating Popup" Command="{Binding UpdatingPopupCommand}" />
 
                 <Button Text="Show Popup content" Command="{Binding ShowPopupContentCommand}" />
+                
+                <Button Text="Show Popup in a Modal Page in a Custom Navigation Page" Clicked="HandleModalPopupInCustomNavigationPage" />
 
                 <Button Text="Custom Positioning Popup" Clicked="HandlePopupPositionButtonClicked" />
 
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs
index 79c4a2fb70..59a1404a62 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs
@@ -169,6 +169,29 @@ async void HandleComplexPopupClicked(object? sender, EventArgs e)
 			// Display Popup Result as a Toast
 			await Toast.Make($"You entered {popupResult.Result}").Show(CancellationToken.None);
 		}
+	}
+
+	async void HandleModalPopupInCustomNavigationPage(object? sender, EventArgs eventArgs)
+	{
+		var modalPopupPage = new ContentPage
+		{
+			Content = new VerticalStackLayout
+			{
+				Spacing = 24,
+				Children =
+				{
+					new Button()
+						.Text("Show Popup")
+						.Invoke(button => button.Command = new Command(async () => await popupService.ShowPopupAsync<ButtonPopup>(Shell.Current))),
+
+					new Button()
+						.Text("Back")
+						.Invoke(button => button.Command = new Command(async () => await Navigation.PopModalAsync()))
+				}
+			}.Center()
+		};
 
+		var customNavigationPage = new NavigationPage(modalPopupPage);
+		await Shell.Current.Navigation.PushModalAsync(customNavigationPage, true);
 	}
 }
\ No newline at end of file

From 54864cee192fd5314207ebc01c42b406c80fc9ca Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:45:50 -0800
Subject: [PATCH 4/7] Add Unit Tests

---
 .../Views/Popup/PopupPageTests.cs             | 127 ++++++++++++++++++
 1 file changed, 127 insertions(+)

diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs
index e808445700..7f312479c0 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupPageTests.cs
@@ -8,6 +8,7 @@
 using Nito.AsyncEx;
 using Xunit;
 using Application = Microsoft.Maui.Controls.Application;
+using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
 using Page = Microsoft.Maui.Controls.Page;
 
 namespace CommunityToolkit.Maui.UnitTests.Views;
@@ -169,6 +170,132 @@ public async Task PopupPageT_CloseAfterAdditionalModalPage_ShouldThrowInvalidOpe
 		await Assert.ThrowsAnyAsync<InvalidOperationException>(async () => await popupPage.CloseAsync(new PopupResult(false), CancellationToken.None));
 	}
 
+	[Fact]
+	public async Task PopupPageT_CloseWhenUsingCustomNavigationPage_ShouldClose()
+	{
+		// Arrange
+		if (Application.Current?.Windows[0].Page?.Navigation is not INavigation navigation)
+		{
+			throw new InvalidOperationException("Unable to locate Navigation page");
+		}
+
+		bool wasPopupPageClosed = false;
+
+		var view = new ContentView();
+		var popupOptions = new MockPopupOptions();
+		var popupPage = new PopupPage<string>(view, popupOptions);
+		popupPage.PopupClosed += HandlePopupPageClosed;
+
+		var onAppearingPage = new ContentPage();
+		var customNavigationPage = new NavigationPage(onAppearingPage);
+		onAppearingPage.NavigatedTo += HandlePageNavigatedTo;
+
+		// Act
+		await Shell.Current.Navigation.PushModalAsync(customNavigationPage, true);
+		await popupPage.CloseAsync(new PopupResult(false), CancellationToken.None);
+
+		// Assert
+		Assert.True(wasPopupPageClosed);
+
+		async void HandlePageNavigatedTo(object? sender, NavigatedToEventArgs e)
+		{
+			if (!e.WasPreviousPageACommunityToolkitPopupPage())
+			{
+				await customNavigationPage.Navigation.PushModalAsync(popupPage);
+			}
+		}
+
+		void HandlePopupPageClosed(object? sender, IPopupResult e)
+		{
+			wasPopupPageClosed = true;
+		}
+	}
+
+	[Fact]
+	public async Task PopupPageT_CloseAfterAdditionalModalPageToCustomNavigationPage_ShouldThrowPopupBlockedException()
+	{
+		// Arrange
+		bool wasPopupPageClosed = false;
+
+		var view = new ContentView();
+		var popupOptions = new MockPopupOptions();
+		var firstPopupPage = new PopupPage<string>(view, popupOptions);
+		firstPopupPage.PopupClosed += HandlePopupPageClosed;
+
+		var onAppearingPage = new ContentPage();
+		var customNavigationPage = new NavigationPage(onAppearingPage);
+		onAppearingPage.NavigatedTo += HandlePageNavigatedTo;
+
+		var secondPopupPage = new PopupPage<string>(new Button(), popupOptions);
+
+		// Act
+		await Shell.Current.Navigation.PushModalAsync(customNavigationPage, true);
+		await customNavigationPage.Navigation.PushModalAsync(secondPopupPage);
+
+		// Assert
+		await Assert.ThrowsAsync<PopupBlockedException>(async () => await firstPopupPage.CloseAsync(new PopupResult(false), CancellationToken.None));
+		await Assert.ThrowsAnyAsync<InvalidPopupOperationException>(async () => await firstPopupPage.CloseAsync(new PopupResult(false), CancellationToken.None));
+		await Assert.ThrowsAnyAsync<InvalidOperationException>(async () => await firstPopupPage.CloseAsync(new PopupResult(false), CancellationToken.None));
+		Assert.False(wasPopupPageClosed);
+
+		async void HandlePageNavigatedTo(object? sender, NavigatedToEventArgs e)
+		{
+			if (!e.WasPreviousPageACommunityToolkitPopupPage())
+			{
+				await customNavigationPage.Navigation.PushModalAsync(firstPopupPage);
+			}
+		}
+
+		void HandlePopupPageClosed(object? sender, IPopupResult e)
+		{
+			wasPopupPageClosed = true;
+		}
+	}
+
+	[Fact]
+	public async Task PopupPageT_CloseAfterAdditionalModalPageToCustomNavigationPage_ShouldThrowPopupNotFound()
+	{
+		// Arrange
+		if (Application.Current?.Windows[0].Page?.Navigation is not INavigation navigation)
+		{
+			throw new InvalidOperationException("Unable to locate Navigation page");
+		}
+
+		bool wasPopupPageClosed = false;
+
+		var view = new ContentView();
+		var popupOptions = new MockPopupOptions();
+		var popupPage = new PopupPage<string>(view, popupOptions);
+		popupPage.PopupClosed += HandlePopupPageClosed;
+
+		var onAppearingPage = new ContentPage();
+		var customNavigationPage = new NavigationPage(onAppearingPage);
+		onAppearingPage.NavigatedTo += HandlePageNavigatedTo;
+
+		// Act
+		await Shell.Current.Navigation.PushModalAsync(customNavigationPage, true);
+		await customNavigationPage.Navigation.PushModalAsync(new ContentPage());
+
+		// Assert
+		await Assert.ThrowsAsync<PopupNotFoundException>(async () => await popupPage.CloseAsync(new PopupResult(false), CancellationToken.None));
+		await Assert.ThrowsAnyAsync<InvalidPopupOperationException>(async () => await popupPage.CloseAsync(new PopupResult(false), CancellationToken.None));
+		await Assert.ThrowsAnyAsync<InvalidOperationException>(async () => await popupPage.CloseAsync(new PopupResult(false), CancellationToken.None));
+		Assert.False(wasPopupPageClosed);
+
+		async void HandlePageNavigatedTo(object? sender, NavigatedToEventArgs e)
+		{
+			if (!e.WasPreviousPageACommunityToolkitPopupPage())
+			{
+				await customNavigationPage.Navigation.PushModalAsync(popupPage);
+			}
+		}
+
+		void HandlePopupPageClosed(object? sender, IPopupResult e)
+		{
+			wasPopupPageClosed = true;
+		}
+	}
+
 	[Fact]
 	public void PopupPageT_Close_ShouldThrowOperationCanceledException_WhenTokenIsCancelled()
 	{

From 4e4dbaca7b76481ccd5446617c9ddd6cfcfce29d Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:46:01 -0800
Subject: [PATCH 5/7] Refactor `Close`

---
 .../Views/Popup/PopupPage.shared.cs           | 56 +++++++------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index 0adc361161..1e5c403f3e 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -81,19 +81,29 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 		// This ensures we throw the correct `OperationCanceledException` in the rare scenario where a developer cancels the token, then manually calls `Navigation.PopModalAsync()` before calling `Popup.CloseAsync()`
 		// It may feel a bit redundant, given that we again call `ThrowIfCancellationRequested` later in this method, however, this ensures we propagate the correct Exception to the developer.
 		token.ThrowIfCancellationRequested();
-
-		var popupPageToClose = Navigation.ModalStack.OfType<PopupPage>().LastOrDefault(popupPage => popupPage.Content == Content);
-
-		if (popupPageToClose is null)
+		
+		// Handle edge case where a Popup was pushed inside a custom IPageContainer (e.g. a NavigationPage) on the Modal Stack
+		var customPageContainer = Navigation.ModalStack.OfType<IPageContainer<Page>>().LastOrDefault();
+		if (customPageContainer is not null && customPageContainer.CurrentPage is not PopupPage)
 		{
-			await FindPopupPage();
-			return;
+			throw new PopupNotFoundException();
 		}
-
-		if (Navigation.ModalStack[^1] is Microsoft.Maui.Controls.Page currentVisibleModalPage
-			&& currentVisibleModalPage != popupPageToClose)
+		
+		var popupPageToClose = customPageContainer?.CurrentPage as PopupPage
+		                       ?? Navigation.ModalStack.OfType<PopupPage>().LastOrDefault()
+		                       ?? throw new PopupNotFoundException();
+
+		// PopupModalAsync will pop the last (top) page from the ModalStack
+		// Ensure that the PopupPage that the user is attempting to close is the last (top) page on the Modal stack before calling Navigation.PopModalAsync
+		if (Navigation.ModalStack[^1] is IPageContainer<Page> { CurrentPage: PopupPage visiblePopupPageInCustomPageContainer } 
+		     && visiblePopupPageInCustomPageContainer.Content != Content)
 		{
-			throw new PopupBlockedException(currentVisibleModalPage);
+			throw new PopupBlockedException(popupPageToClose);
+		}
+		else if (Navigation.ModalStack[^1] is ContentPage currentVisibleModalPage
+		         && currentVisibleModalPage.Content != Content)
+		{
+			throw new PopupBlockedException(popupPageToClose);
 		}
 
 		// We call `.ThrowIfCancellationRequested()` again to avoid a race condition where a developer cancels the CancellationToken after we check for an InvalidOperationException
@@ -215,32 +225,6 @@ void HandleTapGestureRecognizerTapped(object? sender, TappedEventArgs e)
 		}
 	}
 
-	Task<Page> FindPopupPage()
-	{
-		var stack = Navigation.ModalStack;
-
-		if (stack.Count is 0)
-		{
-			throw new PopupNotFoundException();
-		}
-
-		var page = stack[^1];
-
-		switch (page)
-		{
-			case IPageContainer<Page> container:
-				if (container.CurrentPage is not PopupPage)
-				{
-					throw new PopupNotFoundException();
-				}
-				break;
-			case not PopupPage:
-				throw new PopupNotFoundException();
-		}
-
-		return Navigation.PopModalAsync(false);
-	}
-
 	internal sealed partial class PopupPageLayout : Grid
 	{
 		public PopupPageLayout(in Popup popupContent, in IPopupOptions options)

From 6fe8b75a044194a73eb2788528302ca7c42ed2c1 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:57:24 -0800
Subject: [PATCH 6/7] `dotnet format`

---
 .../Views/Popup/PopupPage.shared.cs                | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index 1e5c403f3e..10efd4ab2c 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -81,27 +81,27 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 		// This ensures we throw the correct `OperationCanceledException` in the rare scenario where a developer cancels the token, then manually calls `Navigation.PopModalAsync()` before calling `Popup.CloseAsync()`
 		// It may feel a bit redundant, given that we again call `ThrowIfCancellationRequested` later in this method, however, this ensures we propagate the correct Exception to the developer.
 		token.ThrowIfCancellationRequested();
-		
+
 		// Handle edge case where a Popup was pushed inside a custom IPageContainer (e.g. a NavigationPage) on the Modal Stack
 		var customPageContainer = Navigation.ModalStack.OfType<IPageContainer<Page>>().LastOrDefault();
 		if (customPageContainer is not null && customPageContainer.CurrentPage is not PopupPage)
 		{
 			throw new PopupNotFoundException();
 		}
-		
+
 		var popupPageToClose = customPageContainer?.CurrentPage as PopupPage
-		                       ?? Navigation.ModalStack.OfType<PopupPage>().LastOrDefault()
-		                       ?? throw new PopupNotFoundException();
+							   ?? Navigation.ModalStack.OfType<PopupPage>().LastOrDefault()
+							   ?? throw new PopupNotFoundException();
 
 		// PopupModalAsync will pop the last (top) page from the ModalStack
 		// Ensure that the PopupPage that the user is attempting to close is the last (top) page on the Modal stack before calling Navigation.PopModalAsync
-		if (Navigation.ModalStack[^1] is IPageContainer<Page> { CurrentPage: PopupPage visiblePopupPageInCustomPageContainer } 
-		     && visiblePopupPageInCustomPageContainer.Content != Content)
+		if (Navigation.ModalStack[^1] is IPageContainer<Page> { CurrentPage: PopupPage visiblePopupPageInCustomPageContainer }
+			 && visiblePopupPageInCustomPageContainer.Content != Content)
 		{
 			throw new PopupBlockedException(popupPageToClose);
 		}
 		else if (Navigation.ModalStack[^1] is ContentPage currentVisibleModalPage
-		         && currentVisibleModalPage.Content != Content)
+				 && currentVisibleModalPage.Content != Content)
 		{
 			throw new PopupBlockedException(popupPageToClose);
 		}

From c6cf453bd83156cf95465afe2e758760ac087ba8 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:00:04 -0800
Subject: [PATCH 7/7] Fix typo

---
 src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index 10efd4ab2c..d711bdaedb 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -93,8 +93,8 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 							   ?? Navigation.ModalStack.OfType<PopupPage>().LastOrDefault()
 							   ?? throw new PopupNotFoundException();
 
-		// PopupModalAsync will pop the last (top) page from the ModalStack
-		// Ensure that the PopupPage that the user is attempting to close is the last (top) page on the Modal stack before calling Navigation.PopModalAsync
+		// PopModalAsync will pop the last (top) page from the ModalStack
+		// Ensure that the PopupPage the user is attempting to close is the last (top) page on the Modal stack before calling Navigation.PopModalAsync
 		if (Navigation.ModalStack[^1] is IPageContainer<Page> { CurrentPage: PopupPage visiblePopupPageInCustomPageContainer }
 			 && visiblePopupPageInCustomPageContainer.Content != Content)
 		{