react-native-gesture-handler 3.0.0-beta.2 → 3.0.0-beta.3

package/apple/RNGestureHandlerButtonComponentView.mm

@@ -7,6 +7,7 @@
 #import <react/renderer/components/rngesturehandler_codegen/EventEmitters.h>
 #import <react/renderer/components/rngesturehandler_codegen/Props.h>
 #import <react/renderer/components/rngesturehandler_codegen/RCTComponentViewHelpers.h>
+#import <react/renderer/components/view/BaseViewProps.h>
 #import <react/renderer/components/view/ViewProps.h>
 
 #import "RNGestureHandlerButton.h"
@@ -45,10 +46,12 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
 #endif
 
 // Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
 + (void)load
 {
   [super load];
 }
+#endif
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
@@ -56,6 +59,7 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
     static const auto defaultProps = std::make_shared<const RNGestureHandlerButtonProps>();
     _props = defaultProps;
     _buttonView = [[RNGestureHandlerButton alloc] initWithFrame:self.bounds];
+    _buttonView.animationTarget = self;
 
     self.contentView = _buttonView;
   }
@@ -68,9 +72,12 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   [_buttonView mountChildComponentView:childComponentView index:index];
 }
 
-- (void)unmountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+- (void)unmountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView
+                            index:(NSInteger)__unused index
 {
-  [_buttonView unmountChildComponentView:childComponentView index:index];
+  if (childComponentView.superview == _buttonView) {
+    [childComponentView removeFromSuperview];
+  }
 }
 
 - (LayoutMetrics)buildWrapperMetrics:(const LayoutMetrics &)metrics
@@ -108,6 +115,29 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   [_buttonView updateLayoutMetrics:buttonMetrics oldLayoutMetrics:oldbuttonMetrics];
 }
 
+- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
+{
+  [super finalizeUpdates:updateMask];
+
+  // Resolve per-corner border radii from props and forward to the button
+  // so its underlay CALayer gets the matching shape.
+  const auto borderMetrics = _props->resolveBorderMetrics(_layoutMetrics);
+  [_buttonView setUnderlayCornerRadiiWithTopLeftHorizontal:borderMetrics.borderRadii.topLeft.horizontal
+                                           topLeftVertical:borderMetrics.borderRadii.topLeft.vertical
+                                        topRightHorizontal:borderMetrics.borderRadii.topRight.horizontal
+                                          topRightVertical:borderMetrics.borderRadii.topRight.vertical
+                                      bottomLeftHorizontal:borderMetrics.borderRadii.bottomLeft.horizontal
+                                        bottomLeftVertical:borderMetrics.borderRadii.bottomLeft.vertical
+                                     bottomRightHorizontal:borderMetrics.borderRadii.bottomRight.horizontal
+                                       bottomRightVertical:borderMetrics.borderRadii.bottomRight.vertical];
+  [_buttonView setUnderlayBorderInsetsWithTop:borderMetrics.borderWidths.top
+                                        right:borderMetrics.borderWidths.right
+                                       bottom:borderMetrics.borderWidths.bottom
+                                         left:borderMetrics.borderWidths.left];
+
+  [_buttonView applyStartAnimationState];
+}
+
 #pragma mark - RCTComponentViewProtocol
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
@@ -214,6 +244,19 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   const auto &newProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(props);
 
   _buttonView.userEnabled = newProps.enabled;
+  _buttonView.pressAndHoldAnimationDuration = newProps.pressAndHoldAnimationDuration;
+  _buttonView.tapAnimationDuration = newProps.tapAnimationDuration > 0 ? newProps.tapAnimationDuration : 0;
+  _buttonView.activeOpacity = newProps.activeOpacity;
+  _buttonView.defaultOpacity = newProps.defaultOpacity;
+  _buttonView.activeScale = newProps.activeScale;
+  _buttonView.defaultScale = newProps.defaultScale;
+  _buttonView.defaultUnderlayOpacity = newProps.defaultUnderlayOpacity;
+  _buttonView.activeUnderlayOpacity = newProps.activeUnderlayOpacity;
+  if (newProps.underlayColor) {
+    _buttonView.underlayColor = RCTUIColorFromSharedColor(newProps.underlayColor);
+  } else {
+    _buttonView.underlayColor = nil;
+  }
 #if !TARGET_OS_TV && !TARGET_OS_OSX
   _buttonView.exclusiveTouch = newProps.exclusive;
   [self setAccessibilityProps:props oldProps:oldProps];
@@ -236,6 +279,7 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   }
 
   [super updateProps:props oldProps:oldProps];
+  [_buttonView applyStartAnimationState];
 }
 
 #if !TARGET_OS_OSX
@@ -253,6 +297,12 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
 
   return [_buttonView hitTest:buttonPoint withEvent:event];
 }
+
+- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
+{
+  [super traitCollectionDidChange:previousTraitCollection];
+  [_buttonView applyStartAnimationState];
+}
 #endif
 
 @end

package/apple/RNGestureHandlerDetector.mm

@@ -158,6 +158,12 @@
 {
   [super didAddSubview:view];
 
+  if (_nativeHandlers.count > 0) {
+    react_native_assert(
+        self.subviews.count == 1 &&
+        "Cannot have more than one child view when native gesture handlers are attached to the detector");
+  }
+
   [self tryAttachNativeHandlersToChildView];
 }
 
@@ -201,6 +207,9 @@
       if ([self shouldAttachGestureToSubview:@(tag)] && actionType == RNGestureHandlerActionTypeNativeDetector) {
         // It might happen that `attachHandlers` will be called before children are added into view hierarchy. In that
         // case we cannot attach `NativeViewGestureHandlers` here and we have to do it in `didAddSubview` method.
+        react_native_assert(
+            self.subviews.count <= 1 &&
+            "Cannot attach native gesture handlers when the detector has multiple children");
         [_nativeHandlers addObject:@(tag)];
       } else {
         if (actionType == RNGestureHandlerActionTypeVirtualDetector) {
@@ -294,6 +303,14 @@
 
 - (void)tryAttachNativeHandlersToChildView
 {
+  if (_nativeHandlers.count == 0) {
+    return;
+  }
+
+  react_native_assert(
+      self.subviews.count == 1 &&
+      "Cannot have more than one child view when native gesture handlers are attached to the detector");
+
   RNGestureHandlerManager *handlerManager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
 
   RNGHUIView *view = self.subviews[0];

package/apple/RNGestureHandlerEvents.h

@@ -54,7 +54,9 @@
                                  withAllPointers:(NSArray<NSDictionary *> *)allPointers
                              withNumberOfTouches:(NSUInteger)numberOfTouches
                                  withPointerType:(NSInteger)pointerType;
-+ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside withPointerType:(NSInteger)pointerType;
++ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside
+                                 withNumberOfTouches:(NSUInteger)numberOfTouches
+                                     withPointerType:(NSInteger)pointerType;
 @end
 
 @interface RNGestureHandlerEvent : NSObject <RCTEvent>

package/apple/RNGestureHandlerEvents.mm

@@ -156,10 +156,15 @@
   }];
 }
 
-+ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside withPointerType:(NSInteger)pointerType
++ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside
+                                 withNumberOfTouches:(NSUInteger)numberOfTouches
+                                     withPointerType:(NSInteger)pointerType
 {
-  return [[RNGestureHandlerEventExtraData alloc]
-      initWithData:@{@"pointerInside" : @(pointerInside), @"pointerType" : @(pointerType)}];
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"pointerInside" : @(pointerInside),
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
+  }];
 }
 
 @end

package/apple/RNGestureHandlerManager.h

@@ -42,4 +42,6 @@
 - (nullable RNGestureHandler *)handlerWithTag:(nonnull NSNumber *)handlerTag;
 
 - (nullable RNGHUIView *)viewForReactTag:(nonnull NSNumber *)reactTag;
+
+- (void)reattachHandlersIfNeeded;
 @end

package/apple/RNGestureHandlerManager.mm

@@ -171,6 +171,21 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   }
 
   [_attachRetryCounter removeObjectForKey:viewTag];
+  [self maybeBindHandler:handlerTag toViewWithTag:viewTag withActionType:actionType withHostDetector:hostDetector];
+}
+
+// Resolves a view tag to its native UIView (including contentView unwrapping),
+// sets reactTag, and binds the gesture handler to it. No-op if the handler is
+// already attached to the correct view.
+- (void)maybeBindHandler:(nonnull NSNumber *)handlerTag
+           toViewWithTag:(nonnull NSNumber *)viewTag
+          withActionType:(RNGestureHandlerActionType)actionType
+        withHostDetector:(nullable RNGHUIView *)hostDetector
+{
+  RNGHUIView *view = [_viewRegistry viewForReactTag:viewTag];
+  if (view == nil || view.superview == nil) {
+    return;
+  }
 
   // I think it should be moved to RNNativeViewHandler, but that would require
   // additional logic for setting contentView.reactTag, this works for now
@@ -181,12 +196,17 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
     }
   }
 
+  RNGestureHandler *handler = [_registry handlerWithTag:handlerTag];
+
+  // Already attached to the correct native view, nothing to do.
+  if (handler != nil && handler.recognizer.view == view && handler.actionType == actionType) {
+    return;
+  }
+
   view.reactTag = viewTag; // necessary for RNReanimated eventHash (e.g. "42onGestureHandlerEvent"), also will be
                            // returned as event.target
 
   [_registry attachHandlerWithTag:handlerTag toView:view withActionType:actionType withHostDetector:hostDetector];
-
-  // register view if not already there
   [self registerViewWithGestureRecognizerAttachedIfNeeded:view];
 }
 
@@ -224,6 +244,28 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   return [_registry handlerWithTag:handlerTag];
 }
 
+- (void)reattachHandlersIfNeeded
+{
+  // Re-bind handlers to their current native views. On Fabric, when a parent view has
+  // display:none and siblings change, the native UIView backing a component may be recycled
+  // and replaced. maybeBindHandler is a no-op if the view is nil or unchanged. This is only
+  // needed for handlers using the old api.
+  NSDictionary *handlers = _registry.handlers;
+
+  @synchronized(handlers) {
+    for (RNGestureHandler *handler in handlers.objectEnumerator) {
+      if (handler.viewTag == nil || [handler usesNativeOrVirtualDetector]) {
+        continue;
+      }
+
+      [self maybeBindHandler:handler.tag
+               toViewWithTag:handler.viewTag
+              withActionType:handler.actionType
+            withHostDetector:nil];
+    }
+  }
+}
+
 #pragma mark Root Views Management
 
 - (void)registerViewWithGestureRecognizerAttachedIfNeeded:(RNGHUIView *)childView
@@ -231,10 +273,14 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   RNGHUIView *touchHandlerView = childView;
 
 #if !TARGET_OS_OSX
+  Class fullWindowOverlayContainerClass = NSClassFromString(@"RNSFullWindowOverlayContainer");
+
   if ([[childView reactViewController] isKindOfClass:[RCTFabricModalHostViewController class]]) {
     touchHandlerView = [childView reactViewController].view;
   } else {
-    while (touchHandlerView != nil && ![touchHandlerView isKindOfClass:[RCTSurfaceView class]]) {
+    while (
+        touchHandlerView != nil && ![touchHandlerView isKindOfClass:[RCTSurfaceView class]] &&
+        (fullWindowOverlayContainerClass == nil || ![touchHandlerView isKindOfClass:fullWindowOverlayContainerClass])) {
       touchHandlerView = touchHandlerView.superview;
     }
   }

package/apple/RNGestureHandlerModule.mm

@@ -171,18 +171,21 @@ RCT_EXPORT_MODULE()
 {
   // On the new arch we rely on `flushOperations` for scheduling the operations on the UI thread.
   // On the old arch we rely on `uiManagerWillPerformMounting`
-  if (_operations.count == 0) {
-    return;
-  }
-
   RNGestureHandlerManager *manager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
-  NSArray<GestureHandlerOperation> *operations = _operations;
-  _operations = [NSMutableArray new];
+
+  if (_operations.count > 0) {
+    NSArray<GestureHandlerOperation> *operations = _operations;
+    _operations = [NSMutableArray new];
+
+    [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
+      for (GestureHandlerOperation operation in operations) {
+        operation(manager);
+      }
+    }];
+  }
 
   [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
-    for (GestureHandlerOperation operation in operations) {
-      operation(manager);
-    }
+    [manager reattachHandlersIfNeeded];
   }];
 }
 
@@ -222,6 +225,10 @@ RCT_EXPORT_MODULE()
     } else if (state == 3) { // CANCELLED
       handler.recognizer.state = RNGHGestureRecognizerStateCancelled;
     } else if (state == 4) { // ACTIVE
+      // We don't allow activation of gestures which haven't received any touches
+      if (handler.lastState == RNGestureHandlerStateUndetermined) {
+        return;
+      }
       [handler stopActivationBlocker];
       handler.recognizer.state = RNGHGestureRecognizerStateBegan;
     } else if (state == 5) { // ENDED
@@ -237,7 +244,7 @@ RCT_EXPORT_MODULE()
   // do not send state change event when activating because it bypasses
   // shouldRequireFailureOfGestureRecognizer
   if (state != 4) {
-    [handler handleGesture:handler.recognizer fromReset:NO];
+    [handler handleGesture:handler.recognizer fromReset:NO fromManualStateChange:YES];
   }
 }
 

package/apple/RNGestureHandlerRegistry.h

@@ -21,4 +21,6 @@
 - (void)dropHandlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)dropAllHandlers;
 
+@property (nonatomic, readonly, nonnull) NSDictionary<NSNumber *, RNGestureHandler *> *handlers;
+
 @end

package/apple/RNGestureHandlerRegistry.m

@@ -22,14 +22,23 @@
   return self;
 }
 
+- (NSDictionary<NSNumber *, RNGestureHandler *> *)handlers
+{
+  return _handlers;
+}
+
 - (RNGestureHandler *)handlerWithTag:(NSNumber *)handlerTag
 {
-  return _handlers[handlerTag];
+  @synchronized(_handlers) {
+    return _handlers[handlerTag];
+  }
 }
 
 - (void)registerGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  _handlers[gestureHandler.tag] = gestureHandler;
+  @synchronized(_handlers) {
+    _handlers[gestureHandler.tag] = gestureHandler;
+  }
 }
 
 - (void)attachHandlerWithTag:(NSNumber *)handlerTag
@@ -37,7 +46,12 @@
               withActionType:(RNGestureHandlerActionType)actionType
             withHostDetector:(nullable RNGHUIView *)hostDetector
 {
-  RNGestureHandler *handler = _handlers[handlerTag];
+  RNGestureHandler *handler;
+
+  @synchronized(_handlers) {
+    handler = _handlers[handlerTag];
+  }
+
   RCTAssert(handler != nil, @"Handler for tag %@ does not exists", handlerTag);
   [handler unbindFromView];
   handler.actionType = actionType;
@@ -50,27 +64,43 @@
 
 - (void)detachHandlerWithTag:(NSNumber *)handlerTag fromHostDetector:(RNGHUIView *)hostDetectorView
 {
-  RNGestureHandler *handler = _handlers[handlerTag];
-  if (handler.hostDetectorView != hostDetectorView)
+  RNGestureHandler *handler;
+
+  @synchronized(_handlers) {
+    handler = _handlers[handlerTag];
+  }
+
+  if (handler.hostDetectorView != hostDetectorView) {
     return;
+  }
+
   [handler unbindFromView];
 }
 
 - (void)dropHandlerWithTag:(NSNumber *)handlerTag
 {
-  RNGestureHandler *handler = _handlers[handlerTag];
+  RNGestureHandler *handler;
+
+  @synchronized(_handlers) {
+    handler = _handlers[handlerTag];
+    [_handlers removeObjectForKey:handlerTag];
+  }
+
   [handler unbindFromView];
-  [_handlers removeObjectForKey:handlerTag];
 }
 
 - (void)dropAllHandlers
 {
-  for (NSNumber *tag in _handlers) {
-    RNGestureHandler *handler = _handlers[tag];
-    [handler unbindFromView];
+  NSArray<RNGestureHandler *> *handlers;
+
+  @synchronized(_handlers) {
+    handlers = [_handlers allValues];
+    [_handlers removeAllObjects];
   }
 
-  [_handlers removeAllObjects];
+  for (RNGestureHandler *handler in handlers) {
+    [handler unbindFromView];
+  }
 }
 
 @end

package/apple/RNManualActivationRecognizer.m

@@ -2,7 +2,7 @@
 #import "RNGestureHandler.h"
 
 @implementation RNManualActivationRecognizer {
-  RNGestureHandler *_handler;
+  __weak RNGestureHandler *_handler;
   int _activePointers;
 }
 

package/jest-utils/package.json

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

package/jestSetup.js

@@ -8,32 +8,22 @@ jest.mock('./src/components/Pressable/Pressable', () =>
 jest.mock('./src/components/GestureComponents', () =>
   require('./src/mocks/gestureComponents')
 );
+jest.mock('./src/components/touchables', () =>
+  require('./src/mocks/Touchables')
+);
 jest.mock('./src/v3/detectors/HostGestureDetector', () =>
   require('./src/mocks/hostDetector')
 );
 
-jest.mock('./lib/commonjs/RNGestureHandlerModule', () =>
-  require('./lib/commonjs/mocks/module')
-);
-jest.mock('./lib/commonjs/components/GestureButtons', () =>
-  require('./lib/commonjs/mocks/GestureButtons')
-);
-jest.mock('./lib/commonjs/components/Pressable', () =>
-  require('./lib/commonjs/mocks/Pressable')
-);
-jest.mock('./lib/commonjs/components/GestureComponents', () =>
-  require('./lib/commonjs/mocks/gestureComponents')
-);
-jest.mock('./lib/commonjs/v3/detectors/HostGestureDetector', () =>
-  require('./lib/commonjs/mocks/hostDetector')
-);
-
 jest.mock('./lib/module/RNGestureHandlerModule', () =>
   require('./lib/module/mocks/module')
 );
 jest.mock('./lib/module/components/GestureButtons', () =>
   require('./lib/module/mocks/GestureButtons')
 );
+jest.mock('./lib/module/components/touchables', () =>
+  require('./lib/module/mocks/Touchables')
+);
 jest.mock('./lib/module/components/Pressable', () =>
   require('./lib/module/mocks/Pressable')
 );

package/lib/module/RNGestureHandlerModule.web.js

@@ -2,9 +2,10 @@
 
 import React from 'react';
 import { Gestures } from './web/Gestures';
+import { GestureHandlerWebDelegate } from './web/tools/GestureHandlerWebDelegate';
 import InteractionManager from './web/tools/InteractionManager';
 import NodeManager from './web/tools/NodeManager';
-import { GestureHandlerWebDelegate } from './web/tools/GestureHandlerWebDelegate';
+
 // init method is called inside attachGestureHandler function. However, this function may
 // fail when received view is not valid HTML element. On the other hand, dropGestureHandler
 // will be called even if attach failed, which will result in crash.

package/lib/module/RNGestureHandlerModule.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Gestures","InteractionManager","NodeManager","GestureHandlerWebDelegate","shouldPreventDrop","createGestureHandler","handlerName","handlerTag","config","Error","GestureClass","setGestureHandlerConfig","attachGestureHandler","newView","actionType","propsRef","Element","Component","handler","getHandler","constructor","name","init","detachGestureHandler","newConfig","setGestureConfig","updateGestureHandlerConfig","updateGestureConfig","getGestureHandlerNode","dropGestureHandler","configureRelations","relations","instance","configureInteractions","flushOperations","setReanimatedAvailable","_isAvailable"],"sourceRoot":"../../src","sources":["RNGestureHandlerModule.web.ts"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAGzB,SAASC,QAAQ,QAAQ,gBAAgB;AAEzC,OAAOC,kBAAkB,MAAM,gCAAgC;AAC/D,OAAOC,WAAW,MAAM,yBAAyB;AACjD,SAASC,yBAAyB,QAAQ,uCAAuC;AAGjF;AACA;AACA;AACA;AACA;AACA,IAAIC,iBAAiB,GAAG,KAAK;AAE7B,eAAe;EACbC,oBAAoBA,CAClBC,WAAkC,EAClCC,UAAkB,EAClBC,MAAS,EACT;IACA,IAAI,EAAEF,WAAW,IAAIN,QAAQ,CAAC,EAAE;MAC9B,MAAM,IAAIS,KAAK,CACb,iCAAiCH,WAAW,2BAC9C,CAAC;IACH;IAEA,MAAMI,YAAY,GAAGV,QAAQ,CAACM,WAAW,CAAC;IAC1CJ,WAAW,CAACG,oBAAoB,CAC9BE,UAAU,EACV,IAAIG,YAAY,CAAC,IAAIP,yBAAyB,CAAC,CAAC,CAClD,CAAC;IACD,IAAI,CAACQ,uBAAuB,CAACJ,UAAU,EAAEC,MAA2B,CAAC;EACvE,CAAC;EACDI,oBAAoBA,CAClBL,UAAkB;EAClB;EACAM,OAAY,EACZC,UAAsB,EACtBC,QAAmC,EACnC;IACA,IAAI,EAAEF,OAAO,YAAYG,OAAO,IAAIH,OAAO,YAAYd,KAAK,CAACkB,SAAS,CAAC,EAAE;MACvEb,iBAAiB,GAAG,IAAI;MAExB,MAAMc,OAAO,GAAGhB,WAAW,CAACiB,UAAU,CAACZ,UAAU,CAAC;MAElD,MAAMD,WAAW,GAAGY,OAAO,CAACE,WAAW,CAACC,IAAI;MAE5C,MAAM,IAAIZ,KAAK,CACb,GAAGH,WAAW,aAAaC,UAAU,iDACvC,CAAC;IACH;;IAEA;IACAL,WAAW,CAACiB,UAAU,CAACZ,UAAU,CAAC,CAACe,IAAI,CAACT,OAAO,EAAEE,QAAQ,EAAED,UAAU,CAAC;EACxE,CAAC;EACDS,oBAAoBA,CAAChB,UAAkB,EAAE;IACvC,IAAIH,iBAAiB,EAAE;MACrBA,iBAAiB,GAAG,KAAK;MACzB;IACF;IAEAF,WAAW,CAACqB,oBAAoB,CAAChB,UAAU,CAAC;EAC9C,CAAC;EACDI,uBAAuBA,CAACJ,UAAkB,EAAEiB,SAAiB,EAAE;IAC7DtB,WAAW,CAACiB,UAAU,CAACZ,UAAU,CAAC,CAACkB,gBAAgB,CAACD,SAAS,CAAC;EAChE,CAAC;EACDE,0BAA0BA,CAACnB,UAAkB,EAAEiB,SAA0B,EAAE;IACzEtB,WAAW,CAACiB,UAAU,CAACZ,UAAU,CAAC,CAACoB,mBAAmB,CAACH,SAAS,CAAC;EACnE,CAAC;EACDI,qBAAqBA,CAACrB,UAAkB,EAAE;IACxC,OAAOL,WAAW,CAACiB,UAAU,CAACZ,UAAU,CAAC;EAC3C,CAAC;EACDsB,kBAAkBA,CAACtB,UAAkB,EAAE;IACrC,IAAIH,iBAAiB,EAAE;MACrBA,iBAAiB,GAAG,KAAK;MACzB;IACF;IAEAF,WAAW,CAAC2B,kBAAkB,CAACtB,UAAU,CAAC;EAC5C,CAAC;EACDuB,kBAAkBA,CAACvB,UAAkB,EAAEwB,SAA2B,EAAE;IAClE9B,kBAAkB,CAAC+B,QAAQ,CAACC,qBAAqB,CAC/C/B,WAAW,CAACiB,UAAU,CAACZ,UAAU,CAAC,EAClCwB,SACF,CAAC;EACH,CAAC;EACD;EACAG,eAAeA,CAAA,EAAG,CAAC,CAAC;EACpBC,sBAAsBA,CAACC,YAAqB,EAAE;IAC5C;EAAA;AAEJ,CAAC","ignoreList":[]}
+{"version":3,"names":["React","Gestures","GestureHandlerWebDelegate","InteractionManager","NodeManager","shouldPreventDrop","createGestureHandler","handlerName","handlerTag","config","Error","GestureClass","setGestureHandlerConfig","attachGestureHandler","newView","actionType","propsRef","Element","Component","handler","getHandler","constructor","name","init","detachGestureHandler","newConfig","setGestureConfig","updateGestureHandlerConfig","updateGestureConfig","getGestureHandlerNode","dropGestureHandler","configureRelations","relations","instance","configureInteractions","flushOperations","setReanimatedAvailable","_isAvailable"],"sourceRoot":"../../src","sources":["RNGestureHandlerModule.web.ts"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAIzB,SAASC,QAAQ,QAAQ,gBAAgB;AAEzC,SAASC,yBAAyB,QAAQ,uCAAuC;AACjF,OAAOC,kBAAkB,MAAM,gCAAgC;AAC/D,OAAOC,WAAW,MAAM,yBAAyB;;AAEjD;AACA;AACA;AACA;AACA;AACA,IAAIC,iBAAiB,GAAG,KAAK;AAE7B,eAAe;EACbC,oBAAoBA,CAClBC,WAAkC,EAClCC,UAAkB,EAClBC,MAAS,EACT;IACA,IAAI,EAAEF,WAAW,IAAIN,QAAQ,CAAC,EAAE;MAC9B,MAAM,IAAIS,KAAK,CACb,iCAAiCH,WAAW,2BAC9C,CAAC;IACH;IAEA,MAAMI,YAAY,GAAGV,QAAQ,CAACM,WAAW,CAAC;IAC1CH,WAAW,CAACE,oBAAoB,CAC9BE,UAAU,EACV,IAAIG,YAAY,CAAC,IAAIT,yBAAyB,CAAC,CAAC,CAClD,CAAC;IACD,IAAI,CAACU,uBAAuB,CAACJ,UAAU,EAAEC,MAA2B,CAAC;EACvE,CAAC;EACDI,oBAAoBA,CAClBL,UAAkB;EAClB;EACAM,OAAY,EACZC,UAAsB,EACtBC,QAAmC,EACnC;IACA,IAAI,EAAEF,OAAO,YAAYG,OAAO,IAAIH,OAAO,YAAYd,KAAK,CAACkB,SAAS,CAAC,EAAE;MACvEb,iBAAiB,GAAG,IAAI;MAExB,MAAMc,OAAO,GAAGf,WAAW,CAACgB,UAAU,CAACZ,UAAU,CAAC;MAElD,MAAMD,WAAW,GAAGY,OAAO,CAACE,WAAW,CAACC,IAAI;MAE5C,MAAM,IAAIZ,KAAK,CACb,GAAGH,WAAW,aAAaC,UAAU,iDACvC,CAAC;IACH;;IAEA;IACAJ,WAAW,CAACgB,UAAU,CAACZ,UAAU,CAAC,CAACe,IAAI,CAACT,OAAO,EAAEE,QAAQ,EAAED,UAAU,CAAC;EACxE,CAAC;EACDS,oBAAoBA,CAAChB,UAAkB,EAAE;IACvC,IAAIH,iBAAiB,EAAE;MACrBA,iBAAiB,GAAG,KAAK;MACzB;IACF;IAEAD,WAAW,CAACoB,oBAAoB,CAAChB,UAAU,CAAC;EAC9C,CAAC;EACDI,uBAAuBA,CAACJ,UAAkB,EAAEiB,SAAiB,EAAE;IAC7DrB,WAAW,CAACgB,UAAU,CAACZ,UAAU,CAAC,CAACkB,gBAAgB,CAACD,SAAS,CAAC;EAChE,CAAC;EACDE,0BAA0BA,CAACnB,UAAkB,EAAEiB,SAA0B,EAAE;IACzErB,WAAW,CAACgB,UAAU,CAACZ,UAAU,CAAC,CAACoB,mBAAmB,CAACH,SAAS,CAAC;EACnE,CAAC;EACDI,qBAAqBA,CAACrB,UAAkB,EAAE;IACxC,OAAOJ,WAAW,CAACgB,UAAU,CAACZ,UAAU,CAAC;EAC3C,CAAC;EACDsB,kBAAkBA,CAACtB,UAAkB,EAAE;IACrC,IAAIH,iBAAiB,EAAE;MACrBA,iBAAiB,GAAG,KAAK;MACzB;IACF;IAEAD,WAAW,CAAC0B,kBAAkB,CAACtB,UAAU,CAAC;EAC5C,CAAC;EACDuB,kBAAkBA,CAACvB,UAAkB,EAAEwB,SAA2B,EAAE;IAClE7B,kBAAkB,CAAC8B,QAAQ,CAACC,qBAAqB,CAC/C9B,WAAW,CAACgB,UAAU,CAACZ,UAAU,CAAC,EAClCwB,SACF,CAAC;EACH,CAAC;EACD;EACAG,eAAeA,CAAA,EAAG,CAAC,CAAC;EACpBC,sBAAsBA,CAACC,YAAqB,EAAE;IAC5C;EAAA;AAEJ,CAAC","ignoreList":[]}

package/lib/module/RNGestureHandlerModule.windows.js

@@ -1,14 +1,13 @@
 "use strict";
 
-// GestureHandlers
-import PanGestureHandler from './web/handlers/PanGestureHandler';
-import TapGestureHandler from './web/handlers/TapGestureHandler';
+import FlingGestureHandler from './web/handlers/FlingGestureHandler';
 import LongPressGestureHandler from './web/handlers/LongPressGestureHandler';
+import ManualGestureHandler from './web/handlers/ManualGestureHandler';
+import NativeViewGestureHandler from './web/handlers/NativeViewGestureHandler';
+import PanGestureHandler from './web/handlers/PanGestureHandler';
 import PinchGestureHandler from './web/handlers/PinchGestureHandler';
 import RotationGestureHandler from './web/handlers/RotationGestureHandler';
-import FlingGestureHandler from './web/handlers/FlingGestureHandler';
-import NativeViewGestureHandler from './web/handlers/NativeViewGestureHandler';
-import ManualGestureHandler from './web/handlers/ManualGestureHandler';
+import TapGestureHandler from './web/handlers/TapGestureHandler';
 export const Gestures = {
   NativeViewGestureHandler,
   PanGestureHandler,

package/lib/module/RNGestureHandlerModule.windows.js.map

@@ -1 +1 @@
-{"version":3,"names":["PanGestureHandler","TapGestureHandler","LongPressGestureHandler","PinchGestureHandler","RotationGestureHandler","FlingGestureHandler","NativeViewGestureHandler","ManualGestureHandler","Gestures","createGestureHandler","_handlerName","_handlerTag","_config","attachGestureHandler","_newView","_actionType","_propsRef","setGestureHandlerConfig","_newConfig","updateGestureHandlerConfig","getGestureHandlerNode","dropGestureHandler","flushOperations"],"sourceRoot":"../../src","sources":["RNGestureHandlerModule.windows.ts"],"mappings":";;AAIA;AACA,OAAOA,iBAAiB,MAAM,kCAAkC;AAChE,OAAOC,iBAAiB,MAAM,kCAAkC;AAChE,OAAOC,uBAAuB,MAAM,wCAAwC;AAC5E,OAAOC,mBAAmB,MAAM,oCAAoC;AACpE,OAAOC,sBAAsB,MAAM,uCAAuC;AAC1E,OAAOC,mBAAmB,MAAM,oCAAoC;AACpE,OAAOC,wBAAwB,MAAM,yCAAyC;AAC9E,OAAOC,oBAAoB,MAAM,qCAAqC;AAGtE,OAAO,MAAMC,QAAQ,GAAG;EACtBF,wBAAwB;EACxBN,iBAAiB;EACjBC,iBAAiB;EACjBC,uBAAuB;EACvBC,mBAAmB;EACnBC,sBAAsB;EACtBC,mBAAmB;EACnBE;AACF,CAAC;AAED,eAAe;EACbE,oBAAoBA,CAClBC,YAAmC,EACnCC,WAAmB,EACnBC,OAAU,EACV;IACA;EAAA,CACD;EACDC,oBAAoBA,CAClBF,WAAmB;EACnB;EACAG,QAAa,EACbC,WAAuB,EACvBC,SAAmC,EACnC;IACA;EAAA,CACD;EACDC,uBAAuBA,CAACN,WAAmB,EAAEO,UAAkB,EAAE;IAC/D;EAAA,CACD;EACDC,0BAA0BA,CAACR,WAAmB,EAAEO,UAAkB,EAAE;IAClE;EAAA,CACD;EACDE,qBAAqBA,CAACT,WAAmB,EAAE;IACzC;EAAA,CACD;EACDU,kBAAkBA,CAACV,WAAmB,EAAE;IACtC;EAAA,CACD;EACDW,eAAeA,CAAA,EAAG;IAChB;EAAA;AAEJ,CAAC","ignoreList":[]}
+{"version":3,"names":["FlingGestureHandler","LongPressGestureHandler","ManualGestureHandler","NativeViewGestureHandler","PanGestureHandler","PinchGestureHandler","RotationGestureHandler","TapGestureHandler","Gestures","createGestureHandler","_handlerName","_handlerTag","_config","attachGestureHandler","_newView","_actionType","_propsRef","setGestureHandlerConfig","_newConfig","updateGestureHandlerConfig","getGestureHandlerNode","dropGestureHandler","flushOperations"],"sourceRoot":"../../src","sources":["RNGestureHandlerModule.windows.ts"],"mappings":";;AAGA,OAAOA,mBAAmB,MAAM,oCAAoC;AACpE,OAAOC,uBAAuB,MAAM,wCAAwC;AAC5E,OAAOC,oBAAoB,MAAM,qCAAqC;AACtE,OAAOC,wBAAwB,MAAM,yCAAyC;AAC9E,OAAOC,iBAAiB,MAAM,kCAAkC;AAChE,OAAOC,mBAAmB,MAAM,oCAAoC;AACpE,OAAOC,sBAAsB,MAAM,uCAAuC;AAC1E,OAAOC,iBAAiB,MAAM,kCAAkC;AAGhE,OAAO,MAAMC,QAAQ,GAAG;EACtBL,wBAAwB;EACxBC,iBAAiB;EACjBG,iBAAiB;EACjBN,uBAAuB;EACvBI,mBAAmB;EACnBC,sBAAsB;EACtBN,mBAAmB;EACnBE;AACF,CAAC;AAED,eAAe;EACbO,oBAAoBA,CAClBC,YAAmC,EACnCC,WAAmB,EACnBC,OAAU,EACV;IACA;EAAA,CACD;EACDC,oBAAoBA,CAClBF,WAAmB;EACnB;EACAG,QAAa,EACbC,WAAuB,EACvBC,SAAmC,EACnC;IACA;EAAA,CACD;EACDC,uBAAuBA,CAACN,WAAmB,EAAEO,UAAkB,EAAE;IAC/D;EAAA,CACD;EACDC,0BAA0BA,CAACR,WAAmB,EAAEO,UAAkB,EAAE;IAClE;EAAA,CACD;EACDE,qBAAqBA,CAACT,WAAmB,EAAE;IACzC;EAAA,CACD;EACDU,kBAAkBA,CAACV,WAAmB,EAAE;IACtC;EAAA,CACD;EACDW,eAAeA,CAAA,EAAG;IAChB;EAAA;AAEJ,CAAC","ignoreList":[]}

package/lib/module/components/GestureButtons.js

@@ -3,12 +3,13 @@
 import * as React from 'react';
 import { Animated, Platform, StyleSheet } from 'react-native';
 import createNativeWrapper from '../handlers/createNativeWrapper';
-import GestureHandlerButton from './GestureHandlerButton';
 import { State } from '../State';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import GestureHandlerButton from './GestureHandlerButton';
+
 /**
  * @deprecated use `RawButton` instead
  */
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const LegacyRawButton = createNativeWrapper(GestureHandlerButton, {
   shouldCancelWhenOutside: false,
   shouldActivateOnStart: false
@@ -37,9 +38,7 @@ class InnerBaseButton extends React.Component {
     if (!this.longPressDetected && oldState === State.ACTIVE && state !== State.CANCELLED && this.lastActive && this.props.onPress) {
       this.props.onPress(pointerInside);
     }
-    if (!this.lastActive &&
-    // NativeViewGestureHandler sends different events based on platform
-    state === (Platform.OS !== 'android' ? State.ACTIVE : State.BEGAN) && pointerInside) {
+    if (!this.lastActive && state === State.BEGAN && pointerInside) {
       this.longPressDetected = false;
       if (this.props.onLongPress) {
         this.longPressTimeout = setTimeout(this.onLongPress, this.props.delayLongPress);
@@ -97,14 +96,20 @@ const AnimatedInnerBaseButton = Animated.createAnimatedComponent(InnerBaseButton
 /**
  * @deprecated use `BaseButton` instead
  */
-export const LegacyBaseButton = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/_jsx(InnerBaseButton, {
+export const LegacyBaseButton = ({
+  ref,
+  ...props
+}) => /*#__PURE__*/_jsx(InnerBaseButton, {
   innerRef: ref,
   ...props
-}));
-const AnimatedBaseButton = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/_jsx(AnimatedInnerBaseButton, {
+});
+const AnimatedBaseButton = ({
+  ref,
+  ...props
+}) => /*#__PURE__*/_jsx(AnimatedInnerBaseButton, {
   innerRef: ref,
   ...props
-}));
+});
 const btnStyles = StyleSheet.create({
   underlay: {
     position: 'absolute',
@@ -130,9 +135,12 @@ class InnerRectButton extends React.Component {
     this.props.onActiveStateChange?.(active);
   };
   render() {
+    // Move activeOpacity out of the rest props to avoid passing it to the native component
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const {
       children,
       style,
+      activeOpacity,
       ...rest
     } = this.props;
     const resolvedStyle = StyleSheet.flatten(style) ?? {};
@@ -159,10 +167,13 @@ class InnerRectButton extends React.Component {
 /**
  * @deprecated use `RectButton` instead
  */
-export const LegacyRectButton = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/_jsx(InnerRectButton, {
+export const LegacyRectButton = ({
+  ref,
+  ...props
+}) => /*#__PURE__*/_jsx(InnerRectButton, {
   innerRef: ref,
   ...props
-}));
+});
 class InnerBorderlessButton extends React.Component {
   static defaultProps = {
     activeOpacity: 0.3,
@@ -179,10 +190,13 @@ class InnerBorderlessButton extends React.Component {
     this.props.onActiveStateChange?.(active);
   };
   render() {
+    // Move activeOpacity out of the rest props to avoid passing it to the native component
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const {
       children,
       style,
       innerRef,
+      activeOpacity,
       ...rest
     } = this.props;
     return /*#__PURE__*/_jsx(AnimatedBaseButton, {
@@ -200,9 +214,12 @@ class InnerBorderlessButton extends React.Component {
 /**
  * @deprecated use `BorderlessButton` instead
  */
-export const LegacyBorderlessButton = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/_jsx(InnerBorderlessButton, {
+export const LegacyBorderlessButton = ({
+  ref,
+  ...props
+}) => /*#__PURE__*/_jsx(InnerBorderlessButton, {
   innerRef: ref,
   ...props
-}));
+});
 export { default as LegacyPureNativeButton } from './GestureHandlerButton';
 //# sourceMappingURL=GestureButtons.js.map