react-native-gesture-handler 2.3.2 → 2.4.2

package/ios/RNGestureHandlerManager.mm

@@ -48,6 +48,7 @@
     RCTUIManager *_uiManager;
     NSHashTable<RNRootViewGestureRecognizer *> *_rootViewGestureRecognizers;
     RCTEventDispatcher *_eventDispatcher;
+    id _reanimatedModule;
 }
 
 - (instancetype)initWithUIManager:(RCTUIManager *)uiManager
@@ -58,6 +59,7 @@
         _eventDispatcher = eventDispatcher;
         _registry = [RNGestureHandlerRegistry new];
         _rootViewGestureRecognizers = [NSHashTable hashTableWithOptions:NSPointerFunctionsWeakMemory];
+        _reanimatedModule = nil;
     }
     return self;
 }
@@ -139,6 +141,11 @@
     [_registry dropHandlerWithTag:handlerTag];
 }
 
+- (void)dropAllGestureHandlers
+{
+    [_registry dropAllHandlers];
+}
+
 - (void)handleSetJSResponder:(NSNumber *)viewTag blockNativeResponder:(NSNumber *)blockNativeResponder
 {
     if ([blockNativeResponder boolValue]) {
@@ -210,80 +217,83 @@
 
 #pragma mark Events
 
-- (void)sendStateChangeEvent:(RNGestureHandlerStateChange *)event withActionType:(RNGestureHandlerActionType)actionType
+- (void)sendEvent:(RNGestureHandlerStateChange *)event withActionType:(RNGestureHandlerActionType)actionType
 {
     switch (actionType) {
         case RNGestureHandlerActionTypeReanimatedWorklet:
-            [self sendStateChangeEventForReanimated:event];
+            [self sendEventForReanimated:event];
             break;
             
         case RNGestureHandlerActionTypeNativeAnimatedEvent:
             if ([event.eventName isEqualToString:@"onGestureHandlerEvent"]) {
-                [self sendStateChangeEventForNativeAnimatedEvent:event];
+                [self sendEventForNativeAnimatedEvent: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];
+                [self sendEventForJSFunctionOldAPI:event];
             }
             break;
 
         case RNGestureHandlerActionTypeJSFunctionOldAPI:
-            [self sendStateChangeEventForJSFunctionOldAPI:event];
+            [self sendEventForJSFunctionOldAPI:event];
             break;
             
         case RNGestureHandlerActionTypeJSFunctionNewAPI:
-            [self sendStateChangeEventForJSFunctionNewAPI:event];
+            [self sendEventForJSFunctionNewAPI:event];
             break;
     }
 }
 
-- (void)sendStateChangeEventForReanimated:(RNGestureHandlerStateChange *)event
+- (void)sendEventForReanimated:(RNGestureHandlerStateChange *)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];
+    // Send event directly to Reanimated
+    if (_reanimatedModule == nil) {
+      _reanimatedModule = [_uiManager.bridge moduleForName:@"ReanimatedModule"];
+    }
+    
+    [_reanimatedModule eventDispatcherWillDispatchEvent:event];
 #else
     // In the old architecture, Reanimated overwrites RCTEventDispatcher
     // with REAEventDispatcher and intercepts all direct events.
-    [self sendStateChangeEventForDirectEvent:event];
+    [self sendEventForDirectEvent:event];
 #endif // RN_FABRIC_ENABLED
 }
 
-- (void)sendStateChangeEventForNativeAnimatedEvent:(RNGestureHandlerStateChange *)event
+- (void)sendEventForNativeAnimatedEvent:(RNGestureHandlerStateChange *)event
 {
     // 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];
+    [self sendEventForDirectEvent:event];
 }
 
-- (void)sendStateChangeEventForJSFunctionOldAPI:(RNGestureHandlerStateChange *)event
+- (void)sendEventForJSFunctionOldAPI:(RNGestureHandlerStateChange *)event
 {
     // Delivers the event to JS (old RNGH API).
 #ifdef RN_FABRIC_ENABLED
-    [self sendStateChangeEventForDeviceEvent:event];
+    [self sendEventForDeviceEvent:event];
 #else
-    [self sendStateChangeEventForDirectEvent:event];
+    [self sendEventForDirectEvent:event];
 #endif // RN_FABRIC_ENABLED
 }
 
-- (void)sendStateChangeEventForJSFunctionNewAPI:(RNGestureHandlerStateChange *)event
+- (void)sendEventForJSFunctionNewAPI:(RNGestureHandlerStateChange *)event
 {
     // Delivers the event to JS (new RNGH API).
-    [self sendStateChangeEventForDeviceEvent:event];
+    [self sendEventForDeviceEvent:event];
 }
 
-- (void)sendStateChangeEventForDirectEvent:(RNGestureHandlerStateChange *)event
+- (void)sendEventForDirectEvent:(RNGestureHandlerStateChange *)event
 {
     // Delivers the event to JS as a direct event.
     [_eventDispatcher sendEvent:event];
 }
 
-- (void)sendStateChangeEventForDeviceEvent:(RNGestureHandlerStateChange *)event
+- (void)sendEventForDeviceEvent:(RNGestureHandlerStateChange *)event
 {
     // Delivers the event to JS as a device event.
     NSMutableDictionary *body = [[event arguments] objectAtIndex:2];

package/ios/RNGestureHandlerModule.mm

@@ -60,6 +60,8 @@ RCT_EXPORT_MODULE()
 
 - (void)invalidate
 {
+    [_manager dropAllGestureHandlers];
+    
     _manager = nil;
     
 #ifdef RN_FABRIC_ENABLED
@@ -173,6 +175,22 @@ RCT_EXPORT_METHOD(handleClearJSResponder)
     }];
 }
 
+RCT_EXPORT_METHOD(flushOperations)
+{
+    if (_operations.count == 0) {
+        return;
+    }
+
+    NSArray<GestureHandlerOperation> *operations = _operations;
+    _operations = [NSMutableArray new];
+
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        for (GestureHandlerOperation operation in operations) {
+            operation(self->_manager);
+        }
+    }];
+}
+
 - (void)setGestureState:(int)state forHandler:(int)handlerTag
 {
   RNGestureHandler *handler = [_manager handlerWithTag:@(handlerTag)];

package/ios/RNGestureHandlerPointerTracker.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 
-#import "RNTouchEventType.h"
+#import "RNGHTouchEventType.h"
 
 #define MAX_POINTERS_COUNT 12
 
@@ -8,7 +8,7 @@
 
 @interface RNGestureHandlerPointerTracker : NSObject
 
-@property (nonatomic) RNTouchEventType eventType;
+@property (nonatomic) RNGHTouchEventType eventType;
 @property (nonatomic) NSArray<NSDictionary *> *changedPointersData;
 @property (nonatomic) NSArray<NSDictionary *> *allPointersData;
 @property (nonatomic) int trackedPointersCount;

package/ios/RNGestureHandlerPointerTracker.m

@@ -103,7 +103,7 @@
     return;
   }
   
-  _eventType = RNTouchEventTypePointerDown;
+  _eventType = RNGHTouchEventTypePointerDown;
   
   NSDictionary *data[touches.count];
   
@@ -129,7 +129,7 @@
     return;
   }
   
-  _eventType = RNTouchEventTypePointerMove;
+  _eventType = RNGHTouchEventTypePointerMove;
   
   NSDictionary *data[touches.count];
   
@@ -153,7 +153,7 @@
   // extract all touches first to include the ones that were just lifted
   [self extractAllTouches];
   
-  _eventType = RNTouchEventTypePointerUp;
+  _eventType = RNGHTouchEventTypePointerUp;
   
   NSDictionary *data[touches.count];
   
@@ -188,7 +188,7 @@
   
   if (_trackedPointersCount == 0) {
     // gesture has finished because all pointers were lifted, reset event type to send state change event
-    _eventType = RNTouchEventTypeUndetermined;
+    _eventType = RNGHTouchEventTypeUndetermined;
   } else {
     // turns out that the gesture may be made to fail without calling touchesCancelled in that case there
     // are still tracked pointers but the recognizer state is already set to UIGestureRecognizerStateFailed
@@ -218,7 +218,7 @@
       }
     }
     
-    _eventType = RNTouchEventTypeCancelled;
+    _eventType = RNGHTouchEventTypeCancelled;
     _changedPointersData = [[NSArray alloc] initWithObjects:data count:registeredTouches];
     [self sendEvent];
     _trackedPointersCount = 0;
@@ -227,7 +227,10 @@
 
 - (void)sendEvent
 {
-  if (!_gestureHandler.needsPointerData) {
+  // 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 (!_gestureHandler.needsPointerData || _gestureHandler.recognizer.view.reactTag == nil) {
     return;
   }
   

package/ios/RNGestureHandlerRegistry.h

@@ -14,5 +14,6 @@
 - (void)registerGestureHandler:(nonnull RNGestureHandler *)gestureHandler;
 - (void)attachHandlerWithTag:(nonnull NSNumber *)handlerTag toView:(nonnull UIView *)view withActionType:(RNGestureHandlerActionType)actionType;
 - (void)dropHandlerWithTag:(nonnull NSNumber *)handlerTag;
+- (void)dropAllHandlers;
 
 @end

package/ios/RNGestureHandlerRegistry.m

@@ -48,4 +48,14 @@
     [_handlers removeObjectForKey:handlerTag];
 }
 
+- (void)dropAllHandlers
+{
+    for (NSNumber* tag in _handlers) {
+        RNGestureHandler *handler = _handlers[tag];
+        [handler unbindFromView];
+    }
+    
+    [_handlers removeAllObjects];
+}
+
 @end

package/lib/commonjs/GestureHandlerRootView.android.js

@@ -9,6 +9,8 @@ var React = _interopRequireWildcard(require("react"));
 
 var _reactNative = require("react-native");
 
+var _init = require("./init");
+
 var _utils = require("./utils");
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -16,9 +18,13 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 /* eslint-disable @typescript-eslint/no-var-requires */
-const GestureHandlerRootViewNativeComponent = (0, _utils.isFabric)() ? require('./fabric/RNGestureHandlerRootViewNativeComponent').default : (0, _reactNative.requireNativeComponent)('RNGestureHandlerRootView');
+const GestureHandlerRootViewNativeComponent = (0, _utils.shouldUseCodegenNativeComponent)() ? require('./fabric/RNGestureHandlerRootViewNativeComponent').default : (0, _reactNative.requireNativeComponent)('RNGestureHandlerRootView');
 
 function GestureHandlerRootView(props) {
+  // try initialize fabric on the first render, at this point we can
+  // reliably check if fabric is enabled (the function contains a flag
+  // to make sure it's called only once)
+  (0, _init.maybeInitializeFabric)();
   return /*#__PURE__*/React.createElement(GestureHandlerRootViewNativeComponent, props);
 }
 //# sourceMappingURL=GestureHandlerRootView.android.js.map

package/lib/commonjs/GestureHandlerRootView.android.js.map

@@ -1 +1 @@
-{"version":3,"sources":["GestureHandlerRootView.android.tsx"],"names":["GestureHandlerRootViewNativeComponent","require","default","GestureHandlerRootView","props"],"mappings":";;;;;;;AACA;;AAEA;;AACA;;;;;;AAJA;AAMA,MAAMA,qCAAqC,GAAG,yBAC1CC,OAAO,CAAC,kDAAD,CAAP,CAA4DC,OADlB,GAE1C,yCAAuB,0BAAvB,CAFJ;;AAOe,SAASC,sBAAT,CACbC,KADa,EAEb;AACA,sBAAO,oBAAC,qCAAD,EAA2CA,KAA3C,CAAP;AACD","sourcesContent":["/* eslint-disable @typescript-eslint/no-var-requires */\nimport * as React from 'react';\nimport { PropsWithChildren } from 'react';\nimport { requireNativeComponent, ViewProps } from 'react-native';\nimport { isFabric } from './utils';\n\nconst GestureHandlerRootViewNativeComponent = isFabric()\n  ? require('./fabric/RNGestureHandlerRootViewNativeComponent').default\n  : requireNativeComponent('RNGestureHandlerRootView');\n\nexport interface GestureHandlerRootViewProps\n  extends PropsWithChildren<ViewProps> {}\n\nexport default function GestureHandlerRootView(\n  props: GestureHandlerRootViewProps\n) {\n  return <GestureHandlerRootViewNativeComponent {...props} />;\n}\n"]}
+{"version":3,"sources":["GestureHandlerRootView.android.tsx"],"names":["GestureHandlerRootViewNativeComponent","require","default","GestureHandlerRootView","props"],"mappings":";;;;;;;AACA;;AAEA;;AACA;;AACA;;;;;;AALA;AAOA,MAAMA,qCAAqC,GAAG,gDAC1CC,OAAO,CAAC,kDAAD,CAAP,CAA4DC,OADlB,GAE1C,yCAAuB,0BAAvB,CAFJ;;AAOe,SAASC,sBAAT,CACbC,KADa,EAEb;AACA;AACA;AACA;AACA;AAEA,sBAAO,oBAAC,qCAAD,EAA2CA,KAA3C,CAAP;AACD","sourcesContent":["/* eslint-disable @typescript-eslint/no-var-requires */\nimport * as React from 'react';\nimport { PropsWithChildren } from 'react';\nimport { requireNativeComponent, ViewProps } from 'react-native';\nimport { maybeInitializeFabric } from './init';\nimport { shouldUseCodegenNativeComponent } from './utils';\n\nconst GestureHandlerRootViewNativeComponent = shouldUseCodegenNativeComponent()\n  ? require('./fabric/RNGestureHandlerRootViewNativeComponent').default\n  : requireNativeComponent('RNGestureHandlerRootView');\n\nexport interface GestureHandlerRootViewProps\n  extends PropsWithChildren<ViewProps> {}\n\nexport default function GestureHandlerRootView(\n  props: GestureHandlerRootViewProps\n) {\n  // try initialize fabric on the first render, at this point we can\n  // reliably check if fabric is enabled (the function contains a flag\n  // to make sure it's called only once)\n  maybeInitializeFabric();\n\n  return <GestureHandlerRootViewNativeComponent {...props} />;\n}\n"]}

package/lib/commonjs/GestureHandlerRootView.js

@@ -9,11 +9,17 @@ var React = _interopRequireWildcard(require("react"));
 
 var _reactNative = require("react-native");
 
+var _init = require("./init");
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function GestureHandlerRootView(props) {
+  // try initialize fabric on the first render, at this point we can
+  // reliably check if fabric is enabled (the function contains a flag
+  // to make sure it's called only once)
+  (0, _init.maybeInitializeFabric)();
   return /*#__PURE__*/React.createElement(_reactNative.View, props);
 }
 //# sourceMappingURL=GestureHandlerRootView.js.map

package/lib/commonjs/GestureHandlerRootView.js.map

@@ -1 +1 @@
-{"version":3,"sources":["GestureHandlerRootView.tsx"],"names":["GestureHandlerRootView","props"],"mappings":";;;;;;;AAAA;;AAEA;;;;;;AAKe,SAASA,sBAAT,CACbC,KADa,EAEb;AACA,sBAAO,oBAAC,iBAAD,EAAUA,KAAV,CAAP;AACD","sourcesContent":["import * as React from 'react';\nimport { PropsWithChildren } from 'react';\nimport { View, ViewProps } from 'react-native';\n\nexport interface GestureHandlerRootViewProps\n  extends PropsWithChildren<ViewProps> {}\n\nexport default function GestureHandlerRootView(\n  props: GestureHandlerRootViewProps\n) {\n  return <View {...props} />;\n}\n"]}
+{"version":3,"sources":["GestureHandlerRootView.tsx"],"names":["GestureHandlerRootView","props"],"mappings":";;;;;;;AAAA;;AAEA;;AACA;;;;;;AAKe,SAASA,sBAAT,CACbC,KADa,EAEb;AACA;AACA;AACA;AACA;AAEA,sBAAO,oBAAC,iBAAD,EAAUA,KAAV,CAAP;AACD","sourcesContent":["import * as React from 'react';\nimport { PropsWithChildren } from 'react';\nimport { View, ViewProps } from 'react-native';\nimport { maybeInitializeFabric } from './init';\n\nexport interface GestureHandlerRootViewProps\n  extends PropsWithChildren<ViewProps> {}\n\nexport default function GestureHandlerRootView(\n  props: GestureHandlerRootViewProps\n) {\n  // try initialize fabric on the first render, at this point we can\n  // reliably check if fabric is enabled (the function contains a flag\n  // to make sure it's called only once)\n  maybeInitializeFabric();\n\n  return <View {...props} />;\n}\n"]}

package/lib/commonjs/GestureHandlerRootView.web.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = GestureHandlerRootView;
+
+var React = _interopRequireWildcard(require("react"));
+
+var _reactNative = require("react-native");
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function GestureHandlerRootView(props) {
+  return /*#__PURE__*/React.createElement(_reactNative.View, props);
+}
+//# sourceMappingURL=GestureHandlerRootView.web.js.map

package/lib/commonjs/GestureHandlerRootView.web.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["GestureHandlerRootView.web.tsx"],"names":["GestureHandlerRootView","props"],"mappings":";;;;;;;AAAA;;AAEA;;;;;;AAKe,SAASA,sBAAT,CACbC,KADa,EAEb;AACA,sBAAO,oBAAC,iBAAD,EAAUA,KAAV,CAAP;AACD","sourcesContent":["import * as React from 'react';\nimport { PropsWithChildren } from 'react';\nimport { View, ViewProps } from 'react-native';\n\nexport interface GestureHandlerRootViewProps\n  extends PropsWithChildren<ViewProps> {}\n\nexport default function GestureHandlerRootView(\n  props: GestureHandlerRootViewProps\n) {\n  return <View {...props} />;\n}\n"]}

package/lib/commonjs/RNGestureHandlerModule.js

@@ -19,6 +19,11 @@ if (RNGestureHandlerModule == null) {
       For installation instructions, please refer to https://docs.swmansion.com/react-native-gesture-handler/docs/#installation`.split('\n').map(line => line.trim()).join('\n')));
 }
 
+if (RNGestureHandlerModule.flushOperations === undefined) {
+  RNGestureHandlerModule.flushOperations = () => {// NO-OP if not defined
+  };
+}
+
 var _default = RNGestureHandlerModule;
 exports.default = _default;
 //# sourceMappingURL=RNGestureHandlerModule.js.map

package/lib/commonjs/RNGestureHandlerModule.js.map

@@ -1 +1 @@
-{"version":3,"sources":["RNGestureHandlerModule.ts"],"names":["RNGestureHandlerModule","NativeModules","console","error","split","map","line","trim","join"],"mappings":";;;;;;;AAAA;;AAEA;;AACA,MAAM;AAAEA,EAAAA;AAAF,IAA6BC,0BAAnC;;AAEA,IAAID,sBAAsB,IAAI,IAA9B,EAAoC;AAClCE,EAAAA,OAAO,CAACC,KAAR,CACE,uBACG;AACP;AACA,gIAFM,CAGGC,KAHH,CAGS,IAHT,EAIGC,GAJH,CAIQC,IAAD,IAAUA,IAAI,CAACC,IAAL,EAJjB,EAKGC,IALH,CAKQ,IALR,CADF,CADF;AAUD;;eAuBcR,sB","sourcesContent":["import { NativeModules } from 'react-native';\nimport { ActionType } from './ActionType';\nimport { tagMessage } from './utils';\nconst { RNGestureHandlerModule } = NativeModules;\n\nif (RNGestureHandlerModule == null) {\n  console.error(\n    tagMessage(\n      `react-native-gesture-handler module was not found. Make sure you're running your app on the native platform and your code is linked properly (cd ios && pod install && cd ..).\n\n      For installation instructions, please refer to https://docs.swmansion.com/react-native-gesture-handler/docs/#installation`\n        .split('\\n')\n        .map((line) => line.trim())\n        .join('\\n')\n    )\n  );\n}\n\nexport type RNGestureHandlerModuleProps = {\n  handleSetJSResponder: (tag: number, blockNativeResponder: boolean) => void;\n  handleClearJSResponder: () => void;\n  createGestureHandler: (\n    handlerName: string,\n    handlerTag: number,\n    config: Readonly<Record<string, unknown>>\n  ) => void;\n  attachGestureHandler: (\n    handlerTag: number,\n    newView: number,\n    actionType: ActionType\n  ) => void;\n  updateGestureHandler: (\n    handlerTag: number,\n    newConfig: Readonly<Record<string, unknown>>\n  ) => void;\n  dropGestureHandler: (handlerTag: number) => void;\n  install: () => void;\n};\n\nexport default RNGestureHandlerModule as RNGestureHandlerModuleProps;\n"]}
+{"version":3,"sources":["RNGestureHandlerModule.ts"],"names":["RNGestureHandlerModule","NativeModules","console","error","split","map","line","trim","join","flushOperations","undefined"],"mappings":";;;;;;;AAAA;;AAEA;;AACA,MAAM;AAAEA,EAAAA;AAAF,IAA6BC,0BAAnC;;AAEA,IAAID,sBAAsB,IAAI,IAA9B,EAAoC;AAClCE,EAAAA,OAAO,CAACC,KAAR,CACE,uBACG;AACP;AACA,gIAFM,CAGGC,KAHH,CAGS,IAHT,EAIGC,GAJH,CAIQC,IAAD,IAAUA,IAAI,CAACC,IAAL,EAJjB,EAKGC,IALH,CAKQ,IALR,CADF,CADF;AAUD;;AAED,IAAIR,sBAAsB,CAACS,eAAvB,KAA2CC,SAA/C,EAA0D;AACxDV,EAAAA,sBAAsB,CAACS,eAAvB,GAAyC,MAAM,CAC7C;AACD,GAFD;AAGD;;eAwBcT,sB","sourcesContent":["import { NativeModules } from 'react-native';\nimport { ActionType } from './ActionType';\nimport { tagMessage } from './utils';\nconst { RNGestureHandlerModule } = NativeModules;\n\nif (RNGestureHandlerModule == null) {\n  console.error(\n    tagMessage(\n      `react-native-gesture-handler module was not found. Make sure you're running your app on the native platform and your code is linked properly (cd ios && pod install && cd ..).\n\n      For installation instructions, please refer to https://docs.swmansion.com/react-native-gesture-handler/docs/#installation`\n        .split('\\n')\n        .map((line) => line.trim())\n        .join('\\n')\n    )\n  );\n}\n\nif (RNGestureHandlerModule.flushOperations === undefined) {\n  RNGestureHandlerModule.flushOperations = () => {\n    // NO-OP if not defined\n  };\n}\n\nexport type RNGestureHandlerModuleProps = {\n  handleSetJSResponder: (tag: number, blockNativeResponder: boolean) => void;\n  handleClearJSResponder: () => void;\n  createGestureHandler: (\n    handlerName: string,\n    handlerTag: number,\n    config: Readonly<Record<string, unknown>>\n  ) => void;\n  attachGestureHandler: (\n    handlerTag: number,\n    newView: number,\n    actionType: ActionType\n  ) => void;\n  updateGestureHandler: (\n    handlerTag: number,\n    newConfig: Readonly<Record<string, unknown>>\n  ) => void;\n  dropGestureHandler: (handlerTag: number) => void;\n  install: () => void;\n  flushOperations: () => void;\n};\n\nexport default RNGestureHandlerModule as RNGestureHandlerModuleProps;\n"]}

package/lib/commonjs/RNGestureHandlerModule.web.js

@@ -73,7 +73,10 @@ var _default = {
 
   dropGestureHandler(handlerTag) {
     NodeManager.dropGestureHandler(handlerTag);
-  }
+  },
+
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  flushOperations() {}
 
 };
 exports.default = _default;

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

@@ -1 +1 @@
-{"version":3,"sources":["RNGestureHandlerModule.web.ts"],"names":["Gestures","PanGestureHandler","RotationGestureHandler","PinchGestureHandler","TapGestureHandler","NativeViewGestureHandler","LongPressGestureHandler","FlingGestureHandler","Direction","handleSetJSResponder","tag","blockNativeResponder","console","warn","handleClearJSResponder","createGestureHandler","handlerName","handlerTag","config","Error","GestureClass","NodeManager","updateGestureHandler","attachGestureHandler","newView","_actionType","propsRef","getHandler","setView","newConfig","updateGestureConfig","getGestureHandlerNode","dropGestureHandler"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;AAEO,MAAMA,QAAQ,GAAG;AACtBC,EAAAA,iBAAiB,EAAjBA,0BADsB;AAEtBC,EAAAA,sBAAsB,EAAtBA,+BAFsB;AAGtBC,EAAAA,mBAAmB,EAAnBA,4BAHsB;AAItBC,EAAAA,iBAAiB,EAAjBA,0BAJsB;AAKtBC,EAAAA,wBAAwB,EAAxBA,iCALsB;AAMtBC,EAAAA,uBAAuB,EAAvBA,gCANsB;AAOtBC,EAAAA,mBAAmB,EAAnBA,4BAPsB,CAQtB;;AARsB,CAAjB;;eAWQ;AACbC,EAAAA,SAAS,EAATA,oBADa;;AAEbC,EAAAA,oBAAoB,CAACC,GAAD,EAAcC,oBAAd,EAA6C;AAC/DC,IAAAA,OAAO,CAACC,IAAR,CAAa,wBAAb,EAAuCH,GAAvC,EAA4CC,oBAA5C;AACD,GAJY;;AAKbG,EAAAA,sBAAsB,GAAG;AACvBF,IAAAA,OAAO,CAACC,IAAR,CAAa,0BAAb;AACD,GAPY;;AAQbE,EAAAA,oBAAoB,CAClBC,WADkB,EAElBC,UAFkB,EAGlBC,MAHkB,EAIlB;AACA;AACA,QAAI,EAAEF,WAAW,IAAIhB,QAAjB,CAAJ,EACE,MAAM,IAAImB,KAAJ,CACH,iCAAgCH,WAAY,2BADzC,CAAN;AAGF,UAAMI,YAAY,GAAGpB,QAAQ,CAACgB,WAAD,CAA7B;AACAK,IAAAA,WAAW,CAACN,oBAAZ,CAAiCE,UAAjC,EAA6C,IAAIG,YAAJ,EAA7C;AACA,SAAKE,oBAAL,CAA0BL,UAA1B,EAAsCC,MAAtC;AACD,GArBY;;AAsBbK,EAAAA,oBAAoB,CAClBN,UADkB,EAElBO,OAFkB,EAGlBC,WAHkB,EAIlBC,QAJkB,EAKlB;AACAL,IAAAA,WAAW,CAACM,UAAZ,CAAuBV,UAAvB,EAAmCW,OAAnC,CAA2CJ,OAA3C,EAAoDE,QAApD;AACD,GA7BY;;AA8BbJ,EAAAA,oBAAoB,CAACL,UAAD,EAAqBY,SAArB,EAAqC;AACvDR,IAAAA,WAAW,CAACM,UAAZ,CAAuBV,UAAvB,EAAmCa,mBAAnC,CAAuDD,SAAvD;AACD,GAhCY;;AAiCbE,EAAAA,qBAAqB,CAACd,UAAD,EAAqB;AACxC,WAAOI,WAAW,CAACM,UAAZ,CAAuBV,UAAvB,CAAP;AACD,GAnCY;;AAoCbe,EAAAA,kBAAkB,CAACf,UAAD,EAAqB;AACrCI,IAAAA,WAAW,CAACW,kBAAZ,CAA+Bf,UAA/B;AACD;;AAtCY,C","sourcesContent":["import { ActionType } from './ActionType';\nimport { Direction } from './web/constants';\nimport FlingGestureHandler from './web/FlingGestureHandler';\nimport LongPressGestureHandler from './web/LongPressGestureHandler';\nimport NativeViewGestureHandler from './web/NativeViewGestureHandler';\nimport * as NodeManager from './web/NodeManager';\nimport PanGestureHandler from './web/PanGestureHandler';\nimport PinchGestureHandler from './web/PinchGestureHandler';\nimport RotationGestureHandler from './web/RotationGestureHandler';\nimport TapGestureHandler from './web/TapGestureHandler';\n\nexport const Gestures = {\n  PanGestureHandler,\n  RotationGestureHandler,\n  PinchGestureHandler,\n  TapGestureHandler,\n  NativeViewGestureHandler,\n  LongPressGestureHandler,\n  FlingGestureHandler,\n  // ForceTouchGestureHandler,\n};\n\nexport default {\n  Direction,\n  handleSetJSResponder(tag: number, blockNativeResponder: boolean) {\n    console.warn('handleSetJSResponder: ', tag, blockNativeResponder);\n  },\n  handleClearJSResponder() {\n    console.warn('handleClearJSResponder: ');\n  },\n  createGestureHandler<T>(\n    handlerName: keyof typeof Gestures,\n    handlerTag: number,\n    config: T\n  ) {\n    //TODO(TS) extends config\n    if (!(handlerName in Gestures))\n      throw new Error(\n        `react-native-gesture-handler: ${handlerName} is not supported on web.`\n      );\n    const GestureClass = Gestures[handlerName];\n    NodeManager.createGestureHandler(handlerTag, new GestureClass());\n    this.updateGestureHandler(handlerTag, config);\n  },\n  attachGestureHandler(\n    handlerTag: number,\n    newView: number,\n    _actionType: ActionType,\n    propsRef: React.RefObject<unknown>\n  ) {\n    NodeManager.getHandler(handlerTag).setView(newView, propsRef);\n  },\n  updateGestureHandler(handlerTag: number, newConfig: any) {\n    NodeManager.getHandler(handlerTag).updateGestureConfig(newConfig);\n  },\n  getGestureHandlerNode(handlerTag: number) {\n    return NodeManager.getHandler(handlerTag);\n  },\n  dropGestureHandler(handlerTag: number) {\n    NodeManager.dropGestureHandler(handlerTag);\n  },\n};\n"]}
+{"version":3,"sources":["RNGestureHandlerModule.web.ts"],"names":["Gestures","PanGestureHandler","RotationGestureHandler","PinchGestureHandler","TapGestureHandler","NativeViewGestureHandler","LongPressGestureHandler","FlingGestureHandler","Direction","handleSetJSResponder","tag","blockNativeResponder","console","warn","handleClearJSResponder","createGestureHandler","handlerName","handlerTag","config","Error","GestureClass","NodeManager","updateGestureHandler","attachGestureHandler","newView","_actionType","propsRef","getHandler","setView","newConfig","updateGestureConfig","getGestureHandlerNode","dropGestureHandler","flushOperations"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;AAEO,MAAMA,QAAQ,GAAG;AACtBC,EAAAA,iBAAiB,EAAjBA,0BADsB;AAEtBC,EAAAA,sBAAsB,EAAtBA,+BAFsB;AAGtBC,EAAAA,mBAAmB,EAAnBA,4BAHsB;AAItBC,EAAAA,iBAAiB,EAAjBA,0BAJsB;AAKtBC,EAAAA,wBAAwB,EAAxBA,iCALsB;AAMtBC,EAAAA,uBAAuB,EAAvBA,gCANsB;AAOtBC,EAAAA,mBAAmB,EAAnBA,4BAPsB,CAQtB;;AARsB,CAAjB;;eAWQ;AACbC,EAAAA,SAAS,EAATA,oBADa;;AAEbC,EAAAA,oBAAoB,CAACC,GAAD,EAAcC,oBAAd,EAA6C;AAC/DC,IAAAA,OAAO,CAACC,IAAR,CAAa,wBAAb,EAAuCH,GAAvC,EAA4CC,oBAA5C;AACD,GAJY;;AAKbG,EAAAA,sBAAsB,GAAG;AACvBF,IAAAA,OAAO,CAACC,IAAR,CAAa,0BAAb;AACD,GAPY;;AAQbE,EAAAA,oBAAoB,CAClBC,WADkB,EAElBC,UAFkB,EAGlBC,MAHkB,EAIlB;AACA;AACA,QAAI,EAAEF,WAAW,IAAIhB,QAAjB,CAAJ,EACE,MAAM,IAAImB,KAAJ,CACH,iCAAgCH,WAAY,2BADzC,CAAN;AAGF,UAAMI,YAAY,GAAGpB,QAAQ,CAACgB,WAAD,CAA7B;AACAK,IAAAA,WAAW,CAACN,oBAAZ,CAAiCE,UAAjC,EAA6C,IAAIG,YAAJ,EAA7C;AACA,SAAKE,oBAAL,CAA0BL,UAA1B,EAAsCC,MAAtC;AACD,GArBY;;AAsBbK,EAAAA,oBAAoB,CAClBN,UADkB,EAElBO,OAFkB,EAGlBC,WAHkB,EAIlBC,QAJkB,EAKlB;AACAL,IAAAA,WAAW,CAACM,UAAZ,CAAuBV,UAAvB,EAAmCW,OAAnC,CAA2CJ,OAA3C,EAAoDE,QAApD;AACD,GA7BY;;AA8BbJ,EAAAA,oBAAoB,CAACL,UAAD,EAAqBY,SAArB,EAAqC;AACvDR,IAAAA,WAAW,CAACM,UAAZ,CAAuBV,UAAvB,EAAmCa,mBAAnC,CAAuDD,SAAvD;AACD,GAhCY;;AAiCbE,EAAAA,qBAAqB,CAACd,UAAD,EAAqB;AACxC,WAAOI,WAAW,CAACM,UAAZ,CAAuBV,UAAvB,CAAP;AACD,GAnCY;;AAoCbe,EAAAA,kBAAkB,CAACf,UAAD,EAAqB;AACrCI,IAAAA,WAAW,CAACW,kBAAZ,CAA+Bf,UAA/B;AACD,GAtCY;;AAuCb;AACAgB,EAAAA,eAAe,GAAG,CAAE;;AAxCP,C","sourcesContent":["import { ActionType } from './ActionType';\nimport { Direction } from './web/constants';\nimport FlingGestureHandler from './web/FlingGestureHandler';\nimport LongPressGestureHandler from './web/LongPressGestureHandler';\nimport NativeViewGestureHandler from './web/NativeViewGestureHandler';\nimport * as NodeManager from './web/NodeManager';\nimport PanGestureHandler from './web/PanGestureHandler';\nimport PinchGestureHandler from './web/PinchGestureHandler';\nimport RotationGestureHandler from './web/RotationGestureHandler';\nimport TapGestureHandler from './web/TapGestureHandler';\n\nexport const Gestures = {\n  PanGestureHandler,\n  RotationGestureHandler,\n  PinchGestureHandler,\n  TapGestureHandler,\n  NativeViewGestureHandler,\n  LongPressGestureHandler,\n  FlingGestureHandler,\n  // ForceTouchGestureHandler,\n};\n\nexport default {\n  Direction,\n  handleSetJSResponder(tag: number, blockNativeResponder: boolean) {\n    console.warn('handleSetJSResponder: ', tag, blockNativeResponder);\n  },\n  handleClearJSResponder() {\n    console.warn('handleClearJSResponder: ');\n  },\n  createGestureHandler<T>(\n    handlerName: keyof typeof Gestures,\n    handlerTag: number,\n    config: T\n  ) {\n    //TODO(TS) extends config\n    if (!(handlerName in Gestures))\n      throw new Error(\n        `react-native-gesture-handler: ${handlerName} is not supported on web.`\n      );\n    const GestureClass = Gestures[handlerName];\n    NodeManager.createGestureHandler(handlerTag, new GestureClass());\n    this.updateGestureHandler(handlerTag, config);\n  },\n  attachGestureHandler(\n    handlerTag: number,\n    newView: number,\n    _actionType: ActionType,\n    propsRef: React.RefObject<unknown>\n  ) {\n    NodeManager.getHandler(handlerTag).setView(newView, propsRef);\n  },\n  updateGestureHandler(handlerTag: number, newConfig: any) {\n    NodeManager.getHandler(handlerTag).updateGestureConfig(newConfig);\n  },\n  getGestureHandlerNode(handlerTag: number) {\n    return NodeManager.getHandler(handlerTag);\n  },\n  dropGestureHandler(handlerTag: number) {\n    NodeManager.dropGestureHandler(handlerTag);\n  },\n  // eslint-disable-next-line @typescript-eslint/no-empty-function\n  flushOperations() {},\n};\n"]}

package/lib/commonjs/{EventType.js → TouchEventType.js}

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EventType = void 0;
-const EventType = {
+exports.TouchEventType = void 0;
+const TouchEventType = {
   UNDETERMINED: 0,
   TOUCHES_DOWN: 1,
   TOUCHES_MOVE: 2,
@@ -12,5 +12,5 @@ const EventType = {
   TOUCHES_CANCELLED: 4
 }; // eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value
 
-exports.EventType = EventType;
-//# sourceMappingURL=EventType.js.map
+exports.TouchEventType = TouchEventType;
+//# sourceMappingURL=TouchEventType.js.map

package/lib/commonjs/TouchEventType.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["TouchEventType.ts"],"names":["TouchEventType","UNDETERMINED","TOUCHES_DOWN","TOUCHES_MOVE","TOUCHES_UP","TOUCHES_CANCELLED"],"mappings":";;;;;;AAAO,MAAMA,cAAc,GAAG;AAC5BC,EAAAA,YAAY,EAAE,CADc;AAE5BC,EAAAA,YAAY,EAAE,CAFc;AAG5BC,EAAAA,YAAY,EAAE,CAHc;AAI5BC,EAAAA,UAAU,EAAE,CAJgB;AAK5BC,EAAAA,iBAAiB,EAAE;AALS,CAAvB,C,CAQP","sourcesContent":["export const TouchEventType = {\n  UNDETERMINED: 0,\n  TOUCHES_DOWN: 1,\n  TOUCHES_MOVE: 2,\n  TOUCHES_UP: 3,\n  TOUCHES_CANCELLED: 4,\n} as const;\n\n// eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value\nexport type TouchEventType = typeof TouchEventType[keyof typeof TouchEventType];\n"]}

package/lib/commonjs/components/DrawerLayout.js

@@ -165,6 +165,9 @@ class DrawerLayout extends React.Component {
         });
       } else if (nativeEvent.state === _State.State.ACTIVE) {
         this.emitStateChanged(DRAGGING, false);
+        this.setState({
+          drawerState: DRAGGING
+        });
 
         if (this.props.keyboardDismissMode === 'on-drag') {
           _reactNative.Keyboard.dismiss();
@@ -289,6 +292,9 @@ class DrawerLayout extends React.Component {
       const willShow = toValue !== 0;
       this.updateShowing(willShow);
       this.emitStateChanged(SETTLING, willShow);
+      this.setState({
+        drawerState: SETTLING
+      });
 
       if (this.props.hideStatusBar) {
         _reactNative.StatusBar.setHidden(willShow, this.props.statusBarAnimation || 'slide');
@@ -305,6 +311,17 @@ class DrawerLayout extends React.Component {
       }) => {
         if (finished) {
           this.emitStateChanged(IDLE, willShow);
+          this.setState({
+            drawerOpened: willShow
+          });
+
+          if (this.state.drawerState !== DRAGGING) {
+            // it's possilbe that user started drag while the drawer
+            // was settling, don't override state in this case
+            this.setState({
+              drawerState: IDLE
+            });
+          }
 
           if (willShow) {
             var _this$props$onDrawerO, _this$props3;
@@ -338,11 +355,14 @@ class DrawerLayout extends React.Component {
     _defineProperty(this, "renderOverlay", () => {
       /* Overlay styles */
       (0, _invariant.default)(this.openValue, 'should be set');
-      const overlayOpacity = this.openValue.interpolate({
-        inputRange: [0, 1],
-        outputRange: [0, 1],
-        extrapolate: 'clamp'
-      });
+      let overlayOpacity;
+
+      if (this.state.drawerState !== IDLE) {
+        overlayOpacity = this.openValue;
+      } else {
+        overlayOpacity = this.state.drawerOpened ? 1 : 0;
+      }
+
       const dynamicOverlayStyles = {
         opacity: overlayOpacity,
         backgroundColor: this.props.overlayColor
@@ -398,11 +418,16 @@ class DrawerLayout extends React.Component {
 
       if (drawerSlide) {
         const closedDrawerOffset = fromLeft ? -drawerWidth : drawerWidth;
-        drawerTranslateX = openValue.interpolate({
-          inputRange: [0, 1],
-          outputRange: [closedDrawerOffset, 0],
-          extrapolate: 'clamp'
-        });
+
+        if (this.state.drawerState !== IDLE) {
+          drawerTranslateX = openValue.interpolate({
+            inputRange: [0, 1],
+            outputRange: [closedDrawerOffset, 0],
+            extrapolate: 'clamp'
+          });
+        } else {
+          drawerTranslateX = this.state.drawerOpened ? 0 : closedDrawerOffset;
+        }
       }
 
       const drawerStyles = {
@@ -446,7 +471,9 @@ class DrawerLayout extends React.Component {
       dragX: _dragX,
       touchX: _touchX,
       drawerTranslation: _drawerTranslation,
-      containerWidth: 0
+      containerWidth: 0,
+      drawerState: IDLE,
+      drawerOpened: false
     };
     this.updateAnimatedEvent(_props, this.state);
   }