SwipeGestureRecognizer return actual detected directions (dotnet#20619)

* detected direction * unit test * fix
Glepooek · Mar 4, 2024 · ad28b65 · ad28b65
1 parent 6cb942e
commit ad28b65
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 5 deletions.
diff --git a/src/Controls/src/Core/SwipeGestureRecognizer.cs b/src/Controls/src/Core/SwipeGestureRecognizer.cs
@@ -65,29 +65,47 @@ bool ISwipeGestureController.DetectSwipe(View sender, SwipeDirection direction)
 			var detected = false;
 			var threshold = Threshold;
 
+			var detectedDirection = (SwipeDirection)(0);
+
 			if (direction.IsLeft())
 			{
-				detected |= _totalX < -threshold;
+				if (_totalX < -threshold)
+				{
+					detected = true;
+					detectedDirection |= SwipeDirection.Left;
+				}
 			}
 
 			if (direction.IsRight())
 			{
-				detected |= _totalX > threshold;
+				if (_totalX > threshold)
+				{
+					detected = true;
+					detectedDirection |= SwipeDirection.Right;
+				}
 			}
 
 			if (direction.IsDown())
 			{
-				detected |= _totalY > threshold;
+				if (_totalY > threshold)
+				{
+					detected = true;
+					detectedDirection |= SwipeDirection.Down;
+				}
 			}
 
 			if (direction.IsUp())
 			{
-				detected |= _totalY < -threshold;
+				if (_totalY < -threshold)
+				{
+					detected = true;
+					detectedDirection |= SwipeDirection.Up;
+				}
 			}
 
 			if (detected)
 			{
-				SendSwiped(sender, direction);
+				SendSwiped(sender, detectedDirection);
 			}
 
 			return detected;

diff --git a/src/Controls/tests/Core.UnitTests/Gestures/SwipeGestureRecognizerTests.cs b/src/Controls/tests/Core.UnitTests/Gestures/SwipeGestureRecognizerTests.cs
@@ -83,5 +83,39 @@ public void SwipeIgnoredIfBelowThresholdTest()
 			((ISwipeGestureController)swipe).DetectSwipe(view, SwipeDirection.Up);
 			Assert.False(detected);
 		}
+
+		[Fact]
+		public void SwipedEventDirectionMatchesTotalXTestWithFlags()
+		{
+			var view = new View();
+			var swipe = new SwipeGestureRecognizer();
+
+			SwipeDirection direction = SwipeDirection.Up;
+			swipe.Swiped += (object sender, SwipedEventArgs e) =>
+			{
+				direction = e.Direction;
+			};
+
+			((ISwipeGestureController)swipe).SendSwipe(view, totalX: -150, totalY: 10);
+			((ISwipeGestureController)swipe).DetectSwipe(view, SwipeDirection.Left | SwipeDirection.Right);
+			Assert.Equal(SwipeDirection.Left, direction);
+		}
+
+		[Fact]
+		public void SwipedEventDirectionMatchesTotalYTestWithFlags()
+		{
+			var view = new View();
+			var swipe = new SwipeGestureRecognizer();
+
+			SwipeDirection direction = SwipeDirection.Left;
+			swipe.Swiped += (object sender, SwipedEventArgs e) =>
+			{
+				direction = e.Direction;
+			};
+
+			((ISwipeGestureController)swipe).SendSwipe(view, totalX: 10, totalY: -150);
+			((ISwipeGestureController)swipe).DetectSwipe(view, SwipeDirection.Up | SwipeDirection.Down);
+			Assert.Equal(SwipeDirection.Up, direction);
+		}
 	}
 }