Fixes click/touch behavior when closing views (#29)

Pulselyre · Apr 25, 2024 · 2c55ef1 · 2c55ef1
2 parents a3bb099 + d3c8bd1
commit 2c55ef1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/...ce/UpbeatUI.Extensions.DependencyInjection/UpbeatUI.Extensions.DependencyInjection.csproj b/...ce/UpbeatUI.Extensions.DependencyInjection/UpbeatUI.Extensions.DependencyInjection.csproj
@@ -22,8 +22,8 @@
         <Copyright>© Michael P. Duda 2020-2024</Copyright>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <!-- Update the following properties when publishing a new Nuget version -->
-        <Version>2.0.0</Version>
-        <!-- <PackageValidationBaselineVersion>1.1.5</PackageValidationBaselineVersion> -->
+        <Version>2.1.0</Version>
+        <PackageValidationBaselineVersion>2.0.0</PackageValidationBaselineVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/source/UpbeatUI.Extensions.Hosting/UpbeatUI.Extensions.Hosting.csproj b/source/UpbeatUI.Extensions.Hosting/UpbeatUI.Extensions.Hosting.csproj
@@ -22,8 +22,8 @@
         <Copyright>© Michael P. Duda 2020-2024</Copyright>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <!-- Update the following properties when publishing a new Nuget version -->
-        <Version>4.0.0</Version>
-        <!-- <PackageValidationBaselineVersion>3.1.5</PackageValidationBaselineVersion> -->
+        <Version>4.1.0</Version>
+        <PackageValidationBaselineVersion>4.0.0</PackageValidationBaselineVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/source/UpbeatUI/UpbeatUI.csproj b/source/UpbeatUI/UpbeatUI.csproj
@@ -23,8 +23,8 @@
         <Copyright>© Michael P. Duda 2020-2024</Copyright>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <!-- Update the following properties when publishing a new Nuget version -->
-        <Version>5.0.0</Version>
-        <!-- <PackageValidationBaselineVersion>4.1.5</PackageValidationBaselineVersion> -->
+        <Version>5.1.0</Version>
+        <PackageValidationBaselineVersion>5.0.0</PackageValidationBaselineVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/source/UpbeatUI/View/ModalPanel.cs b/source/UpbeatUI/View/ModalPanel.cs
@@ -58,6 +58,7 @@ public class ModalPanel : Panel
                 typeof(ModalPanel));
 
         private Border _border;
+        private bool _isBorderDown;
         private bool _blockingVisualChange;
 
         /// <summary>
@@ -173,7 +174,9 @@ protected override void OnVisualChildrenChanged(DependencyObject visualAdded, De
                             Focusable = false,
                             IsHitTestVisible = true,
                         };
+                        _border.MouseDown += HandleBorderMouseDown;
                         _border.MouseUp += HandleBorderMouseUp;
+                        _border.TouchDown += HandleBorderTouchDown;
                         _border.TouchUp += HandleBorderTouchUp;
                     }
                     else
@@ -192,7 +195,9 @@ protected override void OnVisualChildrenChanged(DependencyObject visualAdded, De
                     }
                     else if (_border != null)
                     {
+                        _border.MouseDown -= HandleBorderMouseDown;
                         _border.MouseUp -= HandleBorderMouseUp;
+                        _border.TouchDown -= HandleBorderTouchDown;
                         _border.TouchUp -= HandleBorderTouchUp;
                         _border = null;
                     }
@@ -201,16 +206,24 @@ protected override void OnVisualChildrenChanged(DependencyObject visualAdded, De
             }
         }
 
+        private void HandleBorderMouseDown(object sender, MouseButtonEventArgs e) => _isBorderDown = true;
+
+        private void HandleBorderTouchDown(object sender, TouchEventArgs e) => _isBorderDown = true;
+
         private void HandleBorderMouseUp(object sender, RoutedEventArgs e)
         {
-            if (ClosePopupCommand?.CanExecute(null) ?? false)
+            if (_isBorderDown)
             {
-                ClosePopupCommand.Execute(null);
-            }
-            else
-            {
-                RaiseEvent(new RoutedEventArgs(RequestPopupCloseEvent));
+                if (ClosePopupCommand?.CanExecute(null) ?? false)
+                {
+                    ClosePopupCommand.Execute(null);
+                }
+                else
+                {
+                    RaiseEvent(new RoutedEventArgs(RequestPopupCloseEvent));
+                }
             }
+            _isBorderDown = false;
         }
 
         private void HandleBorderTouchUp(object sender, TouchEventArgs e)