react-native-gesture-handler 1.10.1 → 2.1.0

package/DrawerLayout/package.json

@@ -1,6 +1,6 @@
 {
-  "main": "../dist/src/components/DrawerLayout",
+  "main": "../lib/commonjs/components/DrawerLayout",
+  "module": "../lib/module/components/DrawerLayout",
   "react-native": "../src/components/DrawerLayout",
-  "browser": "../src/components/DrawerLayout",
-  "types": "../dist/src/components/DrawerLayout.d.ts"
+  "types": "../lib/typescript/components/DrawerLayout.d.ts"
 }

package/README.md

@@ -1,7 +1,6 @@
-<p align="center">
-  <h1 align="center">React Native Gesture Handler</h1>
-  <h3 align="center">Declarative API exposing platform native touch and gesture system to React Native.</h3>
-</p>
+<img src="https://user-images.githubusercontent.com/16062886/117444014-2d1ffd80-af39-11eb-9bbb-33c320599d93.png" width="100%" alt="React Native Gesture Handler by Software Mansion">
+
+### Declarative API exposing platform native touch and gesture system to React Native.
 
 React Native Gesture Handler provides native-driven gesture management APIs for building best possible touch-based experiences in React Native.
 
@@ -18,7 +17,7 @@ Check out our dedicated documentation page for info about this library, API refe
 
 ## Examples
 
-If you want to play with the API but don't feel like trying it on a real app, you can run the example project. Clone the repo, go to the `Example/` folder and run:
+If you want to play with the API but don't feel like trying it on a real app, you can run the example project. Clone the repo, go to the `example` folder and run:
 
 ```bash
   yarn install
@@ -28,7 +27,7 @@ If you are running on ios, run `pod install` in the ios folder
 
 Run `yarn start` to start the metro bundler
 
-Run `react-native run-android` or `react-native run-ios` (depending on which platform you want to run the example app on).
+Run `yarn android` or `yarn ios` (depending on which platform you want to run the example app on).
 
 You will need to have an Android or iOS device or emulator connected as well as `react-native-cli` package installed globally.
 
@@ -40,6 +39,8 @@ You will need to have an Android or iOS device or emulator connected as well as
 | 1.1.0+  | 0.57.2+              |
 | <1.1.0  | 0.50.0+              |
 
+It may be possible to use newer versions of react-native-gesture-handler on React Native with version <= 0.59 by reverse Jetifying.
+Read more on that here https://github.com/mikehardy/jetifier#to-reverse-jetify--convert-node_modules-dependencies-to-support-libraries
 ## License
 
 Gesture handler library is licensed under [The MIT License](LICENSE).

package/Swipeable/package.json

@@ -1,6 +1,6 @@
 {
-  "main": "../dist/src/components/Swipeable",
+  "main": "../lib/commonjs/components/Swipeable",
+  "module": "../lib/module/components/Swipeable",
   "react-native": "../src/components/Swipeable",
-  "browser": "../src/components/Swipeable",
-  "types": "../dist/src/components/Swipeable.d.ts"
+  "types": "../lib/typescript/components/Swipeable.d.ts"
 }

package/android/build.gradle

@@ -1,9 +1,41 @@
+import groovy.json.JsonSlurper
+
+buildscript {
+    def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion']
+
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+    }
+}
+
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+// Check whether Reanimated 2.3 or higher is installed alongside Gesture Handler
+def shouldUseCommonInterfaceFromReanimated() {
+    if (rootProject.subprojects.find { it.name == 'react-native-reanimated' } != null) {
+        def inputFile = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/package.json')
+        def json = new JsonSlurper().parseText(inputFile.text)
+        def reanimatedVersion = json.version as String
+        def (major, minor, patch) = reanimatedVersion.tokenize('.')
+        return Integer.parseInt(minor) >= 3
+    } else {
+        return false
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 28)
 
@@ -14,15 +46,30 @@ android {
         versionName "1.0"
     }
 
-    // Include "lib/" as sources, unfortunetely react-native link can't handle
+    // 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'
+
+        // 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'
+        }
     }
 }
 
+def kotlin_version = safeExtGet('kotlinVersion', project.properties['RNGH_kotlinVersion'])
+
 dependencies {
     //noinspection GradleDynamicVersion
+    if (shouldUseCommonInterfaceFromReanimated()) {
+        // Include Reanimated as dependency to load the common interface
+        implementation project(':react-native-reanimated')
+    }
     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"
 }

package/android/common/src/main/java/com/swmansion/common/GestureHandlerStateManager.kt

@@ -0,0 +1,5 @@
+package com.swmansion.common
+
+interface GestureHandlerStateManager {
+  fun setGestureHandlerState(handlerTag: Int, newState: Int)
+}

package/android/gradle.properties

@@ -0,0 +1,19 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# 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.5.20

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

@@ -0,0 +1,18 @@
+package com.swmansion.gesturehandler
+
+abstract class BaseGestureHandlerInteractionController : GestureHandlerInteractionController {
+  override fun shouldWaitForHandlerFailure(
+    handler: GestureHandler<*>,
+    otherHandler: GestureHandler<*>,
+  ) = false
+
+  override fun shouldRequireHandlerToWaitForFailure(
+    handler: GestureHandler<*>,
+    otherHandler: GestureHandler<*>,
+  ) = false
+
+  override fun shouldRecognizeSimultaneously(
+    handler: GestureHandler<*>,
+    otherHandler: GestureHandler<*>,
+  ) = false
+}

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

@@ -0,0 +1,11 @@
+package com.swmansion.gesturehandler
+
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.facebook.react.uimanager.UIManagerModule
+
+val ReactContext.deviceEventEmitter: DeviceEventManagerModule.RCTDeviceEventEmitter
+    get() = this.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+
+val ReactContext.UIManager: UIManagerModule
+    get() = this.getNativeModule(UIManagerModule::class.java)!!

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

@@ -0,0 +1,96 @@
+package com.swmansion.gesturehandler
+
+import android.os.Handler
+import android.view.MotionEvent
+
+class FlingGestureHandler : GestureHandler<FlingGestureHandler>() {
+  var numberOfPointersRequired = DEFAULT_NUMBER_OF_TOUCHES_REQUIRED
+  var direction = DEFAULT_DIRECTION
+
+  private val maxDurationMs = DEFAULT_MAX_DURATION_MS
+  private val minAcceptableDelta = DEFAULT_MIN_ACCEPTABLE_DELTA
+  private var startX = 0f
+  private var startY = 0f
+  private var handler: Handler? = null
+  private var maxNumberOfPointersSimultaneously = 0
+  private val failDelayed = Runnable { fail() }
+
+  override fun resetConfig() {
+    super.resetConfig()
+    numberOfPointersRequired = DEFAULT_NUMBER_OF_TOUCHES_REQUIRED
+    direction = DEFAULT_DIRECTION
+  }
+
+  private fun startFling(event: MotionEvent) {
+    startX = event.rawX
+    startY = event.rawY
+    begin()
+    maxNumberOfPointersSimultaneously = 1
+    if (handler == null) {
+      handler = Handler() // lazy delegate?
+    } else {
+      handler!!.removeCallbacksAndMessages(null)
+    }
+    handler!!.postDelayed(failDelayed, maxDurationMs)
+  }
+
+  private fun tryEndFling(event: MotionEvent) = if (
+    maxNumberOfPointersSimultaneously == numberOfPointersRequired &&
+    (direction and DIRECTION_RIGHT != 0 &&
+      event.rawX - startX > minAcceptableDelta ||
+      direction and DIRECTION_LEFT != 0 &&
+      startX - event.rawX > minAcceptableDelta ||
+      direction and DIRECTION_UP != 0 &&
+      startY - event.rawY > minAcceptableDelta ||
+      direction and DIRECTION_DOWN != 0 &&
+      event.rawY - startY > minAcceptableDelta)) {
+    handler!!.removeCallbacksAndMessages(null)
+    activate()
+    true
+  } else {
+    false
+  }
+
+  override fun activate(force: Boolean) {
+    super.activate(force)
+    end()
+  }
+
+  private fun endFling(event: MotionEvent) {
+    if (!tryEndFling(event)) {
+      fail()
+    }
+  }
+
+  override fun onHandle(event: MotionEvent) {
+    val state = state
+    if (state == STATE_UNDETERMINED) {
+      startFling(event)
+    }
+    if (state == STATE_BEGAN) {
+      tryEndFling(event)
+      if (event.pointerCount > maxNumberOfPointersSimultaneously) {
+        maxNumberOfPointersSimultaneously = event.pointerCount
+      }
+      val action = event.actionMasked
+      if (action == MotionEvent.ACTION_UP) {
+        endFling(event)
+      }
+    }
+  }
+
+  override fun onCancel() {
+    handler?.removeCallbacksAndMessages(null)
+  }
+
+  override fun onReset() {
+    handler?.removeCallbacksAndMessages(null)
+  }
+
+  companion object {
+    private const val DEFAULT_MAX_DURATION_MS: Long = 800
+    private const val DEFAULT_MIN_ACCEPTABLE_DELTA: Long = 160
+    private const val DEFAULT_DIRECTION = DIRECTION_RIGHT
+    private const val DEFAULT_NUMBER_OF_TOUCHES_REQUIRED = 1
+  }
+}