fix: taphandler with doubletaphandler

nativescript-community · Jan 13, 2020 · 6c3ed76 · 6c3ed76
1 parent d2c9c8f
commit 6c3ed76
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src-native/ios/GestureHandler/TapHandler.h b/src-native/ios/GestureHandler/TapHandler.h
@@ -9,4 +9,5 @@
 #import "GestureHandler.h"
 
 @interface TapGestureHandler : GestureHandler
+-(void)resetStored;
 @end
diff --git a/src-native/ios/GestureHandler/TapHandler.m b/src-native/ios/GestureHandler/TapHandler.m
@@ -31,7 +31,7 @@ - (id)initWithGestureHandler:(GestureHandler*)gestureHandler;
 @end
 
 @implementation BetterTapGestureRecognizer {
-  __weak GestureHandler *_gestureHandler;
+  __weak TapGestureHandler *_gestureHandler;
   NSUInteger _tapsSoFar;
   CGPoint _initPosition;
   NSInteger _maxNumberOfTouches;
@@ -66,6 +66,7 @@ - (void)cancel
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {
+  [_gestureHandler resetStored];
   [super touchesBegan:touches withEvent:event];
   if (_tapsSoFar == 0) {
     _initPosition = [self locationInView:self.view];
@@ -166,7 +167,10 @@ - (void)reset
 
 @end
 
-@implementation TapGestureHandler
+@implementation TapGestureHandler {
+  __weak NSMutableDictionary *_lastExtraEventData;
+}
+
 
 - (instancetype)initWithTag:(NSNumber *)tag
 {
@@ -203,5 +207,22 @@ - (void)configure:(NSDictionary *)config
   }
 }
 
+- (void)resetStored
+{
+    _lastExtraEventData = NULL;
+}
+- (NSMutableDictionary *)eventExtraData:(UIGestureRecognizer *)recognizer
+{
+  if (recognizer.numberOfTouches == 0 && _lastExtraEventData != NULL) {
+    return _lastExtraEventData;
+  }
+  NSMutableDictionary *result = [super eventExtraData:recognizer];
+  if (recognizer.numberOfTouches != 0)
+  {
+    _lastExtraEventData = result;
+  } 
+  return result;
+}
+
 @end