Merge branch 'main' into FixSnackbarRegistration

Author: ne0rrmatrix

src/CommunityToolkit.Maui.UnitTests/BaseHandlerTest.cs

@@ -81,7 +81,9 @@ static void InitializeServicesAndSetMockApplication(out IServiceProvider service
 		var mockPopup = new MockSelfClosingPopup(mockPageViewModel, new());
 
 		PopupService.AddPopup(mockPopup, mockPageViewModel, appBuilder.Services, ServiceLifetime.Transient);
+
 		appBuilder.Services.AddTransientPopup<MockPopup>();
+		appBuilder.Services.AddTransient<GarbageCollectionHeavySelfClosingPopup>();
 		#endregion
 
 		var mauiApp = appBuilder.Build();

src/CommunityToolkit.Maui.UnitTests/Extensions/PopupExtensionsTests.cs

@@ -946,6 +946,21 @@ public async Task ShowPopupAsyncWithView_Shell_ShouldValidateProperBindingContex
 		Assert.Equal(shellParameterViewModelTextValue, view.BindingContext.Text);
 	}
 
+	[Fact(Timeout = (int)TestDuration.Medium)]
+	public async Task ShowPopupAsync_ShouldSuccessfullyCompleteAndReturnResultUnderHeavyGarbageCollection()
+	{
+		// Arrange
+		var mockPopup = ServiceProvider.GetRequiredService<GarbageCollectionHeavySelfClosingPopup>();
+		var selfClosingPopup = ServiceProvider.GetRequiredService<GarbageCollectionHeavySelfClosingPopup>() ?? throw new InvalidOperationException();
+
+		// Act
+		var result = await navigation.ShowPopupAsync<object?>(selfClosingPopup, PopupOptions.Empty, TestContext.Current.CancellationToken);
+
+		// Assert
+		Assert.Same(mockPopup.Result, result.Result);
+		Assert.False(result.WasDismissedByTappingOutsideOfPopup);
+	}
+
 	[Fact(Timeout = (int)TestDuration.Medium)]
 	public async Task ShowPopupAsync_ShouldReturnResultOnceClosed()
 	{
@@ -1430,7 +1445,7 @@ public async Task ClosePopupAsyncT_ShouldClosePopupUsingPageAndReturnResult()
 		Assert.Equal(expectedResult, popupResult.Result);
 		Assert.False(popupResult.WasDismissedByTappingOutsideOfPopup);
 	}
-	
+
 	[Fact(Timeout = (int)TestDuration.Short)]
 	public async Task ShowPopupAsync_TaskShouldCompleteWhenCloseAsyncIsCalled()
 	{
@@ -1460,7 +1475,7 @@ public async Task ShowPopupAsync_TaskShouldCompleteWhenCloseAsyncIsCalled()
 		Assert.False(popupResult.WasDismissedByTappingOutsideOfPopup);
 	}
 
-	static TapGestureRecognizer GetTapOutsideGestureRecognizer(PopupPage popupPage) => 
+	static TapGestureRecognizer GetTapOutsideGestureRecognizer(PopupPage popupPage) =>
 		(TapGestureRecognizer)popupPage.Content.Children.OfType<BoxView>().Single().GestureRecognizers[0];
 }
 

src/CommunityToolkit.Maui.UnitTests/Services/PopupServiceTests.cs

@@ -522,7 +522,9 @@ public async Task ClosePopupAsyncT_ShouldClosePopupUsingPageAndReturnResult()
 	}
 }
 
-sealed class MockSelfClosingPopup : Popup<object?>, IQueryAttributable
+class GarbageCollectionHeavySelfClosingPopup(MockPageViewModel viewModel, object? result = null) : MockSelfClosingPopup(viewModel, result);
+
+class MockSelfClosingPopup : Popup<object?>, IQueryAttributable
 {
 	public const int ExpectedResult = 2;
 
@@ -548,7 +550,9 @@ async void HandleTick(object? sender, EventArgs e)
 			timer.Tick -= HandleTick;
 			try
 			{
+				GC.Collect();
 				await CloseAsync(Result);
+				GC.Collect();
 			}
 			catch (InvalidOperationException)
 			{

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

@@ -1,7 +1,5 @@
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Extensions;
-using CommunityToolkit.Maui.UnitTests.Extensions;
-using CommunityToolkit.Maui.UnitTests.Services;
 using CommunityToolkit.Maui.Views;
 using FluentAssertions;
 using Microsoft.Maui.Controls.PlatformConfiguration;
@@ -219,6 +217,50 @@ public void PopupPageT_Close_ShouldThrowOperationCanceledException_WhenTokenIsCa
 		act.Should().ThrowAsync<OperationCanceledException>();
 	}
 
+	[Fact]
+	public void TapGestureRecognizer_VerifyCanBeDismissedByTappingOutsideOfPopup_ShouldNotExecuteWhenEitherFalse()
+	{
+		// Arrange
+		var view = new Popup();
+		var popupOptions = new PopupOptions();
+
+		// Act
+		var popupPage = new PopupPage(view, popupOptions);
+		var tapGestureRecognizer = popupPage.Content.Children.OfType<BoxView>().Single().GestureRecognizers.OfType<TapGestureRecognizer>().Single();
+
+		// Assert
+		Assert.True(tapGestureRecognizer.Command?.CanExecute(null));
+
+		// Act
+		view.CanBeDismissedByTappingOutsideOfPopup = false;
+		popupOptions.CanBeDismissedByTappingOutsideOfPopup = false;
+
+		// Assert
+		Assert.False(tapGestureRecognizer.Command?.CanExecute(null));
+
+		// Act
+		view.CanBeDismissedByTappingOutsideOfPopup = true;
+		popupOptions.CanBeDismissedByTappingOutsideOfPopup = false;
+
+		// Assert
+		Assert.False(tapGestureRecognizer.Command?.CanExecute(null));
+
+		// Act
+		view.CanBeDismissedByTappingOutsideOfPopup = false;
+		popupOptions.CanBeDismissedByTappingOutsideOfPopup = true;
+
+		// Assert
+		Assert.False(tapGestureRecognizer.Command?.CanExecute(null));
+
+		// Act
+		view.CanBeDismissedByTappingOutsideOfPopup = true;
+		popupOptions.CanBeDismissedByTappingOutsideOfPopup = true;
+
+		// Assert
+		Assert.True(tapGestureRecognizer.Command?.CanExecute(null));
+
+	}
+
 	[Fact]
 	public void Constructor_WithViewAndPopupOptions_SetsCorrectProperties()
 	{
@@ -487,8 +529,8 @@ public void PopupPage_ShouldRespectLayoutOptions()
 		Assert.Equal(LayoutOptions.Start, border.VerticalOptions);
 		Assert.Equal(LayoutOptions.End, border.HorizontalOptions);
 	}
-	
-	static TapGestureRecognizer GetTapOutsideGestureRecognizer(PopupPage popupPage) => 
+
+	static TapGestureRecognizer GetTapOutsideGestureRecognizer(PopupPage popupPage) =>
 		(TapGestureRecognizer)popupPage.Content.Children.OfType<BoxView>().Single().GestureRecognizers[0];
 
 	// Helper class for testing protected methods

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

@@ -15,6 +15,13 @@ public void PopupBackgroundColor_DefaultValue_ShouldBeWhite()
 		Assert.Equal(PopupDefaults.BackgroundColor, Colors.White);
 	}
 
+	[Fact]
+	public void CanBeDismissedByTappingOutsideOfPopup_DefaultValue_ShouldBeTrue()
+	{
+		var popup = new Popup();
+		Assert.Equal(PopupDefaults.CanBeDismissedByTappingOutsideOfPopup, popup.CanBeDismissedByTappingOutsideOfPopup);
+	}
+
 	[Fact]
 	public void Margin_DefaultValue_ShouldBeDefaultThickness()
 	{
@@ -151,7 +158,7 @@ public async Task PopupT_Close_ShouldNotThrowExceptionWhenCloseIsOverridden()
 		await popup.CloseAsync(TestContext.Current.CancellationToken);
 		await popup.CloseAsync("Hello", TestContext.Current.CancellationToken);
 	}
-	
+
 	[Fact(Timeout = (int)TestDuration.Short)]
 	public async Task ShowPopupAsync_TaskShouldCompleteWhenPopupCloseAsyncIsCalled()
 	{

src/CommunityToolkit.Maui/Primitives/Defaults/PopupDefaults.shared.cs

@@ -31,4 +31,9 @@ static class PopupDefaults
 	/// Default value for <see cref="VisualElement.BackgroundColor"/> BackgroundColor 
 	/// </summary>
 	public static Color BackgroundColor { get; } = Colors.White;
+
+	/// <summary>
+	/// Default value for <see cref="Popup.CanBeDismissedByTappingOutsideOfPopup"/>
+	/// </summary>
+	public const bool CanBeDismissedByTappingOutsideOfPopup = PopupOptionsDefaults.CanBeDismissedByTappingOutsideOfPopup;
 }

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

@@ -27,6 +27,11 @@ public partial class Popup : ContentView
 	/// </summary>
 	public static new readonly BindableProperty VerticalOptionsProperty = View.VerticalOptionsProperty;
 
+	/// <summary>
+	///  Backing BindableProperty for the <see cref="CanBeDismissedByTappingOutsideOfPopup"/> property.
+	/// </summary>
+	public static readonly BindableProperty CanBeDismissedByTappingOutsideOfPopupProperty = BindableProperty.Create(nameof(CanBeDismissedByTappingOutsideOfPopup), typeof(bool), typeof(Popup), PopupDefaults.CanBeDismissedByTappingOutsideOfPopup);
+
 	/// <summary>
 	/// Initializes Popup
 	/// </summary>
@@ -84,6 +89,17 @@ public Popup()
 		set => base.VerticalOptions = value;
 	}
 
+	/// <inheritdoc cref="IPopupOptions.CanBeDismissedByTappingOutsideOfPopup"/> />
+	/// <remarks>
+	/// When true and the user taps outside the popup, it will dismiss.
+	/// On Android - when false the hardware back button is disabled.
+	/// </remarks>
+	public bool CanBeDismissedByTappingOutsideOfPopup
+	{
+		get => (bool)GetValue(CanBeDismissedByTappingOutsideOfPopupProperty);
+		set => SetValue(CanBeDismissedByTappingOutsideOfPopupProperty, value);
+	}
+
 	/// <summary>
 	/// Close the Popup.
 	/// </summary>

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

@@ -26,7 +26,6 @@ partial class PopupPage : ContentPage, IQueryAttributable
 	readonly Popup popup;
 	readonly IPopupOptions popupOptions;
 	readonly Command tapOutsideOfPopupCommand;
-	readonly WeakEventManager popupClosedEventManager = new();
 
 	public PopupPage(View view, IPopupOptions popupOptions)
 		: this(view as Popup ?? CreatePopupFromView<Popup>(view), popupOptions)
@@ -46,14 +45,15 @@ public PopupPage(Popup popup, IPopupOptions popupOptions)
 		{
 			popupOptions.OnTappingOutsideOfPopup?.Invoke();
 			await CloseAsync(new PopupResult(true));
-		}, () => popupOptions.CanBeDismissedByTappingOutsideOfPopup);
+		}, () => GetCanBeDismissedByTappingOutsideOfPopup(popup, popupOptions));
 
 		// Only set the content if the parent constructor hasn't set the content already; don't override content if it already exists
 		base.Content = new PopupPageLayout(popup, popupOptions, tapOutsideOfPopupCommand);
 
+		popup.PropertyChanged += HandlePopupPropertyChanged;
 		if (popupOptions is BindableObject bindablePopupOptions)
 		{
-			bindablePopupOptions.PropertyChanged += HandlePopupPropertyChanged;
+			bindablePopupOptions.PropertyChanged += HandlePopupOptionsPropertyChanged;
 		}
 
 		this.SetBinding(BindingContextProperty, static (Popup x) => x.BindingContext, source: popup, mode: BindingMode.OneWay);
@@ -63,11 +63,7 @@ public PopupPage(Popup popup, IPopupOptions popupOptions)
 		On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.OverFullScreen);
 	}
 
-	public event EventHandler<IPopupResult> PopupClosed
-	{
-		add => popupClosedEventManager.AddEventHandler(value);
-		remove => popupClosedEventManager.RemoveEventHandler(value);
-	}
+	public event EventHandler<IPopupResult>? PopupClosed;
 
 	// Prevent Content from being set by external class
 	// Casts `PopupPage.Content` to return typeof(PopupPageLayout)
@@ -101,13 +97,13 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 		token.ThrowIfCancellationRequested();
 		await Navigation.PopModalAsync(false).WaitAsync(token);
 
-		popupClosedEventManager.HandleEvent(this, result, nameof(PopupClosed));
+		PopupClosed?.Invoke(this, result);
 	}
 
 	protected override bool OnBackButtonPressed()
 	{
-		// Only close the Popup if PopupOptions.CanBeDismissedByTappingOutsideOfPopup is true
-		if (popupOptions.CanBeDismissedByTappingOutsideOfPopup)
+		// Only close the Popup if CanBeDismissedByTappingOutsideOfPopup is true
+		if (GetCanBeDismissedByTappingOutsideOfPopup(popup, popupOptions))
 		{
 			CloseAsync(new PopupResult(true), CancellationToken.None).SafeFireAndForget();
 		}
@@ -152,14 +148,26 @@ protected override void OnNavigatedTo(NavigatedToEventArgs args)
 		return popup;
 	}
 
-	void HandlePopupPropertyChanged(object? sender, PropertyChangedEventArgs e)
+	// Only dismiss when a user taps outside Popup when **both** Popup.CanBeDismissedByTappingOutsideOfPopup and PopupOptions.CanBeDismissedByTappingOutsideOfPopup are true
+	// If either value is false, do not dismiss Popup
+	static bool GetCanBeDismissedByTappingOutsideOfPopup(in Popup popup, in IPopupOptions popupOptions) => popup.CanBeDismissedByTappingOutsideOfPopup & popupOptions.CanBeDismissedByTappingOutsideOfPopup;
+
+	void HandlePopupOptionsPropertyChanged(object? sender, PropertyChangedEventArgs e)
 	{
 		if (e.PropertyName == nameof(IPopupOptions.CanBeDismissedByTappingOutsideOfPopup))
 		{
 			tapOutsideOfPopupCommand.ChangeCanExecute();
 		}
 	}
 
+	void HandlePopupPropertyChanged(object? sender, PropertyChangedEventArgs e)
+	{
+		if (e.PropertyName == Popup.CanBeDismissedByTappingOutsideOfPopupProperty.PropertyName)
+		{
+			tapOutsideOfPopupCommand.ChangeCanExecute();
+		}
+	}
+
 	void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query)
 	{
 		if (popup is IQueryAttributable popupIQueryAttributable)