[Web] v3 typing and using handler data

packages/react-native-gesture-handler/src/web/handlers/GestureHandler.ts

@@ -416,23 +416,41 @@ export default abstract class GestureHandler implements IGestureHandler {
     if (!this.viewRef) {
       throw new Error(tagMessage('Cannot handle event when target is null'));
     }
-    return {
-      nativeEvent: {
-        state: newState,
-        handlerTag: this.handlerTag,
-        oldState: oldState,
-        handlerData: {
-          pointerType: this.pointerType,
+    if (this.actionType === ActionType.NATIVE_DETECTOR) {
+      return {
+        nativeEvent: {
+          state: newState,
+          handlerTag: this.handlerTag,
+          oldState: oldState,
+          handlerData: {
+            pointerType: this.pointerType,
+            numberOfPointers: this.tracker.trackedPointersCount,
+            pointerInside: this.delegate.isPointerInBounds(
+              this.tracker.getAbsoluteCoordsAverage()
+            ),
+            ...this.transformNativeEvent(),
+            target: this.viewRef,
+          },
+        } as StateChangeEvent<unknown> | UpdateEvent<unknown>,
+        timeStamp: Date.now(),
+      };
+    } else {
+      return {
+        nativeEvent: {
           numberOfPointers: this.tracker.trackedPointersCount,
+          state: newState,
           pointerInside: this.delegate.isPointerInBounds(
             this.tracker.getAbsoluteCoordsAverage()
           ),
           ...this.transformNativeEvent(),
+          handlerTag: this.handlerTag,
           target: this.viewRef,
+          oldState: newState !== oldState ? oldState : undefined,
+          pointerType: this.pointerType,
         },
-      } as StateChangeEvent<unknown> | UpdateEvent<unknown>,
-      timeStamp: Date.now(),
-    };
+        timeStamp: Date.now(),
+      };
+    }
   }
 
   private transformTouchEvent(event: AdaptedEvent): ResultEvent | undefined {

packages/react-native-gesture-handler/src/web/interfaces.ts

@@ -8,6 +8,7 @@ import {
 import { Directions } from '../Directions';
 import { PointerType } from '../PointerType';
 import { GestureHandlerEvent } from '../v3/types';
+import { State } from '../State';
 
 export interface HitSlop {
   left?: number;
@@ -83,6 +84,17 @@ export interface Config extends Record<string, ConfigArgs> {
   enableTrackpadTwoFingerGesture?: boolean;
 }
 
+type NativeEventArgs = number | State | boolean | undefined;
+interface NativeEvent extends Record<string, NativeEventArgs> {
+  numberOfPointers: number;
+  state: State;
+  pointerInside: boolean | undefined;
+  handlerTag: number;
+  target: number;
+  oldState?: State;
+  pointerType: PointerType;
+}
+
 export interface Point {
   x: number;
   y: number;
@@ -96,9 +108,10 @@ export interface PointerData {
   absoluteY: number;
 }
 
-export interface ResultEvent
-  extends Record<string, GestureHandlerEvent<unknown> | number> {
-  nativeEvent: GestureHandlerEvent<unknown>;
+// Native event has to stay for v2 compatibility
+type ResultEventType = GestureHandlerEvent<unknown> | NativeEvent;
+export interface ResultEvent extends Record<string, ResultEventType | number> {
+  nativeEvent: ResultEventType;
   timeStamp: number;
 }