react-native-gesture-handler 2.9.0 → 2.10.0

package/README.md

@@ -39,6 +39,7 @@ You will need to have an Android or iOS device or emulator connected as well as
 
 | version | react-native version |
 | ------- | -------------------- |
+| 2.10.0+ | 0.64.0+              |
 | 2.0.0+  | 0.63.0+              |
 | 1.4.0+  | 0.60.0+              |
 | 1.1.0+  | 0.57.2+              |

package/RNGestureHandler.podspec

@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
       'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
     }
     s.platforms       = { ios: '11.0', tvos: '11.0' }
-    s.compiler_flags  = folly_compiler_flags + ' -DRN_FABRIC_ENABLED'
+    s.compiler_flags  = folly_compiler_flags + ' -DRCT_NEW_ARCH_ENABLED'
 
     s.dependency "React"
     s.dependency "React-RCTFabric" # This is for fabric component

package/android/build.gradle

@@ -1,5 +1,7 @@
 import groovy.json.JsonSlurper
-import java.nio.file.Paths
+
+import javax.inject.Inject
+import java.nio.file.Files
 
 buildscript {
     def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion']
@@ -66,6 +68,14 @@ if (project == rootProject) {
     apply from: "spotless.gradle"
 }
 
+def shouldAssertNoMultipleInstances() {
+  if (rootProject.hasProperty("disableMultipleInstancesCheck")) {
+    return rootProject.property("disableMultipleInstancesCheck") != "true"
+  } else {
+    return true
+  }
+}
+
 // Check whether Reanimated 2.3 or higher is installed alongside Gesture Handler
 def shouldUseCommonInterfaceFromReanimated() {
     def reanimated = rootProject.subprojects.find { it.name == 'react-native-reanimated' }
@@ -85,28 +95,6 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-def shouldAssertNoMultipleInstances() {
-  if (rootProject.hasProperty("disableMultipleInstancesCheck")) {
-    return rootProject.property("disableMultipleInstancesCheck") != "true"
-  } else {
-    return true
-  }
-}
-
-def noMultipleInstancesAssertion() {
-    Set<File> files = fileTree(rootDir.parent) {
-        include "node_modules/**/react-native-gesture-handler/package.json"
-        exclude "**/.yarn/**"
-        exclude "**/.pnpm/**"
-    }.files
-
-    if (files.size() > 1) {
-        String parsedLocation = files.stream().map({ File file -> "- " + file.toString().replace("/package.json", "") }).collect().join("\n")
-        String exceptionMessage = "\n[Gesture Handler] Multiple instances of Gesture Handler were detected. Only one instance of react-native-gesture-handler can be installed in a project. You need to resolve the conflict manually. Check out the documentation: https://docs.swmansion.com/react-native-gesture-handler/docs/troubleshooting#multiple-instances-of-gesture-handler-were-detected \n\nConflict between: \n" + parsedLocation + "\n";
-        throw new Exception(exceptionMessage);
-    }
-}
-
 def REACT_NATIVE_DIR = resolveReactNativeDirectory()
 
 def reactProperties = new Properties()
@@ -115,23 +103,75 @@ file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { react
 def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
 def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
-def assertionTask = task assertNoMultipleInstances {
-    onlyIf { shouldAssertNoMultipleInstances() }
-    doFirst {
-        noMultipleInstancesAssertion()
+
+abstract class NoMultipleInstancesAssertionTask extends DefaultTask {
+    @Inject abstract ObjectFactory getObjectFactory()
+
+    @Input abstract Property<File> getProjectDirFile()
+    @Input abstract Property<File> getRootDirFile()
+    @Input abstract Property<Boolean> getShouldCheck()
+
+    def findGestureHandlerInstancesForPath(String path) {
+        return objectFactory.fileTree().from(path)
+                .include("**/react-native-gesture-handler/package.json")
+                .exclude("**/.yarn/**")
+                .exclude({ Files.isSymbolicLink(it.getFile().toPath()) })
+                .findAll()
+    }
+
+    @TaskAction
+    def check() {
+        if (shouldCheck.get()) {
+            // Assert there are no multiple installations of Gesture Handler
+            Set<File> files
+
+            if (projectDirFile.get().parent.contains(rootDirFile.get().parent)) {
+                // standard app
+                files = findGestureHandlerInstancesForPath(rootDirFile.get().parent + "/node_modules")
+            } else {
+                // monorepo
+                files = findGestureHandlerInstancesForPath(rootDirFile.get().parent + "/node_modules")
+                files.addAll(
+                    findGestureHandlerInstancesForPath(projectDirFile.get().parentFile.parent)
+                )
+            }
+
+            if (files.size() > 1) {
+                String parsedLocation = files.stream().map({
+                    File file -> "- " + file.toString().replace("/package.json", "")
+                }).collect().join("\n")
+                String exceptionMessage = "\n[react-native-gesture-handler] Multiple versions of Gesture Handler " +
+                        "were detected. Only one instance of react-native-gesture-handler can be installed in a " +
+                        "project. You need to resolve the conflict manually. Check out the documentation: " +
+                        "https://docs.swmansion.com/react-native-gesture-handler/docs/troubleshooting" +
+                        "#multiple-instances-of-gesture-handler-were-detected \n\nConflict between: \n" +
+                        parsedLocation + "\n"
+                throw new GradleException(exceptionMessage)
+            }
+        }
     }
 }
 
-tasks.preBuild {
-    dependsOn assertionTask
+tasks.register('assertNoMultipleInstances', NoMultipleInstancesAssertionTask) {
+    shouldCheck = shouldAssertNoMultipleInstances()
+    rootDirFile = rootDir
+    projectDirFile = projectDir
 }
 
+ tasks.preBuild {
+     dependsOn assertNoMultipleInstances
+ }
+
 repositories {
     mavenCentral()
 }
 
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 28)
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+        namespace "com.swmansion.gesturehandler"
+    }
 
     // Used to override the NDK path/version on internal CI or by allowing
     // users to customize the NDK path/version from their root project (e.g. for M1 support)

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

@@ -64,7 +64,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
   private var shouldCancelWhenOutside = false
   var numberOfPointers = 0
     private set
-  private var orchestrator: GestureHandlerOrchestrator? = null
+  protected var orchestrator: GestureHandlerOrchestrator? = null
   private var onTouchEventListener: OnTouchEventListener? = null
   private var interactionController: GestureHandlerInteractionController? = null
 

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

@@ -50,6 +50,8 @@ class GestureHandlerOrchestrator(
     return true
   }
 
+  fun getHandlersForView(view: View) = handlerRegistry.getHandlersForView(view)
+
   private fun scheduleFinishedHandlersCleanup() {
     if (isHandlingTouch || handlingChangeSemaphore != 0) {
       finishedHandlersCleanupScheduled = true

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

@@ -5,6 +5,8 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewConfiguration
 import android.view.ViewGroup
+import android.widget.ScrollView
+import com.facebook.react.views.swiperefresh.ReactSwipeRefreshLayout
 import com.facebook.react.views.textinput.ReactEditText
 
 class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
@@ -72,6 +74,7 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
     when (val view = view) {
       is NativeViewGestureHandlerHook -> this.hook = view
       is ReactEditText -> this.hook = EditTextHook(this, view)
+      is ReactSwipeRefreshLayout -> this.hook = SwipeRefreshLayoutHook(this, view)
     }
   }
 
@@ -208,4 +211,40 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
 
     override fun shouldCancelRootViewGestureHandlerIfNecessary() = true
   }
+
+  private class SwipeRefreshLayoutHook(
+    private val handler: NativeViewGestureHandler,
+    private val swipeRefreshLayout: ReactSwipeRefreshLayout
+  ) : NativeViewGestureHandlerHook {
+    override fun wantsToHandleEventBeforeActivation() = true
+
+    override fun handleEventBeforeActivation(event: MotionEvent) {
+      // RefreshControl from GH is set up in a way that ScrollView wrapped with it should wait for
+      // it to fail. This way the RefreshControl is not canceled by the scroll handler.
+      // The problem with this approach is that the RefreshControl handler stays active all the time
+      // preventing scroll from activating.
+      // This is a workaround to prevent it from happening.
+
+      // First get the ScrollView under the RefreshControl, if there is none, return.
+      val scroll = swipeRefreshLayout.getChildAt(0) as? ScrollView ?: return
+
+      // Then find the first NativeViewGestureHandler attached to it
+      val scrollHandler = handler.orchestrator
+        ?.getHandlersForView(scroll)
+        ?.first {
+          it is NativeViewGestureHandler
+        }
+
+      // If handler was found, it's active and the ScrollView is not at the top, fail the RefreshControl
+      if (scrollHandler != null && scrollHandler.state == STATE_ACTIVE && scroll.scrollY > 0) {
+        handler.fail()
+      }
+
+      // The drawback is that the smooth transition from scrolling to refreshing in a single swipe
+      // is impossible this way and two swipes are required:
+      // - one to go back to top
+      // - one to actually refresh
+      // oh well  ¯\_(ツ)_/¯
+    }
+  }
 }

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

@@ -229,12 +229,12 @@ class RNGestureHandlerButtonViewManager : ViewGroupManager<ButtonViewGroup>(), R
           colorDrawable.setCornerRadius(borderRadius)
         }
 
-        val layerDrawable = LayerDrawable(arrayOf(colorDrawable, selectable))
+        val layerDrawable = LayerDrawable(if (selectable != null) arrayOf(colorDrawable, selectable) else arrayOf(colorDrawable))
         background = layerDrawable
       }
     }
 
-    private fun createSelectableDrawable(): Drawable {
+    private fun createSelectableDrawable(): Drawable? {
       // TODO: remove once support for RN 0.63 is dropped, since 0.64 minSdkVersion is 21
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
         context.theme.resolveAttribute(android.R.attr.selectableItemBackground, resolveOutValue, true)
@@ -242,6 +242,12 @@ class RNGestureHandlerButtonViewManager : ViewGroupManager<ButtonViewGroup>(), R
         return resources.getDrawable(resolveOutValue.resourceId)
       }
 
+      // Since Android 13, alpha channel in RippleDrawable is clamped between [128, 255]
+      // see https://github.com/aosp-mirror/platform_frameworks_base/blob/c1bd0480261460584753508327ca8a0c6fc80758/graphics/java/android/graphics/drawable/RippleDrawable.java#L1012
+      if (rippleColor == Color.TRANSPARENT && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        return null
+      }
+
       val states = arrayOf(intArrayOf(android.R.attr.state_enabled))
       val rippleRadius = rippleRadius
       val colorStateList = if (rippleColor != null) {

package/ios/Handlers/RNNativeViewHandler.mm

@@ -13,11 +13,11 @@
 #import <React/RCTConvert.h>
 #import <React/UIView+React.h>
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTScrollViewComponentView.h>
 #else
 #import <React/RCTScrollView.h>
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 #pragma mark RNDummyGestureRecognizer
 
@@ -110,7 +110,7 @@
   // We can restore default scrollview behaviour to delay touches to scrollview's children
   // because gesture handler system can handle cancellation of scroll recognizer when JS responder
   // is set
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
   if ([view isKindOfClass:[RCTScrollViewComponentView class]]) {
     UIScrollView *scrollView = ((RCTScrollViewComponentView *)view).scrollView;
     scrollView.delaysContentTouches = YES;
@@ -123,7 +123,7 @@
     UIScrollView *scrollView = [view.subviews objectAtIndex:0];
     scrollView.delaysContentTouches = YES;
   }
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (void)handleTouchDown:(UIView *)sender forEvent:(UIEvent *)event

package/ios/RNGestureHandlerButtonComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 
 #import <UIKit/UIKit.h>
 
@@ -14,4 +14,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNGestureHandlerButtonComponentView.mm

@@ -1,4 +1,4 @@
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNGestureHandlerButtonComponentView.h"
 
@@ -57,4 +57,4 @@ Class<RCTComponentViewProtocol> RNGestureHandlerButtonCls(void)
   return RNGestureHandlerButtonComponentView.class;
 }
 
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNGestureHandlerManager.mm

@@ -14,12 +14,12 @@
 #import "RNGestureHandlerState.h"
 #import "RNRootViewGestureRecognizer.h"
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/RCTViewComponentView.h>
 #else
 #import <React/RCTTouchHandler.h>
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 #import "Handlers/RNFlingHandler.h"
 #import "Handlers/RNForceTouchHandler.h"
@@ -99,7 +99,7 @@
 {
   UIView *view = [_uiManager viewForReactTag:viewTag];
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
   if (view == nil) {
     // Happens when the view with given tag has been flattened.
     // We cannot attach gesture handler to a non-existent view.
@@ -117,7 +117,7 @@
 
   view.reactTag = viewTag; // necessary for RNReanimated eventHash (e.g. "42onGestureHandlerEvent"), also will be
                            // returned as event.target
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
   [_registry attachHandlerWithTag:handlerTag toView:view withActionType:actionType];
 
@@ -207,7 +207,7 @@
   if ([gestureRecognizer.view isKindOfClass:[UIScrollView class]])
     return;
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
   RCTSurfaceTouchHandler *touchHandler = [viewWithTouchHandler performSelector:@selector(touchHandler)];
 #else
   RCTTouchHandler *touchHandler = [viewWithTouchHandler performSelector:@selector(touchHandler)];
@@ -249,7 +249,7 @@
 - (void)sendEventForReanimated:(RNGestureHandlerStateChange *)event
 {
   // Delivers the event to Reanimated.
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
   // Send event directly to Reanimated
   if (_reanimatedModule == nil) {
     _reanimatedModule = [_uiManager.bridge moduleForName:@"ReanimatedModule"];
@@ -260,7 +260,7 @@
   // In the old architecture, Reanimated overwrites RCTEventDispatcher
   // with REAEventDispatcher and intercepts all direct events.
   [self sendEventForDirectEvent:event];
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (void)sendEventForNativeAnimatedEvent:(RNGestureHandlerStateChange *)event
@@ -275,11 +275,11 @@
 - (void)sendEventForJSFunctionOldAPI:(RNGestureHandlerStateChange *)event
 {
   // Delivers the event to JS (old RNGH API).
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
   [self sendEventForDeviceEvent:event];
 #else
   [self sendEventForDirectEvent:event];
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (void)sendEventForJSFunctionNewAPI:(RNGestureHandlerStateChange *)event

package/ios/RNGestureHandlerModule.mm

@@ -7,7 +7,7 @@
 #import <React/RCTUIManagerUtils.h>
 #import <React/RCTViewManager.h>
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
 #import <React/RCTSurfacePresenter.h>
@@ -16,7 +16,7 @@
 #import <ReactCommon/RCTTurboModule.h>
 
 #import <react/renderer/uimanager/primitives.h>
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 #import "RNGestureHandler.h"
 #import "RNGestureHandlerDirection.h"
@@ -26,12 +26,12 @@
 #import "RNGestureHandlerButton.h"
 #import "RNGestureHandlerStateManager.h"
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 using namespace facebook;
 using namespace react;
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 @interface RNGestureHandlerModule () <RCTSurfacePresenterObserver, RNGestureHandlerStateManager>
 
 @end
@@ -39,7 +39,7 @@ using namespace react;
 @interface RNGestureHandlerModule () <RCTUIManagerObserver, RNGestureHandlerStateManager>
 
 @end
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 typedef void (^GestureHandlerOperation)(RNGestureHandlerManager *manager);
 
@@ -66,11 +66,11 @@ RCT_EXPORT_MODULE()
 
   _manager = nil;
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
   [self.bridge.surfacePresenter removeObserver:self];
 #else
   [self.bridge.uiManager.observerCoordinator removeObserver:self];
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (dispatch_queue_t)methodQueue
@@ -84,7 +84,7 @@ RCT_EXPORT_MODULE()
   return RCTGetUIManagerQueue();
 }
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 void decorateRuntime(jsi::Runtime &runtime)
 {
   auto isFormsStackingContext = jsi::Function::createFromHostFunction(
@@ -103,7 +103,7 @@ void decorateRuntime(jsi::Runtime &runtime)
       });
   runtime.global().setProperty(runtime, "isFormsStackingContext", std::move(isFormsStackingContext));
 }
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)setBridge:(RCTBridge *)bridge
 {
@@ -113,14 +113,14 @@ void decorateRuntime(jsi::Runtime &runtime)
                                                 eventDispatcher:bridge.eventDispatcher];
   _operations = [NSMutableArray new];
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
   [bridge.surfacePresenter addObserver:self];
 #else
   [bridge.uiManager.observerCoordinator addObserver:self];
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
   RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
@@ -128,7 +128,7 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
   decorateRuntime(*runtime);
   return @true;
 }
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 RCT_EXPORT_METHOD(createGestureHandler
                   : (nonnull NSString *)handlerName tag
@@ -239,7 +239,7 @@ RCT_EXPORT_METHOD(flushOperations)
 
 #pragma mark - RCTSurfacePresenterObserver
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 
 - (void)didMountComponentsWithRootTag:(NSInteger)rootTag
 {
@@ -282,7 +282,7 @@ RCT_EXPORT_METHOD(flushOperations)
   }];
 }
 
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 #pragma mark Events
 

package/ios/RNGestureHandlerRootViewComponentView.mm

@@ -1,4 +1,4 @@
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -18,4 +18,4 @@ Class<RCTComponentViewProtocol> RNGestureHandlerRootViewCls(void)
   return nil;
 }
 
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNRootViewGestureRecognizer.m

@@ -10,11 +10,11 @@
 
 #import <UIKit/UIGestureRecognizerSubclass.h>
 
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfaceTouchHandler.h>
 #else
 #import <React/RCTTouchHandler.h>
-#endif // RN_FABRIC_ENABLED
+#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation RNRootViewGestureRecognizer {
   BOOL _active;
@@ -46,7 +46,7 @@
 - (BOOL)canPreventGestureRecognizer:(UIGestureRecognizer *)preventedGestureRecognizer
 {
   return ![preventedGestureRecognizer isKindOfClass:[
-#ifdef RN_FABRIC_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
         RCTSurfaceTouchHandler
 #else
         RCTTouchHandler

package/lib/commonjs/EnableNewWebImplementation.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.enableExperimentalWebImplementation = enableExperimentalWebImplementation;
+exports.enableLegacyWebImplementation = enableLegacyWebImplementation;
+exports.isNewWebImplementationEnabled = isNewWebImplementationEnabled;
+
+var _reactNative = require("react-native");
+
+let useNewWebImplementation = true;
+let getWasCalled = false;
+
+function enableExperimentalWebImplementation(_shouldEnable = true) {// NO-OP since the new implementation is now the default
+}
+
+function enableLegacyWebImplementation(shouldUseLegacyImplementation = true) {
+  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;
+}
+//# sourceMappingURL=EnableNewWebImplementation.js.map

package/lib/commonjs/EnableNewWebImplementation.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["EnableNewWebImplementation.ts"],"names":["useNewWebImplementation","getWasCalled","enableExperimentalWebImplementation","_shouldEnable","enableLegacyWebImplementation","shouldUseLegacyImplementation","Platform","OS","console","error","isNewWebImplementationEnabled"],"mappings":";;;;;;;;;AAAA;;AAEA,IAAIA,uBAAuB,GAAG,IAA9B;AACA,IAAIC,YAAY,GAAG,KAAnB;;AAEO,SAASC,mCAAT,CACLC,aAAa,GAAG,IADX,EAEC,CACN;AACD;;AAEM,SAASC,6BAAT,CACLC,6BAA6B,GAAG,IAD3B,EAEC;AACN,MACEC,sBAASC,EAAT,KAAgB,KAAhB,IACAP,uBAAuB,KAAK,CAACK,6BAF/B,EAGE;AACA;AACD;;AAED,MAAIJ,YAAJ,EAAkB;AAChBO,IAAAA,OAAO,CAACC,KAAR,CACE,mLADF;AAGA;AACD;;AAEDT,EAAAA,uBAAuB,GAAG,CAACK,6BAA3B;AACD;;AAEM,SAASK,6BAAT,GAAkD;AACvDT,EAAAA,YAAY,GAAG,IAAf;AACA,SAAOD,uBAAP;AACD","sourcesContent":["import { Platform } from 'react-native';\n\nlet useNewWebImplementation = true;\nlet getWasCalled = false;\n\nexport function enableExperimentalWebImplementation(\n  _shouldEnable = true\n): void {\n  // NO-OP since the new implementation is now the default\n}\n\nexport function enableLegacyWebImplementation(\n  shouldUseLegacyImplementation = true\n): void {\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"]}

package/lib/commonjs/GestureHandlerRootViewContext.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = /*#__PURE__*/_react.default.createContext(false);
+
+exports.default = _default;
+//# sourceMappingURL=GestureHandlerRootViewContext.js.map

package/lib/commonjs/GestureHandlerRootViewContext.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["GestureHandlerRootViewContext.ts"],"names":["React","createContext"],"mappings":";;;;;;;AAAA;;;;4BAEeA,eAAMC,aAAN,CAAoB,KAApB,C","sourcesContent":["import React from 'react';\n\nexport default React.createContext(false);\n"]}

package/lib/commonjs/RNGestureHandlerModule.macos.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.HammerGestures = exports.Gestures = void 0;
 
-var _EnableExperimentalWebImplementation = require("./EnableExperimentalWebImplementation");
+var _EnableNewWebImplementation = require("./EnableNewWebImplementation");
 
 var _InteractionManager = _interopRequireDefault(require("./web/tools/InteractionManager"));
 
@@ -80,7 +80,7 @@ var _default = {
   },
 
   createGestureHandler(handlerName, handlerTag, config) {
-    if ((0, _EnableExperimentalWebImplementation.isExperimentalWebImplementationEnabled)()) {
+    if ((0, _EnableNewWebImplementation.isNewWebImplementationEnabled)()) {
       if (!(handlerName in Gestures)) {
         throw new Error(`react-native-gesture-handler: ${handlerName} is not supported on web.`);
       }
@@ -106,7 +106,7 @@ var _default = {
   },
 
   attachGestureHandler(handlerTag, newView, _actionType, propsRef) {
-    if ((0, _EnableExperimentalWebImplementation.isExperimentalWebImplementationEnabled)()) {
+    if ((0, _EnableNewWebImplementation.isNewWebImplementationEnabled)()) {
       _NodeManager.default.getHandler(handlerTag).init(newView, propsRef);
     } else {
       HammerNodeManager.getHandler(handlerTag).setView(newView, propsRef);
@@ -114,7 +114,7 @@ var _default = {
   },
 
   updateGestureHandler(handlerTag, newConfig) {
-    if ((0, _EnableExperimentalWebImplementation.isExperimentalWebImplementationEnabled)()) {
+    if ((0, _EnableNewWebImplementation.isNewWebImplementationEnabled)()) {
       _NodeManager.default.getHandler(handlerTag).updateGestureConfig(newConfig);
 
       _InteractionManager.default.getInstance().configureInteractions(_NodeManager.default.getHandler(handlerTag), newConfig);
@@ -124,7 +124,7 @@ var _default = {
   },
 
   getGestureHandlerNode(handlerTag) {
-    if ((0, _EnableExperimentalWebImplementation.isExperimentalWebImplementationEnabled)()) {
+    if ((0, _EnableNewWebImplementation.isNewWebImplementationEnabled)()) {
       return _NodeManager.default.getHandler(handlerTag);
     } else {
       return HammerNodeManager.getHandler(handlerTag);
@@ -132,7 +132,7 @@ var _default = {
   },
 
   dropGestureHandler(handlerTag) {
-    if ((0, _EnableExperimentalWebImplementation.isExperimentalWebImplementationEnabled)()) {
+    if ((0, _EnableNewWebImplementation.isNewWebImplementationEnabled)()) {
       _NodeManager.default.dropGestureHandler(handlerTag);
     } else {
       HammerNodeManager.dropGestureHandler(handlerTag);