react-native-gesture-handler 2.2.0 → 2.3.2

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

@@ -0,0 +1,47 @@
+/**
+* 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.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & 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 ? false : (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 ? false : (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;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

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

@@ -0,0 +1,22 @@
+/**
+* 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;
+
+public interface RNGestureHandlerButtonManagerInterface<T extends View> {
+  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);
+}

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

@@ -0,0 +1,25 @@
+/**
+* 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.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNGestureHandlerRootViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNGestureHandlerRootViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNGestureHandlerRootViewManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    super.setProperty(view, propName, value);
+  }
+}

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

@@ -0,0 +1,16 @@
+/**
+* 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;
+
+public interface RNGestureHandlerRootViewManagerInterface<T extends View> {
+  // No props
+}

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

@@ -0,0 +1,13 @@
+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/ios/Handlers/RNFlingHandler.m

@@ -72,7 +72,9 @@
   [super resetConfig];
   UISwipeGestureRecognizer *recognizer = (UISwipeGestureRecognizer *)_recognizer;
   recognizer.direction = UISwipeGestureRecognizerDirectionRight;
+#if !TARGET_OS_TV
   recognizer.numberOfTouchesRequired = 1;
+#endif
 }
 
 - (void)configure:(NSDictionary *)config

package/ios/Handlers/RNPanHandler.m

@@ -236,8 +236,10 @@
     recognizer.allowedScrollTypesMask = 0;
   }
 #endif
+#if !TARGET_OS_TV
   recognizer.minimumNumberOfTouches = 1;
   recognizer.maximumNumberOfTouches = NSUIntegerMax;
+#endif
   recognizer.minDistSq = NAN;
   recognizer.minVelocitySq = NAN;
 }

package/ios/Handlers/RNPinchHandler.m

@@ -10,6 +10,7 @@
 
 #import "RNPinchHandler.h"
 
+#if !TARGET_OS_TV
 @interface RNBetterPinchRecognizer : UIPinchGestureRecognizer
 
 - (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler;
@@ -67,6 +68,7 @@
 }
 
 @end
+#endif
 
 @implementation RNPinchGestureHandler
 

package/ios/Handlers/RNRotationHandler.m

@@ -8,6 +8,7 @@
 
 #import "RNRotationHandler.h"
 
+#if !TARGET_OS_TV
 @interface RNBetterRotationRecognizer : UIRotationGestureRecognizer
 
 - (id)initWithGestureHandler:(RNGestureHandler*)gestureHandler;
@@ -66,6 +67,7 @@
 }
 
 @end
+#endif
 
 @implementation RNRotationGestureHandler
 

package/ios/RNGestureHandler.h

@@ -1,3 +1,4 @@
+#import "RNGestureHandlerActionType.h"
 #import "RNGestureHandlerState.h"
 #import "RNGestureHandlerDirection.h"
 #import "RNGestureHandlerEvents.h"
@@ -25,13 +26,7 @@ if (value != nil) { recognizer.prop = [RCTConvert type:value]; }\
 
 @protocol RNGestureHandlerEventEmitter
 
-- (void)sendTouchEvent:(nonnull RNGestureHandlerEvent *)event;
-
-- (void)sendStateChangeEvent:(nonnull RNGestureHandlerStateChange *)event;
-
-- (void)sendTouchDeviceEvent:(nonnull RNGestureHandlerEvent *)event;
-
-- (void)sendStateChangeDeviceEvent:(nonnull RNGestureHandlerStateChange *)event;
+- (void)sendStateChangeEvent:(nonnull RNGestureHandlerStateChange *)event withActionType:(RNGestureHandlerActionType)actionType;
 
 @end
 
@@ -60,7 +55,7 @@ if (value != nil) { recognizer.prop = [RCTConvert type:value]; }\
 @property (nonatomic, readonly, nullable) UIGestureRecognizer *recognizer;
 @property (nonatomic, readonly, nullable) RNGestureHandlerPointerTracker *pointerTracker;
 @property (nonatomic) BOOL enabled;
-@property (nonatomic) BOOL usesDeviceEvents;
+@property (nonatomic) RNGestureHandlerActionType actionType;
 @property (nonatomic) BOOL shouldCancelWhenOutside;
 @property (nonatomic) BOOL needsPointerData;
 @property (nonatomic) BOOL manualActivation;

package/ios/RNGestureHandler.m

@@ -236,11 +236,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 
 - (void)sendStateChangeEvent:(RNGestureHandlerStateChange *)event
 {
-    if (self.usesDeviceEvents) {
-        [self.emitter sendStateChangeDeviceEvent:event];
-    } else {
-        [self.emitter sendStateChangeEvent:event];
-    }
+    [self.emitter sendStateChangeEvent:event withActionType:self.actionType];
 }
 
 - (void)sendTouchEventInState:(RNGestureHandlerState)state
@@ -252,11 +248,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
                                           withNumberOfTouches:_pointerTracker.trackedPointersCount];
   id event = [[RNGestureHandlerEvent alloc] initWithReactTag:reactTag handlerTag:_tag state:state extraData:extraData coalescingKey:[_tag intValue]];
   
-  if (self.usesDeviceEvents) {
-      [self.emitter sendStateChangeDeviceEvent:event];
-  } else {
-      [self.emitter sendStateChangeEvent:event];
-  }
+  [self.emitter sendStateChangeEvent:event withActionType:self.actionType];
 }
 
 - (RNGestureHandlerState)recognizerState

package/ios/RNGestureHandlerActionType.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSInteger, RNGestureHandlerActionType) {
+    RNGestureHandlerActionTypeReanimatedWorklet = 1, // Reanimated worklet
+    RNGestureHandlerActionTypeNativeAnimatedEvent, // Animated.event with useNativeDriver: true
+    RNGestureHandlerActionTypeJSFunctionOldAPI, // JS function or Animated.event with useNativeDriver: false using old RNGH API
+    RNGestureHandlerActionTypeJSFunctionNewAPI, // JS function or Animated.event with useNativeDriver: false using new RNGH API
+};

package/ios/RNGestureHandlerButtonComponentView.h

@@ -0,0 +1,17 @@
+#ifdef RN_FABRIC_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTViewComponentView.h>
+
+#import "RNGestureHandlerButton.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNGestureHandlerButtonComponentView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RN_FABRIC_ENABLED

package/ios/RNGestureHandlerButtonComponentView.mm

@@ -0,0 +1,48 @@
+#ifdef RN_FABRIC_ENABLED
+
+#import "RNGestureHandlerButtonComponentView.h"
+
+#import <React/RCTConversions.h>
+
+#import <react/renderer/components/rngesturehandler/ComponentDescriptors.h>
+#import <react/renderer/components/rngesturehandler/EventEmitters.h>
+#import <react/renderer/components/rngesturehandler/Props.h>
+#import <react/renderer/components/rngesturehandler/RCTComponentViewHelpers.h>
+
+#import "RCTFabricComponentsPlugins.h"
+#import "RNGestureHandlerButton.h"
+
+using namespace facebook::react;
+
+@interface RNGestureHandlerButtonComponentView () <RCTRNGestureHandlerButtonViewProtocol>
+@end
+
+@implementation RNGestureHandlerButtonComponentView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNGestureHandlerButtonProps>();
+    _props = defaultProps;
+    
+    self.contentView = [[RNGestureHandlerButton alloc] initWithFrame:self.bounds];
+  }
+
+  return self;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNGestureHandlerButtonComponentDescriptor>();
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNGestureHandlerButtonCls(void)
+{
+  return RNGestureHandlerButtonComponentView.class;
+}
+
+#endif // RN_FABRIC_ENABLED

package/ios/RNGestureHandlerButtonManager.h

@@ -0,0 +1,5 @@
+#import <React/RCTViewManager.h>
+
+@interface RNGestureHandlerButtonManager : RCTViewManager
+
+@end

package/ios/RNGestureHandlerButtonManager.m

@@ -0,0 +1,30 @@
+#import "RNGestureHandlerButton.h"
+#import "RNGestureHandlerButtonManager.h"
+
+@implementation RNGestureHandlerButtonManager
+
+RCT_EXPORT_MODULE(RNGestureHandlerButton)
+
+RCT_EXPORT_VIEW_PROPERTY(enabled, BOOL)
+#if !TARGET_OS_TV
+RCT_CUSTOM_VIEW_PROPERTY(exclusive, BOOL, RNGestureHandlerButton)
+{
+  [view setExclusiveTouch: json == nil ? YES : [RCTConvert BOOL: json]];
+}
+#endif
+RCT_CUSTOM_VIEW_PROPERTY(hitSlop, UIEdgeInsets, RNGestureHandlerButton)
+{
+  if (json) {
+    UIEdgeInsets hitSlopInsets = [RCTConvert UIEdgeInsets:json];
+    view.hitTestEdgeInsets = UIEdgeInsetsMake(-hitSlopInsets.top, -hitSlopInsets.left, -hitSlopInsets.bottom, -hitSlopInsets.right);
+  } else {
+    view.hitTestEdgeInsets = defaultView.hitTestEdgeInsets;
+  }
+}
+
+- (UIView *)view
+{
+    return [RNGestureHandlerButton new];
+}
+
+@end

package/ios/RNGestureHandlerManager.h

@@ -17,10 +17,8 @@
                       config:(nonnull NSDictionary *)config;
 
 - (void)attachGestureHandler:(nonnull NSNumber *)handlerTag
-               toViewWithTag:(nonnull NSNumber *)viewTag;
-
-- (void)attachGestureHandlerForDeviceEvents:(nonnull NSNumber *)handlerTag
-                              toViewWithTag:(nonnull NSNumber *)viewTag;
+               toViewWithTag:(nonnull NSNumber *)viewTag
+              withActionType:(RNGestureHandlerActionType)actionType;
 
 - (void)updateGestureHandler:(nonnull NSNumber *)handlerTag config:(nonnull NSDictionary *)config;
 

package/ios/{RNGestureHandlerManager.m → RNGestureHandlerManager.mm}

@@ -14,11 +14,16 @@
 #import "RCTRootContentView.h"
 #endif
 
+#import "RNGestureHandlerActionType.h"
 #import "RNGestureHandlerState.h"
 #import "RNGestureHandler.h"
 #import "RNGestureHandlerRegistry.h"
 #import "RNRootViewGestureRecognizer.h"
 
+#ifdef RN_FABRIC_ENABLED
+#import <React/RCTViewComponentView.h>
+#endif // RN_FABRIC_ENABLED
+
 #import "Handlers/RNPanHandler.h"
 #import "Handlers/RNTapHandler.h"
 #import "Handlers/RNFlingHandler.h"
@@ -94,21 +99,30 @@
 
 - (void)attachGestureHandler:(nonnull NSNumber *)handlerTag
                toViewWithTag:(nonnull NSNumber *)viewTag
+              withActionType:(RNGestureHandlerActionType)actionType
 {
     UIView *view = [_uiManager viewForReactTag:viewTag];
+    
+#ifdef RN_FABRIC_ENABLED
+    if (view == nil) {
+        // Happens when the view with given tag has been flattened.
+        // We cannot attach gesture handler to a non-existent view.
+        return;
+    }
+    
+    // I think it should be moved to RNNativeViewHandler, but that would require
+    // additional logic for setting contentView.reactTag, this works for now
+    if ([view isKindOfClass:[RCTViewComponentView class]]) {
+        RCTViewComponentView *componentView = (RCTViewComponentView *)view;
+        if (componentView.contentView != nil) {
+            view = componentView.contentView;
+        }
+    }
+    
+    view.reactTag = viewTag; // necessary for RNReanimated eventHash (e.g. "42onGestureHandlerEvent"), also will be returned as event.target  
+#endif // RN_FABRIC_ENABLED
 
-    [_registry attachHandlerWithTag:handlerTag toView:view];
-
-    // register view if not already there
-    [self registerViewWithGestureRecognizerAttachedIfNeeded:view];
-}
-
-- (void)attachGestureHandlerForDeviceEvents:(nonnull NSNumber *)handlerTag
-                              toViewWithTag:(nonnull NSNumber *)viewTag
-{
-    UIView *view = [_uiManager viewForReactTag:viewTag];
-
-    [_registry attachHandlerWithTagForDeviceEvents:handlerTag toView:view];
+    [_registry attachHandlerWithTag:handlerTag toView:view withActionType:actionType];
 
     // register view if not already there
     [self registerViewWithGestureRecognizerAttachedIfNeeded:view];
@@ -196,24 +210,82 @@
 
 #pragma mark Events
 
-- (void)sendTouchEvent:(RNGestureHandlerEvent *)event
+- (void)sendStateChangeEvent:(RNGestureHandlerStateChange *)event withActionType:(RNGestureHandlerActionType)actionType
 {
-    [_eventDispatcher sendEvent:event];
+    switch (actionType) {
+        case RNGestureHandlerActionTypeReanimatedWorklet:
+            [self sendStateChangeEventForReanimated:event];
+            break;
+            
+        case RNGestureHandlerActionTypeNativeAnimatedEvent:
+            if ([event.eventName isEqualToString:@"onGestureHandlerEvent"]) {
+                [self sendStateChangeEventForNativeAnimatedEvent:event];
+            } else {
+                // Although onGestureEvent prop is an Animated.event with useNativeDriver: true,
+                // onHandlerStateChange prop is still a regular JS function.
+                // Also, Animated.event is only supported with old API.
+                [self sendStateChangeEventForJSFunctionOldAPI:event];
+            }
+            break;
+
+        case RNGestureHandlerActionTypeJSFunctionOldAPI:
+            [self sendStateChangeEventForJSFunctionOldAPI:event];
+            break;
+            
+        case RNGestureHandlerActionTypeJSFunctionNewAPI:
+            [self sendStateChangeEventForJSFunctionNewAPI:event];
+            break;
+    }
 }
 
-- (void)sendStateChangeEvent:(RNGestureHandlerStateChange *)event
+- (void)sendStateChangeEventForReanimated:(RNGestureHandlerStateChange *)event
 {
-    [_eventDispatcher sendEvent:event];
+    // Delivers the event to Reanimated.
+#ifdef RN_FABRIC_ENABLED
+    // TODO: send event directly to Reanimated
+    // This is already supported in Reanimated with Fabric but let's wait until the official release.
+    // [_reanimatedModule eventDispatcherWillDispatchEvent:event];
+#else
+    // In the old architecture, Reanimated overwrites RCTEventDispatcher
+    // with REAEventDispatcher and intercepts all direct events.
+    [self sendStateChangeEventForDirectEvent:event];
+#endif // RN_FABRIC_ENABLED
 }
 
-- (void)sendTouchDeviceEvent:(RNGestureHandlerEvent *)event
+- (void)sendStateChangeEventForNativeAnimatedEvent:(RNGestureHandlerStateChange *)event
 {
-    NSMutableDictionary *body = [[event arguments] objectAtIndex:2];
-    [_eventDispatcher sendDeviceEventWithName:@"onGestureHandlerEvent" body:body];
+    // Delivers the event to NativeAnimatedModule.
+    // Currently, NativeAnimated[Turbo]Module is RCTEventDispatcherObserver so we can
+    // simply send a direct event which is handled by the observer but ignored on JS side.
+    // TODO: send event directly to NativeAnimated[Turbo]Module
+    [self sendStateChangeEventForDirectEvent:event];
+}
+
+- (void)sendStateChangeEventForJSFunctionOldAPI:(RNGestureHandlerStateChange *)event
+{
+    // Delivers the event to JS (old RNGH API).
+#ifdef RN_FABRIC_ENABLED
+    [self sendStateChangeEventForDeviceEvent:event];
+#else
+    [self sendStateChangeEventForDirectEvent:event];
+#endif // RN_FABRIC_ENABLED
+}
+
+- (void)sendStateChangeEventForJSFunctionNewAPI:(RNGestureHandlerStateChange *)event
+{
+    // Delivers the event to JS (new RNGH API).
+    [self sendStateChangeEventForDeviceEvent:event];
+}
+
+- (void)sendStateChangeEventForDirectEvent:(RNGestureHandlerStateChange *)event
+{
+    // Delivers the event to JS as a direct event.
+    [_eventDispatcher sendEvent:event];
 }
 
-- (void)sendStateChangeDeviceEvent:(RNGestureHandlerStateChange *)event
+- (void)sendStateChangeEventForDeviceEvent:(RNGestureHandlerStateChange *)event
 {
+    // Delivers the event to JS as a device event.
     NSMutableDictionary *body = [[event arguments] objectAtIndex:2];
     [_eventDispatcher sendDeviceEventWithName:@"onGestureHandlerStateChange" body:body];
 }