Reimplement by adding FirstGestureOrDefault

dotnet · Mar 26, 2024 · acadf48 · acadf48
1 parent edd66ef
commit acadf48
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Controls/src/Core/EnumerableExtensions.cs b/src/Controls/src/Core/EnumerableExtensions.cs
@@ -63,21 +63,24 @@ public static IEnumerable<T> GetGesturesFor<T>(this IEnumerable<IGestureRecogniz
 		}
 
 		internal static bool HasAnyGesturesFor<T>(this IEnumerable<IGestureRecognizer>? gestures, Func<T, bool>? predicate = null) where T : GestureRecognizer
+			=> FirstGestureOrDefault(gestures, predicate) is not null;
+
+		internal static T? FirstGestureOrDefault<T>(this IEnumerable<IGestureRecognizer>? gestures, Func<T, bool>? predicate = null) where T : GestureRecognizer
 		{
 			if (gestures is null)
 			{
-				return false;
+				return null;
 			}
 
 			foreach (IGestureRecognizer item in gestures)
 			{
 				if (item is T gesture && (predicate is null || predicate(gesture)))
 				{
-					return true;
+					return gesture;
 				}
 			}
 
-			return false;
+			return null;
 		}
 	}
 }
diff --git a/src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.Windows.cs b/src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.Windows.cs
@@ -683,10 +683,10 @@ void UpdateDragAndDropGestureRecognizers()
 				return;
 			}
 
-			bool canDrag = gestures.GetGesturesFor<DragGestureRecognizer>().FirstOrDefault()?.CanDrag ?? false;
+			bool canDrag = gestures.FirstGestureOrDefault<DragGestureRecognizer>()?.CanDrag ?? false;
 			_container.CanDrag = canDrag;
 
-			bool allowDrop = gestures.GetGesturesFor<DropGestureRecognizer>().FirstOrDefault()?.AllowDrop ?? false;
+			bool allowDrop = gestures.FirstGestureOrDefault<DropGestureRecognizer>()?.AllowDrop ?? false;
 			_container.AllowDrop = allowDrop;
 
 			if (canDrag)