react-native-gesture-handler 2.7.0 → 2.8.0

package/android/build.gradle

@@ -5,11 +5,17 @@ buildscript {
     def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion']
 
     repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
         mavenCentral()
+        google()
     }
 
     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")
     }
 }
 
@@ -48,6 +54,10 @@ if (isNewArchitectureEnabled()) {
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+if (project == rootProject) {
+    apply from: "spotless.gradle"
+}
+
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
@@ -162,13 +172,8 @@ android {
         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'
-
             // Include "common/" only when it's not provided by Reanimated to mitigate
             // multiple definitions of the same class preventing build
             if (shouldUseCommonInterfaceFromReanimated()) {

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

@@ -4,7 +4,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.events.Event
 
 class ReanimatedEventDispatcher {
-    fun <T : Event<T>>sendEvent(event: T, reactApplicationContext: ReactContext) {
-        // no-op
-    }
+  fun <T : Event<T>>sendEvent(event: T, reactApplicationContext: ReactContext) {
+    // no-op
+  }
 }

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

@@ -5,13 +5,13 @@ import com.facebook.react.uimanager.events.Event
 import com.swmansion.reanimated.ReanimatedModule
 
 class ReanimatedEventDispatcher {
-    private var reanimatedModule: ReanimatedModule? = null
+  private var reanimatedModule: ReanimatedModule? = null
 
-    fun <T : Event<T>>sendEvent(event: T, reactApplicationContext: ReactContext) {
-        if (reanimatedModule == null) {
-            reanimatedModule = reactApplicationContext.getNativeModule(ReanimatedModule::class.java)
-        }
-
-        reanimatedModule?.nodesManager?.onEventDispatch(event)
+  fun <T : Event<T>>sendEvent(event: T, reactApplicationContext: ReactContext) {
+    if (reanimatedModule == null) {
+      reanimatedModule = reactApplicationContext.getNativeModule(ReanimatedModule::class.java)
     }
+
+    reanimatedModule?.nodesManager?.onEventDispatch(event)
+  }
 }

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

@@ -7,6 +7,6 @@ import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.Event
 
 fun ReactContext.dispatchEvent(event: Event<*>) {
-    val fabricUIManager = UIManagerHelper.getUIManager(this, UIManagerType.FABRIC) as FabricUIManager
-    fabricUIManager.eventDispatcher.dispatchEvent(event)
+  val fabricUIManager = UIManagerHelper.getUIManager(this, UIManagerType.FABRIC) as FabricUIManager
+  fabricUIManager.eventDispatcher.dispatchEvent(event)
 }

package/android/src/main/java/com/swmansion/gesturehandler/RNGestureHandlerPackage.kt

@@ -4,10 +4,9 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
-import com.swmansion.gesturehandler.BuildConfig
+import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager
 import com.swmansion.gesturehandler.react.RNGestureHandlerModule
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootViewManager
-import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager
 
 class RNGestureHandlerPackage : ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
@@ -17,5 +16,6 @@ class RNGestureHandlerPackage : ReactPackage {
   override fun createViewManagers(reactContext: ReactApplicationContext) =
     listOf<ViewManager<*, *>>(
       RNGestureHandlerRootViewManager(),
-      RNGestureHandlerButtonViewManager())
+      RNGestureHandlerButtonViewManager()
+    )
 }

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/FlingGestureHandler.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.os.Handler
 import android.os.Looper
@@ -37,14 +37,17 @@ class FlingGestureHandler : GestureHandler<FlingGestureHandler>() {
 
   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)) {
+    (
+      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

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/GestureHandler.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.app.Activity
 import android.content.Context
@@ -14,6 +14,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.uimanager.PixelUtil
+import com.swmansion.gesturehandler.BuildConfig
 import com.swmansion.gesturehandler.react.RNGestureHandlerTouchEvent
 import java.lang.IllegalStateException
 import java.util.*
@@ -48,7 +49,6 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
   private val trackedPointers: Array<PointerData?> = Array(MAX_POINTERS_COUNT) { null }
   var needsPointerData = false
 
-
   private var hitSlop: FloatArray? = null
   var eventCoalescingKey: Short = 0
     private set
@@ -127,11 +127,15 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
   }
 
   fun setManualActivation(manualActivation: Boolean): ConcreteGestureHandlerT =
-      applySelf { this.manualActivation = manualActivation }
+    applySelf { this.manualActivation = manualActivation }
 
   fun setHitSlop(
-    leftPad: Float, topPad: Float, rightPad: Float, bottomPad: Float,
-    width: Float, height: Float,
+    leftPad: Float,
+    topPad: Float,
+    rightPad: Float,
+    bottomPad: Float,
+    width: Float,
+    height: Float,
   ): ConcreteGestureHandlerT = applySelf {
     if (hitSlop == null) {
       hitSlop = FloatArray(6)
@@ -278,7 +282,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     }
 
     // introduced in 1.11.0, remove if crashes are not reported
-    if(pointerProps.isEmpty()|| pointerCoords.isEmpty()){
+    if (pointerProps.isEmpty() || pointerCoords.isEmpty()) {
       throw IllegalStateException("pointerCoords.size=${pointerCoords.size}, pointerProps.size=${pointerProps.size}")
     }
 
@@ -289,8 +293,8 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
         event.eventTime,
         action,
         count,
-        pointerProps,  /* props are copied and hence it is safe to use static array here */
-        pointerCoords,  /* same applies to coords */
+        pointerProps, /* props are copied and hence it is safe to use static array here */
+        pointerCoords, /* same applies to coords */
         event.metaState,
         event.buttonState,
         event.xPrecision,
@@ -313,7 +317,8 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     handler: GestureHandler<*>,
     event: MotionEvent,
     e: IllegalArgumentException
-  ) : Exception("""
+  ) : Exception(
+    """
     handler: ${handler::class.simpleName}
     state: ${handler.state}
     view: ${handler.view}
@@ -324,14 +329,17 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     trackedPointersCount: ${handler.trackedPointersIDsCount}
     trackedPointers: ${handler.trackedPointerIDs.joinToString(separator = ", ")}
     while handling event: $event
-  """.trimIndent(), e) {}
+    """.trimIndent(),
+    e
+  )
 
   fun handle(transformedEvent: MotionEvent, sourceEvent: MotionEvent) {
-    if (!isEnabled
-      || state == STATE_CANCELLED
-      || state == STATE_FAILED
-      || state == STATE_END
-      || trackedPointersIDsCount < 1) {
+    if (!isEnabled ||
+      state == STATE_CANCELLED ||
+      state == STATE_FAILED ||
+      state == STATE_END ||
+      trackedPointersIDsCount < 1
+    ) {
       return
     }
 
@@ -380,11 +388,11 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     val offsetY = event.rawY - event.y
 
     trackedPointers[pointerId] = PointerData(
-        pointerId,
-        event.getX(event.actionIndex),
-        event.getY(event.actionIndex),
-        event.getX(event.actionIndex) + offsetX - windowOffset[0],
-        event.getY(event.actionIndex) + offsetY - windowOffset[1],
+      pointerId,
+      event.getX(event.actionIndex),
+      event.getY(event.actionIndex),
+      event.getX(event.actionIndex) + offsetX - windowOffset[0],
+      event.getY(event.actionIndex) + offsetY - windowOffset[1],
     )
     trackedPointersCount++
     addChangedPointer(trackedPointers[pointerId]!!)
@@ -402,11 +410,11 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     val offsetY = event.rawY - event.y
 
     trackedPointers[pointerId] = PointerData(
-        pointerId,
-        event.getX(event.actionIndex),
-        event.getY(event.actionIndex),
-        event.getX(event.actionIndex) + offsetX - windowOffset[0],
-        event.getY(event.actionIndex) + offsetY - windowOffset[1],
+      pointerId,
+      event.getX(event.actionIndex),
+      event.getY(event.actionIndex),
+      event.getX(event.actionIndex) + offsetX - windowOffset[0],
+      event.getY(event.actionIndex) + offsetY - windowOffset[1],
     )
     addChangedPointer(trackedPointers[pointerId]!!)
     trackedPointers[pointerId] = null
@@ -545,11 +553,11 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
   }
 
   fun wantEvents(): Boolean {
-    return isEnabled
-      && state != STATE_FAILED
-      && state != STATE_CANCELLED
-      && state != STATE_END
-      && trackedPointersIDsCount > 0
+    return isEnabled &&
+      state != STATE_FAILED &&
+      state != STATE_CANCELLED &&
+      state != STATE_END &&
+      trackedPointersIDsCount > 0
   }
 
   open fun shouldRequireToWaitForFailure(handler: GestureHandler<*>): Boolean {
@@ -745,7 +753,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     private lateinit var pointerCoords: Array<PointerCoords?>
     private fun initPointerProps(size: Int) {
       var size = size
-      if (!::pointerProps.isInitialized) {
+      if (!Companion::pointerProps.isInitialized) {
         pointerProps = arrayOfNulls(MAX_POINTERS_COUNT)
         pointerCoords = arrayOfNulls(MAX_POINTERS_COUNT)
       }

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/GestureHandlerInteractionController.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 interface GestureHandlerInteractionController {
   fun shouldWaitForHandlerFailure(handler: GestureHandler<*>, otherHandler: GestureHandler<*>): Boolean

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/GestureHandlerOrchestrator.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.graphics.Matrix
 import android.graphics.PointF
@@ -134,7 +134,10 @@ class GestureHandlerOrchestrator(
               // their state is set to END and when the gesture they are waiting for activates they
               // should be cancelled, however `cancel` was never sent as gestures were already in the END state.
               // Send synthetic BEGAN -> CANCELLED to properly handle JS logic
-              otherHandler.dispatchStateChange(GestureHandler.STATE_CANCELLED, GestureHandler.STATE_BEGAN)
+              otherHandler.dispatchStateChange(
+                GestureHandler.STATE_CANCELLED,
+                GestureHandler.STATE_BEGAN
+              )
             }
             otherHandler.isAwaiting = false
           } else {
@@ -253,10 +256,10 @@ class GestureHandlerOrchestrator(
 
     val action = sourceEvent.actionMasked
     val event = transformEventToViewCoords(handler.view, MotionEvent.obtain(sourceEvent))
-    
+
     // Touch events are sent before the handler itself has a chance to process them,
     // mainly because `onTouchesUp` shoul be send befor gesture finishes. This means that
-    // the first `onTouchesDown` event is sent before a gesture begins, activation in 
+    // the first `onTouchesDown` event is sent before a gesture begins, activation in
     // callback for this event causes problems because the handler doesn't have a chance
     // to initialize itself with starting values of pointer (in pan this causes translation
     // to be equal to the coordinates of the pointer). The simplest solution is to send
@@ -475,9 +478,10 @@ class GestureHandlerOrchestrator(
 
     // if the pointer is inside the view but it overflows its parent, handlers attached to the parent
     // might not have been extracted (pointer might be in a child, but may be outside parent)
-    if (coords[0] in 0f..view.width.toFloat() && coords[1] in 0f..view.height.toFloat()
-      && isViewOverflowingParent(view) && extractAncestorHandlers(view, coords, pointerId)) {
-        found = true
+    if (coords[0] in 0f..view.width.toFloat() && coords[1] in 0f..view.height.toFloat() &&
+      isViewOverflowingParent(view) && extractAncestorHandlers(view, coords, pointerId)
+    ) {
+      found = true
     }
 
     return found
@@ -527,8 +531,10 @@ class GestureHandlerOrchestrator(
       }
       PointerEventsConfig.BOX_ONLY -> {
         // This view is the target, its children don't matter
-        (recordViewHandlersForPointer(view, coords, pointerId)
-          || shouldHandlerlessViewBecomeTouchTarget(view, coords))
+        (
+          recordViewHandlersForPointer(view, coords, pointerId) ||
+            shouldHandlerlessViewBecomeTouchTarget(view, coords)
+          )
       }
       PointerEventsConfig.BOX_NONE -> {
         // This view can't be the target, but its children might
@@ -557,8 +563,10 @@ class GestureHandlerOrchestrator(
           extractGestureHandlers(view, coords, pointerId)
         } else false
 
-        (recordViewHandlersForPointer(view, coords, pointerId)
-          || found || shouldHandlerlessViewBecomeTouchTarget(view, coords))
+        (
+          recordViewHandlersForPointer(view, coords, pointerId) ||
+            found || shouldHandlerlessViewBecomeTouchTarget(view, coords)
+          )
       }
     }
 
@@ -570,7 +578,6 @@ class GestureHandlerOrchestrator(
   private fun isClipping(view: View) =
     view !is ViewGroup || viewConfigHelper.isViewClippingChildren(view)
 
-
   companion object {
     // The limit doesn't necessarily need to exists, it was just simpler to implement it that way
     // it is also more allocation-wise efficient to have a fixed limit
@@ -637,14 +644,15 @@ class GestureHandlerOrchestrator(
       x in 0f..child.width.toFloat() && y in 0f..child.height.toFloat()
 
     private fun shouldHandlerWaitForOther(handler: GestureHandler<*>, other: GestureHandler<*>): Boolean {
-      return handler !== other && (handler.shouldWaitForHandlerFailure(other)
-        || other.shouldRequireToWaitForFailure(handler))
+      return handler !== other && (
+        handler.shouldWaitForHandlerFailure(other) ||
+          other.shouldRequireToWaitForFailure(handler)
+        )
     }
 
     private fun canRunSimultaneously(a: GestureHandler<*>, b: GestureHandler<*>) =
       a === b || a.shouldRecognizeSimultaneously(b) || b.shouldRecognizeSimultaneously(a)
 
-
     private fun shouldHandlerBeCancelledBy(handler: GestureHandler<*>, other: GestureHandler<*>): Boolean {
       if (!handler.hasCommonPointers(other)) {
         // if two handlers share no common pointer one can never trigger cancel for the other
@@ -656,7 +664,8 @@ class GestureHandlerOrchestrator(
         return false
       }
       return if (handler !== other &&
-        (handler.isAwaiting || handler.state == GestureHandler.STATE_ACTIVE)) {
+        (handler.isAwaiting || handler.state == GestureHandler.STATE_ACTIVE)
+      ) {
         // in every other case as long as the handler is about to be activated or already in active
         // state, we delegate the decision to the implementation of GestureHandler#shouldBeCancelledBy
         handler.shouldBeCancelledBy(other)
@@ -664,8 +673,8 @@ class GestureHandlerOrchestrator(
     }
 
     private fun isFinished(state: Int) =
-      state == GestureHandler.STATE_CANCELLED
-        || state == GestureHandler.STATE_FAILED
-        || state == GestureHandler.STATE_END
+      state == GestureHandler.STATE_CANCELLED ||
+        state == GestureHandler.STATE_FAILED ||
+        state == GestureHandler.STATE_END
   }
 }

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/GestureHandlerRegistry.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.view.View
 import java.util.*

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/GestureUtils.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.view.MotionEvent
 

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/LongPressGestureHandler.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.content.Context
 import android.os.Handler

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/ManualGestureHandler.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.view.MotionEvent
 

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/NativeViewGestureHandler.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.os.SystemClock
 import android.view.MotionEvent
@@ -114,7 +114,7 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
   override fun onCancel() {
     val time = SystemClock.uptimeMillis()
     val event = MotionEvent.obtain(time, time, MotionEvent.ACTION_CANCEL, 0f, 0f, 0).apply {
-      action =  MotionEvent.ACTION_CANCEL
+      action = MotionEvent.ACTION_CANCEL
     }
     view!!.onTouchEvent(event)
   }
@@ -172,8 +172,8 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
   }
 
   private class EditTextHook(
-          private val handler: NativeViewGestureHandler,
-          private val editText: ReactEditText
+    private val handler: NativeViewGestureHandler,
+    private val editText: ReactEditText
   ) : NativeViewGestureHandlerHook {
     private var startX = 0f
     private var startY = 0f
@@ -194,7 +194,7 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
     // of RNGestureHandlerRootHelper so no explicit type checks, but its tag is always negative
     // also if other handler is NativeViewGestureHandler then don't override the default implementation
     override fun shouldRecognizeSimultaneously(handler: GestureHandler<*>) =
-            handler.tag > 0 && handler !is NativeViewGestureHandler
+      handler.tag > 0 && handler !is NativeViewGestureHandler
 
     override fun wantsToHandleEventBeforeActivation() = true
 

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/OnTouchEventListener.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.view.MotionEvent
 

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/PanGestureHandler.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.content.Context
 import android.os.Handler
@@ -6,8 +6,8 @@ import android.os.Looper
 import android.view.MotionEvent
 import android.view.VelocityTracker
 import android.view.ViewConfiguration
-import com.swmansion.gesturehandler.GestureUtils.getLastPointerX
-import com.swmansion.gesturehandler.GestureUtils.getLastPointerY
+import com.swmansion.gesturehandler.core.GestureUtils.getLastPointerX
+import com.swmansion.gesturehandler.core.GestureUtils.getLastPointerY
 
 class PanGestureHandler(context: Context?) : GestureHandler<PanGestureHandler>() {
   var velocityX = 0f
@@ -173,12 +173,14 @@ class PanGestureHandler(context: Context?) : GestureHandler<PanGestureHandler>()
     }
     val vx = velocityX
     if (minVelocityX != MIN_VALUE_IGNORE &&
-      (minVelocityX < 0 && vx <= minVelocityX || minVelocityX in 0.0f..vx)) {
+      (minVelocityX < 0 && vx <= minVelocityX || minVelocityX in 0.0f..vx)
+    ) {
       return true
     }
     val vy = velocityY
     if (minVelocityY != MIN_VALUE_IGNORE &&
-      (minVelocityY < 0 && vx <= minVelocityY || minVelocityY in 0.0f..vx)) {
+      (minVelocityY < 0 && vx <= minVelocityY || minVelocityY in 0.0f..vx)
+    ) {
       return true
     }
     val velocitySq = vx * vx + vy * vy

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/PinchGestureHandler.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.graphics.PointF
 import android.view.MotionEvent
@@ -18,7 +18,8 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
   private var scaleGestureDetector: ScaleGestureDetector? = null
   private var startingSpan = 0f
   private var spanSlop = 0f
-  private val gestureListener: ScaleGestureDetector.OnScaleGestureListener = object : ScaleGestureDetector.OnScaleGestureListener {
+  private val gestureListener: ScaleGestureDetector.OnScaleGestureListener = object :
+    ScaleGestureDetector.OnScaleGestureListener {
     override fun onScale(detector: ScaleGestureDetector): Boolean {
       val prevScaleFactor: Double = scale
       scale *= detector.scaleFactor.toDouble()
@@ -26,8 +27,9 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
       if (delta > 0) {
         velocity = (scale - prevScaleFactor) / delta
       }
-      if (abs(startingSpan - detector.currentSpan) >= spanSlop
-              && state == STATE_BEGAN) {
+      if (abs(startingSpan - detector.currentSpan) >= spanSlop &&
+        state == STATE_BEGAN
+      ) {
         activate()
       }
       return true
@@ -55,6 +57,11 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
       scaleGestureDetector = ScaleGestureDetector(context, gestureListener)
       val configuration = ViewConfiguration.get(context)
       spanSlop = configuration.scaledTouchSlop.toFloat()
+
+      // set the focal point to the position of the first pointer as NaN causes the event not to arrive
+      this.focalPointX = event.x
+      this.focalPointY = event.y
+
       begin()
     }
     scaleGestureDetector?.onTouchEvent(sourceEvent)

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/PointerEventsConfig.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 enum class PointerEventsConfig {
   /**

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/RotationGestureDetector.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.view.MotionEvent
 import kotlin.math.atan2

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/RotationGestureHandler.kt

@@ -1,8 +1,8 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.graphics.PointF
 import android.view.MotionEvent
-import com.swmansion.gesturehandler.RotationGestureDetector.OnRotationGestureListener
+import com.swmansion.gesturehandler.core.RotationGestureDetector.OnRotationGestureListener
 import kotlin.math.abs
 
 class RotationGestureHandler : GestureHandler<RotationGestureHandler>() {
@@ -45,6 +45,11 @@ class RotationGestureHandler : GestureHandler<RotationGestureHandler>() {
     if (state == STATE_UNDETERMINED) {
       resetProgress()
       rotationGestureDetector = RotationGestureDetector(gestureListener)
+
+      // set the anchor to the position of the first pointer as NaN causes the event not to arrive
+      this.anchorX = event.x
+      this.anchorY = event.y
+
       begin()
     }
     rotationGestureDetector?.onTouchEvent(sourceEvent)

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/ScaleGestureDetector.java

@@ -5,7 +5,7 @@
  * Modified line 189 to set initial min span to 0 instead of copying it from the system configuration
  */
 
-package com.swmansion.gesturehandler;
+package com.swmansion.gesturehandler.core;
 
 import android.content.Context;
 import android.os.Build;

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/TapGestureHandler.kt

@@ -1,10 +1,10 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.os.Handler
 import android.os.Looper
 import android.view.MotionEvent
-import com.swmansion.gesturehandler.GestureUtils.getLastPointerX
-import com.swmansion.gesturehandler.GestureUtils.getLastPointerY
+import com.swmansion.gesturehandler.core.GestureUtils.getLastPointerX
+import com.swmansion.gesturehandler.core.GestureUtils.getLastPointerY
 import kotlin.math.abs
 
 class TapGestureHandler : GestureHandler<TapGestureHandler>() {

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/core}/ViewConfigurationHelper.kt

@@ -1,4 +1,4 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.core
 
 import android.view.View
 import android.view.ViewGroup

package/android/{lib/src/main/java/com/swmansion/gesturehandler → src/main/java/com/swmansion/gesturehandler/react}/Extensions.kt

@@ -1,11 +1,11 @@
-package com.swmansion.gesturehandler
+package com.swmansion.gesturehandler.react
 
 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)
+  get() = this.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
 
 val ReactContext.UIManager: UIManagerModule
-    get() = this.getNativeModule(UIManagerModule::class.java)!!
+  get() = this.getNativeModule(UIManagerModule::class.java)!!