Revert "Add GestureRecognizer to Prevent Popup from closing when tapped inside"

This reverts commit d17876e.

Author: TheCodeTraveler

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

@@ -435,7 +435,7 @@ public void ShowPopupAsync_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)navigation.ModalStack[0];
 		var popupPageContent = popupPage.Content;
-		var border = popupPageContent.Border;
+		var border = (Border)popupPageContent.Children[0];
 		var popup = border.Content;
 
 		// Assert
@@ -507,7 +507,7 @@ public void ShowPopupAsync_Shell_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)shellNavigation.ModalStack[0];
 		var popupPageContent = popupPage.Content;
-		var border = popupPageContent.Border;
+		var border = (Border)popupPageContent.Children[0];
 		var popup = border.Content;
 
 		// Assert
@@ -579,7 +579,7 @@ public void ShowPopupAsyncWithView_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)navigation.ModalStack[0];
 		var popupPageContent = popupPage.Content;
-		var border = popupPageContent.Border;
+		var border = (Border)popupPageContent.Children[0];
 		var popup = (Popup)(border.Content ?? throw new InvalidCastException());
 
 		// Assert
@@ -660,7 +660,7 @@ public void ShowPopupAsyncWithView_Shell_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)shellNavigation.ModalStack[0];
 		var popupPageContent = popupPage.Content;
-		var border = popupPageContent.Border;
+		var border = (Border)popupPageContent.Children[0];
 		var popup = (Popup)(border.Content ?? throw new InvalidCastException());
 
 		// Assert

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

@@ -166,7 +166,7 @@ public void ShowPopupAsync_WithCustomOptions_AppliesOptions()
 
 		var popupPage = (PopupPage)navigation.ModalStack[0];
 		var popupPageLayout = popupPage.Content;
-		var border = popupPageLayout.Border;
+		var border = (Border)popupPageLayout.Children[0];
 		var popup = border.Content;
 
 		// Assert

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

@@ -472,7 +472,7 @@ public void PopupPage_ShouldRespectLayoutOptions()
 
 		// Act
 		var popupPage = new PopupPage(view, PopupOptions.Empty);
-		var border = popupPage.Content.Border;
+		var border = (Border)popupPage.Content.Children[0];
 
 		// Assert
 		Assert.Equal(LayoutOptions.Start, border.VerticalOptions);

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

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Globalization;
+using System.Windows.Input;
 using CommunityToolkit.Maui.Converters;
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Extensions;
@@ -41,16 +42,14 @@ public PopupPage(Popup popup, IPopupOptions popupOptions)
 		this.popup = popup;
 		this.popupOptions = 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 = new Command(async () =>
 		{
 			popupOptions.OnTappingOutsideOfPopup?.Invoke();
 			await CloseAsync(new PopupResult(true));
 		}, () => popupOptions.CanBeDismissedByTappingOutsideOfPopup);
-
-		Content.GestureRecognizers.Add(new TapGestureRecognizer { Command = tapOutsideOfPopupCommand });
+		
+		// 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);
 
 		if (popupOptions is BindableObject bindablePopupOptions)
 		{
@@ -104,15 +103,15 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 
 		popupClosedEventManager.HandleEvent(this, result, nameof(PopupClosed));
 	}
-
+	
 	protected override bool OnBackButtonPressed()
 	{
 		// Only close the Popup if PopupOptions.CanBeDismissedByTappingOutsideOfPopup is true
 		if (popupOptions.CanBeDismissedByTappingOutsideOfPopup)
 		{
 			CloseAsync(new PopupResult(true), CancellationToken.None).SafeFireAndForget();
 		}
-
+		
 		// Always return true to let the Android Operating System know that we are manually handling the Navigation request from the Android Back Button
 		return true;
 	}
@@ -176,36 +175,42 @@ void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query)
 
 	internal sealed partial class PopupPageLayout : Grid
 	{
-		public PopupPageLayout(in Popup popupContent, in IPopupOptions options)
+		public PopupPageLayout(in Popup popupContent, in IPopupOptions options, ICommand tapOutsideOfPopupCommand)
 		{
 			Background = BackgroundColor = null;
 
-			Border = new Border
+			var border = new Border
 			{
 				BackgroundColor = popupContent.BackgroundColor ??= PopupDefaults.BackgroundColor,
 				Content = popupContent
 			};
-			Border.GestureRecognizers.Add(new TapGestureRecognizer()); // Blocks `tapOutsideOfPopupCommand` from closing the Popup when the content is tapped
+			
+			var backgroundGrid = new BoxView
+			{
+				BackgroundColor = Colors.Transparent,
+			};
+			
+			backgroundGrid.GestureRecognizers.Add(new TapGestureRecognizer { Command = tapOutsideOfPopupCommand });
+			
+			Children.Add(backgroundGrid);
 
 			// Bind `Popup` values through to Border using OneWay Bindings 
-			Border.SetBinding(Border.MarginProperty, static (Popup popup) => popup.Margin, source: popupContent, mode: BindingMode.OneWay);
-			Border.SetBinding(Border.PaddingProperty, static (Popup popup) => popup.Padding, source: popupContent, mode: BindingMode.OneWay);
-			Border.SetBinding(Border.BackgroundProperty, static (Popup popup) => popup.Background, source: popupContent, mode: BindingMode.OneWay);
-			Border.SetBinding(Border.BackgroundColorProperty, static (Popup popup) => popup.BackgroundColor, source: popupContent, mode: BindingMode.OneWay);
-			Border.SetBinding(Border.VerticalOptionsProperty, static (Popup popup) => popup.VerticalOptions, source: popupContent, mode: BindingMode.OneWay);
-			Border.SetBinding(Border.HorizontalOptionsProperty, static (Popup popup) => popup.HorizontalOptions, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.MarginProperty, static (Popup popup) => popup.Margin, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.PaddingProperty, static (Popup popup) => popup.Padding, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.BackgroundProperty, static (Popup popup) => popup.Background, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.BackgroundColorProperty, static (Popup popup) => popup.BackgroundColor, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.VerticalOptionsProperty, static (Popup popup) => popup.VerticalOptions, source: popupContent, mode: BindingMode.OneWay);
+			border.SetBinding(Border.HorizontalOptionsProperty, static (Popup popup) => popup.HorizontalOptions, source: popupContent, mode: BindingMode.OneWay);
 
 			// Bind `PopupOptions` values through to Border using OneWay Bindings
-			Border.SetBinding(Border.ShadowProperty, static (IPopupOptions options) => options.Shadow, source: options, mode: BindingMode.OneWay);
-			Border.SetBinding(Border.StrokeProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeConverter(), mode: BindingMode.OneWay);
-			Border.SetBinding(Border.StrokeShapeProperty, static (IPopupOptions options) => options.Shape, source: options, mode: BindingMode.OneWay);
-			Border.SetBinding(Border.StrokeThicknessProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeThicknessConverter(), mode: BindingMode.OneWay);
+			border.SetBinding(Border.ShadowProperty, static (IPopupOptions options) => options.Shadow, source: options, mode: BindingMode.OneWay);
+			border.SetBinding(Border.StrokeProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeConverter(), mode: BindingMode.OneWay);
+			border.SetBinding(Border.StrokeShapeProperty, static (IPopupOptions options) => options.Shape, source: options, mode: BindingMode.OneWay);
+			border.SetBinding(Border.StrokeThicknessProperty, static (IPopupOptions options) => options.Shape, source: options, converter: new BorderStrokeThicknessConverter(), mode: BindingMode.OneWay);
 
-			Children.Add(Border);
+			Children.Add(border);
 		}
 
-		public Border Border { get; }
-
 		sealed partial class BorderStrokeThicknessConverter : BaseConverterOneWay<Shape?, double>
 		{
 			public override double DefaultConvertReturnValue { get; set; } = PopupOptionsDefaults.BorderStrokeThickness;