@nativescript-community/gesturehandler 2.0.25 → 2.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/gesturehandler",
-    "version": "2.0.25",
+    "version": "2.0.26",
     "description": "Declarative API exposing platform native touch and gesture system to NativeScript.",
     "main": "gesturehandler",
     "sideEffects": false,
@@ -35,5 +35,5 @@
     "dependencies": {
         "@nativescript-community/observable": "^2.0.10"
     },
-    "gitHead": "9776a3293c8857f7bedeaa968c7f780d1297920c"
+    "gitHead": "e8d059050bff972153044b540202e65854d6bb4e"
 }

package/platforms/ios/src/FlingHandler.m

@@ -14,7 +14,7 @@
 - (instancetype)initWithTag:(NSNumber *)tag
 {
     if ((self = [super initWithTag:tag])) {
-        self.direction = UISwipeGestureRecognizerDirectionLeft | UISwipeGestureRecognizerDirectionRight |   UISwipeGestureRecognizerDirectionUp | UISwipeGestureRecognizerDirectionDown;
+      _direction = UISwipeGestureRecognizerDirectionLeft | UISwipeGestureRecognizerDirectionRight |   UISwipeGestureRecognizerDirectionUp | UISwipeGestureRecognizerDirectionDown;
         _recognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
         [(UISwipeGestureRecognizer*)_recognizer setDirection:UISwipeGestureRecognizerDirectionLeft];
         _rightrecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
@@ -34,17 +34,17 @@
   
   id prop = config[@"direction"];
   if (prop != nil) {
-    self.direction = [prop integerValue];
-    if ((self.direction & UISwipeGestureRecognizerDirectionLeft) == 0)  {
+    _direction = [prop integerValue];
+    if ((_direction & UISwipeGestureRecognizerDirectionLeft) == 0)  {
       _recognizer.enabled = NO;
     }
-    if ((self.direction & UISwipeGestureRecognizerDirectionRight) == 0)  {
+    if ((_direction & UISwipeGestureRecognizerDirectionRight) == 0)  {
       _rightrecognizer.enabled = NO;
     }
-    if ((self.direction & UISwipeGestureRecognizerDirectionUp) == 0)  {
+    if ((_direction & UISwipeGestureRecognizerDirectionUp) == 0)  {
       _toprecognizer.enabled = NO;
     }
-    if ((self.direction & UISwipeGestureRecognizerDirectionDown) == 0)  {
+    if ((_direction & UISwipeGestureRecognizerDirectionDown) == 0)  {
       _bottomrecognizer.enabled = NO;
     }
   }
@@ -90,7 +90,11 @@
     _bottomrecognizer.delegate = nil;
 }
 - (void) setDirection:(NSInteger) value {
-  ((UISwipeGestureRecognizer *)_recognizer).direction = value;
+  _direction = value;
+  _recognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionLeft) != 0;
+  _rightrecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionRight) != 0;
+  _toprecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionUp) != 0;
+  _bottomrecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionDown) != 0;
 }
 //
 //- (NSNumber *) direction {
@@ -128,4 +132,3 @@
   return result;
 }
 @end
-

package/platforms/ios/src/GestureHandler.h

@@ -78,6 +78,7 @@ if (value != nil) recognizer.prop = [value type]; \
 //@property (nonatomic, weak, nullable) id<GestureHandlerEventEmitter> emitter;
 @property (nonatomic, readonly, nullable) UIGestureRecognizer *recognizer;
 @property (nonatomic) BOOL enabled;
+@property (nonatomic) BOOL activateOnBegin;
 @property(nonatomic) BOOL shouldCancelWhenOutside;
 @property (nullable, nonatomic, weak) id<GestureHandlerDelegate> delegate;
 

package/platforms/ios/src/GestureHandler.m

@@ -70,6 +70,7 @@ CGRect GHHitSlopInsetRect(CGRect rect, RNGHHitSlop hitSlop) {
         _tag = tag;
         _lastState = GestureHandlerStateUndetermined;
         _hitSlop = RNGHHitSlopEmpty;
+        _activateOnBegin = YES;
     }
     return self;
 }
@@ -323,7 +324,7 @@ shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherG
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
     [self reset];
-    if (self.delegate && [self.delegate respondsToSelector:@selector(gestureHandler:shouldActivateForEvent:)]) {
+    if (self.activateOnBegin && self.delegate && [self.delegate respondsToSelector:@selector(gestureHandler:shouldActivateForEvent:)]) {
         if (![self.delegate gestureHandler:self shouldActivateForEvent:[self eventExtraData:gestureRecognizer]]) {
           return FALSE;
         }

package/platforms/ios/src/PanHandler.m

@@ -79,6 +79,12 @@
   }
 #endif
   [super touchesBegan:touches withEvent:event];
+
+  // we check for active before UIGestureRecognizerStateBegan because otherwise
+  // we dont behave as Android and activate on first touch
+  if (![_gestureHandler.delegate gestureHandler:_gestureHandler shouldActivateForEvent:[_gestureHandler eventExtraData:self]]) {
+    self.state = UIGestureRecognizerStateFailed;
+  }
 }
 
 - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
@@ -187,6 +193,7 @@
 {
   if ((self = [super initWithTag:tag])) {
     _recognizer = [[BetterPanGestureRecognizer alloc] initWithGestureHandler:self];
+    self.activateOnBegin = NO;
   }
   return self;
 }
@@ -275,4 +282,3 @@
   ((BetterPanGestureRecognizer*)_recognizer).failOffsetYEnd = value;
 }
 @end
-