react-native-gesture-handler 2.24.0 → 2.25.0

package/src/handlers/createHandler.tsx

@@ -77,12 +77,8 @@ UIManagerAny.genericDirectEventTypes = {
   ...UIManagerAny.genericDirectEventTypes,
   ...customGHEventsConfig,
 };
-// In newer versions of RN the `genericDirectEventTypes` is located in the object
-// returned by UIManager.getViewManagerConfig('getConstants') or in older RN UIManager.getConstants(), we need to add it there as well to make
-// it compatible with RN 61+
-const UIManagerConstants =
-  UIManagerAny.getViewManagerConfig?.('getConstants') ??
-  UIManagerAny.getConstants?.();
+
+const UIManagerConstants = UIManagerAny.getViewManagerConfig?.('getConstants');
 
 if (UIManagerConstants) {
   UIManagerConstants.genericDirectEventTypes = {
@@ -190,7 +186,7 @@ export default function createHandler<
     static displayName = name;
     static contextType = GestureHandlerRootViewContext;
 
-    private handlerTag: number;
+    private handlerTag = -1;
     private config: Record<string, unknown>;
     private propsRef: React.MutableRefObject<unknown>;
     private isMountedRef: React.MutableRefObject<boolean | null>;
@@ -200,7 +196,6 @@ export default function createHandler<
 
     constructor(props: T & InternalEventHandlers) {
       super(props);
-      this.handlerTag = getNextHandlerTag();
       this.config = {};
       this.propsRef = React.createRef();
       this.isMountedRef = React.createRef();
@@ -333,6 +328,7 @@ export default function createHandler<
     private createGestureHandler = (
       newConfig: Readonly<Record<string, unknown>>
     ) => {
+      this.handlerTag = getNextHandlerTag();
       this.config = newConfig;
 
       RNGestureHandlerModule.createGestureHandler(

package/src/handlers/gestures/GestureDetector/updateHandlers.ts

@@ -30,6 +30,9 @@ export function updateHandlers(
     }
   }
 
+  // Store attached gestures to avoid crash when gestures changed after queueing micro task
+  const attachedGestures = preparedGesture.attachedGestures;
+
   // Use queueMicrotask to extract handlerTags, because when it's ran, all refs should be updated
   // and handlerTags in BaseGesture references should be updated in the loop above (we need to wait
   // in case of external relations)
@@ -38,12 +41,17 @@ export function updateHandlers(
       return;
     }
 
+    // Stop if attached gestures changed after queueing micro task
+    if (attachedGestures !== preparedGesture.attachedGestures) {
+      return;
+    }
+
     // If amount of gesture configs changes, we need to update the callbacks in shared value
     let shouldUpdateSharedValueIfUsed =
-      preparedGesture.attachedGestures.length !== newGestures.length;
+      attachedGestures.length !== newGestures.length;
 
     for (let i = 0; i < newGestures.length; i++) {
-      const handler = preparedGesture.attachedGestures[i];
+      const handler = attachedGestures[i];
 
       // If the gestureId is different (gesture isn't wrapped with useMemo or its dependencies changed),
       // we need to update the shared value, assuming the gesture runs on UI thread or the thread changed
@@ -70,7 +78,7 @@ export function updateHandlers(
     }
 
     if (preparedGesture.animatedHandlers && shouldUpdateSharedValueIfUsed) {
-      const newHandlersValue = preparedGesture.attachedGestures
+      const newHandlersValue = attachedGestures
         .filter((g) => g.shouldUseReanimated) // Ignore gestures that shouldn't run on UI
         .map((g) => g.handlers) as unknown as HandlerCallbacks<
         Record<string, unknown>

package/src/handlers/gestures/GestureDetector/utils.ts

@@ -18,7 +18,6 @@ import {
   baseGestureHandlerWithDetectorProps,
 } from '../../gestureHandlerCommon';
 import { isNewWebImplementationEnabled } from '../../../EnableNewWebImplementation';
-import { getReactNativeVersion } from '../../../getReactNativeVersion';
 import { RNRenderer } from '../../../RNRenderer';
 import { useCallback, useRef, useState } from 'react';
 import { Reanimated } from '../reanimatedWrapper';
@@ -133,14 +132,11 @@ export function validateDetectorChildren(ref: any) {
   //         /       \
   //   NativeView  NativeView
   if (__DEV__ && Platform.OS !== 'web') {
-    const REACT_NATIVE_VERSION = getReactNativeVersion();
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const wrapType =
-      REACT_NATIVE_VERSION.minor > 63 || REACT_NATIVE_VERSION.major > 0
-        ? // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          ref._reactInternals.elementType
-        : // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          ref._reactInternalFiber.elementType;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      ref._reactInternals.elementType;
+
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     let instance =
       RNRenderer.findHostInstance_DEPRECATED(

package/src/web/tools/GestureHandlerOrchestrator.ts

@@ -307,7 +307,6 @@ export default class GestureHandlerOrchestrator {
     }
 
     if (handler.awaiting || handler.state === State.ACTIVE) {
-      // For now it always returns false
       return handler.shouldBeCancelledByOther(otherHandler);
     }
 

package/src/web/tools/InteractionManager.ts

@@ -1,5 +1,4 @@
 import type IGestureHandler from '../handlers/IGestureHandler';
-import { State } from '../../State';
 import { Config, Handler } from '../interfaces';
 
 export default class InteractionManager {
@@ -108,7 +107,7 @@ export default class InteractionManager {
     // We check constructor name instead of using `instanceof` in order do avoid circular dependencies
     const isNativeHandler =
       otherHandler.constructor.name === 'NativeViewGestureHandler';
-    const isActive = otherHandler.state === State.ACTIVE;
+    const isActive = otherHandler.active;
     const isButton = otherHandler.isButton?.() === true;
 
     return isNativeHandler && isActive && !isButton;

package/lib/commonjs/getReactNativeVersion.js

@@ -1,22 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getReactNativeVersion = getReactNativeVersion;
-
-var _package = _interopRequireDefault(require("react-native/package.json"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const [majorStr, minorStr] = _package.default.version.split('.');
-
-const REACT_NATIVE_VERSION = {
-  major: parseInt(majorStr, 10),
-  minor: parseInt(minorStr, 10)
-};
-
-function getReactNativeVersion() {
-  return REACT_NATIVE_VERSION;
-}
-//# sourceMappingURL=getReactNativeVersion.js.map

package/lib/commonjs/getReactNativeVersion.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["getReactNativeVersion.ts"],"names":["majorStr","minorStr","pack","version","split","REACT_NATIVE_VERSION","major","parseInt","minor","getReactNativeVersion"],"mappings":";;;;;;;AAAA;;;;AAEA,MAAM,CAACA,QAAD,EAAWC,QAAX,IAAuBC,iBAAKC,OAAL,CAAaC,KAAb,CAAmB,GAAnB,CAA7B;;AACA,MAAMC,oBAAoB,GAAG;AAC3BC,EAAAA,KAAK,EAAEC,QAAQ,CAACP,QAAD,EAAW,EAAX,CADY;AAE3BQ,EAAAA,KAAK,EAAED,QAAQ,CAACN,QAAD,EAAW,EAAX;AAFY,CAA7B;;AAKO,SAASQ,qBAAT,GAAiC;AACtC,SAAOJ,oBAAP;AACD","sourcesContent":["import pack from 'react-native/package.json';\n\nconst [majorStr, minorStr] = pack.version.split('.');\nconst REACT_NATIVE_VERSION = {\n  major: parseInt(majorStr, 10),\n  minor: parseInt(minorStr, 10),\n};\n\nexport function getReactNativeVersion() {\n  return REACT_NATIVE_VERSION;\n}\n"]}

package/lib/commonjs/getReactNativeVersion.web.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getReactNativeVersion = getReactNativeVersion;
-
-function getReactNativeVersion() {
-  throw new Error('getReactNativeVersion is not supported on web');
-}
-//# sourceMappingURL=getReactNativeVersion.web.js.map

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

@@ -1 +0,0 @@
-{"version":3,"sources":["getReactNativeVersion.web.ts"],"names":["getReactNativeVersion","Error"],"mappings":";;;;;;;AAAO,SAASA,qBAAT,GAAiC;AACtC,QAAM,IAAIC,KAAJ,CAAU,+CAAV,CAAN;AACD","sourcesContent":["export function getReactNativeVersion() {\n  throw new Error('getReactNativeVersion is not supported on web');\n}\n"]}

package/lib/module/getReactNativeVersion.js

@@ -1,10 +0,0 @@
-import pack from 'react-native/package.json';
-const [majorStr, minorStr] = pack.version.split('.');
-const REACT_NATIVE_VERSION = {
-  major: parseInt(majorStr, 10),
-  minor: parseInt(minorStr, 10)
-};
-export function getReactNativeVersion() {
-  return REACT_NATIVE_VERSION;
-}
-//# sourceMappingURL=getReactNativeVersion.js.map

package/lib/module/getReactNativeVersion.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["getReactNativeVersion.ts"],"names":["pack","majorStr","minorStr","version","split","REACT_NATIVE_VERSION","major","parseInt","minor","getReactNativeVersion"],"mappings":"AAAA,OAAOA,IAAP,MAAiB,2BAAjB;AAEA,MAAM,CAACC,QAAD,EAAWC,QAAX,IAAuBF,IAAI,CAACG,OAAL,CAAaC,KAAb,CAAmB,GAAnB,CAA7B;AACA,MAAMC,oBAAoB,GAAG;AAC3BC,EAAAA,KAAK,EAAEC,QAAQ,CAACN,QAAD,EAAW,EAAX,CADY;AAE3BO,EAAAA,KAAK,EAAED,QAAQ,CAACL,QAAD,EAAW,EAAX;AAFY,CAA7B;AAKA,OAAO,SAASO,qBAAT,GAAiC;AACtC,SAAOJ,oBAAP;AACD","sourcesContent":["import pack from 'react-native/package.json';\n\nconst [majorStr, minorStr] = pack.version.split('.');\nconst REACT_NATIVE_VERSION = {\n  major: parseInt(majorStr, 10),\n  minor: parseInt(minorStr, 10),\n};\n\nexport function getReactNativeVersion() {\n  return REACT_NATIVE_VERSION;\n}\n"]}

package/lib/module/getReactNativeVersion.web.js

@@ -1,4 +0,0 @@
-export function getReactNativeVersion() {
-  throw new Error('getReactNativeVersion is not supported on web');
-}
-//# sourceMappingURL=getReactNativeVersion.web.js.map

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

@@ -1 +0,0 @@
-{"version":3,"sources":["getReactNativeVersion.web.ts"],"names":["getReactNativeVersion","Error"],"mappings":"AAAA,OAAO,SAASA,qBAAT,GAAiC;AACtC,QAAM,IAAIC,KAAJ,CAAU,+CAAV,CAAN;AACD","sourcesContent":["export function getReactNativeVersion() {\n  throw new Error('getReactNativeVersion is not supported on web');\n}\n"]}

package/lib/typescript/getReactNativeVersion.d.ts

@@ -1,4 +0,0 @@
-export declare function getReactNativeVersion(): {
-    major: number;
-    minor: number;
-};

package/lib/typescript/getReactNativeVersion.web.d.ts

@@ -1 +0,0 @@
-export declare function getReactNativeVersion(): void;

package/src/getReactNativeVersion.ts

@@ -1,11 +0,0 @@
-import pack from 'react-native/package.json';
-
-const [majorStr, minorStr] = pack.version.split('.');
-const REACT_NATIVE_VERSION = {
-  major: parseInt(majorStr, 10),
-  minor: parseInt(minorStr, 10),
-};
-
-export function getReactNativeVersion() {
-  return REACT_NATIVE_VERSION;
-}

package/src/getReactNativeVersion.web.ts

@@ -1,3 +0,0 @@
-export function getReactNativeVersion() {
-  throw new Error('getReactNativeVersion is not supported on web');
-}