@nativescript/canvas-polyfill 2.0.0-beta.19 → 2.0.0-beta.20

package/DOM/Element.js

@@ -19,12 +19,102 @@ export class DOMRect extends DOMRectReadOnly {
         super(x, y, width, height, top, right, bottom, left);
     }
 }
+export function parseChildren(element, children) {
+    if (element) {
+        const length = element?.childNodes?.length ?? 0;
+        for (let i = 0; i < length; i++) {
+            const node = element.childNodes.item(i);
+            if (node) {
+                switch (node.nodeName) {
+                    case 'image': {
+                        const image = new SVGImageElement();
+                        image.nativeElement.__domElement = node;
+                        children.push(image);
+                    }
+                    case 'line':
+                        {
+                            const line = new SVGLineElement();
+                            line.nativeElement.__domElement = node;
+                            children.push(line);
+                        }
+                        break;
+                    case 'polyline':
+                        {
+                            const polyline = new SVGPolylineElement();
+                            polyline.nativeElement.__domElement = node;
+                            children.push(polyline);
+                        }
+                        break;
+                    case 'polygon':
+                        {
+                            const polygon = new SVGPolygonElement();
+                            polygon.nativeElement.__domElement = node;
+                            children.push(polygon);
+                        }
+                        break;
+                    case 'g':
+                        {
+                            const g = new SVGGElement();
+                            g.nativeElement.__domElement = node;
+                            children.push(g);
+                        }
+                        break;
+                    case 'path':
+                        {
+                            const path = new SVGPathElement();
+                            path.nativeElement.__domElement = node;
+                            children.push(path);
+                        }
+                        break;
+                    case 'rect':
+                        {
+                            const rect = new SVGRectElement();
+                            rect.nativeElement.__domElement = node;
+                            children.push(rect);
+                        }
+                        break;
+                    case 'stop':
+                        {
+                            const stop = new SVGStopElement();
+                            stop.nativeElement.__domElement = node;
+                            children.push(stop);
+                        }
+                        break;
+                    case 'use':
+                        {
+                            const use = new SVGUseElement();
+                            use.nativeElement.__domElement = node;
+                            children.push(use);
+                        }
+                        break;
+                    default:
+                        //	ret.push(node);
+                        break;
+                }
+            }
+        }
+    }
+}
 export class Element extends Node {
     constructor(tagName) {
         super(tagName.toUpperCase());
         this._classList = new Set();
         this._attrs = new Map();
         this._attributeOriginalValue = new Map();
+        this._id = '';
+        this._children = new HTMLCollection();
+        this._namespaceURI = null;
+    }
+    get namespaceURI() {
+        return this._namespaceURI;
+    }
+    set id(value) {
+        this._id = value;
+        setValue(this.nativeElement, 'id', value);
+        setValue(this.nativeElement?.__domElement, 'id', value);
+    }
+    get id() {
+        return this._id;
     }
     set nativeElement(value) {
         this._nativeElement = value;
@@ -51,67 +141,33 @@ export class Element extends Node {
         return this.nodeName;
     }
     get children() {
-        const element = this._xmlDom?.documentElement ?? this._xmlDom;
+        if (this._children.length) {
+            return this._children;
+        }
+        if (this.ownerDocument?.nodeName === '#document' && this.ownerDocument?.body?.nodeName?.toLowerCase?.() === 'html') {
+            this._children.push(document.documentElement);
+            this._children.push(document.head);
+            this._children.push(document.body);
+        }
+        const element = this.nativeElement?.__domElement;
         if (element) {
-            const ret = new HTMLCollection();
-            const length = element?.childNodes?.length ?? 0;
-            for (let i = 0; i < length; i++) {
-                const node = element.childNodes.item(i);
-                if (node) {
-                    switch (node.nodeName) {
-                        case 'line':
-                            {
-                                const line = new SVGLineElement();
-                                line.__instance = node;
-                                ret.push(line);
-                            }
-                            break;
-                        case 'polyline':
-                            {
-                                const polyline = new SVGPolylineElement();
-                                polyline.__instance = node;
-                                ret.push(polyline);
-                            }
-                            break;
-                        case 'g':
-                            {
-                                const g = new SVGGElement();
-                                g.__instance = node;
-                                ret.push(g);
-                            }
-                            break;
-                        case 'path':
-                            {
-                                const path = new SVGPathElement();
-                                path.__instance = node;
-                                ret.push(path);
-                            }
-                            break;
-                        case 'rect':
-                            {
-                                const rect = new SVGRectElement();
-                                rect.__instance = node;
-                                ret.push(rect);
-                            }
-                            break;
-                    }
-                }
-            }
-            return ret;
+            parseChildren(element, this._children);
+            return this._children;
         }
         return [];
     }
     getAttribute(key) {
         if (this.nativeElement) {
-            return this.nativeElement[key];
+            return this.nativeElement[key] ?? null;
         }
-        return this._attrs.get(key);
+        return this._attrs.get(key) ?? null;
     }
     setAttribute(key, value) {
         if (this.nativeElement) {
             if (!this._attributeOriginalValue.has(key)) {
                 this._attributeOriginalValue.set(key, this.nativeElement[key]);
                 setValue(this.nativeElement, key, value);
+                this.nativeElement?.__domElement?.setAttribute(key, value);
             }
         }
         else {
@@ -126,6 +182,7 @@ export class Element extends Node {
         this._attributeOriginalValue.delete(key);
         if (this.nativeElement) {
             setValue(this.nativeElement, key, originalValue);
+            this.nativeElement?.__domElement?.removeAttribute(key);
         }
         else {
             setValue(this._attrs, key, originalValue);
@@ -134,9 +191,19 @@ export class Element extends Node {
     setAttributeNS() { }
     removeAttributeNS() { }
     querySelector(selector) {
-        const selection = querySelector(selector, this);
+        const context = this._xmlDom?.documentElement ?? this._xmlDom;
+        const selection = querySelector(selector, context);
         if (Array.isArray(selection)) {
-            return selection[0];
+            const item = selection[0];
+            if (item) {
+                switch (item.nodeName) {
+                    case 'linearGradient': {
+                        const ret = new SVGLinearGradientElement();
+                        ret.__instance = item;
+                        return ret;
+                    }
+                }
+            }
         }
         return null;
     }
@@ -170,6 +237,9 @@ export class Element extends Node {
         };
     }
     get attributes() {
+        if (this.nativeElement) {
+            return this.nativeElement.__domElement?.attributes;
+        }
         return [];
     }
     get clientWidth() {
@@ -185,35 +255,47 @@ export class Element extends Node {
         return this.innerHeight;
     }
     get innerWidth() {
-        return this.width;
+        if (this.nativeElement) {
+            return this.nativeElement['width'];
+        }
+        return this['width'];
     }
     get innerHeight() {
-        return this.height;
+        if (this.nativeElement) {
+            return this.nativeElement['height'];
+        }
+        return this['height'];
     }
+    /*
+
     get width() {
         if (this.nativeElement) {
-            return this.nativeElement['width'];
+            return this.nativeElement['width'] as never;
         }
         return this._width;
     }
-    set width(value) {
+
+    set width(value: number) {
         this._width = value;
         if (this.nativeElement) {
             setValue(this.nativeElement, 'width', value);
         }
     }
+
     get height() {
         if (this.nativeElement) {
-            return this.nativeElement['height'];
+            return this.nativeElement['height'] as never;
         }
         return this._height;
     }
-    set height(value) {
+
+    set height(value: number) {
         this._height = value;
         if (this.nativeElement) {
             setValue(this.nativeElement, 'height', value);
         }
     }
+    */
     get ontouchstart() {
         return {};
     }

package/DOM/Element.js.map

@@ -1 +1 @@
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/Element.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/Element.ts"],"names":[],"mappings":"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"}

package/DOM/EventTarget.js

@@ -20,7 +20,7 @@ export class EventTarget {
             emitter = this._emitter?.deref?.();
         }
         if (emitter !== null && emitter !== undefined) {
-            emitter.addEventListener(event, handler);
+            emitter.addEventListener(event, handler, this);
         }
     }
     removeEventListener(event, handler) {
@@ -44,7 +44,7 @@ export class EventTarget {
             emitter = this._emitter?.deref?.();
         }
         if (emitter !== null && emitter !== undefined) {
-            emitter.notify({ ...event, eventName: event.type, object: event.target ?? this });
+            emitter.notify({ ...event, eventName: event.type, object: emitter });
         }
     }
 }

package/DOM/EventTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventTarget.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/EventTarget.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;IAGvB,gBAAgB,CACf,KAAa,EACb,OAAY,EACZ,UAAmC,EAAE;QAErC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAClC,IAAI,OAAO,EAAE;YACZ,kDAAkD;SAClD;QACD,IAAI,IAAI,EAAE;YACT,MAAM,UAAU,GAAG,OAAO,CAAC;YAC3B,MAAM,IAAI,GAAG,IAAI,CAAC;YAClB,OAAO,GAAG,CAAC,GAAG,IAAS,EAAE,EAAE;gBAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1C,CAAC,CAAC;SACF;QACD,IAAI,OAAmB,CAAC;QAExB,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC;SACjC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;SACnC;QACD,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC9C,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACzC;IACF,CAAC;IAED,mBAAmB,CAAC,KAAa,EAAE,OAAa;QAC/C,IAAI,OAAmB,CAAC;QAExB,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC;SACjC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;SACnC;QAED,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC9C,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SAC5C;IACF,CAAC;IAED,aAAa,CAAC,KAAK;QAClB,IAAI,OAAmB,CAAC;QAExB,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC;SACjC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;SACnC;QAED,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC9C,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAe,IAAI,IAAI,EAAE,CAAC,CAAC;SAC3F;IACF,CAAC;CACD"}
+{"version":3,"file":"EventTarget.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/EventTarget.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;IAGvB,gBAAgB,CAAC,KAAa,EAAE,OAAY,EAAE,UAAmC,EAAE;QAClF,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAClC,IAAI,OAAO,EAAE;YACZ,kDAAkD;SAClD;QACD,IAAI,IAAI,EAAE;YACT,MAAM,UAAU,GAAG,OAAO,CAAC;YAC3B,MAAM,IAAI,GAAG,IAAI,CAAC;YAClB,OAAO,GAAG,CAAC,GAAG,IAAS,EAAE,EAAE;gBAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1C,CAAC,CAAC;SACF;QACD,IAAI,OAAmB,CAAC;QAExB,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC;SACjC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;SACnC;QACD,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC9C,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;SAC/C;IACF,CAAC;IAED,mBAAmB,CAAC,KAAa,EAAE,OAAa;QAC/C,IAAI,OAAmB,CAAC;QAExB,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC;SACjC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;SACnC;QAED,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC9C,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SAC5C;IACF,CAAC;IAED,aAAa,CAAC,KAAK;QAClB,IAAI,OAAmB,CAAC;QAExB,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC;SACjC;QAED,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;SACnC;QAED,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC9C,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;SACrE;IACF,CAAC;CACD"}

package/DOM/HTMLCanvasElement.d.ts

@@ -1,11 +1,13 @@
 import { HTMLElement } from './HTMLElement';
 export declare class HTMLCanvasElement extends HTMLElement {
     constructor();
-    get _canvas(): import("@nativescript/core").ViewBase;
-    set width(value: any);
-    get width(): any;
-    set height(value: any);
-    get height(): any;
+    get _canvas(): import("@nativescript/core").View & {
+        __domElement?: import("./Element").Element;
+    };
+    set width(value: never);
+    get width(): never;
+    set height(value: never);
+    get height(): never;
     toDataURL(type: string, encoderOptions?: number): string;
     getContext(contextType: string, contextOptions: any): any;
     setPointerCapture(id: string): void;

package/DOM/HTMLCanvasElement.js

@@ -1,6 +1,7 @@
 import { Canvas } from '@nativescript/canvas';
 import { HTMLElement } from './HTMLElement';
 import setValue from 'set-value';
+import { DOMParser } from '@xmldom/xmldom';
 export class HTMLCanvasElement extends HTMLElement {
     constructor() {
         super('canvas');
@@ -14,6 +15,9 @@ export class HTMLCanvasElement extends HTMLElement {
         else {
             this.nativeElement = Canvas.createCustomView();
         }
+        if (!this.nativeElement.__domElement) {
+            this.nativeElement.__domElement = new DOMParser().parseFromString('<canvas></canvas>', 'text/html').documentElement;
+        }
     }
     get _canvas() {
         return this.nativeElement;
@@ -44,9 +48,7 @@ export class HTMLCanvasElement extends HTMLElement {
         }
         return null;
     }
-    setPointerCapture(id) {
-    }
-    releasePointerCapture(id) {
-    }
+    setPointerCapture(id) { }
+    releasePointerCapture(id) { }
 }
 //# sourceMappingURL=HTMLCanvasElement.js.map

package/DOM/HTMLCanvasElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"HTMLCanvasElement.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/HTMLCanvasElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACjD;QACC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;SACtB;QAED,IAAI,MAAM,YAAY,MAAM,EAAE;YAC7B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;SAC5B;aAAM;YACN,IAAI,CAAC,aAAa,GAAI,MAAc,CAAC,gBAAgB,EAAE,CAAC;SACxD;IACF,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK,CAAC,KAAK;QACd,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,MAAM,CAAC,KAAK;QACf,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,iBAAyB,IAAI;QACpD,MAAM,aAAa,GAAG,IAAI,CAAC,aAE1B,CAAC;QAEF,IAAI,aAAa,EAAE;YAClB,OAAO,aAAa,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACvD;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,UAAU,CAAC,WAAmB,EAAE,cAAc;QAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,aAE1B,CAAC;QACF,IAAI,aAAa,EAAE;YAClB,OAAO,aAAa,CAAC,UAAU,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;SAC7D;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,iBAAiB,CAAC,EAAU;IAC5B,CAAC;IAED,qBAAqB,CAAC,EAAU;IAChC,CAAC;CAED"}
+{"version":3,"file":"HTMLCanvasElement.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/HTMLCanvasElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACjD;QACC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;SACtB;QAED,IAAI,MAAM,YAAY,MAAM,EAAE;YAC7B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;SAC5B;aAAM;YACN,IAAI,CAAC,aAAa,GAAI,MAAc,CAAC,gBAAgB,EAAE,CAAC;SACxD;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE;YACrC,IAAI,CAAC,aAAa,CAAC,YAAY,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC,eAAwB,CAAC;SAC7H;IACF,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK,CAAC,KAAK;QACd,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAU,CAAC;IAC7C,CAAC;IAED,IAAI,MAAM,CAAC,KAAK;QACf,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAU,CAAC;IAC9C,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,iBAAyB,IAAI;QACpD,MAAM,aAAa,GAAG,IAAI,CAAC,aAE1B,CAAC;QAEF,IAAI,aAAa,EAAE;YAClB,OAAO,aAAa,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACvD;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,UAAU,CAAC,WAAmB,EAAE,cAAc;QAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,aAE1B,CAAC;QACF,IAAI,aAAa,EAAE;YAClB,OAAO,aAAa,CAAC,UAAU,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;SAC7D;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,iBAAiB,CAAC,EAAU,IAAG,CAAC;IAEhC,qBAAqB,CAAC,EAAU,IAAG,CAAC;CACpC"}

package/DOM/HTMLDivElement.js

@@ -11,6 +11,9 @@ export class HTMLDivElement extends HTMLElement {
         else {
             this.nativeElement = arguments[0];
         }
+        if (!this.nativeElement.__domElement) {
+            this.nativeElement.__domElement = new DOMParser().parseFromString('<div></div>', 'text/html').documentElement;
+        }
     }
 }
 //# sourceMappingURL=HTMLDivElement.js.map

package/DOM/HTMLDivElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"HTMLDivElement.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/HTMLDivElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC9C;QACC,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAEzB,4BAA4B;QAC5B,IAAI,CAAC,CAAC,GAAG,YAAY,WAAW,CAAC,EAAE;YAClC,IAAI,CAAC,aAAa,GAAG,IAAI,WAAW,EAAE,CAAC;SACvC;aAAM;YACN,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;SAClC;IACF,CAAC;CACD"}
+{"version":3,"file":"HTMLDivElement.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/HTMLDivElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC9C;QACC,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAEzB,4BAA4B;QAC5B,IAAI,CAAC,CAAC,GAAG,YAAY,WAAW,CAAC,EAAE;YAClC,IAAI,CAAC,aAAa,GAAG,IAAI,WAAW,EAAE,CAAC;SACvC;aAAM;YACN,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;SAClC;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE;YACrC,IAAI,CAAC,aAAa,CAAC,YAAY,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,eAAwB,CAAC;SACvH;IACF,CAAC;CACD"}

package/DOM/HTMLElement.d.ts

@@ -1,7 +1,7 @@
 import { Element } from './Element';
 import { ViewBase } from '@nativescript/core';
 export declare class Style {
-    proxy: any;
+    _proxy: any;
     constructor();
     _values: Map<any, any>;
     nativeElement: WeakRef<ViewBase>;
@@ -12,4 +12,10 @@ export declare class HTMLElement extends Element {
     private _style;
     constructor(tagName?: string);
     get style(): Style | import("@nativescript/core").Style;
+    set nativeElement(value: import("@nativescript/core").View & {
+        __domElement?: Element;
+    });
+    get nativeElement(): import("@nativescript/core").View & {
+        __domElement?: Element;
+    };
 }

package/DOM/HTMLElement.js

@@ -1,30 +1,35 @@
 import { Element } from './Element';
+import setValue from 'set-value';
 export class Style {
     constructor() {
         const values = new Map();
-        this.proxy = new Proxy(this, {
+        this._values = values;
+        this._proxy = new Proxy(this, {
             set(target, prop, value) {
                 target.setProperty(prop, value);
                 return true;
             },
             get(target, prop, receiver) {
                 return target.getPropertyValue(prop);
-            }
+            },
         });
-        this._values = values;
     }
     setProperty(key, val) {
+        const nativeElement = this.nativeElement?.deref?.();
+        let value = val;
+        if (typeof value === 'string' && value.includes('px')) {
+            value = value.replace('px', '');
+        }
+        if (nativeElement !== null) {
+            setValue(nativeElement, key, val);
+        }
         this._values.set(key, val);
-        // const nativeElement = this.nativeElement?.deref?.();
-        // if (nativeElement !== null) {
-        // 	setValue(nativeElement, key, val);
-        // }
     }
     getPropertyValue(key) {
-        // const nativeElement = this.nativeElement?.deref?.();
-        // if (nativeElement !== null) {
-        // 	return nativeElement[key];
-        // }
+        const nativeElement = this.nativeElement?.deref?.();
+        if (nativeElement !== null) {
+            return nativeElement[key];
+        }
         return this._values.get(key);
     }
 }
@@ -39,5 +44,19 @@ export class HTMLElement extends Element {
         }
         return this._style;
     }
+    set nativeElement(value) {
+        this._nativeElement = value;
+        if (value) {
+            this._emitter = new WeakRef(value);
+            this._style.nativeElement = new WeakRef(value);
+        }
+        else {
+            this._emitter = value;
+            this._style.nativeElement = value;
+        }
+    }
+    get nativeElement() {
+        return this._nativeElement;
+    }
 }
 //# sourceMappingURL=HTMLElement.js.map

package/DOM/HTMLElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"HTMLElement.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/HTMLElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,OAAO,KAAK;IAGjB;QACC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE;YAC5B,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK;gBACtB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAChC,OAAO,IAAI,CAAC;YACb,CAAC;YACD,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ;gBACzB,OAAO,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACtC,CAAC;SACD,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAKD,WAAW,CAAC,GAAoB,EAAE,GAAY;QAC7C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3B,uDAAuD;QACvD,gCAAgC;QAChC,sCAAsC;QACtC,IAAI;IACL,CAAC;IAED,gBAAgB,CAAC,GAAoB;QACpC,uDAAuD;QACvD,gCAAgC;QAChC,8BAA8B;QAC9B,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACD;AAED,MAAM,OAAO,WAAY,SAAQ,OAAO;IAIvC,YAAY,UAAkB,EAAE;QAC/B,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAHd,WAAM,GAAG,IAAI,KAAK,EAAE,CAAC;IAI7B,CAAC;IAED,IAAI,KAAK;QACR,IAAI,IAAI,CAAC,aAAa,EAAE;YACvB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;CAED"}
+{"version":3,"file":"HTMLElement.js","sourceRoot":"","sources":["../../../../packages/canvas-polyfill/DOM/HTMLElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,MAAM,OAAO,KAAK;IAEjB;QACC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE;YAC7B,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK;gBACtB,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAChC,OAAO,IAAI,CAAC;YACb,CAAC;YACD,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ;gBACzB,OAAO,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACtC,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;IAKD,WAAW,CAAC,GAAoB,EAAE,GAAY;QAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE,CAAC;QACpD,IAAI,KAAK,GAAG,GAAG,CAAC;QAChB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACtD,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;SAChC;QACD,IAAI,aAAa,KAAK,IAAI,EAAE;YAC3B,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,gBAAgB,CAAC,GAAoB;QACpC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE,CAAC;QACpD,IAAI,aAAa,KAAK,IAAI,EAAE;YAC3B,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACD;AAED,MAAM,OAAO,WAAY,SAAQ,OAAO;IAGvC,YAAY,UAAkB,EAAE;QAC/B,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK;QACR,IAAI,IAAI,CAAC,aAAa,EAAE;YACvB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,IAAI,aAAa,CAAC,KAAK;QACtB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,KAAK,EAAE;YACV,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;SAC/C;aAAM;YACN,IAAI,CAAC,QAAQ,GAAG,KAAc,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,KAAc,CAAC;SAC3C;IACF,CAAC;IAED,IAAI,aAAa;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;CACD"}

package/DOM/HTMLImageElement.d.ts

@@ -6,7 +6,10 @@ export declare class HTMLImageElement extends HTMLElement {
     private _onerror;
     private _complete;
     private _base64;
+    width: number;
+    height: number;
     _asset: ImageAsset;
+    _svg: any;
     __id: any;
     decoding: string;
     get src(): any;
@@ -17,6 +20,7 @@ export declare class HTMLImageElement extends HTMLElement {
     set onerror(value: any);
     get complete(): any;
     set complete(value: any);
+    static _fromSvg(svg: any): HTMLImageElement;
     constructor(props?: any);
     _load(): void;
 }