@nativescript/canvas 2.0.0-beta.0 → 2.0.0-beta.10

package/Dom/shapes/Points.js

@@ -2,16 +2,24 @@ import { Property } from '@nativescript/core';
 import { Paint } from '../Paint';
 export const pointsProperty = new Property({
     name: 'points',
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
 export const modeProperty = new Property({
     name: 'mode',
     defaultValue: 'points',
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
 export class Points extends Paint {
     draw() {
         const override_color = this.parent._overrideColor;
         const context = this._canvas.getContext('2d');
-        context.strokeStyle = this.color.hex;
+        context.lineWidth = this._getStrokeWidth();
+        context.lineJoin = this._getStrokeJoin();
+        context.strokeStyle = this._getColor();
         context.drawPoints(this.mode ?? 'points', this.points);
     }
 }

package/Dom/shapes/Points.js.map

@@ -1 +1 @@
-{"version":3,"file":"Points.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Points.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAAoB,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAqC;IAC9E,IAAI,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAyC;IAChF,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,QAAQ;CACtB,CAAC,CAAC;AAEH,MAAM,OAAO,MAAO,SAAQ,KAAK;IAIhC,IAAI;QACH,MAAM,cAAc,GAAI,IAAI,CAAC,MAAc,CAAC,cAAc,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QACjF,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QACpC,OAAe,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACD;AAED,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAChC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"Points.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Points.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAAoB,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAqC;IAC9E,IAAI,EAAE,QAAQ;IACd,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAyC;IAChF,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,QAAQ;IACtB,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,MAAO,SAAQ,KAAK;IAIhC,IAAI;QACH,MAAM,cAAc,GAAI,IAAI,CAAC,MAAc,CAAC,cAAc,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QACjF,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACzC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,OAAe,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACD;AAED,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAChC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC"}

package/Dom/shapes/Rect.js

@@ -5,24 +5,36 @@ export const xProperty = new Property({
     valueConverter(value) {
         return parseFloat(value);
     },
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
 export const yProperty = new Property({
     name: 'y',
     valueConverter(value) {
         return parseFloat(value);
     },
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
 export const widthProperty = new Property({
     name: 'width',
     valueConverter(value) {
         return parseFloat(value);
     },
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
 export const heightProperty = new Property({
     name: 'height',
     valueConverter(value) {
         return parseFloat(value);
     },
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
 export class Rect extends Paint {
     constructor() {
@@ -33,26 +45,34 @@ export class Rect extends Paint {
         const context = this._canvas.getContext('2d');
         context.rect(this.x, this.y, this.width, this.height);
         if (this._children.length > 0) {
-            this._children.forEach((child) => {
-                switch (child.paintStyle) {
+            for (const child of this._children) {
+                const color = child._getColor();
+                const style = child._getPaintStyle();
+                switch (style) {
                     case 'fill':
-                        context.fillStyle = child.color.hex;
+                        context.fillStyle = color;
                         context.fill();
                         break;
                     case 'stroke':
-                        context.strokeStyle = child.color.hex;
-                        context.lineWidth = child.strokeWidth;
+                        context.strokeStyle = color;
+                        context.lineWidth = child._getStrokeWidth();
+                        context.lineJoin = child._getStrokeJoin();
                         context.stroke();
                         break;
                 }
-            });
+            }
         }
         else {
             super.draw();
         }
     }
     _addViewToNativeVisualTree(view, atIndex) {
-        if (view instanceof Paint) {
+        if (view === this._canvas) {
+            this.nativeView.addView(this._canvas.nativeView);
+            return true;
+        }
+        else if (view instanceof Paint) {
+            view._canvas = this._canvas;
             this._children.push(view);
         }
         return false;
@@ -60,4 +80,6 @@ export class Rect extends Paint {
 }
 xProperty.register(Rect);
 yProperty.register(Rect);
+widthProperty.register(Rect);
+heightProperty.register(Rect);
 //# sourceMappingURL=Rect.js.map

package/Dom/shapes/Rect.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Rect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAA8B,MAAM,oBAAoB,CAAC;AAEzF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAe;IACvD,IAAI,EAAE,OAAO;IACb,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAe;IACxD,IAAI,EAAE,QAAQ;IACd,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,IAAK,SAAQ,KAAK;IAA/B;;QAMC,cAAS,GAAY,EAAE,CAAC;IA+BzB,CAAC;IA7BA,IAAI;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QACjF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChC,QAAQ,KAAK,CAAC,UAAU,EAAE;oBACzB,KAAK,MAAM;wBACV,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;wBACpC,OAAO,CAAC,IAAI,EAAE,CAAC;wBACf,MAAM;oBACP,KAAK,QAAQ;wBACZ,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;wBACtC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC;wBACtC,OAAO,CAAC,MAAM,EAAE,CAAC;wBACjB,MAAM;iBACP;YACF,CAAC,CAAC,CAAC;SACH;aAAM;YACN,KAAK,CAAC,IAAI,EAAE,CAAC;SACb;IACF,CAAC;IAED,0BAA0B,CAAC,IAAc,EAAE,OAAgB;QAC1D,IAAI,IAAI,YAAY,KAAK,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAED,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACzB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Rect.ts"],"names":[],"mappings":"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"}

package/Dom/shapes/RoundedRect.d.ts

@@ -1,6 +1,7 @@
 import { ViewBase } from '@nativescript/core';
 import { Paint } from '../Paint';
-export declare class RoundedRect extends Paint {
+import { Rect } from './Rect';
+export declare class RoundedRect extends Rect {
     x: number;
     y: number;
     width: number;

package/Dom/shapes/RoundedRect.js

@@ -1,34 +1,43 @@
-import { Property, Screen } from '@nativescript/core';
+import { Property } from '@nativescript/core';
 import { Paint } from '../Paint';
 import { Shadow } from '../Shadow';
+import { Rect } from './Rect';
 const xProperty = new Property({
     name: 'x',
     valueConverter(value) {
         return parseFloat(value);
     },
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
 const yProperty = new Property({
     name: 'y',
     valueConverter(value) {
         return parseFloat(value);
     },
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
 const rProperty = new Property({
     name: 'r',
     valueConverter(value) {
         return parseFloat(value);
     },
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
 });
-export class RoundedRect extends Paint {
+export class RoundedRect extends Rect {
     constructor() {
         super(...arguments);
         this._children = [];
     }
     draw() {
-        const scale = Screen.mainScreen.scale;
         const context = this._canvas.getContext('2d');
         const color = this._getColor();
-        context.roundRect(this.x * scale, this.y * scale, this.width * scale, this.height * scale, this.r * scale);
+        context.roundRect(this.x, this.y, this.width, this.height, this.r);
         if (this._children.length > 0) {
             this._children.forEach((child) => {
                 const child_color = child._getColor();
@@ -40,9 +49,9 @@ export class RoundedRect extends Paint {
                             const dy = context.shadowOffsetY;
                             const blur = context.shadowBlur;
                             const shadowColor = context.shadowColor;
-                            context.shadowOffsetX = child.dx * scale;
-                            context.shadowOffsetY = child.dy * scale;
-                            context.shadowBlur = child.blur * scale;
+                            context.shadowOffsetX = child.dx;
+                            context.shadowOffsetY = child.dy;
+                            context.shadowBlur = child.blur;
                             context.shadowColor = child_color;
                             context.fill();
                             context.shadowOffsetX = dx;
@@ -56,15 +65,16 @@ export class RoundedRect extends Paint {
                         break;
                     case 'stroke':
                         context.strokeStyle = color;
-                        context.lineWidth = child.strokeWidth;
+                        context.lineWidth = child._getStrokeWidth();
+                        context.lineJoin = child._getStrokeJoin();
                         if (child instanceof Shadow) {
                             const dx = context.shadowOffsetX;
                             const dy = context.shadowOffsetY;
                             const blur = context.shadowBlur;
                             const shadowColor = context.shadowColor;
-                            context.shadowOffsetX = child.dx * scale;
-                            context.shadowOffsetY = child.dy * scale;
-                            context.shadowBlur = child.blur * scale;
+                            context.shadowOffsetX = child.dx;
+                            context.shadowOffsetY = child.dy;
+                            context.shadowBlur = child.blur;
                             context.shadowColor = child_color;
                             context.stroke();
                             context.shadowOffsetX = dx;

package/Dom/shapes/RoundedRect.js.map

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

package/Dom/shapes/index.d.ts

@@ -1,6 +1,23 @@
+import { Paint } from '../Paint';
 export * from './Rect';
 export * from './Path';
 export * from './Circle';
 export * from './RoundedRect';
 export * from './Line';
 export * from './Points';
+export * from './Oval';
+export * from './Atlas';
+export declare function vec(x: number, y: number): {
+    x: number;
+    y: number;
+};
+export declare function rect(x: number, y: number, width: number, height: number): {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+};
+export declare function drawAsImage(elements: Paint[], size?: {
+    width: number;
+    height: number;
+}): any;

package/Dom/shapes/index.js

@@ -1,7 +1,38 @@
+import { Canvas } from '../../Canvas';
 export * from './Rect';
 export * from './Path';
 export * from './Circle';
 export * from './RoundedRect';
 export * from './Line';
 export * from './Points';
+export * from './Oval';
+export * from './Atlas';
+export function vec(x, y) {
+    return { x, y };
+}
+export function rect(x, y, width, height) {
+    return { x, y, width, height };
+}
+export function drawAsImage(elements, size = { width: 300, height: 150 }) {
+    const canvas = Canvas.createCustomView();
+    if (size.width !== 300 && size.height !== 150) {
+        canvas._isBatch = true;
+        canvas.width = size.width;
+        canvas.height = size.height;
+        canvas._isBatch = false;
+        canvas._layoutNative();
+    }
+    for (const element of elements) {
+        element._addCanvas(canvas);
+        element.draw();
+    }
+    // const asset = new ImageAsset() as any;
+    const snapshot = canvas.snapshot();
+    // if (global.isAndroid) {
+    // 	const value = new java.lang.Long(asset.native.__addr);
+    // 	console.log(value);
+    // 	(org as any).nativescript.canvas.NSCImageAsset.loadImageFromBitmap(new java.lang.Long(asset.native.__addr), snapshot.android);
+    // }
+    return snapshot;
+}
 //# sourceMappingURL=index.js.map

package/Dom/shapes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AAExB,MAAM,UAAU,GAAG,CAAC,CAAS,EAAE,CAAS;IACvC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,KAAa,EAAE,MAAc;IACvE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,QAAiB,EAAE,OAA0C,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE;IACnH,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAEzC,IAAI,IAAI,CAAC,KAAK,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE;QAC7C,MAAc,CAAC,QAAQ,GAAG,IAAI,CAAC;QAChC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAc,CAAC,QAAQ,GAAG,KAAK,CAAC;QAChC,MAAc,CAAC,aAAa,EAAE,CAAC;KAChC;IAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC/B,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,EAAE,CAAC;KACf;IACD,yCAAyC;IAEzC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAEnC,0BAA0B;IAC1B,0DAA0D;IAC1D,uBAAuB;IACvB,kIAAkI;IAClI,IAAI;IAEJ,OAAO,QAAQ,CAAC;AACjB,CAAC"}

package/SVG/SVG.d.ts

@@ -1,4 +1,4 @@
-import { View, Style, CssProperty } from '@nativescript/core';
+import { View, Style, CssProperty, Property } from '@nativescript/core';
 export declare const strokeProperty: CssProperty<Style, any>;
 export declare const strokeWidthProperty: CssProperty<Style, number>;
 export declare const fillProperty: CssProperty<Style, any>;
@@ -9,6 +9,7 @@ export declare const strokeLinecapProperty: CssProperty<Style, any>;
 export declare const strokeLinejoinProperty: CssProperty<Style, any>;
 export declare const strokeMiterlimitProperty: CssProperty<Style, any>;
 export declare const srcProperty: any;
+export declare const syncProperty: Property<Svg, boolean>;
 import { SVGItem } from './SVGItem';
 export declare class Svg extends View {
     static readyEvent: string;

package/SVG/SVG.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Http, View, Style, CssProperty, Property, path, knownFolders, CSSType, Application, Utils } from '@nativescript/core';
+import { Http, View, Style, CssProperty, Property, path, knownFolders, CSSType, Application, Utils, booleanConverter } from '@nativescript/core';
 export const strokeProperty = new CssProperty({
     name: 'stroke',
     cssName: 'stroke',
@@ -53,6 +53,11 @@ export const strokeMiterlimitProperty = new CssProperty({
 export const srcProperty = new Property({
     name: 'src',
 });
+export const syncProperty = new Property({
+    name: 'sync',
+    defaultValue: false,
+    valueConverter: booleanConverter,
+});
 import { DOMParser, XMLSerializer } from 'xmldom';
 const initialSVG = '<svg width="auto" height="auto" xmlns="http://www.w3.org/2000/svg"></svg>';
 let Svg = class Svg extends View {
@@ -115,6 +120,14 @@ let Svg = class Svg extends View {
             }
         }
     }
+    [syncProperty.setNative](value) {
+        if (global.isAndroid) {
+            this._svg.setSync(value);
+        }
+        else if (global.isIOS) {
+            this._svg.sync = value;
+        }
+    }
     onLayout(left, top, right, bottom) {
         super.onLayout(left, top, right, bottom);
         this.__redraw();
@@ -177,6 +190,7 @@ Svg = __decorate([
     __metadata("design:paramtypes", [])
 ], Svg);
 export { Svg };
+syncProperty.register(Svg);
 srcProperty.register(Svg);
 stopColorProperty.register(Style);
 strokeWidthProperty.register(Style);

package/SVG/SVG.js.map

@@ -1 +1 @@
-{"version":3,"file":"SVG.js","sourceRoot":"","sources":["../../../../packages/canvas/SVG/SVG.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAA8B,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3J,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,WAAW,CAAa;IACzD,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,QAAQ;IACjB,YAAY,EAAE,SAAS;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,WAAW,CAAgB;IACjE,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,cAAc;IACvB,YAAY,EAAE,CAAC;CACf,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,WAAW,CAAa;IACvD,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,MAAM;IACf,YAAY,EAAE,SAAS;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,WAAW,CAAa;IAC3D,IAAI,EAAE,UAAU;IAChB,OAAO,EAAE,WAAW;IACpB,YAAY,EAAE,SAAS;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,WAAW,CAAa;IAC9D,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,cAAc;IACvB,YAAY,EAAE,SAAS;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,WAAW,CAAa;IAC5D,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,YAAY;IACrB,YAAY,EAAE,SAAS;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,WAAW,CAAa;IAChE,IAAI,EAAE,eAAe;IACrB,OAAO,EAAE,gBAAgB;CACzB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,WAAW,CAAa;IACjE,IAAI,EAAE,gBAAgB;IACtB,OAAO,EAAE,iBAAiB;CAC1B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,WAAW,CAAa;IACnE,IAAI,EAAE,kBAAkB;IACxB,OAAO,EAAE,mBAAmB;CAC5B,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAc;IACpD,IAAI,EAAE,KAAK;CACX,CAAC,CAAC;AAIH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAClD,MAAM,UAAU,GAAG,2EAA2E,CAAC;AAExF,IAAM,GAAG,GAAT,MAAM,GAAI,SAAQ,IAAI;IAQ5B;QACC,KAAK,EAAE,CAAC;QAHT,eAAU,GAAG,EAAE,CAAC;QAChB,oBAAe,GAAG,KAAK,CAAC;QAGvB,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,kBAAkB,IAAI,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;YAC7F,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACzD;aAAM,IAAI,MAAM,CAAC,KAAK,EAAE;YACxB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACrD,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;SAC/C;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,EAAE,CAAC;IACxC,CAAC;IAED,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,KAAa;QACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC/B,IAAI,MAAM,CAAC,SAAS,EAAE;oBACrB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBACxB;qBAAM,IAAI,MAAM,CAAC,KAAK,EAAE;oBACxB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC;iBACtB;aACD;iBAAM;gBACN,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;oBAC1B,IAAI,MAAM,CAAC,SAAS,EAAE;wBACrB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;qBACxF;yBAAM,IAAI,MAAM,CAAC,KAAK,EAAE;wBACxB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;qBACtF;iBACD;qBAAM,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;oBACjC,IAAI,MAAM,CAAC,SAAS,EAAE;wBACrB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;qBAC5B;yBAAM,IAAI,MAAM,CAAC,KAAK,EAAE;wBACxB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;qBAC1B;iBACD;qBAAM,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;oBACpC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;yBACnB,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;wBACb,IAAI,MAAM,CAAC,SAAS,EAAE;4BACrB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;yBACtB;6BAAM,IAAI,MAAM,CAAC,KAAK,EAAE;4BACxB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;yBACpB;oBACF,CAAC,CAAC;yBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;wBACZ,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBAChB,CAAC,CAAC,CAAC;iBACJ;aACD;SACD;IACF,CAAC;IAEM,QAAQ,CAAC,IAAY,EAAE,GAAW,EAAE,KAAa,EAAE,MAAc;QACvE,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjB,CAAC;IAEM,SAAS,CAAC,gBAAwB,EAAE,iBAAyB;QACnE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,UAAU,EAAE;YACf,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YAClE,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SACzC;IACF,CAAC;IAED,QAAQ;QACP,IAAI,IAAI,CAAC,eAAe,EAAE;YACzB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC9D,IAAI,KAAK,KAAK,MAAM,EAAE;gBACrB,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;aAC9E;YACD,IAAI,MAAM,KAAK,MAAM,EAAE;gBACtB,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;aAChF;YACD,IAAI,UAAU,KAAK,UAAU,EAAE;gBAC9B,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC;aACtB;SACD;IACF,CAAC;IAED,QAAQ;QACP,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,UAAU;QACT,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,KAAK,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IAED,cAAc;QACb,KAAK,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAED,QAAQ,CAAC,IAAa;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,WAAW,CAAC,IAAa;QACxB,IAAI,IAAI,CAAC,UAAU,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;SAClE;IACF,CAAC;;AAxHa,cAAU,GAAG,OAAO,CAAC;AADvB,GAAG;IADf,OAAO,CAAC,KAAK,CAAC;;GACF,GAAG,CA0Hf;SA1HY,GAAG;AA4HhB,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC1B,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAClC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACpC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC/B,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC7B,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACpC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACjC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACtC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACvC,wBAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}
+{"version":3,"file":"SVG.js","sourceRoot":"","sources":["../../../../packages/canvas/SVG/SVG.ts"],"names":[],"mappings":"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"}

package/WebGL/WebGLRenderingContext/index.js

@@ -23,6 +23,13 @@ import { ImageAsset } from '../../ImageAsset';
 import { Canvas } from '../../Canvas';
 import { ImageBitmap } from '../../ImageBitmap';
 import { Helpers } from '../../helpers';
+var ContextType;
+(function (ContextType) {
+    ContextType[ContextType["None"] = 0] = "None";
+    ContextType[ContextType["Canvas"] = 1] = "Canvas";
+    ContextType[ContextType["WebGL"] = 2] = "WebGL";
+    ContextType[ContextType["WebGL2"] = 3] = "WebGL2";
+})(ContextType || (ContextType = {}));
 let ctor;
 export class WebGLRenderingContextBase extends WebGLRenderingCommon {
     constructor(context, contextOptions) {
@@ -593,6 +600,21 @@ export class WebGLRenderingContextBase extends WebGLRenderingCommon {
             }
             else if (border instanceof Canvas) {
                 this.native.texImage2D(target, level, internalformat, width, height, border.native);
+                if (global.isAndroid) {
+                    this.native.texImage2D(target, level, internalformat, width, height, border.native);
+                }
+                else {
+                    if (border._contextType === ContextType.Canvas) {
+                        if (!border._renderer) {
+                            border._renderer = Utils.setupRender();
+                            border._renderer.createSurface();
+                        }
+                        border._renderer.texImage2D(target, level, internalformat, width, height, border._canvas, this.canvas._canvas, this.native.__flipY);
+                    }
+                    else {
+                        this.native.texImage2D(target, level, internalformat, width, height, border.native);
+                    }
+                }
             }
             else if (global.isAndroid && border instanceof android.graphics.Bitmap) {
                 // todo ios
@@ -621,7 +643,21 @@ export class WebGLRenderingContextBase extends WebGLRenderingCommon {
                 }
             }
             else if (border && typeof border.tagName === 'string' && border.tagName === 'CANVAS' && border._canvas instanceof Canvas) {
-                this.native.texImage2D(target, level, internalformat, width, height, border._canvas.native);
+                if (global.isAndroid) {
+                    this.native.texImage2D(target, level, internalformat, width, height, border._canvas.native);
+                }
+                else {
+                    if (border._canvas._contextType === ContextType.Canvas) {
+                        if (!border._canvas._renderer) {
+                            border._canvas._renderer = Utils.setupRender();
+                            border._canvas._renderer.createSurface();
+                        }
+                        border._canvas._renderer.texImage2D(target, level, internalformat, width, height, border._canvas._canvas, this.canvas._canvas, this.native.__flipY);
+                    }
+                    else {
+                        this.native.texImage2D(target, level, internalformat, width, height, border._canvas.native);
+                    }
+                }
             }
         }
     }