react-native-gesture-handler 2.3.0 → 2.4.0

package/RNGestureHandler.podspec

@@ -23,7 +23,8 @@ Pod::Spec.new do |s|
     folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
     s.pod_target_xcconfig = {
-      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly"'
+      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly"',
+      'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
     }
     s.platforms       = { ios: '11.0', tvos: '11.0' }
     s.compiler_flags  = folly_compiler_flags + ' -DRN_FABRIC_ENABLED'

package/android/build.gradle

@@ -38,7 +38,7 @@ def shouldUseCommonInterfaceFromReanimated() {
         def json = new JsonSlurper().parseText(inputFile.text)
         def reanimatedVersion = json.version as String
         def (major, minor, patch) = reanimatedVersion.tokenize('.')
-        return Integer.parseInt(major) == 2 && Integer.parseInt(minor) >= 3
+        return (Integer.parseInt(major) == 2 && Integer.parseInt(minor) >= 3) || Integer.parseInt(major) == 3
     } else {
         return false
     }
@@ -76,6 +76,11 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     if (isNewArchitectureEnabled()) {
         externalNativeBuild {
             ndkBuild {
@@ -101,8 +106,11 @@ android {
 
             // Include "common/" only when it's not provided by Reanimated to mitigate
             // multiple definitions of the same class preventing build
-            if (!shouldUseCommonInterfaceFromReanimated()) {
+            if (shouldUseCommonInterfaceFromReanimated()) {
+                srcDirs += 'reanimated/src/main/java'
+            } else {
                 srcDirs += 'common/src/main/java'
+                srcDirs += 'noreanimated/src/main/java'
             }
 
             if (isNewArchitectureEnabled()) {

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

@@ -316,7 +316,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     isEnabled: ${handler.isEnabled}
     isActive: ${handler.isActive}
     isAwaiting: ${handler.isAwaiting}
-    trackedPointersCount: ${handler.trackedPointersCount}
+    trackedPointersCount: ${handler.trackedPointersIDsCount}
     trackedPointers: ${handler.trackedPointerIDs.joinToString(separator = ", ")}
     while handling event: $event
   """.trimIndent(), e) {}
@@ -329,7 +329,19 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
       || trackedPointersIDsCount < 1) {
       return
     }
-    val event = adaptEvent(origEvent)
+
+    // a workaround for https://github.com/software-mansion/react-native-gesture-handler/issues/1188
+    val event = if (BuildConfig.DEBUG) {
+      adaptEvent(origEvent)
+    } else {
+      try {
+        adaptEvent(origEvent)
+      } catch (e: AdaptEventException) {
+        fail()
+        return
+      }
+    }
+
     x = event.x
     y = event.y
     numberOfPointers = event.pointerCount

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

@@ -0,0 +1,10 @@
+package com.swmansion.gesturehandler
+
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.events.Event
+
+object ReanimatedEventDispatcher {
+    fun <T : Event<T>>sendEvent(event: T, reactApplicationContext: ReactContext) {
+        // no-op
+    }
+}

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
+
+object 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/react/RNGestureHandlerButtonViewManager.kt

@@ -134,10 +134,18 @@ class RNGestureHandlerButtonViewManager : ViewGroupManager<ButtonViewGroup>(), R
 
     private fun applyRippleEffectWhenNeeded(selectable: Drawable): Drawable {
       val rippleColor = rippleColor
-      if (rippleColor != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && selectable is RippleDrawable) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && selectable is RippleDrawable) {
         val states = arrayOf(intArrayOf(android.R.attr.state_enabled))
-        val colors = intArrayOf(rippleColor)
-        val colorStateList = ColorStateList(states, colors)
+        val colorStateList = if (rippleColor != null) {
+          val colors = intArrayOf(rippleColor)
+          ColorStateList(states, colors)
+        } else {
+          // if rippleColor is null, reapply the default color
+          context.theme.resolveAttribute(android.R.attr.colorControlHighlight, resolveOutValue, true)
+          val colors = intArrayOf(resolveOutValue.data)
+          ColorStateList(states, colors)
+        }
+
         selectable.setColor(colorStateList)
       }
 

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

@@ -6,52 +6,14 @@ import android.util.AttributeSet
 import android.view.MotionEvent
 import com.facebook.react.ReactInstanceManager
 import com.facebook.react.ReactRootView
+import java.lang.Exception
 
 @Deprecated(message = "Use <GestureHandlerRootView /> component instead. Check gesture handler installation instructions in documentation for more information.")
 class RNGestureHandlerEnabledRootView : ReactRootView {
-  private lateinit var _reactInstanceManager: ReactInstanceManager
-  private var gestureRootHelper: RNGestureHandlerRootHelper? = null
-
   constructor(context: Context?) : super(context) {}
   constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {}
 
-  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-    gestureRootHelper?.requestDisallowInterceptTouchEvent(disallowIntercept)
-    super.requestDisallowInterceptTouchEvent(disallowIntercept)
-  }
-
-  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
-    return if (gestureRootHelper?.dispatchTouchEvent(ev) == true) {
-      true
-    } else super.dispatchTouchEvent(ev)
-  }
-
-  /**
-   * This method is used to enable root view to start processing touch events through the gesture
-   * handler library logic. Unless this method is called (which happens as a result of instantiating
-   * new gesture handler from JS) the root view component will just proxy all touch related methods
-   * to its superclass. Thus in the "disabled" state all touch related events will fallback to
-   * default RN behavior.
-   */
-  fun initialize() {
-    check(gestureRootHelper == null) { "GestureHandler already initialized for root view $this" }
-    gestureRootHelper = RNGestureHandlerRootHelper(
-      _reactInstanceManager.currentReactContext!!, this)
-  }
-
-  fun tearDown() {
-    gestureRootHelper?.let {
-      it.tearDown()
-      gestureRootHelper = null
-    }
-  }
-
-  override fun startReactApplication(
-    reactInstanceManager: ReactInstanceManager,
-    moduleName: String,
-    initialProperties: Bundle?,
-  ) {
-    super.startReactApplication(reactInstanceManager, moduleName, initialProperties)
-    _reactInstanceManager = reactInstanceManager
+  init {
+      throw UnsupportedOperationException("Your application is configured to use RNGestureHandlerEnabledRootView which is no longer supported. You can see how to migrate to <GestureHandlerRootView /> here: https://docs.swmansion.com/react-native-gesture-handler/docs/guides/migrating-off-rnghenabledroot")
   }
 }

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

@@ -1,3 +1,9 @@
+// 1. RCTEventEmitter was deprecated in favor of RCTModernEventEmitter interface
+// 2. Event#init() with only viewTag was deprecated in favor of two arg c-tor
+// 3. Event#receiveEvent() with 3 args was deprecated in favor of 4 args version
+// ref: https://github.com/facebook/react-native/commit/2fbbdbb2ce897e8da3f471b08b93f167d566db1d
+@file:Suppress("DEPRECATION")
+
 package com.swmansion.gesturehandler.react
 
 import androidx.core.util.Pools

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

@@ -14,7 +14,12 @@ import com.facebook.soloader.SoLoader
 import com.swmansion.common.GestureHandlerStateManager
 import com.swmansion.gesturehandler.*
 import java.util.*
+// NativeModule.onCatalystInstanceDestroy() was deprecated in favor of NativeModule.invalidate()
+// ref: https://github.com/facebook/react-native/commit/18c8417290823e67e211bde241ae9dde27b72f17
 
+// UIManagerModule.resolveRootTagFromReactTag() was deprecated and will be removed in the next RN release
+// ref: https://github.com/facebook/react-native/commit/acbf9e18ea666b07c1224a324602a41d0a66985e
+@Suppress("DEPRECATION")
 @ReactModule(name = RNGestureHandlerModule.MODULE_NAME)
 class RNGestureHandlerModule(reactContext: ReactApplicationContext?)
   : ReactContextBaseJavaModule(reactContext), GestureHandlerStateManager {
@@ -314,7 +319,7 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?)
 
   private val eventListener = object : OnTouchEventListener {
     override fun <T : GestureHandler<T>> onHandlerUpdate(handler: T, event: MotionEvent) {
-      this@RNGestureHandlerModule.onHandlerUpdate(handler, event)
+      this@RNGestureHandlerModule.onHandlerUpdate(handler)
     }
 
     override fun <T : GestureHandler<T>> onStateChange(handler: T, newState: Int, oldState: Int) {
@@ -363,10 +368,6 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?)
 
   @ReactMethod
   fun attachGestureHandler(handlerTag: Int, viewTag: Int, actionType: Int) {
-    if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      tryInitializeHandlerForReactRootView(viewTag)
-    }
-
     // We don't have to handle view flattening in any special way since handlers are stored as
     // a map: viewTag -> [handler]. If the view with attached handlers was to be flattened
     // then that viewTag simply wouldn't be visited when traversing the view hierarchy in the
@@ -459,12 +460,7 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?)
       while (roots.isNotEmpty()) {
         val sizeBefore: Int = roots.size
         val root: RNGestureHandlerRootHelper = roots[0]
-        val reactRootView: ViewGroup = root.rootView
-        if (reactRootView is RNGestureHandlerEnabledRootView) {
-          reactRootView.tearDown()
-        } else {
-          root.tearDown()
-        }
+        root.tearDown()
         if (roots.size >= sizeBefore) {
           throw IllegalStateException("Expected root helper to get unregistered while tearing down")
         }
@@ -473,44 +469,6 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?)
     super.onCatalystInstanceDestroy()
   }
 
-  private fun tryInitializeHandlerForReactRootView(ancestorViewTag: Int) {
-    val uiManager = reactApplicationContext.UIManager
-    val rootViewTag = uiManager.resolveRootTagFromReactTag(ancestorViewTag)
-    if (rootViewTag < 1) {
-      throw JSApplicationIllegalArgumentException("Could find root view for a given ancestor with tag $ancestorViewTag")
-    }
-    synchronized(roots) {
-      for (root in roots) {
-        val rootView: ViewGroup = root.rootView
-        if (rootView is ReactRootView && rootView.rootViewTag == rootViewTag) {
-          // we have found root helper registered for a given react root, we don't need to
-          // initialize a new one then
-          return
-        }
-      }
-    }
-    synchronized(enqueuedRootViewInit) {
-      if (rootViewTag in enqueuedRootViewInit) {
-        // root view initialization already enqueued -> we skip
-        return
-      }
-      enqueuedRootViewInit.add(rootViewTag)
-    }
-    // root helper for a given root tag has not been found, we may wat to check if the root view is
-    // an instance of RNGestureHandlerEnabledRootView and then initialize gesture handler with it
-    uiManager.addUIBlock(UIBlock { nativeViewHierarchyManager ->
-      val view = nativeViewHierarchyManager.resolveView(rootViewTag)
-      if (view is RNGestureHandlerEnabledRootView) {
-        view.initialize()
-      } else {
-        // Seems like the root view is something else than RNGestureHandlerEnabledRootView, this
-        // is fine though as long as gestureHandlerRootHOC is used in JS
-        // FIXME: check and warn about gestureHandlerRootHOC
-      }
-      synchronized(enqueuedRootViewInit) { enqueuedRootViewInit.remove(rootViewTag) }
-    })
-  }
-
   fun registerRootHelper(root: RNGestureHandlerRootHelper) {
     synchronized(roots) {
       if (root in roots) {
@@ -542,7 +500,7 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?)
   private fun <T : GestureHandler<T>> findFactoryForHandler(handler: GestureHandler<T>): HandlerFactory<T>? =
     handlerFactories.firstOrNull { it.type == handler.javaClass } as HandlerFactory<T>?
 
-  private fun <T : GestureHandler<T>> onHandlerUpdate(handler: T, motionEvent: MotionEvent) {
+  private fun <T : GestureHandler<T>> onHandlerUpdate(handler: T) {
     // triggers onUpdate and onChange callbacks on the JS side
 
     if (handler.tag < 0) {
@@ -631,10 +589,8 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?)
   private fun <T : Event<T>>sendEventForReanimated(event: T) {
     // Delivers the event to Reanimated.
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // TODO: send event directly to Reanimated
-      // This is already supported in Reanimated with Fabric but let's wait until the official release.
-      // val reanimatedModule = reactApplicationContext.getNativeModule(ReanimatedModule::class.java)
-      // reanimatedModule?.nodesManager?.onEventDispatch(event)
+      // Send event directly to Reanimated
+      ReanimatedEventDispatcher.sendEvent(event, reactApplicationContext)
     } else {
       // In the old architecture, Reanimated subscribes for specific direct events.
       sendEventForDirectEvent(event)

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

@@ -51,6 +51,8 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
 
       var parent = viewGroup.parent
       while (parent != null) {
+        // our own deprecated root view
+        @Suppress("DEPRECATION")
         if (parent is RNGestureHandlerEnabledRootView || parent is RNGestureHandlerRootView) {
           return true
         }

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

@@ -1,3 +1,9 @@
+// 1. RCTEventEmitter was deprecated in favor of RCTModernEventEmitter interface
+// 2. Event#init() with only viewTag was deprecated in favor of two arg c-tor
+// 3. Event#receiveEvent() with 3 args was deprecated in favor of 4 args version
+// ref: https://github.com/facebook/react-native/commit/2fbbdbb2ce897e8da3f471b08b93f167d566db1d
+@file:Suppress("DEPRECATION")
+
 package com.swmansion.gesturehandler.react
 
 import androidx.core.util.Pools

package/ios/RNGHTouchEventType.h

@@ -0,0 +1,9 @@
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSInteger, RNGHTouchEventType) {
+  RNGHTouchEventTypeUndetermined = 0,
+  RNGHTouchEventTypePointerDown,
+  RNGHTouchEventTypePointerMove,
+  RNGHTouchEventTypePointerUp,
+  RNGHTouchEventTypeCancelled,
+};

package/ios/RNGestureHandler.h

@@ -26,7 +26,7 @@ if (value != nil) { recognizer.prop = [RCTConvert type:value]; }\
 
 @protocol RNGestureHandlerEventEmitter
 
-- (void)sendStateChangeEvent:(nonnull RNGestureHandlerStateChange *)event withActionType:(RNGestureHandlerActionType)actionType;
+- (void)sendEvent:(nonnull RNGestureHandlerStateChange *)event withActionType:(RNGestureHandlerActionType)actionType;
 
 @end
 
@@ -74,7 +74,7 @@ if (value != nil) { recognizer.prop = [RCTConvert type:value]; }\
 - (void)sendEventsInState:(RNGestureHandlerState)state
            forViewWithTag:(nonnull NSNumber *)reactTag
             withExtraData:(nonnull RNGestureHandlerEventExtraData *)extraData;
-- (void)sendStateChangeEvent:(nonnull RNGestureHandlerStateChange *)event;
+- (void)sendEvent:(nonnull RNGestureHandlerStateChange *)event;
 - (void)sendTouchEventInState:(RNGestureHandlerState)state
                  forViewWithTag:(nonnull NSNumber *)reactTag;
 

package/ios/RNGestureHandler.m

@@ -94,13 +94,14 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 - (void)resetConfig
 {
   self.enabled = YES;
+  self.manualActivation = NO;
   _shouldCancelWhenOutside = NO;
   _handlersToWaitFor = nil;
   _simultaneousHandlers = nil;
   _hitSlop = RNGHHitSlopEmpty;
   _needsPointerData = NO;
-  
-  self.manualActivation = NO;
+
+  _recognizer.cancelsTouchesInView = YES;
 }
 
 - (void)configure:(NSDictionary *)config
@@ -119,6 +120,11 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
         _shouldCancelWhenOutside = [RCTConvert BOOL:prop];
     }
   
+    prop = config[@"cancelsTouchesInView"];
+    if (prop != nil) {
+        _recognizer.cancelsTouchesInView = [RCTConvert BOOL:prop];
+    }
+    
     prop = config[@"needsPointerData"];
     if (prop != nil) {
         _needsPointerData = [RCTConvert BOOL:prop];
@@ -189,6 +195,13 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 
 - (void)handleGesture:(UIGestureRecognizer *)recognizer
 {
+    // it may happen that the gesture recognizer is reset after it's been unbound from the view,
+    // it that recognizer tried to send event, the app would crash because the target of the event
+    // would be nil.
+    if (recognizer.view.reactTag == nil) {
+      return;
+    }
+    
     _state = [self recognizerState];
     RNGestureHandlerEventExtraData *eventData = [self eventExtraData:recognizer];
     [self sendEventsInState:self.state forViewWithTag:recognizer.view.reactTag withExtraData:eventData];
@@ -212,7 +225,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
                                                                        state:RNGestureHandlerStateActive
                                                                    prevState:_lastState
                                                                    extraData:extraData];
-            [self sendStateChangeEvent:event];
+            [self sendEvent:event];
             _lastState = RNGestureHandlerStateActive;
         }
         id stateEvent = [[RNGestureHandlerStateChange alloc] initWithReactTag:reactTag
@@ -220,7 +233,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
                                                                         state:state
                                                                     prevState:_lastState
                                                                     extraData:extraData];
-        [self sendStateChangeEvent:stateEvent];
+        [self sendEvent:stateEvent];
         _lastState = state;
     }
 
@@ -230,13 +243,13 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
                                                                   state:state
                                                               extraData:extraData
                                                           coalescingKey:self->_eventCoalescingKey];
-        [self sendStateChangeEvent:touchEvent];
+        [self sendEvent:touchEvent];
     }
 }
 
-- (void)sendStateChangeEvent:(RNGestureHandlerStateChange *)event
+- (void)sendEvent:(RNGestureHandlerStateChange *)event
 {
-    [self.emitter sendStateChangeEvent:event withActionType:self.actionType];
+    [self.emitter sendEvent:event withActionType:self.actionType];
 }
 
 - (void)sendTouchEventInState:(RNGestureHandlerState)state
@@ -248,7 +261,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
                                           withNumberOfTouches:_pointerTracker.trackedPointersCount];
   id event = [[RNGestureHandlerEvent alloc] initWithReactTag:reactTag handlerTag:_tag state:state extraData:extraData coalescingKey:[_tag intValue]];
   
-  [self.emitter sendStateChangeEvent:event withActionType:self.actionType];
+  [self.emitter sendEvent:event withActionType:self.actionType];
 }
 
 - (RNGestureHandlerState)recognizerState

package/ios/RNGestureHandler.xcodeproj/xcuserdata/jakubpiasecki.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>RNGestureHandler-tvOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>RNGestureHandler.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/RNGestureHandlerButton.h

@@ -14,5 +14,6 @@
  *  Insets used when hit testing inside this view.
  */
 @property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
+@property (nonatomic) BOOL userEnabled;
 
 @end

package/ios/RNGestureHandlerButton.m

@@ -38,6 +38,7 @@
   self = [super init];
   if (self) {
     _hitTestEdgeInsets = UIEdgeInsetsZero;
+    _userEnabled = YES;
 #if !TARGET_OS_TV
     [self setExclusiveTouch:YES];
 #endif
@@ -47,6 +48,11 @@
 
 - (BOOL)shouldHandleTouch:(UIView *)view
 {
+    if ([view isKindOfClass:[RNGestureHandlerButton class]]) {
+        RNGestureHandlerButton *button = (RNGestureHandlerButton *)view;
+        return button.userEnabled;
+    }
+    
     return [view isKindOfClass:[UIControl class]] || [view.gestureRecognizers count] > 0;
 }
 
@@ -62,7 +68,9 @@
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
     UIView *inner = [super hitTest:point withEvent:event];
-    while (inner && ![self shouldHandleTouch:inner]) inner = inner.superview;
+    while (inner && ![self shouldHandleTouch:inner]) {
+        inner = inner.superview;
+    }
     return inner;
 }
 

package/ios/RNGestureHandlerButtonComponentView.mm

@@ -18,14 +18,18 @@ using namespace facebook::react;
 @end
 
 @implementation RNGestureHandlerButtonComponentView
+{
+    RNGestureHandlerButton *_buttonView;
+}
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const RNGestureHandlerButtonProps>();
     _props = defaultProps;
+    _buttonView = [[RNGestureHandlerButton alloc] initWithFrame:self.bounds];
     
-    self.contentView = [[RNGestureHandlerButton alloc] initWithFrame:self.bounds];
+    self.contentView = _buttonView;
   }
 
   return self;
@@ -38,6 +42,15 @@ using namespace facebook::react;
   return concreteComponentDescriptorProvider<RNGestureHandlerButtonComponentDescriptor>();
 }
 
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+    const auto &newProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(props);
+
+    _buttonView.userEnabled = newProps.enabled;
+    _buttonView.exclusiveTouch = newProps.exclusive;
+
+    [super updateProps:props oldProps:oldProps];
+}
 @end
 
 Class<RCTComponentViewProtocol> RNGestureHandlerButtonCls(void)

package/ios/RNGestureHandlerButtonManager.m

@@ -5,7 +5,10 @@
 
 RCT_EXPORT_MODULE(RNGestureHandlerButton)
 
-RCT_EXPORT_VIEW_PROPERTY(enabled, BOOL)
+RCT_CUSTOM_VIEW_PROPERTY(enabled, BOOL, RNGestureHandlerButton)
+{
+    view.userEnabled = json == nil ? YES : [RCTConvert BOOL: json];
+}
 #if !TARGET_OS_TV
 RCT_CUSTOM_VIEW_PROPERTY(exclusive, BOOL, RNGestureHandlerButton)
 {

package/ios/RNGestureHandlerEvents.h

@@ -4,7 +4,7 @@
 #import <UIKit/UIKit.h>
 
 #import "RNGestureHandlerState.h"
-#import "RNTouchEventType.h"
+#import "RNGHTouchEventType.h"
 
 @interface RNGestureHandlerEventExtraData : NSObject
 
@@ -36,7 +36,7 @@
                                 withAnchorPoint:(CGPoint)anchorPoint
                                    withVelocity:(CGFloat)velocity
                             withNumberOfTouches:(NSUInteger)numberOfTouches;
-+ (RNGestureHandlerEventExtraData *)forEventType:(RNTouchEventType)eventType
++ (RNGestureHandlerEventExtraData *)forEventType:(RNGHTouchEventType)eventType
                              withChangedPointers:(NSArray<NSDictionary *> *)changedPointers
                                  withAllPointers:(NSArray<NSDictionary *> *)allPointers
                              withNumberOfTouches:(NSUInteger)numberOfTouches;

package/ios/RNGestureHandlerEvents.m

@@ -103,7 +103,7 @@
                            @"numberOfPointers": @(numberOfTouches)}];
 }
 
-+ (RNGestureHandlerEventExtraData *)forEventType:(RNTouchEventType)eventType
++ (RNGestureHandlerEventExtraData *)forEventType:(RNGHTouchEventType)eventType
                              withChangedPointers:(NSArray<NSDictionary *> *)changedPointers
                                  withAllPointers:(NSArray<NSDictionary *> *)allPointers
                              withNumberOfTouches:(NSUInteger)numberOfTouches
@@ -111,7 +111,7 @@
     if (changedPointers == nil || allPointers == nil) {
         changedPointers = @[];
         allPointers = @[];
-        eventType = RNTouchEventTypeUndetermined;
+        eventType = RNGHTouchEventTypeUndetermined;
     }
   
     return [[RNGestureHandlerEventExtraData alloc]

package/ios/RNGestureHandlerManager.h

@@ -24,6 +24,8 @@
 
 - (void)dropGestureHandler:(nonnull NSNumber *)handlerTag;
 
+- (void)dropAllGestureHandlers;
+
 - (void)handleSetJSResponder:(nonnull NSNumber *)viewTag
         blockNativeResponder:(nonnull NSNumber *)blockNativeResponder;