react-native-gesture-handler 2.2.0 → 2.3.2

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Krzysztof Magiera
+Copyright (c) 2016 Software Mansion <swmansion.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -11,6 +11,10 @@ It makes touch interactions and gesture tracking not only smooth, but also depen
 
 Check [getting started](https://docs.swmansion.com/react-native-gesture-handler/docs/#installation) section of our docs for the detailed installation instructions.
 
+## Fabric
+
+To learn how to use `react-native-gesture-handler` with Fabric architecture, head over to [Fabric README](README-Fabric.md). Instructions on how to run Fabric Example within this repo can be found in the [FabricExample README](FabricExample/README.md).
+
 ## Documentation
 
 Check out our dedicated documentation page for info about this library, API reference and more: [https://docs.swmansion.com/react-native-gesture-handler/docs/](https://docs.swmansion.com/react-native-gesture-handler/docs/)
@@ -31,7 +35,7 @@ Run `yarn android` or `yarn ios` (depending on which platform you want to run th
 
 You will need to have an Android or iOS device or emulator connected as well as `react-native-cli` package installed globally.
 
-## React native Support
+## React Native Support
 
 | version | react-native version |
 | ------- | -------------------- |

package/RNGestureHandler.podspec

@@ -1,5 +1,7 @@
 require "json"
 
+fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED']
+
 Pod::Spec.new do |s|
   # NPM package specification
   package = JSON.parse(File.read(File.join(File.dirname(__FILE__), "package.json")))
@@ -10,10 +12,32 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/software-mansion/react-native-gesture-handler"
   s.license      = "MIT"
   s.author       = { package["author"]["name"] => package["author"]["email"] }
-  s.platforms    = { :ios => "9.0", :tvos => "9.0" }
   s.source       = { :git => "https://github.com/software-mansion/react-native-gesture-handler", :tag => "#{s.version}" }
-  s.source_files = "ios/**/*.{h,m}"
+  s.source_files = "ios/**/*.{h,m,mm}"
+  s.requires_arc = true
+
+  if fabric_enabled
+    # folly_version must match the version used in React Native
+    # See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec
+    folly_version = '2021.06.28.00-v2'
+    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+    s.pod_target_xcconfig = {
+      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly"'
+    }
+    s.platforms       = { ios: '11.0', tvos: '11.0' }
+    s.compiler_flags  = folly_compiler_flags + ' -DRN_FABRIC_ENABLED'
 
-  s.dependency "React-Core"
+    s.dependency "React"
+    s.dependency "React-RCTFabric" # This is for fabric component
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly", folly_version
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+  else
+    s.platforms = { :ios => "9.0", :tvos => "9.0" }
 
+    s.dependency "React-Core"
+  end
 end

package/android/build.gradle

@@ -12,6 +12,17 @@ buildscript {
     }
 }
 
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
@@ -45,18 +56,62 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 28)
         versionCode 1
         versionName "1.0"
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+        if (isNewArchitectureEnabled()) {
+            var appProject = rootProject.allprojects.find {it.plugins.hasPlugin('com.android.application')}
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "APP_PLATFORM=android-21",
+                            "APP_STL=c++_shared",
+                            "NDK_TOOLCHAIN_VERSION=clang",
+                            "GENERATED_SRC_DIR=${appProject.buildDir}/generated/source",
+                            "PROJECT_BUILD_DIR=${appProject.buildDir}",
+                            "REACT_ANDROID_DIR=${appProject.rootDir}/../node_modules/react-native/ReactAndroid",
+                            "REACT_ANDROID_BUILD_DIR=${appProject.rootDir}/../node_modules/react-native/ReactAndroid/build"
+                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+                    cppFlags "-std=c++17"
+                    targets "rngesturehandler_modules"
+                }
+            }
+        }
+    }
+
+    if (isNewArchitectureEnabled()) {
+        externalNativeBuild {
+            ndkBuild {
+                path "src/main/jni/Android.mk"
+            }
+        }
+    }
+
+    packagingOptions {
+        // For some reason gradle only complains about the duplicated version of libreact_render libraries
+        // while there are more libraries copied in intermediates folder of the lib build directory, we exclude
+        // only the ones that make the build fail (ideally we should only include librngesturehandler_modules but we
+        // are only allowed to specify exclude patterns)
+        exclude "**/libreact_render*.so"
     }
 
     // Include "lib/" as sources, unfortunately react-native link can't handle
     // setting up alternative gradle modules. We still have "lib" defined as a
     // standalone gradle module just to be used in AndroidNativeExample
-    sourceSets {
-        main.java.srcDirs += 'lib/src/main/java'
+    sourceSets.main {
+        java {
+            srcDirs += 'lib/src/main/java'
 
-        // Include "common/" only when it's not provided by Reanimated to mitigate
-        // multiple definitions of the same class preventing build
-        if (!shouldUseCommonInterfaceFromReanimated()) {
-            main.java.srcDirs += 'common/src/main/java'
+            // Include "common/" only when it's not provided by Reanimated to mitigate
+            // multiple definitions of the same class preventing build
+            if (!shouldUseCommonInterfaceFromReanimated()) {
+                srcDirs += 'common/src/main/java'
+            }
+
+            if (isNewArchitectureEnabled()) {
+                srcDirs += 'src/fabric/java'
+            } else {
+                // this folder also includes files from codegen so the library can compile with
+                // codegen turned off
+                srcDirs += 'src/paper/java'
+            }
         }
     }
 }
@@ -65,12 +120,30 @@ def kotlin_version = safeExtGet('kotlinVersion', project.properties['RNGH_kotlin
 
 dependencies {
     //noinspection GradleDynamicVersion
+    if (isNewArchitectureEnabled()) {
+        implementation project(':ReactAndroid')
+    } else {
+        implementation 'com.facebook.react:react-native:+'
+    }
+
     if (shouldUseCommonInterfaceFromReanimated()) {
         // Include Reanimated as dependency to load the common interface
-        implementation project(':react-native-reanimated')
+        implementation (project(':react-native-reanimated')) {
+            exclude group:'com.facebook.fbjni' // resolves "Duplicate class com.facebook.jni.CppException"
+        }
     }
-    implementation 'com.facebook.react:react-native:+'
+
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
+
+if (isNewArchitectureEnabled()) {
+    react {
+        reactRoot = rootProject.file("../node_modules/react-native/")
+        jsRootDir = file("../src/fabric/")
+        codegenDir = rootProject.file("../node_modules/react-native-codegen/")
+        libraryName = "rngesturehandler"
+        codegenJavaPackageName = "com.swmansion.gesturehandler"
+    }
+}

package/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandler.kt

@@ -34,7 +34,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     private set
   var isEnabled = true
     private set
-  var usesDeviceEvents = false
+  var actionType = 0
 
   var changedTouchesPayload: WritableArray? = null
     private set
@@ -700,6 +700,10 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     const val DIRECTION_LEFT = 2
     const val DIRECTION_UP = 4
     const val DIRECTION_DOWN = 8
+    const val ACTION_TYPE_REANIMATED_WORKLET = 1
+    const val ACTION_TYPE_NATIVE_ANIMATED_EVENT = 2
+    const val ACTION_TYPE_JS_FUNCTION_OLD_API = 3
+    const val ACTION_TYPE_JS_FUNCTION_NEW_API = 4
     private const val MAX_POINTERS_COUNT = 12
     private lateinit var pointerProps: Array<PointerProperties?>
     private lateinit var pointerCoords: Array<PointerCoords?>

package/android/lib/src/main/java/com/swmansion/gesturehandler/GestureHandlerOrchestrator.kt

@@ -383,11 +383,13 @@ class GestureHandlerOrchestrator(
         val parentViewGroup: ViewGroup = parent
 
         handlerRegistry.getHandlersForView(parent)?.let {
-          for (handler in it) {
-            if (handler.isEnabled && handler.isWithinBounds(view, coords[0], coords[1])) {
-              found = true
-              recordHandlerIfNotPresent(handler, parentViewGroup)
-              handler.startTrackingPointer(pointerId)
+          synchronized(it) {
+            for (handler in it) {
+              if (handler.isEnabled && handler.isWithinBounds(view, coords[0], coords[1])) {
+                found = true
+                recordHandlerIfNotPresent(handler, parentViewGroup)
+                handler.startTrackingPointer(pointerId)
+              }
             }
           }
         }
@@ -402,13 +404,13 @@ class GestureHandlerOrchestrator(
   private fun recordViewHandlersForPointer(view: View, coords: FloatArray, pointerId: Int): Boolean {
     var found = false
     handlerRegistry.getHandlersForView(view)?.let {
-      val size = it.size
-      for (i in 0 until size) {
-        val handler = it[i]
-        if (handler.isEnabled && handler.isWithinBounds(view, coords[0], coords[1])) {
-          recordHandlerIfNotPresent(handler, view)
-          handler.startTrackingPointer(pointerId)
-          found = true
+      synchronized(it) {
+        for (handler in it) {
+          if (handler.isEnabled && handler.isWithinBounds(view, coords[0], coords[1])) {
+            recordHandlerIfNotPresent(handler, view)
+            handler.startTrackingPointer(pointerId)
+            found = true
+          }
         }
       }
     }

package/android/lib/src/main/java/com/swmansion/gesturehandler/PinchGestureHandler.kt

@@ -1,8 +1,6 @@
 package com.swmansion.gesturehandler
 
 import android.view.MotionEvent
-import android.view.ScaleGestureDetector
-import android.view.ScaleGestureDetector.OnScaleGestureListener
 import android.view.ViewConfiguration
 import kotlin.math.abs
 
@@ -19,7 +17,7 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
   private var scaleGestureDetector: ScaleGestureDetector? = null
   private var startingSpan = 0f
   private var spanSlop = 0f
-  private val gestureListener: OnScaleGestureListener = object : OnScaleGestureListener {
+  private val gestureListener: ScaleGestureDetector.OnScaleGestureListener = object : ScaleGestureDetector.OnScaleGestureListener {
     override fun onScale(detector: ScaleGestureDetector): Boolean {
       val prevScaleFactor: Double = scale
       scale *= detector.scaleFactor.toDouble()
@@ -28,7 +26,7 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
         velocity = (scale - prevScaleFactor) / delta
       }
       if (abs(startingSpan - detector.currentSpan) >= spanSlop
-        && state == STATE_BEGAN) {
+              && state == STATE_BEGAN) {
         activate()
       }
       return true