removed logic events web/android

Author: akwasniewski

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEventDispatcher.kt

@@ -153,7 +153,7 @@ class RNGestureHandlerEventDispatcher(private val reactApplicationContext: React
       }
 
       GestureHandler.ACTION_TYPE_LOGIC_DETECTOR -> {
-        val event = RNGestureHandlerLogicStateChangeEvent.obtain(
+        val event = RNGestureHandlerStateChangeEvent.obtain(
           handler,
           newState,
           oldState,
@@ -198,7 +198,7 @@ class RNGestureHandlerEventDispatcher(private val reactApplicationContext: React
         handler.viewForEvents!!.dispatchEvent(event)
       }
       GestureHandler.ACTION_TYPE_LOGIC_DETECTOR -> {
-        val event = RNGestureHandlerLogicTouchEvent.obtain(handler, handler.actionType)
+        val event = RNGestureHandlerTouchEvent.obtain(handler, handler.actionType)
 
         handler.parentView?.dispatchEvent(event)
       }

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerLogicEvent.kt

@@ -13,28 +13,13 @@ type GestureHandlerEvent = Readonly<{
   handlerData: UnsafeMixed;
 }>;
 
-type GestureHandlerLogicEvent = Readonly<{
-  handlerTag: Int32;
-  state: Int32;
-  handlerData: UnsafeMixed;
-  childTag: Int32;
-}>;
-
 type GestureHandlerStateChangeEvent = Readonly<{
   handlerTag: Int32;
   state: Int32;
   oldState: Int32;
   handlerData: UnsafeMixed;
 }>;
 
-type GestureHandlerLogicStateChangeEvent = Readonly<{
-  handlerTag: Int32;
-  state: Int32;
-  oldState: Int32;
-  handlerData: UnsafeMixed;
-  childTag: Int32;
-}>;
-
 type GestureHandlerTouchEvent = Readonly<{
   handlerTag: Int32;
   numberOfTouches: Int32;
@@ -57,29 +42,6 @@ type GestureHandlerTouchEvent = Readonly<{
   pointerType: Int32;
 }>;
 
-type GestureHandlerLogicTouchEvent = Readonly<{
-  handlerTag: Int32;
-  numberOfTouches: Int32;
-  state: Int32;
-  eventType: Int32;
-  allTouches: {
-    id: Int32;
-    x: Double;
-    y: Double;
-    absoluteX: Double;
-    absoluteY: Double;
-  }[];
-  changedTouches: {
-    id: Int32;
-    x: Double;
-    y: Double;
-    absoluteX: Double;
-    absoluteY: Double;
-  }[];
-  pointerType: Int32;
-  childTag: Int32;
-}>;
-
 export interface LogicProps {
   handlerTags: Int32[];
   moduleId: Int32;
@@ -92,9 +54,9 @@ export interface NativeProps extends ViewProps {
   onGestureHandlerStateChange?: DirectEventHandler<GestureHandlerStateChangeEvent>;
   onGestureHandlerTouchEvent?: DirectEventHandler<GestureHandlerTouchEvent>;
 
-  onGestureHandlerLogicEvent?: DirectEventHandler<GestureHandlerLogicEvent>;
-  onGestureHandlerLogicStateChange?: DirectEventHandler<GestureHandlerLogicStateChangeEvent>;
-  onGestureHandlerLogicTouchEvent?: DirectEventHandler<GestureHandlerLogicTouchEvent>;
+  onGestureHandlerLogicEvent?: DirectEventHandler<GestureHandlerEvent>;
+  onGestureHandlerLogicStateChange?: DirectEventHandler<GestureHandlerStateChangeEvent>;
+  onGestureHandlerLogicTouchEvent?: DirectEventHandler<GestureHandlerTouchEvent>;
 
   handlerTags: Int32[];
   moduleId: Int32;

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerLogicStateChangeEvent.kt

@@ -52,7 +52,7 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
     currentHandlerTags: Set<number>,
     attachedHandlerTags: Set<number>,
     attachedNativeHandlerTags: Set<number>,
-    childTag?: number
+    isLogic: boolean
   ) => {
     const oldHandlerTags = attachedHandlerTags.difference(currentHandlerTags);
     const newHandlerTags = currentHandlerTags.difference(attachedHandlerTags);
@@ -79,9 +79,8 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
         RNGestureHandlerModule.attachGestureHandler(
           tag,
           viewRef.current,
-          childTag ? ActionType.LogicDetector : ActionType.NATIVE_DETECTOR,
-          propsRef,
-          childTag
+          isLogic ? ActionType.LogicDetector : ActionType.NATIVE_DETECTOR,
+          propsRef
         );
       }
       attachedHandlerTags.add(tag);
@@ -108,7 +107,8 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
       propsRef,
       new Set(handlerTags),
       attachedHandlerTags.current,
-      attachedNativeHandlerTags.current
+      attachedNativeHandlerTags.current,
+      false
     );
   }, [handlerTags, children]);
 
@@ -140,7 +140,7 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
           new Set(child.handlerTags),
           attachedHandlerTags,
           attachedNativeHandlerTags,
-          child.viewTag
+          true
         );
       }
     });