From a380b846119d0f966fb5d995eabed7de66a03d19 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Mon, 20 Feb 2023 13:53:00 +0000
Subject: [PATCH 01/17] Added initial PopupService implementation

---
 .../MauiProgram.cs                            |   4 +-
 .../Pages/Views/Popup/MultiplePopupPage.xaml  |   4 +-
 .../Views/Popup/MultiplePopupViewModel.cs     |  18 +++-
 .../AppBuilderExtensions.shared.cs            |   2 +
 .../CommunityToolkit.Maui.csproj              |   3 +
 .../ServiceCollectionExtensions.shared.cs     |  20 ++++
 src/CommunityToolkit.Maui/IPopupService.cs    |  35 ++++++
 src/CommunityToolkit.Maui/PopupService.cs     | 101 ++++++++++++++++++
 8 files changed, 181 insertions(+), 6 deletions(-)
 create mode 100644 src/CommunityToolkit.Maui/IPopupService.cs
 create mode 100644 src/CommunityToolkit.Maui/PopupService.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index e741668263..122854d6df 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -170,8 +170,8 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientWithShellRoute<ShowPopupInOnAppearingPage, ShowPopupInOnAppearingPageViewModel>();
 
 		// Add Popups
-		services.AddTransient<CsharpBindingPopup, CsharpBindingPopupViewModel>();
-		services.AddTransient<XamlBindingPopup, XamlBindingPopupViewModel>();
+		services.AddTransientPopup<CsharpBindingPopup, CsharpBindingPopupViewModel>();
+		services.AddTransientPopup<XamlBindingPopup, XamlBindingPopupViewModel>();
 	}
 
 	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 31013613d2..9204dcb81a 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
@@ -1,4 +1,4 @@
-<pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                 xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
                 xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
@@ -28,7 +28,7 @@
 
                 <Button Text="XAML Binding Popup" Clicked="HandleXamlBindingPopupPopupButtonClicked" />
 
-                <Button Text="C# Binding Popup" Clicked="HandleCsharpBindingPopupButtonClicked" />
+                <Button Text="C# Binding Popup" Command="{Binding CsharpBindingPopupCommand}" />
             </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 6d51f8336c..434e784876 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
@@ -1,5 +1,19 @@
-namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
+using CommunityToolkit.Mvvm.Input;
 
-public class MultiplePopupViewModel : BaseViewModel
+namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
+
+public partial class MultiplePopupViewModel : BaseViewModel
 {
+	readonly IPopupService popupService;
+
+	public MultiplePopupViewModel(IPopupService popupService)
+	{
+		this.popupService = popupService;
+	}
+
+	[RelayCommand]
+	Task OnCsharpBindingPopup()
+	{
+		return this.popupService.ShowPopupAsync<CsharpBindingPopupViewModel>();
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
index 0bfd315acc..5e02b58cd8 100644
--- a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
@@ -20,6 +20,8 @@ public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder
 		// Pass `null` because `options?.Invoke()` will set options on both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core`
 		builder.UseMauiCommunityToolkitCore(null);
 
+		builder.Services.AddSingleton<IPopupService, PopupService>();
+
 		// Invokes options for both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core`
 		options?.Invoke(new Options());
 
diff --git a/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj b/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
index 64b35006a6..863888ee8b 100644
--- a/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
+++ b/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
@@ -47,6 +47,9 @@
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
+    <CreatePackage>false</CreatePackage>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\CommunityToolkit.Maui.Core\CommunityToolkit.Maui.Core.csproj" />
   </ItemGroup>
diff --git a/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs b/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
index 5629a747e2..76e82d1dee 100644
--- a/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui/Extensions/ServiceCollectionExtensions.shared.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using CommunityToolkit.Maui.Views;
 
 // Using root CommunityToolkit.Maui namespace so these extension methods
 // light up in MauiProgram when CommunityToolkit.Maui namespace is imported 
@@ -32,6 +33,25 @@ public static IServiceCollection AddTransient<TView, TViewModel>(this IServiceCo
 			.AddTransient<TView>();
 	}
 
+	/// <summary>
+	/// Adds a <see cref="Popup"/> of the type specified in <typeparamref name="TPopupView"/> 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="TPopupView">The type of the Popup to add. Constrained to <see cref="Popup"/></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 AddTransientPopup<TPopupView, TPopupViewModel>(this IServiceCollection services)
+		where TPopupView : Popup
+		where TPopupViewModel : INotifyPropertyChanged
+	{
+		PopupService.AddTransientPopup<TPopupView, 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/IPopupService.cs b/src/CommunityToolkit.Maui/IPopupService.cs
new file mode 100644
index 0000000000..b29481b44c
--- /dev/null
+++ b/src/CommunityToolkit.Maui/IPopupService.cs
@@ -0,0 +1,35 @@
+namespace CommunityToolkit.Maui;
+
+/// <summary>
+/// Provides a mechanism for displaying <see cref="CommunityToolkit.Maui.Views.Popup"/>s based on the underlying view model.
+/// </summary>
+public interface IPopupService
+{
+	/// <summary>
+	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
+	void ShowPopup<TViewModel>();
+
+	/// <summary>
+	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
+	/// <param name="viewModel">The view model to use as the <c>BindingContext</c> for the <see cref="CommunityToolkit.Maui.Views.Popup"/>.</param>
+	void ShowPopup<TViewModel>(TViewModel viewModel);
+
+	/// <summary>
+	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
+	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
+	Task<object?> ShowPopupAsync<TViewModel>();
+
+	/// <summary>
+	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
+	/// <param name="viewModel">The view model to use as the <c>BindingContext</c> for the <see cref="CommunityToolkit.Maui.Views.Popup"/>.</param>
+	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
+	Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel);
+}
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
new file mode 100644
index 0000000000..b3d713d12d
--- /dev/null
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -0,0 +1,101 @@
+using CommunityToolkit.Maui.Views;
+using System.ComponentModel;
+
+namespace CommunityToolkit.Maui;
+
+/// <inheritdoc cref="IPopupService"/>
+public class PopupService : IPopupService
+{
+	readonly IServiceProvider serviceProvider;
+
+	static readonly IDictionary<Type, Type> viewModelToViewMappings = new Dictionary<Type, Type>();
+
+	/// <summary>
+	/// Creates a new instance of <see cref="PopupService"/>.
+	/// </summary>
+	/// <param name="serviceProvider">The <see cref="IServiceProvider"/> implementation.</param>
+	public PopupService(IServiceProvider serviceProvider)
+	{
+		this.serviceProvider = serviceProvider;
+	}
+
+	internal static void AddTransientPopup<TPopupView, TPopupViewModel>(IServiceCollection services)
+		where TPopupView : Popup
+		where TPopupViewModel : INotifyPropertyChanged
+	{
+		viewModelToViewMappings.Add(typeof(TPopupViewModel), typeof(TPopupView));
+
+		services.AddTransient(typeof(TPopupView));
+		services.AddTransient(typeof(TPopupViewModel));
+	}
+
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}()"/>
+	public void ShowPopup<TViewModel>() =>
+		ShowPopup(GetViewModel<TViewModel>());
+
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(TViewModel)"/>
+	public void ShowPopup<TViewModel>(TViewModel viewModel)
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var popup = GetPopup(viewModel);
+
+		GetMainPage().ShowPopup(popup);
+	}
+
+	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}()"/>
+	public Task<object?> ShowPopupAsync<TViewModel>() =>
+		ShowPopupAsync(GetViewModel<TViewModel>());
+
+	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(TViewModel)"/>
+	public Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel)
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var popup = GetPopup(viewModel);
+
+		return GetMainPage().ShowPopupAsync(popup);
+	}
+
+	static Page GetMainPage()
+	{
+		var currentApplication = Application.Current;
+
+		ArgumentNullException.ThrowIfNull(currentApplication);
+
+		var mainPage = currentApplication.MainPage;
+
+		ArgumentNullException.ThrowIfNull(mainPage);
+
+		return mainPage;
+	}
+
+	Popup GetPopup<TViewModel>(TViewModel viewModel)
+	{
+		var viewModelType = typeof(TViewModel);
+		var popup = this.serviceProvider.GetService(viewModelToViewMappings[viewModelType]) as Popup;
+
+		if (popup is null)
+		{
+			throw new InvalidOperationException(
+				$"Unable to resolve popup type for {typeof(TViewModel)} please make sure that you have called {nameof(AddTransientPopup)}");
+		}
+
+		popup.BindingContext = viewModel;
+
+		return popup;
+	}
+
+	TViewModel GetViewModel<TViewModel>()
+	{
+		var viewModel = this.serviceProvider.GetService<TViewModel>();
+
+		if (viewModel is null)
+		{
+			throw new InvalidOperationException(
+				$"Unable to resolve type {typeof(TViewModel)} please make sure that you have called {nameof(AddTransientPopup)}");
+		}
+
+		return viewModel;
+	}
+}

From 3d13946504e4dec0f9c85b0ef1fb0d0d9b60bc2a Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Fri, 28 Apr 2023 18:47:51 +0100
Subject: [PATCH 02/17] Tweaks to allowing parameters to be passed to the view
 model behind a popup

---
 src/CommunityToolkit.Maui/IPopupService.cs | 27 +++++++++++++----
 src/CommunityToolkit.Maui/PopupService.cs  | 34 +++++++++++++++++++---
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/CommunityToolkit.Maui/IPopupService.cs b/src/CommunityToolkit.Maui/IPopupService.cs
index b29481b44c..8f21d9587a 100644
--- a/src/CommunityToolkit.Maui/IPopupService.cs
+++ b/src/CommunityToolkit.Maui/IPopupService.cs
@@ -1,4 +1,6 @@
-namespace CommunityToolkit.Maui;
+using System.ComponentModel;
+
+namespace CommunityToolkit.Maui;
 
 /// <summary>
 /// Provides a mechanism for displaying <see cref="CommunityToolkit.Maui.Views.Popup"/>s based on the underlying view model.
@@ -9,21 +11,36 @@ public interface IPopupService
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
-	void ShowPopup<TViewModel>();
+	void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged;
+
+	/// <summary>
+	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
+	/// <param name="query">Any parameters that can be passed across to the Popup or underlying view model.</param>
+	void ShowPopup<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable;
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
 	/// <param name="viewModel">The view model to use as the <c>BindingContext</c> for the <see cref="CommunityToolkit.Maui.Views.Popup"/>.</param>
-	void ShowPopup<TViewModel>(TViewModel viewModel);
+	void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged;
+
+	/// <summary>
+	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
+	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
+	Task<object?> ShowPopupAsync<TViewModel>() where TViewModel : INotifyPropertyChanged;
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
 	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
-	Task<object?> ShowPopupAsync<TViewModel>();
+	/// <param name="query">Any parameters that can be passed across to the Popup or underlying view model.</param>
+	Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable;
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
@@ -31,5 +48,5 @@ public interface IPopupService
 	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Views.Popup"/>.</typeparam>
 	/// <param name="viewModel">The view model to use as the <c>BindingContext</c> for the <see cref="CommunityToolkit.Maui.Views.Popup"/>.</param>
 	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
-	Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel);
+	Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged;
 }
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index b3d713d12d..e93a75f10a 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -30,11 +30,11 @@ internal static void AddTransientPopup<TPopupView, TPopupViewModel>(IServiceColl
 	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}()"/>
-	public void ShowPopup<TViewModel>() =>
+	public void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged =>
 		ShowPopup(GetViewModel<TViewModel>());
 
 	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(TViewModel)"/>
-	public void ShowPopup<TViewModel>(TViewModel viewModel)
+	public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged
 	{
 		ArgumentNullException.ThrowIfNull(viewModel);
 
@@ -43,12 +43,25 @@ public void ShowPopup<TViewModel>(TViewModel viewModel)
 		GetMainPage().ShowPopup(popup);
 	}
 
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(IDictionary{string, object})"/>
+	public void ShowPopup<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable
+	{
+		ArgumentNullException.ThrowIfNull(query);
+
+		var viewModel = GetViewModel<TViewModel>();
+		viewModel.ApplyQueryAttributes(query);
+
+		var popup = GetPopup(viewModel);
+
+		GetMainPage().ShowPopup(popup);
+	}
+
 	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}()"/>
-	public Task<object?> ShowPopupAsync<TViewModel>() =>
+	public Task<object?> ShowPopupAsync<TViewModel>() where TViewModel : INotifyPropertyChanged =>
 		ShowPopupAsync(GetViewModel<TViewModel>());
 
 	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(TViewModel)"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel)
+	public Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged
 	{
 		ArgumentNullException.ThrowIfNull(viewModel);
 
@@ -57,6 +70,19 @@ public void ShowPopup<TViewModel>(TViewModel viewModel)
 		return GetMainPage().ShowPopupAsync(popup);
 	}
 
+	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(IDictionary{string, object})"/>
+	public Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable
+	{
+		ArgumentNullException.ThrowIfNull(query);
+
+		var viewModel = GetViewModel<TViewModel>();
+		viewModel.ApplyQueryAttributes(query);
+
+		var popup = GetPopup(viewModel);
+
+		return GetMainPage().ShowPopupAsync(popup);
+	}
+
 	static Page GetMainPage()
 	{
 		var currentApplication = Application.Current;

From 6b5ff39802d3d6f6122f9ba11f9cc46ebfb61114 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Sun, 30 Apr 2023 09:55:20 +0100
Subject: [PATCH 03/17] Tidy up xml docs

---
 src/CommunityToolkit.Maui/IPopupService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui/IPopupService.cs b/src/CommunityToolkit.Maui/IPopupService.cs
index 8f21d9587a..24d990ab85 100644
--- a/src/CommunityToolkit.Maui/IPopupService.cs
+++ b/src/CommunityToolkit.Maui/IPopupService.cs
@@ -17,7 +17,7 @@ public interface IPopupService
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
-	/// <param name="query">Any parameters that can be passed across to the Popup or underlying view model.</param>
+	/// <param name="query">Any parameters that can be passed across to the resolved view model.</param>
 	void ShowPopup<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable;
 
 	/// <summary>
@@ -39,7 +39,7 @@ public interface IPopupService
 	/// </summary>
 	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Views.Popup"/>.</typeparam>
 	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
-	/// <param name="query">Any parameters that can be passed across to the Popup or underlying view model.</param>
+	/// <param name="query">Any parameters that can be passed across to the resolved view model.</param>
 	Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable;
 
 	/// <summary>

From 8cd9c7fc29197e47646af09ad131ac9f1c16b0f3 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Sat, 6 May 2023 12:59:10 +0100
Subject: [PATCH 04/17] Some unit tests

---
 .../PopupServiceTests.cs                      | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs

diff --git a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
new file mode 100644
index 0000000000..16a341d5d7
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
@@ -0,0 +1,132 @@
+using System.ComponentModel;
+using CommunityToolkit.Maui.UnitTests.Mocks;
+using CommunityToolkit.Maui.Views;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests;
+
+public class PopupServiceTests : BaseHandlerTest
+{
+	public PopupServiceTests() : base()
+	{
+		var appBuilder = MauiApp.CreateBuilder()
+								.UseMauiCommunityToolkit()
+								.UseMauiApp<MockApplication>();
+
+		var mauiApp = appBuilder.Build();
+		var application = mauiApp.Services.GetRequiredService<IApplication>();
+		application.Handler = new ApplicationHandlerStub();
+		application.Handler.SetMauiContext(new HandlersContextStub(mauiApp.Services));
+	}
+
+	[Fact]
+	public static 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>(null));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact]
+	public static void ShowPopupWithNullQueryShouldThrowArgumentNullException()
+	{
+		var popupService = new PopupService(new MockServiceProvider());
+
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<IQueryAttributable>(null));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact]
+	public static void ShowPopupShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
+	{
+		var popupService = new PopupService(new MockServiceProvider());
+
+		Assert.Throws<InvalidOperationException>(popupService.ShowPopup<MockPageViewModel>);
+	}
+
+	[Fact]
+	public static void D()
+	{
+		var serviceCollection = new ServiceCollection();
+		PopupService.AddTransientPopup<MockPopup, MockPageViewModel>(serviceCollection);
+
+		var popup = new MockPopup();
+
+		var popupService = new PopupService(
+			MockServiceProvider.ThatProvides(
+				(implementation: popup, forType: typeof(MockPopup)),
+				(implementation: new MockPageViewModel(), forType: typeof(MockPageViewModel))));
+
+		Application.Current = new MockApplication();
+		var app = Application.Current ?? throw new NullReferenceException();
+
+		var page = new ContentPage
+		{
+			Content = new Label
+			{
+				Text = "Hello there"
+			},
+			IsPlatformEnabled = true
+		};
+
+		//// 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);
+
+		bool popupWasOpened = false;
+
+		popup.Opened += (s, e) =>
+		{
+			popupWasOpened = true;
+		};
+
+		popupService.ShowPopup<MockPageViewModel>();
+
+		Assert.True(popupWasOpened);
+	}
+}
+
+public class MockServiceProvider : IServiceProvider
+{
+	readonly IDictionary<Type, object> registrations;
+
+	public MockServiceProvider()
+	{
+		registrations = new Dictionary<Type, object>();
+	}
+
+	public MockServiceProvider(params (object implementation, Type forType)[] registrations) : this()
+	{
+		foreach (var (implementation, forType) in registrations)
+		{
+			this.registrations.Add(forType, implementation);
+		}
+	}
+
+	public static MockServiceProvider ThatProvides(params (object implementation, Type forType)[] registrations)
+	{
+		return new MockServiceProvider(registrations);
+	}
+
+	public object? GetService(Type serviceType)
+	{
+		if (this.registrations.TryGetValue(serviceType, out var registeredImplementation))
+		{
+			return registeredImplementation;
+		}
+
+		return null;
+	}
+}
+
+public class MockPopup : Popup
+{
+
+}

From 48c1291a0ad3195bccc589490b1f055cff6f5974 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Wed, 10 May 2023 20:26:00 +0100
Subject: [PATCH 05/17] Only create a view model instance if the BindingContext
 hasn't been set

---
 src/CommunityToolkit.Maui/PopupService.cs | 31 +++++++++++++----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index e93a75f10a..80e4e9d22b 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -38,7 +38,7 @@ public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INoti
 	{
 		ArgumentNullException.ThrowIfNull(viewModel);
 
-		var popup = GetPopup(viewModel);
+		var popup = GetPopup(typeof(TViewModel));
 
 		GetMainPage().ShowPopup(popup);
 	}
@@ -48,10 +48,14 @@ public void ShowPopup<TViewModel>(IDictionary<string, object> query) where TView
 	{
 		ArgumentNullException.ThrowIfNull(query);
 
-		var viewModel = GetViewModel<TViewModel>();
-		viewModel.ApplyQueryAttributes(query);
+		var popup = GetPopup(typeof(TViewModel));
 
-		var popup = GetPopup(viewModel);
+		if (popup.BindingContext is null)
+		{
+			var viewModel = GetViewModel<TViewModel>();
+			viewModel.ApplyQueryAttributes(query);
+			popup.BindingContext = viewModel;
+		}
 
 		GetMainPage().ShowPopup(popup);
 	}
@@ -65,7 +69,7 @@ public void ShowPopup<TViewModel>(IDictionary<string, object> query) where TView
 	{
 		ArgumentNullException.ThrowIfNull(viewModel);
 
-		var popup = GetPopup(viewModel);
+		var popup = GetPopup(typeof(TViewModel));
 
 		return GetMainPage().ShowPopupAsync(popup);
 	}
@@ -75,10 +79,14 @@ public void ShowPopup<TViewModel>(IDictionary<string, object> query) where TView
 	{
 		ArgumentNullException.ThrowIfNull(query);
 
-		var viewModel = GetViewModel<TViewModel>();
-		viewModel.ApplyQueryAttributes(query);
+		var popup = GetPopup(typeof(TViewModel));
 
-		var popup = GetPopup(viewModel);
+		if (popup.BindingContext is null)
+		{
+			var viewModel = GetViewModel<TViewModel>();
+			viewModel.ApplyQueryAttributes(query);
+			popup.BindingContext = viewModel;
+		}
 
 		return GetMainPage().ShowPopupAsync(popup);
 	}
@@ -96,19 +104,16 @@ static Page GetMainPage()
 		return mainPage;
 	}
 
-	Popup GetPopup<TViewModel>(TViewModel viewModel)
+	Popup GetPopup(Type viewModelType)
 	{
-		var viewModelType = typeof(TViewModel);
 		var popup = this.serviceProvider.GetService(viewModelToViewMappings[viewModelType]) as Popup;
 
 		if (popup is null)
 		{
 			throw new InvalidOperationException(
-				$"Unable to resolve popup type for {typeof(TViewModel)} please make sure that you have called {nameof(AddTransientPopup)}");
+				$"Unable to resolve popup type for {viewModelType} please make sure that you have called {nameof(AddTransientPopup)}");
 		}
 
-		popup.BindingContext = viewModel;
-
 		return popup;
 	}
 

From 2653cc6502d95032648b81ee09bd1d4671a0d05a Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Wed, 10 May 2023 20:56:08 +0100
Subject: [PATCH 06/17] Remove the reliance on IQueryAttributable in favour of
 our own interface

---
 .../Views/Popup/MultiplePopupViewModel.cs     |  3 +-
 .../IArgumentsReceiver.cs                     | 13 +++++
 .../IPopupService.cs                          | 54 +++++++++++++++++++
 .../PopupServiceTests.cs                      | 17 +++---
 src/CommunityToolkit.Maui/IPopupService.cs    | 52 ------------------
 src/CommunityToolkit.Maui/PopupService.cs     | 15 +++---
 6 files changed, 86 insertions(+), 68 deletions(-)
 create mode 100644 src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/IPopupService.cs
 delete mode 100644 src/CommunityToolkit.Maui/IPopupService.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
index 434e784876..2d7b869da6 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
@@ -1,4 +1,5 @@
-using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Mvvm.Input;
 
 namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
diff --git a/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs b/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs
new file mode 100644
index 0000000000..f435b74856
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs
@@ -0,0 +1,13 @@
+namespace CommunityToolkit.Maui.Core;
+
+/// <summary>
+/// Represents an implementation that can receive arguments during specific lifecycle events.
+/// </summary>
+public interface IArgumentsReceiver
+{
+	/// <summary>
+	/// Sets the arguments ready for use.
+	/// </summary>
+	/// <param name="arguments">A set of arguments.</param>
+	void SetArguments(IDictionary<string, object> arguments);
+}
diff --git a/src/CommunityToolkit.Maui.Core/IPopupService.cs b/src/CommunityToolkit.Maui.Core/IPopupService.cs
new file mode 100644
index 0000000000..f34dd3c56c
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/IPopupService.cs
@@ -0,0 +1,54 @@
+using System.ComponentModel;
+
+namespace CommunityToolkit.Maui.Core;
+
+/// <summary>
+/// Provides a mechanism for displaying <see cref="CommunityToolkit.Maui.Core.IPopup"/>s based on the underlying view model.
+/// </summary>
+public interface IPopupService
+{
+	/// <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>
+	void ShowPopup<TViewModel>() 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>.
+	/// The view model will be passed the supplied <paramref name="arguments"/> based on its <see cref="IArgumentsReceiver"/> implementation.
+	/// </summary>
+	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
+	/// <param name="arguments">Any parameters that can be passed across to the resolved view model.</param>
+	void ShowPopup<TViewModel>(IDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, 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;
+
+	/// <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>
+	/// <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>() 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>.
+	/// The view model will be passed the supplied <paramref name="arguments"/> based on its <see cref="IArgumentsReceiver"/> implementation.
+	/// </summary>
+	/// <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="arguments">Any parameters that can be passed across to the resolved view model.</param>
+	Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, 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>
+	/// <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) where TViewModel : INotifyPropertyChanged;
+}
diff --git a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
index 16a341d5d7..1188168f20 100644
--- a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.UnitTests.Mocks;
 using CommunityToolkit.Maui.Views;
 using Xunit;
@@ -29,15 +30,15 @@ public static void ShowPopupWithNullViewModelShouldThrowArgumentNullException()
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
-	[Fact]
-	public static void ShowPopupWithNullQueryShouldThrowArgumentNullException()
-	{
-		var popupService = new PopupService(new MockServiceProvider());
+//	[Fact]
+//	public static void ShowPopupWithNullQueryShouldThrowArgumentNullException()
+//	{
+//		var popupService = new PopupService(new MockServiceProvider());
 
-#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<IQueryAttributable>(null));
-#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-	}
+//#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+//		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<IArgumentsReceiver>(null));
+//#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+//	}
 
 	[Fact]
 	public static void ShowPopupShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
diff --git a/src/CommunityToolkit.Maui/IPopupService.cs b/src/CommunityToolkit.Maui/IPopupService.cs
deleted file mode 100644
index 24d990ab85..0000000000
--- a/src/CommunityToolkit.Maui/IPopupService.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.ComponentModel;
-
-namespace CommunityToolkit.Maui;
-
-/// <summary>
-/// Provides a mechanism for displaying <see cref="CommunityToolkit.Maui.Views.Popup"/>s based on the underlying view model.
-/// </summary>
-public interface IPopupService
-{
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
-	void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
-	/// <param name="query">Any parameters that can be passed across to the resolved view model.</param>
-	void ShowPopup<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
-	/// <param name="viewModel">The view model to use as the <c>BindingContext</c> for the <see cref="CommunityToolkit.Maui.Views.Popup"/>.</param>
-	void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
-	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
-	Task<object?> ShowPopupAsync<TViewModel>() where TViewModel : INotifyPropertyChanged;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
-	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
-	/// <param name="query">Any parameters that can be passed across to the resolved view model.</param>
-	Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable;
-
-	/// <summary>
-	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Views.Popup"/> 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.Views.Popup"/>.</typeparam>
-	/// <param name="viewModel">The view model to use as the <c>BindingContext</c> for the <see cref="CommunityToolkit.Maui.Views.Popup"/>.</param>
-	/// <returns>A <see cref="Task"/> that can be awaited to return the result of the <see cref="CommunityToolkit.Maui.Views.Popup"/> once it has been dismissed.</returns>
-	Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged;
-}
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 80e4e9d22b..e5a653858c 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -1,4 +1,5 @@
-using CommunityToolkit.Maui.Views;
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.Views;
 using System.ComponentModel;
 
 namespace CommunityToolkit.Maui;
@@ -44,16 +45,16 @@ public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INoti
 	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(IDictionary{string, object})"/>
-	public void ShowPopup<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable
+	public void ShowPopup<TViewModel>(IDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged
 	{
-		ArgumentNullException.ThrowIfNull(query);
+		ArgumentNullException.ThrowIfNull(arguments);
 
 		var popup = GetPopup(typeof(TViewModel));
 
 		if (popup.BindingContext is null)
 		{
 			var viewModel = GetViewModel<TViewModel>();
-			viewModel.ApplyQueryAttributes(query);
+			viewModel.SetArguments(arguments);
 			popup.BindingContext = viewModel;
 		}
 
@@ -75,16 +76,16 @@ public void ShowPopup<TViewModel>(IDictionary<string, object> query) where TView
 	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(IDictionary{string, object})"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> query) where TViewModel : IQueryAttributable
+	public Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged
 	{
-		ArgumentNullException.ThrowIfNull(query);
+		ArgumentNullException.ThrowIfNull(arguments);
 
 		var popup = GetPopup(typeof(TViewModel));
 
 		if (popup.BindingContext is null)
 		{
 			var viewModel = GetViewModel<TViewModel>();
-			viewModel.ApplyQueryAttributes(query);
+			viewModel.SetArguments(arguments);
 			popup.BindingContext = viewModel;
 		}
 

From 71eeb15f50916136afbf2c9bd4b23277fba6b8d9 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Wed, 10 May 2023 21:07:57 +0100
Subject: [PATCH 07/17] A better way to find the current Page

---
 src/CommunityToolkit.Maui/PopupService.cs | 26 ++++++++---------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index e5a653858c..7748a43d47 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -1,5 +1,6 @@
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Views;
+using Microsoft.Maui.Controls.Platform;
 using System.ComponentModel;
 
 namespace CommunityToolkit.Maui;
@@ -11,6 +12,10 @@ public class PopupService : IPopupService
 
 	static readonly IDictionary<Type, Type> viewModelToViewMappings = new Dictionary<Type, Type>();
 
+	static Page CurrentPage =>
+		PageExtensions.GetCurrentPage(
+			Application.Current?.MainPage ?? throw new NullReferenceException("MainPage is null."));
+
 	/// <summary>
 	/// Creates a new instance of <see cref="PopupService"/>.
 	/// </summary>
@@ -41,7 +46,7 @@ public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INoti
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		GetMainPage().ShowPopup(popup);
+		CurrentPage.ShowPopup(popup);
 	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(IDictionary{string, object})"/>
@@ -58,7 +63,7 @@ public void ShowPopup<TViewModel>(IDictionary<string, object> arguments) where T
 			popup.BindingContext = viewModel;
 		}
 
-		GetMainPage().ShowPopup(popup);
+		CurrentPage.ShowPopup(popup);
 	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}()"/>
@@ -72,7 +77,7 @@ public void ShowPopup<TViewModel>(IDictionary<string, object> arguments) where T
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		return GetMainPage().ShowPopupAsync(popup);
+		return CurrentPage.ShowPopupAsync(popup);
 	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(IDictionary{string, object})"/>
@@ -89,20 +94,7 @@ public void ShowPopup<TViewModel>(IDictionary<string, object> arguments) where T
 			popup.BindingContext = viewModel;
 		}
 
-		return GetMainPage().ShowPopupAsync(popup);
-	}
-
-	static Page GetMainPage()
-	{
-		var currentApplication = Application.Current;
-
-		ArgumentNullException.ThrowIfNull(currentApplication);
-
-		var mainPage = currentApplication.MainPage;
-
-		ArgumentNullException.ThrowIfNull(mainPage);
-
-		return mainPage;
+		return CurrentPage.ShowPopupAsync(popup);
 	}
 
 	Popup GetPopup(Type viewModelType)

From f519b67568e553c05a78823497bc87a8e1052de7 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Wed, 10 May 2023 21:25:38 +0100
Subject: [PATCH 08/17] Readonly dictionary and some safety checking around
 expected BindingContext types.

---
 .../IArgumentsReceiver.cs                     |  2 +-
 .../IPopupService.cs                          |  4 +-
 src/CommunityToolkit.Maui/PopupService.cs     | 37 +++++++++++++------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs b/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs
index f435b74856..a61f393ee8 100644
--- a/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs
+++ b/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs
@@ -9,5 +9,5 @@ public interface IArgumentsReceiver
 	/// Sets the arguments ready for use.
 	/// </summary>
 	/// <param name="arguments">A set of arguments.</param>
-	void SetArguments(IDictionary<string, object> arguments);
+	void SetArguments(IReadOnlyDictionary<string, object> arguments);
 }
diff --git a/src/CommunityToolkit.Maui.Core/IPopupService.cs b/src/CommunityToolkit.Maui.Core/IPopupService.cs
index f34dd3c56c..b1dfda0189 100644
--- a/src/CommunityToolkit.Maui.Core/IPopupService.cs
+++ b/src/CommunityToolkit.Maui.Core/IPopupService.cs
@@ -19,7 +19,7 @@ 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="arguments">Any parameters that can be passed across to the resolved view model.</param>
-	void ShowPopup<TViewModel>(IDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged;
+	void ShowPopup<TViewModel>(IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged;
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
@@ -42,7 +42,7 @@ 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="arguments">Any parameters that can be passed across to the resolved view model.</param>
-	Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged;
+	Task<object?> ShowPopupAsync<TViewModel>(IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged;
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 7748a43d47..1d3b23e13e 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -49,19 +49,14 @@ public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INoti
 		CurrentPage.ShowPopup(popup);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(IDictionary{string, object})"/>
-	public void ShowPopup<TViewModel>(IDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(IReadOnlyDictionary{string, object})"/>
+	public void ShowPopup<TViewModel>(IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged
 	{
 		ArgumentNullException.ThrowIfNull(arguments);
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		if (popup.BindingContext is null)
-		{
-			var viewModel = GetViewModel<TViewModel>();
-			viewModel.SetArguments(arguments);
-			popup.BindingContext = viewModel;
-		}
+		AssignBindingContext<TViewModel>(popup, arguments);
 
 		CurrentPage.ShowPopup(popup);
 	}
@@ -80,21 +75,39 @@ public void ShowPopup<TViewModel>(IDictionary<string, object> arguments) where T
 		return CurrentPage.ShowPopupAsync(popup);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(IDictionary{string, object})"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(IDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(IReadOnlyDictionary{string, object})"/>
+	public Task<object?> ShowPopupAsync<TViewModel>(IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged
 	{
 		ArgumentNullException.ThrowIfNull(arguments);
 
 		var popup = GetPopup(typeof(TViewModel));
 
+		AssignBindingContext<TViewModel>(popup, arguments);
+
+		return CurrentPage.ShowPopupAsync(popup);
+	}
+
+	/// <summary>
+	/// Ensures that the BindingContext property of the Popup to present is either not set (in which case we will assign an instance through the magic of DI), or is of the expected type so that we can pass the <paramref name="arguments"/> over to it.
+	/// </summary>
+	/// <typeparam name="TViewModel"></typeparam>
+	/// <param name="popup">The popup to be presented.</param>
+	/// <param name="arguments">The arguments to provide.</param>
+	/// <exception cref="InvalidOperationException"></exception>
+	void AssignBindingContext<TViewModel>(Popup popup, IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver
+	{
 		if (popup.BindingContext is null)
 		{
 			var viewModel = GetViewModel<TViewModel>();
-			viewModel.SetArguments(arguments);
+			
 			popup.BindingContext = viewModel;
 		}
+		else if (popup.BindingContext is not TViewModel)
+		{
+			throw new InvalidOperationException($"Unexpected type has been assigned to the BindingContext of {popup.GetType()}. Expected type {typeof(TViewModel)} but was {popup.BindingContext.GetType()}");
+		}
 
-		return CurrentPage.ShowPopupAsync(popup);
+		((IArgumentsReceiver)popup.BindingContext).SetArguments(arguments);
 	}
 
 	Popup GetPopup(Type viewModelType)

From b616186d4ef840b118fcdeeaff01af8dcc0305e9 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Thu, 10 Aug 2023 23:01:59 +0100
Subject: [PATCH 09/17] A different attempt at passing parameters without an
 explicit interface

---
 .../Popup/CsharpBindingPopupViewModel.cs      |  7 ++-
 .../Views/Popup/MultiplePopupViewModel.cs     |  3 +-
 .../IArgumentsReceiver.cs                     | 13 ----
 .../IPopupService.cs                          | 31 ++++++++--
 .../PopupServiceTests.cs                      |  3 +-
 src/CommunityToolkit.Maui/PopupService.cs     | 61 ++++++++++++++-----
 6 files changed, 81 insertions(+), 37 deletions(-)
 delete mode 100644 src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CsharpBindingPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CsharpBindingPopupViewModel.cs
index 02752494ae..9dabfc5bb2 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CsharpBindingPopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CsharpBindingPopupViewModel.cs
@@ -4,5 +4,10 @@ public sealed partial class CsharpBindingPopupViewModel : BaseViewModel
 {
 	public string Title { get; } = "C# Binding Popup";
 
-	public string Message { get; } = "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.";
+	public string Message { get; private set; } = "";
+
+	internal void Load(string message)
+	{
+		Message = message;
+	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
index 2d7b869da6..ef3d085aec 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
@@ -15,6 +15,7 @@ public MultiplePopupViewModel(IPopupService popupService)
 	[RelayCommand]
 	Task OnCsharpBindingPopup()
 	{
-		return this.popupService.ShowPopupAsync<CsharpBindingPopupViewModel>();
+		return this.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."));
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs b/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs
deleted file mode 100644
index a61f393ee8..0000000000
--- a/src/CommunityToolkit.Maui.Core/IArgumentsReceiver.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace CommunityToolkit.Maui.Core;
-
-/// <summary>
-/// Represents an implementation that can receive arguments during specific lifecycle events.
-/// </summary>
-public interface IArgumentsReceiver
-{
-	/// <summary>
-	/// Sets the arguments ready for use.
-	/// </summary>
-	/// <param name="arguments">A set of arguments.</param>
-	void SetArguments(IReadOnlyDictionary<string, object> arguments);
-}
diff --git a/src/CommunityToolkit.Maui.Core/IPopupService.cs b/src/CommunityToolkit.Maui.Core/IPopupService.cs
index b1dfda0189..35f9b4e7af 100644
--- a/src/CommunityToolkit.Maui.Core/IPopupService.cs
+++ b/src/CommunityToolkit.Maui.Core/IPopupService.cs
@@ -15,11 +15,20 @@ public interface IPopupService
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
-	/// The view model will be passed the supplied <paramref name="arguments"/> based on its <see cref="IArgumentsReceiver"/> implementation.
+	/// The supplied <paramref name="onPresenting"/> provides a mechanism to invoke any methods on your view model in order to load or pass data to it.
 	/// </summary>
 	/// <typeparam name="TViewModel">The type of the view model registered with the <see cref="CommunityToolkit.Maui.Core.IPopup"/>.</typeparam>
-	/// <param name="arguments">Any parameters that can be passed across to the resolved view model.</param>
-	void ShowPopup<TViewModel>(IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged;
+	/// <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>.
+	/// The supplied <paramref name="onPresenting"/> provides a mechanism to invoke any methods on your view model in order to load or pass data to it.
+	/// </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="Func{TViewModel, Task}"/> that will be performed before the popup is presented.
+	/// The <see cref="Task"/> returned from the func will be awaited so it will delay the popup from showing until that operation has completed..</param>
+	void ShowPopup<TViewModel>(Func<TViewModel, Task> 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>.
@@ -37,12 +46,22 @@ public interface IPopupService
 
 	/// <summary>
 	/// Resolves and displays a <see cref="CommunityToolkit.Maui.Core.IPopup"/> and <typeparamref name="TViewModel"/> pair that was registered with <c>AddTransientPopup</c>.
-	/// The view model will be passed the supplied <paramref name="arguments"/> based on its <see cref="IArgumentsReceiver"/> implementation.
+	/// The supplied <paramref name="onPresenting"/> provides a mechanism to invoke any methods on your view model in order to load or pass data to it.
+	/// </summary>
+	/// <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>
+	Task<object?> ShowPopupAsync<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>.
+	/// The supplied <paramref name="onPresenting"/> provides a mechanism to invoke any methods on your view model in order to load or pass data to it.
 	/// </summary>
 	/// <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="arguments">Any parameters that can be passed across to the resolved view model.</param>
-	Task<object?> ShowPopupAsync<TViewModel>(IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged;
+	/// <param name="onPresenting">An <see cref="Func{TViewModel, Task}"/> that will be performed before the popup is presented.
+	/// The <see cref="Task"/> returned from the func will be awaited so it will delay the popup from showing until that operation has completed..</param>
+	Task<object?> ShowPopupAsync<TViewModel>(Func<TViewModel, Task> 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>.
diff --git a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
index 1188168f20..5c1506efe0 100644
--- a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.UnitTests.Mocks;
 using CommunityToolkit.Maui.Views;
 using Xunit;
@@ -26,7 +25,7 @@ public static 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>(null));
+		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<INotifyPropertyChanged>(viewModel: null));
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 1d3b23e13e..9d92bdc2c5 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -49,14 +49,30 @@ public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INoti
 		CurrentPage.ShowPopup(popup);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(IReadOnlyDictionary{string, object})"/>
-	public void ShowPopup<TViewModel>(IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(Action{TViewModel})"/>
+	public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewModel : INotifyPropertyChanged
 	{
-		ArgumentNullException.ThrowIfNull(arguments);
+		ArgumentNullException.ThrowIfNull(onPresenting);
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		AssignBindingContext<TViewModel>(popup, arguments);
+		var viewModel = AssignBindingContext<TViewModel>(popup);
+
+		onPresenting.Invoke(viewModel);
+
+		CurrentPage.ShowPopup(popup);
+	}
+
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(Func{TViewModel, Task})"/>
+	public async void ShowPopup<TViewModel>(Func<TViewModel, Task> onPresenting) where TViewModel : INotifyPropertyChanged
+	{
+		ArgumentNullException.ThrowIfNull(onPresenting);
+
+		var popup = GetPopup(typeof(TViewModel));
+
+		var viewModel = AssignBindingContext<TViewModel>(popup);
+
+		await onPresenting.Invoke(viewModel);
 
 		CurrentPage.ShowPopup(popup);
 	}
@@ -75,26 +91,42 @@ public void ShowPopup<TViewModel>(IReadOnlyDictionary<string, object> arguments)
 		return CurrentPage.ShowPopupAsync(popup);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(IReadOnlyDictionary{string, object})"/>
-	public Task<object?> ShowPopupAsync<TViewModel>(IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver, INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(Action{TViewModel})"/>
+	public Task<object?> ShowPopupAsync<TViewModel>(Action<TViewModel> onPresenting) where TViewModel : INotifyPropertyChanged
 	{
-		ArgumentNullException.ThrowIfNull(arguments);
+		ArgumentNullException.ThrowIfNull(onPresenting);
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		AssignBindingContext<TViewModel>(popup, arguments);
+		var viewModel = AssignBindingContext<TViewModel>(popup);
+
+		onPresenting.Invoke(viewModel);
+
+		return CurrentPage.ShowPopupAsync(popup);
+	}
+
+	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(Func{TViewModel, Task})"/>
+	public async Task<object?> ShowPopupAsync<TViewModel>(Func<TViewModel, Task> onPresenting) where TViewModel : INotifyPropertyChanged
+	{
+		ArgumentNullException.ThrowIfNull(onPresenting);
+
+		var popup = GetPopup(typeof(TViewModel));
+
+		var viewModel = AssignBindingContext<TViewModel>(popup);
+
+		await onPresenting.Invoke(viewModel);
 
 		return CurrentPage.ShowPopupAsync(popup);
 	}
 
 	/// <summary>
-	/// Ensures that the BindingContext property of the Popup to present is either not set (in which case we will assign an instance through the magic of DI), or is of the expected type so that we can pass the <paramref name="arguments"/> over to it.
+	/// Ensures that the BindingContext property of the Popup to present is either not set (in which case we will assign an instance through the magic of DI),
+	/// or is of the expected type.
 	/// </summary>
 	/// <typeparam name="TViewModel"></typeparam>
 	/// <param name="popup">The popup to be presented.</param>
-	/// <param name="arguments">The arguments to provide.</param>
 	/// <exception cref="InvalidOperationException"></exception>
-	void AssignBindingContext<TViewModel>(Popup popup, IReadOnlyDictionary<string, object> arguments) where TViewModel : IArgumentsReceiver
+	TViewModel AssignBindingContext<TViewModel>(Popup popup)
 	{
 		if (popup.BindingContext is null)
 		{
@@ -102,12 +134,13 @@ void AssignBindingContext<TViewModel>(Popup popup, IReadOnlyDictionary<string, o
 			
 			popup.BindingContext = viewModel;
 		}
-		else if (popup.BindingContext is not TViewModel)
+
+		if (popup.BindingContext is not TViewModel assignedViewModel)
 		{
-			throw new InvalidOperationException($"Unexpected type has been assigned to the BindingContext of {popup.GetType()}. Expected type {typeof(TViewModel)} but was {popup.BindingContext.GetType()}");
+			throw new InvalidOperationException($"Unexpected type has been assigned to the BindingContext of {popup.GetType()}. Expected type {typeof(TViewModel)} but was {popup.BindingContext?.GetType()}");
 		}
 
-		((IArgumentsReceiver)popup.BindingContext).SetArguments(arguments);
+		return assignedViewModel;
 	}
 
 	Popup GetPopup(Type viewModelType)

From 9f30cce789a166210b90d92cd19d9375a3718e37 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Sun, 13 Aug 2023 21:11:59 +0100
Subject: [PATCH 10/17] Update src/CommunityToolkit.Maui/PopupService.cs

Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
---
 src/CommunityToolkit.Maui/PopupService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 9d92bdc2c5..88b9b9a86f 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -10,7 +10,7 @@ public class PopupService : IPopupService
 {
 	readonly IServiceProvider serviceProvider;
 
-	static readonly IDictionary<Type, Type> viewModelToViewMappings = new Dictionary<Type, Type>();
+	static readonly Dictionary<Type, Type> viewModelToViewMappings = new Dictionary<Type, Type>();
 
 	static Page CurrentPage =>
 		PageExtensions.GetCurrentPage(

From fc31da8e8a4b34f1628ea1e86499d687e417047d Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Sun, 13 Aug 2023 23:11:07 +0100
Subject: [PATCH 11/17] Now is a time for test

---
 .../IPopupService.cs                          |  19 --
 .../Mocks/MockPageViewModel.cs                |   1 +
 .../Mocks/MockPopupHandler.cs                 |   9 +-
 .../PopupServiceTests.cs                      | 233 +++++++++++++++---
 src/CommunityToolkit.Maui/PopupService.cs     |  51 ++--
 5 files changed, 229 insertions(+), 84 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/IPopupService.cs b/src/CommunityToolkit.Maui.Core/IPopupService.cs
index 35f9b4e7af..304902be13 100644
--- a/src/CommunityToolkit.Maui.Core/IPopupService.cs
+++ b/src/CommunityToolkit.Maui.Core/IPopupService.cs
@@ -21,15 +21,6 @@ public interface IPopupService
 	/// <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>.
-	/// The supplied <paramref name="onPresenting"/> provides a mechanism to invoke any methods on your view model in order to load or pass data to it.
-	/// </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="Func{TViewModel, Task}"/> that will be performed before the popup is presented.
-	/// The <see cref="Task"/> returned from the func will be awaited so it will delay the popup from showing until that operation has completed..</param>
-	void ShowPopup<TViewModel>(Func<TViewModel, Task> 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>
@@ -53,16 +44,6 @@ public interface IPopupService
 	/// <param name="onPresenting">An <see cref="Action{TViewModel}"/> that will be performed before the popup is presented.</param>
 	Task<object?> ShowPopupAsync<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>.
-	/// The supplied <paramref name="onPresenting"/> provides a mechanism to invoke any methods on your view model in order to load or pass data to it.
-	/// </summary>
-	/// <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="Func{TViewModel, Task}"/> that will be performed before the popup is presented.
-	/// The <see cref="Task"/> returned from the func will be awaited so it will delay the popup from showing until that operation has completed..</param>
-	Task<object?> ShowPopupAsync<TViewModel>(Func<TViewModel, Task> 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>
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPageViewModel.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPageViewModel.cs
index 961e1c09f6..227359d82d 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPageViewModel.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPageViewModel.cs
@@ -2,4 +2,5 @@
 
 public class MockPageViewModel : BindableObject
 {
+	public bool HasLoaded { get; set; }
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs
index e4f265d08c..407065186c 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockPopupHandler.cs
@@ -7,7 +7,8 @@ public class MockPopupHandler : ElementHandler<IPopup, object>
 {
 	public static CommandMapper<IPopup, MockPopupHandler> PopUpCommandMapper = new(ElementCommandMapper)
 	{
-		[nameof(IPopup.OnOpened)] = MapOnOpened
+		[nameof(IPopup.OnOpened)] = MapOnOpened,
+		[nameof(IPopup.OnClosed)] = MapOnClosed,
 	};
 
 	public MockPopupHandler() : base(new PropertyMapper<IView>(), PopUpCommandMapper)
@@ -30,5 +31,11 @@ protected override object CreatePlatformElement()
 	static void MapOnOpened(MockPopupHandler arg1, IPopup arg2, object? arg3)
 	{
 		arg1.OnOpenedCount++;
+		arg2.OnOpened();
+	}
+
+	static void MapOnClosed(MockPopupHandler handler, IPopup view, object? result)
+	{
+		view.HandlerCompleteTCS.TrySetResult();
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
index 5c1506efe0..c1b041d832 100644
--- a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
@@ -19,6 +19,107 @@ public PopupServiceTests() : base()
 		application.Handler.SetMauiContext(new HandlersContextStub(mauiApp.Services));
 	}
 
+	static PopupServiceTests()
+	{
+		var serviceCollection = new ServiceCollection();
+		PopupService.AddTransientPopup<MockPopup, MockPageViewModel>(serviceCollection);
+	}
+
+	[Fact]
+	public static void ShowPopupAsyncWithNullViewModelShouldThrowArgumentNullException()
+	{
+		var popupService = new PopupService(new MockServiceProvider());
+
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Assert.ThrowsAsync<ArgumentNullException>(() => popupService.ShowPopupAsync<INotifyPropertyChanged>(viewModel: null));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact]
+	public static void ShowPopupAsyncWithNullOnPresentingShouldThrowArgumentNullException()
+	{
+		var popupService = new PopupService(new MockServiceProvider());
+
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Assert.ThrowsAsync<ArgumentNullException>(() => popupService.ShowPopupAsync<INotifyPropertyChanged>(onPresenting: null));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact]
+	public static void ShowPopupAsyncWithMismatchedViewModelTypeShouldThrowInvalidOperationException()
+	{
+		var popupService = new PopupService(new MockServiceProvider());
+
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Assert.ThrowsAsync<ArgumentNullException>(() => popupService.ShowPopupAsync<INotifyPropertyChanged>(viewModel: null));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
+
+	[Fact]
+	public static void ShowPopupAsyncShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
+	{
+		var popupInstance = new MockMismatchedPopup();
+		var popupViewModel = new MockPageViewModel();
+
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
+
+		Assert.ThrowsAsync<InvalidOperationException>(popupService.ShowPopupAsync<MockPageViewModel>);
+	}
+
+	[Fact]
+	public void ShowPopupAsyncShouldCreateAndAssignBindingContext()
+	{
+		var popupInstance = new MockPopup();
+		var popupViewModel = new MockPageViewModel();
+
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
+
+		_ = popupService.ShowPopupAsync<MockPageViewModel>();
+
+		Assert.Same(popupInstance.BindingContext, popupViewModel);
+	}
+
+	[Fact]
+	public void ShowPopupAsyncShouldAssignPassedInViewModelToBindingContext()
+	{
+		var popupInstance = new MockPopup();
+		var popupViewModel = new MockPageViewModel();
+
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
+
+		_ = popupService.ShowPopupAsync(popupViewModel);
+
+		Assert.Same(popupInstance.BindingContext, popupViewModel);
+	}
+
+	[Fact]
+	public void ShowPopupAsyncWithOnPresentingShouldBeInvoked()
+	{
+		var popupInstance = new MockPopup();
+		var popupViewModel = new MockPageViewModel();
+
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
+
+		_ = popupService.ShowPopupAsync<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true);
+
+		Assert.True(popupViewModel.HasLoaded);
+	}
+
+	[Fact]
+	public async Task ShowPopupAsyncShouldReturnResultOnceClosed()
+	{
+		var expectedResult = new object();
+
+		var popupInstance = new MockSelfClosingPopup(expectedResult);
+		var popupViewModel = new MockPageViewModel();
+
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
+
+		var result = await popupService.ShowPopupAsync<MockPageViewModel>();
+
+		Assert.Same(expectedResult, result);
+	}
+
 	[Fact]
 	public static void ShowPopupWithNullViewModelShouldThrowArgumentNullException()
 	{
@@ -29,38 +130,85 @@ public static void ShowPopupWithNullViewModelShouldThrowArgumentNullException()
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
-//	[Fact]
-//	public static void ShowPopupWithNullQueryShouldThrowArgumentNullException()
-//	{
-//		var popupService = new PopupService(new MockServiceProvider());
+	[Fact]
+	public static void ShowPopupWithNullOnPresentingShouldThrowArgumentNullException()
+	{
+		var popupService = new PopupService(new MockServiceProvider());
 
-//#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-//		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<IArgumentsReceiver>(null));
-//#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
-//	}
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+		Assert.Throws<ArgumentNullException>(() => popupService.ShowPopup<INotifyPropertyChanged>(onPresenting: null));
+#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
+	}
 
 	[Fact]
-	public static void ShowPopupShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
+	public static 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]
+	public static void ShowPopupShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
+	{
+		var popupInstance = new MockMismatchedPopup();
+		var popupViewModel = new MockPageViewModel();
+
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
+
 		Assert.Throws<InvalidOperationException>(popupService.ShowPopup<MockPageViewModel>);
 	}
 
 	[Fact]
-	public static void D()
+	public void ShowPopupShouldCreateAndAssignBindingContext()
 	{
-		var serviceCollection = new ServiceCollection();
-		PopupService.AddTransientPopup<MockPopup, MockPageViewModel>(serviceCollection);
+		var popupInstance = new MockPopup();
+		var popupViewModel = new MockPageViewModel();
+
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
+
+		popupService.ShowPopup<MockPageViewModel>();
+
+		Assert.Same(popupInstance.BindingContext, popupViewModel);
+	}
+
+	[Fact]
+	public void ShowPopupShouldAssignPassedInViewModelToBindingContext()
+	{
+		var popupInstance = new MockPopup();
+		var popupViewModel = new MockPageViewModel();
 
-		var popup = new MockPopup();
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
 
+		popupService.ShowPopup(popupViewModel);
+
+		Assert.Same(popupInstance.BindingContext, popupViewModel);
+	}
+
+	[Fact]
+	public void ShowPopupWithOnPresentingShouldBeInvoked()
+	{
+		var popupInstance = new MockPopup();
+		var popupViewModel = new MockPageViewModel();
+
+		var popupService = SetupTest(popupInstance, () => popupViewModel);
+
+		popupService.ShowPopup<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true);
+
+		Assert.True(popupViewModel.HasLoaded);
+	}
+
+	static PopupService SetupTest(
+		Popup popup,
+		Func<INotifyPropertyChanged> createViewModelInstance)
+	{
 		var popupService = new PopupService(
 			MockServiceProvider.ThatProvides(
 				(implementation: popup, forType: typeof(MockPopup)),
-				(implementation: new MockPageViewModel(), forType: typeof(MockPageViewModel))));
+				(implementation: createViewModelInstance.Invoke(), forType: typeof(MockPageViewModel))));
 
-		Application.Current = new MockApplication();
 		var app = Application.Current ?? throw new NullReferenceException();
 
 		var page = new ContentPage
@@ -68,28 +216,20 @@ public static void D()
 			Content = new Label
 			{
 				Text = "Hello there"
-			},
-			IsPlatformEnabled = true
+			}
 		};
 
-		//// Make sure that our page will have a Handler
-		//CreateViewHandler<MockPageHandler>(page);
+		// 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);
-
-		bool popupWasOpened = false;
+		_ = CreateElementHandler<MockPopupHandler>(popup);
 
-		popup.Opened += (s, e) =>
-		{
-			popupWasOpened = true;
-		};
-
-		popupService.ShowPopup<MockPageViewModel>();
+		Assert.NotNull(popup.Handler);
+		Assert.NotNull(page.Handler);
 
-		Assert.True(popupWasOpened);
+		return popupService;
 	}
 }
 
@@ -128,5 +268,38 @@ public static MockServiceProvider ThatProvides(params (object implementation, Ty
 
 public class MockPopup : Popup
 {
+	public MockPopup()
+	{
+
+	}
+}
 
+public class MockSelfClosingPopup : Popup
+{
+	readonly object result;
+
+	public MockSelfClosingPopup(object result)
+	{
+		this.result = result;
+	}
+
+	internal override void OnOpened()
+	{
+		base.OnOpened();
+
+		Task.Run(async () =>
+		{
+			await Task.Delay(1000);
+
+			this.Close(this.result);
+		});
+	}
+}
+
+public class MockMismatchedPopup : Popup
+{
+	public MockMismatchedPopup()
+	{
+		BindingContext = new object();
+	}
 }
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 9d92bdc2c5..9a92b2f362 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -36,43 +36,37 @@ internal static void AddTransientPopup<TPopupView, TPopupViewModel>(IServiceColl
 	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}()"/>
-	public void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged =>
-		ShowPopup(GetViewModel<TViewModel>());
-
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(TViewModel)"/>
-	public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged
+	public void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged
 	{
-		ArgumentNullException.ThrowIfNull(viewModel);
-
 		var popup = GetPopup(typeof(TViewModel));
 
+		var viewModel = AssignBindingContext(popup, GetViewModel<TViewModel>);
+
 		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}(TViewModel)"/>
+	public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged
 	{
-		ArgumentNullException.ThrowIfNull(onPresenting);
+		ArgumentNullException.ThrowIfNull(viewModel);
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		var viewModel = AssignBindingContext<TViewModel>(popup);
-
-		onPresenting.Invoke(viewModel);
+		AssignBindingContext(popup, () => viewModel);
 
 		CurrentPage.ShowPopup(popup);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(Func{TViewModel, Task})"/>
-	public async void ShowPopup<TViewModel>(Func<TViewModel, Task> onPresenting) where TViewModel : INotifyPropertyChanged
+	/// <inheritdoc cref="IPopupService.ShowPopup{TViewModel}(Action{TViewModel})"/>
+	public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewModel : INotifyPropertyChanged
 	{
 		ArgumentNullException.ThrowIfNull(onPresenting);
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		var viewModel = AssignBindingContext<TViewModel>(popup);
+		var viewModel = AssignBindingContext(popup, GetViewModel<TViewModel>);
 
-		await onPresenting.Invoke(viewModel);
+		onPresenting.Invoke(viewModel);
 
 		CurrentPage.ShowPopup(popup);
 	}
@@ -88,6 +82,8 @@ public async void ShowPopup<TViewModel>(Func<TViewModel, Task> onPresenting) whe
 
 		var popup = GetPopup(typeof(TViewModel));
 
+		AssignBindingContext(popup, () => viewModel);
+
 		return CurrentPage.ShowPopupAsync(popup);
 	}
 
@@ -98,39 +94,26 @@ public async void ShowPopup<TViewModel>(Func<TViewModel, Task> onPresenting) whe
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		var viewModel = AssignBindingContext<TViewModel>(popup);
+		var viewModel = AssignBindingContext(popup, GetViewModel<TViewModel>);
 
 		onPresenting.Invoke(viewModel);
 
 		return CurrentPage.ShowPopupAsync(popup);
 	}
 
-	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(Func{TViewModel, Task})"/>
-	public async Task<object?> ShowPopupAsync<TViewModel>(Func<TViewModel, Task> onPresenting) where TViewModel : INotifyPropertyChanged
-	{
-		ArgumentNullException.ThrowIfNull(onPresenting);
-
-		var popup = GetPopup(typeof(TViewModel));
-
-		var viewModel = AssignBindingContext<TViewModel>(popup);
-
-		await onPresenting.Invoke(viewModel);
-
-		return CurrentPage.ShowPopupAsync(popup);
-	}
-
 	/// <summary>
 	/// Ensures that the BindingContext property of the Popup to present is either not set (in which case we will assign an instance through the magic of DI),
 	/// or is of the expected type.
 	/// </summary>
 	/// <typeparam name="TViewModel"></typeparam>
 	/// <param name="popup">The popup to be presented.</param>
+	/// <param name="getViewModelInstance">Provides the instance of the view model ready to assign.</param>
 	/// <exception cref="InvalidOperationException"></exception>
-	TViewModel AssignBindingContext<TViewModel>(Popup popup)
+	static TViewModel AssignBindingContext<TViewModel>(Popup popup, Func<TViewModel> getViewModelInstance)
 	{
 		if (popup.BindingContext is null)
 		{
-			var viewModel = GetViewModel<TViewModel>();
+			var viewModel = getViewModelInstance.Invoke();
 			
 			popup.BindingContext = viewModel;
 		}

From 5977554fde4aca7195292edca7da5b96a3187446 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Sun, 13 Aug 2023 23:17:07 +0100
Subject: [PATCH 12/17] Remove unnecessary changes

---
 src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj b/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
index 3f6af9e1cf..ae639f9167 100644
--- a/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
+++ b/src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj
@@ -47,9 +47,6 @@
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
-    <CreatePackage>false</CreatePackage>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\CommunityToolkit.Maui.Core\CommunityToolkit.Maui.Core.csproj" />
   </ItemGroup>

From fc9a1e130a5f13378b13e8deb2589b39414c0e1f Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Tue, 15 Aug 2023 15:53:29 +0100
Subject: [PATCH 13/17] Sample to perform a long running process

---
 .../MauiProgram.cs                            |  1 +
 .../Pages/Views/Popup/MultiplePopupPage.xaml  |  2 +
 .../Views/Popup/MultiplePopupViewModel.cs     |  7 +++
 .../Views/Popup/UpdatingPopupViewModel.cs     | 42 ++++++++++++++
 .../Views/Popups/UpdatingPopup.xaml           | 55 +++++++++++++++++++
 .../Views/Popups/UpdatingPopup.xaml.cs        | 11 ++++
 6 files changed, 118 insertions(+)
 create mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index 0118d890be..15357d731a 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -194,6 +194,7 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 
 		// Add Popups
 		services.AddTransientPopup<CsharpBindingPopup, CsharpBindingPopupViewModel>();
+		services.AddTransientPopup<UpdatingPopup, UpdatingPopupViewModel>();
 		services.AddTransientPopup<XamlBindingPopup, XamlBindingPopupViewModel>();
 	}
 
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
index 9204dcb81a..d05ab27ce4 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/MultiplePopupPage.xaml
@@ -29,6 +29,8 @@
                 <Button Text="XAML Binding Popup" Clicked="HandleXamlBindingPopupPopupButtonClicked" />
 
                 <Button Text="C# Binding Popup" Command="{Binding CsharpBindingPopupCommand}" />
+
+                <Button Text="Updating Popup" Command="{Binding UpdatingPopupCommand}" />
             </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 ef3d085aec..49c8914cbc 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
@@ -18,4 +18,11 @@ Task OnCsharpBindingPopup()
 		return this.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."));
 	}
+
+	[RelayCommand]
+	Task OnUpdatingPopup()
+	{
+		return this.popupService.ShowPopupAsync<UpdatingPopupViewModel>(
+			onPresenting: viewModel => viewModel.PerformUpdates(3));
+	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
new file mode 100644
index 0000000000..c7cc5cd836
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
@@ -0,0 +1,42 @@
+using CommunityToolkit.Mvvm.Input;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
+
+public partial class UpdatingPopupViewModel : BaseViewModel
+{
+	[Mvvm.ComponentModel.ObservableProperty]
+	string message = "";
+
+	[Mvvm.ComponentModel.ObservableProperty]
+	[Mvvm.ComponentModel.NotifyCanExecuteChangedFor(nameof(FinishCommand))]
+	double updateProgress;
+
+	public UpdatingPopupViewModel()
+	{
+	}
+
+	internal async void PerformUpdates(int numberOfUpdates)
+	{
+		double updateTotalForPercentage = numberOfUpdates + 1;
+
+		for (var update = 1; update <= numberOfUpdates; update++)
+		{
+			this.Message = $"Updating {update} of {numberOfUpdates}";
+
+			this.UpdateProgress = update / updateTotalForPercentage;
+
+			await Task.Delay(TimeSpan.FromSeconds(3));	
+		}
+
+		this.UpdateProgress = 1d;
+		this.Message = "Updates complete";
+	}
+
+	[RelayCommand(CanExecute = nameof(CanFinish))]
+	void OnFinish()
+	{
+
+	}
+
+	bool CanFinish() => this.UpdateProgress == 1d;
+}
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml
new file mode 100644
index 0000000000..95c00985d8
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<toolkit:Popup
+	x:Class="CommunityToolkit.Maui.Sample.Views.Popups.UpdatingPopup"
+	xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+	CanBeDismissedByTappingOutsideOfPopup="False">
+
+	<VerticalStackLayout Style="{StaticResource PopupLayout}" Spacing="12" >
+		<VerticalStackLayout.Resources>
+			<ResourceDictionary>
+				<Style x:Key="Title" TargetType="Label">
+					<Setter Property="FontSize" Value="26" />
+					<Setter Property="FontAttributes" Value="Bold" />
+					<Setter Property="TextColor" Value="#000" />
+					<Setter Property="VerticalTextAlignment" Value="Center" />
+					<Setter Property="HorizontalTextAlignment" Value="Center" />
+				</Style>
+				<Style x:Key="Divider" TargetType="BoxView">
+					<Setter Property="HeightRequest" Value="1" />
+					<Setter Property="Margin" Value="50, 25" />
+					<Setter Property="Color" Value="#c3c3c3" />
+				</Style>
+				<Style x:Key="Content" TargetType="Label">
+					<Setter Property="HorizontalTextAlignment" Value="Center" />
+					<Setter Property="VerticalTextAlignment" Value="Center" />
+				</Style>
+				<Style x:Key="PopupLayout" TargetType="StackLayout">
+					<Setter Property="Padding" Value="{OnPlatform Android=20, WinUI=20, iOS=12, MacCatalyst=5, Tizen=20}" />
+				</Style>
+				<Style x:Key="ConfirmButton" TargetType="Button">
+					<Setter Property="VerticalOptions" Value="EndAndExpand" />
+				</Style>
+
+				<x:Double x:Key="ComparingValue">1.0</x:Double>
+			</ResourceDictionary>
+		</VerticalStackLayout.Resources>
+
+		<Label Style="{StaticResource Title}" Text="Updating" />
+
+		<BoxView Style="{StaticResource Divider}" />
+
+		<ActivityIndicator
+			IsRunning="{Binding UpdateProgress, Converter={toolkit:CompareConverter ComparingValue={StaticResource ComparingValue}, ComparisonOperator=Smaller, FalseObject=False, TrueObject=True}}"/>
+
+		<Label Style="{StaticResource Content}" Text="{Binding Message}" />
+
+		<ProgressBar Progress="{Binding UpdateProgress}" />
+
+		<Button
+			Command="{Binding FinishCommand}"
+			Style="{StaticResource ConfirmButton}"
+			Text="Finish" />
+	</VerticalStackLayout>
+</toolkit:Popup>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs
new file mode 100644
index 0000000000..c1b0f41443
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Maui.Views;
+
+namespace CommunityToolkit.Maui.Sample.Views.Popups;
+
+public partial class UpdatingPopup : Popup
+{
+	public UpdatingPopup()
+	{
+		InitializeComponent();
+	}
+}

From d1fd1d90f96682b7ebede2a9d3748718c1c3373b Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Wed, 16 Aug 2023 07:53:25 +0100
Subject: [PATCH 14/17] Provide ability to close popup from within popup view
 model

---
 .../Views/Popup/MultiplePopupViewModel.cs           |  2 +-
 .../Views/Popup/UpdatingPopupViewModel.cs           | 10 +++++++++-
 .../Views/Popups/UpdatingPopup.xaml.cs              | 13 +++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
index 49c8914cbc..b63eb9e373 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
@@ -23,6 +23,6 @@ Task OnCsharpBindingPopup()
 	Task OnUpdatingPopup()
 	{
 		return this.popupService.ShowPopupAsync<UpdatingPopupViewModel>(
-			onPresenting: viewModel => viewModel.PerformUpdates(3));
+			onPresenting: viewModel => viewModel.PerformUpdates(10));
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
index c7cc5cd836..301e70c5fb 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
@@ -11,6 +11,14 @@ public partial class UpdatingPopupViewModel : BaseViewModel
 	[Mvvm.ComponentModel.NotifyCanExecuteChangedFor(nameof(FinishCommand))]
 	double updateProgress;
 
+	readonly WeakEventManager finishedEventManager = new();
+
+	public event EventHandler<EventArgs> Finished
+	{
+		add => finishedEventManager.AddEventHandler(value);
+		remove => finishedEventManager.RemoveEventHandler(value);
+	}
+
 	public UpdatingPopupViewModel()
 	{
 	}
@@ -35,7 +43,7 @@ internal async void PerformUpdates(int numberOfUpdates)
 	[RelayCommand(CanExecute = nameof(CanFinish))]
 	void OnFinish()
 	{
-
+		finishedEventManager.HandleEvent(this, EventArgs.Empty, nameof(Finished));
 	}
 
 	bool CanFinish() => this.UpdateProgress == 1d;
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs
index c1b0f41443..1f49054be7 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/UpdatingPopup.xaml.cs
@@ -1,11 +1,20 @@
-using CommunityToolkit.Maui.Views;
+using CommunityToolkit.Maui.Sample.ViewModels.Views;
+using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui.Sample.Views.Popups;
 
 public partial class UpdatingPopup : Popup
 {
-	public UpdatingPopup()
+	public UpdatingPopup(UpdatingPopupViewModel updatingPopupViewModel)
 	{
 		InitializeComponent();
+		BindingContext = updatingPopupViewModel;
+
+		updatingPopupViewModel.Finished += OnUpdatingPopupViewModelFinished;
+	}
+
+	void OnUpdatingPopupViewModelFinished(object? sender, EventArgs e)
+	{
+		this.Close();
 	}
 }

From 3f0599f25ac42fb499bc371fa619d85816704200 Mon Sep 17 00:00:00 2001
From: Shaun Lawrence <shaunrlawrence@gmail.com>
Date: Mon, 4 Sep 2023 21:17:57 +0100
Subject: [PATCH 15/17] Prevent unnecessary instance being created

---
 src/CommunityToolkit.Maui/PopupService.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index 14bee92b5a..f0e4bb593c 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -40,7 +40,7 @@ public void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged
 	{
 		var popup = GetPopup(typeof(TViewModel));
 
-		var viewModel = AssignBindingContext(popup, GetViewModel<TViewModel>);
+		AssignBindingContext(popup, GetViewModel<TViewModel>);
 
 		CurrentPage.ShowPopup(popup);
 	}
@@ -72,8 +72,14 @@ public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewMo
 	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}()"/>
-	public Task<object?> ShowPopupAsync<TViewModel>() where TViewModel : INotifyPropertyChanged =>
-		ShowPopupAsync(GetViewModel<TViewModel>());
+	public Task<object?> ShowPopupAsync<TViewModel>() where TViewModel : INotifyPropertyChanged
+	{
+		var popup = GetPopup(typeof(TViewModel));
+
+		AssignBindingContext(popup, GetViewModel<TViewModel>);
+
+		return CurrentPage.ShowPopupAsync(popup);
+	}
 
 	/// <inheritdoc cref="IPopupService.ShowPopupAsync{TViewModel}(TViewModel)"/>
 	public Task<object?> ShowPopupAsync<TViewModel>(TViewModel viewModel) where TViewModel : INotifyPropertyChanged

From 77ffdc9db0751ab62a3cfcf7672e6ddf7da7e6fc Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Tue, 31 Oct 2023 17:42:09 -0700
Subject: [PATCH 16/17] Refactor `CurrentPage`, Add Default Constructor,
 Refactor `ValidateBindingContext`

---
 .../Views/Popup/MultiplePopupViewModel.cs     |  4 +-
 .../Views/Popup/UpdatingPopupViewModel.cs     | 31 ++++-----
 src/CommunityToolkit.Maui/PopupService.cs     | 69 ++++++++-----------
 3 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
index b63eb9e373..5f08474732 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/MultiplePopupViewModel.cs
@@ -15,14 +15,14 @@ public MultiplePopupViewModel(IPopupService popupService)
 	[RelayCommand]
 	Task OnCsharpBindingPopup()
 	{
-		return this.popupService.ShowPopupAsync<CsharpBindingPopupViewModel>(
+		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."));
 	}
 
 	[RelayCommand]
 	Task OnUpdatingPopup()
 	{
-		return this.popupService.ShowPopupAsync<UpdatingPopupViewModel>(
+		return popupService.ShowPopupAsync<UpdatingPopupViewModel>(
 			onPresenting: viewModel => viewModel.PerformUpdates(10));
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
index 301e70c5fb..e75f84ef90 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/UpdatingPopupViewModel.cs
@@ -1,43 +1,42 @@
-using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
 namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
 public partial class UpdatingPopupViewModel : BaseViewModel
 {
-	[Mvvm.ComponentModel.ObservableProperty]
+	const double finalUpdateProgressValue = 1;
+	
+	readonly WeakEventManager finishedEventManager = new();
+	
+	[ObservableProperty]
 	string message = "";
 
-	[Mvvm.ComponentModel.ObservableProperty]
-	[Mvvm.ComponentModel.NotifyCanExecuteChangedFor(nameof(FinishCommand))]
+	[ObservableProperty]
+	[NotifyCanExecuteChangedFor(nameof(FinishCommand))]
 	double updateProgress;
 
-	readonly WeakEventManager finishedEventManager = new();
-
 	public event EventHandler<EventArgs> Finished
 	{
 		add => finishedEventManager.AddEventHandler(value);
 		remove => finishedEventManager.RemoveEventHandler(value);
 	}
 
-	public UpdatingPopupViewModel()
-	{
-	}
-
 	internal async void PerformUpdates(int numberOfUpdates)
 	{
 		double updateTotalForPercentage = numberOfUpdates + 1;
 
 		for (var update = 1; update <= numberOfUpdates; update++)
 		{
-			this.Message = $"Updating {update} of {numberOfUpdates}";
+			Message = $"Updating {update} of {numberOfUpdates}";
 
-			this.UpdateProgress = update / updateTotalForPercentage;
+			UpdateProgress = update / updateTotalForPercentage;
 
-			await Task.Delay(TimeSpan.FromSeconds(3));	
+			await Task.Delay(TimeSpan.FromSeconds(1));	
 		}
 
-		this.UpdateProgress = 1d;
-		this.Message = "Updates complete";
+		UpdateProgress = finalUpdateProgressValue;
+		Message = "Updates complete";
 	}
 
 	[RelayCommand(CanExecute = nameof(CanFinish))]
@@ -46,5 +45,5 @@ void OnFinish()
 		finishedEventManager.HandleEvent(this, EventArgs.Empty, nameof(Finished));
 	}
 
-	bool CanFinish() => this.UpdateProgress == 1d;
+	bool CanFinish() => UpdateProgress is finalUpdateProgressValue;
 }
diff --git a/src/CommunityToolkit.Maui/PopupService.cs b/src/CommunityToolkit.Maui/PopupService.cs
index f0e4bb593c..61ab714809 100644
--- a/src/CommunityToolkit.Maui/PopupService.cs
+++ b/src/CommunityToolkit.Maui/PopupService.cs
@@ -1,7 +1,7 @@
-using CommunityToolkit.Maui.Core;
+using System.ComponentModel;
+using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Views;
 using Microsoft.Maui.Controls.Platform;
-using System.ComponentModel;
 
 namespace CommunityToolkit.Maui;
 
@@ -10,23 +10,33 @@ public class PopupService : IPopupService
 {
 	readonly IServiceProvider serviceProvider;
 
-	static readonly Dictionary<Type, Type> viewModelToViewMappings = new Dictionary<Type, Type>();
+	static readonly Dictionary<Type, Type> viewModelToViewMappings = new();
 
 	static Page CurrentPage =>
 		PageExtensions.GetCurrentPage(
-			Application.Current?.MainPage ?? throw new NullReferenceException("MainPage is null."));
+			Application.Current?.MainPage ?? throw new InvalidOperationException("Application.Current.MainPage cannot be null."));
 
 	/// <summary>
 	/// Creates a new instance of <see cref="PopupService"/>.
 	/// </summary>
 	/// <param name="serviceProvider">The <see cref="IServiceProvider"/> implementation.</param>
+	[ActivatorUtilitiesConstructor]
 	public PopupService(IServiceProvider serviceProvider)
 	{
 		this.serviceProvider = serviceProvider;
 	}
+	
+	/// <summary>
+	/// Creates a new instance of <see cref="PopupService"/>.
+	/// </summary>
+	public PopupService()
+	{
+		serviceProvider = Application.Current?.Handler?.MauiContext?.Services 
+							?? throw new InvalidOperationException("Could not locate IServiceProvider");
+	}
 
 	internal static void AddTransientPopup<TPopupView, TPopupViewModel>(IServiceCollection services)
-		where TPopupView : Popup
+		where TPopupView : IPopup
 		where TPopupViewModel : INotifyPropertyChanged
 	{
 		viewModelToViewMappings.Add(typeof(TPopupViewModel), typeof(TPopupView));
@@ -40,7 +50,7 @@ public void ShowPopup<TViewModel>() where TViewModel : INotifyPropertyChanged
 	{
 		var popup = GetPopup(typeof(TViewModel));
 
-		AssignBindingContext(popup, GetViewModel<TViewModel>);
+		ValidateBindingContext<TViewModel>(popup, out _);
 
 		CurrentPage.ShowPopup(popup);
 	}
@@ -52,7 +62,7 @@ public void ShowPopup<TViewModel>(TViewModel viewModel) where TViewModel : INoti
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		AssignBindingContext(popup, () => viewModel);
+		ValidateBindingContext<TViewModel>(popup, out _);
 
 		CurrentPage.ShowPopup(popup);
 	}
@@ -64,7 +74,7 @@ public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewMo
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		var viewModel = AssignBindingContext(popup, GetViewModel<TViewModel>);
+		ValidateBindingContext(popup, out TViewModel viewModel);
 
 		onPresenting.Invoke(viewModel);
 
@@ -76,7 +86,7 @@ public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewMo
 	{
 		var popup = GetPopup(typeof(TViewModel));
 
-		AssignBindingContext(popup, GetViewModel<TViewModel>);
+		ValidateBindingContext<TViewModel>(popup, out _);
 
 		return CurrentPage.ShowPopupAsync(popup);
 	}
@@ -88,7 +98,7 @@ public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewMo
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		AssignBindingContext(popup, () => viewModel);
+		ValidateBindingContext<TViewModel>(popup, out _);
 
 		return CurrentPage.ShowPopupAsync(popup);
 	}
@@ -100,7 +110,7 @@ public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewMo
 
 		var popup = GetPopup(typeof(TViewModel));
 
-		var viewModel = AssignBindingContext(popup, GetViewModel<TViewModel>);
+		ValidateBindingContext(popup, out TViewModel viewModel);
 
 		onPresenting.Invoke(viewModel);
 
@@ -108,34 +118,26 @@ public void ShowPopup<TViewModel>(Action<TViewModel> onPresenting) where TViewMo
 	}
 
 	/// <summary>
-	/// Ensures that the BindingContext property of the Popup to present is either not set (in which case we will assign an instance through the magic of DI),
-	/// or is of the expected type.
+	/// Ensures that the BindingContext property of the Popup to present is properly assigned and of the expected type.
 	/// </summary>
 	/// <typeparam name="TViewModel"></typeparam>
 	/// <param name="popup">The popup to be presented.</param>
-	/// <param name="getViewModelInstance">Provides the instance of the view model ready to assign.</param>
+	/// <param name="bindingContext">Validated View Model</param>
 	/// <exception cref="InvalidOperationException"></exception>
-	static TViewModel AssignBindingContext<TViewModel>(Popup popup, Func<TViewModel> getViewModelInstance)
+	static void ValidateBindingContext<TViewModel>(Popup popup, out TViewModel bindingContext)
 	{
-		if (popup.BindingContext is null)
+		if (popup.BindingContext is not TViewModel viewModel)
 		{
-			var viewModel = getViewModelInstance.Invoke();
-			
-			popup.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"}");
 		}
 
-		if (popup.BindingContext is not TViewModel assignedViewModel)
-		{
-			throw new InvalidOperationException($"Unexpected type has been assigned to the BindingContext of {popup.GetType()}. Expected type {typeof(TViewModel)} but was {popup.BindingContext?.GetType()}");
-		}
-
-		return assignedViewModel;
+		bindingContext = viewModel;
 	}
 
 	Popup GetPopup(Type viewModelType)
 	{
-		var popup = this.serviceProvider.GetService(viewModelToViewMappings[viewModelType]) as Popup;
-
+		var popup = serviceProvider.GetService(viewModelToViewMappings[viewModelType]) as Popup;
+		
 		if (popup is null)
 		{
 			throw new InvalidOperationException(
@@ -144,17 +146,4 @@ Popup GetPopup(Type viewModelType)
 
 		return popup;
 	}
-
-	TViewModel GetViewModel<TViewModel>()
-	{
-		var viewModel = this.serviceProvider.GetService<TViewModel>();
-
-		if (viewModel is null)
-		{
-			throw new InvalidOperationException(
-				$"Unable to resolve type {typeof(TViewModel)} please make sure that you have called {nameof(AddTransientPopup)}");
-		}
-
-		return viewModel;
-	}
 }

From 5276255592959fd7cddcda9e5bc46d3d80425908 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:13:58 -0700
Subject: [PATCH 17/17] Update Unit Tests

---
 .../BaseHandlerTest.cs                        |  14 +-
 .../PopupServiceTests.cs                      | 221 ++++++++----------
 2 files changed, 106 insertions(+), 129 deletions(-)

diff --git a/src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs b/src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs
index d997543776..4dbf242893 100644
--- a/src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs
@@ -6,8 +6,11 @@ public abstract class BaseHandlerTest : BaseTest
 {
 	protected BaseHandlerTest()
 	{
-		CreateAndSetMockApplication();
+		CreateAndSetMockApplication(out var serviceProvider);
+		ServiceProvider = serviceProvider;
 	}
+	
+	protected IServiceProvider ServiceProvider { get; } 
 
 	protected static TElementHandler CreateElementHandler<TElementHandler>(Microsoft.Maui.IElement view, bool hasMauiContext = true)
 		where TElementHandler : IElementHandler, new()
@@ -17,7 +20,7 @@ protected static TElementHandler CreateElementHandler<TElementHandler>(Microsoft
 
 		if (hasMauiContext)
 		{
-			mockElementHandler.SetMauiContext(Application.Current?.Handler.MauiContext ?? throw new NullReferenceException());
+			mockElementHandler.SetMauiContext(Application.Current?.Handler?.MauiContext ?? throw new NullReferenceException());
 		}
 
 		return mockElementHandler;
@@ -31,20 +34,23 @@ protected static TViewHandler CreateViewHandler<TViewHandler>(IView view, bool h
 
 		if (hasMauiContext)
 		{
-			mockViewHandler.SetMauiContext(Application.Current?.Handler.MauiContext ?? throw new NullReferenceException());
+			mockViewHandler.SetMauiContext(Application.Current?.Handler?.MauiContext ?? throw new NullReferenceException());
 		}
 
 		return mockViewHandler;
 	}
 
-	static void CreateAndSetMockApplication()
+	static void CreateAndSetMockApplication(out IServiceProvider serviceProvider)
 	{
 		var appBuilder = MauiApp.CreateBuilder()
 								.UseMauiCommunityToolkit()
 								.UseMauiApp<MockApplication>();
 
 		var mauiApp = appBuilder.Build();
+
 		var application = mauiApp.Services.GetRequiredService<IApplication>();
+		serviceProvider = mauiApp.Services;
+		
 		application.Handler = new ApplicationHandlerStub();
 		application.Handler.SetMauiContext(new HandlersContextStub(mauiApp.Services));
 	}
diff --git a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
index c1b041d832..a3afd3c746 100644
--- a/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/PopupServiceTests.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.UnitTests.Mocks;
 using CommunityToolkit.Maui.Views;
 using Xunit;
@@ -7,11 +8,11 @@ namespace CommunityToolkit.Maui.UnitTests;
 
 public class PopupServiceTests : BaseHandlerTest
 {
-	public PopupServiceTests() : base()
+	public PopupServiceTests()
 	{
 		var appBuilder = MauiApp.CreateBuilder()
-								.UseMauiCommunityToolkit()
-								.UseMauiApp<MockApplication>();
+			.UseMauiCommunityToolkit()
+			.UseMauiApp<MockApplication>();
 
 		var mauiApp = appBuilder.Build();
 		var application = mauiApp.Services.GetRequiredService<IApplication>();
@@ -26,94 +27,93 @@ static PopupServiceTests()
 	}
 
 	[Fact]
-	public static void ShowPopupAsyncWithNullViewModelShouldThrowArgumentNullException()
+	public void ShowPopupAsyncWithNullViewModelShouldThrowArgumentNullException()
 	{
 		var popupService = new PopupService(new MockServiceProvider());
 
 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.ThrowsAsync<ArgumentNullException>(() => popupService.ShowPopupAsync<INotifyPropertyChanged>(viewModel: null));
+		Assert.ThrowsAsync<ArgumentNullException>(() =>
+			popupService.ShowPopupAsync<INotifyPropertyChanged>(viewModel: null));
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
 	[Fact]
-	public static void ShowPopupAsyncWithNullOnPresentingShouldThrowArgumentNullException()
+	public void ShowPopupAsyncWithNullOnPresentingShouldThrowArgumentNullException()
 	{
 		var popupService = new PopupService(new MockServiceProvider());
 
 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.ThrowsAsync<ArgumentNullException>(() => popupService.ShowPopupAsync<INotifyPropertyChanged>(onPresenting: null));
+		Assert.ThrowsAsync<ArgumentNullException>(() =>
+			popupService.ShowPopupAsync<INotifyPropertyChanged>(onPresenting: null));
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
 	[Fact]
-	public static void ShowPopupAsyncWithMismatchedViewModelTypeShouldThrowInvalidOperationException()
+	public void ShowPopupAsyncWithMismatchedViewModelTypeShouldThrowInvalidOperationException()
 	{
 		var popupService = new PopupService(new MockServiceProvider());
 
 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
-		Assert.ThrowsAsync<ArgumentNullException>(() => popupService.ShowPopupAsync<INotifyPropertyChanged>(viewModel: null));
+		Assert.ThrowsAsync<ArgumentNullException>(() =>
+			popupService.ShowPopupAsync<INotifyPropertyChanged>(viewModel: null));
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 	}
 
-	[Fact]
-	public static void ShowPopupAsyncShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
+	[Fact(Timeout = 2000)]
+	public void ShowPopupAsyncShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
 	{
 		var popupInstance = new MockMismatchedPopup();
 		var popupViewModel = new MockPageViewModel();
 
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
+		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
 		Assert.ThrowsAsync<InvalidOperationException>(popupService.ShowPopupAsync<MockPageViewModel>);
 	}
 
-	[Fact]
-	public void ShowPopupAsyncShouldCreateAndAssignBindingContext()
-	{
-		var popupInstance = new MockPopup();
-		var popupViewModel = new MockPageViewModel();
-
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
-
-		_ = popupService.ShowPopupAsync<MockPageViewModel>();
-
-		Assert.Same(popupInstance.BindingContext, popupViewModel);
-	}
-
-	[Fact]
-	public void ShowPopupAsyncShouldAssignPassedInViewModelToBindingContext()
+	[Fact(Timeout = 2000)]
+	public async Task ShowPopupAsyncShouldValidateProperBindingContext()
 	{
-		var popupInstance = new MockPopup();
 		var popupViewModel = new MockPageViewModel();
+		var popupInstance = new MockSelfClosingPopup(string.Empty)
+		{
+			BindingContext = popupViewModel
+		};
 
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
+		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
-		_ = popupService.ShowPopupAsync(popupViewModel);
+		await popupService.ShowPopupAsync<MockPageViewModel>();
 
 		Assert.Same(popupInstance.BindingContext, popupViewModel);
 	}
 
-	[Fact]
-	public void ShowPopupAsyncWithOnPresentingShouldBeInvoked()
+	[Fact(Timeout = 2000)]
+	public async Task ShowPopupAsyncWithOnPresentingShouldBeInvoked()
 	{
-		var popupInstance = new MockPopup();
 		var popupViewModel = new MockPageViewModel();
+		var popupInstance = new MockSelfClosingPopup(string.Empty)
+		{
+			BindingContext = popupViewModel
+		};
 
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
+		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
-		_ = popupService.ShowPopupAsync<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true);
+		await popupService.ShowPopupAsync<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true);
 
 		Assert.True(popupViewModel.HasLoaded);
 	}
 
-	[Fact]
+	[Fact(Timeout = 2000)]
 	public async Task ShowPopupAsyncShouldReturnResultOnceClosed()
 	{
 		var expectedResult = new object();
 
-		var popupInstance = new MockSelfClosingPopup(expectedResult);
 		var popupViewModel = new MockPageViewModel();
+		var popupInstance = new MockSelfClosingPopup(expectedResult)
+		{
+			BindingContext = popupViewModel
+		};
 
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
+		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
 		var result = await popupService.ShowPopupAsync<MockPageViewModel>();
 
@@ -121,7 +121,7 @@ public async Task ShowPopupAsyncShouldReturnResultOnceClosed()
 	}
 
 	[Fact]
-	public static void ShowPopupWithNullViewModelShouldThrowArgumentNullException()
+	public void ShowPopupWithNullViewModelShouldThrowArgumentNullException()
 	{
 		var popupService = new PopupService(new MockServiceProvider());
 
@@ -131,7 +131,7 @@ public static void ShowPopupWithNullViewModelShouldThrowArgumentNullException()
 	}
 
 	[Fact]
-	public static void ShowPopupWithNullOnPresentingShouldThrowArgumentNullException()
+	public void ShowPopupWithNullOnPresentingShouldThrowArgumentNullException()
 	{
 		var popupService = new PopupService(new MockServiceProvider());
 
@@ -141,7 +141,7 @@ public static void ShowPopupWithNullOnPresentingShouldThrowArgumentNullException
 	}
 
 	[Fact]
-	public static void ShowPopupWithMismatchedViewModelTypeShouldThrowInvalidOperationException()
+	public void ShowPopupWithMismatchedViewModelTypeShouldThrowInvalidOperationException()
 	{
 		var popupService = new PopupService(new MockServiceProvider());
 
@@ -151,60 +151,38 @@ public static void ShowPopupWithMismatchedViewModelTypeShouldThrowInvalidOperati
 	}
 
 	[Fact]
-	public static void ShowPopupShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
+	public void ShowPopupShouldThrowInvalidOperationExceptionWhenNoViewModelIsRegistered()
 	{
 		var popupInstance = new MockMismatchedPopup();
 		var popupViewModel = new MockPageViewModel();
 
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
+		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
 		Assert.Throws<InvalidOperationException>(popupService.ShowPopup<MockPageViewModel>);
 	}
 
-	[Fact]
-	public void ShowPopupShouldCreateAndAssignBindingContext()
-	{
-		var popupInstance = new MockPopup();
-		var popupViewModel = new MockPageViewModel();
-
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
-
-		popupService.ShowPopup<MockPageViewModel>();
-
-		Assert.Same(popupInstance.BindingContext, popupViewModel);
-	}
-
-	[Fact]
-	public void ShowPopupShouldAssignPassedInViewModelToBindingContext()
-	{
-		var popupInstance = new MockPopup();
-		var popupViewModel = new MockPageViewModel();
-
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
-
-		popupService.ShowPopup(popupViewModel);
-
-		Assert.Same(popupInstance.BindingContext, popupViewModel);
-	}
-
 	[Fact]
 	public void ShowPopupWithOnPresentingShouldBeInvoked()
 	{
-		var popupInstance = new MockPopup();
 		var popupViewModel = new MockPageViewModel();
+		var popupInstance = new MockPopup
+		{
+			BindingContext = popupViewModel
+		};
 
-		var popupService = SetupTest(popupInstance, () => popupViewModel);
+		SetupTest(popupInstance, () => popupViewModel, out var popupService);
 
 		popupService.ShowPopup<MockPageViewModel>(onPresenting: viewModel => viewModel.HasLoaded = true);
 
 		Assert.True(popupViewModel.HasLoaded);
 	}
 
-	static PopupService SetupTest(
+	static void SetupTest(
 		Popup popup,
-		Func<INotifyPropertyChanged> createViewModelInstance)
+		Func<INotifyPropertyChanged> createViewModelInstance,
+		out IPopupService popupService)
 	{
-		var popupService = new PopupService(
+		popupService = new PopupService(
 			MockServiceProvider.ThatProvides(
 				(implementation: popup, forType: typeof(MockPopup)),
 				(implementation: createViewModelInstance.Invoke(), forType: typeof(MockPageViewModel))));
@@ -224,82 +202,75 @@ static PopupService SetupTest(
 
 		app.MainPage = page;
 
-		_ = CreateElementHandler<MockPopupHandler>(popup);
+		CreateElementHandler<MockPopupHandler>(popup);
 
 		Assert.NotNull(popup.Handler);
 		Assert.NotNull(page.Handler);
-
-		return popupService;
 	}
-}
 
-public class MockServiceProvider : IServiceProvider
-{
-	readonly IDictionary<Type, object> registrations;
-
-	public MockServiceProvider()
+	class MockServiceProvider : IServiceProvider
 	{
-		registrations = new Dictionary<Type, object>();
-	}
+		readonly IDictionary<Type, object> registrations = new Dictionary<Type, object>();
 
-	public MockServiceProvider(params (object implementation, Type forType)[] registrations) : this()
-	{
-		foreach (var (implementation, forType) in registrations)
+		public MockServiceProvider()
 		{
-			this.registrations.Add(forType, implementation);
 		}
-	}
 
-	public static MockServiceProvider ThatProvides(params (object implementation, Type forType)[] registrations)
-	{
-		return new MockServiceProvider(registrations);
-	}
-
-	public object? GetService(Type serviceType)
-	{
-		if (this.registrations.TryGetValue(serviceType, out var registeredImplementation))
+		MockServiceProvider(params (object implementation, Type forType)[] registrations) : this()
 		{
-			return registeredImplementation;
+			foreach (var (implementation, forType) in registrations)
+			{
+				this.registrations.Add(forType, implementation);
+			}
 		}
 
-		return null;
-	}
-}
+		public static MockServiceProvider ThatProvides(params (object implementation, Type forType)[] registrations)
+		{
+			return new MockServiceProvider(registrations);
+		}
 
-public class MockPopup : Popup
-{
-	public MockPopup()
-	{
+		public object? GetService(Type serviceType)
+		{
+			if (registrations.TryGetValue(serviceType, out var registeredImplementation))
+			{
+				return registeredImplementation;
+			}
 
+			return null;
+		}
 	}
-}
-
-public class MockSelfClosingPopup : Popup
-{
-	readonly object result;
 
-	public MockSelfClosingPopup(object result)
+	class MockPopup : Popup
 	{
-		this.result = result;
+		public MockPopup()
+		{
+		}
 	}
 
-	internal override void OnOpened()
+	class MockSelfClosingPopup : Popup
 	{
-		base.OnOpened();
+		readonly object result;
 
-		Task.Run(async () =>
+		public MockSelfClosingPopup(object result)
 		{
-			await Task.Delay(1000);
+			this.result = result;
+		}
+
+		internal override async void OnOpened()
+		{
+			base.OnOpened();
+
+			await Task.Delay(TimeSpan.FromSeconds(1));
 
-			this.Close(this.result);
-		});
+			Close(result);
+		}
 	}
-}
 
-public class MockMismatchedPopup : Popup
-{
-	public MockMismatchedPopup()
+	class MockMismatchedPopup : Popup
 	{
-		BindingContext = new object();
+		public MockMismatchedPopup()
+		{
+			BindingContext = new object();
+		}
 	}
-}
+}
\ No newline at end of file