handler data

Author: akwasniewski

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

@@ -6,7 +6,6 @@ import {
   PropsRef,
   ResultEvent,
   PointerData,
-  ResultTouchEvent,
   TouchEventType,
   EventTypes,
 } from '../interfaces';
@@ -20,6 +19,7 @@ import { PointerType } from '../../PointerType';
 import { GestureHandlerDelegate } from '../tools/GestureHandlerDelegate';
 import { ActionType } from '../../ActionType';
 import { tagMessage } from '../../utils';
+import { StateChangeEvent, UpdateEvent } from '../../v3/types';
 
 export default abstract class GestureHandler implements IGestureHandler {
   private lastSentState: State | null = null;
@@ -367,8 +367,7 @@ export default abstract class GestureHandler implements IGestureHandler {
     const { onGestureHandlerEvent, onGestureHandlerTouchEvent }: PropsRef =
       this.propsRef!.current;
 
-    const touchEvent: ResultTouchEvent | undefined =
-      this.transformTouchEvent(event);
+    const touchEvent: ResultEvent | undefined = this.transformTouchEvent(event);
 
     if (touchEvent) {
       if (
@@ -408,7 +407,6 @@ export default abstract class GestureHandler implements IGestureHandler {
       invokeNullableMethod(onGestureHandlerStateChange, resultEvent);
     }
     if (this.state === State.ACTIVE) {
-      resultEvent.nativeEvent.oldState = undefined;
       if (
         onGestureHandlerAnimatedEvent &&
         (this.actionType === ActionType.NATIVE_ANIMATED_EVENT ||
@@ -426,24 +424,24 @@ export default abstract class GestureHandler implements IGestureHandler {
     }
     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,
-      },
+        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(),
     };
   }
 
-  private transformTouchEvent(
-    event: AdaptedEvent
-  ): ResultTouchEvent | undefined {
+  private transformTouchEvent(event: AdaptedEvent): ResultEvent | undefined {
     const rect = this.delegate.measureView();
 
     const all: PointerData[] = [];
@@ -573,7 +571,7 @@ export default abstract class GestureHandler implements IGestureHandler {
       });
     });
 
-    const cancelEvent: ResultTouchEvent = {
+    const cancelEvent: ResultEvent = {
       nativeEvent: {
         handlerTag: this.handlerTag,
         state: this.state,
@@ -880,10 +878,10 @@ export default abstract class GestureHandler implements IGestureHandler {
 
 function invokeNullableMethod(
   method:
-    | ((event: ResultEvent | ResultTouchEvent) => void)
-    | { __getHandler: () => (event: ResultEvent | ResultTouchEvent) => void }
+    | ((event: ResultEvent) => void)
+    | { __getHandler: () => (event: ResultEvent) => void }
     | { __nodeConfig: { argMapping: unknown[] } },
-  event: ResultEvent | ResultTouchEvent
+  event: ResultEvent
 ): void {
   if (!method) {
     return;
@@ -915,7 +913,7 @@ function invokeNullableMethod(
     }
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    const nativeValue = event.nativeEvent[key];
+    const nativeValue = (event.nativeEvent as any)[key];
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     if (value?.setValue) {

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

@@ -5,8 +5,8 @@ import {
   TouchAction,
 } from '../handlers/gestureHandlerCommon';
 import { Directions } from '../Directions';
-import { State } from '../State';
 import { PointerType } from '../PointerType';
+import { GestureHandlerEvent } from '../v3/types';
 
 export interface HitSlop {
   left?: number;
@@ -81,17 +81,6 @@ 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;
@@ -105,26 +94,9 @@ export interface PointerData {
   absoluteY: number;
 }
 
-type TouchNativeArgs = number | State | TouchEventType | PointerData[];
-
-interface NativeTouchEvent extends Record<string, TouchNativeArgs> {
-  handlerTag: number;
-  state: State;
-  eventType: TouchEventType;
-  changedTouches: PointerData[];
-  allTouches: PointerData[];
-  numberOfTouches: number;
-  pointerType: PointerType;
-}
-
-export interface ResultEvent extends Record<string, NativeEvent | number> {
-  nativeEvent: NativeEvent;
-  timeStamp: number;
-}
-
-export interface ResultTouchEvent
-  extends Record<string, NativeTouchEvent | number> {
-  nativeEvent: NativeTouchEvent;
+export interface ResultEvent
+  extends Record<string, GestureHandlerEvent<unknown> | number> {
+  nativeEvent: GestureHandlerEvent<unknown>;
   timeStamp: number;
 }