fix(ios): prevent error while overriding N gestures

nativescript-community · Nov 21, 2023 · bb04710 · bb04710
1 parent a6349e8
commit bb04710
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 10 deletions.
diff --git a/packages/gesturehandler/platforms/ios/src/GestureHandlerManager.h b/packages/gesturehandler/platforms/ios/src/GestureHandlerManager.h
@@ -16,6 +16,7 @@
 - (void)updateGestureHandler:(nonnull NSNumber *)handlerTag config:(nonnull NSDictionary *)config;
 
 - (void)dropGestureHandler:(nonnull NSNumber *)handlerTag;
+- (void)detachGestureHandler:(nonnull NSNumber *)handlerTag;
 
 //- (void)handleSetJSResponder:(nonnull UIView *)view
 //        blockNativeResponder:(nonnull NSNumber *)blockNativeResponder;

diff --git a/packages/gesturehandler/platforms/ios/src/GestureHandlerManager.m b/packages/gesturehandler/platforms/ios/src/GestureHandlerManager.m
@@ -88,6 +88,10 @@ - (void)dropGestureHandler:(NSNumber *)handlerTag
     [_registry dropHandlerWithTag:handlerTag];
 }
 
+- (void)detachGestureHandler:(NSNumber *)handlerTag
+{
+    [_registry detachHandlerWithTag:handlerTag];
+}
 //- (void)handleSetJSResponder:(NSNumber *)viewTag blockNativeResponder:(NSNumber *)blockNativeResponder
 //{
 //    if ([blockNativeResponder boolValue]) {

diff --git a/packages/gesturehandler/platforms/ios/src/GestureHandlerRegistry.h b/packages/gesturehandler/platforms/ios/src/GestureHandlerRegistry.h
@@ -14,5 +14,7 @@
 - (void)registerGestureHandler:(nonnull GestureHandler *)gestureHandler;
 - (void)attachHandlerWithTag:(nonnull NSNumber *)handlerTag toView:(nonnull UIView *)view;
 - (void)dropHandlerWithTag:(nonnull NSNumber *)handlerTag;
+- (void)detachHandlerWithTag:(nonnull NSNumber *)handlerTag;
+- (void)detachHandlerWithTag:(nonnull NSNumber *)handlerTag;
 
 @end
diff --git a/packages/gesturehandler/platforms/ios/src/GestureHandlerRegistry.m b/packages/gesturehandler/platforms/ios/src/GestureHandlerRegistry.m
@@ -46,4 +46,9 @@ - (void)dropHandlerWithTag:(NSNumber *)handlerTag
     [_handlers removeObjectForKey:handlerTag];
 }
 
+- (void)detachHandlerWithTag:(NSNumber *)handlerTag
+{
+    GestureHandler *handler = _handlers[handlerTag];
+    [handler unbindFromView];
+}
 @end
diff --git a/src/gesturehandler/gesturehandler.d.ts b/src/gesturehandler/gesturehandler.d.ts
@@ -10,7 +10,7 @@ export enum FlingDirection {
     DIRECTION_LEFT,
     DIRECTION_UP,
     DIRECTION_DOWN,
-    DIRECTION_RIGHT,
+    DIRECTION_RIGHT
 }
 
 export abstract class BaseNative<T, U extends {}> extends Observable {
@@ -65,7 +65,7 @@ export abstract class Handler<T, U extends HandlerOptions> extends BaseNative<T,
     getView(): View;
     cancel();
     attachToView(view: View);
-    detachFromView(view?: View);
+    detachFromView(view?: View, drop?: boolean);
 }
 export interface TapGestureHandlerOptions extends HandlerOptions {
     numberOfTaps?: number;

diff --git a/src/gesturehandler/gesturehandler.ios.ts b/src/gesturehandler/gesturehandler.ios.ts
@@ -195,14 +195,14 @@ export class Handler<T extends GestureHandler, U extends HandlerOptions> extends
             return;
         }
         if (this.attachedView) {
-            this.detachFromView(this.attachedView);
+            this.detachFromView(this.attachedView, false);
         }
         this.attachedView = view;
         this.delegate = HandlerDelegate.initWithOwner(new WeakRef(this));
         this.native.delegate = this.delegate;
         this.manager.get().attachGestureHandler(this, view);
     }
-    detachFromView(view?: View) {
+    detachFromView(view?: View, drop = true) {
         if ((view && view !== this.attachedView) || !this.attachedView) {
             return;
         }
@@ -212,7 +212,7 @@ export class Handler<T extends GestureHandler, U extends HandlerOptions> extends
         }
         const tag = this.native.tag;
         this.delegate = this.native.delegate = null;
-        this.manager.get().detachGestureHandler(tag, this.attachedView);
+        this.manager.get().detachGestureHandler(tag, this.attachedView, drop);
         this.attachedView = null;
     }
     getTag() {
@@ -274,9 +274,11 @@ export class Manager extends ManagerBase {
             dispose: onDispose
         });
     }
-    detachGestureHandler(handlerTag: number, view: View) {
-        if (view.nativeView) {
+    detachGestureHandler(handlerTag: number, view: View, drop = true) {
+        if (drop) {
             this.manager.dropGestureHandler(handlerTag);
+        } else {
+            this.manager.detachGestureHandler(handlerTag);
         }
         if (view) {
             const viewListeners = this.viewListeners.get(view);

diff --git a/src/gesturehandler/gestures_override.ts b/src/gesturehandler/gestures_override.ts
@@ -60,7 +60,7 @@ export class GesturesObserver {
     }
 
     public disconnect() {
-        this._detach();
+        this._detach(true);
 
         if (this.target) {
             this.target.off('loaded', this._onTargetLoaded);
@@ -123,12 +123,12 @@ export class GesturesObserver {
         }
     }
 
-    private _detach() {
+    private _detach(drop = false) {
         if (this.gestureHandler) {
             // dont detach events. It will be done on dispose
             // this.gestureHandler.off(GestureHandlerStateEvent);
             // this.gestureHandler.off(GestureHandlerTouchEvent);
-            this.gestureHandler.detachFromView(this.target);
+            this.gestureHandler.detachFromView(this.target, drop);
         }
         this._notifyTouch = false;
         this._eventData = {};

diff --git a/src/gesturehandler/typings/ios.d.ts b/src/gesturehandler/typings/ios.d.ts
@@ -157,6 +157,7 @@ declare class GestureHandlerManager extends NSObject {
     createGestureHandlerTagConfig(handlerName: string, handlerTag: number, config: NSDictionary<any, any>): GestureHandler;
 
     dropGestureHandler(handlerTag: number): void;
+    detachGestureHandler(handlerTag: number): void;
 
     updateGestureHandlerConfig(handlerTag: number, config: NSDictionary<any, any>): void;
 }