fix(ios): gesture override more in line with N

farfromrefug · farfromrefug · commit fb3744d274aa · 2024-03-22T16:58:05.000+01:00
diff --git a/packages/gesturehandler/platforms/ios/src/GestureHandler.h b/packages/gesturehandler/platforms/ios/src/GestureHandler.h
@@ -93,11 +93,12 @@ if (value != nil) recognizer.prop = [value type]; \
 - (GestureHandlerState)state;
 - (nullable NSMutableDictionary *)eventExtraData:(nonnull id)recognizer;
 
+- (CGPoint) locationInView:(UIView*)view;
+- (CGPoint) locationOfTouch:(NSUInteger)index inView:(UIView*)view;
 - (void)reset;
 - (void)cancel;
 - (void)sendEventsInState:(GestureHandlerState)state
            forView:(nonnull UIView *)view
             withExtraData:(nullable NSDictionary*)extraData;
 
 @end
-
diff --git a/packages/gesturehandler/platforms/ios/src/GestureHandler.m b/packages/gesturehandler/platforms/ios/src/GestureHandler.m
@@ -318,6 +318,7 @@ - (void)cancel
     _recognizer.enabled = NO;
     _recognizer.enabled = YES;
     [self reset];
+}
 
  - (BOOL)containsPointInView
  {
@@ -326,6 +327,13 @@ - (BOOL)containsPointInView
      return CGRectContainsPoint(hitFrame, pt);
  }
 
+ - (CGPoint) locationInView:(UIView*)view {
+    return [_recognizer locationInView:view];
+ }
+ - (CGPoint) locationOfTouch:(NSUInteger)index inView:(UIView*)view {
+    return [_recognizer locationOfTouch:index inView:view];
+ }
+
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
     [self reset];
diff --git a/src/gesturehandler/gesturehandler.android.ts b/src/gesturehandler/gesturehandler.android.ts
@@ -265,7 +265,7 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
             object: this,
             data: {
                 state: handler.getState(),
-                android: view,
+                android: handler,
                 extraData: this.getExtraData(handler),
                 view: view.nsView ? view.nsView?.get() : null
             }
@@ -279,7 +279,7 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
             data: {
                 state,
                 prevState,
-                android: view,
+                android: handler,
                 extraData: this.getExtraData(handler),
                 view: view.nsView ? view.nsView?.get() : null
             }
diff --git a/src/gesturehandler/gesturehandler.ios.ts b/src/gesturehandler/gesturehandler.ios.ts
@@ -159,7 +159,7 @@ export class HandlerDelegate extends NSObject implements GestureHandlerDelegate
                 data: {
                     state,
                     prevState,
-                    ios: view,
+                    ios: handler,
                     extraData: toJsObject(extraData),
                     view: view.nsView ? view.nsView.get() : null
                 }
@@ -174,7 +174,7 @@ export class HandlerDelegate extends NSObject implements GestureHandlerDelegate
                 object: owner,
                 data: {
                     state,
-                    ios: view,
+                    ios: handler,
                     extraData: toJsObject(extraData),
                     view: view.nsView ? view.nsView.get() : null
                 }
diff --git a/src/gesturehandler/gestures_override.ts b/src/gesturehandler/gestures_override.ts
@@ -99,7 +99,7 @@ export class GesturesObserver {
     private _notifyTouch: boolean;
 
     private gestureHandler: Handler<any, any>;
-    private _eventData: { [k: number]: CommonGestureEventData | TouchGestureEventData } = {};
+    private _eventData: { [k: number]: CommonGestureEventData | AndroidTouchGestureEventData } = {};
 
     private _onTargetLoaded: (data: EventData) => void;
     private _onTargetUnloaded: (data: EventData) => void;
@@ -154,7 +154,7 @@ export class GesturesObserver {
                 }
                 eventData.handler = this.gestureHandler;
             }
-            eventData.prepare(this.target, event.data);
+            eventData.prepare(this.target, event);
             _executeCallback(this, eventData);
             // this.callback.call(this._context, {
             //     eventName: gestureToString(type),
@@ -209,7 +209,7 @@ export class GesturesObserver {
                 gestureHandler = manager.createGestureHandler(HandlerType.LONG_PRESS, target['LONGPRESS_HANDLER_TAG'], {
                     simultaneousHandlers: [ROOT_GESTURE_HANDLER_TAG]
                 });
-                gestureHandler.on(GestureHandlerStateEvent, this.onGestureStateChange(GestureTypes.longPress, __IOS__  ? GestureState.BEGAN : GestureState.ACTIVE), this);
+                gestureHandler.on(GestureHandlerStateEvent, this.onGestureStateChange(GestureTypes.longPress, __IOS__ ? GestureState.BEGAN : GestureState.ACTIVE), this);
             }
             if (type & GestureTypes.doubleTap) {
                 gestureHandler = manager.createGestureHandler(HandlerType.TAP, target['DOUBLE_TAP_HANDLER_TAG'], {
@@ -258,7 +258,7 @@ export class GesturesObserver {
         if (this._notifyTouch) {
             let eventData = this._eventData[GestureTypes.touch];
             if (!eventData) {
-                eventData = this._eventData[GestureTypes.touch] = new TouchGestureEventData();
+                eventData = this._eventData[GestureTypes.touch] = new AndroidTouchGestureEventData();
                 eventData.handler = this.gestureHandler;
             }
             eventData.prepare(this.target, motionEvent);
@@ -267,11 +267,14 @@ export class GesturesObserver {
     }
 }
 
-class Pointer implements Pointer {
+class AndroidPointer implements AndroidPointer {
     public android: number;
     public ios: any = undefined;
 
-    constructor(id: number, private event: android.view.MotionEvent) {
+    constructor(
+        id: number,
+        private event: android.view.MotionEvent
+    ) {
         this.android = id;
     }
 
@@ -287,7 +290,11 @@ class GesturePointer {
     android: number;
     ios: number;
     private event: any;
-    constructor(index: number, private x, private y) {
+    constructor(
+        index: number,
+        private x,
+        private y
+    ) {
         this.android = index;
     }
 
@@ -300,6 +307,32 @@ class GesturePointer {
     }
 }
 
+class Pointer {
+    _location: CGPoint;
+    ios: GestureHandler;
+    _view: View;
+    get location() {
+        if (!this._location) {
+            this._location = this.ios.locationInView(this._view.nativeViewProtected);
+        }
+
+        return this._location;
+    }
+
+    constructor(touch, targetView, location?) {
+        this._location = location;
+        this.ios = touch;
+        this._view = targetView;
+    }
+
+    getX() {
+        return this.location.x;
+    }
+
+    getY() {
+        return this.location.y;
+    }
+}
 class CommonGestureEventData implements GestureEventData {
     ios;
     android;
@@ -320,20 +353,22 @@ class CommonGestureEventData implements GestureEventData {
     state: GestureStateTypes;
     handler: Handler<any, any>;
 
-    private _activePointers: GesturePointer[];
-    private _allPointers: GesturePointer[];
+    private _activePointers: (GesturePointer | Pointer)[];
+    private _allPointers: (GesturePointer | Pointer)[];
 
     constructor(type: GestureTypes) {
         this.eventName = gestureToString(type);
         this.type = type;
     }
 
-    public prepare(view: View, eventData) {
+    public prepare(view: View, event) {
         this.view = view;
         this.object = view;
+        this.ios = event.ios;
+        this.android = event.android;
         this._activePointers = undefined;
         this._allPointers = undefined;
-        this.eventData = eventData;
+        this.eventData = event.data;
         switch (this.eventData.state) {
             case GestureState.BEGAN:
                 this.state = GestureStateTypes.began;
@@ -362,8 +397,12 @@ class CommonGestureEventData implements GestureEventData {
     getActivePointers() {
         // Only one active pointer in Android
         if (!this._activePointers) {
-            const positions = this.extraData.positions;
-            this._activePointers = [new GesturePointer(0, positions[0], positions[1])];
+            if (__ANDROID__) {
+                const positions = this.extraData.positions;
+                this._activePointers = [new GesturePointer(0, positions[0], positions[1])];
+            } else {
+                this._activePointers = [new Pointer(this.ios, this.view)];
+            }
         }
         return this._activePointers;
     }
@@ -373,7 +412,11 @@ class CommonGestureEventData implements GestureEventData {
             this._allPointers = [];
             const positions = this.extraData.positions;
             for (let i = 0; i < this.getPointerCount(); i++) {
-                this._allPointers.push(new GesturePointer(i, positions[i * 2], positions[i * 2 + 1]));
+                if (__ANDROID__) {
+                    this._allPointers.push(new GesturePointer(i, positions[i * 2], positions[i * 2 + 1]));
+                } else {
+                    this._allPointers = [new Pointer(this.ios, this.view, { x: positions[i * 2], y: positions[i * 2 + 1] })];
+                }
             }
         }
         return this._allPointers;
@@ -404,7 +447,7 @@ class CommonGestureEventData implements GestureEventData {
         return '';
     }
 }
-class TouchGestureEventData {
+class AndroidTouchGestureEventData {
     eventName: string = gestureToString(GestureTypes.touch);
     type: GestureTypes = GestureTypes.touch;
     ios: any = undefined;
@@ -415,8 +458,8 @@ class TouchGestureEventData {
     state: GestureStateTypes;
     handler: Handler<any, any>;
 
-    private _activePointers: Pointer[];
-    private _allPointers: Pointer[];
+    private _activePointers: AndroidPointer[];
+    private _allPointers: AndroidPointer[];
 
     public prepare(view: View, e: android.view.MotionEvent) {
         this.view = view;
@@ -431,19 +474,19 @@ class TouchGestureEventData {
         return this.android.getPointerCount();
     }
 
-    getActivePointers(): Pointer[] {
+    getActivePointers(): AndroidPointer[] {
         // Only one active pointer in Android
         if (!this._activePointers) {
-            this._activePointers = [new Pointer(this.android.getActionIndex(), this.android)];
+            this._activePointers = [new AndroidPointer(this.android.getActionIndex(), this.android)];
         }
         return this._activePointers;
     }
 
-    getAllPointers(): Pointer[] {
+    getAllPointers(): AndroidPointer[] {
         if (!this._allPointers) {
             this._allPointers = [];
             for (let i = 0; i < this.getPointerCount(); i++) {
-                this._allPointers.push(new Pointer(i, this.android));
+                this._allPointers.push(new AndroidPointer(i, this.android));
             }
         }
         return this._allPointers;
diff --git a/src/gesturehandler/typings/ios.d.ts b/src/gesturehandler/typings/ios.d.ts
@@ -92,6 +92,8 @@ declare class GestureHandler extends NSObject implements UIGestureRecognizerDele
     performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any;
 
     reset(): void;
+    cancel(): void;
+    locationInView(view: UIView): CGPoint;
 
     respondsToSelector(aSelector: string): boolean;
 

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ - (void)cancel`
`318`	`318`	`_recognizer.enabled = NO;`
`319`	`319`	`_recognizer.enabled = YES;`
`320`	`320`	`[self reset];`
	`321`	`+}`
`321`	`322`
`322`	`323`	`- (BOOL)containsPointInView`
`323`	`324`	`{`
`@@ -326,6 +327,13 @@ - (BOOL)containsPointInView`
`326`	`327`	`return CGRectContainsPoint(hitFrame, pt);`
`327`	`328`	`}`
`328`	`329`
	`330`	`+ - (CGPoint) locationInView:(UIView*)view {`
	`331`	`+ return [_recognizer locationInView:view];`
	`332`	`+ }`
	`333`	`+ - (CGPoint) locationOfTouch:(NSUInteger)index inView:(UIView*)view {`
	`334`	`+ return [_recognizer locationOfTouch:index inView:view];`
	`335`	`+ }`
	`336`	`+`
`329`	`337`	`- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer`
`330`	`338`	`{`
`331`	`339`	`[self reset];`