Fix Hot Reload with Popup

src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs

@@ -323,6 +323,38 @@ public void NullColorThrowsArgumentNullException()
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
+	[Fact(Timeout = (int)TestDuration.Short)]
+	public async Task ShowPopup_IsLogicalChild()
+	{
+		var app = Application.Current ?? throw new NullReferenceException();
+
+		var page = new ContentPage
+		{
+			Content = new Label
+			{
+				Text = "Hello there"
+			}
+		};
+
+		// Make sure that our page will have a Handler
+		CreateViewHandler<MockPageHandler>(page);
+
+		app.MainPage = page;
+
+		// Make sure that our popup will have a Handler
+		CreateElementHandler<MockPopupHandler>(popup);
+
+		Assert.NotNull(popup.Handler);
+		Assert.NotNull(page.Handler);
+
+		Assert.Single(page.LogicalChildrenInternal);
+		page.ShowPopup((MockPopup)popup);
+		Assert.Equal(2, page.LogicalChildrenInternal.Count);
+
+		await((MockPopup)popup).CloseAsync(token: CancellationToken.None);
+		Assert.Single(page.LogicalChildrenInternal);
+	}
+
 	class MockPopup : Popup
 	{
 		public MockPopup()

src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs

@@ -27,9 +27,10 @@ static PageHandler CreatePageHandler(IPopup virtualView)
 			view.SetBinding(BindingContextProperty, new Binding { Source = virtualView, Path = BindingContextProperty.PropertyName });
 			var contentPage = new ContentPage
 			{
-				Content = view,
-				Parent = virtualView.Parent as Element
+				Content = view
 			};
+			var parent = virtualView.Parent as Element;
+			parent?.AddLogicalChild(contentPage);
 
 			return (PageHandler)contentPage.ToHandler(mauiContext);
 		}

src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs

@@ -351,7 +351,11 @@ protected virtual async Task OnClosed(object? result, bool wasDismissedByTapping
 		((IResourceDictionary)resources).ValuesChanged -= OnResourcesChanged;
 
 		await popupDismissedTaskCompletionSource.Task.WaitAsync(token);
-		Parent = null;
+
+		if (Parent is not null)
+		{
+			Parent.RemoveLogicalChild(this);
+		}
 
 		dismissWeakEventManager.HandleEvent(this, new PopupClosedEventArgs(result, wasDismissedByTappingOutsideOfPopup), nameof(Closed));
 	}

src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.shared.cs

@@ -114,7 +114,10 @@ async void handler(object? sender, EventArgs args)
 	static void CreatePopup(Page page, Popup popup)
 	{
 		var mauiContext = GetMauiContext(page);
-		popup.Parent = page.GetCurrentPage();
+
+		var parent = page.GetCurrentPage();
+		parent.AddLogicalChild(popup);
+
 		var platformPopup = popup.ToHandler(mauiContext);
 		platformPopup.Invoke(nameof(IPopup.OnOpened));
 	}

src/CommunityToolkit.Maui/Views/Popup/PopupExtensions.windows.cs

@@ -12,7 +12,9 @@ public static partial class PopupExtensions
 	static void PlatformShowPopup(Popup popup, IMauiContext mauiContext)
 	{
 		var window = mauiContext.GetPlatformWindow().GetWindow() ?? throw new NullReferenceException("Window is null.");
-		popup.Parent = ((Page)window.Content).GetCurrentPage();
+
+		Page parent = ((Page)window.Content).GetCurrentPage();
+		parent.AddLogicalChild(popup);
 
 		var platform = popup.ToHandler(mauiContext);
 		platform?.Invoke(nameof(IPopup.OnOpened));