Merge pull request #21321 from unoplatform/dev/dr/cancelDIrectManip

feat: Add support for ManipulationMode=None

Author: dr1rrb

src/Uno.UI.RuntimeTests/Tests/Uno_UI_Xaml_Core/Given_InputManager.cs

@@ -1323,6 +1323,57 @@ public async Task When_DirectManipulationMixedWithUIElementManipulation_Then_Top
 		completed.Should().Be(0);
 	}
 
+	[TestMethod]
+#if __WASM__
+	[Ignore("Scrolling is handled by native code and InputInjector is not yet able to inject native pointers.")]
+#elif !HAS_INPUT_INJECTOR
+	[Ignore("InputInjector is not supported on this platform.")]
+#endif
+	[DataRow(ManipulationModes.None)]
+	[DataRow(ManipulationModes.TranslateX)]
+	[DataRow(ManipulationModes.TranslateY)]
+	[DataRow(ManipulationModes.TranslateRailsX)]
+	[DataRow(ManipulationModes.TranslateRailsY)]
+	[DataRow(ManipulationModes.TranslateInertia)]
+	[DataRow(ManipulationModes.All)] // Does **NOT** include System
+	public async Task When_DirectManipulationDisabled(ManipulationModes mode)
+	{
+		ScrollViewer sv;
+		var ui = new Grid
+		{
+			Width = 200,
+			Height = 200,
+			Children =
+			{
+				(sv = new ScrollViewer
+				{
+					UpdatesMode = Uno.UI.Xaml.Controls.ScrollViewerUpdatesMode.Synchronous,
+					IsScrollInertiaEnabled = false,
+					Background = new SolidColorBrush(Colors.DeepPink),
+					Content = new Border
+					{
+						ManipulationMode = mode,
+						Background = new SolidColorBrush(Colors.DeepSkyBlue),
+						Margin = new Thickness(10),
+						Width = 800,
+						Height = 800,
+					}
+				}),
+			}
+		};
+
+		var bounds = await UITestHelper.Load(ui);
+
+		var injector = InputInjector.TryCreate() ?? throw new InvalidOperationException("Failed to init the InputInjector");
+		using var finger = injector.GetFinger();
+
+		finger.Drag(from: bounds.GetCenter(), to: bounds.GetCenter().Offset(y: -8000));
+
+		await UITestHelper.WaitForIdle();
+
+		sv.VerticalOffset.Should().Be(0);
+	}
+
 	private CoreCursorType? GetCursorShape()
 	{
 		var cursor = TestServices.WindowHelper

src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.ManagedDirectManip.cs

@@ -129,13 +129,16 @@ internal bool CancelDirectManipulations(UIElement requestingElement)
 			var cancelled = false;
 			foreach (var manipulation in _directManipulations)
 			{
-				if (manipulation.Handlers.Any(handler => handler.Owner == requestingElement))
+				if (manipulation.Handlers.Any(IsForParentOfRequestingElement))
 				{
 					cancelled |= manipulation.Cancel();
 				}
 			}
 
 			return cancelled;
+
+			bool IsForParentOfRequestingElement(IDirectManipulationHandler handler)
+				=> handler.Owner is DependencyObject owner && requestingElement.GetAllParents(includeCurrent: true).Contains(owner);
 		}
 
 		private bool IsRedirectedToManipulations(PointerIdentifier pointerId)

src/Uno.UI/UI/Xaml/Internal/PointerCaptureOptions.cs

@@ -10,6 +10,8 @@ internal enum PointerCaptureOptions : byte
 	None = 0,
 
 	/// <summary>
+	/// DEPRECATED: Setting ManipulationMode=None is equivalent to setting this option.
+	/// 
 	/// Indicates that the pointer capture should prevent the "direct manipulation" (a.k.a. OS steal) which would takes over the capture (mainly for scrolling using touch and pen).
 	/// This applies for:
 	///   * iOS and Android, where we configure the OS to forbid it to steal the pointer when it detects a scroll gesture.

src/Uno.UI/UI/Xaml/UIElement.FocusMixins.cs

@@ -7,10 +7,9 @@
 
 namespace Microsoft.UI.Xaml
 {
-	/// <summary>
-	/// This contains focus-related mixins that belong either in UIElement or in Control depending whether
-	/// targeting UWP or WinUI. When WinUI becomes the "standard", we can move this in UIElement directly.
-	/// </summary>
+	// This file contains focus-related mixins that belong either in UIElement or in Control depending whether
+	// targeting UWP or WinUI. When WinUI becomes the "standard", we can move this in UIElement directly.
+
 	public partial class UIElement
 	{
 		public FocusState FocusState

src/Uno.UI/UI/Xaml/UIElement.Pointers.cs

@@ -1042,11 +1042,10 @@ internal bool OnPointerDown(PointerRoutedEventArgs args, BubblingContext ctx = d
 #endif
 			}
 
-			// TODO
-			//if (!ManipulationMode.HasFlag(ManipulationModes.System))
-			//{
-			//	Cancel[ALL]DirectManipulation()
-			//}
+			if (!ManipulationMode.HasFlag(ManipulationModes.System))
+			{
+				CancelDirectManipulations();
+			}
 
 			return handledInManaged;
 		}