fix(dragging): when a child and a parent subscribe to dragging, only …

…fire on the child
unoplatform · Nov 14, 2024 · ccea9af · ccea9af
1 parent 453d1fe
commit ccea9af
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/src/Uno.UI/UI/Input/GestureRecognizer.Manipulation.cs b/src/Uno.UI/UI/Input/GestureRecognizer.Manipulation.cs
@@ -594,6 +594,19 @@ private bool IsBeginningOfDragManipulation()
 				}
 			}
 
+			public void DisableDragging()
+			{
+				StopDragTimer();
+				if (_state is ManipulationState.Starting)
+				{
+					_isDraggingEnable = false;
+				}
+				else if (_state is ManipulationState.Started && IsDragManipulation)
+				{
+					Complete();
+				}
+			}
+
 			private bool ShouldStartInertia(ManipulationVelocities velocities)
 				=> _inertia is null
 					&& !IsDragManipulation

diff --git a/src/Uno.UI/UI/Input/GestureRecognizer.cs b/src/Uno.UI/UI/Input/GestureRecognizer.cs
@@ -192,16 +192,19 @@ public void CompleteGesture()
 		}
 
 		/// <returns>The set of events that can be raised by this recognizer for this pointer ID</returns>
-		internal GestureSettings PreventEvents(uint pointerId, GestureSettings events)
+		internal GestureSettings PreventEvents(PointerIdentifier pointerId, GestureSettings events)
 		{
-			if (_gestures.TryGetValue(pointerId, out var gesture))
+			if (_gestures.TryGetValue(pointerId.Id, out var gesture))
 			{
-				gesture.PreventGestures(events & GestureSettingsHelper.SupportedGestures);
+				gesture.PreventGestures(events);
+			}
 
-				return gesture.Settings;
+			if ((events & GestureSettings.Drag) != 0 && (_manipulation?.IsActive(pointerId) ?? false))
+			{
+				_manipulation?.DisableDragging();
 			}
 
-			return GestureSettings.None;
+			return _gestureSettings;
 		}
 
 		#region Manipulations

diff --git a/src/Uno.UI/UI/Xaml/UIElement.Pointers.cs b/src/Uno.UI/UI/Xaml/UIElement.Pointers.cs
@@ -10,6 +10,7 @@
 using Windows.ApplicationModel.DataTransfer.DragDrop;
 using Windows.ApplicationModel.DataTransfer.DragDrop.Core;
 using Windows.Devices.Haptics;
+using Windows.Devices.Input;
 using Windows.Foundation;
 using Windows.UI.Core;
 using Microsoft.UI.Xaml.Input;
@@ -22,6 +23,7 @@
 using Uno.UI.Extensions;
 using Uno.UI.Xaml;
 using Uno.UI.Xaml.Core;
+using PointerDeviceType = Windows.Devices.Input.PointerDeviceType;
 
 #if HAS_UNO_WINUI
 using Microsoft.UI.Input;
@@ -558,19 +560,31 @@ partial void PrepareManagedGestureEventBubbling(RoutedEvent routedEvent, ref Rou
 			{
 				if (routedEvent == TappedEvent)
 				{
-					GestureRecognizer.PreventEvents(((TappedRoutedEventArgs)args).PointerId, GestureSettings.Tap);
+					var tappedArgs = (TappedRoutedEventArgs)args;
+					GestureRecognizer.PreventEvents(
+						new PointerIdentifier((PointerDeviceType)tappedArgs.PointerDeviceType, tappedArgs.PointerId),
+						GestureSettings.Tap);
 				}
 				else if (routedEvent == DoubleTappedEvent)
 				{
-					GestureRecognizer.PreventEvents(((DoubleTappedRoutedEventArgs)args).PointerId, GestureSettings.DoubleTap);
+					var doubleTappedArgs = (DoubleTappedRoutedEventArgs)args;
+					GestureRecognizer.PreventEvents(
+						new PointerIdentifier((PointerDeviceType)doubleTappedArgs.PointerDeviceType, doubleTappedArgs.PointerId),
+						GestureSettings.DoubleTap);
 				}
 				else if (routedEvent == RightTappedEvent)
 				{
-					GestureRecognizer.PreventEvents(((RightTappedRoutedEventArgs)args).PointerId, GestureSettings.RightTap);
+					var rightTappedArgs = (RightTappedRoutedEventArgs)args;
+					GestureRecognizer.PreventEvents(
+						new PointerIdentifier((PointerDeviceType)rightTappedArgs.PointerDeviceType, rightTappedArgs.PointerId),
+						GestureSettings.RightTap);
 				}
 				else if (routedEvent == HoldingEvent)
 				{
-					GestureRecognizer.PreventEvents(((HoldingRoutedEventArgs)args).PointerId, GestureSettings.Hold);
+					var holdingArgs = (HoldingRoutedEventArgs)args;
+					GestureRecognizer.PreventEvents(
+						new PointerIdentifier((PointerDeviceType)holdingArgs.PointerDeviceType, holdingArgs.PointerId),
+						GestureSettings.Hold);
 				}
 			}
 		}
@@ -606,7 +620,7 @@ private void UpdateRaisedGestureEventsFlag(PointerRoutedEventArgs args)
 			}
 
 			var pointerId = args.Pointer.PointerId;
-			args.GestureEventsAlreadyRaised |= GestureRecognizer.PreventEvents(pointerId, args.GestureEventsAlreadyRaised);
+			args.GestureEventsAlreadyRaised |= GestureRecognizer.PreventEvents(new PointerIdentifier((PointerDeviceType)args.Pointer.PointerDeviceType, args.Pointer.PointerId), args.GestureEventsAlreadyRaised);
 		}
 		#endregion