From 1e153071e12b3ca46855021a9a1b99423acd5142 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <17139988+bijington@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:45:37 +0000
Subject: [PATCH 1/6] Initial musings on showing popups without having to
 create your own popup

---
 .../MauiProgram.cs                            |  2 +
 .../Pages/Views/Popup/MultiplePopupPage.xaml  |  2 +
 .../Views/Popup/MultiplePopupViewModel.cs     |  8 ++++
 .../Views/Popup/PopupContentViewModel.cs      | 11 +++++
 .../Views/Popups/PopupContentView.xaml        | 15 ++++++
 .../Views/Popups/PopupContentView.xaml.cs     | 13 +++++
 .../ServiceCollectionExtensions.shared.cs     | 19 ++++++++
 .../Popup/Popup.macios.cs                     |  2 +-
 src/CommunityToolkit.Maui/PopupService.cs     | 47 +++++++++++++++++--
 9 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupContentViewModel.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index 175a32efc..02b29d395 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -198,6 +198,8 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientPopup<CsharpBindingPopup, CsharpBindingPopupViewModel>();
 		services.AddTransientPopup<UpdatingPopup, UpdatingPopupViewModel>();
 		services.AddTransientPopup<XamlBindingPopup, XamlBindingPopupViewModel>();
+
+		services.AddTransientPopupContent<PopupContentView, PopupContentViewModel>();
 	}
 
 	static void RegisterEssentials(in IServiceCollection services)
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
index d05ab27ce..1267aaebe 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
@@ -31,6 +31,8 @@
                 <Button Text="C# Binding Popup" Command="{Binding CsharpBindingPopupCommand}" />
 
                 <Button Text="Updating Popup" Command="{Binding UpdatingPopupCommand}" />
+
+                <Button Text="Show Popup content" Command="{Binding ShowPopupContentCommand}" />
             </VerticalStackLayout>
         </ScrollView>
     </ContentPage.Content>
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
index 05dd13a53..a091d7bef 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
@@ -20,4 +20,12 @@ Task OnUpdatingPopup(CancellationToken token)
 			onPresenting: viewModel => viewModel.PerformUpdates(10),
 			token);
 	}
+
+	[RelayCommand]
+	Task OnShowPopupContent(CancellationToken token)
+	{
+		return popupService.ShowPopupAsync<PopupContentViewModel>(
+			onPresenting: viewModel => viewModel.SetMessage("This is a dynamically set message, shown in a popup without the need to create your own Popup subclass."),
+			token);
+	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupContentViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupContentViewModel.cs
new file mode 100644
index 000000000..aae6aea02
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupContentViewModel.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
+
+public sealed partial class PopupContentViewModel : BaseViewModel
+{
+    [ObservableProperty]
+	string message = "";
+
+    internal void SetMessage(string text) => this.Message = text;
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml
new file mode 100644
index 000000000..fa0f57729
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Grid
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="CommunityToolkit.Maui.Sample.Views.Popups.PopupContentView"
+    xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
+    x:DataType="viewModels:PopupContentViewModel">
+
+    <Label
+        Text="{Binding Message}"
+        HorizontalTextAlignment="Center"
+        VerticalTextAlignment="Center"
+        Margin="20" />
+
+</Grid>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml.cs
new file mode 100644
index 000000000..dd71ac58d
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/PopupContentView.xaml.cs
@@ -0,0 +1,13 @@
+using CommunityToolkit.Maui.Sample.ViewModels.Views;
+
+namespace CommunityToolkit.Maui.Sample.Views.Popups;
+
+public partial class PopupContentView : Grid
+{
+	public PopupContentView(PopupContentViewModel popupContentViewModel)
+	{
+		InitializeComponent();
+
+		BindingContext = popupContentViewModel;
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs b/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
index 76e82d1de..af6c208ea 100644
--- a/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
@@ -52,6 +52,25 @@ public static IServiceCollection AddTransientPopup<TPopupView, TPopupViewModel>(
 		return services;
 	}
 
+	/// <summary>
+	/// Adds a <see cref="View"/> of the type specified in <typeparamref name="TPopupContentView"/> and a ViewModel
+	/// of the type specified in <typeparamref name="TPopupViewModel"/> to the specified
+	/// <see cref="IServiceCollection"/> with <see cref="ServiceLifetime.Transient"/> lifetime.
+	/// </summary>
+	/// <typeparam name="TPopupContentView">The type of the Popup to add. Constrained to <see cref="View"/></typeparam>
+	/// <typeparam name="TPopupViewModel">The type of the ViewModel to add. Constrained to 
+	/// <see cref="INotifyPropertyChanged"/></typeparam>
+	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
+	/// <returns>A reference to this instance after the operation has completed.</returns>
+	public static IServiceCollection AddTransientPopupContent<TPopupContentView, TPopupViewModel>(this IServiceCollection services)
+		where TPopupContentView : View
+		where TPopupViewModel : INotifyPropertyChanged
+	{
+		PopupService.AddTransientPopupContent<TPopupContentView, TPopupViewModel>(services);
+
+		return services;
+	}
+
 	/// <summary>
 	/// Adds a <see cref="NavigableElement"/> of the type specified in <typeparamref name="TView"/> and a ViewModel
 	/// of the type specified in <typeparamref name="TViewModel"/> to the specified
diff --git a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs b/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
index 1db15585c..bcd30dba2 100644
--- a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
+++ b/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
@@ -24,7 +24,7 @@ static PageHandler CreatePageHandler(IPopup virtualView)
 		{
 			var mauiContext = virtualView.Handler?.MauiContext ?? throw new NullReferenceException(nameof(IMauiContext));
 			var view = (View?)virtualView.Content ?? throw new InvalidOperationException($"{nameof(IPopup.Content)} can't be null here.");
-			view.SetBinding(BindingContextProperty, new Binding { Source = virtualView, Path = BindingContextProperty.PropertyName });
+			//view.SetBinding(BindingContextProperty, new Binding { Source = virtualView, Path = BindingContextProperty.PropertyName });
 			var contentPage = new ContentPage
 			{
 				Content = view,
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 848e90967..03203d55c 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -35,6 +35,16 @@ public PopupService()
 							?? throw new InvalidOperationException("Could not locate IServiceProvider");
 	}
 
+	internal static void AddTransientPopupContent<TPopupContentView, TPopupViewModel>(IServiceCollection services)
+		where TPopupContentView : View
+		where TPopupViewModel : INotifyPropertyChanged
+	{
+		viewModelToViewMappings.Add(typeof(TPopupViewModel), typeof(TPopupContentView));
+
+		services.AddTransient(typeof(TPopupContentView));
+		services.AddTransient(typeof(TPopupViewModel));
+	}
+
 	internal static void AddTransientPopup<TPopupView, TPopupViewModel>(IServiceCollection services)
 		where TPopupView : IPopup
 		where TPopupViewModel : INotifyPropertyChanged
@@ -126,24 +136,51 @@ public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewMo
 	/// <exception cref="InvalidOperationException"></exception>
 	static void ValidateBindingContext<TViewModel>(Popup popup, out TViewModel bindingContext)
 	{
-		if (popup.BindingContext is not TViewModel viewModel)
+		if (popup.BindingContext is TViewModel viewModel)
+		{
+			bindingContext = viewModel;
+			return;			
+		}
+		else if (popup.Content?.BindingContext is TViewModel contentViewModel)
 		{
-			throw new InvalidOperationException($"Unexpected type has been assigned to the BindingContext of {popup.GetType().FullName}. Expected type {typeof(TViewModel).FullName} but was {popup.BindingContext?.GetType().FullName ?? "null"}");
+			bindingContext = contentViewModel;
+			return;
 		}
 
-		bindingContext = viewModel;
+		throw new InvalidOperationException($"Unexpected type has been assigned to the BindingContext of {popup.GetType().FullName}. Expected type {typeof(TViewModel).FullName} but was {popup.BindingContext?.GetType().FullName ?? "null"}");
 	}
 
 	Popup GetPopup(Type viewModelType)
 	{
-		var popup = serviceProvider.GetService(viewModelToViewMappings[viewModelType]) as Popup;
+		var view = serviceProvider.GetService(viewModelToViewMappings[viewModelType]);
 
-		if (popup is null)
+		if (view is null)
 		{
 			throw new InvalidOperationException(
 				$"Unable to resolve popup type for {viewModelType} please make sure that you have called {nameof(AddTransientPopup)}");
 		}
 
+		Popup popup;
+
+		if (view is View visualElement)
+		{
+			popup = new Popup
+			{
+				Content = visualElement
+			};
+
+			//visualElement.SetBinding(VisualElement.BindingContextProperty, new Binding(path: nameof(Popup.BindingContext), source: popup));
+		}
+		else if (view is Popup viewPopup)
+		{
+			popup = viewPopup;
+		}
+		else
+		{
+			throw new InvalidOperationException(
+				$"Invalid type of view being used to present a Popup. Expected either IPopup or View.");
+		}
+
 		return popup;
 	}
 }
\ No newline at end of file

From fdd77156788e1606ea1557b40df492144420b40b Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <17139988+bijington@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:47:26 +0000
Subject: [PATCH 2/6] Remove commented code

---
 src/CommunityToolkit.Maui/PopupService.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 03203d55c..cdc0157b1 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -168,8 +168,6 @@ Popup GetPopup(Type viewModelType)
 			{
 				Content = visualElement
 			};
-
-			//visualElement.SetBinding(VisualElement.BindingContextProperty, new Binding(path: nameof(Popup.BindingContext), source: popup));
 		}
 		else if (view is Popup viewPopup)
 		{

From 1f78fa74b3044626da587eb71aafe2f64b6d6779 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <17139988+bijington@users.noreply.github.com>
Date: Mon, 4 Dec 2023 21:29:13 +0000
Subject: [PATCH 3/6] Pass on the BindingContext of a view up to the popup

---
 .../HandlerImplementation/Popup/Popup.macios.cs                | 2 +-
 src/CommunityToolkit.Maui/PopupService.cs                      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs b/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
index bcd30dba2..1db15585c 100644
--- a/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
+++ b/src/CommunityToolkit.Maui/HandlerImplementation/Popup/Popup.macios.cs
@@ -24,7 +24,7 @@ static PageHandler CreatePageHandler(IPopup virtualView)
 		{
 			var mauiContext = virtualView.Handler?.MauiContext ?? throw new NullReferenceException(nameof(IMauiContext));
 			var view = (View?)virtualView.Content ?? throw new InvalidOperationException($"{nameof(IPopup.Content)} can't be null here.");
-			//view.SetBinding(BindingContextProperty, new Binding { Source = virtualView, Path = BindingContextProperty.PropertyName });
+			view.SetBinding(BindingContextProperty, new Binding { Source = virtualView, Path = BindingContextProperty.PropertyName });
 			var contentPage = new ContentPage
 			{
 				Content = view,
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index cdc0157b1..99a6d1fbf 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -168,6 +168,9 @@ Popup GetPopup(Type viewModelType)
 			{
 				Content = visualElement
 			};
+
+			// Binding the BindingContext property up from the view to the popup so that it is nicely handled on macOS.
+			popup.SetBinding(Popup.BindingContextProperty, new Binding { Source = view, Path = Popup.BindingContextProperty.PropertyName });
 		}
 		else if (view is Popup viewPopup)
 		{

From f7fb58104dd55181e6eb4e4ad846eedf72cacd40 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <17139988+bijington@users.noreply.github.com>
Date: Sun, 11 Feb 2024 14:20:17 +0000
Subject: [PATCH 4/6] Expand IPopupService API to enable the ability to supply
 the configurable properties

The aim is to allow us to hide the Popup away from developers, or at least simply the usage of showing a popup to not needing to create a Popup implementation
---
 .../IPopupService.cs                          |  77 ++++++++---
 .../PopupServiceTests.cs                      | 100 ++------------
 src/CommunityToolkit.Maui/PopupService.cs     | 122 +++++++++++++-----
 .../Views/Popup/Popup.shared.cs               |   2 +-
 4 files changed, 160 insertions(+), 141 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/IPopupService.cs b/src/CommunityToolkit.Maui.Core/IPopupService.cs
index f549dbfa2..56d7b5a93 100644
--- a/src/CommunityToolkit.Maui.Core/IPopupService.cs
+++ b/src/CommunityToolkit.Maui.Core/IPopupService.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using Microsoft.Maui.Primitives;
 
 namespace CommunityToolkit.Maui.Core;
 
@@ -11,7 +12,19 @@ public interface IPopupService
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
 	/// </summary>
 	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
-	void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged;
+	/// <param name="canBeDismissedByTappingOutsideOfPopup">A <see cref="bool"/> indicating whether the <see cref="CommunityToolkit.Maui.Core.IPopup"/> can be dismissed by tapping outside of it.</param>
+	/// <param name="resultWhenUserTapsOutsideOfPopup">An <see cref="object"/> that will be returned when the user taps outside of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="verticalOptions">The vertical alignment of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="horizontalOptions">The horizontal alignment of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="size">The size of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="color">The background color of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	void ShowPopup<TViewModel>(
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		LayoutAlignment verticalOptions = LayoutAlignment.Center,
+		LayoutAlignment horizontalOptions = LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default) where TViewModel : INotifyPropertyChanged;
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
@@ -19,22 +32,41 @@ public interface IPopupService
 	/// </summary>
 	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
 	/// <param name="onPresenting">An <see cref="Action{TViewModel}"/> that will be performed before the popup is presented.</param>
-	void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewModel : INotifyPropertyChanged;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
-	/// </summary>
-	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
-	/// <param name="viewModel">The view model to use as the <c>BindingContext</c> for the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
-	void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged;
+	/// <param name="canBeDismissedByTappingOutsideOfPopup">A <see cref="bool"/> indicating whether the <see cref="CommunityToolkit.Maui.Core.IPopup"/> can be dismissed by tapping outside of it.</param>
+	/// <param name="resultWhenUserTapsOutsideOfPopup">An <see cref="object"/> that will be returned when the user taps outside of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="verticalOptions">The vertical alignment of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="horizontalOptions">The horizontal alignment of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="size">The size of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="color">The background color of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	void ShowPopup<TViewModel>(
+		Action<TViewModel> onPresenting,
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		LayoutAlignment verticalOptions = LayoutAlignment.Center,
+		LayoutAlignment horizontalOptions = LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default) where TViewModel : INotifyPropertyChanged;
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
 	/// </summary>
 	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
+	/// <param name="canBeDismissedByTappingOutsideOfPopup">A <see cref="bool"/> indicating whether the <see cref="CommunityToolkit.Maui.Core.IPopup"/> can be dismissed by tapping outside of it.</param>
+	/// <param name="resultWhenUserTapsOutsideOfPopup">An <see cref="object"/> that will be returned when the user taps outside of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="verticalOptions">The vertical alignment of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="horizontalOptions">The horizontal alignment of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="size">The size of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="color">The background color of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
 	/// <param name="token"><see cref="CancellationToken"/> </param>
 	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Core.IPopup"/> once it has been dismissed.</returns>
-	Task<object?> ShowPopupAsync<TViewModel>(CancellationToken token = default) where TViewModel : INotifyPropertyChanged;
+	Task<object?> ShowPopupAsync<TViewModel>(
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		LayoutAlignment verticalOptions = LayoutAlignment.Center,
+		LayoutAlignment horizontalOptions = LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default,
+		CancellationToken token = default) where TViewModel : INotifyPropertyChanged;
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
@@ -43,15 +75,20 @@ public interface IPopupService
 	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
 	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Core.IPopup"/> once it has been dismissed.</returns>
 	/// <param name="onPresenting">An <see cref="Action{TViewModel}"/> that will be performed before the popup is presented.</param>
+	/// <param name="canBeDismissedByTappingOutsideOfPopup">A <see cref="bool"/> indicating whether the <see cref="CommunityToolkit.Maui.Core.IPopup"/> can be dismissed by tapping outside of it.</param>
+	/// <param name="resultWhenUserTapsOutsideOfPopup">An <see cref="object"/> that will be returned when the user taps outside of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="verticalOptions">The vertical alignment of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="horizontalOptions">The horizontal alignment of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="size">The size of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
+	/// <param name="color">The background color of the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
 	/// <param name="token"><see cref="CancellationToken"/> </param>
-	Task<object?> ShowPopupAsync<TViewModel>(Action<TViewModel> onPresenting, CancellationToken token = default) where TViewModel : INotifyPropertyChanged;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
-	/// </summary>
-	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
-	/// <param name="viewModel">The view model to use as the <c>BindingContext</c> for the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</param>
-	/// <param name="token"><see cref="CancellationToken"/> </param>
-	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Core.IPopup"/> once it has been dismissed.</returns>
-	Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel, CancellationToken token = default) where TViewModel : INotifyPropertyChanged;
+	Task<object?> ShowPopupAsync<TViewModel>(
+		Action<TViewModel> onPresenting,
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		LayoutAlignment verticalOptions = LayoutAlignment.Center,
+		LayoutAlignment horizontalOptions = LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default,
+		CancellationToken token = default) where TViewModel : INotifyPropertyChanged;
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
index 3a8627321..9cfa64e71 100644
--- a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
@@ -26,17 +26,6 @@ static PopupServiceTests()
 		PopupService.AddTransientPopup<MockPopup, MockPageViewModel>(serviceCollection);
 	}
 
-	[Fact]
-	public async Task ShowPopupAsyncWithNullViewModelShouldThrowArgumentNullException()
-	{
-		var popupService = new PopupService(new MockServiceProvider());
-
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		await Assert.ThrowsAsync<ArgumentNullException>(() =>
-			popupService.ShowPopupAsync<INotifyPropertyChanged>(viewModel: null, CancellationToken.None));
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-	}
-
 	[Fact]
 	public async Task ShowPopupAsyncWithNullOnPresentingShouldThrowArgumentNullException()
 	{
@@ -44,7 +33,7 @@ public async Task ShowPopupAsyncWithNullOnPresentingShouldThrowArgumentNullExcep
 
 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
 		await Assert.ThrowsAsync<ArgumentNullException>(() =>
-			popupService.ShowPopupAsync<INotifyPropertyChanged>(onPresenting: null, CancellationToken.None));
+			popupService.ShowPopupAsync<INotifyPropertyChanged>(onPresenting: null, token: CancellationToken.None));
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
@@ -64,7 +53,7 @@ public async Task ShowPopupAsync_CancellationTokenExpired()
 		// Ensure CancellationToken has expired
 		await Task.Delay(100, CancellationToken.None);
 
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(cts.Token));
+		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(token: cts.Token));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
@@ -83,18 +72,7 @@ public async Task ShowPopupAsync_CancellationTokenCanceled()
 		// Ensure CancellationToken has expired
 		await cts.CancelAsync();
 
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(cts.Token));
-	}
-
-	[Fact]
-	public async Task ShowPopupAsyncWithMismatchedViewModelTypeShouldThrowInvalidOperationException()
-	{
-		var popupService = new PopupService(new MockServiceProvider());
-
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		await Assert.ThrowsAsync<ArgumentNullException>(() =>
-			popupService.ShowPopupAsync<INotifyPropertyChanged>(viewModel: null, CancellationToken.None));
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(token: cts.Token));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
@@ -105,7 +83,7 @@ public async Task ShowPopupAsyncShouldThrowInvalidOperationExceptionWhenNoViewMo
 
 		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
-		await Assert.ThrowsAsync<InvalidOperationException>(() => popupService.ShowPopupAsync<MockPageViewModel>(CancellationToken.None));
+		await Assert.ThrowsAsync<InvalidOperationException>(() => popupService.ShowPopupAsync<MockPageViewModel>(token: CancellationToken.None));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Medium)]
@@ -119,7 +97,7 @@ public async Task ShowPopupAsyncShouldValidateProperBindingContext()
 
 		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
-		await popupService.ShowPopupAsync<MockPageViewModel>(CancellationToken.None);
+		await popupService.ShowPopupAsync<MockPageViewModel>(token: CancellationToken.None);
 
 		Assert.Same(popupInstance.BindingContext, popupViewModel);
 	}
@@ -140,7 +118,7 @@ public async Task ShowPopupAsyncWithOnPresenting_CancellationTokenExpired()
 		// Ensure CancellationToken has expired
 		await Task.Delay(100, CancellationToken.None);
 
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(viewModel => viewModel.HasLoaded = true, cts.Token));
+		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(viewModel => viewModel.HasLoaded = true, token: cts.Token));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Short)]
@@ -159,7 +137,7 @@ public async Task ShowPopupAsyncWithOnPresenting_CancellationTokenCanceled()
 		// Ensure CancellationToken has expired
 		await cts.CancelAsync();
 
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(viewModel => viewModel.HasLoaded = true, cts.Token));
+		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync<MockPageViewModel>(viewModel => viewModel.HasLoaded = true, token: cts.Token));
 	}
 
 	[Fact(Timeout = (int)TestDuration.Medium)]
@@ -173,7 +151,7 @@ public async Task ShowPopupAsyncWithOnPresentingShouldBeInvoked()
 
 		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
-		await popupService.ShowPopupAsync<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true, CancellationToken.None);
+		await popupService.ShowPopupAsync<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true, token: CancellationToken.None);
 
 		Assert.True(popupViewModel.HasLoaded);
 	}
@@ -191,21 +169,11 @@ public async Task ShowPopupAsyncShouldReturnResultOnceClosed()
 
 		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
-		var result = await popupService.ShowPopupAsync<MockPageViewModel>(CancellationToken.None);
+		var result = await popupService.ShowPopupAsync<MockPageViewModel>(token: CancellationToken.None);
 
 		Assert.Same(expectedResult, result);
 	}
 
-	[Fact]
-	public void ShowPopupWithNullViewModelShouldThrowArgumentNullException()
-	{
-		var popupService = new PopupService(new MockServiceProvider());
-
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<INotifyPropertyChanged>(viewModel: null));
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-	}
-
 	[Fact]
 	public void ShowPopupWithNullOnPresentingShouldThrowArgumentNullException()
 	{
@@ -216,54 +184,6 @@ public void ShowPopupWithNullOnPresentingShouldThrowArgumentNullException()
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
-	[Fact]
-	public void ShowPopupWithMismatchedViewModelTypeShouldThrowInvalidOperationException()
-	{
-		var popupService = new PopupService(new MockServiceProvider());
-
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<INotifyPropertyChanged>(viewModel: null));
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-	}
-
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopupAsyncWithViewModel_CancellationTokenExpired()
-	{
-		var popupViewModel = new MockPageViewModel();
-		var popupInstance = new MockSelfClosingPopup(string.Empty)
-		{
-			BindingContext = popupViewModel
-		};
-
-		SetupTest(popupInstance, () => popupViewModel, out var popupService);
-
-		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-
-		// Ensure CancellationToken has expired
-		await Task.Delay(100, CancellationToken.None);
-
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync(popupViewModel, cts.Token));
-	}
-
-	[Fact(Timeout = (int)TestDuration.Short)]
-	public async Task ShowPopupAsyncWithViewModel_CancellationTokenCanceled()
-	{
-		var popupViewModel = new MockPageViewModel();
-		var popupInstance = new MockSelfClosingPopup(string.Empty)
-		{
-			BindingContext = popupViewModel
-		};
-
-		SetupTest(popupInstance, () => popupViewModel, out var popupService);
-
-		var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-
-		// Ensure CancellationToken has expired
-		await cts.CancelAsync();
-
-		await Assert.ThrowsAsync<TaskCanceledException>(() => popupService.ShowPopupAsync(popupViewModel, cts.Token));
-	}
-
 	[Fact]
 	public void ShowPopupShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
 	{
@@ -272,7 +192,7 @@ public void ShowPopupShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegist
 
 		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
-		Assert.Throws<InvalidOperationException>(popupService.ShowPopup<MockPageViewModel>);
+		Assert.Throws<InvalidOperationException>(() => popupService.ShowPopup<MockPageViewModel>());
 	}
 
 	[Fact]
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 99a6d1fbf..40566b36b 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -55,35 +55,55 @@ internal static void AddTransientPopup<TPopupView, TPopupViewModel>(IServiceColl
 		services.AddTransient(typeof(TPopupViewModel));
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}()"/>
-	public void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(bool, object?, Microsoft.Maui.Primitives.LayoutAlignment, Microsoft.Maui.Primitives.LayoutAlignment, Size, Color?)"/>
+	public void ShowPopup<TViewModel>(
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		Microsoft.Maui.Primitives.LayoutAlignment verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Microsoft.Maui.Primitives.LayoutAlignment horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default
+	) where TViewModel : INotifyPropertyChanged
 	{
 		var popup = GetPopup(typeof(TViewModel));
 
-		ValidateBindingContext<TViewModel>(popup, out _);
-
-		CurrentPage.ShowPopup(popup);
-	}
-
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(TViewModel)"/>
-	public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged
-	{
-		ArgumentNullException.ThrowIfNull(viewModel);
-
-		var popup = GetPopup(typeof(TViewModel));
+		ApplyPopupProperties(
+			popup,
+			canBeDismissedByTappingOutsideOfPopup,
+			resultWhenUserTapsOutsideOfPopup,
+			verticalOptions,
+			horizontalOptions,
+			size,
+			color);
 
 		ValidateBindingContext<TViewModel>(popup, out _);
 
 		CurrentPage.ShowPopup(popup);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(Action{TViewModel})"/>
-	public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewModel : INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(Action{TViewModel}, bool, object?, Microsoft.Maui.Primitives.LayoutAlignment, Microsoft.Maui.Primitives.LayoutAlignment, Size, Color?)"/>
+	public void ShowPopup<TViewModel>(
+		Action<TViewModel> onPresenting,
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		Microsoft.Maui.Primitives.LayoutAlignment verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Microsoft.Maui.Primitives.LayoutAlignment horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default) where TViewModel : INotifyPropertyChanged
 	{
 		ArgumentNullException.ThrowIfNull(onPresenting);
 
 		var popup = GetPopup(typeof(TViewModel));
 
+		ApplyPopupProperties(
+			popup,
+			canBeDismissedByTappingOutsideOfPopup,
+			resultWhenUserTapsOutsideOfPopup,
+			verticalOptions,
+			horizontalOptions,
+			size,
+			color);
+
 		ValidateBindingContext(popup, out TViewModel viewModel);
 
 		onPresenting.Invoke(viewModel);
@@ -91,35 +111,56 @@ public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewMo
 		CurrentPage.ShowPopup(popup);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(CancellationToken)"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(CancellationToken token = default) where TViewModel : INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(bool, object?, Microsoft.Maui.Primitives.LayoutAlignment, Microsoft.Maui.Primitives.LayoutAlignment, Size, Color?, CancellationToken)"/>
+	public Task<object?> ShowPopupAsync<TViewModel>(
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		Microsoft.Maui.Primitives.LayoutAlignment verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Microsoft.Maui.Primitives.LayoutAlignment horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default,
+		CancellationToken token = default) where TViewModel : INotifyPropertyChanged
 	{
 		var popup = GetPopup(typeof(TViewModel));
 
-		ValidateBindingContext<TViewModel>(popup, out _);
-
-		return CurrentPage.ShowPopupAsync(popup, token);
-	}
-
-	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(TViewModel, CancellationToken)"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel, CancellationToken token = default) where TViewModel : INotifyPropertyChanged
-	{
-		ArgumentNullException.ThrowIfNull(viewModel);
-
-		var popup = GetPopup(typeof(TViewModel));
+		ApplyPopupProperties(
+			popup,
+			canBeDismissedByTappingOutsideOfPopup,
+			resultWhenUserTapsOutsideOfPopup,
+			verticalOptions,
+			horizontalOptions,
+			size,
+			color);
 
 		ValidateBindingContext<TViewModel>(popup, out _);
 
 		return CurrentPage.ShowPopupAsync(popup, token);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(Action{TViewModel}, CancellationToken)"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(Action<TViewModel> onPresenting, CancellationToken token = default) where TViewModel : INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(Action{TViewModel}, bool, object?, Microsoft.Maui.Primitives.LayoutAlignment, Microsoft.Maui.Primitives.LayoutAlignment, Size, Color?, CancellationToken)"/>
+	public Task<object?> ShowPopupAsync<TViewModel>(
+		Action<TViewModel> onPresenting,
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		Microsoft.Maui.Primitives.LayoutAlignment verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Microsoft.Maui.Primitives.LayoutAlignment horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default,
+		CancellationToken token = default) where TViewModel : INotifyPropertyChanged
 	{
 		ArgumentNullException.ThrowIfNull(onPresenting);
 
 		var popup = GetPopup(typeof(TViewModel));
 
+		ApplyPopupProperties(
+			popup,
+			canBeDismissedByTappingOutsideOfPopup,
+			resultWhenUserTapsOutsideOfPopup,
+			verticalOptions,
+			horizontalOptions,
+			size,
+			color);
+
 		ValidateBindingContext(popup, out TViewModel viewModel);
 
 		onPresenting.Invoke(viewModel);
@@ -150,6 +191,27 @@ static void ValidateBindingContext<TViewModel>(Popup popup, out TViewModel bindi
 		throw new InvalidOperationException($"Unexpected type has been assigned to the BindingContext of {popup.GetType().FullName}. Expected type {typeof(TViewModel).FullName} but was {popup.BindingContext?.GetType().FullName ?? "null"}");
 	}
 
+	static void ApplyPopupProperties(
+		Popup popup,
+		bool canBeDismissedByTappingOutsideOfPopup = true,
+		object? resultWhenUserTapsOutsideOfPopup = default,
+		Microsoft.Maui.Primitives.LayoutAlignment verticalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Microsoft.Maui.Primitives.LayoutAlignment horizontalOptions = Microsoft.Maui.Primitives.LayoutAlignment.Center,
+		Size size = default,
+		Color? color = default)
+	{
+		popup.CanBeDismissedByTappingOutsideOfPopup = canBeDismissedByTappingOutsideOfPopup;
+		popup.ResultWhenUserTapsOutsideOfPopup = resultWhenUserTapsOutsideOfPopup;
+		popup.VerticalOptions = verticalOptions;
+		popup.HorizontalOptions = horizontalOptions;
+		popup.Size = size;
+
+		if (color is not null)
+		{
+			popup.Color = color;
+		}
+	}
+
 	Popup GetPopup(Type viewModelType)
 	{
 		var view = serviceProvider.GetService(viewModelToViewMappings[viewModelType]);
diff --git a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
index bbc6fca46..8fd78d014 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
@@ -240,7 +240,7 @@ public IList<string> StyleClass
 	/// <summary>
 	/// Gets or sets the result that will return when user taps outside of the Popup.
 	/// </summary>
-	protected object? ResultWhenUserTapsOutsideOfPopup { get; set; }
+	public object? ResultWhenUserTapsOutsideOfPopup { get; set; }
 
 	/// <inheritdoc/>
 	IView? IPopup.Anchor => Anchor;

From 3a14894c628f2228473bdb15c4718801c905be38 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <17139988+bijington@users.noreply.github.com>
Date: Tue, 20 Feb 2024 19:54:47 +0000
Subject: [PATCH 5/6] Name the cancellation token usage

---
 .../ViewModels/Views/Popup/MultiplePopupViewModel.cs        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
index a091d7bef..c70f800e7 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
@@ -10,7 +10,7 @@ Task OnCsharpBindingPopup(CancellationToken token)
 	{
 		return popupService.ShowPopupAsync<CsharpBindingPopupViewModel>(
 			onPresenting: viewModel => viewModel.Load("This is a platform specific popup with a .NET MAUI View being rendered. The behaviors of the popup will confirm to 100% this platform look and feel, but still allows you to use your .NET MAUI Controls."),
-			token);
+			token: token);
 	}
 
 	[RelayCommand]
@@ -18,7 +18,7 @@ Task OnUpdatingPopup(CancellationToken token)
 	{
 		return popupService.ShowPopupAsync<UpdatingPopupViewModel>(
 			onPresenting: viewModel => viewModel.PerformUpdates(10),
-			token);
+			token: token);
 	}
 
 	[RelayCommand]
@@ -26,6 +26,6 @@ Task OnShowPopupContent(CancellationToken token)
 	{
 		return popupService.ShowPopupAsync<PopupContentViewModel>(
 			onPresenting: viewModel => viewModel.SetMessage("This is a dynamically set message, shown in a popup without the need to create your own Popup subclass."),
-			token);
+			token: token);
 	}
 }
\ No newline at end of file

From 880bd322fea257d26d167f2d321dae06808a351f Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <17139988+bijington@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:38:01 +0100
Subject: [PATCH 6/6] Include DynamicallyAccessedMembers

---
 .../Extensions/ServiceCollectionExtensions.shared.cs            | 2 +-
 src/CommunityToolkit.Maui/PopupService.cs                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs b/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
index eec6d88bb..6dfa94929 100644
--- a/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
@@ -63,7 +63,7 @@ public static class ServiceCollectionExtensions
 	/// <see cref="INotifyPropertyChanged"/></typeparam>
 	/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
 	/// <returns>A reference to this instance after the operation has completed.</returns>
-	public static IServiceCollection AddTransientPopupContent<TPopupContentView, TPopupViewModel>(this IServiceCollection services)
+	public static IServiceCollection AddTransientPopupContent<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupContentView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(this IServiceCollection services)
 		where TPopupContentView : View
 		where TPopupViewModel : INotifyPropertyChanged
 	{
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index a7ce2a0d9..ee5c84428 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -36,7 +36,7 @@ public PopupService()
 							?? throw new InvalidOperationException("Could not locate IServiceProvider");
 	}
 
-	internal static void AddTransientPopupContent<TPopupContentView, TPopupViewModel>(IServiceCollection services)
+	internal static void AddTransientPopupContent<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupContentView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TPopupViewModel>(IServiceCollection services)
 		where TPopupContentView : View
 		where TPopupViewModel : INotifyPropertyChanged
 	{