react-native-gesture-handler 2.32.0-nightly-20260521-3846335df → 2.32.0

package/DrawerLayout/package.json

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

package/README.md

@@ -33,15 +33,6 @@ You will need to have an Android or iOS device or emulator connected.
 
 `react-native-gesture-handler` supports the three latest minor releases of `react-native`.
 
-### Gesture Handler 3
-
-Check out our [compatibility table](https://docs.swmansion.com/react-native-gesture-handler/docs/fundamentals/installation#requirements) in documentation.
-
-> [!IMPORTANT]
-> Minimal supported `react-native` version for Gesture Handler 3 is `0.82`
-
-### Gesture Handler 2
-
 | version | react-native version |
 | ------- | -------------------- |
 | 2.28.0+ | 0.79.0+              |

package/RNGestureHandler.podspec

@@ -5,7 +5,7 @@ is_gh_example_app = ENV["GH_EXAMPLE_APP_NAME"] != nil
 
 compilation_metadata_dir = "CompilationDatabase"
 compilation_metadata_generation_flag = is_gh_example_app ? '-gen-cdb-fragment-path ' + compilation_metadata_dir : ''
-version_flag = "-DREACT_NATIVE_MINOR_VERSION=#{get_react_native_minor_version()}"
+version_flag = "-DREACT_NATIVE_MINOR_VERSION=#{GestureHandlerUtils.get_react_native_minor_version()}"
 
 Pod::Spec.new do |s|
   # NPM package specification
@@ -18,16 +18,20 @@ Pod::Spec.new do |s|
   s.license      = "MIT"
   s.author       = { package["author"]["name"] => package["author"]["email"] }
   s.source       = { :git => "https://github.com/software-mansion/react-native-gesture-handler", :tag => "#{s.version}" }
-  s.source_files = "apple/**/*.{h,m,mm}", "shared/**/*.{h,cpp}"
+  s.source_files = "apple/**/*.{h,m,mm}"
   s.requires_arc = true
   s.platforms       = { ios: '11.0', tvos: '11.0', osx: '10.15', visionos: '1.0' }
   s.xcconfig = {
     "OTHER_CFLAGS" => "$(inherited) #{compilation_metadata_generation_flag} #{version_flag}"
   }
 
-  install_modules_dependencies(s);
+  if defined?(install_modules_dependencies()) != nil
+    install_modules_dependencies(s);
+  else
+    s.dependency "React-Core"
+  end
 
-  if ENV['USE_FRAMEWORKS'] != nil
+  if ENV['USE_FRAMEWORKS'] != nil && ENV['RCT_NEW_ARCH_ENABLED'] == '1'
     add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
       "react/renderer/textlayoutmanager/platform/ios",
       "react/renderer/components/textinput/platform/ios",

package/ReanimatedDrawerLayout/package.json

@@ -1,5 +1,5 @@
 {
-  "main": "../lib/module/components/ReanimatedDrawerLayout",
+  "main": "../lib/commonjs/components/ReanimatedDrawerLayout",
   "module": "../lib/module/components/ReanimatedDrawerLayout",
   "react-native": "../src/components/ReanimatedDrawerLayout",
   "types": "../lib/typescript/components/ReanimatedDrawerLayout.d.ts"

package/ReanimatedSwipeable/package.json

@@ -1,5 +1,5 @@
 {
-  "main": "../lib/module/components/ReanimatedSwipeable/",
+  "main": "../lib/commonjs/components/ReanimatedSwipeable/",
   "module": "../lib/module/components/ReanimatedSwipeable/",
   "react-native": "../src/components/ReanimatedSwipeable/",
   "types": "../lib/typescript/components/ReanimatedSwipeable/"

package/Swipeable/package.json

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

package/android/build.gradle

@@ -16,6 +16,14 @@ buildscript {
     }
 }
 
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
@@ -49,11 +57,6 @@ def resolveReactNativeDirectory() {
     )
 }
 
-def isNewArchitectureEnabled() {
-    // This is a workaround for linter crashing when applying the `com.facebook.react` plugin.
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
-
 if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
 }
@@ -144,16 +147,19 @@ android {
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 24)
         targetSdkVersion safeExtGet('targetSdkVersion', 33)
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString()
 
-        externalNativeBuild {
-            cmake {
-                cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++20", "-DANDROID"
-                arguments "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}",
-                        "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}",
-                        "-DANDROID_STL=c++_shared",
-                        "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-                abiFilters(*reactNativeArchitectures())
+        if (isNewArchitectureEnabled()) {
+            externalNativeBuild {
+                cmake {
+                    cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++20", "-DANDROID"
+                    arguments "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}",
+                            "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}",
+                            "-DANDROID_STL=c++_shared",
+                            "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+                    abiFilters(*reactNativeArchitectures())
+                }
             }
         }
     }
@@ -163,9 +169,11 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    externalNativeBuild {
-        cmake {
-            path "src/main/jni/CMakeLists.txt"
+    if (isNewArchitectureEnabled()) {
+        externalNativeBuild {
+            cmake {
+                path "src/main/jni/CMakeLists.txt"
+            }
         }
     }
 
@@ -194,6 +202,14 @@ android {
             } else {
                 srcDirs += 'nosvg/src/main/java'
             }
+
+            if (isNewArchitectureEnabled()) {
+                srcDirs += 'fabric/src/main/java'
+            } else {
+                // 'paper/src/main/java' includes files from codegen so the library can compile with
+                // codegen turned off
+                srcDirs += 'paper/src/main/java'
+            }
         }
     }
 
@@ -217,6 +233,7 @@ def kotlin_version = safeExtGet('kotlinVersion', project.properties['RNGH_kotlin
 dependencies {
     implementation 'com.facebook.react:react-native:+' // from node_modules
 
+
     if (shouldUseCommonInterfaceFromReanimated()) {
         // Include Reanimated as dependency to load the common interface
         implementation(rootProject.subprojects.find { it.name == 'react-native-reanimated' }) {

package/android/noreanimated/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/noreanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt

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

package/android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerDelegate.java

@@ -0,0 +1,64 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+@SuppressWarnings("deprecation")
+public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNGestureHandlerButtonManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNGestureHandlerButtonManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "exclusive":
+        mViewManager.setExclusive(view, value == null ? true : (boolean) value);
+        break;
+      case "foreground":
+        mViewManager.setForeground(view, value == null ? false : (boolean) value);
+        break;
+      case "borderless":
+        mViewManager.setBorderless(view, value == null ? false : (boolean) value);
+        break;
+      case "enabled":
+        mViewManager.setEnabled(view, value == null ? true : (boolean) value);
+        break;
+      case "rippleColor":
+        mViewManager.setRippleColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "rippleRadius":
+        mViewManager.setRippleRadius(view, value == null ? 0 : ((Double) value).intValue());
+        break;
+      case "touchSoundDisabled":
+        mViewManager.setTouchSoundDisabled(view, value == null ? false : (boolean) value);
+        break;
+      case "borderWidth":
+        mViewManager.setBorderWidth(view, value == null ? 0f : ((Double) value).floatValue());
+        break;
+      case "borderColor":
+        mViewManager.setBorderColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "borderStyle":
+        mViewManager.setBorderStyle(view, value == null ? "solid" : (String) value);
+        break;
+      case "pointerEvents":
+        mViewManager.setPointerEvents(view, (String) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerInterface.java

@@ -0,0 +1,28 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
+
+public interface RNGestureHandlerButtonManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+  void setExclusive(T view, boolean value);
+  void setForeground(T view, boolean value);
+  void setBorderless(T view, boolean value);
+  void setEnabled(T view, boolean value);
+  void setRippleColor(T view, @Nullable Integer value);
+  void setRippleRadius(T view, int value);
+  void setTouchSoundDisabled(T view, boolean value);
+  void setBorderWidth(T view, float value);
+  void setBorderColor(T view, @Nullable Integer value);
+  void setBorderStyle(T view, @Nullable String value);
+  void setPointerEvents(T view, @Nullable String value);
+}

package/android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerDelegate.java

@@ -0,0 +1,33 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+@SuppressWarnings("deprecation")
+public class RNGestureHandlerRootViewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNGestureHandlerRootViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNGestureHandlerRootViewManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "unstable_forceActive":
+        mViewManager.setUnstable_forceActive(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerInterface.java

@@ -0,0 +1,17 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
+
+public interface RNGestureHandlerRootViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+  void setUnstable_forceActive(T view, boolean value);
+}

package/android/paper/src/main/java/com/swmansion/gesturehandler/NativeRNGestureHandlerModuleSpec.java

@@ -0,0 +1,67 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.swmansion.gesturehandler;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+
+public abstract class NativeRNGestureHandlerModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public static final String NAME = "RNGestureHandlerModule";
+
+  public NativeRNGestureHandlerModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void handleSetJSResponder(double tag, boolean blockNativeResponder);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void handleClearJSResponder();
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void createGestureHandler(String handlerName, double handlerTag, ReadableMap config);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void attachGestureHandler(double handlerTag, double newView, double actionType);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void updateGestureHandler(double handlerTag, ReadableMap newConfig);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void dropGestureHandler(double handlerTag);
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
+  public abstract boolean install();
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void flushOperations();
+}

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

@@ -0,0 +1,16 @@
+package com.swmansion.gesturehandler
+
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.events.Event
+
+fun ReactContext.dispatchEvent(event: Event<*>) {
+  try {
+    this.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher.dispatchEvent(event)
+  } catch (e: NullPointerException) {
+    throw Exception(
+      "Couldn't get an instance of UIManagerModule. Gesture Handler is unable to send an event.",
+      e,
+    )
+  }
+}

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

@@ -0,0 +1,17 @@
+package com.swmansion.gesturehandler
+
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.events.Event
+import com.swmansion.reanimated.ReanimatedModule
+
+class ReanimatedEventDispatcher {
+  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)
+  }
+}

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

@@ -11,7 +11,6 @@ import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager
-import com.swmansion.gesturehandler.react.RNGestureHandlerDetectorViewManager
 import com.swmansion.gesturehandler.react.RNGestureHandlerModule
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootViewManager
 
@@ -31,17 +30,11 @@ class RNGestureHandlerPackage :
       RNGestureHandlerButtonViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec {
         RNGestureHandlerButtonViewManager()
       },
-      RNGestureHandlerDetectorViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec {
-        RNGestureHandlerDetectorViewManager()
-      },
     )
   }
 
-  override fun createViewManagers(reactContext: ReactApplicationContext) = listOf<ViewManager<*, *>>(
-    RNGestureHandlerRootViewManager(),
-    RNGestureHandlerButtonViewManager(),
-    RNGestureHandlerDetectorViewManager(),
-  )
+  override fun createViewManagers(reactContext: ReactApplicationContext) =
+    listOf<ViewManager<*, *>>(RNGestureHandlerRootViewManager(), RNGestureHandlerButtonViewManager())
 
   override fun getViewManagerNames(reactContext: ReactApplicationContext) = viewManagers.keys.toList()
 

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

@@ -6,7 +6,7 @@ import android.os.Looper
 import android.view.MotionEvent
 import android.view.VelocityTracker
 import com.facebook.react.bridge.ReadableMap
-import com.swmansion.gesturehandler.react.events.eventbuilders.FlingGestureHandlerEventDataBuilder
+import com.swmansion.gesturehandler.react.eventbuilders.FlingGestureHandlerEventDataBuilder
 
 class FlingGestureHandler : GestureHandler() {
   var numberOfPointersRequired = DEFAULT_NUMBER_OF_TOUCHES_REQUIRED
@@ -132,9 +132,8 @@ class FlingGestureHandler : GestureHandler() {
 
     override fun create(context: Context?): FlingGestureHandler = FlingGestureHandler()
 
-    override fun updateConfig(handler: FlingGestureHandler, config: ReadableMap) {
-      super.updateConfig(handler, config)
-
+    override fun setConfig(handler: FlingGestureHandler, config: ReadableMap) {
+      super.setConfig(handler, config)
       if (config.hasKey(KEY_NUMBER_OF_POINTERS)) {
         handler.numberOfPointersRequired = config.getInt(KEY_NUMBER_OF_POINTERS)
       }