react-native-gesture-handler 2.25.0 → 2.27.0

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRegistry.kt

@@ -8,19 +8,17 @@ import com.swmansion.gesturehandler.core.GestureHandlerRegistry
 import java.util.*
 
 class RNGestureHandlerRegistry : GestureHandlerRegistry {
-  private val handlers = SparseArray<GestureHandler<*>>()
+  private val handlers = SparseArray<GestureHandler>()
   private val attachedTo = SparseArray<Int?>()
-  private val handlersForView = SparseArray<ArrayList<GestureHandler<*>>>()
+  private val handlersForView = SparseArray<ArrayList<GestureHandler>>()
 
   @Synchronized
-  fun registerHandler(handler: GestureHandler<*>) {
+  fun registerHandler(handler: GestureHandler) {
     handlers.put(handler.tag, handler)
   }
 
   @Synchronized
-  fun getHandler(handlerTag: Int): GestureHandler<*>? {
-    return handlers[handlerTag]
-  }
+  fun getHandler(handlerTag: Int): GestureHandler? = handlers[handlerTag]
 
   @Synchronized
   fun attachHandlerToView(handlerTag: Int, viewTag: Int, actionType: Int): Boolean {
@@ -34,7 +32,7 @@ class RNGestureHandlerRegistry : GestureHandlerRegistry {
   }
 
   @Synchronized
-  private fun registerHandlerForViewWithTag(viewTag: Int, handler: GestureHandler<*>) {
+  private fun registerHandlerForViewWithTag(viewTag: Int, handler: GestureHandler) {
     check(attachedTo[handler.tag] == null) { "Handler $handler already attached" }
     attachedTo.put(handler.tag, viewTag)
     var listToAdd = handlersForView[viewTag]
@@ -50,7 +48,7 @@ class RNGestureHandlerRegistry : GestureHandlerRegistry {
   }
 
   @Synchronized
-  private fun detachHandler(handler: GestureHandler<*>) {
+  private fun detachHandler(handler: GestureHandler) {
     val attachedToView = attachedTo[handler.tag]
     if (attachedToView != null) {
       attachedTo.remove(handler.tag)
@@ -89,12 +87,8 @@ class RNGestureHandlerRegistry : GestureHandlerRegistry {
   }
 
   @Synchronized
-  fun getHandlersForViewWithTag(viewTag: Int): ArrayList<GestureHandler<*>>? {
-    return handlersForView[viewTag]
-  }
+  fun getHandlersForViewWithTag(viewTag: Int): ArrayList<GestureHandler>? = handlersForView[viewTag]
 
   @Synchronized
-  override fun getHandlersForView(view: View): ArrayList<GestureHandler<*>>? {
-    return getHandlersForViewWithTag(view.id)
-  }
+  override fun getHandlersForView(view: View): ArrayList<GestureHandler>? = getHandlersForViewWithTag(view.id)
 }

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt

@@ -16,7 +16,7 @@ import com.swmansion.gesturehandler.core.GestureHandlerOrchestrator
 
 class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView: ViewGroup) {
   private val orchestrator: GestureHandlerOrchestrator?
-  private val jsGestureHandler: GestureHandler<*>?
+  private val jsGestureHandler: GestureHandler?
   val rootView: ViewGroup
   private var shouldIntercept = false
   private var passingTouch = false
@@ -24,51 +24,61 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
   init {
     UiThreadUtil.assertOnUiThread()
     val wrappedViewTag = wrappedView.id
-    check(wrappedViewTag >= 1) { "Expect view tag to be set for $wrappedView" }
-    val module = (context as ThemedReactContext).reactApplicationContext.getNativeModule(RNGestureHandlerModule::class.java)!!
+    assert(wrappedViewTag >= 1) { "Expect view tag to be set for $wrappedView" }
+    val module = context.getNativeModule(RNGestureHandlerModule::class.java)!!
     val registry = module.registry
     rootView = findRootViewTag(wrappedView)
     Log.i(
       ReactConstants.TAG,
-      "[GESTURE HANDLER] Initialize gesture handler for root view $rootView"
+      "[GESTURE HANDLER] Initialize gesture handler for root view $rootView",
     )
     orchestrator = GestureHandlerOrchestrator(
-      wrappedView, registry, RNViewConfigurationHelper()
+      wrappedView,
+      registry,
+      RNViewConfigurationHelper(),
     ).apply {
       minimumAlphaForTraversal = MIN_ALPHA_FOR_TOUCH
     }
-    jsGestureHandler = RootViewGestureHandler().apply { tag = -wrappedViewTag }
-    with(registry) {
-      registerHandler(jsGestureHandler)
-      attachHandlerToView(jsGestureHandler.tag, wrappedViewTag, GestureHandler.ACTION_TYPE_JS_FUNCTION_OLD_API)
-    }
+    jsGestureHandler = RootViewGestureHandler(handlerTag = -wrappedViewTag)
+    registry.registerHandler(jsGestureHandler)
+    registry.attachHandlerToView(jsGestureHandler.tag, wrappedViewTag, GestureHandler.ACTION_TYPE_JS_FUNCTION_OLD_API)
     module.registerRootHelper(this)
   }
 
   fun tearDown() {
     Log.i(
       ReactConstants.TAG,
-      "[GESTURE HANDLER] Tearing down gesture handler registered for root view $rootView"
+      "[GESTURE HANDLER] Tearing down gesture handler registered for root view $rootView",
     )
-    val module = (context as ThemedReactContext).reactApplicationContext.getNativeModule(RNGestureHandlerModule::class.java)!!
+    val module = (context as ThemedReactContext).reactApplicationContext.getNativeModule(
+      RNGestureHandlerModule::class.java,
+    )!!
     with(module) {
       registry.dropHandler(jsGestureHandler!!.tag)
       unregisterRootHelper(this@RNGestureHandlerRootHelper)
     }
   }
 
-  internal inner class RootViewGestureHandler : GestureHandler<RootViewGestureHandler>() {
+  internal inner class RootViewGestureHandler(handlerTag: Int) : GestureHandler() {
+    init {
+      this.tag = handlerTag
+    }
+
     private fun handleEvent(event: MotionEvent) {
       val currentState = state
 
       // we shouldn't stop intercepting events when there is an active handler already, which could happen when
       // adding a new pointer to the screen after a handler activates
-      if (currentState == STATE_UNDETERMINED && (!shouldIntercept || orchestrator?.isAnyHandlerActive() != true)) {
+      if (currentState == STATE_UNDETERMINED &&
+        (!shouldIntercept || orchestrator?.isAnyHandlerActive() != true)
+      ) {
         begin()
         shouldIntercept = false
       }
 
-      if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_HOVER_EXIT) {
+      if (event.actionMasked == MotionEvent.ACTION_UP ||
+        event.actionMasked == MotionEvent.ACTION_HOVER_EXIT
+      ) {
         end()
       }
     }
@@ -122,8 +132,8 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
   }
 
   /*package*/
-  @Suppress("UNUSED_PARAMETER", "COMMENT_IN_SUPPRESSION")
   // We want to keep order of parameters, so instead of removing viewTag we suppress the warning
+  @Suppress("UNUSED_PARAMETER", "COMMENT_IN_SUPPRESSION")
   fun handleSetJSResponder(viewTag: Int, blockNativeResponder: Boolean) {
     if (blockNativeResponder) {
       UiThreadUtil.runOnUiThread { tryCancelAllHandlers() }

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootView.kt

@@ -12,18 +12,18 @@ import com.facebook.react.uimanager.RootView
 import com.facebook.react.views.view.ReactViewGroup
 
 class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
-  private var _enabled = false
+  private var rootViewEnabled = false
   private var rootHelper: RNGestureHandlerRootHelper? = null // TODO: resettable lateinit
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
-    _enabled = !hasGestureHandlerEnabledRootView(this)
-    if (!_enabled) {
+    rootViewEnabled = !hasGestureHandlerEnabledRootView(this)
+    if (!rootViewEnabled) {
       Log.i(
         ReactConstants.TAG,
-        "[GESTURE HANDLER] Gesture handler is already enabled for a parent view"
+        "[GESTURE HANDLER] Gesture handler is already enabled for a parent view",
       )
     }
-    if (_enabled && rootHelper == null) {
+    if (rootViewEnabled && rootHelper == null) {
       rootHelper = RNGestureHandlerRootHelper(context as ReactContext, this)
     }
   }
@@ -32,18 +32,21 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
     rootHelper?.tearDown()
   }
 
-  override fun dispatchTouchEvent(ev: MotionEvent) =
-    if (_enabled && rootHelper!!.dispatchTouchEvent(ev)) {
-      true
-    } else super.dispatchTouchEvent(ev)
+  override fun dispatchTouchEvent(ev: MotionEvent) = if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(ev)) {
+    true
+  } else {
+    super.dispatchTouchEvent(ev)
+  }
 
   override fun dispatchGenericMotionEvent(event: MotionEvent) =
-    if (_enabled && rootHelper!!.dispatchTouchEvent(event)) {
+    if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(event)) {
       true
-    } else super.dispatchGenericMotionEvent(event)
+    } else {
+      super.dispatchGenericMotionEvent(event)
+    }
 
   override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-    if (_enabled) {
+    if (rootViewEnabled) {
       rootHelper!!.requestDisallowInterceptTouchEvent()
     }
     super.requestDisallowInterceptTouchEvent(disallowIntercept)

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootViewManager.kt

@@ -22,9 +22,7 @@ class RNGestureHandlerRootViewManager :
     mDelegate = RNGestureHandlerRootViewManagerDelegate<RNGestureHandlerRootView, RNGestureHandlerRootViewManager>(this)
   }
 
-  override fun getDelegate(): ViewManagerDelegate<RNGestureHandlerRootView> {
-    return mDelegate
-  }
+  override fun getDelegate(): ViewManagerDelegate<RNGestureHandlerRootView> = mDelegate
 
   override fun getName() = REACT_CLASS
 
@@ -42,7 +40,7 @@ class RNGestureHandlerRootViewManager :
     RNGestureHandlerEvent.EVENT_NAME to
       mutableMapOf("registrationName" to RNGestureHandlerEvent.EVENT_NAME),
     RNGestureHandlerStateChangeEvent.EVENT_NAME to
-      mutableMapOf("registrationName" to RNGestureHandlerStateChangeEvent.EVENT_NAME)
+      mutableMapOf("registrationName" to RNGestureHandlerStateChangeEvent.EVENT_NAME),
   )
 
   companion object {

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerStateChangeEvent.kt

@@ -19,7 +19,7 @@ class RNGestureHandlerStateChangeEvent private constructor() : Event<RNGestureHa
   private var newState: Int = GestureHandler.STATE_UNDETERMINED
   private var oldState: Int = GestureHandler.STATE_UNDETERMINED
 
-  private fun <T : GestureHandler<T>> init(
+  private fun <T : GestureHandler> init(
     handler: T,
     newState: Int,
     oldState: Int,
@@ -52,26 +52,27 @@ class RNGestureHandlerStateChangeEvent private constructor() : Event<RNGestureHa
   companion object {
     const val EVENT_NAME = "onGestureHandlerStateChange"
     private const val TOUCH_EVENTS_POOL_SIZE = 7 // magic
-    private val EVENTS_POOL = Pools.SynchronizedPool<RNGestureHandlerStateChangeEvent>(TOUCH_EVENTS_POOL_SIZE)
+    private val EVENTS_POOL = Pools.SynchronizedPool<RNGestureHandlerStateChangeEvent>(
+      TOUCH_EVENTS_POOL_SIZE,
+    )
 
-    fun <T : GestureHandler<T>> obtain(
+    fun <T : GestureHandler> obtain(
       handler: T,
       newState: Int,
       oldState: Int,
       dataBuilder: GestureHandlerEventDataBuilder<T>,
-    ): RNGestureHandlerStateChangeEvent =
-      (EVENTS_POOL.acquire() ?: RNGestureHandlerStateChangeEvent()).apply {
-        init(handler, newState, oldState, dataBuilder)
-      }
-
-    fun createEventData(
-      dataBuilder: GestureHandlerEventDataBuilder<*>,
-      newState: Int,
-      oldState: Int,
-    ): WritableMap = Arguments.createMap().apply {
-      dataBuilder.buildEventData(this)
-      putInt("state", newState)
-      putInt("oldState", oldState)
+    ): RNGestureHandlerStateChangeEvent = (
+      EVENTS_POOL.acquire()
+        ?: RNGestureHandlerStateChangeEvent()
+      ).apply {
+      init(handler, newState, oldState, dataBuilder)
     }
+
+    fun createEventData(dataBuilder: GestureHandlerEventDataBuilder<*>, newState: Int, oldState: Int): WritableMap =
+      Arguments.createMap().apply {
+        dataBuilder.buildEventData(this)
+        putInt("state", newState)
+        putInt("oldState", oldState)
+      }
   }
 }

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerTouchEvent.kt

@@ -10,7 +10,7 @@ import com.swmansion.gesturehandler.core.GestureHandler
 class RNGestureHandlerTouchEvent private constructor() : Event<RNGestureHandlerTouchEvent>() {
   private var extraData: WritableMap? = null
   private var coalescingKey: Short = 0
-  private fun <T : GestureHandler<T>> init(handler: T) {
+  private fun <T : GestureHandler> init(handler: T) {
     val view = handler.view!!
     super.init(UIManagerHelper.getSurfaceId(view), view.id)
     extraData = createEventData(handler)
@@ -38,14 +38,16 @@ class RNGestureHandlerTouchEvent private constructor() : Event<RNGestureHandlerT
 
     const val EVENT_NAME = "onGestureHandlerEvent"
     private const val TOUCH_EVENTS_POOL_SIZE = 7 // magic
-    private val EVENTS_POOL = Pools.SynchronizedPool<RNGestureHandlerTouchEvent>(TOUCH_EVENTS_POOL_SIZE)
+    private val EVENTS_POOL = Pools.SynchronizedPool<RNGestureHandlerTouchEvent>(
+      TOUCH_EVENTS_POOL_SIZE,
+    )
 
-    fun <T : GestureHandler<T>> obtain(handler: T): RNGestureHandlerTouchEvent =
+    fun <T : GestureHandler> obtain(handler: T): RNGestureHandlerTouchEvent =
       (EVENTS_POOL.acquire() ?: RNGestureHandlerTouchEvent()).apply {
         init(handler)
       }
 
-    fun <T : GestureHandler<T>> createEventData(handler: T): WritableMap = Arguments.createMap().apply {
+    fun <T : GestureHandler> createEventData(handler: T): WritableMap = Arguments.createMap().apply {
       putInt("handlerTag", handler.tag)
       putInt("state", handler.state)
       putInt("numberOfTouches", handler.trackedPointersCount)

package/android/src/main/java/com/swmansion/gesturehandler/react/RNViewConfigurationHelper.kt

@@ -15,7 +15,9 @@ class RNViewConfigurationHelper : ViewConfigurationHelper {
     val pointerEvents: PointerEvents =
       if (view is ReactPointerEventsView) {
         (view as ReactPointerEventsView).pointerEvents
-      } else PointerEvents.AUTO
+      } else {
+        PointerEvents.AUTO
+      }
 
     // Views that are disabled should never be the target of pointer events. However, their children
     // can be because some views (SwipeRefreshLayout) use enabled but still have children that can
@@ -36,10 +38,10 @@ class RNViewConfigurationHelper : ViewConfigurationHelper {
     }
   }
 
-  override fun getChildInDrawingOrderAtIndex(parent: ViewGroup, index: Int): View {
-    return if (parent is ReactViewGroup) {
-      parent.getChildAt(parent.getZIndexMappedChildIndex(index))
-    } else parent.getChildAt(index)
+  override fun getChildInDrawingOrderAtIndex(parent: ViewGroup, index: Int): View = if (parent is ReactViewGroup) {
+    parent.getChildAt(parent.getZIndexMappedChildIndex(index))
+  } else {
+    parent.getChildAt(index)
   }
 
   override fun isViewClippingChildren(view: ViewGroup) = when {

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/FlingGestureHandlerEventDataBuilder.kt

@@ -4,7 +4,8 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.PixelUtil
 import com.swmansion.gesturehandler.core.FlingGestureHandler
 
-class FlingGestureHandlerEventDataBuilder(handler: FlingGestureHandler) : GestureHandlerEventDataBuilder<FlingGestureHandler>(handler) {
+class FlingGestureHandlerEventDataBuilder(handler: FlingGestureHandler) :
+  GestureHandlerEventDataBuilder<FlingGestureHandler>(handler) {
   private val x: Float
   private val y: Float
   private val absoluteX: Float

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/GestureHandlerEventDataBuilder.kt

@@ -3,7 +3,7 @@ package com.swmansion.gesturehandler.react.eventbuilders
 import com.facebook.react.bridge.WritableMap
 import com.swmansion.gesturehandler.core.GestureHandler
 
-abstract class GestureHandlerEventDataBuilder<T : GestureHandler<T>>(handler: T) {
+abstract class GestureHandlerEventDataBuilder<T : GestureHandler>(handler: T) {
   private val numberOfPointers: Int
   private val handlerTag: Int
   private val state: Int

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/HoverGestureHandlerEventDataBuilder.kt

@@ -5,7 +5,8 @@ import com.facebook.react.uimanager.PixelUtil
 import com.swmansion.gesturehandler.core.HoverGestureHandler
 import com.swmansion.gesturehandler.core.StylusData
 
-class HoverGestureHandlerEventDataBuilder(handler: HoverGestureHandler) : GestureHandlerEventDataBuilder<HoverGestureHandler>(handler) {
+class HoverGestureHandlerEventDataBuilder(handler: HoverGestureHandler) :
+  GestureHandlerEventDataBuilder<HoverGestureHandler>(handler) {
   private val x: Float
   private val y: Float
   private val absoluteX: Float

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/LongPressGestureHandlerEventDataBuilder.kt

@@ -4,7 +4,8 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.PixelUtil
 import com.swmansion.gesturehandler.core.LongPressGestureHandler
 
-class LongPressGestureHandlerEventDataBuilder(handler: LongPressGestureHandler) : GestureHandlerEventDataBuilder<LongPressGestureHandler>(handler) {
+class LongPressGestureHandlerEventDataBuilder(handler: LongPressGestureHandler) :
+  GestureHandlerEventDataBuilder<LongPressGestureHandler>(handler) {
   private val x: Float
   private val y: Float
   private val absoluteX: Float

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/ManualGestureHandlerEventDataBuilder.kt

@@ -2,4 +2,5 @@ package com.swmansion.gesturehandler.react.eventbuilders
 
 import com.swmansion.gesturehandler.core.ManualGestureHandler
 
-class ManualGestureHandlerEventDataBuilder(handler: ManualGestureHandler) : GestureHandlerEventDataBuilder<ManualGestureHandler>(handler)
+class ManualGestureHandlerEventDataBuilder(handler: ManualGestureHandler) :
+  GestureHandlerEventDataBuilder<ManualGestureHandler>(handler)

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/NativeGestureHandlerEventDataBuilder.kt

@@ -3,7 +3,8 @@ package com.swmansion.gesturehandler.react.eventbuilders
 import com.facebook.react.bridge.WritableMap
 import com.swmansion.gesturehandler.core.NativeViewGestureHandler
 
-class NativeGestureHandlerEventDataBuilder(handler: NativeViewGestureHandler) : GestureHandlerEventDataBuilder<NativeViewGestureHandler>(handler) {
+class NativeGestureHandlerEventDataBuilder(handler: NativeViewGestureHandler) :
+  GestureHandlerEventDataBuilder<NativeViewGestureHandler>(handler) {
   private val pointerInside: Boolean
 
   init {

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/PanGestureHandlerEventDataBuilder.kt

@@ -5,7 +5,8 @@ import com.facebook.react.uimanager.PixelUtil
 import com.swmansion.gesturehandler.core.PanGestureHandler
 import com.swmansion.gesturehandler.core.StylusData
 
-class PanGestureHandlerEventDataBuilder(handler: PanGestureHandler) : GestureHandlerEventDataBuilder<PanGestureHandler>(handler) {
+class PanGestureHandlerEventDataBuilder(handler: PanGestureHandler) :
+  GestureHandlerEventDataBuilder<PanGestureHandler>(handler) {
   private val x: Float
   private val y: Float
   private val absoluteX: Float

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/PinchGestureHandlerEventDataBuilder.kt

@@ -4,7 +4,8 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.PixelUtil
 import com.swmansion.gesturehandler.core.PinchGestureHandler
 
-class PinchGestureHandlerEventDataBuilder(handler: PinchGestureHandler) : GestureHandlerEventDataBuilder<PinchGestureHandler>(handler) {
+class PinchGestureHandlerEventDataBuilder(handler: PinchGestureHandler) :
+  GestureHandlerEventDataBuilder<PinchGestureHandler>(handler) {
   private val scale: Double
   private val focalX: Float
   private val focalY: Float

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/RotationGestureHandlerEventDataBuilder.kt

@@ -4,7 +4,8 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.PixelUtil
 import com.swmansion.gesturehandler.core.RotationGestureHandler
 
-class RotationGestureHandlerEventDataBuilder(handler: RotationGestureHandler) : GestureHandlerEventDataBuilder<RotationGestureHandler>(handler) {
+class RotationGestureHandlerEventDataBuilder(handler: RotationGestureHandler) :
+  GestureHandlerEventDataBuilder<RotationGestureHandler>(handler) {
   private val rotation: Double
   private val anchorX: Float
   private val anchorY: Float

package/android/src/main/java/com/swmansion/gesturehandler/react/eventbuilders/TapGestureHandlerEventDataBuilder.kt

@@ -4,7 +4,8 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.PixelUtil
 import com.swmansion.gesturehandler.core.TapGestureHandler
 
-class TapGestureHandlerEventDataBuilder(handler: TapGestureHandler) : GestureHandlerEventDataBuilder<TapGestureHandler>(handler) {
+class TapGestureHandlerEventDataBuilder(handler: TapGestureHandler) :
+  GestureHandlerEventDataBuilder<TapGestureHandler>(handler) {
   private val x: Float
   private val y: Float
   private val absoluteX: Float

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

@@ -26,21 +26,11 @@ target_include_directories(
 )
 
 find_package(ReactAndroid REQUIRED CONFIG)
-if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-  target_link_libraries(
-    ${PACKAGE_NAME}
-    ReactAndroid::reactnative
-    ReactAndroid::jsi
-  )
-elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 75)
-  target_link_libraries(
-    ${PACKAGE_NAME}
-    ReactAndroid::react_render_core
-    ReactAndroid::react_render_uimanager
-    ReactAndroid::react_render_graphics
-    ReactAndroid::jsi
-    ReactAndroid::react_nativemodule_core
-  )
-else ()
-  message(FATAL_ERROR "react-native-gesture-handler on the New Architecture requires react-native 0.75 or newer.")
-endif ()
+find_package(fbjni REQUIRED CONFIG)
+
+target_link_libraries(
+  ${PACKAGE_NAME}
+  ReactAndroid::reactnative
+  ReactAndroid::jsi
+  fbjni::fbjni
+)

package/android/svg/src/main/java/com/swmansion/gesturehandler/RNSVGHitTester.kt

@@ -27,9 +27,7 @@ class RNSVGHitTester {
       return rootSvgView
     }
 
-    fun isSvgElement(view: Any): Boolean {
-      return (view is VirtualView || view is SvgView)
-    }
+    fun isSvgElement(view: Any): Boolean = (view is VirtualView || view is SvgView)
 
     fun hitTest(view: View, posX: Float, posY: Float): Boolean {
       val rootSvgView = getRootSvgView(view)

package/apple/RNGestureHandlerButton.mm

@@ -135,20 +135,24 @@
 // Vendored from RCTView.m to infer accessibility label from children
 static NSString *RNGHRecursiveAccessibilityLabel(UIView *view)
 {
-  NSMutableString *str = [NSMutableString stringWithString:@""];
+  NSMutableString *str = nil;
   for (UIView *subview in view.subviews) {
     NSString *label = subview.accessibilityLabel;
     if (!label) {
       label = RNGHRecursiveAccessibilityLabel(subview);
     }
     if (label && label.length > 0) {
+      if (str == nil) {
+        str = [NSMutableString string];
+      }
       if (str.length > 0) {
         [str appendString:@" "];
       }
       [str appendString:label];
     }
   }
-  return str.length == 0 ? nil : str;
+
+  return str;
 }
 #endif
 

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "react-native-gesture-handler",
-  "version": "2.25.0",
+  "version": "2.27.0",
   "description": "Declarative API exposing native platform touch and gesture system to React Native",
   "scripts": {
-    "prepare": "bob build && husky install",
     "test": "jest",
-    "build": "yarn tsc -p tsconfig.build.json",
-    "precommit": "lint-staged",
-    "release": "npm login && release-it",
+    "build": "yarn tsc -p tsconfig.build.json && bob build",
     "ts-check": "yarn tsc --noEmit",
-    "format:js": "prettier --write --list-different './{src,example,FabricExample,MacOSExample}/**/*.{js,jsx,ts,tsx}'",
-    "format:android": "node ./scripts/format-android.js",
-    "format:apple": "find apple/ -iname *.h -o -iname *.m -o -iname *.cpp -o -iname *.mm | xargs clang-format -i",
-    "lint:js": "eslint --ext '.js,.ts,.tsx' src/ example/src FabricExample/src MacOSExample/src && yarn prettier --check './{src,example,FabricExample,MacOSExample}/**/*.{js,jsx,ts,tsx}'",
-    "lint:js-root": "eslint --ext '.js,.ts,.tsx' src/ && yarn prettier --check './src/**/*.{js,jsx,ts,tsx}'",
+    "format-js": "prettier --write --list-different './src/**/*.{js,jsx,ts,tsx}'",
+    "format:js": "yarn format-js",
+    "format:android": "node ../../scripts/format-android.js",
+    "format:apple": "node ../../scripts/format-apple.js",
+    "lint-js": "eslint --ext '.js,.ts,.tsx' src/ && yarn prettier --check './src/**/*.{js,jsx,ts,tsx}'",
+    "lint:js": "yarn lint-js",
     "lint:android": "./android/gradlew -p android spotlessCheck -q",
     "circular-dependency-check": "yarn madge --extensions js,ts,tsx --circular src",
-    "architectures-consistency-check": "node ./scripts/codegen-check-consistency.js",
-    "sync-architectures": "node ./scripts/codegen-sync-archs.js"
+    "architectures-consistency-check": "node ../../scripts/codegen-check-consistency.js",
+    "sync-architectures": "node ../../scripts/codegen-sync-archs.js",
+    "clean": "rm -rf node_modules android/build android/.cxx",
+    "prepack": "cp ../../README.md ./README.md",
+    "postpack": "rm ./README.md"
   },
   "react-native": "src/index.ts",
   "main": "lib/commonjs/index.js",
@@ -77,53 +78,39 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.12.7",
-    "@react-native/babel-preset": "0.78.0",
+    "@react-native/babel-preset": "0.80.0",
     "@testing-library/react-native": "^12.5.1",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/invariant": "^2.2.37",
     "@types/jest": "^27.0.3",
-    "@types/react": "^19.0.0",
-    "@types/react-test-renderer": "^19.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
+    "@types/react": "^19.1.0",
+    "@types/react-test-renderer": "^19.1.0",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
+    "@typescript-eslint/parser": "^6.9.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "clang-format": "^1.8.0",
-    "eslint": "^7.32.0",
-    "eslint-config-satya164": "^3.1.8",
+    "eslint": "^8.57.0",
+    "eslint-config-satya164": "3.3.0",
     "eslint-import-resolver-babel-module": "^5.2.0",
-    "eslint-plugin-jest": "^26.0.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "expo": "^35.0.1",
+    "eslint-plugin-jest": "27.4.3",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-react": "^7.37.5",
     "husky": "^8.0.1",
     "jest": "^28.1.0",
     "lint-staged": "^12.3.2",
     "madge": "^6.1.0",
     "prettier": "3.3.3",
-    "react": "19.0.0",
-    "react-native": "0.78.0",
-    "react-native-builder-bob": "^0.17.1",
-    "react-native-reanimated": "^3.12.0",
-    "react-test-renderer": "19.0.0",
-    "release-it": "^13.6.5",
-    "typescript": "5.0.4"
+    "react": "19.1.0",
+    "react-native": "0.80.0",
+    "react-native-builder-bob": "^0.39.0",
+    "react-native-reanimated": "^3.18.0",
+    "react-test-renderer": "19.1.0",
+    "typescript": "~5.8.3"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
-  "lint-staged": {
-    "./{src,example,FabricExample,MacOSExample}/**/*.{ts,tsx}": "yarn format:js",
-    "android/**/*.kt": "yarn format:android",
-    "apple/**/*.{h,m,mm,cpp}": "yarn format:apple",
-    "src/specs/*.ts": "yarn sync-architectures"
-  },
-  "release-it": {
-    "hooks": {
-      "before:git:bump": [
-        "# check if version corresponds to changes in native files  \n if git diff --name-only ${latestVersion} HEAD | egrep \"(android/.*)|(ios/.*)\" -q; then egrep '\\.0$' -q <<< ${version}; else test $? -eq 1; fi"
-      ]
-    }
-  },
   "react-native-builder-bob": {
     "source": "src",
     "output": "lib",
@@ -138,11 +125,6 @@
       ]
     ]
   },
-  "eslintIgnore": [
-    "node_modules/",
-    "lib/",
-    "src/specs/*NativeComponent.js"
-  ],
   "codegenConfig": {
     "name": "rngesturehandler_codegen",
     "type": "all",