Prevent native wrapper recognizer to stay around.

PicnicSupermarket · Jul 28, 2017 · bc80d6b · bc80d6b
1 parent a2ad73b
commit bc80d6b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/ios/Handlers/RNGestureHandler.m b/ios/Handlers/RNGestureHandler.m
@@ -15,6 +15,19 @@ @interface RNDummyGestureRecognizer : UIGestureRecognizer
 
 
 @implementation RNDummyGestureRecognizer
+
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    self.state = UIGestureRecognizerStateFailed;
+    [self reset];
+}
+
+- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    self.state = UIGestureRecognizerStateCancelled;
+    [self reset];
+}
+
 @end
 
 
@@ -735,6 +748,15 @@ @implementation RNRootViewGestureRecognizer
     BOOL _active;
 }
 
+- (instancetype)init
+{
+    if (self = [super init]) {
+        self.delaysTouchesEnded = NO;
+        self.delaysTouchesBegan = NO;
+    }
+    return self;
+}
+
 - (BOOL)canPreventGestureRecognizer:(UIGestureRecognizer *)preventedGestureRecognizer
 {
     return ![preventedGestureRecognizer isKindOfClass:[RCTTouchHandler class]];

diff --git a/ios/RNGestureHandlerManager.m b/ios/RNGestureHandlerManager.m
@@ -76,11 +76,12 @@ - (void)dropGestureHandlersForView:(NSNumber *)viewTag
 
 - (void)handleSetJSResponder:(NSNumber *)viewTag blockNativeResponder:(NSNumber *)blockNativeResponder
 {
-    NSLog(@"SET JS RESP");
-    for (RCTRootView *rootView in _rootViews) {
-        for (UIGestureRecognizer *recognizer in rootView.gestureRecognizers) {
-            if ([recognizer isKindOfClass:[RNRootViewGestureRecognizer class]]) {
-                [(RNRootViewGestureRecognizer *)recognizer blockOtherRecognizers];
+    if ([blockNativeResponder boolValue]) {
+        for (RCTRootView *rootView in _rootViews) {
+            for (UIGestureRecognizer *recognizer in rootView.gestureRecognizers) {
+                if ([recognizer isKindOfClass:[RNRootViewGestureRecognizer class]]) {
+                    [(RNRootViewGestureRecognizer *)recognizer blockOtherRecognizers];
+                }
             }
         }
     }