react-native-gesture-handler 2.7.1 → 2.9.0

package/ios/RNGestureHandlerActionType.h

@@ -1,8 +1,10 @@
 #import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSInteger, RNGestureHandlerActionType) {
-    RNGestureHandlerActionTypeReanimatedWorklet = 1, // Reanimated worklet
-    RNGestureHandlerActionTypeNativeAnimatedEvent, // Animated.event with useNativeDriver: true
-    RNGestureHandlerActionTypeJSFunctionOldAPI, // JS function or Animated.event with useNativeDriver: false using old RNGH API
-    RNGestureHandlerActionTypeJSFunctionNewAPI, // JS function or Animated.event with useNativeDriver: false using new RNGH API
+  RNGestureHandlerActionTypeReanimatedWorklet = 1, // Reanimated worklet
+  RNGestureHandlerActionTypeNativeAnimatedEvent, // Animated.event with useNativeDriver: true
+  RNGestureHandlerActionTypeJSFunctionOldAPI, // JS function or Animated.event with useNativeDriver: false using old
+                                              // RNGH API
+  RNGestureHandlerActionTypeJSFunctionNewAPI, // JS function or Animated.event with useNativeDriver: false using new
+                                              // RNGH API
 };

package/ios/RNGestureHandlerButton.m

@@ -48,12 +48,12 @@
 
 - (BOOL)shouldHandleTouch:(UIView *)view
 {
-    if ([view isKindOfClass:[RNGestureHandlerButton class]]) {
-        RNGestureHandlerButton *button = (RNGestureHandlerButton *)view;
-        return button.userEnabled;
-    }
-    
-    return [view isKindOfClass:[UIControl class]] || [view.gestureRecognizers count] > 0;
+  if ([view isKindOfClass:[RNGestureHandlerButton class]]) {
+    RNGestureHandlerButton *button = (RNGestureHandlerButton *)view;
+    return button.userEnabled;
+  }
+
+  return [view isKindOfClass:[UIControl class]] || [view.gestureRecognizers count] > 0;
 }
 
 - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
@@ -67,12 +67,11 @@
 
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
-    UIView *inner = [super hitTest:point withEvent:event];
-    while (inner && ![self shouldHandleTouch:inner]) {
-        inner = inner.superview;
-    }
-    return inner;
+  UIView *inner = [super hitTest:point withEvent:event];
+  while (inner && ![self shouldHandleTouch:inner]) {
+    inner = inner.superview;
+  }
+  return inner;
 }
 
 @end
-

package/ios/RNGestureHandlerButtonComponentView.mm

@@ -17,9 +17,8 @@ using namespace facebook::react;
 @interface RNGestureHandlerButtonComponentView () <RCTRNGestureHandlerButtonViewProtocol>
 @end
 
-@implementation RNGestureHandlerButtonComponentView
-{
-    RNGestureHandlerButton *_buttonView;
+@implementation RNGestureHandlerButtonComponentView {
+  RNGestureHandlerButton *_buttonView;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -28,7 +27,7 @@ using namespace facebook::react;
     static const auto defaultProps = std::make_shared<const RNGestureHandlerButtonProps>();
     _props = defaultProps;
     _buttonView = [[RNGestureHandlerButton alloc] initWithFrame:self.bounds];
-    
+
     self.contentView = _buttonView;
   }
 
@@ -44,12 +43,12 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-    const auto &newProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(props);
+  const auto &newProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(props);
 
-    _buttonView.userEnabled = newProps.enabled;
-    _buttonView.exclusiveTouch = newProps.exclusive;
+  _buttonView.userEnabled = newProps.enabled;
+  _buttonView.exclusiveTouch = newProps.exclusive;
 
-    [super updateProps:props oldProps:oldProps];
+  [super updateProps:props oldProps:oldProps];
 }
 @end
 

package/ios/RNGestureHandlerButtonManager.m

@@ -1,5 +1,5 @@
-#import "RNGestureHandlerButton.h"
 #import "RNGestureHandlerButtonManager.h"
+#import "RNGestureHandlerButton.h"
 
 @implementation RNGestureHandlerButtonManager
 
@@ -7,19 +7,20 @@ RCT_EXPORT_MODULE(RNGestureHandlerButton)
 
 RCT_CUSTOM_VIEW_PROPERTY(enabled, BOOL, RNGestureHandlerButton)
 {
-    view.userEnabled = json == nil ? YES : [RCTConvert BOOL: json];
+  view.userEnabled = json == nil ? YES : [RCTConvert BOOL:json];
 }
 #if !TARGET_OS_TV
 RCT_CUSTOM_VIEW_PROPERTY(exclusive, BOOL, RNGestureHandlerButton)
 {
-  [view setExclusiveTouch: json == nil ? YES : [RCTConvert BOOL: json]];
+  [view setExclusiveTouch:json == nil ? YES : [RCTConvert BOOL:json]];
 }
 #endif
 RCT_CUSTOM_VIEW_PROPERTY(hitSlop, UIEdgeInsets, RNGestureHandlerButton)
 {
   if (json) {
     UIEdgeInsets hitSlopInsets = [RCTConvert UIEdgeInsets:json];
-    view.hitTestEdgeInsets = UIEdgeInsetsMake(-hitSlopInsets.top, -hitSlopInsets.left, -hitSlopInsets.bottom, -hitSlopInsets.right);
+    view.hitTestEdgeInsets =
+        UIEdgeInsetsMake(-hitSlopInsets.top, -hitSlopInsets.left, -hitSlopInsets.bottom, -hitSlopInsets.right);
   } else {
     view.hitTestEdgeInsets = defaultView.hitTestEdgeInsets;
   }
@@ -27,7 +28,7 @@ RCT_CUSTOM_VIEW_PROPERTY(hitSlop, UIEdgeInsets, RNGestureHandlerButton)
 
 - (UIView *)view
 {
-    return [RNGestureHandlerButton new];
+  return [RNGestureHandlerButton new];
 }
 
 @end

package/ios/RNGestureHandlerDirection.h

@@ -1,8 +1,8 @@
 #import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSInteger, RNGestureHandlerDirection) {
-    RNGestureHandlerDirectionRight = 1,
-    RNGestureHandlerDirectionLeft = 2,
-    RNGestureHandlerDirectionUp = 4,
-    RNGestureHandlerDirectionDown = 8,
+  RNGestureHandlerDirectionRight = 1,
+  RNGestureHandlerDirectionLeft = 2,
+  RNGestureHandlerDirectionUp = 4,
+  RNGestureHandlerDirectionDown = 8,
 };

package/ios/RNGestureHandlerEvents.h

@@ -3,8 +3,8 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import "RNGestureHandlerState.h"
 #import "RNGHTouchEventType.h"
+#import "RNGestureHandlerState.h"
 
 @interface RNGestureHandlerEventExtraData : NSObject
 
@@ -48,18 +48,17 @@
 - (instancetype)initWithReactTag:(NSNumber *)reactTag
                       handlerTag:(NSNumber *)handlerTag
                            state:(RNGestureHandlerState)state
-                       extraData:(RNGestureHandlerEventExtraData*)extraData
+                       extraData:(RNGestureHandlerEventExtraData *)extraData
                    coalescingKey:(uint16_t)coalescingKey NS_DESIGNATED_INITIALIZER;
 
 @end
 
-
 @interface RNGestureHandlerStateChange : NSObject <RCTEvent>
 
 - (instancetype)initWithReactTag:(NSNumber *)reactTag
                       handlerTag:(NSNumber *)handlerTag
                            state:(RNGestureHandlerState)state
                        prevState:(RNGestureHandlerState)prevState
-                       extraData:(RNGestureHandlerEventExtraData*)extraData NS_DESIGNATED_INITIALIZER;
+                       extraData:(RNGestureHandlerEventExtraData *)extraData NS_DESIGNATED_INITIALIZER;
 
 @end

package/ios/RNGestureHandlerEvents.m

@@ -6,23 +6,23 @@
 
 - (instancetype)initWithData:(NSDictionary *)data;
 {
-    if ((self = [super init])) {
-        _data = data;
-    }
-    return self;
+  if ((self = [super init])) {
+    _data = data;
+  }
+  return self;
 }
 
 + (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position
                            withAbsolutePosition:(CGPoint)absolutePosition
                             withNumberOfTouches:(NSUInteger)numberOfTouches
 {
-    return [[RNGestureHandlerEventExtraData alloc]
-            initWithData:@{
-                           @"x": @(position.x),
-                           @"y": @(position.y),
-                           @"absoluteX": @(absolutePosition.x),
-                           @"absoluteY": @(absolutePosition.y),
-                           @"numberOfPointers": @(numberOfTouches)}];
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"x" : @(position.x),
+    @"y" : @(position.y),
+    @"absoluteX" : @(absolutePosition.x),
+    @"absoluteY" : @(absolutePosition.y),
+    @"numberOfPointers" : @(numberOfTouches)
+  }];
 }
 
 + (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position
@@ -30,15 +30,14 @@
                             withNumberOfTouches:(NSUInteger)numberOfTouches
                                    withDuration:(NSUInteger)duration
 {
-    return [[RNGestureHandlerEventExtraData alloc]
-            initWithData:@{
-                           @"x": @(position.x),
-                           @"y": @(position.y),
-                           @"absoluteX": @(absolutePosition.x),
-                           @"absoluteY": @(absolutePosition.y),
-                           @"numberOfPointers": @(numberOfTouches),
-                           @"duration":@(duration)
-            }];
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"x" : @(position.x),
+    @"y" : @(position.y),
+    @"absoluteX" : @(absolutePosition.x),
+    @"absoluteY" : @(absolutePosition.y),
+    @"numberOfPointers" : @(numberOfTouches),
+    @"duration" : @(duration)
+  }];
 }
 
 + (RNGestureHandlerEventExtraData *)forPan:(CGPoint)position
@@ -47,17 +46,17 @@
                               withVelocity:(CGPoint)velocity
                        withNumberOfTouches:(NSUInteger)numberOfTouches
 {
-    return [[RNGestureHandlerEventExtraData alloc]
-            initWithData:@{
-                           @"x": @(position.x),
-                           @"y": @(position.y),
-                           @"absoluteX": @(absolutePosition.x),
-                           @"absoluteY": @(absolutePosition.y),
-                           @"translationX": @(translation.x),
-                           @"translationY": @(translation.y),
-                           @"velocityX": SAFE_VELOCITY(velocity.x),
-                           @"velocityY": SAFE_VELOCITY(velocity.y),
-                           @"numberOfPointers": @(numberOfTouches)}];
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"x" : @(position.x),
+    @"y" : @(position.y),
+    @"absoluteX" : @(absolutePosition.x),
+    @"absoluteY" : @(absolutePosition.y),
+    @"translationX" : @(translation.x),
+    @"translationY" : @(translation.y),
+    @"velocityX" : SAFE_VELOCITY(velocity.x),
+    @"velocityY" : SAFE_VELOCITY(velocity.y),
+    @"numberOfPointers" : @(numberOfTouches)
+  }];
 }
 
 + (RNGestureHandlerEventExtraData *)forForce:(CGFloat)force
@@ -65,15 +64,14 @@
                         withAbsolutePosition:(CGPoint)absolutePosition
                          withNumberOfTouches:(NSUInteger)numberOfTouches
 {
-    return [[RNGestureHandlerEventExtraData alloc]
-            initWithData:@{
-                           @"x": @(position.x),
-                           @"y": @(position.y),
-                           @"absoluteX": @(absolutePosition.x),
-                           @"absoluteY": @(absolutePosition.y),
-                           @"force": @(force),
-                           @"numberOfPointers": @(numberOfTouches)}];
-  
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"x" : @(position.x),
+    @"y" : @(position.y),
+    @"absoluteX" : @(absolutePosition.x),
+    @"absoluteY" : @(absolutePosition.y),
+    @"force" : @(force),
+    @"numberOfPointers" : @(numberOfTouches)
+  }];
 }
 
 + (RNGestureHandlerEventExtraData *)forPinch:(CGFloat)scale
@@ -81,13 +79,13 @@
                                 withVelocity:(CGFloat)velocity
                          withNumberOfTouches:(NSUInteger)numberOfTouches
 {
-    return [[RNGestureHandlerEventExtraData alloc]
-            initWithData:@{
-                           @"scale": @(scale),
-                           @"focalX": @(focalPoint.x),
-                           @"focalY": @(focalPoint.y),
-                           @"velocity": SAFE_VELOCITY(velocity),
-                           @"numberOfPointers": @(numberOfTouches)}];
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"scale" : @(scale),
+    @"focalX" : @(focalPoint.x),
+    @"focalY" : @(focalPoint.y),
+    @"velocity" : SAFE_VELOCITY(velocity),
+    @"numberOfPointers" : @(numberOfTouches)
+  }];
 }
 
 + (RNGestureHandlerEventExtraData *)forRotation:(CGFloat)rotation
@@ -95,12 +93,13 @@
                                    withVelocity:(CGFloat)velocity
                             withNumberOfTouches:(NSUInteger)numberOfTouches
 {
-    return [[RNGestureHandlerEventExtraData alloc]
-            initWithData:@{@"rotation": @(rotation),
-                           @"anchorX": @(anchorPoint.x),
-                           @"anchorY": @(anchorPoint.y),
-                           @"velocity": SAFE_VELOCITY(velocity),
-                           @"numberOfPointers": @(numberOfTouches)}];
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"rotation" : @(rotation),
+    @"anchorX" : @(anchorPoint.x),
+    @"anchorY" : @(anchorPoint.y),
+    @"velocity" : SAFE_VELOCITY(velocity),
+    @"numberOfPointers" : @(numberOfTouches)
+  }];
 }
 
 + (RNGestureHandlerEventExtraData *)forEventType:(RNGHTouchEventType)eventType
@@ -108,33 +107,31 @@
                                  withAllPointers:(NSArray<NSDictionary *> *)allPointers
                              withNumberOfTouches:(NSUInteger)numberOfTouches
 {
-    if (changedPointers == nil || allPointers == nil) {
-        changedPointers = @[];
-        allPointers = @[];
-        eventType = RNGHTouchEventTypeUndetermined;
-    }
-  
-    return [[RNGestureHandlerEventExtraData alloc]
-            initWithData:@{@"eventType": @(eventType),
-                         @"changedTouches": changedPointers,
-                         @"allTouches": allPointers,
-                         @"numberOfTouches": @(numberOfTouches)}];
+  if (changedPointers == nil || allPointers == nil) {
+    changedPointers = @[];
+    allPointers = @[];
+    eventType = RNGHTouchEventTypeUndetermined;
+  }
+
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"eventType" : @(eventType),
+    @"changedTouches" : changedPointers,
+    @"allTouches" : allPointers,
+    @"numberOfTouches" : @(numberOfTouches)
+  }];
 }
 
 + (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside
 {
-    return [[RNGestureHandlerEventExtraData alloc]
-            initWithData:@{@"pointerInside": @(pointerInside)}];
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{@"pointerInside" : @(pointerInside)}];
 }
 
 @end
 
-
-@implementation RNGestureHandlerEvent
-{
-    NSNumber *_handlerTag;
-    RNGestureHandlerState _state;
-    RNGestureHandlerEventExtraData *_extraData;
+@implementation RNGestureHandlerEvent {
+  NSNumber *_handlerTag;
+  RNGestureHandlerState _state;
+  RNGestureHandlerEventExtraData *_extraData;
 }
 
 @synthesize viewTag = _viewTag;
@@ -146,56 +143,54 @@
                        extraData:(RNGestureHandlerEventExtraData *)extraData
                    coalescingKey:(uint16_t)coalescingKey
 {
-    if ((self = [super init])) {
-        _viewTag = reactTag;
-        _handlerTag = handlerTag;
-        _state = state;
-        _extraData = extraData;
-        _coalescingKey = coalescingKey;
-    }
-    return self;
+  if ((self = [super init])) {
+    _viewTag = reactTag;
+    _handlerTag = handlerTag;
+    _state = state;
+    _extraData = extraData;
+    _coalescingKey = coalescingKey;
+  }
+  return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (NSString *)eventName
 {
-    return @"onGestureHandlerEvent";
+  return @"onGestureHandlerEvent";
 }
 
 - (BOOL)canCoalesce
 {
-    return YES;
+  return YES;
 }
 
 - (id<RCTEvent>)coalesceWithEvent:(id<RCTEvent>)newEvent;
 {
-    return newEvent;
+  return newEvent;
 }
 
 + (NSString *)moduleDotMethod
 {
-    return @"RCTEventEmitter.receiveEvent";
+  return @"RCTEventEmitter.receiveEvent";
 }
 
 - (NSArray *)arguments
 {
-    NSMutableDictionary *body = [NSMutableDictionary dictionaryWithDictionary:_extraData.data];
-    [body setObject:_viewTag forKey:@"target"];
-    [body setObject:_handlerTag forKey:@"handlerTag"];
-    [body setObject:@(_state) forKey:@"state"];
-    return @[self.viewTag, @"onGestureHandlerEvent", body];
+  NSMutableDictionary *body = [NSMutableDictionary dictionaryWithDictionary:_extraData.data];
+  [body setObject:_viewTag forKey:@"target"];
+  [body setObject:_handlerTag forKey:@"handlerTag"];
+  [body setObject:@(_state) forKey:@"state"];
+  return @[ self.viewTag, @"onGestureHandlerEvent", body ];
 }
 
 @end
 
-
-@implementation RNGestureHandlerStateChange
-{
-    NSNumber *_handlerTag;
-    RNGestureHandlerState _state;
-    RNGestureHandlerState _prevState;
-    RNGestureHandlerEventExtraData *_extraData;
+@implementation RNGestureHandlerStateChange {
+  NSNumber *_handlerTag;
+  RNGestureHandlerState _state;
+  RNGestureHandlerState _prevState;
+  RNGestureHandlerEventExtraData *_extraData;
 }
 
 @synthesize viewTag = _viewTag;
@@ -207,49 +202,49 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
                        prevState:(RNGestureHandlerState)prevState
                        extraData:(RNGestureHandlerEventExtraData *)extraData
 {
-    static uint16_t coalescingKey = 0;
-    if ((self = [super init])) {
-        _viewTag = reactTag;
-        _handlerTag = handlerTag;
-        _state = state;
-        _prevState = prevState;
-        _extraData = extraData;
-        _coalescingKey = coalescingKey++;
-    }
-    return self;
+  static uint16_t coalescingKey = 0;
+  if ((self = [super init])) {
+    _viewTag = reactTag;
+    _handlerTag = handlerTag;
+    _state = state;
+    _prevState = prevState;
+    _extraData = extraData;
+    _coalescingKey = coalescingKey++;
+  }
+  return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (NSString *)eventName
 {
-    return @"onGestureHandlerStateChange";
+  return @"onGestureHandlerStateChange";
 }
 
 - (BOOL)canCoalesce
 {
-    // TODO: event coalescing
-    return NO;
+  // TODO: event coalescing
+  return NO;
 }
 
 - (id<RCTEvent>)coalesceWithEvent:(id<RCTEvent>)newEvent;
 {
-    return newEvent;
+  return newEvent;
 }
 
 + (NSString *)moduleDotMethod
 {
-    return @"RCTEventEmitter.receiveEvent";
+  return @"RCTEventEmitter.receiveEvent";
 }
 
 - (NSArray *)arguments
 {
-    NSMutableDictionary *body = [NSMutableDictionary dictionaryWithDictionary:_extraData.data];
-    [body setObject:_viewTag forKey:@"target"];
-    [body setObject:_handlerTag forKey:@"handlerTag"];
-    [body setObject:@(_state) forKey:@"state"];
-    [body setObject:@(_prevState) forKey:@"oldState"];
-    return @[self.viewTag, @"onGestureHandlerStateChange", body];
+  NSMutableDictionary *body = [NSMutableDictionary dictionaryWithDictionary:_extraData.data];
+  [body setObject:_viewTag forKey:@"target"];
+  [body setObject:_handlerTag forKey:@"handlerTag"];
+  [body setObject:@(_state) forKey:@"state"];
+  [body setObject:@(_prevState) forKey:@"oldState"];
+  return @[ self.viewTag, @"onGestureHandlerStateChange", body ];
 }
 
 @end

package/ios/RNGestureHandlerManager.h

@@ -26,8 +26,7 @@
 
 - (void)dropAllGestureHandlers;
 
-- (void)handleSetJSResponder:(nonnull NSNumber *)viewTag
-        blockNativeResponder:(nonnull NSNumber *)blockNativeResponder;
+- (void)handleSetJSResponder:(nonnull NSNumber *)viewTag blockNativeResponder:(nonnull NSNumber *)blockNativeResponder;
 
 - (void)handleClearJSResponder;