Add Popup.CanBeDismissedByTappingOutsideOfPopup

Author: TheCodeTraveler

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,49 @@ public void PopupPageT_Close_ShouldThrowOperationCanceledException_WhenTokenIsCa
 		act.Should().ThrowAsync<OperationCanceledException>();
 	}
 
+	[Fact]
+	public void TapGestureRecognizer_VerifyCanBeDismissedByTappingOutsideOfPopup_ShouldNotExecuteWhenEitherFalse()
+	{
+		// Arrange
+		var view = new Popup
+		{
+			CanBeDismissedByTappingOutsideOfPopup = false
+		};
+		var popupOptions = new PopupOptions
+		{
+			CanBeDismissedByTappingOutsideOfPopup = false
+		};
+
+		// Act
+		var popupPage = new PopupPage(view, popupOptions);
+		var tapGestureRecognizer = popupPage.Content.Children.OfType<BoxView>().Single().GestureRecognizers.OfType<TapGestureRecognizer>().Single();
+
+		// 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()
 	{

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

@@ -26,6 +26,11 @@ public partial class Popup : ContentView
 	/// Bindable property to set the vertical position of the <see cref="Popup"/> when displayed on screen
 	/// </summary>
 	public static new readonly BindableProperty VerticalOptionsProperty = View.VerticalOptionsProperty;
+	
+	/// <summary>
+	///  Backing BindableProperty for the <see cref="CanBeDismissedByTappingOutsideOfPopup"/> property.
+	/// </summary>
+	public static readonly BindableProperty CanBeDismissedByTappingOutsideOfPopupProperty = BindableProperty.Create(nameof(CanBeDismissedByTappingOutsideOfPopup), typeof(bool), typeof(Popup), PopupDefaults.CanBeDismissedByTappingOutsideOfPopup);
 
 	/// <summary>
 	/// Initializes Popup
@@ -83,6 +88,17 @@ public Popup()
 		get => base.VerticalOptions;
 		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.

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

@@ -46,14 +46,15 @@ public PopupPage(Popup popup, IPopupOptions popupOptions)
 		{
 			popupOptions.OnTappingOutsideOfPopup?.Invoke();
 			await CloseAsync(new PopupResult(true));
-		}, () => popupOptions.CanBeDismissedByTappingOutsideOfPopup);
+		}, () => popupOptions.CanBeDismissedByTappingOutsideOfPopup & popup.CanBeDismissedByTappingOutsideOfPopup);
 
 		// 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);
@@ -152,13 +153,21 @@ protected override void OnNavigatedTo(NavigatedToEventArgs args)
 		return popup;
 	}
 
-	void HandlePopupPropertyChanged(object? sender, PropertyChangedEventArgs e)
+	void HandlePopupOptionsPropertyChanged(object? sender, PropertyChangedEventArgs e)
 	{
 		if (e.PropertyName == nameof(IPopupOptions.CanBeDismissedByTappingOutsideOfPopup))
 		{
 			tapOutsideOfPopupCommand.ChangeCanExecute();
 		}
 	}
+	
+	void HandlePopupPropertyChanged(object? sender, PropertyChangedEventArgs e)
+	{
+		if (e.PropertyName == nameof(Popup.CanBeDismissedByTappingOutsideOfPopup))
+		{
+			tapOutsideOfPopupCommand.ChangeCanExecute();
+		}
+	}
 
 	void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query)
 	{