react-native-gesture-handler 2.7.1 → 2.9.0

package/ios/RNGestureHandlerModule.mm

@@ -1,27 +1,27 @@
 #import "RNGestureHandlerModule.h"
 
-#import <React/RCTLog.h>
-#import <React/RCTViewManager.h>
 #import <React/RCTComponent.h>
+#import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
-#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
+#import <React/RCTUIManagerUtils.h>
+#import <React/RCTViewManager.h>
 
 #ifdef RN_FABRIC_ENABLED
-#import <React/RCTBridge.h>
-#import <ReactCommon/RCTTurboModule.h>
 #import <React/RCTBridge+Private.h>
-#import <ReactCommon/CallInvoker.h>
-#import <React/RCTUtils.h>
+#import <React/RCTBridge.h>
 #import <React/RCTSurfacePresenter.h>
+#import <React/RCTUtils.h>
+#import <ReactCommon/CallInvoker.h>
+#import <ReactCommon/RCTTurboModule.h>
 
 #import <react/renderer/uimanager/primitives.h>
 #endif // RN_FABRIC_ENABLED
 
-#import "RNGestureHandlerState.h"
-#import "RNGestureHandlerDirection.h"
 #import "RNGestureHandler.h"
+#import "RNGestureHandlerDirection.h"
 #import "RNGestureHandlerManager.h"
+#import "RNGestureHandlerState.h"
 
 #import "RNGestureHandlerButton.h"
 #import "RNGestureHandlerStateManager.h"
@@ -43,46 +43,45 @@ using namespace react;
 
 typedef void (^GestureHandlerOperation)(RNGestureHandlerManager *manager);
 
-@implementation RNGestureHandlerModule
-{
-    RNGestureHandlerManager *_manager;
+@implementation RNGestureHandlerModule {
+  RNGestureHandlerManager *_manager;
 
-    // Oparations called after views have been updated.
-    NSMutableArray<GestureHandlerOperation> *_operations;
+  // Oparations called after views have been updated.
+  NSMutableArray<GestureHandlerOperation> *_operations;
 }
 
 RCT_EXPORT_MODULE()
 
 + (BOOL)requiresMainQueueSetup
 {
-    return YES;
+  return YES;
 }
 
 - (void)invalidate
 {
-    RNGestureHandlerManager *handlerManager = _manager;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [handlerManager dropAllGestureHandlers];
-    });
-    
-    _manager = nil;
-    
+  RNGestureHandlerManager *handlerManager = _manager;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [handlerManager dropAllGestureHandlers];
+  });
+
+  _manager = nil;
+
 #ifdef RN_FABRIC_ENABLED
-    [self.bridge.surfacePresenter removeObserver:self];
+  [self.bridge.surfacePresenter removeObserver:self];
 #else
-    [self.bridge.uiManager.observerCoordinator removeObserver:self];
+  [self.bridge.uiManager.observerCoordinator removeObserver:self];
 #endif // RN_FABRIC_ENABLED
 }
 
 - (dispatch_queue_t)methodQueue
 {
-    // This module needs to be on the same queue as the UIManager to avoid
-    // having to lock `_operations` and `_preOperations` since `uiManagerWillFlushUIBlocks`
-    // will be called from that queue.
+  // This module needs to be on the same queue as the UIManager to avoid
+  // having to lock `_operations` and `_preOperations` since `uiManagerWillFlushUIBlocks`
+  // will be called from that queue.
 
-    // This is required as this module rely on having all the view nodes created before
-    // gesture handlers can be associated with them
-    return RCTGetUIManagerQueue();
+  // This is required as this module rely on having all the view nodes created before
+  // gesture handlers can be associated with them
+  return RCTGetUIManagerQueue();
 }
 
 #ifdef RN_FABRIC_ENABLED
@@ -92,13 +91,8 @@ void decorateRuntime(jsi::Runtime &runtime)
       runtime,
       jsi::PropNameID::forAscii(runtime, "isFormsStackingContext"),
       1,
-      [](jsi::Runtime &runtime,
-         const jsi::Value &thisValue,
-         const jsi::Value *arguments,
-         size_t count) -> jsi::Value
-      {
-        if (!arguments[0].isObject())
-        {
+      [](jsi::Runtime &runtime, const jsi::Value &thisValue, const jsi::Value *arguments, size_t count) -> jsi::Value {
+        if (!arguments[0].isObject()) {
           return jsi::Value::null();
         }
 
@@ -113,85 +107,96 @@ void decorateRuntime(jsi::Runtime &runtime)
 
 - (void)setBridge:(RCTBridge *)bridge
 {
-    [super setBridge:bridge];
+  [super setBridge:bridge];
 
-    _manager = [[RNGestureHandlerManager alloc]
-                initWithUIManager:bridge.uiManager
-                eventDispatcher:bridge.eventDispatcher];
-    _operations = [NSMutableArray new];
+  _manager = [[RNGestureHandlerManager alloc] initWithUIManager:bridge.uiManager
+                                                eventDispatcher:bridge.eventDispatcher];
+  _operations = [NSMutableArray new];
 
 #ifdef RN_FABRIC_ENABLED
-    [bridge.surfacePresenter addObserver:self];
+  [bridge.surfacePresenter addObserver:self];
 #else
-    [bridge.uiManager.observerCoordinator addObserver:self];
+  [bridge.uiManager.observerCoordinator addObserver:self];
 #endif // RN_FABRIC_ENABLED
 }
 
 #ifdef RN_FABRIC_ENABLED
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
-    RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
-    auto runtime = (jsi::Runtime *)cxxBridge.runtime;
-    decorateRuntime(*runtime);
-    return @true;
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
+{
+  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
+  auto runtime = (jsi::Runtime *)cxxBridge.runtime;
+  decorateRuntime(*runtime);
+  return @true;
 }
 #endif // RN_FABRIC_ENABLED
 
-RCT_EXPORT_METHOD(createGestureHandler:(nonnull NSString *)handlerName tag:(nonnull NSNumber *)handlerTag config:(NSDictionary *)config)
+RCT_EXPORT_METHOD(createGestureHandler
+                  : (nonnull NSString *)handlerName tag
+                  : (nonnull NSNumber *)handlerTag config
+                  : (NSDictionary *)config)
 {
-    [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-        [manager createGestureHandler:handlerName tag:handlerTag config:config];
-    }];
+  [self addOperationBlock:^(RNGestureHandlerManager *manager) {
+    [manager createGestureHandler:handlerName tag:handlerTag config:config];
+  }];
 }
 
-RCT_EXPORT_METHOD(attachGestureHandler:(nonnull NSNumber *)handlerTag toViewWithTag:(nonnull NSNumber *)viewTag actionType:(nonnull NSNumber *)actionType)
+RCT_EXPORT_METHOD(attachGestureHandler
+                  : (nonnull NSNumber *)handlerTag toViewWithTag
+                  : (nonnull NSNumber *)viewTag actionType
+                  : (nonnull NSNumber *)actionType)
 {
-    [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-        [manager attachGestureHandler:handlerTag toViewWithTag:viewTag withActionType:(RNGestureHandlerActionType)[actionType integerValue]];
-    }];
+  [self addOperationBlock:^(RNGestureHandlerManager *manager) {
+    [manager attachGestureHandler:handlerTag
+                    toViewWithTag:viewTag
+                   withActionType:(RNGestureHandlerActionType)[actionType integerValue]];
+  }];
 }
 
-RCT_EXPORT_METHOD(updateGestureHandler:(nonnull NSNumber *)handlerTag config:(NSDictionary *)config)
+RCT_EXPORT_METHOD(updateGestureHandler : (nonnull NSNumber *)handlerTag config : (NSDictionary *)config)
 {
-    [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-        [manager updateGestureHandler:handlerTag config:config];
-    }];
+  [self addOperationBlock:^(RNGestureHandlerManager *manager) {
+    [manager updateGestureHandler:handlerTag config:config];
+  }];
 }
 
-RCT_EXPORT_METHOD(dropGestureHandler:(nonnull NSNumber *)handlerTag)
+RCT_EXPORT_METHOD(dropGestureHandler : (nonnull NSNumber *)handlerTag)
 {
-    [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-        [manager dropGestureHandler:handlerTag];
-    }];
+  [self addOperationBlock:^(RNGestureHandlerManager *manager) {
+    [manager dropGestureHandler:handlerTag];
+  }];
 }
 
-RCT_EXPORT_METHOD(handleSetJSResponder:(nonnull NSNumber *)viewTag blockNativeResponder:(nonnull NSNumber *)blockNativeResponder)
+RCT_EXPORT_METHOD(handleSetJSResponder
+                  : (nonnull NSNumber *)viewTag blockNativeResponder
+                  : (nonnull NSNumber *)blockNativeResponder)
 {
-    [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-        [manager handleSetJSResponder:viewTag blockNativeResponder:blockNativeResponder];
-    }];
+  [self addOperationBlock:^(RNGestureHandlerManager *manager) {
+    [manager handleSetJSResponder:viewTag blockNativeResponder:blockNativeResponder];
+  }];
 }
 
 RCT_EXPORT_METHOD(handleClearJSResponder)
 {
-    [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-        [manager handleClearJSResponder];
-    }];
+  [self addOperationBlock:^(RNGestureHandlerManager *manager) {
+    [manager handleClearJSResponder];
+  }];
 }
 
 RCT_EXPORT_METHOD(flushOperations)
 {
-    if (_operations.count == 0) {
-        return;
-    }
+  if (_operations.count == 0) {
+    return;
+  }
 
-    NSArray<GestureHandlerOperation> *operations = _operations;
-    _operations = [NSMutableArray new];
+  NSArray<GestureHandlerOperation> *operations = _operations;
+  _operations = [NSMutableArray new];
 
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+  [self.bridge.uiManager
+      addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         for (GestureHandlerOperation operation in operations) {
-            operation(self->_manager);
+          operation(self->_manager);
         }
-    }];
+      }];
 }
 
 - (void)setGestureState:(int)state forHandler:(int)handlerTag
@@ -212,12 +217,12 @@ RCT_EXPORT_METHOD(flushOperations)
       handler.recognizer.state = UIGestureRecognizerStateEnded;
     }
   }
-  
+
   // if the gesture was set to finish, cancel all pointers it was tracking
   if (state == 1 || state == 3 || state == 5) {
     [handler.pointerTracker cancelPointers];
   }
-  
+
   // do not send state change event when activating because it bypasses
   // shouldRequireFailureOfGestureRecognizer
   if (state != 4) {
@@ -225,11 +230,11 @@ RCT_EXPORT_METHOD(flushOperations)
   }
 }
 
-#pragma mark -- Batch handling
+#pragma mark-- Batch handling
 
 - (void)addOperationBlock:(GestureHandlerOperation)operation
 {
-    [_operations addObject:operation];
+  [_operations addObject:operation];
 }
 
 #pragma mark - RCTSurfacePresenterObserver
@@ -238,18 +243,18 @@ RCT_EXPORT_METHOD(flushOperations)
 
 - (void)didMountComponentsWithRootTag:(NSInteger)rootTag
 {
-    RCTAssertMainQueue();
-    
-    if (_operations.count == 0) {
-        return;
-    }
+  RCTAssertMainQueue();
 
-    NSArray<GestureHandlerOperation> *operations = _operations;
-    _operations = [NSMutableArray new];
+  if (_operations.count == 0) {
+    return;
+  }
 
-    for (GestureHandlerOperation operation in operations) {
-        operation(self->_manager);
-    }
+  NSArray<GestureHandlerOperation> *operations = _operations;
+  _operations = [NSMutableArray new];
+
+  for (GestureHandlerOperation operation in operations) {
+    operation(self->_manager);
+  }
 }
 
 #else
@@ -263,18 +268,18 @@ RCT_EXPORT_METHOD(flushOperations)
 
 - (void)uiManagerWillPerformMounting:(RCTUIManager *)uiManager
 {
-    if (_operations.count == 0) {
-        return;
-    }
+  if (_operations.count == 0) {
+    return;
+  }
 
-    NSArray<GestureHandlerOperation> *operations = _operations;
-    _operations = [NSMutableArray new];
+  NSArray<GestureHandlerOperation> *operations = _operations;
+  _operations = [NSMutableArray new];
 
-    [uiManager addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        for (GestureHandlerOperation operation in operations) {
-            operation(self->_manager);
-        }
-    }];
+  [uiManager addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    for (GestureHandlerOperation operation in operations) {
+      operation(self->_manager);
+    }
+  }];
 }
 
 #endif // RN_FABRIC_ENABLED
@@ -283,30 +288,29 @@ RCT_EXPORT_METHOD(flushOperations)
 
 - (NSArray<NSString *> *)supportedEvents
 {
-    return @[@"onGestureHandlerEvent", @"onGestureHandlerStateChange"];
+  return @[ @"onGestureHandlerEvent", @"onGestureHandlerStateChange" ];
 }
 
 #pragma mark Module Constants
 
 - (NSDictionary *)constantsToExport
 {
-    return @{ @"State": @{
-                      @"UNDETERMINED": @(RNGestureHandlerStateUndetermined),
-                      @"BEGAN": @(RNGestureHandlerStateBegan),
-                      @"ACTIVE": @(RNGestureHandlerStateActive),
-                      @"CANCELLED": @(RNGestureHandlerStateCancelled),
-                      @"FAILED": @(RNGestureHandlerStateFailed),
-                      @"END": @(RNGestureHandlerStateEnd)
-                      },
-              @"Direction": @{
-                      @"RIGHT": @(RNGestureHandlerDirectionRight),
-                      @"LEFT": @(RNGestureHandlerDirectionLeft),
-                      @"UP": @(RNGestureHandlerDirectionUp),
-                      @"DOWN": @(RNGestureHandlerDirectionDown)
-                      }
-              };
+  return @{
+    @"State" : @{
+      @"UNDETERMINED" : @(RNGestureHandlerStateUndetermined),
+      @"BEGAN" : @(RNGestureHandlerStateBegan),
+      @"ACTIVE" : @(RNGestureHandlerStateActive),
+      @"CANCELLED" : @(RNGestureHandlerStateCancelled),
+      @"FAILED" : @(RNGestureHandlerStateFailed),
+      @"END" : @(RNGestureHandlerStateEnd)
+    },
+    @"Direction" : @{
+      @"RIGHT" : @(RNGestureHandlerDirectionRight),
+      @"LEFT" : @(RNGestureHandlerDirectionLeft),
+      @"UP" : @(RNGestureHandlerDirectionUp),
+      @"DOWN" : @(RNGestureHandlerDirectionDown)
+    }
+  };
 }
 
-
-
 @end

package/ios/RNGestureHandlerPointerTracker.h

@@ -13,7 +13,7 @@
 @property (nonatomic) NSArray<NSDictionary *> *allPointersData;
 @property (nonatomic) int trackedPointersCount;
 
-- (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler;
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
 - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;

package/ios/RNGestureHandlerPointerTracker.m

@@ -15,11 +15,11 @@
   _trackedPointersCount = 0;
   _changedPointersData = nil;
   _allPointersData = nil;
-  
+
   for (int i = 0; i < MAX_POINTERS_COUNT; i++) {
     _trackedPointers[i] = nil;
   }
-  
+
   return self;
 }
 
@@ -31,7 +31,7 @@
       return index;
     }
   }
-  
+
   return -1;
 }
 
@@ -43,7 +43,7 @@
       return index;
     }
   }
-  
+
   return -1;
 }
 
@@ -68,32 +68,34 @@
   return count;
 }
 
-- (NSDictionary *)extractPointerData:(int)index
-                            forTouch:(UITouch *)touch
+- (NSDictionary *)extractPointerData:(int)index forTouch:(UITouch *)touch
 {
   CGPoint relativePos = [touch locationInView:_gestureHandler.recognizer.view];
   CGPoint absolutePos = [touch locationInView:_gestureHandler.recognizer.view.window];
-  
-  return @{@"id": @(index),
-              @"x": @(relativePos.x),
-              @"y": @(relativePos.y),
-              @"absoluteX": @(absolutePos.x),
-              @"absoluteY": @(absolutePos.y)};
+
+  return @{
+    @"id" : @(index),
+    @"x" : @(relativePos.x),
+    @"y" : @(relativePos.y),
+    @"absoluteX" : @(absolutePos.x),
+    @"absoluteY" : @(absolutePos.y)
+  };
 }
 
-- (void)extractAllTouches {
+- (void)extractAllTouches
+{
   int registeredTouches = [self registeredTouchesCount];
 
   NSDictionary *data[registeredTouches];
   int nextIndex = 0;
-  
+
   for (int i = 0; i < MAX_POINTERS_COUNT; i++) {
     UITouch *touch = _trackedPointers[i];
     if (touch != nil) {
       data[nextIndex++] = [self extractPointerData:i forTouch:touch];
     }
   }
-  
+
   _allPointersData = [[NSArray alloc] initWithObjects:data count:registeredTouches];
 }
 
@@ -102,11 +104,11 @@
   if (!_gestureHandler.needsPointerData) {
     return;
   }
-  
+
   _eventType = RNGHTouchEventTypePointerDown;
-  
+
   NSDictionary *data[touches.count];
-  
+
   for (int i = 0; i < [touches count]; i++) {
     UITouch *touch = [[touches allObjects] objectAtIndex:i];
     int index = [self registerTouch:touch];
@@ -116,7 +118,7 @@
 
     data[i] = [self extractPointerData:index forTouch:touch];
   }
-  
+
   _changedPointersData = [[NSArray alloc] initWithObjects:data count:[touches count]];
   // extract all touches last to include the ones that were just added
   [self extractAllTouches];
@@ -128,17 +130,17 @@
   if (!_gestureHandler.needsPointerData) {
     return;
   }
-  
+
   _eventType = RNGHTouchEventTypePointerMove;
-  
+
   NSDictionary *data[touches.count];
-  
+
   for (int i = 0; i < [touches count]; i++) {
     UITouch *touch = [[touches allObjects] objectAtIndex:i];
     int index = [self findTouchIndex:touch];
     data[i] = [self extractPointerData:index forTouch:touch];
   }
-  
+
   _changedPointersData = [[NSArray alloc] initWithObjects:data count:[touches count]];
   [self extractAllTouches];
   [self sendEvent];
@@ -149,14 +151,14 @@
   if (!_gestureHandler.needsPointerData) {
     return;
   }
-  
+
   // extract all touches first to include the ones that were just lifted
   [self extractAllTouches];
-  
+
   _eventType = RNGHTouchEventTypePointerUp;
-  
+
   NSDictionary *data[touches.count];
-  
+
   for (int i = 0; i < [touches count]; i++) {
     UITouch *touch = [[touches allObjects] objectAtIndex:i];
     int index = [self unregisterTouch:touch];
@@ -166,7 +168,7 @@
 
     data[i] = [self extractPointerData:index forTouch:touch];
   }
-  
+
   _changedPointersData = [[NSArray alloc] initWithObjects:data count:[touches count]];
   [self sendEvent];
 }
@@ -176,7 +178,7 @@
   if (!_gestureHandler.needsPointerData) {
     return;
   }
-  
+
   [self reset];
 }
 
@@ -185,7 +187,7 @@
   if (!_gestureHandler.needsPointerData) {
     return;
   }
-  
+
   if (_trackedPointersCount == 0) {
     // gesture has finished because all pointers were lifted, reset event type to send state change event
     _eventType = RNGHTouchEventTypeUndetermined;
@@ -195,7 +197,7 @@
     // we need to clear the pointers and send info about their cancellation
     [self cancelPointers];
   }
-  
+
   [_gestureHandler reset];
 }
 
@@ -203,13 +205,13 @@
 {
   // extract all touches first to include the ones that were just cancelled
   [self extractAllTouches];
-  
+
   int registeredTouches = [self registeredTouchesCount];
-  
+
   if (registeredTouches > 0) {
     int nextIndex = 0;
     NSDictionary *data[registeredTouches];
-    
+
     for (int i = 0; i < MAX_POINTERS_COUNT; i++) {
       UITouch *touch = _trackedPointers[i];
       if (touch != nil) {
@@ -217,7 +219,7 @@
         [self unregisterTouch:touch];
       }
     }
-    
+
     _eventType = RNGHTouchEventTypeCancelled;
     _changedPointersData = [[NSArray alloc] initWithObjects:data count:registeredTouches];
     [self sendEvent];
@@ -233,8 +235,9 @@
   if (!_gestureHandler.needsPointerData || _gestureHandler.recognizer.view.reactTag == nil) {
     return;
   }
-  
-  [_gestureHandler sendTouchEventInState:[_gestureHandler state] forViewWithTag:_gestureHandler.recognizer.view.reactTag];
+
+  [_gestureHandler sendTouchEventInState:[_gestureHandler state]
+                          forViewWithTag:_gestureHandler.recognizer.view.reactTag];
 }
 
 @end

package/ios/RNGestureHandlerRegistry.h

@@ -12,7 +12,9 @@
 
 - (nullable RNGestureHandler *)handlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)registerGestureHandler:(nonnull RNGestureHandler *)gestureHandler;
-- (void)attachHandlerWithTag:(nonnull NSNumber *)handlerTag toView:(nonnull UIView *)view withActionType:(RNGestureHandlerActionType)actionType;
+- (void)attachHandlerWithTag:(nonnull NSNumber *)handlerTag
+                      toView:(nonnull UIView *)view
+              withActionType:(RNGestureHandlerActionType)actionType;
 - (void)dropHandlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)dropAllHandlers;