From 52a260c4144f60df9a35b31f0b6b291d1648f2fa Mon Sep 17 00:00:00 2001
From: rxDietel <94047927+rxDietel@users.noreply.github.com>
Date: Thu, 25 Nov 2021 23:13:20 +0100
Subject: [PATCH] [Bug] [Fixed] #1712 (#1713)

---
 .../XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml   | 4 ++--
 .../Views/Popup/UWP/PopupRenderer.uwp.cs                     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
index 8f5dc9523..c0b75b6ba 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
@@ -34,14 +34,14 @@
     <StackLayout Style="{StaticResource PopupLayout}">
         <Label 
             Style="{StaticResource Title}" 
-            Text="Simple Popup" />
+            Text="Simple Popup Without Light Dismiss" />
         <BoxView Style="{StaticResource Divider}" />
         <Label 
             Style="{StaticResource Content}"
             Text="{OnPlatform
                 Android='This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.',
                 iOS='This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.',
-                UWP='UWP Flyouts do not support toggling light dismiss mode. On UWP this will always dismiss the flyout if you tap outside of the control'}" />
+                UWP='UWP Flyouts do not have native support for toggling light dismiss mode. On UWP this will disrupt the closing of the flyout if you tap outside of the control'}" />
         <Button 
             Text="Close"
             VerticalOptions="EndAndExpand"
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
index dbe1e0ac5..76269b85b 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
@@ -111,8 +111,7 @@ void ConfigureControl()
 
 		void SetEvents()
 		{
-			if (Element?.IsLightDismissEnabled is true)
-				Closing += OnClosing;
+			Closing += OnClosing;
 
 			if (Element != null)
 				Element.Dismissed += OnDismissed;
@@ -273,6 +272,8 @@ void OnClosing(object? sender, object e)
 		{
 			if (isOpen && Element?.IsLightDismissEnabled is true)
 				Element.LightDismiss();
+			if (isOpen && e is FlyoutBaseClosingEventArgs args)
+				args.Cancel = true;
 		}
 
 		void OnOpened(object sender, object e) =>