@triniwiz/nativescript-masonkit 1.0.0-beta.103 → 1.0.0-beta.105

package/common.d.ts

@@ -264,6 +264,12 @@ export declare class ViewBase extends CustomLayoutView implements AddChildFromBu
     addChild(child: any): void;
     insertBefore(child: any, reference: any): void;
     private _nativeIndexFor;
+    private _attachCursor;
+    _nativeAttachIndex(child: any, atIndex: number): {
+        jsIndex: number;
+        nativeIndex: number;
+    };
+    _invalidateAttachCursor(): void;
     _windowsNativeIndexOf(child: any, atIndex: number): number;
     _childIndexToNativeChildIndex(index?: number): number;
     insertChild(child: any, atIndex: number): void;
@@ -427,6 +433,8 @@ export declare class Event {
     set button(_: number);
     get target(): any;
     set target(_: any);
+    get object(): any;
+    get eventName(): string;
     set currentTarget(_: any);
     set bubbles(_: boolean);
     set cancelable(_: boolean);
@@ -437,3 +445,12 @@ export declare class InputEvent extends Event {
     get data(): any;
     get inputType(): any;
 }
+/** DOM KeyboardEvent: dispatched on Windows. */
+export declare class KeyboardEvent extends Event {
+    get key(): string;
+    get repeat(): boolean;
+    get ctrlKey(): boolean;
+    get shiftKey(): boolean;
+    get altKey(): boolean;
+    get metaKey(): boolean;
+}

package/common.js

@@ -114,8 +114,12 @@ function masonNativeEventName(eventName) {
         case 'tap':
         case 'click':
             return 'click';
+        case 'beforeinput':
         case 'input':
         case 'change':
+        case 'focus':
+        case 'blur':
+        case 'keydown':
             return eventName;
         default:
             return null;
@@ -388,13 +392,7 @@ export class ViewBase extends CustomLayoutView {
                     invoke(event) {
                         const owner = ref.get();
                         if (owner) {
-                            let ret;
-                            if (arg === 'input') {
-                                ret = new InputEvent();
-                            }
-                            else {
-                                ret = new Event();
-                            }
+                            const ret = wrapNativeEvent(arg);
                             ret[native_] = event;
                             ret._target = owner;
                             callback.call(thisArg || owner, ret);
@@ -408,13 +406,7 @@ export class ViewBase extends CustomLayoutView {
             if (__APPLE__) {
                 //@ts-ignore
                 const id = this._view.mason_addEventListener(arg, (event) => {
-                    let ret;
-                    if (arg === 'input') {
-                        ret = new InputEvent();
-                    }
-                    else {
-                        ret = new Event();
-                    }
+                    const ret = wrapNativeEvent(arg);
                     ret[native_] = event;
                     ret._target = this;
                     callback.call(thisArg || this, ret);
@@ -454,6 +446,21 @@ export class ViewBase extends CustomLayoutView {
                     }
                     catch (_) { }
                 }
+                else if (typeof this._view.AddEventListener === 'function') {
+                    const ref = new WeakRef(this);
+                    const listener = globalThis.NSWinRT.asDelegate('NativeScript.Mason.EventListener', (event) => {
+                        const owner = ref.deref();
+                        if (!owner)
+                            return;
+                        const ret = wrapNativeEvent(arg);
+                        ret[native_] = event;
+                        ret._target = owner;
+                        callback.call(thisArg || owner, ret);
+                    });
+                    callback['mason:event:id'] = this._view.AddEventListener(arg, listener);
+                    // Held so the delegate isn't collected.
+                    callback['mason:event:listener'] = listener;
+                }
             }
         }
     }
@@ -497,6 +504,11 @@ export class ViewBase extends CustomLayoutView {
                     callback['mason:event:id'] = undefined;
                     callback['mason:event:tapped'] = undefined;
                 }
+                else if (id && typeof this._view.RemoveEventListener === 'function') {
+                    this._view.RemoveEventListener(arg, id);
+                    callback['mason:event:id'] = undefined;
+                    callback['mason:event:listener'] = undefined;
+                }
             }
         }
     }
@@ -864,6 +876,24 @@ export class ViewBase extends CustomLayoutView {
         }
         return index;
     }
+    _nativeAttachIndex(child, atIndex) {
+        const cur = this._attachCursor;
+        let jsIndex;
+        let nativeIndex;
+        if (atIndex <= -1 && cur && this._children[cur.jsIndex] === cur.child && this._children[cur.jsIndex + 1] === child) {
+            jsIndex = cur.jsIndex + 1;
+            nativeIndex = cur.nativeIndex + 1;
+        }
+        else {
+            jsIndex = atIndex <= -1 ? this._children.indexOf(child) : atIndex;
+            nativeIndex = jsIndex <= -1 ? jsIndex : this._nativeIndexFor(jsIndex);
+        }
+        this._attachCursor = jsIndex >= 0 && nativeIndex >= 0 ? { child, jsIndex, nativeIndex } : undefined;
+        return { jsIndex, nativeIndex };
+    }
+    _invalidateAttachCursor() {
+        this._attachCursor = undefined;
+    }
     // Windows attaches element children on load with no index, after text runs that attached
     // straight away, so an append would land them after text that comes later.
     _windowsNativeIndexOf(child, atIndex) {
@@ -879,6 +909,7 @@ export class ViewBase extends CustomLayoutView {
         return super._childIndexToNativeChildIndex(index);
     }
     insertChild(child, atIndex) {
+        this._invalidateAttachCursor();
         if (__WINDOWS__) {
             this._windowsSplitAnonymousText(atIndex);
         }
@@ -909,6 +940,7 @@ export class ViewBase extends CustomLayoutView {
         }
     }
     replaceChild(child, atIndex) {
+        this._invalidateAttachCursor();
         if (child && child[isPlaceholder_] && child._view) {
             this._children[atIndex] = child;
             if (this[isText_]) {
@@ -956,6 +988,7 @@ export class ViewBase extends CustomLayoutView {
         }
     }
     removeChild(child) {
+        this._invalidateAttachCursor();
         // Placeholder (e.g. Br): it was attached straight to the mason tree via the
         // native element APIs (never `_addView`-ed), so `_removeView` would throw.
         // Remove the native node directly instead.
@@ -1080,6 +1113,7 @@ export class ViewBase extends CustomLayoutView {
             this._forEachAnonymousText((anonymous) => masonEngine().RemoveChild(this._view, anonymous));
         }
         this._children.splice(0);
+        this._invalidateAttachCursor();
     }
     [(_a = isMasonView_, _b = isTextChild_, _c = isText_, _d = pseudoStyles_, zIndexProperty.setNative)](value) {
         // @ts-ignore
@@ -1285,6 +1319,7 @@ export class ViewBase extends CustomLayoutView {
     }
     // -- Unified text node update (cross-platform) --
     _updateTextNode(node, operation = null) {
+        this._invalidateAttachCursor();
         const text = String(node.text ?? node.data ?? '');
         const textNode = this._createOrUpdateNativeTextNode(node, text);
         if (!operation)
@@ -1573,6 +1608,13 @@ export class ViewBase extends CustomLayoutView {
         this._borderRadiusCorner(3, value);
     }
     _borderSideColor(side, value) {
+        if (__ANDROID__) {
+            const s = this._styleHelper;
+            if (s) {
+                s.setBorderSideColor(side === 't' ? 'top' : side === 'r' ? 'right' : side === 'b' ? 'bottom' : 'left', value);
+                return;
+            }
+        }
         let sides = this[borderSideColors_];
         if (!sides) {
             sides = this[borderSideColors_] = { t: 'transparent', r: 'transparent', b: 'transparent', l: 'transparent' };
@@ -1771,8 +1813,12 @@ export class ViewBase extends CustomLayoutView {
     // @ts-ignore
     [borderColorProperty.setNative](value) {
         if (__ANDROID__) {
+            const s = this._styleHelper;
+            if (s)
+                s.setBorderColor(String(value));
             // @ts-ignore
-            org.nativescript.mason.masonkit.NodeHelper.getShared().setBorderColor(this.nativeView, String(value));
+            else
+                org.nativescript.mason.masonkit.NodeHelper.getShared().setBorderColor(this.nativeView, String(value));
         }
         else if (__APPLE__) {
             // @ts-ignore
@@ -2653,6 +2699,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.bubbles;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.Bubbles ?? false;
+        }
         return false;
     }
     get cancelable() {
@@ -2662,6 +2711,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.cancelable;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.Cancelable ?? false;
+        }
         return false;
     }
     get isComposing() {
@@ -2671,6 +2723,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.isComposing;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.IsComposing ?? false;
+        }
         return false;
     }
     get timeStamp() {
@@ -2680,6 +2735,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.timeStamp;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.TimeStamp ?? 0;
+        }
         return 0;
     }
     get defaultPrevented() {
@@ -2689,6 +2747,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.defaultPrevented;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.DefaultPrevented ?? false;
+        }
         return false;
     }
     get propagationStopped() {
@@ -2698,6 +2759,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.propagationStopped;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.PropagationStopped ?? false;
+        }
         return false;
     }
     get immediatePropagationStopped() {
@@ -2707,6 +2771,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.immediatePropagationStopped;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.ImmediatePropagationStopped ?? false;
+        }
         return false;
     }
     get currentTarget() {
@@ -2722,6 +2789,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.stopImmediatePropagation();
         }
+        if (__WINDOWS__) {
+            return this[native_]?.StopImmediatePropagation();
+        }
     }
     stopPropagation() {
         if (__ANDROID__) {
@@ -2730,6 +2800,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.stopPropagation();
         }
+        if (__WINDOWS__) {
+            return this[native_]?.StopPropagation();
+        }
     }
     preventDefault() {
         if (__ANDROID__) {
@@ -2738,6 +2811,9 @@ export class Event {
         if (__APPLE__) {
             return this[native_]?.preventDefault();
         }
+        if (__WINDOWS__) {
+            return this[native_]?.PreventDefault();
+        }
     }
     // Writable on purpose, unlike the DOM's read-only `Event.type`. Aliases
     // (e.g. 'tap') are folded onto the native name ('click') before the event
@@ -2752,6 +2828,9 @@ export class Event {
         if (__ANDROID__) {
             return this[native_]?.getType();
         }
+        if (__WINDOWS__) {
+            return this[native_]?.Type;
+        }
         return this[native_]?.type;
     }
     set type(value) {
@@ -2768,6 +2847,12 @@ export class Event {
         return this['_target'];
     }
     set target(_) { }
+    get object() {
+        return this['_target'];
+    }
+    get eventName() {
+        return this.type;
+    }
     set currentTarget(_) { }
     set bubbles(_) { }
     set cancelable(_) { }
@@ -2807,6 +2892,9 @@ export class InputEvent extends Event {
             }
             return this[native_]?.data;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.Data ?? null;
+        }
         return false;
     }
     get inputType() {
@@ -2816,7 +2904,42 @@ export class InputEvent extends Event {
         if (__APPLE__) {
             return this[native_]?.inputType;
         }
+        if (__WINDOWS__) {
+            return this[native_]?.InputType ?? '';
+        }
         return false;
     }
 }
+/** DOM KeyboardEvent: dispatched on Windows. */
+export class KeyboardEvent extends Event {
+    get key() {
+        return this[native_]?.Key ?? '';
+    }
+    get repeat() {
+        return this[native_]?.Repeat ?? false;
+    }
+    get ctrlKey() {
+        return this[native_]?.CtrlKey ?? false;
+    }
+    get shiftKey() {
+        return this[native_]?.ShiftKey ?? false;
+    }
+    get altKey() {
+        return this[native_]?.AltKey ?? false;
+    }
+    get metaKey() {
+        return this[native_]?.MetaKey ?? false;
+    }
+}
+function wrapNativeEvent(type) {
+    switch (type) {
+        case 'beforeinput':
+        case 'input':
+            return new InputEvent();
+        case 'keydown':
+            return new KeyboardEvent();
+        default:
+            return new Event();
+    }
+}
 //# sourceMappingURL=common.js.map