Make sure Popup will set the Window at the Content (#674)

* Make sure Popup will set the Window at the Content * dotnet format * Group Fields + Public Properties together * removed the Parent set from macios Co-authored-by: Brandon Minnick <[email protected]>
CommunityToolkit · Oct 18, 2022 · ba22c8e · ba22c8e
1 parent e9b0a6c
commit ba22c8e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/src/CommunityToolkit.Maui.Core/Interfaces/IPopup.shared.cs b/src/CommunityToolkit.Maui.Core/Interfaces/IPopup.shared.cs
@@ -6,7 +6,7 @@ namespace CommunityToolkit.Maui.Core;
 /// <summary>
 /// Represents a small View that pops up at front the Page.
 /// </summary>
-public interface IPopup : IElement
+public interface IPopup : IElement, IVisualTreeElement
 {
 	/// <summary>
 	/// Gets the View that Popup will be anchored.

diff --git a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs b/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
@@ -25,8 +25,7 @@ static PageHandler CreatePageHandler(IPopup virtualView)
 			var view = (View?)virtualView.Content ?? throw new InvalidOperationException($"{nameof(IPopup.Content)} can't be null here.");
 			var contentPage = new ContentPage
 			{
-				Content = view,
-				Parent = Application.Current?.MainPage
+				Content = view
 			};
 
 			contentPage.SetBinding(BindingContextProperty, new Binding { Source = virtualView, Path = BindingContextProperty.PropertyName });

diff --git a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui.Core;
+using Microsoft.Maui.Controls.Internals;
 using LayoutAlignment = Microsoft.Maui.Primitives.LayoutAlignment;
 
 namespace CommunityToolkit.Maui.Views;
@@ -7,7 +8,7 @@ namespace CommunityToolkit.Maui.Views;
 /// Represents a small View that pops up at front the Page. Implements <see cref="IPopup"/>.
 /// </summary>
 [ContentProperty(nameof(Content))]
-public partial class Popup : Element, IPopup
+public partial class Popup : Element, IPopup, IWindowController, IPropertyPropagationController
 {
 	/// <summary>
 	///  Backing BindableProperty for the <see cref="Content"/> property.
@@ -44,6 +45,7 @@ public partial class Popup : Element, IPopup
 	readonly Lazy<PlatformConfigurationRegistry<Popup>> platformConfigurationRegistry;
 
 	TaskCompletionSource<object?> taskCompletionSource = new();
+	Window? window;
 
 	/// <summary>
 	/// Instantiates a new instance of <see cref="Popup"/>.
@@ -53,7 +55,6 @@ public Popup()
 		platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<Popup>>(() => new(this));
 
 		VerticalOptions = HorizontalOptions = LayoutAlignment.Center;
-
 #if WINDOWS
 		this.HandlerChanged += OnPopupHandlerChanged;
 #endif
@@ -163,6 +164,23 @@ public bool CanBeDismissedByTappingOutsideOfPopup
 	/// </remarks>
 	public View? Anchor { get; set; }
 
+	/// <summary>
+	/// Property that represents the Window that's showing the Popup.
+	/// </summary>
+	public Window? Window
+	{
+		get => window;
+		set
+		{
+			window = value;
+
+			if (Content is IWindowController controller)
+			{
+				controller.Window = value;
+			}
+		}
+	}
+
 	/// <summary>
 	/// Gets or sets the result that will return when user taps outside of the Popup.
 	/// </summary>
@@ -174,6 +192,7 @@ public bool CanBeDismissedByTappingOutsideOfPopup
 	/// <inheritdoc/>
 	IView? IPopup.Content => Content;
 
+
 	/// <summary>
 	/// Resets the Popup.
 	/// </summary>
@@ -231,6 +250,7 @@ protected override void OnBindingContextChanged()
 		if (Content is not null)
 		{
 			SetInheritedBindingContext(Content, BindingContext);
+			Content.Parent = this;
 		}
 	}
 
@@ -250,4 +270,12 @@ static void OnColorChanged(BindableObject bindable, object oldValue, object newV
 	void IPopup.OnOpened() => OnOpened();
 
 	void IPopup.OnDismissedByTappingOutsideOfPopup() => OnDismissedByTappingOutsideOfPopup();
+
+	void IPropertyPropagationController.PropagatePropertyChanged(string propertyName) =>
+		PropertyPropagationExtensions.PropagatePropertyChanged(propertyName, this, ((IVisualTreeElement)this).GetVisualChildren());
+
+	IReadOnlyList<IVisualTreeElement> IVisualTreeElement.GetVisualChildren() =>
+		Content is null
+			? Enumerable.Empty<IVisualTreeElement>().ToList()
+			: new List<IVisualTreeElement> { Content };
 }