react-native-gesture-handler 3.0.0-beta.4 → 3.0.0-beta.5

package/src/v3/hooks/utils/eventHandlersUtils.ts

@@ -16,38 +16,49 @@ export function useMemoizedGestureCallbacks<
 >(
   callbacks: GestureCallbacks<THandlerData, TExtendedHandlerData>
 ): GestureCallbacks<THandlerData, TExtendedHandlerData> {
-  return useMemo(
-    () => ({
-      ...(callbacks.onBegin ? { onBegin: callbacks.onBegin } : {}),
-      ...(callbacks.onActivate ? { onActivate: callbacks.onActivate } : {}),
-      ...(callbacks.onDeactivate
-        ? { onDeactivate: callbacks.onDeactivate }
-        : {}),
-      ...(callbacks.onFinalize ? { onFinalize: callbacks.onFinalize } : {}),
-      ...(callbacks.onUpdate ? { onUpdate: callbacks.onUpdate } : {}),
-      ...(callbacks.onTouchesDown
-        ? { onTouchesDown: callbacks.onTouchesDown }
-        : {}),
-      ...(callbacks.onTouchesMove
-        ? { onTouchesMove: callbacks.onTouchesMove }
-        : {}),
-      ...(callbacks.onTouchesUp ? { onTouchesUp: callbacks.onTouchesUp } : {}),
-      ...(callbacks.onTouchesCancel
-        ? { onTouchesCancel: callbacks.onTouchesCancel }
-        : {}),
-    }),
-    [
-      callbacks.onActivate,
-      callbacks.onBegin,
-      callbacks.onDeactivate,
-      callbacks.onFinalize,
-      callbacks.onTouchesCancel,
-      callbacks.onTouchesDown,
-      callbacks.onTouchesMove,
-      callbacks.onTouchesUp,
-      callbacks.onUpdate,
-    ]
-  );
+  return useMemo(() => {
+    const memoized: GestureCallbacks<THandlerData, TExtendedHandlerData> = {};
+
+    if (callbacks.onBegin) {
+      memoized.onBegin = callbacks.onBegin;
+    }
+    if (callbacks.onActivate) {
+      memoized.onActivate = callbacks.onActivate;
+    }
+    if (callbacks.onDeactivate) {
+      memoized.onDeactivate = callbacks.onDeactivate;
+    }
+    if (callbacks.onFinalize) {
+      memoized.onFinalize = callbacks.onFinalize;
+    }
+    if (callbacks.onUpdate) {
+      memoized.onUpdate = callbacks.onUpdate;
+    }
+    if (callbacks.onTouchesDown) {
+      memoized.onTouchesDown = callbacks.onTouchesDown;
+    }
+    if (callbacks.onTouchesMove) {
+      memoized.onTouchesMove = callbacks.onTouchesMove;
+    }
+    if (callbacks.onTouchesUp) {
+      memoized.onTouchesUp = callbacks.onTouchesUp;
+    }
+    if (callbacks.onTouchesCancel) {
+      memoized.onTouchesCancel = callbacks.onTouchesCancel;
+    }
+
+    return memoized;
+  }, [
+    callbacks.onActivate,
+    callbacks.onBegin,
+    callbacks.onDeactivate,
+    callbacks.onFinalize,
+    callbacks.onTouchesCancel,
+    callbacks.onTouchesDown,
+    callbacks.onTouchesMove,
+    callbacks.onTouchesUp,
+    callbacks.onUpdate,
+  ]);
 }
 
 function getHandler<THandlerData, TExtendedHandlerData extends THandlerData>(

package/src/v3/hooks/utils/reanimatedUtils.ts

@@ -2,7 +2,6 @@ import { Reanimated } from '../../../handlers/gestures/reanimatedWrapper';
 import { NativeProxy } from '../../NativeProxy';
 import type {
   BaseGestureConfig,
-  GestureCallbacks,
   SharedValue,
   SharedValueOrT,
 } from '../../types';
@@ -21,7 +20,7 @@ function hash(str: string) {
   return h >>> 0;
 }
 
-const SHARED_VALUE_OFFSET = 1.618;
+export const SHARED_VALUE_OFFSET = 1.618;
 
 // Don't transfer entire NativeProxy to the UI thread
 const { updateGestureHandlerConfig } = NativeProxy;
@@ -101,14 +100,15 @@ export function hasWorkletEventHandlers<
   THandlerData,
   TExtendedHandlerData extends THandlerData,
 >(config: BaseGestureConfig<TConfig, THandlerData, TExtendedHandlerData>) {
-  return Object.entries(config).some(
-    ([key, value]) =>
-      HandlerCallbacks.has(
-        key as keyof GestureCallbacks<THandlerData, TExtendedHandlerData>
-      ) &&
-      typeof value === 'function' &&
-      '__workletHash' in value
-  );
+  for (const key of HandlerCallbacks) {
+    const value = config[key];
+
+    if (typeof value === 'function' && '__workletHash' in value) {
+      return true;
+    }
+  }
+
+  return false;
 }
 
 export function maybeUnpackValue<T>(

package/src/web/tools/NodeManager.ts

@@ -2,6 +2,8 @@ import type { ValueOf } from '../../typeUtils';
 import type { Gestures } from '../Gestures';
 import type IGestureHandler from '../handlers/IGestureHandler';
 
+type HandlerReadyCallback = (handler: IGestureHandler) => void;
+
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class
 export default abstract class NodeManager {
   private static gestures: Record<
@@ -9,6 +11,9 @@ export default abstract class NodeManager {
     InstanceType<ValueOf<typeof Gestures>>
   > = {};
 
+  private static observers: Map<number, Map<object, HandlerReadyCallback>> =
+    new Map();
+
   public static getHandler(tag: number): IGestureHandler {
     if (tag in this.gestures) {
       return this.gestures[tag] as IGestureHandler;
@@ -17,6 +22,10 @@ export default abstract class NodeManager {
     throw new Error(`No handler for tag ${tag}`);
   }
 
+  public static hasHandler(tag: number): boolean {
+    return tag in this.gestures;
+  }
+
   public static createGestureHandler(
     handlerTag: number,
     handler: InstanceType<ValueOf<typeof Gestures>>
@@ -29,6 +38,15 @@ export default abstract class NodeManager {
 
     this.gestures[handlerTag] = handler;
     this.gestures[handlerTag].handlerTag = handlerTag;
+
+    const pending = this.observers.get(handlerTag);
+    if (pending) {
+      // Snapshot before iterating — callbacks may call back into observeHandler / cancelObservation
+      // and mutate the underlying map.
+      for (const callback of Array.from(pending.values())) {
+        callback(handler as IGestureHandler);
+      }
+    }
   }
 
   public static dropGestureHandler(handlerTag: number): void {
@@ -50,6 +68,45 @@ export default abstract class NodeManager {
     this.gestures[handlerTag].detach();
   }
 
+  // Invokes `callback` every time a handler with `tag` is created and, if the handler already exists,
+  // immediately before returning. The observation persists until explicitly cancelled: the registry
+  // holds both `owner` and `callback` strongly, so callers MUST call `cancelObservation` or
+  // `cancelAllObservationsForOwner` when the owner is going away (typically in effect cleanup) to
+  // avoid leaking. Observing the same tag twice with the same `owner` replaces the previous callback.
+  public static observeHandler(
+    tag: number,
+    owner: object,
+    callback: HandlerReadyCallback
+  ): void {
+    let table = this.observers.get(tag);
+    if (!table) {
+      table = new Map();
+      this.observers.set(tag, table);
+    }
+    table.set(owner, callback);
+
+    if (tag in this.gestures) {
+      callback(this.gestures[tag] as IGestureHandler);
+    }
+  }
+
+  public static cancelObservation(tag: number, owner: object): void {
+    const table = this.observers.get(tag);
+    if (!table) {
+      return;
+    }
+    table.delete(owner);
+    if (table.size === 0) {
+      this.observers.delete(tag);
+    }
+  }
+
+  public static cancelAllObservationsForOwner(owner: object): void {
+    for (const tag of this.observers.keys()) {
+      this.cancelObservation(tag, owner);
+    }
+  }
+
   public static get nodes() {
     return { ...this.gestures };
   }

package/lib/module/RNRenderer.js

@@ -1,6 +0,0 @@
-"use strict";
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-export { default as RNRenderer } from 'react-native/Libraries/Renderer/shims/ReactNative';
-//# sourceMappingURL=RNRenderer.js.map

package/lib/module/RNRenderer.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["default","RNRenderer"],"sourceRoot":"../../src","sources":["RNRenderer.ts"],"mappings":";;AAAA;AACA;AACA,SAASA,OAAO,IAAIC,UAAU,QAAQ,mDAAmD","ignoreList":[]}

package/lib/module/RNRenderer.web.js

@@ -1,6 +0,0 @@
-"use strict";
-
-export const RNRenderer = {
-  findHostInstance_DEPRECATED: _ref => null
-};
-//# sourceMappingURL=RNRenderer.web.js.map

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

@@ -1 +0,0 @@
-{"version":3,"names":["RNRenderer","findHostInstance_DEPRECATED","_ref"],"sourceRoot":"../../src","sources":["RNRenderer.web.ts"],"mappings":";;AAAA,OAAO,MAAMA,UAAU,GAAG;EACxBC,2BAA2B,EAAGC,IAAS,IAAK;AAC9C,CAAC","ignoreList":[]}

package/lib/typescript/RNRenderer.d.ts

@@ -1,2 +0,0 @@
-export { default as RNRenderer } from 'react-native/Libraries/Renderer/shims/ReactNative';
-//# sourceMappingURL=RNRenderer.d.ts.map

package/lib/typescript/RNRenderer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RNRenderer.d.ts","sourceRoot":"","sources":["../../src/RNRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,mDAAmD,CAAC"}

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

@@ -1,4 +0,0 @@
-export declare const RNRenderer: {
-    findHostInstance_DEPRECATED: (_ref: any) => null;
-};
-//# sourceMappingURL=RNRenderer.web.d.ts.map

package/lib/typescript/RNRenderer.web.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RNRenderer.web.d.ts","sourceRoot":"","sources":["../../src/RNRenderer.web.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;wCACe,GAAG;CACxC,CAAC"}

package/src/RNRenderer.ts

@@ -1,3 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-export { default as RNRenderer } from 'react-native/Libraries/Renderer/shims/ReactNative';

package/src/RNRenderer.web.ts

@@ -1,3 +0,0 @@
-export const RNRenderer = {
-  findHostInstance_DEPRECATED: (_ref: any) => null,
-};