react-native-gesture-handler 2.25.0 → 2.26.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,7 +26,16 @@ target_include_directories(
 )
 
 find_package(ReactAndroid REQUIRED CONFIG)
-if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+find_package(fbjni REQUIRED CONFIG)
+if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+  find_package(fbjni REQUIRED CONFIG)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+  )
+elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
   target_link_libraries(
     ${PACKAGE_NAME}
     ReactAndroid::reactnative

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/lib/commonjs/ActionType.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ActionType = void 0;
-const ActionType = {
+const ActionType = exports.ActionType = {
   REANIMATED_WORKLET: 1,
   NATIVE_ANIMATED_EVENT: 2,
   JS_FUNCTION_OLD_API: 3,
   JS_FUNCTION_NEW_API: 4
-}; // eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value
+};
 
-exports.ActionType = ActionType;
+// eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value
 //# sourceMappingURL=ActionType.js.map

package/lib/commonjs/ActionType.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ActionType.ts"],"names":["ActionType","REANIMATED_WORKLET","NATIVE_ANIMATED_EVENT","JS_FUNCTION_OLD_API","JS_FUNCTION_NEW_API"],"mappings":";;;;;;AAAO,MAAMA,UAAU,GAAG;AACxBC,EAAAA,kBAAkB,EAAE,CADI;AAExBC,EAAAA,qBAAqB,EAAE,CAFC;AAGxBC,EAAAA,mBAAmB,EAAE,CAHG;AAIxBC,EAAAA,mBAAmB,EAAE;AAJG,CAAnB,C,CAOP","sourcesContent":["export const ActionType = {\n  REANIMATED_WORKLET: 1,\n  NATIVE_ANIMATED_EVENT: 2,\n  JS_FUNCTION_OLD_API: 3,\n  JS_FUNCTION_NEW_API: 4,\n} as const;\n\n// eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value\nexport type ActionType = (typeof ActionType)[keyof typeof ActionType];\n"]}
+{"version":3,"names":["ActionType","exports","REANIMATED_WORKLET","NATIVE_ANIMATED_EVENT","JS_FUNCTION_OLD_API","JS_FUNCTION_NEW_API"],"sourceRoot":"../../src","sources":["ActionType.ts"],"mappings":";;;;;;AAAO,MAAMA,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;EACxBE,kBAAkB,EAAE,CAAC;EACrBC,qBAAqB,EAAE,CAAC;EACxBC,mBAAmB,EAAE,CAAC;EACtBC,mBAAmB,EAAE;AACvB,CAAU;;AAEV","ignoreList":[]}

package/lib/commonjs/Directions.js

@@ -3,26 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DiagonalDirections = exports.Directions = void 0;
+exports.Directions = exports.DiagonalDirections = void 0;
 const RIGHT = 1;
 const LEFT = 2;
 const UP = 4;
-const DOWN = 8; // Public interface
+const DOWN = 8;
 
-const Directions = {
+// Public interface
+const Directions = exports.Directions = {
   RIGHT: RIGHT,
   LEFT: LEFT,
   UP: UP,
   DOWN: DOWN
-}; // Internal interface
+};
 
-exports.Directions = Directions;
-const DiagonalDirections = {
+// Internal interface
+const DiagonalDirections = exports.DiagonalDirections = {
   UP_RIGHT: UP | RIGHT,
   DOWN_RIGHT: DOWN | RIGHT,
   UP_LEFT: UP | LEFT,
   DOWN_LEFT: DOWN | LEFT
-}; // eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value
+};
 
-exports.DiagonalDirections = DiagonalDirections;
+// eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
 //# sourceMappingURL=Directions.js.map

package/lib/commonjs/Directions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Directions.ts"],"names":["RIGHT","LEFT","UP","DOWN","Directions","DiagonalDirections","UP_RIGHT","DOWN_RIGHT","UP_LEFT","DOWN_LEFT"],"mappings":";;;;;;AAAA,MAAMA,KAAK,GAAG,CAAd;AACA,MAAMC,IAAI,GAAG,CAAb;AACA,MAAMC,EAAE,GAAG,CAAX;AACA,MAAMC,IAAI,GAAG,CAAb,C,CAEA;;AACO,MAAMC,UAAU,GAAG;AACxBJ,EAAAA,KAAK,EAAEA,KADiB;AAExBC,EAAAA,IAAI,EAAEA,IAFkB;AAGxBC,EAAAA,EAAE,EAAEA,EAHoB;AAIxBC,EAAAA,IAAI,EAAEA;AAJkB,CAAnB,C,CAOP;;;AACO,MAAME,kBAAkB,GAAG;AAChCC,EAAAA,QAAQ,EAAEJ,EAAE,GAAGF,KADiB;AAEhCO,EAAAA,UAAU,EAAEJ,IAAI,GAAGH,KAFa;AAGhCQ,EAAAA,OAAO,EAAEN,EAAE,GAAGD,IAHkB;AAIhCQ,EAAAA,SAAS,EAAEN,IAAI,GAAGF;AAJc,CAA3B,C,CAOP","sourcesContent":["const RIGHT = 1;\nconst LEFT = 2;\nconst UP = 4;\nconst DOWN = 8;\n\n// Public interface\nexport const Directions = {\n  RIGHT: RIGHT,\n  LEFT: LEFT,\n  UP: UP,\n  DOWN: DOWN,\n} as const;\n\n// Internal interface\nexport const DiagonalDirections = {\n  UP_RIGHT: UP | RIGHT,\n  DOWN_RIGHT: DOWN | RIGHT,\n  UP_LEFT: UP | LEFT,\n  DOWN_LEFT: DOWN | LEFT,\n} as const;\n\n// eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value\nexport type Directions = (typeof Directions)[keyof typeof Directions];\n// eslint-disable-next-line @typescript-eslint/no-redeclare\nexport type DiagonalDirections =\n  (typeof DiagonalDirections)[keyof typeof DiagonalDirections];\n"]}
+{"version":3,"names":["RIGHT","LEFT","UP","DOWN","Directions","exports","DiagonalDirections","UP_RIGHT","DOWN_RIGHT","UP_LEFT","DOWN_LEFT"],"sourceRoot":"../../src","sources":["Directions.ts"],"mappings":";;;;;;AAAA,MAAMA,KAAK,GAAG,CAAC;AACf,MAAMC,IAAI,GAAG,CAAC;AACd,MAAMC,EAAE,GAAG,CAAC;AACZ,MAAMC,IAAI,GAAG,CAAC;;AAEd;AACO,MAAMC,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;EACxBJ,KAAK,EAAEA,KAAK;EACZC,IAAI,EAAEA,IAAI;EACVC,EAAE,EAAEA,EAAE;EACNC,IAAI,EAAEA;AACR,CAAU;;AAEV;AACO,MAAMG,kBAAkB,GAAAD,OAAA,CAAAC,kBAAA,GAAG;EAChCC,QAAQ,EAAEL,EAAE,GAAGF,KAAK;EACpBQ,UAAU,EAAEL,IAAI,GAAGH,KAAK;EACxBS,OAAO,EAAEP,EAAE,GAAGD,IAAI;EAClBS,SAAS,EAAEP,IAAI,GAAGF;AACpB,CAAU;;AAEV;;AAEA","ignoreList":[]}

package/lib/commonjs/EnableNewWebImplementation.js

@@ -6,41 +6,33 @@ Object.defineProperty(exports, "__esModule", {
 exports.enableExperimentalWebImplementation = enableExperimentalWebImplementation;
 exports.enableLegacyWebImplementation = enableLegacyWebImplementation;
 exports.isNewWebImplementationEnabled = isNewWebImplementationEnabled;
-
 var _reactNative = require("react-native");
-
 var _utils = require("./utils");
-
 let useNewWebImplementation = true;
 let getWasCalled = false;
+
 /**
  * @deprecated new web implementation is enabled by default. This function will be removed in Gesture Handler 3
  */
-
 function enableExperimentalWebImplementation(_shouldEnable = true) {
   // NO-OP since the new implementation is now the default
   console.warn((0, _utils.tagMessage)('New web implementation is enabled by default. This function will be removed in Gesture Handler 3.'));
 }
+
 /**
  * @deprecated legacy implementation is no longer supported. This function will be removed in Gesture Handler 3
  */
-
-
 function enableLegacyWebImplementation(shouldUseLegacyImplementation = true) {
   console.warn((0, _utils.tagMessage)('Legacy web implementation is deprecated. This function will be removed in Gesture Handler 3.'));
-
   if (_reactNative.Platform.OS !== 'web' || useNewWebImplementation === !shouldUseLegacyImplementation) {
     return;
   }
-
   if (getWasCalled) {
     console.error('Some parts of this application have already started using the new gesture handler implementation. No changes will be applied. You can try enabling legacy implementation earlier.');
     return;
   }
-
   useNewWebImplementation = !shouldUseLegacyImplementation;
 }
-
 function isNewWebImplementationEnabled() {
   getWasCalled = true;
   return useNewWebImplementation;

package/lib/commonjs/EnableNewWebImplementation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["EnableNewWebImplementation.ts"],"names":["useNewWebImplementation","getWasCalled","enableExperimentalWebImplementation","_shouldEnable","console","warn","enableLegacyWebImplementation","shouldUseLegacyImplementation","Platform","OS","error","isNewWebImplementationEnabled"],"mappings":";;;;;;;;;AAAA;;AACA;;AAEA,IAAIA,uBAAuB,GAAG,IAA9B;AACA,IAAIC,YAAY,GAAG,KAAnB;AAEA;AACA;AACA;;AACO,SAASC,mCAAT,CACLC,aAAa,GAAG,IADX,EAEC;AACN;AACAC,EAAAA,OAAO,CAACC,IAAR,CACE,uBACE,mGADF,CADF;AAKD;AAED;AACA;AACA;;;AACO,SAASC,6BAAT,CACLC,6BAA6B,GAAG,IAD3B,EAEC;AACNH,EAAAA,OAAO,CAACC,IAAR,CACE,uBACE,8FADF,CADF;;AAMA,MACEG,sBAASC,EAAT,KAAgB,KAAhB,IACAT,uBAAuB,KAAK,CAACO,6BAF/B,EAGE;AACA;AACD;;AAED,MAAIN,YAAJ,EAAkB;AAChBG,IAAAA,OAAO,CAACM,KAAR,CACE,mLADF;AAGA;AACD;;AAEDV,EAAAA,uBAAuB,GAAG,CAACO,6BAA3B;AACD;;AAEM,SAASI,6BAAT,GAAkD;AACvDV,EAAAA,YAAY,GAAG,IAAf;AACA,SAAOD,uBAAP;AACD","sourcesContent":["import { Platform } from 'react-native';\nimport { tagMessage } from './utils';\n\nlet useNewWebImplementation = true;\nlet getWasCalled = false;\n\n/**\n * @deprecated new web implementation is enabled by default. This function will be removed in Gesture Handler 3\n */\nexport function enableExperimentalWebImplementation(\n  _shouldEnable = true\n): void {\n  // NO-OP since the new implementation is now the default\n  console.warn(\n    tagMessage(\n      'New web implementation is enabled by default. This function will be removed in Gesture Handler 3.'\n    )\n  );\n}\n\n/**\n * @deprecated legacy implementation is no longer supported. This function will be removed in Gesture Handler 3\n */\nexport function enableLegacyWebImplementation(\n  shouldUseLegacyImplementation = true\n): void {\n  console.warn(\n    tagMessage(\n      'Legacy web implementation is deprecated. This function will be removed in Gesture Handler 3.'\n    )\n  );\n\n  if (\n    Platform.OS !== 'web' ||\n    useNewWebImplementation === !shouldUseLegacyImplementation\n  ) {\n    return;\n  }\n\n  if (getWasCalled) {\n    console.error(\n      'Some parts of this application have already started using the new gesture handler implementation. No changes will be applied. You can try enabling legacy implementation earlier.'\n    );\n    return;\n  }\n\n  useNewWebImplementation = !shouldUseLegacyImplementation;\n}\n\nexport function isNewWebImplementationEnabled(): boolean {\n  getWasCalled = true;\n  return useNewWebImplementation;\n}\n"]}
+{"version":3,"names":["_reactNative","require","_utils","useNewWebImplementation","getWasCalled","enableExperimentalWebImplementation","_shouldEnable","console","warn","tagMessage","enableLegacyWebImplementation","shouldUseLegacyImplementation","Platform","OS","error","isNewWebImplementationEnabled"],"sourceRoot":"../../src","sources":["EnableNewWebImplementation.ts"],"mappings":";;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAEA,IAAIE,uBAAuB,GAAG,IAAI;AAClC,IAAIC,YAAY,GAAG,KAAK;;AAExB;AACA;AACA;AACO,SAASC,mCAAmCA,CACjDC,aAAa,GAAG,IAAI,EACd;EACN;EACAC,OAAO,CAACC,IAAI,CACV,IAAAC,iBAAU,EACR,mGACF,CACF,CAAC;AACH;;AAEA;AACA;AACA;AACO,SAASC,6BAA6BA,CAC3CC,6BAA6B,GAAG,IAAI,EAC9B;EACNJ,OAAO,CAACC,IAAI,CACV,IAAAC,iBAAU,EACR,8FACF,CACF,CAAC;EAED,IACEG,qBAAQ,CAACC,EAAE,KAAK,KAAK,IACrBV,uBAAuB,KAAK,CAACQ,6BAA6B,EAC1D;IACA;EACF;EAEA,IAAIP,YAAY,EAAE;IAChBG,OAAO,CAACO,KAAK,CACX,mLACF,CAAC;IACD;EACF;EAEAX,uBAAuB,GAAG,CAACQ,6BAA6B;AAC1D;AAEO,SAASI,6BAA6BA,CAAA,EAAY;EACvDX,YAAY,GAAG,IAAI;EACnB,OAAOD,uBAAuB;AAChC","ignoreList":[]}