react-native-gesture-handler 2.7.1 → 2.9.0

package/android/src/main/jni/CMakeLists.txt

@@ -3,57 +3,23 @@ cmake_minimum_required(VERSION 3.9.0)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1")
+
+set(REACT_ANDROID_DIR "${REACT_NATIVE_DIR}/ReactAndroid")
+
+include(${REACT_ANDROID_DIR}/cmake-utils/folly-flags.cmake)
+add_compile_options(${folly_FLAGS})
 
 add_library(gesturehandler
   SHARED
   cpp-adapter.cpp
 )
 
-set(REACT_ANDROID_DIR "${REACT_NATIVE_DIR}/ReactAndroid")
-set(REACT_COMMON_DIR "${REACT_NATIVE_DIR}/ReactCommon")
-set(REACT_NDK_EXPORT_DIR "${APP_BUILD_DIR}/react-ndk/exported")
-
-# copied from react-native/ReactAndroid/cmake-utils/Android-prebuilt.cmake
-
-## jsi
-add_library(jsi SHARED IMPORTED GLOBAL)
-set_target_properties(jsi
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libjsi.so)
-target_include_directories(jsi INTERFACE ${REACT_COMMON_DIR}/jsi)
-
-## react_render_core
-add_library(react_render_core SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_core
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_core.so)
-target_include_directories(react_render_core
-        INTERFACE
-        ${REACT_COMMON_DIR}
-        ${REACT_COMMON_DIR}/react/renderer/core)
-
-## react_render_uimanager
-add_library(react_render_uimanager SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_uimanager
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_uimanager.so)
-target_include_directories(react_render_uimanager INTERFACE ${REACT_COMMON_DIR}/react/renderer/uimanager)
-
-target_include_directories(
-  gesturehandler
-  PRIVATE
-  "${REACT_ANDROID_DIR}/build/third-party-ndk/boost/boost_1_76_0"
-  "${REACT_ANDROID_DIR}/build/third-party-ndk/double-conversion"
-  "${REACT_ANDROID_DIR}/build/third-party-ndk/folly"
-)
+find_package(ReactAndroid REQUIRED CONFIG)
 
 target_link_libraries(
   gesturehandler
-  jsi
-  react_render_uimanager
-  react_render_core
+  ReactAndroid::react_render_core
+  ReactAndroid::react_render_uimanager
+  ReactAndroid::jsi
+  ReactAndroid::react_nativemodule_core
 )

package/android/src/main/jni/cpp-adapter.cpp

@@ -6,8 +6,7 @@
 using namespace facebook;
 using namespace react;
 
-void decorateRuntime(jsi::Runtime &runtime)
-{
+void decorateRuntime(jsi::Runtime &runtime) {
   auto isFormsStackingContext = jsi::Function::createFromHostFunction(
       runtime,
       jsi::PropNameID::forAscii(runtime, "isFormsStackingContext"),
@@ -15,27 +14,31 @@ void decorateRuntime(jsi::Runtime &runtime)
       [](jsi::Runtime &runtime,
          const jsi::Value &thisValue,
          const jsi::Value *arguments,
-         size_t count) -> jsi::Value
-      {
-        if (!arguments[0].isObject())
-        {
+         size_t count) -> jsi::Value {
+        if (!arguments[0].isObject()) {
           return jsi::Value::null();
         }
 
-        auto shadowNode = arguments[0].asObject(runtime).getHostObject<ShadowNodeWrapper>(runtime)->shadowNode;
-        bool isFormsStackingContext = shadowNode->getTraits().check(ShadowNodeTraits::FormsStackingContext);
+        auto shadowNode = arguments[0]
+                              .asObject(runtime)
+                              .getHostObject<ShadowNodeWrapper>(runtime)
+                              ->shadowNode;
+        bool isFormsStackingContext = shadowNode->getTraits().check(
+            ShadowNodeTraits::FormsStackingContext);
 
         return jsi::Value(isFormsStackingContext);
       });
-  runtime.global().setProperty(runtime, "isFormsStackingContext", std::move(isFormsStackingContext));
+  runtime.global().setProperty(
+      runtime, "isFormsStackingContext", std::move(isFormsStackingContext));
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_swmansion_gesturehandler_react_RNGestureHandlerModule_decorateRuntime(JNIEnv *env, jobject clazz, jlong jsiPtr)
-{
+Java_com_swmansion_gesturehandler_react_RNGestureHandlerModule_decorateRuntime(
+    JNIEnv *env,
+    jobject clazz,
+    jlong jsiPtr) {
   jsi::Runtime *runtime = reinterpret_cast<jsi::Runtime *>(jsiPtr);
-  if (runtime)
-  {
+  if (runtime) {
     decorateRuntime(*runtime);
   }
 }

package/android/src/paper/java/com/swmansion/gesturehandler/ReactContextExtensions.kt

@@ -5,9 +5,9 @@ import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.uimanager.events.Event
 
 fun ReactContext.dispatchEvent(event: Event<*>) {
-    try {
-        this.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher.dispatchEvent(event)
-    } catch (e: NullPointerException) {
-        throw Exception("Couldn't get an instance of UIManagerModule. Gesture Handler is unable to send an event.", e)
-    }
+  try {
+    this.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher.dispatchEvent(event)
+  } catch (e: NullPointerException) {
+    throw Exception("Couldn't get an instance of UIManagerModule. Gesture Handler is unable to send an event.", e)
+  }
 }

package/ios/Handlers/RNFlingHandler.m

@@ -2,12 +2,12 @@
 
 @interface RNBetterSwipeGestureRecognizer : UISwipeGestureRecognizer
 
-- (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler;
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 
 @end
 
 @implementation RNBetterSwipeGestureRecognizer {
-  __weak RNGestureHandler* _gestureHandler;
+  __weak RNGestureHandler *_gestureHandler;
   CGPoint _lastPoint; // location of the most recently updated touch, relative to the view
   bool _hasBegan; // whether the `BEGAN` event has been sent
 }
@@ -27,6 +27,7 @@
   _lastPoint = [[[touches allObjects] objectAtIndex:0] locationInView:_gestureHandler.recognizer.view];
   [_gestureHandler reset];
   [super touchesBegan:touches withEvent:event];
+  [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
 
   // self.numberOfTouches doesn't work for this because in case than one finger is required,
   // when holding one finger on the screen and tapping with the second one, numberOfTouches is equal
@@ -35,8 +36,6 @@
     [self triggerAction];
     _hasBegan = YES;
   }
-
-  [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
 }
 
 - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
@@ -73,7 +72,8 @@
   [super reset];
 }
 
-- (CGPoint)getLastLocation {
+- (CGPoint)getLastLocation
+{
   // I think keeping the location of only one touch is enough since it would be used to determine the direction
   // of the movement, and if it's wrong the recognizer fails anyway.
   // In case the location of all touches is required, touch events are the way to go
@@ -103,48 +103,50 @@
 
 - (void)configure:(NSDictionary *)config
 {
-    [super configure:config];
-    UISwipeGestureRecognizer *recognizer = (UISwipeGestureRecognizer *)_recognizer;
-
-    id prop = config[@"direction"];
-    if (prop != nil) {
-        recognizer.direction = [RCTConvert NSInteger:prop];
-    }
-    
+  [super configure:config];
+  UISwipeGestureRecognizer *recognizer = (UISwipeGestureRecognizer *)_recognizer;
+
+  id prop = config[@"direction"];
+  if (prop != nil) {
+    recognizer.direction = [RCTConvert NSInteger:prop];
+  }
+
 #if !TARGET_OS_TV
-    prop = config[@"numberOfPointers"];
-    if (prop != nil) {
-        recognizer.numberOfTouchesRequired = [RCTConvert NSInteger:prop];
-    }
+  prop = config[@"numberOfPointers"];
+  if (prop != nil) {
+    recognizer.numberOfTouchesRequired = [RCTConvert NSInteger:prop];
+  }
 #endif
 }
 
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
-    RNGestureHandlerState savedState = _lastState;
-    BOOL shouldBegin = [super gestureRecognizerShouldBegin:gestureRecognizer];
-    _lastState = savedState;
-    
-    return shouldBegin;
+  RNGestureHandlerState savedState = _lastState;
+  BOOL shouldBegin = [super gestureRecognizerShouldBegin:gestureRecognizer];
+  _lastState = savedState;
+
+  return shouldBegin;
 }
 
 - (RNGestureHandlerEventExtraData *)eventExtraData:(id)_recognizer
 {
-    // For some weird reason [recognizer locationInView:recognizer.view.window] returns (0, 0).
-    // To calculate the correct absolute position, first calculate the absolute position of the
-    // view inside the root view controller (https://stackoverflow.com/a/7448573) and then
-    // add the relative touch position to it.
-    
-    RNBetterSwipeGestureRecognizer *recognizer = (RNBetterSwipeGestureRecognizer *)_recognizer;
-    
-    CGPoint viewAbsolutePosition = [recognizer.view convertPoint:recognizer.view.bounds.origin toView:[UIApplication sharedApplication].keyWindow.rootViewController.view];
-    CGPoint locationInView = [recognizer getLastLocation];
-    
-    return [RNGestureHandlerEventExtraData
-            forPosition:locationInView
-            withAbsolutePosition:CGPointMake(viewAbsolutePosition.x + locationInView.x, viewAbsolutePosition.y + locationInView.y)
-            withNumberOfTouches:recognizer.numberOfTouches];
+  // For some weird reason [recognizer locationInView:recognizer.view.window] returns (0, 0).
+  // To calculate the correct absolute position, first calculate the absolute position of the
+  // view inside the root view controller (https://stackoverflow.com/a/7448573) and then
+  // add the relative touch position to it.
+
+  RNBetterSwipeGestureRecognizer *recognizer = (RNBetterSwipeGestureRecognizer *)_recognizer;
+
+  CGPoint viewAbsolutePosition =
+      [recognizer.view convertPoint:recognizer.view.bounds.origin
+                             toView:[UIApplication sharedApplication].keyWindow.rootViewController.view];
+  CGPoint locationInView = [recognizer getLastLocation];
+
+  return [RNGestureHandlerEventExtraData
+               forPosition:locationInView
+      withAbsolutePosition:CGPointMake(
+                               viewAbsolutePosition.x + locationInView.x, viewAbsolutePosition.y + locationInView.y)
+       withNumberOfTouches:recognizer.numberOfTouches];
 }
 
 @end
-

package/ios/Handlers/RNForceTouchHandler.m

@@ -11,7 +11,7 @@
 @property (nonatomic) CGFloat force;
 @property (nonatomic) BOOL feedbackOnActivation;
 
-- (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler;
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 
 @end
 
@@ -25,7 +25,7 @@ static const CGFloat defaultMinForce = 0.2;
 static const CGFloat defaultMaxForce = NAN;
 static const BOOL defaultFeedbackOnActivation = NO;
 
-- (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
   if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
@@ -45,7 +45,7 @@ static const BOOL defaultFeedbackOnActivation = NO;
   }
   [super touchesBegan:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
-  
+
   _firstTouch = [touches anyObject];
   [self handleForceWithTouches:touches];
   self.state = UIGestureRecognizerStatePossible;
@@ -59,25 +59,27 @@ static const BOOL defaultFeedbackOnActivation = NO;
   }
   [super touchesMoved:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesMoved:touches withEvent:event];
-  
+
   [self handleForceWithTouches:touches];
-  
+
   if ([self shouldFail]) {
     self.state = UIGestureRecognizerStateFailed;
     return;
   }
-  
+
   if (self.state == UIGestureRecognizerStatePossible && [self shouldActivate]) {
     [self performFeedbackIfRequired];
     self.state = UIGestureRecognizerStateBegan;
   }
 }
 
-- (BOOL)shouldActivate {
+- (BOOL)shouldActivate
+{
   return (_force >= _minForce);
 }
 
-- (BOOL)shouldFail {
+- (BOOL)shouldFail
+{
   return TEST_MAX_IF_NOT_NAN(_force, _maxForce);
 }
 
@@ -113,11 +115,13 @@ static const BOOL defaultFeedbackOnActivation = NO;
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
 }
 
-- (void)handleForceWithTouches:(NSSet<UITouch *> *)touches {
+- (void)handleForceWithTouches:(NSSet<UITouch *> *)touches
+{
   _force = _firstTouch.force / _firstTouch.maximumPossibleForce;
 }
 
-- (void)reset {
+- (void)reset
+{
   [_gestureHandler.pointerTracker reset];
   [super reset];
   _force = 0;
@@ -140,7 +144,7 @@ static const BOOL defaultFeedbackOnActivation = NO;
 {
   [super resetConfig];
   RNForceTouchGestureRecognizer *recognizer = (RNForceTouchGestureRecognizer *)_recognizer;
-  
+
   recognizer.feedbackOnActivation = defaultFeedbackOnActivation;
   recognizer.maxForce = defaultMaxForce;
   recognizer.minForce = defaultMinForce;
@@ -162,12 +166,10 @@ static const BOOL defaultFeedbackOnActivation = NO;
 
 - (RNGestureHandlerEventExtraData *)eventExtraData:(RNForceTouchGestureRecognizer *)recognizer
 {
-  return [RNGestureHandlerEventExtraData
-          forForce: recognizer.force
-          forPosition:[recognizer locationInView:recognizer.view]
-          withAbsolutePosition:[recognizer locationInView:recognizer.view.window]
-          withNumberOfTouches:recognizer.numberOfTouches];
+  return [RNGestureHandlerEventExtraData forForce:recognizer.force
+                                      forPosition:[recognizer locationInView:recognizer.view]
+                             withAbsolutePosition:[recognizer locationInView:recognizer.view.window]
+                              withNumberOfTouches:recognizer.numberOfTouches];
 }
 
 @end
-

package/ios/Handlers/RNLongPressHandler.m

@@ -19,9 +19,9 @@
   uint64_t previousTime;
 }
 
-- (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler;
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 - (void)handleGesture:(UIGestureRecognizer *)recognizer;
-- (NSUInteger) getDuration;
+- (NSUInteger)getDuration;
 
 @end
 
@@ -30,7 +30,7 @@
   CGPoint _initPosition;
 }
 
-- (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
   if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
@@ -70,10 +70,11 @@
 {
   [super touchesMoved:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesMoved:touches withEvent:event];
-  
+
   CGPoint trans = [self translationInView];
-  if ((_gestureHandler.shouldCancelWhenOutside && ![_gestureHandler containsPointInView])
-      || (TEST_MAX_IF_NOT_NAN(fabs(trans.y * trans.y + trans.x + trans.x), self.allowableMovement * self.allowableMovement))) {
+  if ((_gestureHandler.shouldCancelWhenOutside && ![_gestureHandler containsPointInView]) ||
+      (TEST_MAX_IF_NOT_NAN(
+          fabs(trans.y * trans.y + trans.x + trans.x), self.allowableMovement * self.allowableMovement))) {
     self.enabled = NO;
     self.enabled = YES;
   }
@@ -96,26 +97,25 @@
   if (self.state == UIGestureRecognizerStateFailed) {
     [self triggerAction];
   }
-  
+
   [_gestureHandler.pointerTracker reset];
-  
+
   [super reset];
 }
 
 - (NSUInteger)getDuration
 {
   static mach_timebase_info_data_t sTimebaseInfo;
-  
+
   if (sTimebaseInfo.denom == 0) {
     mach_timebase_info(&sTimebaseInfo);
   }
-  
+
   return (NSUInteger)(((previousTime - startTime) * sTimebaseInfo.numer / (sTimebaseInfo.denom * 1000000)));
 }
 
 @end
 
-
 @implementation RNLongPressGestureHandler
 
 - (instancetype)initWithTag:(NSNumber *)tag
@@ -130,7 +130,7 @@
 {
   [super resetConfig];
   UILongPressGestureRecognizer *recognizer = (UILongPressGestureRecognizer *)_recognizer;
-  
+
   recognizer.minimumPressDuration = 0.5;
   recognizer.allowableMovement = 10;
 }
@@ -139,12 +139,12 @@
 {
   [super configure:config];
   UILongPressGestureRecognizer *recognizer = (UILongPressGestureRecognizer *)_recognizer;
-  
+
   id prop = config[@"minDurationMs"];
   if (prop != nil) {
     recognizer.minimumPressDuration = [RCTConvert CGFloat:prop] / 1000.0;
   }
-  
+
   prop = config[@"maxDist"];
   if (prop != nil) {
     recognizer.allowableMovement = [RCTConvert CGFloat:prop];
@@ -165,21 +165,19 @@
 
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
-  //same as TapGH, this needs to be unified when all handlers are updated
+  // same as TapGH, this needs to be unified when all handlers are updated
   RNGestureHandlerState savedState = _lastState;
   BOOL shouldBegin = [super gestureRecognizerShouldBegin:gestureRecognizer];
   _lastState = savedState;
-  
+
   return shouldBegin;
 }
 
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIGestureRecognizer *)recognizer
 {
-    return [RNGestureHandlerEventExtraData
-            forPosition:[recognizer locationInView:recognizer.view]
-            withAbsolutePosition:[recognizer locationInView:recognizer.view.window]
-            withNumberOfTouches:recognizer.numberOfTouches
-            withDuration:[(RNBetterLongPressGestureRecognizer*)recognizer getDuration]];
+  return [RNGestureHandlerEventExtraData forPosition:[recognizer locationInView:recognizer.view]
+                                withAbsolutePosition:[recognizer locationInView:recognizer.view.window]
+                                 withNumberOfTouches:recognizer.numberOfTouches
+                                        withDuration:[(RNBetterLongPressGestureRecognizer *)recognizer getDuration]];
 }
 @end
-

package/ios/Handlers/RNManualHandler.m

@@ -2,7 +2,7 @@
 
 @interface RNManualRecognizer : UIGestureRecognizer
 
-- (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler;
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 
 @end
 
@@ -24,7 +24,7 @@
 {
   [super touchesBegan:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
-  
+
   if (_shouldSendBeginEvent) {
     [_gestureHandler handleGesture:self];
     _shouldSendBeginEvent = NO;
@@ -35,6 +35,13 @@
 {
   [super touchesMoved:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesMoved:touches withEvent:event];
+
+  if ([self shouldFail]) {
+    self.state = (self.state == UIGestureRecognizerStatePossible) ? UIGestureRecognizerStateFailed
+                                                                  : UIGestureRecognizerStateCancelled;
+
+    [self reset];
+  }
 }
 
 - (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
@@ -53,21 +60,29 @@
 {
   [_gestureHandler.pointerTracker reset];
   [super reset];
-  
+
   _shouldSendBeginEvent = YES;
 }
 
+- (BOOL)shouldFail
+{
+  if (_gestureHandler.shouldCancelWhenOutside && ![_gestureHandler containsPointInView]) {
+    return YES;
+  } else {
+    return NO;
+  }
+}
+
 @end
 
 @implementation RNManualGestureHandler
 
 - (instancetype)initWithTag:(NSNumber *)tag
 {
-    if ((self = [super initWithTag:tag])) {
-        _recognizer = [[RNManualRecognizer alloc] initWithGestureHandler:self];
-
-    }
-    return self;
+  if ((self = [super initWithTag:tag])) {
+    _recognizer = [[RNManualRecognizer alloc] initWithGestureHandler:self];
+  }
+  return self;
 }
 
 @end