@nativescript/canvas 1.1.0 → 2.0.0-alpha.1

package/Canvas/index.android.js

@@ -7,35 +7,40 @@ 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 { CanvasBase, ignorePixelScalingProperty, scalingProperty } from './common';
+import { CanvasBase, ignorePixelScalingProperty } from './common';
 import { DOMMatrix } from '../Canvas2D';
 import { CanvasRenderingContext2D } from '../Canvas2D/CanvasRenderingContext2D';
 import { WebGLRenderingContext } from '../WebGL/WebGLRenderingContext';
 import { WebGL2RenderingContext } from '../WebGL2/WebGL2RenderingContext';
-import { Application, View, profile, ImageSource } from '@nativescript/core';
+import { Application, View, profile } from '@nativescript/core';
 export function createSVGMatrix() {
-    return new DOMMatrix(org.nativescript.canvas.TNSCanvas.createSVGMatrix());
+    return new DOMMatrix();
 }
 export * from './common';
+const defaultOpts = {
+    alpha: true,
+    antialias: true,
+    depth: true,
+    failIfMajorPerformanceCaveat: false,
+    powerPreference: 'default',
+    premultipliedAlpha: true,
+    preserveDrawingBuffer: false,
+    stencil: false,
+    desynchronized: false,
+    xrCompatible: false,
+};
 export class Canvas extends CanvasBase {
-    constructor(useCpu = false) {
+    constructor() {
         super();
         this._ready = false;
         this._didPause = false;
-        if (arguments.length === 1) {
-            if (typeof arguments[0] === 'boolean') {
-                useCpu = arguments[0];
-            }
-        }
+        this._didLayout = false;
         const activity = Application.android.foregroundActivity || Application.android.startActivity;
-        this._canvas = new org.nativescript.canvas.TNSCanvas(activity, useCpu);
+        this._canvas = new org.nativescript.canvas.NSCCanvas(activity);
         global.__canvasLoaded = true;
     }
     [ignorePixelScalingProperty.setNative](value) {
-        this._canvas?.setIgnorePixelScaling?.(value);
-    }
-    [scalingProperty.setNative](value) {
-        this._canvas?.setScaling?.(value);
+        this._canvas.setIgnorePixelScaling(value);
     }
     // @ts-ignore
     get android() {
@@ -63,6 +68,7 @@ export class Canvas extends CanvasBase {
     }
     set width(value) {
         this.style.width = value;
+        this._didLayout = false;
         if (this._isCustom) {
             this._layoutNative();
         }
@@ -83,6 +89,7 @@ export class Canvas extends CanvasBase {
     }
     set height(value) {
         this.style.height = value;
+        this._didLayout = false;
         if (this._isCustom) {
             this._layoutNative();
         }
@@ -92,6 +99,7 @@ export class Canvas extends CanvasBase {
         canvas.width = 300;
         canvas.height = 150;
         canvas._isCustom = true;
+        canvas._layoutNative();
         return canvas;
     }
     createNativeView() {
@@ -102,9 +110,6 @@ export class Canvas extends CanvasBase {
         if (this.ignorePixelScaling) {
             this._canvas.setIgnorePixelScaling(this.ignorePixelScaling);
         }
-        if (this.scaling) {
-            this._canvas.setScaling(this.scaling);
-        }
         const ref = new WeakRef(this);
         this.on(View.layoutChangedEvent, (args) => {
             const parent = this.parent;
@@ -122,7 +127,7 @@ export class Canvas extends CanvasBase {
                 });
             }
         });
-        this._canvas.setListener(new org.nativescript.canvas.TNSCanvas.Listener({
+        this._canvas.setListener(new org.nativescript.canvas.NSCCanvas.Listener({
             contextReady() {
                 const owner = ref.get();
                 if (owner && !owner._ready) {
@@ -130,6 +135,12 @@ export class Canvas extends CanvasBase {
                     owner._readyEvent();
                 }
             },
+            surfaceResize(width, height) {
+                //console.log('surfaceResize', width, height);
+                // if(this._webglContext || this._webgl2Context){
+                // 	(this._webglContext || this._webgl2Context)?.resize();
+                // }
+            },
         }));
     }
     onUnloaded() {
@@ -148,31 +159,20 @@ export class Canvas extends CanvasBase {
             // }
         }
     }
-    flush() {
-        if (this._didPause) {
-            return;
-        }
-        if (this._canvas) {
-            this._canvas.flush();
-        }
-    }
     disposeNativeView() {
         this._canvas.setListener(null);
         super.disposeNativeView();
     }
     toDataURL(type = 'png', encoderOptions = 0.92) {
-        return this.android.toDataURL(type, encoderOptions);
-    }
-    snapshot(flip = false) {
-        if (this._canvas) {
-            const bm = this._canvas.getImage?.(flip ?? false);
-            if (bm) {
-                return new ImageSource(bm);
-            }
+        if (this._2dContext) {
+            return this._2dContext.__toDataURL(type, encoderOptions);
         }
-        return null;
+        return (this._webglContext || this._webgl2Context).__toDataURL(type, encoderOptions);
     }
     _layoutNative() {
+        if (this._didLayout) {
+            return;
+        }
         if (!this.parent) {
             if ((typeof this.width === 'string' && this.width.indexOf('%')) || (typeof this.height === 'string' && this.height.indexOf('%'))) {
                 return;
@@ -181,29 +181,41 @@ export class Canvas extends CanvasBase {
                 return;
             }
             const size = this._realSize;
-            org.nativescript.canvas.TNSCanvas.layoutView(size.width || 0, size.height || 0, this._canvas);
+            org.nativescript.canvas.NSCCanvas.layoutView(size.width || 0, size.height || 0, this._canvas);
+            if (this._2dContext) {
+                this._2dContext.native.__resize(size.width, size.height);
+            }
+            this._didLayout = true;
         }
     }
+    get __native__context() {
+        var _a, _b, _c, _d, _e;
+        return (_d = (_b = (_a = this._2dContext) === null || _a === void 0 ? void 0 : _a.native) !== null && _b !== void 0 ? _b : (_c = this._webglContext) === null || _c === void 0 ? void 0 : _c.native) !== null && _d !== void 0 ? _d : (_e = this._webgl2Context) === null || _e === void 0 ? void 0 : _e.native;
+    }
+    get native() {
+        return this.__native__context;
+    }
     getContext(type, options) {
+        var _a, _b, _c;
         if (!this._canvas) {
             return null;
         }
-        const getNativeOptions = (options) => {
-            return JSON.stringify(this._handleContextOptions(type, options));
-        };
         if (typeof type === 'string') {
             if (type === '2d') {
                 if (this._webglContext || this._webgl2Context) {
                     return null;
                 }
                 if (!this._2dContext) {
-                    this._2dContext = new CanvasRenderingContext2D(this._canvas.getContext(type, getNativeOptions(options)));
-                    // @ts-ignore
+                    this._layoutNative();
+                    const opts = Object.assign(defaultOpts, this._handleContextOptions(type, options));
+                    opts['fontColor'] = ((_c = (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.color) === null || _c === void 0 ? void 0 : _c.android) || -16777216;
+                    //	this._canvas.initContext(type, opts.alpha, opts.antialias, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.desynchronized, opts.xrCompatible);
+                    const ctx = this._canvas.create2DContext(opts.alpha, opts.antialias, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.stencil, opts.desynchronized, opts.xrCompatible, opts.fontColor);
+                    this._2dContext = new CanvasRenderingContext2D(ctx);
+                    //this._2dContext = new (CanvasRenderingContext2D as any)(this._canvas, opts);
+                    // // @ts-ignore
                     this._2dContext._canvas = this;
                 }
-                else {
-                    this._canvas.getContext(type, getNativeOptions(options));
-                }
                 // @ts-ignore
                 this._2dContext._type = '2d';
                 return this._2dContext;
@@ -213,12 +225,11 @@ export class Canvas extends CanvasBase {
                     return null;
                 }
                 if (!this._webglContext) {
-                    this._webglContext = new WebGLRenderingContext(this._canvas.getContext('webgl', getNativeOptions(options)));
+                    const opts = Object.assign({ version: 'v1' }, Object.assign(defaultOpts, this._handleContextOptions(type, options)));
+                    this._canvas.initContext(type, opts.alpha, opts.antialias, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.desynchronized, opts.xrCompatible);
+                    this._webglContext = new WebGLRenderingContext(this._canvas, opts);
                     this._webglContext._canvas = this;
                 }
-                else {
-                    this._canvas.getContext('webgl', getNativeOptions(options));
-                }
                 this._webglContext._type = 'webgl';
                 return this._webglContext;
             }
@@ -227,12 +238,11 @@ export class Canvas extends CanvasBase {
                     return null;
                 }
                 if (!this._webgl2Context) {
-                    this._webgl2Context = new WebGL2RenderingContext(this.android.getContext('webgl2', getNativeOptions(options)));
+                    const opts = Object.assign({ version: 'v2' }, Object.assign(defaultOpts, this._handleContextOptions(type, options)));
+                    this._canvas.initContext(type, opts.alpha, opts.antialias, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.desynchronized, opts.xrCompatible);
+                    this._webgl2Context = new WebGL2RenderingContext(this._canvas, opts);
                     this._webgl2Context._canvas = this;
                 }
-                else {
-                    this.android.getContext('webgl2', getNativeOptions(options));
-                }
                 this._webgl2Context._type = 'webgl2';
                 return this._webgl2Context;
             }

package/Canvas/index.android.js.map

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

package/Canvas/index.d.ts

@@ -40,10 +40,6 @@ export declare class Canvas extends CanvasBase {
 
 	toDataURL(type?: string, encoderOptions?: number): any;
 
-
-	getContext(type: '2d', options?: any): CanvasRenderingContext2D | null;
-	getContext(type: 'webgl' | 'experimental-webgl', options?: any): WebGLRenderingContext | null;
-	getContext(type: 'webgl2', options?: any): WebGL2RenderingContext | null;
 	getContext(type: string, options?: any): CanvasRenderingContext2D | WebGLRenderingContext | WebGL2RenderingContext | null;
 
 	getBoundingClientRect(): {

package/Canvas/index.ios.d.ts

@@ -3,7 +3,6 @@ import { DOMMatrix } from '../Canvas2D';
 import { CanvasRenderingContext2D } from '../Canvas2D/CanvasRenderingContext2D';
 import { WebGLRenderingContext } from '../WebGL/WebGLRenderingContext';
 import { WebGL2RenderingContext } from '../WebGL2/WebGL2RenderingContext';
-import { ImageSource } from '@nativescript/core';
 export * from './common';
 export declare function createSVGMatrix(): DOMMatrix;
 export declare class Canvas extends CanvasBase {
@@ -36,7 +35,6 @@ export declare class Canvas extends CanvasBase {
     _layoutNative(): void;
     getContext(type: string, options?: any): CanvasRenderingContext2D | WebGLRenderingContext | WebGL2RenderingContext | null;
     toDataURL(type?: string, encoderOptions?: number): any;
-    snapshot(flip?: boolean): ImageSource | null;
     getBoundingClientRect(): {
         x: number;
         y: number;

package/Canvas/index.ios.js

@@ -7,12 +7,12 @@ 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 { CanvasBase, ignorePixelScalingProperty, scalingProperty } from './common';
+import { CanvasBase, ignorePixelScalingProperty } from './common';
 import { DOMMatrix } from '../Canvas2D';
 import { CanvasRenderingContext2D } from '../Canvas2D/CanvasRenderingContext2D';
 import { WebGLRenderingContext } from '../WebGL/WebGLRenderingContext';
 import { WebGL2RenderingContext } from '../WebGL2/WebGL2RenderingContext';
-import { Utils, profile, ImageSource } from '@nativescript/core';
+import { profile } from '@nativescript/core';
 export * from './common';
 export function createSVGMatrix() {
     return new DOMMatrix(TNSCanvas.createSVGMatrix());
@@ -44,9 +44,6 @@ export class Canvas extends CanvasBase {
     [ignorePixelScalingProperty.setNative](value) {
         this._canvas.ignorePixelScaling = value;
     }
-    [scalingProperty.setNative](value) {
-        this._canvas.scaling = value;
-    }
     // @ts-ignore
     get ios() {
         return this._canvas;
@@ -129,9 +126,7 @@ export class Canvas extends CanvasBase {
     }
     initNativeView() {
         super.initNativeView();
-        if (this.scaling) {
-            this._canvas.scaling = this.scaling;
-        }
+        this._canvas.ignorePixelScaling = this.ignorePixelScaling;
     }
     flush() {
         if (this.ios) {
@@ -157,6 +152,7 @@ export class Canvas extends CanvasBase {
     }
     _layoutNative() {
         if (!this.parent) {
+            console.time('_layoutNative');
             if ((typeof this.style.width === 'string' && this.style.width.indexOf('%')) || (typeof this.style.height === 'string' && this.style.height.indexOf('%'))) {
                 return;
             }
@@ -164,12 +160,22 @@ export class Canvas extends CanvasBase {
                 return;
             }
             const size = this._realSize;
-            if (!(size.width || 0) && !(size.height || 0)) {
-                return;
-            }
-            const width = Utils.layout.toDeviceIndependentPixels(size.width || 0);
-            const height = Utils.layout.toDeviceIndependentPixels(size.height || 0);
-            TNSCanvas.layoutView(this._canvas, width, height);
+            // if (!(size.width || 0) && !(size.height || 0)) {
+            // 	return;
+            // }
+            this._canvas.forceLayout(size.width || 0, size.height || 0);
+            // const width = Utils.layout.toDeviceIndependentPixels(size.width || 0);
+            // const height = Utils.layout.toDeviceIndependentPixels(size.height || 0);
+            // let frameSize = this._canvas.frame.size;
+            // if (width === frameSize.width && height === frameSize.height) {
+            // 	return;
+            // }
+            // const frame_origin = this._canvas.frame.origin;
+            // const frame = CGRectMake(frame_origin.x, frame_origin.y, width, height);
+            // this._canvas.frame = frame;
+            // this._canvas.setNeedsLayout();
+            // this._canvas.layoutIfNeeded();
+            console.timeEnd('_layoutNative');
         }
     }
     getContext(type, options) {
@@ -181,16 +187,11 @@ export class Canvas extends CanvasBase {
                 return null;
             }
             if (!this._2dContext) {
-                if (!options) {
-                    this._2dContext = new CanvasRenderingContext2D(this._canvas.getContext(type));
-                }
-                else {
-                    this._2dContext = new CanvasRenderingContext2D(this._canvas.getContextWithTypeAttributes(type, JSON.stringify(this._handleContextOptions(type, options))));
-                }
+                this._2dContext = new CanvasRenderingContext2D(this._canvas.getContextContextAttributes(type, this._handleContextOptions(type, options)));
                 this._2dContext._canvas = this;
             }
             else {
-                this._canvas.getContextContextAttributes(type, this._handleContextOptions(type, JSON.stringify(this._handleContextOptions(type, options))));
+                this._canvas.getContextContextAttributes(type, this._handleContextOptions(type, options));
             }
             this._2dContext._type = '2d';
             return this._2dContext;
@@ -200,12 +201,7 @@ export class Canvas extends CanvasBase {
                 return null;
             }
             if (!this._webglContext) {
-                if (!options) {
-                    this._webglContext = new WebGLRenderingContext(this._canvas.getContext('webgl'));
-                }
-                else {
-                    this._webglContext = new WebGLRenderingContext(this._canvas.getContextContextAttributes('webgl', this._handleContextOptions(type, options)));
-                }
+                this._webglContext = new WebGLRenderingContext(this._canvas.getContextContextAttributes('webgl', this._handleContextOptions(type, options)));
                 this._webglContext._canvas = this;
             }
             else {
@@ -219,12 +215,7 @@ export class Canvas extends CanvasBase {
                 return null;
             }
             if (!this._webgl2Context) {
-                if (!options) {
-                    this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContext('webgl2'));
-                }
-                else {
-                    this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContextContextAttributes('webgl2', this._handleContextOptions(type, options)));
-                }
+                this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContextContextAttributes('webgl2', this._handleContextOptions(type, options)));
                 this._webgl2Context._canvas = this;
             }
             else {
@@ -238,15 +229,6 @@ export class Canvas extends CanvasBase {
     toDataURL(type = 'image/png', encoderOptions = 0.92) {
         return this._canvas.toDataURL(type, encoderOptions);
     }
-    snapshot(flip = false) {
-        if (this._canvas) {
-            const bm = this._canvas.getImage?.(flip ?? false);
-            if (bm) {
-                return new ImageSource(bm);
-            }
-        }
-        return null;
-    }
     getBoundingClientRect() {
         const view = this;
         const frame = view.ios.frame;

package/Canvas/index.ios.js.map

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

package/Canvas2D/CanvasGradient/CanvasGradient.android.d.ts

@@ -1,6 +1,8 @@
 import { CanvasGradientBase } from './common';
 export declare class CanvasGradient extends CanvasGradientBase {
     readonly nativeInstance: any;
+    _addColorStop: any;
+    _getMethod(name: string): any;
     protected constructor(nativeInstance: any);
     get native(): any;
     static fromNative(nativeInstance: any): CanvasGradient;

package/Canvas2D/CanvasGradient/CanvasGradient.android.js

@@ -3,6 +3,15 @@ export class CanvasGradient extends CanvasGradientBase {
     constructor(nativeInstance) {
         super();
         this.nativeInstance = nativeInstance;
+        this._getMethod('addColorStop');
+    }
+    _getMethod(name) {
+        if (this._addColorStop === undefined) {
+            const ret = this.native[name];
+            this._addColorStop = ret;
+            return ret;
+        }
+        return this._addColorStop;
     }
     get native() {
         return this.nativeInstance;
@@ -11,7 +20,7 @@ export class CanvasGradient extends CanvasGradientBase {
         return new CanvasGradient(nativeInstance);
     }
     addColorStop(offset, color) {
-        this.nativeInstance.addColorStop(offset, color);
+        this._addColorStop(offset, color);
     }
 }
 //# sourceMappingURL=CanvasGradient.android.js.map

package/Canvas2D/CanvasGradient/CanvasGradient.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"CanvasGradient.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasGradient/CanvasGradient.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAE5C,MAAM,OAAO,cAAe,SAAQ,kBAAkB;IAGlD,YAAsB,cAAmB;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,cAAc;QAC5B,OAAO,IAAI,cAAc,CAAC,cAAc,CAAC,CAAC;IAC9C,CAAC;IAEM,YAAY,CAAC,MAAc,EAAE,KAAU;QAC1C,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;CACJ"}
+{"version":3,"file":"CanvasGradient.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasGradient/CanvasGradient.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,MAAM,OAAO,cAAe,SAAQ,kBAAkB;IAerD,YAAsB,cAAmB;QACxC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IAdD,UAAU,CAAC,IAAY;QACtB,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC;YACzB,OAAO,GAAG,CAAC;SACX;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAQD,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,cAAc;QAC/B,OAAO,IAAI,cAAc,CAAC,cAAc,CAAC,CAAC;IAC3C,CAAC;IAEM,YAAY,CAAC,MAAc,EAAE,KAAU;QAC7C,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;CACD"}

package/Canvas2D/CanvasPattern/CanvasPattern.android.d.ts

@@ -1,6 +1,8 @@
 import { CanvasPatternBase } from './common';
 import { DOMMatrix } from '../DOMMatrix/DOMMatrix';
 export declare class CanvasPattern extends CanvasPatternBase {
+    _setTransform: any;
+    _getMethod(name: string): any;
     constructor(instance: any);
     setTransform(matrix: DOMMatrix): void;
 }

package/Canvas2D/CanvasPattern/CanvasPattern.android.js

@@ -3,9 +3,18 @@ export class CanvasPattern extends CanvasPatternBase {
     constructor(instance) {
         super(instance);
         this.nativeInstance = instance;
+        this._getMethod('setTransform');
+    }
+    _getMethod(name) {
+        if (this._setTransform === undefined) {
+            const ret = this.native[name];
+            this._setTransform = ret;
+            return ret;
+        }
+        return this._setTransform;
     }
     setTransform(matrix) {
-        this.native.setTransform(matrix.native);
+        this._setTransform(matrix.native);
     }
 }
 //# sourceMappingURL=CanvasPattern.android.js.map

package/Canvas2D/CanvasPattern/CanvasPattern.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"CanvasPattern.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAG3C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACnD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;IAChC,CAAC;IAEM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;CACD"}
+{"version":3,"file":"CanvasPattern.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAanD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IAdD,UAAU,CAAC,IAAY;QACtB,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC;YACzB,OAAO,GAAG,CAAC;SACX;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAQM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CACD"}

package/Canvas2D/CanvasPattern/CanvasPattern.ios.d.ts

@@ -3,5 +3,4 @@ import { DOMMatrix } from '../DOMMatrix/DOMMatrix';
 export declare class CanvasPattern extends CanvasPatternBase {
     constructor(instance: any);
     setTransform(matrix: DOMMatrix): void;
-    get [Symbol.toStringTag](): string;
 }

package/Canvas2D/CanvasPattern/CanvasPattern.ios.js

@@ -6,8 +6,5 @@ export class CanvasPattern extends CanvasPatternBase {
     setTransform(matrix) {
         this.native.setTransformWithMatrix(matrix.native);
     }
-    get [Symbol.toStringTag]() {
-        return 'CanvasPattern';
-    }
 }
 //# sourceMappingURL=CanvasPattern.ios.js.map

package/Canvas2D/CanvasPattern/CanvasPattern.ios.js.map

@@ -1 +1 @@
-{"version":3,"file":"CanvasPattern.ios.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACnD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC;IACM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACvB,OAAO,eAAe,CAAA;IACvB,CAAC;CACD"}
+{"version":3,"file":"CanvasPattern.ios.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACnD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC;IACM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CACD"}

package/Canvas2D/CanvasRenderingContext2D/common.d.ts

@@ -1,4 +1,4 @@
-import { CanvasRenderingContext } from '../../common';
+import { CanvasRenderingContext } from "../../common";
 import { CanvasGradient } from '../CanvasGradient';
 import { CanvasPattern } from '../CanvasPattern';
 import { Path2D } from '../Path2D';
@@ -68,8 +68,6 @@ export declare abstract class CanvasRenderingContext2DBase implements CanvasRend
     abstract putImageData(imageData: ImageData, dx: number, dy: number, dirtyX: number, dirtyY: number, dirtyWidth: number, dirtyHeight: number): void;
     abstract quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): any;
     abstract rect(x: number, y: number, width: number, height: number): void;
-    abstract roundRect(x: number, y: number, width: number, height: number, radii: number): void;
-    abstract roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
     abstract removeHitRegion(id: string): void;
     abstract resetTransform(): void;
     abstract restore(): void;

package/Canvas2D/CanvasRenderingContext2D/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasRenderingContext2D/common.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,4BAA4B;IAAlD;QA0BC,UAAK,GAAW,MAAM,CAAC;IAmHxB,CAAC;IAvHA,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAGD,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CAgHD"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasRenderingContext2D/common.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,4BAA4B;IAAlD;QA2BC,UAAK,GAAW,MAAM,CAAC;IAyPxB,CAAC;IA7PA,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAGD,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CAsPD"}