[CP] Fix iOS Touch popover gesture completion (#912)

Co-authored-by: Vetle Finstad <finstad@Vetles-MacBook-Pro-2.local>

Author: Vetle444

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [60.2.18]
+- [Touch][iOS] Fixed popovers and context menus opened from `Touch.Command` breaking scrolling and swipe-back gestures after dismissal.
+
 ## [60.2.17]
 - [Touch][iOS] Fixed scroll gestures on tappable rows getting stuck after dismissing context menus or picker popovers, and prevented taps behind open overlays from activating touch commands.
 

src/library/DIPS.Mobile.UI/Effects/Touch/iOS/TouchEffectGestureRecognizerDelegate.cs

@@ -47,11 +47,11 @@ public override bool ShouldRecognizeSimultaneously(UIGestureRecognizer gestureRe
         UIGestureRecognizer otherGestureRecognizer)
     {
         if (gestureRecognizer is TouchEffectTapGestureRecognizer touchGesture &&
-            otherGestureRecognizer is UIPanGestureRecognizer)
+            otherGestureRecognizer is UIPanGestureRecognizer &&
+            otherGestureRecognizer.State == UIGestureRecognizerState.Began)
         {
             TouchPlatformEffect.HandleTouch(UIGestureRecognizerState.Cancelled, ref touchGesture.m_currentState,
                 gestureRecognizer.View);
-            return false;
         }
 
         return true;

src/library/DIPS.Mobile.UI/Effects/Touch/iOS/TouchEffectTapGestureRecognizer.cs

@@ -47,19 +47,26 @@ public override void TouchesBegan(NSSet touches, UIEvent evt)
     public override void TouchesEnded(NSSet touches, UIEvent evt)
     {
         base.TouchesEnded(touches, evt);
-        
-        if(!m_longPressDetected && m_currentState is not UIGestureRecognizerState.Cancelled)
-            m_onTap.Invoke();
+
+        var shouldInvokeTap = !m_longPressDetected && m_currentState is not UIGestureRecognizerState.Cancelled;
 
         TouchPlatformEffect.HandleTouch(UIGestureRecognizerState.Ended, ref m_currentState, m_uiView);
         m_longPressDetected = false;
+
+        State = shouldInvokeTap ? UIGestureRecognizerState.Ended : UIGestureRecognizerState.Failed;
+
+        if (shouldInvokeTap)
+        {
+            MainThread.BeginInvokeOnMainThread(m_onTap);
+        }
     }
 
     public override void TouchesCancelled(NSSet touches, UIEvent evt)
     {
         base.TouchesCancelled(touches, evt);
 
         TouchPlatformEffect.HandleTouch(UIGestureRecognizerState.Cancelled, ref m_currentState, m_uiView);
+        State = UIGestureRecognizerState.Cancelled;
         m_longPressDetected = false;
     }
 
@@ -76,6 +83,7 @@ public override void TouchesMoved(NSSet touches, UIEvent evt)
         {
             TouchPlatformEffect.HandleTouch(UIGestureRecognizerState.Cancelled, ref m_currentState, m_uiView);
             m_isCancelled = true;
+            State = UIGestureRecognizerState.Failed;
         }
 
         base.TouchesMoved(touches, evt);