react-native-gesture-handler 2.25.0 → 2.26.0

package/RNGestureHandler.podspec

@@ -34,6 +34,7 @@ Pod::Spec.new do |s|
     add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
       "react/renderer/textlayoutmanager/platform/ios",
       "react/renderer/components/textinput/platform/ios",
+      "react/renderer/components/text/platform/cxx",
     ])
   end
 

package/android/build.gradle

@@ -11,8 +11,8 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
-        classpath("com.android.tools.build:gradle:7.2.1")
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:6.7.2")
+        classpath("com.android.tools.build:gradle:8.10.1")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
     }
 }
 
@@ -39,7 +39,13 @@ def resolveReactNativeDirectory() {
     }
 
     // Fallback to node resolver for custom directory structures like monorepos.
-    def reactNativePackage = file(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim())
+    def reactNativePackage = file(
+        providers.exec {
+            workingDir(rootDir)
+            commandLine("node", "--print", "require.resolve('react-native/package.json')")
+        }.standardOutput.asText.get().trim()
+    )
+
     if (reactNativePackage.exists()) {
         return reactNativePackage.parentFile
     }
@@ -54,6 +60,7 @@ def resolveReactNativeDirectory() {
 if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
 }
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
@@ -61,34 +68,45 @@ if (project == rootProject) {
     apply from: "spotless.gradle"
 }
 
+def getExternalLibVersion(project){
+    def inputFile = new File(project.projectDir, "../package.json")
+    def json = new JsonSlurper().parseText(inputFile.text)
+    def libVerision = json.version as String
+    def (major, minor, patch) = libVerision.tokenize('.')
+
+    // Handle cases where version is a pre-release one, e.g. "2.3.0-alpha.1"
+    def patchVersion = patch.find(/(\d+)/) ? patch.find(/(\d+)/) : "0"
+
+    return [Integer.parseInt(major), Integer.parseInt(minor), Integer.parseInt(patchVersion)]
+}
+
 // Check whether Reanimated 2.3 or higher is installed alongside Gesture Handler
 def shouldUseCommonInterfaceFromReanimated() {
     def reanimated = rootProject.subprojects.find { it.name == 'react-native-reanimated' }
-    if (reanimated != null) {
-        def inputFile = new File(reanimated.projectDir, '../package.json')
-        def json = new JsonSlurper().parseText(inputFile.text)
-        def reanimatedVersion = json.version as String
-        def (major, minor, patch) = reanimatedVersion.tokenize('.')
-        return (Integer.parseInt(major) == 2 && Integer.parseInt(minor) >= 3) || Integer.parseInt(major) >= 3
-    } else {
+
+    if (reanimated == null) {
         return false
     }
+
+    def (major, minor, patch) = getExternalLibVersion(reanimated)
+    
+    return (major == 2 && minor >= 3) || major >= 3
 }
 
 def shouldUseCommonInterfaceFromRNSVG() {
     // common interface compatible with react-native-svg >= 15.11.2
     def rnsvg = rootProject.subprojects.find { it.name == 'react-native-svg' }
+
     if (rnsvg == null) {
         return false
     }
 
-    def inputFile = new File(rnsvg.projectDir, '../package.json')
-    def json = new JsonSlurper().parseText(inputFile.text)
-    def rnsvgVersion = json.version as String
-    def (major, minor, patch) = rnsvgVersion.tokenize('.')
-    return (Integer.parseInt(major) == 15 && Integer.parseInt(minor) == 11 && Integer.parseInt(patch) >= 2) ||
-            (Integer.parseInt(major) == 15 && Integer.parseInt(minor) > 11) ||
-            Integer.parseInt(major) > 15
+    def (major, minor, patch) = getExternalLibVersion(rnsvg)
+
+
+    return (major == 15 && minor == 11 && patch >= 2) ||
+            (major == 15 && minor > 11) ||
+            major > 15
 }
 
 def reactNativeArchitectures() {
@@ -102,7 +120,7 @@ def reactProperties = new Properties()
 file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
 def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
-def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
+def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
 repositories {
     mavenCentral()
@@ -111,7 +129,7 @@ repositories {
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
-    namespace "com.swmansion.gesturehandler"
+    namespace = "com.swmansion.gesturehandler"
     buildFeatures {
         buildConfig = true
         prefab = true
@@ -127,10 +145,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
+        minSdkVersion safeExtGet('minSdkVersion', 24)
         targetSdkVersion safeExtGet('targetSdkVersion', 33)
-        versionCode 1
-        versionName "1.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString()
 
@@ -175,12 +191,9 @@ android {
 
     sourceSets.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 += 'reanimated/src/main/java'
             } else {
-                srcDirs += 'common/src/main/java'
                 srcDirs += 'noreanimated/src/main/java'
             }
 
@@ -195,21 +208,7 @@ android {
             } else {
                 // 'paper/src/main/java' includes files from codegen so the library can compile with
                 // codegen turned off
-                
-                if (REACT_NATIVE_MINOR_VERSION > 77) {
-                    srcDirs += 'paper/src/main/java'
-                } else {
-                    srcDirs += 'paper77/src/main/java'
-                }
-            }
-
-            if (REACT_NATIVE_MINOR_VERSION >= 77) {
-                // With RN 0.77, ViewManager related functions in the package has different signatures as they 
-                // are no longer nullable
-                srcDirs += 'package77/src/main/java'
-            } else {
-                // It's safe to delete this block once we drop support for RN 0.76
-                srcDirs += 'packageDeprecated/src/main/java'
+                srcDirs += 'paper/src/main/java'
             }
         }
     }
@@ -247,7 +246,7 @@ dependencies {
         implementation rootProject.subprojects.find { it.name == 'react-native-svg' }
     }
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.core:core-ktx:1.6.0"
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation "androidx.core:core-ktx:1.16.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

package/android/fabric/src/main/java/com/swmansion/gesturehandler/ReactContextExtensions.kt

@@ -1,11 +1,11 @@
 package com.swmansion.gesturehandler
 
+import android.annotation.SuppressLint
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.fabric.FabricUIManager
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.Event
-import android.annotation.SuppressLint
 
 fun ReactContext.dispatchEvent(event: Event<*>) {
   @SuppressLint("WrongConstant")

package/android/gradle.properties

@@ -16,4 +16,4 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemor
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-RNGH_kotlinVersion=1.6.21
+RNGH_kotlinVersion=2.0.21

package/android/noreanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt

@@ -4,9 +4,9 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.events.Event
 
 class ReanimatedEventDispatcher {
-  @Suppress("UNUSED_PARAMETER", "COMMENT_IN_SUPPRESSION")
   // This is necessary on new architecture
-  fun <T : Event<T>>sendEvent(event: T, reactApplicationContext: ReactContext) {
+  @Suppress("UNUSED_PARAMETER", "COMMENT_IN_SUPPRESSION")
+  fun <T : Event<T>> sendEvent(event: T, reactApplicationContext: ReactContext) {
     // no-op
   }
 }

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

@@ -8,6 +8,9 @@ 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)
+    throw Exception(
+      "Couldn't get an instance of UIManagerModule. Gesture Handler is unable to send an event.",
+      e,
+    )
   }
 }

package/android/reanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt

@@ -7,7 +7,7 @@ import com.swmansion.reanimated.ReanimatedModule
 class ReanimatedEventDispatcher {
   private var reanimatedModule: ReanimatedModule? = null
 
-  fun <T : Event<T>>sendEvent(event: T, reactApplicationContext: ReactContext) {
+  fun <T : Event<T>> sendEvent(event: T, reactApplicationContext: ReactContext) {
     if (reanimatedModule == null) {
       reanimatedModule = reactApplicationContext.getNativeModule(ReanimatedModule::class.java)
     }

package/android/{package77/src → src}/main/java/com/swmansion/gesturehandler/RNGestureHandlerPackage.kt

@@ -16,10 +16,12 @@ import com.swmansion.gesturehandler.react.RNGestureHandlerRootViewManager
 
 @ReactModuleList(
   nativeModules = [
-    RNGestureHandlerModule::class
-  ]
+    RNGestureHandlerModule::class,
+  ],
 )
-class RNGestureHandlerPackage : BaseReactPackage(), ViewManagerOnDemandReactPackage {
+class RNGestureHandlerPackage :
+  BaseReactPackage(),
+  ViewManagerOnDemandReactPackage {
   private val viewManagers: Map<String, ModuleSpec> by lazy {
     mapOf(
       RNGestureHandlerRootViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec {
@@ -27,34 +29,27 @@ class RNGestureHandlerPackage : BaseReactPackage(), ViewManagerOnDemandReactPack
       },
       RNGestureHandlerButtonViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec {
         RNGestureHandlerButtonViewManager()
-      }
+      },
     )
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext) =
-    listOf<ViewManager<*, *>>(
-      RNGestureHandlerRootViewManager(),
-      RNGestureHandlerButtonViewManager()
-    )
+    listOf<ViewManager<*, *>>(RNGestureHandlerRootViewManager(), RNGestureHandlerButtonViewManager())
 
-  override fun getViewManagerNames(reactContext: ReactApplicationContext) =
-    viewManagers.keys.toList()
+  override fun getViewManagerNames(reactContext: ReactApplicationContext) = viewManagers.keys.toList()
 
   override fun getViewManagers(reactContext: ReactApplicationContext): MutableList<ModuleSpec> =
     viewManagers.values.toMutableList()
 
-  override fun createViewManager(
-    reactContext: ReactApplicationContext,
-    viewManagerName: String
-  ) = viewManagers[viewManagerName]?.provider?.get() as? ViewManager<*, *>
+  override fun createViewManager(reactContext: ReactApplicationContext, viewManagerName: String) =
+    viewManagers[viewManagerName]?.provider?.get() as? ViewManager<*, *>
 
-  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-    return if (name == RNGestureHandlerModule.NAME) {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? =
+    if (name == RNGestureHandlerModule.NAME) {
       RNGestureHandlerModule(reactContext)
     } else {
       null
     }
-  }
 
   override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
     try {
@@ -72,8 +67,8 @@ class RNGestureHandlerPackage : BaseReactPackage(), ViewManagerOnDemandReactPack
             reactModule.canOverrideExistingModule,
             reactModule.needsEagerInit,
             reactModule.isCxxModule,
-            true
-          )
+            true,
+          ),
         )
       }
     } catch (e: InstantiationException) {

package/android/src/main/java/com/swmansion/gesturehandler/core/FlingGestureHandler.kt

@@ -1,11 +1,14 @@
 package com.swmansion.gesturehandler.core
 
+import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.view.MotionEvent
 import android.view.VelocityTracker
+import com.facebook.react.bridge.ReadableMap
+import com.swmansion.gesturehandler.react.eventbuilders.FlingGestureHandlerEventDataBuilder
 
-class FlingGestureHandler : GestureHandler<FlingGestureHandler>() {
+class FlingGestureHandler : GestureHandler() {
   var numberOfPointersRequired = DEFAULT_NUMBER_OF_TOUCHES_REQUIRED
   var direction = DEFAULT_DIRECTION
 
@@ -39,10 +42,7 @@ class FlingGestureHandler : GestureHandler<FlingGestureHandler>() {
 
     val velocityVector = Vector.fromVelocity(velocityTracker!!)
 
-    fun getVelocityAlignment(
-      direction: Int,
-      maxDeviationCosine: Double,
-    ): Boolean = (
+    fun getVelocityAlignment(direction: Int, maxDeviationCosine: Double): Boolean = (
       (this.direction and direction) == direction &&
         velocityVector.isSimilar(Vector.fromDirection(direction), maxDeviationCosine)
       )
@@ -126,6 +126,30 @@ class FlingGestureHandler : GestureHandler<FlingGestureHandler>() {
     event.offsetLocation(-offsetX, -offsetY)
   }
 
+  class Factory : GestureHandler.Factory<FlingGestureHandler>() {
+    override val type = FlingGestureHandler::class.java
+    override val name = "FlingGestureHandler"
+
+    override fun create(context: Context?): FlingGestureHandler = FlingGestureHandler()
+
+    override fun setConfig(handler: FlingGestureHandler, config: ReadableMap) {
+      super.setConfig(handler, config)
+      if (config.hasKey(KEY_NUMBER_OF_POINTERS)) {
+        handler.numberOfPointersRequired = config.getInt(KEY_NUMBER_OF_POINTERS)
+      }
+      if (config.hasKey(KEY_DIRECTION)) {
+        handler.direction = config.getInt(KEY_DIRECTION)
+      }
+    }
+
+    override fun createEventBuilder(handler: FlingGestureHandler) = FlingGestureHandlerEventDataBuilder(handler)
+
+    companion object {
+      private const val KEY_NUMBER_OF_POINTERS = "numberOfPointers"
+      private const val KEY_DIRECTION = "direction"
+    }
+  }
+
   companion object {
     private const val DEFAULT_MAX_DURATION_MS: Long = 800
     private const val DEFAULT_MIN_VELOCITY: Long = 2000