@nativescript-community/gesturehandler 0.2.2 → 2.0.0

package/{gesturehandler.ios.js → .history/src/gesturehandler.ios_20210422150701.ts}

@@ -1,16 +1,33 @@
 import { View } from '@nativescript/core/ui';
-import { GestureTypes } from '@nativescript/core/ui/gestures';
+import { GestureEventData, GestureTypes } from '@nativescript/core/ui/gestures';
 import { getClass } from '@nativescript/core/utils/types';
-import { BaseGestureRootView, BaseNative, GestureHandlerStateEvent, GestureHandlerTouchEvent, GestureState, HandlerType, ManagerBase, ViewDisposeEvent, ViewInitEvent, install as installBase, nativeProperty, } from './gesturehandler.common';
+import { HandlerOptions } from './gesturehandler';
+import {
+    BaseNative,
+    GestureHandlerStateEvent,
+    GestureHandlerTouchEvent,
+    GestureState,
+    GestureStateEventData,
+    GestureTouchEventData,
+    HandlerType,
+    ManagerBase,
+    OptionsTypeMap,
+    TypeMap,
+    ViewDisposeEvent,
+    ViewInitEvent,
+    install as installBase,
+    nativeProperty,
+} from './gesturehandler.common';
 import { observe as gestureObserve } from './gestures_override';
-export { GestureState, GestureHandlerStateEvent, GestureHandlerTouchEvent, HandlerType, ViewInitEvent, ViewDisposeEvent };
-export var FlingDirection;
-(function (FlingDirection) {
-    FlingDirection[FlingDirection["DIRECTION_LEFT"] = 2] = "DIRECTION_LEFT";
-    FlingDirection[FlingDirection["DIRECTION_UP"] = 4] = "DIRECTION_UP";
-    FlingDirection[FlingDirection["DIRECTION_DOWN"] = 8] = "DIRECTION_DOWN";
-    FlingDirection[FlingDirection["DIRECTION_RIGHT"] = 1] = "DIRECTION_RIGHT";
-})(FlingDirection || (FlingDirection = {}));
+export { GestureState, GestureHandlerStateEvent, GestureHandlerTouchEvent, GestureStateEventData, GestureTouchEventData, HandlerType, ViewInitEvent, ViewDisposeEvent };
+
+export enum FlingDirection {
+    DIRECTION_LEFT = UISwipeGestureRecognizerDirection.Left,
+    DIRECTION_UP = UISwipeGestureRecognizerDirection.Up,
+    DIRECTION_DOWN = UISwipeGestureRecognizerDirection.Down,
+    DIRECTION_RIGHT = UISwipeGestureRecognizerDirection.Right,
+}
+
 let installed = false;
 let installedOverrides = false;
 export function install(overrideNGestures = false) {
@@ -18,14 +35,19 @@ export function install(overrideNGestures = false) {
         installed = true;
         installBase(overrideNGestures);
     }
+
     if (overrideNGestures === true && !installedOverrides) {
         installedOverrides = true;
         const NSView = require('@nativescript/core/ui/core/view').View;
-        NSView.prototype._observe = function (type, callback, thisArg) {
+        NSView.prototype._observe = function (type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void {
             if (!this._gestureObservers[type]) {
                 this._gestureObservers[type] = [];
             }
+
             this._gestureObservers[type].push(gestureObserve(this, type, callback, thisArg));
+            // if (type & GestureTypes.touch && this.isLoaded && !this.touchListenerIsSet) {
+            //     this.setOnTouchListener();
+            // }
         };
     }
 }
@@ -35,30 +57,35 @@ function toJsObject(objCObj) {
     }
     let node, key, i, l;
     const oKeyArr = objCObj.allKeys;
+
     if (oKeyArr === undefined && objCObj.count !== undefined) {
+        // array
         node = [];
         for (i = 0, l = objCObj.count; i < l; i++) {
             key = objCObj.objectAtIndex(i);
             node.push(toJsObject(key));
         }
-    }
-    else if (oKeyArr !== undefined) {
+    } else if (oKeyArr !== undefined) {
+        // object
         node = {};
         for (i = 0, l = oKeyArr.count; i < l; i++) {
             key = oKeyArr.objectAtIndex(i);
             const val = objCObj.valueForKey(key);
+
+            // Firestore can store nulls
             if (val === null) {
                 node[key] = null;
                 continue;
             }
             node[key] = getValueForClass(val);
         }
-    }
-    else {
+    } else {
         node = getValueForClass(objCObj);
     }
+
     return node;
 }
+
 function getValueForClass(val) {
     switch (getClass(val)) {
         case 'NSArray':
@@ -76,86 +103,91 @@ function getValueForClass(val) {
             return Number(String(val));
         case 'Date':
             return new Date(val);
+
         default:
-            console.log("Please report this at https://github.com/farfromrefug/@nativescript-community/gesturehandler-febase/issues: iOS toJsObject is missing a converter for class '" +
-                getClass(val) +
-                "'. Casting to String as a fallback.");
+            console.log(
+                "Please report this at https://github.com/farfromrefug/@nativescript-community/gesturehandler-febase/issues: iOS toJsObject is missing a converter for class '" +
+                    getClass(val) +
+                    "'. Casting to String as a fallback."
+            );
             return String(val);
     }
 }
-export class GestureRootView extends BaseGestureRootView {
-}
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HandlerDelegate = void 0;
-var HandlerDelegate = /** @class */ (function (_super) {
-    __extends(HandlerDelegate, _super);
-    function HandlerDelegate() {
-        return _super !== null && _super.apply(this, arguments) || this;
+
+@NativeClass
+export class HandlerDelegate extends NSObject implements GestureHandlerDelegate {
+    public static ObjCProtocols = [GestureHandlerDelegate];
+    private _owner: WeakRef<Handler<any, any>>;
+    static new(): HandlerDelegate {
+        return super.new() as HandlerDelegate;
     }
-    HandlerDelegate.new = function () {
-        return _super.new.call(this);
-    };
     // public initWithOwner(owner: WeakRef<Handler<any, any>>): HandlerDelegate {
     //     this._owner = owner;
     //     return this;
     // }
-    HandlerDelegate.initWithOwner = function (owner) {
-        var impl = HandlerDelegate.new();
+
+    public static initWithOwner(owner: WeakRef<Handler<any, any>>): HandlerDelegate {
+        const impl = HandlerDelegate.new();
         impl._owner = owner;
         return impl;
-    };
-    HandlerDelegate.prototype.gestureHandlerDidChangeStatePrevStateExtraDataView = function (handler, state, prevState, extraData, view) {
-        var owner = this._owner && this._owner.get();
+    }
+    gestureHandlerDidChangeStatePrevStateExtraDataView(
+        handler: GestureHandler,
+        state: GestureHandlerState,
+        prevState: GestureHandlerState,
+        extraData: NSDictionary<any, any>,
+        view: UIView & { nsView?: WeakRef<View> }
+    ): void {
+        const owner = this._owner && this._owner.get();
         if (owner) {
             owner.notify({
                 eventName: GestureHandlerStateEvent,
                 object: owner,
                 data: {
-                    state: state,
-                    prevState: prevState,
+                    state,
+                    prevState,
                     ios: view,
                     extraData: toJsObject(extraData),
                     view: view.nsView ? view.nsView.get() : null,
                 },
             });
         }
-    };
-    HandlerDelegate.prototype.gestureHandlerTouchEventOnViewStateExtraData = function (handler, view, state, extraData) {
-        var owner = this._owner && this._owner.get();
+    }
+    gestureHandlerTouchEventOnViewStateExtraData(handler: GestureHandler, view: UIView & { nsView?: WeakRef<View> }, state: GestureHandlerState, extraData: NSDictionary<any, any>): void {
+        const owner = this._owner && this._owner.get();
         if (owner) {
             owner.notify({
                 eventName: GestureHandlerTouchEvent,
                 object: owner,
                 data: {
-                    state: state,
+                    state,
                     ios: view,
                     extraData: toJsObject(extraData),
                     view: view.nsView ? view.nsView.get() : null,
                 },
             });
         }
-    };
-    HandlerDelegate.prototype.gestureHandlerShouldActivateForEvent = function (handler, extraData) {
-        var owner = this._owner && this._owner.get();
+    }
+    gestureHandlerShouldActivateForEvent(handler: GestureHandler, extraData: NSDictionary<any, any>) {
+        const owner = this._owner && this._owner.get();
         if (owner && owner.options && owner.options.shouldStartGesture) {
             return owner.options.shouldStartGesture(toJsObject(extraData));
         }
         return true;
-    };
-    HandlerDelegate.ObjCProtocols = [GestureHandlerDelegate];
-    return HandlerDelegate;
-}(NSObject));
-exports.HandlerDelegate = HandlerDelegate;
-export class Handler extends BaseNative {
-    constructor() {
-        super(...arguments);
-        this.nativeGetterKey = 'nativeView';
     }
+}
+
+export class Handler<T extends GestureHandler, U extends HandlerOptions> extends BaseNative<T, U> {
+    manager: WeakRef<Manager>;
+    delegate: HandlerDelegate;
+    @nativeProperty enabled: boolean;
+    @nativeProperty shouldCancelWhenOutside: boolean;
     createNative() {
         return null;
     }
-    attachToView(view) {
+    attachedView: View;
+    nativeGetterKey = 'nativeView';
+    attachToView(view: View) {
         if (view === this.attachedView) {
             return;
         }
@@ -167,10 +199,11 @@ export class Handler extends BaseNative {
         this.native.delegate = this.delegate;
         this.manager.get().attachGestureHandler(this, view);
     }
-    detachFromView(view) {
+    detachFromView(view?: View) {
         if ((view && view !== this.attachedView) || !this.attachedView) {
             return;
         }
+
         if (!this.attachedView) {
             return;
         }
@@ -183,6 +216,7 @@ export class Handler extends BaseNative {
         return this.native.tag;
     }
     setTag(value) {
+        // cant change tag on ios
     }
     getView() {
         return this.attachedView;
@@ -191,36 +225,32 @@ export class Handler extends BaseNative {
         this.native.reset();
     }
 }
-__decorate([
-    nativeProperty
-], Handler.prototype, "enabled", void 0);
-__decorate([
-    nativeProperty
-], Handler.prototype, "shouldCancelWhenOutside", void 0);
+
 export class Manager extends ManagerBase {
-    constructor() {
-        super(...arguments);
-        this.viewListeners = new Map();
-    }
+    _manager: GestureHandlerManager;
     get manager() {
         if (!this._manager) {
             this._manager = GestureHandlerManager.alloc().init();
         }
         return this._manager;
     }
+
+    static sManager: Manager;
     static getInstance() {
         if (!Manager.sManager) {
             Manager.sManager = new Manager();
         }
         return Manager.sManager;
     }
-    createGestureHandler(handlerName, handlerTag, config) {
-        const nHandler = this.manager.createGestureHandlerTagConfig(handlerName, handlerTag, config ? NSDictionary.dictionaryWithDictionary(config) : null);
+    createGestureHandler<T extends HandlerType>(handlerName: T, handlerTag: number, config?: OptionsTypeMap[T]): TypeMap[T] {
+        const nHandler = this.manager.createGestureHandlerTagConfig(handlerName, handlerTag, config ? NSDictionary.dictionaryWithDictionary(config as any) : null);
         const result = new Handler(config, nHandler);
         result.manager = new WeakRef(this);
-        return result;
+        return result as any;
     }
-    attachGestureHandler(handler, view) {
+
+    viewListeners = new Map<View, Map<number, { init: () => void; dispose: () => void }>>();
+    attachGestureHandler(handler: Handler<any, any>, view: View) {
         const tag = handler.native.tag;
         if (view.nativeView) {
             this.manager.attachGestureHandlerToView(tag, view[handler.nativeGetterKey]);
@@ -241,7 +271,7 @@ export class Manager extends ManagerBase {
             dispose: onDispose,
         });
     }
-    detachGestureHandler(handlerTag, view) {
+    detachGestureHandler(handlerTag: number, view: View) {
         if (view.nativeView) {
             this.manager.dropGestureHandler(handlerTag);
         }
@@ -261,4 +291,3 @@ export class Manager extends ManagerBase {
         }
     }
 }
-//# sourceMappingURL=gesturehandler.ios.js.map

package/.history/src/gesturehandler.ios_20220328144653.ts

@@ -0,0 +1,296 @@
+import { View } from '@nativescript/core/ui';
+import { GestureEventData, GestureTypes } from '@nativescript/core/ui/gestures';
+import { getClass } from '@nativescript/core/utils/types';
+import { HandlerOptions } from './gesturehandler';
+import {
+    BaseGestureRootView,
+    BaseNative,
+    GestureHandlerStateEvent,
+    GestureHandlerTouchEvent,
+    GestureState,
+    GestureStateEventData,
+    GestureTouchEventData,
+    HandlerType,
+    ManagerBase,
+    OptionsTypeMap,
+    TypeMap,
+    ViewDisposeEvent,
+    ViewInitEvent,
+    install as installBase,
+    nativeProperty,
+} from './gesturehandler.common';
+import { observe as gestureObserve } from './gestures_override';
+export { GestureState, GestureHandlerStateEvent, GestureHandlerTouchEvent, GestureStateEventData, GestureTouchEventData, HandlerType, ViewInitEvent, ViewDisposeEvent };
+
+export enum FlingDirection {
+    DIRECTION_LEFT = UISwipeGestureRecognizerDirection.Left,
+    DIRECTION_UP = UISwipeGestureRecognizerDirection.Up,
+    DIRECTION_DOWN = UISwipeGestureRecognizerDirection.Down,
+    DIRECTION_RIGHT = UISwipeGestureRecognizerDirection.Right,
+}
+
+let installed = false;
+let installedOverrides = false;
+export function install(overrideNGestures = false) {
+    if (!installed) {
+        installed = true;
+        installBase(overrideNGestures);
+    }
+
+    if (overrideNGestures === true && !installedOverrides) {
+        installedOverrides = true;
+        const NSView = require('@nativescript/core/ui/core/view').View;
+        NSView.prototype._observe = function (type: GestureTypes, callback: (args: GestureEventData) => void, thisArg?: any): void {
+            if (!this._gestureObservers[type]) {
+                this._gestureObservers[type] = [];
+            }
+
+            this._gestureObservers[type].push(gestureObserve(this, type, callback, thisArg));
+            // if (type & GestureTypes.touch && this.isLoaded && !this.touchListenerIsSet) {
+            //     this.setOnTouchListener();
+            // }
+        };
+    }
+}
+function toJsObject(objCObj) {
+    if (objCObj === null || typeof objCObj !== 'object') {
+        return objCObj;
+    }
+    let node, key, i, l;
+    const oKeyArr = objCObj.allKeys;
+
+    if (oKeyArr === undefined && objCObj.count !== undefined) {
+        // array
+        node = [];
+        for (i = 0, l = objCObj.count; i < l; i++) {
+            key = objCObj.objectAtIndex(i);
+            node.push(toJsObject(key));
+        }
+    } else if (oKeyArr !== undefined) {
+        // object
+        node = {};
+        for (i = 0, l = oKeyArr.count; i < l; i++) {
+            key = oKeyArr.objectAtIndex(i);
+            const val = objCObj.valueForKey(key);
+
+            // Firestore can store nulls
+            if (val === null) {
+                node[key] = null;
+                continue;
+            }
+            node[key] = getValueForClass(val);
+        }
+    } else {
+        node = getValueForClass(objCObj);
+    }
+
+    return node;
+}
+
+function getValueForClass(val) {
+    switch (getClass(val)) {
+        case 'NSArray':
+        case 'NSMutableArray':
+            return toJsObject(val);
+        case 'NSDictionary':
+        case 'NSMutableDictionary':
+            return toJsObject(val);
+        case 'String':
+            return String(val);
+        case 'Boolean':
+            return val;
+        case 'Number':
+        case 'NSDecimalNumber':
+            return Number(String(val));
+        case 'Date':
+            return new Date(val);
+
+        default:
+            console.log(
+                "Please report this at https://github.com/farfromrefug/@nativescript-community/gesturehandler-febase/issues: iOS toJsObject is missing a converter for class '" +
+                    getClass(val) +
+                    "'. Casting to String as a fallback."
+            );
+            return String(val);
+    }
+}
+
+export class GestureRootView extends BaseGestureRootView {}
+
+@NativeClass
+export class HandlerDelegate extends NSObject implements GestureHandlerDelegate {
+    public static ObjCProtocols = [GestureHandlerDelegate];
+    private _owner: WeakRef<Handler<any, any>>;
+    static new(): HandlerDelegate {
+        return super.new() as HandlerDelegate;
+    }
+    // public initWithOwner(owner: WeakRef<Handler<any, any>>): HandlerDelegate {
+    //     this._owner = owner;
+    //     return this;
+    // }
+
+    public static initWithOwner(owner: WeakRef<Handler<any, any>>): HandlerDelegate {
+        const impl = HandlerDelegate.new();
+        impl._owner = owner;
+        return impl;
+    }
+    gestureHandlerDidChangeStatePrevStateExtraDataView(
+        handler: GestureHandler,
+        state: GestureHandlerState,
+        prevState: GestureHandlerState,
+        extraData: NSDictionary<any, any>,
+        view: UIView & { nsView?: WeakRef<View> }
+    ): void {
+        const owner = this._owner && this._owner.get();
+        if (owner) {
+            owner.notify({
+                eventName: GestureHandlerStateEvent,
+                object: owner,
+                data: {
+                    state,
+                    prevState,
+                    ios: view,
+                    extraData: toJsObject(extraData),
+                    view: view.nsView ? view.nsView.get() : null,
+                },
+            });
+        }
+    }
+    gestureHandlerTouchEventOnViewStateExtraData(handler: GestureHandler, view: UIView & { nsView?: WeakRef<View> }, state: GestureHandlerState, extraData: NSDictionary<any, any>): void {
+        const owner = this._owner && this._owner.get();
+        if (owner) {
+            owner.notify({
+                eventName: GestureHandlerTouchEvent,
+                object: owner,
+                data: {
+                    state,
+                    ios: view,
+                    extraData: toJsObject(extraData),
+                    view: view.nsView ? view.nsView.get() : null,
+                },
+            });
+        }
+    }
+    gestureHandlerShouldActivateForEvent(handler: GestureHandler, extraData: NSDictionary<any, any>) {
+        const owner = this._owner && this._owner.get();
+        if (owner && owner.options && owner.options.shouldStartGesture) {
+            return owner.options.shouldStartGesture(toJsObject(extraData));
+        }
+        return true;
+    }
+}
+
+export class Handler<T extends GestureHandler, U extends HandlerOptions> extends BaseNative<T, U> {
+    manager: WeakRef<Manager>;
+    delegate: HandlerDelegate;
+    @nativeProperty enabled: boolean;
+    @nativeProperty shouldCancelWhenOutside: boolean;
+    createNative() {
+        return null;
+    }
+    attachedView: View;
+    nativeGetterKey = 'nativeView';
+    attachToView(view: View) {
+        if (view === this.attachedView) {
+            return;
+        }
+        if (this.attachedView) {
+            this.detachFromView(this.attachedView);
+        }
+        this.attachedView = view;
+        this.delegate = HandlerDelegate.initWithOwner(new WeakRef(this));
+        this.native.delegate = this.delegate;
+        this.manager.get().attachGestureHandler(this, view);
+    }
+    detachFromView(view?: View) {
+        if ((view && view !== this.attachedView) || !this.attachedView) {
+            return;
+        }
+
+        if (!this.attachedView) {
+            return;
+        }
+        const tag = this.native.tag;
+        this.delegate = this.native.delegate = null;
+        this.manager.get().detachGestureHandler(tag, this.attachedView);
+        this.attachedView = null;
+    }
+    getTag() {
+        return this.native.tag;
+    }
+    setTag(value) {
+        // cant change tag on ios
+    }
+    getView() {
+        return this.attachedView;
+    }
+    cancel() {
+        this.native.reset();
+    }
+}
+
+export class Manager extends ManagerBase {
+    _manager: GestureHandlerManager;
+    get manager() {
+        if (!this._manager) {
+            this._manager = GestureHandlerManager.alloc().init();
+        }
+        return this._manager;
+    }
+
+    static sManager: Manager;
+    static getInstance() {
+        if (!Manager.sManager) {
+            Manager.sManager = new Manager();
+        }
+        return Manager.sManager;
+    }
+    createGestureHandler<T extends HandlerType>(handlerName: T, handlerTag: number, config?: OptionsTypeMap[T]): TypeMap[T] {
+        const nHandler = this.manager.createGestureHandlerTagConfig(handlerName, handlerTag, config ? NSDictionary.dictionaryWithDictionary(config as any) : null);
+        const result = new Handler(config, nHandler);
+        result.manager = new WeakRef(this);
+        return result as any;
+    }
+
+    viewListeners = new Map<View, Map<number, { init: () => void; dispose: () => void }>>();
+    attachGestureHandler(handler: Handler<any, any>, view: View) {
+        const tag = handler.native.tag;
+        if (view.nativeView) {
+            this.manager.attachGestureHandlerToView(tag, view[handler.nativeGetterKey]);
+        }
+        const onInit = () => {
+            this.manager.attachGestureHandlerToView(tag, view[handler.nativeGetterKey]);
+        };
+        const onDispose = () => this.manager.dropGestureHandler(tag);
+        view.on(ViewInitEvent, onInit, this);
+        view.on(ViewDisposeEvent, onDispose, this);
+        let viewListeners = this.viewListeners.get(view);
+        if (!viewListeners) {
+            viewListeners = new Map();
+            this.viewListeners.set(view, viewListeners);
+        }
+        viewListeners.set(tag, {
+            init: onInit,
+            dispose: onDispose,
+        });
+    }
+    detachGestureHandler(handlerTag: number, view: View) {
+        if (view.nativeView) {
+            this.manager.dropGestureHandler(handlerTag);
+        }
+        if (view) {
+            const viewListeners = this.viewListeners.get(view);
+            if (viewListeners) {
+                const listeners = viewListeners.get(handlerTag);
+                if (listeners) {
+                    view.off(ViewInitEvent, listeners.init, this);
+                    view.off(ViewDisposeEvent, () => listeners.dispose, this);
+                    viewListeners.delete(handlerTag);
+                    if (viewListeners.size === 0) {
+                        this.viewListeners.delete(view);
+                    }
+                }
+            }
+        }
+    }
+}

package/.history/src/references.d_20200412093513.ts

@@ -0,0 +1,3 @@
+/// <reference path="./typings/android.d.ts" />
+/// <reference path="./typings/extensions.android.d.ts" />
+/// <reference path="./typings/ios.d.ts" />

package/.history/src/references.d_20220328144701.ts

@@ -0,0 +1,3 @@
+/// <reference path="./typings/android.d.ts" />
+/// <reference path="./typings/extensions.android.d.ts" />
+/// <reference path="./typings/ios.d.ts" />

package/.history/tsconfig_20220306153539.json

@@ -0,0 +1,9 @@
+{
+    "extends": "./tools/tsconfig",
+    "compilerOptions": {
+        "paths": {
+            "@nativescript-community/health-data": ["src/health-data"],
+            "@nativescript-community/health-data/*": ["src/health-data/*"]
+        }
+    }
+}

package/.history/tsconfig_20220328152313.json

@@ -0,0 +1,9 @@
+{
+    "extends": "./tools/tsconfig",
+    "compilerOptions": {
+        "paths": {
+            "@nativescript-community/gesturehandler": ["src/gesturehandler"],
+            "@nativescript-community/gesturehandler/*": ["src/gesturehandler/*"]
+        }
+    }
+}

package/.prettierignore

@@ -0,0 +1,4 @@
+package-lock.json
+node_modules/
+plugin/
+docs/

package/.prettierrc

@@ -0,0 +1,6 @@
+{
+    "printWidth": 200,
+    "semi": true,
+    "tabWidth": 4,
+    "singleQuote": true
+}

package/.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+    printWidth: 200,
+    semi: true,
+    tabWidth: 4,
+    trailingComma: 'none',
+    singleQuote: true
+};

package/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_271.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true