Added TapGesture handling for Spans on Mac OS * fixes #4775

Author: AndreiMisiukevich

Xamarin.Forms.Platform.iOS/EventTracker.cs

@@ -134,6 +134,21 @@ Action<NSClickGestureRecognizer> CreateRecognizerHandler(WeakReference weakEvent
 			});
 		}
 
+		NSGestureProbe CreateTapRecognizerHandler(WeakReference weakEventTracker, WeakReference weakRecognizer)
+		{
+			return new NSGestureProbe((gesturerecognizer) =>
+			{
+				var tapGestureRecognizer = weakRecognizer.Target as TapGestureRecognizer;
+				var eventTracker = weakEventTracker.Target as EventTracker;
+				var view = eventTracker?._renderer?.Element as View;
+
+				if (tapGestureRecognizer != null && view != null)
+					tapGestureRecognizer.SendTapped(view);
+
+				return false;
+			});
+		}
+
 		Action<NSClickGestureRecognizer> CreateChildRecognizerHandler(WeakReference weakEventTracker, WeakReference weakRecognizer)
 		{
 			return new Action<NSClickGestureRecognizer>((sender) =>
@@ -149,7 +164,26 @@ Action<NSClickGestureRecognizer> CreateChildRecognizerHandler(WeakReference weak
 					if (item == clickGestureRecognizer && view != null)
 						clickGestureRecognizer.SendClicked(view, clickGestureRecognizer.Buttons);
 			});
+		}
+
+		NSGestureProbe CreateChildTapRecognizerHandler(WeakReference weakEventTracker, WeakReference weakRecognizer)
+		{
+			return new NSGestureProbe((gesturerecognizer) =>
+			{
+				var eventTracker = weakEventTracker.Target as EventTracker;
+				var view = eventTracker?._renderer?.Element as View;
+				var childGestures = GetChildGestures(gesturerecognizer, weakEventTracker, weakRecognizer, eventTracker, view);
+
+				var tapGestureRecognizer = ((ChildGestureRecognizer)weakRecognizer.Target).GestureRecognizer as TapGestureRecognizer;
+				var nativeRecognizer = gesturerecognizer as NSClickGestureRecognizer;
+				var recognizers = childGestures?.GetChildGesturesFor<TapGestureRecognizer>(x => x.NumberOfTapsRequired == (int)nativeRecognizer.NumberOfClicksRequired);
 
+					foreach (var item in recognizers)
+						if (item == tapGestureRecognizer && view != null)
+							tapGestureRecognizer.SendTapped(view);
+						
+				return false;
+			});
 		}
 #else
 
@@ -206,25 +240,13 @@ protected virtual NativeGestureRecognizer GetNativeRecognizer(IGestureRecognizer
 			if (recognizer is ClickGestureRecognizer clickRecognizer)
 			{
 				var returnAction = CreateRecognizerHandler(weakEventTracker, weakRecognizer, clickRecognizer);
-
 				var uiRecognizer = CreateClickRecognizer((int)clickRecognizer.Buttons, clickRecognizer.NumberOfClicksRequired, returnAction);
 				return uiRecognizer;
 			}
 
 			if (tapRecognizer != null)
 			{
-				var returnAction = new NSGestureProbe((gesturerecognizer) =>
-				{
-					var tapGestureRecognizer = weakRecognizer.Target as TapGestureRecognizer;
-					var eventTracker = weakEventTracker.Target as EventTracker;
-					var view = eventTracker?._renderer?.Element as View;
-
-					if (tapGestureRecognizer != null && view != null)
-						tapGestureRecognizer.SendTapped(view);
-
-					return false;
-				});
-
+				var returnAction = CreateTapRecognizerHandler(weakEventTracker, weakRecognizer);
 				var uiRecognizer = CreateTapRecognizer(tapRecognizer.NumberOfTapsRequired, returnAction);
 				return uiRecognizer;
 			}
@@ -263,6 +285,13 @@ protected virtual NativeGestureRecognizer GetNativeRecognizer(IGestureRecognizer
 					var uiRecognizer = CreateClickRecognizer((int)clickChildRecognizer.Buttons, clickChildRecognizer.NumberOfClicksRequired, returnAction);
 					return uiRecognizer;
 				}
+
+				if (childRecognizer.GestureRecognizer is TapGestureRecognizer tapChildRecognizer)
+				{
+					var returnAction = CreateChildTapRecognizerHandler(weakEventTracker, weakRecognizer);
+					var uiRecognizer = CreateTapRecognizer(tapChildRecognizer.NumberOfTapsRequired, returnAction);
+					return uiRecognizer;
+				}
 #else
 				if (childRecognizer.GestureRecognizer is TapGestureRecognizer tapChildRecognizer)
 				{
@@ -470,6 +499,7 @@ NSClickGestureRecognizer CreateTapRecognizer(int numTaps, NSGestureProbe action)
 
 			return result;
 		}
+
 #endif
 
 		static bool ShouldRecognizeTapsTogether(NativeGestureRecognizer gesture, NativeGestureRecognizer other)