chore: updates

NativeScript · Oct 17, 2023 · c2cf251 · c2cf251
1 parent 991972a
commit c2cf251
Show file tree

Hide file tree

Showing 58 changed files with 1,398 additions and 1,620 deletions.
diff --git a/packages/canvas-polyfill/async/file/file.android.ts b/packages/canvas-polyfill/async/file/file.android.ts
@@ -1,5 +1,5 @@
 declare var com;
-
+import { File } from '@nativescript/core';
 export class FileManager {
 	public static writeFile(bytes: any, path: string, callback: (...args) => void) {
 		const listener = new com.github.triniwiz.async.Async2.FileManager.Callback({
@@ -29,7 +29,7 @@ export class FileManager {
 		if (this._readFile === undefined) {
 			this._readFile = !!global?.CanvasModule?.readFile;
 		}
-		if (global?.CanvasModule?.readFile) {
+		if (this._readFile) {
 			global?.CanvasModule?.readFile(path, (error, buffer: ArrayBuffer) => {
 				if (error) {
 					callback(new Error(error), null);

diff --git a/packages/canvas/Canvas/index.android.ts b/packages/canvas/Canvas/index.android.ts
@@ -43,7 +43,7 @@ export class Canvas extends CanvasBase {
 
 	constructor() {
 		super();
-		const activity = Application.android.foregroundActivity || Application.android.startActivity;
+		const activity = Application.android.foregroundActivity || Application.android.startActivity || Utils.android.getApplicationContext();
 		this._canvas = new org.nativescript.canvas.NSCCanvas(activity);
 		(global as any).__canvasLoaded = true;
 	}
@@ -304,7 +304,7 @@ export class Canvas extends CanvasBase {
 					this._layoutNative();
 					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.stencil, opts.desynchronized, opts.xrCompatible);
+					this._canvas.initContext(type, true, false, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.stencil, opts.desynchronized, opts.xrCompatible);
 					this._webglContext = new (WebGLRenderingContext as any)(this._canvas, opts);
 					(this._webglContext as any)._canvas = this;
 					this._webglContext._type = 'webgl';
@@ -320,7 +320,7 @@ export class Canvas extends CanvasBase {
 					this._layoutNative();
 					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.stencil, opts.desynchronized, opts.xrCompatible);
+					this._canvas.initContext(type, opts.alpha, false, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.stencil, opts.desynchronized, opts.xrCompatible);
 
 					this._webgl2Context = new (WebGL2RenderingContext as any)(this._canvas, opts);
 					(this._webgl2Context as any)._canvas = this;

diff --git a/packages/canvas/Canvas/index.ios.ts b/packages/canvas/Canvas/index.ios.ts
@@ -81,6 +81,7 @@ export class Canvas extends CanvasBase {
 			}
 			this.native.__startRaf();
 		};
+
 	}
 
 	[ignorePixelScalingProperty.setNative](value: boolean) {
@@ -271,7 +272,7 @@ export class Canvas extends CanvasBase {
 					this._layoutNative();
 					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.stencil, opts.desynchronized, opts.xrCompatible);
+					this._canvas.initContext(type, opts.alpha, false, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.stencil, opts.desynchronized, opts.xrCompatible);
 
 					this._webglContext = new (WebGLRenderingContext as any)(this._canvas, opts);
 					(this._webglContext as any)._canvas = this;
@@ -284,11 +285,12 @@ export class Canvas extends CanvasBase {
 					return null;
 				}
 
+
 				if (!this._webgl2Context) {
 					this._layoutNative();
 					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.stencil, opts.desynchronized, opts.xrCompatible);
+					
+					this._canvas.initContext(type, opts.alpha, false, opts.depth, opts.failIfMajorPerformanceCaveat, opts.powerPreference, opts.premultipliedAlpha, opts.preserveDrawingBuffer, opts.stencil, opts.desynchronized, opts.xrCompatible);
 
 					this._webgl2Context = new (WebGL2RenderingContext as any)(this._canvas, opts);
 					(this._webgl2Context as any)._canvas = this;

diff --git a/packages/canvas/ImageBitmap/index.ts b/packages/canvas/ImageBitmap/index.ts
@@ -115,12 +115,14 @@ export class ImageBitmap {
 				}
 			}
 
-			global.CanvasModule.createImageBitmap(realSource, sx, sy, sWidth, sHeight, options, (error, value) => {
-				if (value) {
-					resolve(ImageBitmap.fromNative(value));
-				} else {
-					reject(new Error(error));
-				}
+			setTimeout(() => {
+				global.CanvasModule.createImageBitmap(realSource, sx, sy, sWidth, sHeight, options, (error, value) => {
+					if (value) {
+						resolve(ImageBitmap.fromNative(value));
+					} else {
+						reject(new Error(error));
+					}
+				});
 			});
 		});
 	}

diff --git a/packages/canvas/WebGL/WebGLRenderingContext/index.ts b/packages/canvas/WebGL/WebGLRenderingContext/index.ts
@@ -45,13 +45,12 @@ import { Helpers } from '../../helpers';
 let ctor;
 
 export class WebGLRenderingContext extends WebGLRenderingContextBase {
-	public static isDebug = false;
+	public static isDebug = true;
 	public static filter: 'both' | 'error' | 'args' = 'both';
 	_context;
 
 	static {
 		Helpers.initialize();
-		ctor = global.CanvasModule.createWebGLContext;
 	}
 
 	constructor(context, contextOptions?) {
@@ -79,7 +78,8 @@ export class WebGLRenderingContext extends WebGLRenderingContextBase {
 				//direction = 1;
 			}
 
-			this._context = ctor(contextOptions, ctx, Screen.mainScreen.scale, -16777216, Screen.mainScreen.scale * 160, direction);
+
+			this._context = global.CanvasModule.createWebGLContext(contextOptions, ctx, Screen.mainScreen.scale, -16777216, Screen.mainScreen.scale * 160, direction);
 		} else {
 			this._context = context;
 		}