From 27045572f65d1d9ac02ac309599f0da9e55c29a5 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <17139988+bijington@users.noreply.github.com>
Date: Wed, 25 Jun 2025 22:00:33 +0100
Subject: [PATCH 1/2] Move default values into a style to support style
 overriding

---
 samples/CommunityToolkit.Maui.Sample/App.xaml |  4 ++
 .../Views/Popup/Popup.shared.cs               | 37 ++++++-------------
 .../Views/Popup/PopupPage.shared.cs           |  9 +++--
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/App.xaml b/samples/CommunityToolkit.Maui.Sample/App.xaml
index 9167b3b42b..b02035424c 100644
--- a/samples/CommunityToolkit.Maui.Sample/App.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/App.xaml
@@ -27,6 +27,10 @@
             </Style>
             <Style x:Key="InheritancePopupStyle" TargetType="{x:Type popups:StyleInheritancePopup}" BasedOn="{StaticResource BasePopupStyle}">
                 <Setter Property="BackgroundColor" Value="SkyBlue" />
+                <Setter Property="Margin" Value="1" />
+                <Setter Property="Padding" Value="1" />
+                <Setter Property="HorizontalOptions" Value="Center" />
+                <Setter Property="VerticalOptions" Value="Center" />
             </Style>
 
             <Style x:Key="DynamicBasePopupStyle" TargetType="{x:Type popups:DynamicStyleInheritancePopup}">
diff --git a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
index c971c92294..440b7473ed 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
@@ -7,40 +7,27 @@ namespace CommunityToolkit.Maui.Views;
 /// </summary>
 public partial class Popup : ContentView
 {
-	/// <summary>
-	/// Bindable property to set the margin between the <see cref="Popup"/> and the edge of the window
-	/// </summary>
-	public static new readonly BindableProperty MarginProperty = View.MarginProperty;
-
-	/// <summary>
-	/// Bindable property to set the padding between the <see cref="Popup"/> border and the <see cref="Popup"/> content
-	/// </summary>
-	public static new readonly BindableProperty PaddingProperty = ContentView.PaddingProperty;
-
-	/// <summary>
-	/// Bindable property to set the horizontal position of the <see cref="Popup"/> when displayed on screen
-	/// </summary>
-	public static new readonly BindableProperty HorizontalOptionsProperty = View.HorizontalOptionsProperty;
-
-	/// <summary>
-	/// Bindable property to set the vertical position of the <see cref="Popup"/> when displayed on screen
-	/// </summary>
-	public static new readonly BindableProperty VerticalOptionsProperty = View.VerticalOptionsProperty;
-
 	/// <summary>
 	///  Backing BindableProperty for the <see cref="CanBeDismissedByTappingOutsideOfPopup"/> property.
 	/// </summary>
 	public static readonly BindableProperty CanBeDismissedByTappingOutsideOfPopupProperty = BindableProperty.Create(nameof(CanBeDismissedByTappingOutsideOfPopup), typeof(bool), typeof(Popup), PopupDefaults.CanBeDismissedByTappingOutsideOfPopup);
-
+	
 	/// <summary>
 	/// Initializes Popup
 	/// </summary>
 	public Popup()
 	{
-		Margin = PopupDefaults.Margin;
-		Padding = PopupDefaults.Padding;
-		HorizontalOptions = PopupDefaults.HorizontalOptions;
-		VerticalOptions = PopupDefaults.VerticalOptions;
+		var style = new Style(typeof(Popup))
+		{
+			ApplyToDerivedTypes = true
+		};
+
+		style.Setters.Add(new Setter { Property = Popup.HorizontalOptionsProperty, Value = PopupDefaults.HorizontalOptions });
+		style.Setters.Add(new Setter { Property = Popup.VerticalOptionsProperty, Value = PopupDefaults.VerticalOptions });
+		style.Setters.Add(new Setter { Property = Popup.MarginProperty, Value = PopupDefaults.Margin });
+		style.Setters.Add(new Setter { Property = Popup.PaddingProperty, Value = PopupDefaults.Padding });
+		
+		Resources.Add(style);
 	}
 
 	/// <summary>
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index ebf1a76e75..b35a897fbe 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -7,6 +7,7 @@
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Controls.Shapes;
+using static Microsoft.Maui.Controls.View;
 
 namespace CommunityToolkit.Maui.Views;
 
@@ -136,13 +137,13 @@ protected override void OnNavigatedTo(NavigatedToEventArgs args)
 		popup.SetBinding(BackgroundProperty, static (View view) => view.Background, source: view, mode: BindingMode.OneWay);
 		popup.SetBinding(BindingContextProperty, static (View view) => view.BindingContext, source: view, mode: BindingMode.OneWay);
 		popup.SetBinding(BackgroundColorProperty, static (View view) => view.BackgroundColor, source: view, mode: BindingMode.OneWay);
-		popup.SetBinding(Popup.MarginProperty, static (View view) => view.Margin, source: view, mode: BindingMode.OneWay);
-		popup.SetBinding(Popup.VerticalOptionsProperty, static (View view) => view.VerticalOptions, source: view, mode: BindingMode.OneWay, converter: new VerticalOptionsConverter());
-		popup.SetBinding(Popup.HorizontalOptionsProperty, static (View view) => view.HorizontalOptions, source: view, mode: BindingMode.OneWay, converter: new HorizontalOptionsConverter());
+		popup.SetBinding(MarginProperty, static (View view) => view.Margin, source: view, mode: BindingMode.OneWay);
+		popup.SetBinding(VerticalOptionsProperty, static (View view) => view.VerticalOptions, source: view, mode: BindingMode.OneWay, converter: new VerticalOptionsConverter());
+		popup.SetBinding(HorizontalOptionsProperty, static (View view) => view.HorizontalOptions, source: view, mode: BindingMode.OneWay, converter: new HorizontalOptionsConverter());
 
 		if (view is IPaddingElement paddingElement)
 		{
-			popup.SetBinding(Popup.PaddingProperty, static (IPaddingElement paddingElement) => paddingElement.Padding, source: paddingElement, mode: BindingMode.OneWay, converter: new PaddingConverter());
+			popup.SetBinding(PaddingProperty, static (IPaddingElement paddingElement) => paddingElement.Padding, source: paddingElement, mode: BindingMode.OneWay, converter: new PaddingConverter());
 		}
 
 		return popup;

From 4ab66ddd515ed20b04079e44aeec65a2e0bab5c2 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <17139988+bijington@users.noreply.github.com>
Date: Thu, 26 Jun 2025 20:30:59 +0100
Subject: [PATCH 2/2] Improvements for code review

---
 .../Views/Popup/Popup.shared.cs               | 44 ++++++++++++++-----
 .../Views/Popup/PopupPage.shared.cs           |  7 ++-
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
index 440b7473ed..5485ff1b7a 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
@@ -7,27 +7,49 @@ namespace CommunityToolkit.Maui.Views;
 /// </summary>
 public partial class Popup : ContentView
 {
+	/// <summary>
+	/// Bindable property to set the margin between the <see cref="Popup"/> and the edge of the window
+	/// </summary>
+	public static new readonly BindableProperty MarginProperty = View.MarginProperty;
+
+	/// <summary>
+	/// Bindable property to set the padding between the <see cref="Popup"/> border and the <see cref="Popup"/> content
+	/// </summary>
+	public static new readonly BindableProperty PaddingProperty = ContentView.PaddingProperty;
+
+	/// <summary>
+	/// Bindable property to set the horizontal position of the <see cref="Popup"/> when displayed on screen
+	/// </summary>
+	public static new readonly BindableProperty HorizontalOptionsProperty = View.HorizontalOptionsProperty;
+
+	/// <summary>
+	/// Bindable property to set the vertical position of the <see cref="Popup"/> when displayed on screen
+	/// </summary>
+	public static new readonly BindableProperty VerticalOptionsProperty = View.VerticalOptionsProperty;
+	
 	/// <summary>
 	///  Backing BindableProperty for the <see cref="CanBeDismissedByTappingOutsideOfPopup"/> property.
 	/// </summary>
 	public static readonly BindableProperty CanBeDismissedByTappingOutsideOfPopupProperty = BindableProperty.Create(nameof(CanBeDismissedByTappingOutsideOfPopup), typeof(bool), typeof(Popup), PopupDefaults.CanBeDismissedByTappingOutsideOfPopup);
+
+	static Style DefaultStyle { get; } = new Style(typeof(Popup))
+	{
+		ApplyToDerivedTypes = true,
+		Setters =
+		{
+			new Setter { Property = Popup.HorizontalOptionsProperty, Value = PopupDefaults.HorizontalOptions },
+			new Setter { Property = Popup.VerticalOptionsProperty, Value = PopupDefaults.VerticalOptions },
+			new Setter { Property = Popup.MarginProperty, Value = PopupDefaults.Margin },
+			new Setter { Property = Popup.PaddingProperty, Value = PopupDefaults.Padding }
+		}
+	};
 	
 	/// <summary>
 	/// Initializes Popup
 	/// </summary>
 	public Popup()
 	{
-		var style = new Style(typeof(Popup))
-		{
-			ApplyToDerivedTypes = true
-		};
-
-		style.Setters.Add(new Setter { Property = Popup.HorizontalOptionsProperty, Value = PopupDefaults.HorizontalOptions });
-		style.Setters.Add(new Setter { Property = Popup.VerticalOptionsProperty, Value = PopupDefaults.VerticalOptions });
-		style.Setters.Add(new Setter { Property = Popup.MarginProperty, Value = PopupDefaults.Margin });
-		style.Setters.Add(new Setter { Property = Popup.PaddingProperty, Value = PopupDefaults.Padding });
-		
-		Resources.Add(style);
+		Resources.Add(DefaultStyle);
 	}
 
 	/// <summary>
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index b35a897fbe..991f63f1c6 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -7,7 +7,6 @@
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Controls.Shapes;
-using static Microsoft.Maui.Controls.View;
 
 namespace CommunityToolkit.Maui.Views;
 
@@ -137,9 +136,9 @@ protected override void OnNavigatedTo(NavigatedToEventArgs args)
 		popup.SetBinding(BackgroundProperty, static (View view) => view.Background, source: view, mode: BindingMode.OneWay);
 		popup.SetBinding(BindingContextProperty, static (View view) => view.BindingContext, source: view, mode: BindingMode.OneWay);
 		popup.SetBinding(BackgroundColorProperty, static (View view) => view.BackgroundColor, source: view, mode: BindingMode.OneWay);
-		popup.SetBinding(MarginProperty, static (View view) => view.Margin, source: view, mode: BindingMode.OneWay);
-		popup.SetBinding(VerticalOptionsProperty, static (View view) => view.VerticalOptions, source: view, mode: BindingMode.OneWay, converter: new VerticalOptionsConverter());
-		popup.SetBinding(HorizontalOptionsProperty, static (View view) => view.HorizontalOptions, source: view, mode: BindingMode.OneWay, converter: new HorizontalOptionsConverter());
+		popup.SetBinding(View.MarginProperty, static (View view) => view.Margin, source: view, mode: BindingMode.OneWay);
+		popup.SetBinding(View.VerticalOptionsProperty, static (View view) => view.VerticalOptions, source: view, mode: BindingMode.OneWay, converter: new VerticalOptionsConverter());
+		popup.SetBinding(View.HorizontalOptionsProperty, static (View view) => view.HorizontalOptions, source: view, mode: BindingMode.OneWay, converter: new HorizontalOptionsConverter());
 
 		if (view is IPaddingElement paddingElement)
 		{