diff --git a/README.md b/README.md
index 1db8858b7..6591c45b0 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,15 @@ npm run setup
 npm start
 ```
 
-- @nativescript/canvas
-- @nativescript/canvas-babylon
-- @nativescript/canvas-media
-- @nativescript/canvas-phaser
-- @nativescript/canvas-phaser-ce
-- @nativescript/canvas-pixi
-- @nativescript/canvas-polyfill
-- @nativescript/canvas-three
+- [@nativescript/canvas](packages/canvas/README.md)
+- [@nativescript/canvas-babylon](packages/canvas-babylon/README.md)
+- [@nativescript/canvas-chartjs](packages/canvas-chartjs/README.md)
+- [@nativescript/canvas-media](packages/canvas-media/README.md)
+- [@nativescript/canvas-phaser](packages/canvas-phaser/README.md)
+- [@nativescript/canvas-phaser-ce](packages/canvas-phaser-ce/README.md)
+- [@nativescript/canvas-pixi](packages/canvas-pixi/README.md)
+- [@nativescript/canvas-polyfill](packages/canvas-polyfill/README.md)
+- [@nativescript/canvas-three](packages/canvas-three/README.md)
 
 # How to use?
 
diff --git a/apps/demo-angular/package.json b/apps/demo-angular/package.json
index 8cb61c5d1..d45e52469 100644
--- a/apps/demo-angular/package.json
+++ b/apps/demo-angular/package.json
@@ -1,19 +1,20 @@
 {
-	"main": "./src/main.ts",
-	"dependencies": {
-		"@nativescript/canvas": "file:../../dist/packages/canvas",
-		"@nativescript/canvas-babylon": "file:../../dist/packages/canvas-babylon",
-		"@nativescript/canvas-media": "file:../../dist/packages/canvas-media",
-		"@nativescript/canvas-phaser": "file:../../dist/packages/canvas-phaser",
-		"@nativescript/canvas-phaser-ce": "file:../../dist/packages/canvas-phaser-ce",
-		"@nativescript/canvas-pixi": "file:../../dist/packages/canvas-pixi",
-		"@nativescript/canvas-polyfill": "file:../../dist/packages/canvas-polyfill",
-		"@nativescript/canvas-three": "file:../../dist/packages/canvas-three",
-		"@nativescript/core": "file:../../node_modules/@nativescript/core",
-		"three": "file:../../node_modules/three"
-	},
-	"devDependencies": {
-		"@nativescript/android": "~8.5.0",
-		"@nativescript/ios": "8.5.1-dev.0"
-	}
+  "main": "./src/main.ts",
+  "dependencies": {
+    "@nativescript/canvas": "file:../../dist/packages/canvas",
+    "@nativescript/canvas-babylon": "file:../../dist/packages/canvas-babylon",
+    "@nativescript/canvas-media": "file:../../dist/packages/canvas-media",
+    "@nativescript/canvas-phaser": "file:../../dist/packages/canvas-phaser",
+    "@nativescript/canvas-phaser-ce": "file:../../dist/packages/canvas-phaser-ce",
+    "@nativescript/canvas-pixi": "file:../../dist/packages/canvas-pixi",
+    "@nativescript/canvas-polyfill": "file:../../dist/packages/canvas-polyfill",
+    "@nativescript/canvas-three": "file:../../dist/packages/canvas-three",
+    "@nativescript/core": "file:../../node_modules/@nativescript/core",
+    "three": "file:../../node_modules/three",
+    "@nativescript/canvas-chartjs": "file:../../dist/packages/canvas-chartjs"
+  },
+  "devDependencies": {
+    "@nativescript/android": "~8.5.0",
+    "@nativescript/ios": "8.5.1-dev.0"
+  }
 }
diff --git a/apps/demo-angular/src/app-routing.module.ts b/apps/demo-angular/src/app-routing.module.ts
index ef3578032..5b1c933ac 100644
--- a/apps/demo-angular/src/app-routing.module.ts
+++ b/apps/demo-angular/src/app-routing.module.ts
@@ -9,6 +9,7 @@ const routes: Routes = [
    { path: 'home', component: HomeComponent },
 	{ path: 'canvas', loadChildren: () => import('./plugin-demos/canvas.module').then(m => m.CanvasModule) },
 	{ path: 'canvas-babylon', loadChildren: () => import('./plugin-demos/canvas-babylon.module').then(m => m.CanvasBabylonModule) },
+	{ path: 'canvas-chartjs', loadChildren: () => import('./plugin-demos/canvas-chartjs.module').then(m => m.CanvasChartjsModule) },
 	{ path: 'canvas-media', loadChildren: () => import('./plugin-demos/canvas-media.module').then(m => m.CanvasMediaModule) },
 	{ path: 'canvas-phaser', loadChildren: () => import('./plugin-demos/canvas-phaser.module').then(m => m.CanvasPhaserModule) },
 	{ path: 'canvas-phaser-ce', loadChildren: () => import('./plugin-demos/canvas-phaser-ce.module').then(m => m.CanvasPhaserCeModule) },
diff --git a/apps/demo-angular/src/home.component.ts b/apps/demo-angular/src/home.component.ts
index e351d431e..9dbe641be 100644
--- a/apps/demo-angular/src/home.component.ts
+++ b/apps/demo-angular/src/home.component.ts
@@ -9,34 +9,32 @@ export class HomeComponent {
 	constructor(private router: RouterExtensions){}
 
 	demos = [
-		{
-			name: 'canvas',
-		},
-		{
-			name: 'canvas-babylon',
-		},
-		{
-			name: 'canvas-media',
-		},
-		{
-			name: 'canvas-phaser',
-		},
-		{
-			name: 'canvas-phaser-ce',
-		},
-		{
-			name: 'canvas-pixi',
-		},
-		{
-			name: 'canvas-polyfill',
-		},
-		{
-			name: 'canvas-three',
-		},
-	];
-
-	onTap(event){
-		const item = this.demos[event.index];
-		this.router.navigate(['/' + item.name]);
+	{
+		name: 'canvas'
+	},
+	{
+		name: 'canvas-babylon'
+	},
+	{
+		name: 'canvas-chartjs'
+	},
+	{
+		name: 'canvas-media'
+	},
+	{
+		name: 'canvas-phaser'
+	},
+	{
+		name: 'canvas-phaser-ce'
+	},
+	{
+		name: 'canvas-pixi'
+	},
+	{
+		name: 'canvas-polyfill'
+	},
+	{
+		name: 'canvas-three'
 	}
-}
+];
+}
\ No newline at end of file
diff --git a/apps/demo-angular/src/plugin-demos/canvas-chartjs.component.html b/apps/demo-angular/src/plugin-demos/canvas-chartjs.component.html
new file mode 100644
index 000000000..ae852df04
--- /dev/null
+++ b/apps/demo-angular/src/plugin-demos/canvas-chartjs.component.html
@@ -0,0 +1,8 @@
+<ActionBar title="canvas-chartjs" class="action-bar"> </ActionBar>
+<StackLayout class="p-20">
+  <ScrollView class="h-full">
+    <StackLayout>
+      <Button text="Test canvas-chartjs" (tap)="demoShared.testIt()" class="btn btn-primary"></Button>
+    </StackLayout>
+  </ScrollView>
+</StackLayout>
diff --git a/apps/demo-angular/src/plugin-demos/canvas-chartjs.component.ts b/apps/demo-angular/src/plugin-demos/canvas-chartjs.component.ts
new file mode 100644
index 000000000..77b350cfa
--- /dev/null
+++ b/apps/demo-angular/src/plugin-demos/canvas-chartjs.component.ts
@@ -0,0 +1,19 @@
+import { Component, NgZone } from '@angular/core';
+import { DemoSharedCanvasChartjs } from '@demo/shared';
+import { } from '@nativescript/canvas-chartjs';
+
+@Component({
+	selector: 'demo-canvas-chartjs',
+	templateUrl: 'canvas-chartjs.component.html',
+})
+export class CanvasChartjsComponent {
+  
+  demoShared: DemoSharedCanvasChartjs;
+  
+	constructor(private _ngZone: NgZone) {}
+
+  ngOnInit() {
+    this.demoShared = new DemoSharedCanvasChartjs();
+  }
+
+}
\ No newline at end of file
diff --git a/apps/demo-angular/src/plugin-demos/canvas-chartjs.module.ts b/apps/demo-angular/src/plugin-demos/canvas-chartjs.module.ts
new file mode 100644
index 000000000..004afb2ff
--- /dev/null
+++ b/apps/demo-angular/src/plugin-demos/canvas-chartjs.module.ts
@@ -0,0 +1,10 @@
+import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
+import { NativeScriptCommonModule, NativeScriptRouterModule } from '@nativescript/angular';
+import { CanvasChartjsComponent } from './canvas-chartjs.component';
+
+@NgModule({
+	imports: [NativeScriptCommonModule, NativeScriptRouterModule.forChild([{ path: '', component: CanvasChartjsComponent }])],
+  declarations: [CanvasChartjsComponent],
+  schemas: [ NO_ERRORS_SCHEMA]
+})
+export class CanvasChartjsModule {}
diff --git a/apps/demo-vue/app/plugin-demos/canvas-chartjs.vue b/apps/demo-vue/app/plugin-demos/canvas-chartjs.vue
new file mode 100644
index 000000000..18ce9c8a1
--- /dev/null
+++ b/apps/demo-vue/app/plugin-demos/canvas-chartjs.vue
@@ -0,0 +1,34 @@
+<template>
+  <Page>
+    <ActionBar>
+      <Label text="canvas-chartjs"/>
+    </ActionBar>
+
+    <GridLayout>
+      <Button class="info" :text="message"/>
+    </GridLayout>
+  </Page>
+</template>
+
+<script lang="ts">
+  import Vue from "nativescript-vue";
+  import { DemoSharedCanvasChartjs } from '@demo/shared';
+  import { } from '@nativescript/canvas-chartjs';
+
+  export default Vue.extend({
+    computed: {
+      message() {
+        return "Test canvas-chartjs";
+      }
+    }
+  });
+</script>
+
+<style scoped lang="scss">
+
+  .info {
+    font-size: 20;
+    horizontal-align: center;
+    vertical-align: center;
+  }
+</style>
diff --git a/apps/demo-vue/package.json b/apps/demo-vue/package.json
index 13b993060..bf2306b00 100644
--- a/apps/demo-vue/package.json
+++ b/apps/demo-vue/package.json
@@ -1,19 +1,20 @@
 {
-	"main": "./app/app.ts",
-	"dependencies": {
-		"nativescript-vue": "file:../../node_modules/nativescript-vue",
-		"@nativescript/core": "file:../../node_modules/@nativescript/core",
-		"@nativescript/canvas-media": "file:../../packages/canvas-media",
-		"@nativescript/canvas": "file:../../packages/canvas",
-		"@nativescript/canvas-babylon": "file:../../packages/canvas-babylon",
-		"@nativescript/canvas-phaser": "file:../../packages/canvas-phaser",
-		"@nativescript/canvas-phaser-ce": "file:../../packages/canvas-phaser-ce",
-		"@nativescript/canvas-pixi": "file:../../packages/canvas-pixi",
-		"@nativescript/canvas-polyfill": "file:../../packages/canvas-polyfill",
-		"@nativescript/canvas-three": "file:../../packages/canvas-three"
-	},
-	"devDependencies": {
-		"@nativescript/android": "~8.5.0",
-		"@nativescript/ios": "8.5.1-dev.0"
-	}
+  "main": "./app/app.ts",
+  "dependencies": {
+    "nativescript-vue": "file:../../node_modules/nativescript-vue",
+    "@nativescript/core": "file:../../node_modules/@nativescript/core",
+    "@nativescript/canvas-media": "file:../../packages/canvas-media",
+    "@nativescript/canvas": "file:../../packages/canvas",
+    "@nativescript/canvas-babylon": "file:../../packages/canvas-babylon",
+    "@nativescript/canvas-phaser": "file:../../packages/canvas-phaser",
+    "@nativescript/canvas-phaser-ce": "file:../../packages/canvas-phaser-ce",
+    "@nativescript/canvas-pixi": "file:../../packages/canvas-pixi",
+    "@nativescript/canvas-polyfill": "file:../../packages/canvas-polyfill",
+    "@nativescript/canvas-three": "file:../../packages/canvas-three",
+    "@nativescript/canvas-chartjs": "file:../../packages/canvas-chartjs"
+  },
+  "devDependencies": {
+    "@nativescript/android": "~8.5.0",
+    "@nativescript/ios": "8.5.1-dev.0"
+  }
 }
diff --git a/apps/demo/package.json b/apps/demo/package.json
index 58f99aa70..1c42a7989 100644
--- a/apps/demo/package.json
+++ b/apps/demo/package.json
@@ -1,32 +1,33 @@
 {
-	"main": "./src/app.ts",
-	"description": "NativeScript Application",
-	"license": "SEE LICENSE IN <your-license-filename>",
-	"repository": "<fill-your-repository-here>",
-	"dependencies": {
-		"@nativescript/canvas": "file:../../packages/canvas",
-		"@nativescript/canvas-babylon": "file:../../packages/canvas-babylon",
-		"@nativescript/canvas-media": "file:../../packages/canvas-media",
-		"@nativescript/canvas-phaser": "file:../../packages/canvas-phaser",
-		"@nativescript/canvas-phaser-ce": "file:../../packages/canvas-phaser-ce",
-		"@nativescript/canvas-pixi": "file:../../packages/canvas-pixi",
-		"@nativescript/canvas-polyfill": "file:../../packages/canvas-polyfill",
-		"@nativescript/canvas-three": "file:../../packages/canvas-three",
-		"@nativescript/core": "file:../../node_modules/@nativescript/core",
-		"babylonjs": "file:../../node_modules/babylonjs",
-		"babylonjs-materials": "file:../../node_modules/babylonjs-materials",
-		"chart.js": "file:../../node_modules/chart.js",
-		"d3": "file:../../node_modules/d3",
-		"matter-js": "file:../../node_modules/matter-js",
-		"phaser": "file:../../node_modules/phaser",
-		"phaser-ce": "file:../../node_modules/phaser-ce",
-		"pixi.js": "file:../../node_modules/pixi.js",
-		"three": "file:../../node_modules/three",
-		"vexflow": "file:../../node_modules/vexflow",
-		"zen-3d": "file:../../node_modules/zen-3d"
-	},
-	"devDependencies": {
-		"@nativescript/android": "8.5.4",
-		"@nativescript/ios": "8.5.2"
-	}
+  "main": "./src/app.ts",
+  "description": "NativeScript Application",
+  "license": "SEE LICENSE IN <your-license-filename>",
+  "repository": "<fill-your-repository-here>",
+  "dependencies": {
+    "@nativescript/canvas": "file:../../packages/canvas",
+    "@nativescript/canvas-babylon": "file:../../packages/canvas-babylon",
+    "@nativescript/canvas-media": "file:../../packages/canvas-media",
+    "@nativescript/canvas-phaser": "file:../../packages/canvas-phaser",
+    "@nativescript/canvas-phaser-ce": "file:../../packages/canvas-phaser-ce",
+    "@nativescript/canvas-pixi": "file:../../packages/canvas-pixi",
+    "@nativescript/canvas-polyfill": "file:../../packages/canvas-polyfill",
+    "@nativescript/canvas-three": "file:../../packages/canvas-three",
+    "@nativescript/core": "file:../../node_modules/@nativescript/core",
+    "babylonjs": "file:../../node_modules/babylonjs",
+    "babylonjs-materials": "file:../../node_modules/babylonjs-materials",
+    "chart.js": "file:../../node_modules/chart.js",
+    "d3": "file:../../node_modules/d3",
+    "matter-js": "file:../../node_modules/matter-js",
+    "phaser": "file:../../node_modules/phaser",
+    "phaser-ce": "file:../../node_modules/phaser-ce",
+    "pixi.js": "file:../../node_modules/pixi.js",
+    "three": "file:../../node_modules/three",
+    "vexflow": "file:../../node_modules/vexflow",
+    "zen-3d": "file:../../node_modules/zen-3d",
+    "@nativescript/canvas-chartjs": "file:../../packages/canvas-chartjs"
+  },
+  "devDependencies": {
+    "@nativescript/android": "8.6.2",
+    "@nativescript/ios": "8.6.1"
+  }
 }
diff --git a/apps/demo/src/app.ts b/apps/demo/src/app.ts
index 97e5b0a0c..661ffc3dd 100644
--- a/apps/demo/src/app.ts
+++ b/apps/demo/src/app.ts
@@ -49,7 +49,7 @@ Application.on('uncaughtError', (args) => {
 	console.log('uncaughtError: platform error', args.android ?? args.ios);
 });
 Application.on('launch', (args) => {
-	require('@nativescript/canvas-polyfill');
+	//require('@nativescript/canvas-polyfill');
 	if (global.isAndroid) {
 		jp.wasabeef.takt.Takt.stock(Utils.android.getApplicationContext()).seat(jp.wasabeef.takt.Seat.TOP_CENTER).color(-65536);
 	} else {
diff --git a/apps/demo/src/main-page.xml b/apps/demo/src/main-page.xml
index f1187ceb5..fe995b678 100644
--- a/apps/demo/src/main-page.xml
+++ b/apps/demo/src/main-page.xml
@@ -13,6 +13,7 @@
         <Button text="canvas-pixi" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="canvas-polyfill" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="canvas-three" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
+<Button text="canvas-chartjs" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
       </StackLayout>
     </ScrollView>
   </StackLayout>
diff --git a/apps/demo/src/plugin-demos/canvas-chartjs.ts b/apps/demo/src/plugin-demos/canvas-chartjs.ts
new file mode 100644
index 000000000..2c6312a95
--- /dev/null
+++ b/apps/demo/src/plugin-demos/canvas-chartjs.ts
@@ -0,0 +1,12 @@
+import { Observable, EventData, Page } from '@nativescript/core';
+import { DemoSharedCanvasChartjs } from '@demo/shared';
+import { } from '@nativescript/canvas-chartjs';
+
+export function navigatingTo(args: EventData) {
+	const page = <Page>args.object;
+	page.bindingContext = new DemoModel();
+}
+
+export class DemoModel extends DemoSharedCanvasChartjs {
+	
+}
diff --git a/apps/demo/src/plugin-demos/canvas-chartjs.xml b/apps/demo/src/plugin-demos/canvas-chartjs.xml
new file mode 100644
index 000000000..576870798
--- /dev/null
+++ b/apps/demo/src/plugin-demos/canvas-chartjs.xml
@@ -0,0 +1,14 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" class="page">
+    <Page.actionBar>
+        <ActionBar title="canvas-chartjs" icon="" class="action-bar">
+        </ActionBar>
+    </Page.actionBar>
+    <StackLayout class="p-20">
+        <ScrollView class="h-full">
+          <StackLayout>
+            <Button text="Test canvas-chartjs" tap="{{ testIt }}" class="btn btn-primary"/>
+
+          </StackLayout>
+        </ScrollView>
+    </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/package.json b/package.json
index 43020b828..664a3b27b 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
 	},
 	"private": true,
 	"devDependencies": {
+		"@angular-devkit/build-angular": "^15.0.0",
 		"@angular/animations": "^15.0.0",
 		"@angular/common": "^15.0.0",
 		"@angular/compiler": "^15.0.0",
@@ -37,36 +38,36 @@
 		"@nativescript/types": "~8.5.0",
 		"@nativescript/webpack": "~5.0.5",
 		"@ngtools/webpack": "^15.0.0",
+		"@types/three": "^0.157.0",
 		"babylonjs": "^6.0.0",
 		"babylonjs-materials": "^6.0.0",
 		"canvg": "^4.0.1",
-		"chart.js": "^4.2.1",
+		"chart.js": "^4.4.0",
 		"d3": "^7.8.4",
 		"dotenv": "~16.0.3",
 		"eslint": "~8.38.0",
 		"eslint-config-prettier": "~8.8.0",
 		"husky": "^8.0.0",
-		"matter-js": "^0.14.2",
+		"matter-js": "^0.19.0",
 		"nativescript-theme-core": "~1.0.4",
 		"nativescript-vue": "~2.9.0",
 		"nativescript-vue-template-compiler": "~2.9.0",
 		"ng-packagr": "^15.0.0",
 		"phaser": "^3.55.2",
 		"phaser-ce": "^2.20.0",
-		"pixi.js": "^7.2.3",
-		"playcanvas": "^1.62.0",
+		"pixi.js": "^7.3.1",
+		"playcanvas": "^1.66.1",
+		"query-selector": "2.0.0",
 		"react-nativescript": "^4.0.0",
 		"rimraf": "^3.0.2",
 		"rxjs": "~7.8.0",
 		"svelte-native": "^1.0.5",
-		"three": "^0.151.3",
+		"three": "^0.157.0",
 		"typescript": "~4.8.0",
-		"vexflow": "^3.0.9",
+		"vexflow": "^4.2.3",
 		"xmldom": "~0.6.0",
-		"query-selector": "2.0.0",
 		"zen-3d": "0.0.3",
-		"zone.js": "~0.13.0",
-		"@angular-devkit/build-angular": "^15.0.0"
+		"zone.js": "~0.13.0"
 	},
 	"lint-staged": {
 		"**/*.{js,ts,scss,json,html}": [
diff --git a/packages/canvas-babylon/package.json b/packages/canvas-babylon/package.json
index ceb11965b..7ab056e9b 100644
--- a/packages/canvas-babylon/package.json
+++ b/packages/canvas-babylon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-babylon",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "description": "",
   "main": "index",
   "typings": "index.d.ts",
@@ -33,9 +33,7 @@
   "readmeFilename": "README.md",
   "bootstrapper": "@nativescript/plugin-seed",
   "dependencies": {
-    "@nativescript/canvas-polyfill": "alpha"
-  },
-  "peerDependencies": {
-    "babylonjs": "^5.53.0"
+    "@nativescript/canvas-polyfill": "alpha",
+    "babylonjs": "~6.24.0"
   }
 }
diff --git a/packages/canvas-chartjs/.eslintrc.json b/packages/canvas-chartjs/.eslintrc.json
new file mode 100644
index 000000000..53c06c8db
--- /dev/null
+++ b/packages/canvas-chartjs/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*", "node_modules/**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/packages/canvas-chartjs/README.md b/packages/canvas-chartjs/README.md
new file mode 100644
index 000000000..59947c7df
--- /dev/null
+++ b/packages/canvas-chartjs/README.md
@@ -0,0 +1,13 @@
+# @nativescript/canvas-chartjs
+
+```javascript
+npm install @nativescript/canvas-chartjs
+```
+
+## Usage
+
+// TODO
+
+## License
+
+Apache License Version 2.0
diff --git a/packages/canvas-chartjs/common.ts b/packages/canvas-chartjs/common.ts
new file mode 100644
index 000000000..fc0698600
--- /dev/null
+++ b/packages/canvas-chartjs/common.ts
@@ -0,0 +1,4 @@
+import { Observable } from '@nativescript/core';
+
+export class CanvasChartjsCommon extends Observable {
+}
diff --git a/packages/canvas-chartjs/index.android.ts b/packages/canvas-chartjs/index.android.ts
new file mode 100644
index 000000000..376d206f0
--- /dev/null
+++ b/packages/canvas-chartjs/index.android.ts
@@ -0,0 +1,5 @@
+import { CanvasChartjsCommon } from './common';
+
+export class CanvasChartjs extends CanvasChartjsCommon {
+
+}
diff --git a/packages/canvas-chartjs/index.d.ts b/packages/canvas-chartjs/index.d.ts
new file mode 100644
index 000000000..e94a29814
--- /dev/null
+++ b/packages/canvas-chartjs/index.d.ts
@@ -0,0 +1,5 @@
+import { CanvasChartjsCommon } from './common';
+
+export declare class CanvasChartjs extends CanvasChartjsCommon {
+    
+}
diff --git a/packages/canvas-chartjs/index.ios.ts b/packages/canvas-chartjs/index.ios.ts
new file mode 100644
index 000000000..2caa478b8
--- /dev/null
+++ b/packages/canvas-chartjs/index.ios.ts
@@ -0,0 +1,5 @@
+import { CanvasChartjsCommon } from './common';
+
+export class CanvasChartjs extends CanvasChartjsCommon {
+    
+}
diff --git a/packages/canvas-chartjs/package.json b/packages/canvas-chartjs/package.json
new file mode 100644
index 000000000..3d4139d64
--- /dev/null
+++ b/packages/canvas-chartjs/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@nativescript/canvas-chartjs",
+  "version": "2.0.0-alpha.21",
+  "description": "ChartJS",
+  "main": "index",
+  "typings": "index.d.ts",
+  "nativescript": {
+    "platforms": {
+      "ios": "6.0.0",
+      "android": "6.0.0"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NativeScript/plugins.git"
+  },
+  "keywords": [
+    "NativeScript",
+    "JavaScript",
+    "TypeScript",
+    "iOS",
+    "Android"
+  ],
+  "author": {
+    "name": "NativeScript",
+    "email": "oss@nativescript.org"
+  },
+  "bugs": {
+    "url": "https://github.com/NativeScript/plugins/issues"
+  },
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/NativeScript/plugins",
+  "readmeFilename": "README.md",
+  "bootstrapper": "@nativescript/plugin-seed",
+  "dependencies": {
+    "@nativescript/canvas-polyfill": "alpha",
+    "chart.js": "~4.4.0"
+  }
+}
diff --git a/packages/canvas-chartjs/project.json b/packages/canvas-chartjs/project.json
new file mode 100644
index 000000000..b470e8123
--- /dev/null
+++ b/packages/canvas-chartjs/project.json
@@ -0,0 +1,73 @@
+{
+  "name": "canvas-chartjs",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/canvas-chartjs",
+  "targets": {
+    "build": {
+      "executor": "@nrwl/js:tsc",
+      "options": {
+        "outputPath": "dist/packages/canvas-chartjs",
+        "tsConfig": "packages/canvas-chartjs/tsconfig.json",
+        "packageJson": "packages/canvas-chartjs/package.json",
+        "main": "packages/canvas-chartjs/index.d.ts",
+        "assets": [
+          "packages/canvas-chartjs/*.md",
+          "packages/canvas-chartjs/index.d.ts",
+          "LICENSE",
+          {
+            "glob": "**/*",
+            "input": "packages/canvas-chartjs/platforms/",
+            "output": "./platforms/"
+          }
+        ],
+        "dependsOn": [
+          {
+            "target": "build.all",
+            "projects": "dependencies"
+          }
+        ]
+      }
+    },
+    "build.all": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node tools/scripts/build-finish.ts canvas-chartjs"
+        ],
+        "parallel": false
+      },
+      "outputs": [
+        "dist/packages/canvas-chartjs"
+      ],
+      "dependsOn": [
+        {
+          "target": "build.all",
+          "projects": "dependencies"
+        },
+        {
+          "target": "build",
+          "projects": "self"
+        }
+      ]
+    },
+    "focus": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "nx g @nativescript/plugin-tools:focus-packages canvas-chartjs"
+        ],
+        "parallel": false
+      }
+    },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "options": {
+        "lintFilePatterns": [
+          "packages/canvas-chartjs/**/*.ts"
+        ]
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/packages/canvas-chartjs/references.d.ts b/packages/canvas-chartjs/references.d.ts
new file mode 100644
index 000000000..98c5393d2
--- /dev/null
+++ b/packages/canvas-chartjs/references.d.ts
@@ -0,0 +1 @@
+/// <reference path="../../references.d.ts" />
\ No newline at end of file
diff --git a/packages/canvas-chartjs/tsconfig.json b/packages/canvas-chartjs/tsconfig.json
new file mode 100644
index 000000000..aed7323d7
--- /dev/null
+++ b/packages/canvas-chartjs/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "rootDir": "."
+  },
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "angular"],
+  "include": ["**/*.ts", "references.d.ts"]
+}
diff --git a/packages/canvas-media/package.json b/packages/canvas-media/package.json
index f8513ef5e..b42fd5dbb 100644
--- a/packages/canvas-media/package.json
+++ b/packages/canvas-media/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-media",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "description": "Canvas media",
   "main": "index",
   "typings": "index.d.ts",
diff --git a/packages/canvas-media/platforms/android/canvas_media.aar b/packages/canvas-media/platforms/android/canvas_media.aar
index 271ba6c51..1568ace76 100644
Binary files a/packages/canvas-media/platforms/android/canvas_media.aar and b/packages/canvas-media/platforms/android/canvas_media.aar differ
diff --git a/packages/canvas-phaser-ce/package.json b/packages/canvas-phaser-ce/package.json
index 604a23260..db05dc24d 100644
--- a/packages/canvas-phaser-ce/package.json
+++ b/packages/canvas-phaser-ce/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-phaser-ce",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "description": "Tools for using Phaser-ce to build native 2D games in NativeScript 👾",
   "main": "index",
   "typings": "index.d.ts",
@@ -33,9 +33,7 @@
   "readmeFilename": "README.md",
   "bootstrapper": "@nativescript/plugin-seed",
   "dependencies": {
-    "@nativescript/canvas-polyfill": "alpha"
-  },
-  "peerDependencies": {
+    "@nativescript/canvas-polyfill": "alpha",
     "phaser-ce": "2.20.0"
   }
 }
diff --git a/packages/canvas-phaser/package.json b/packages/canvas-phaser/package.json
index 87c54e0a7..6c30fca93 100644
--- a/packages/canvas-phaser/package.json
+++ b/packages/canvas-phaser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-phaser",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "description": "Build awesome 2D games with Phaser.js and NativeScript",
   "main": "index",
   "typings": "index.d.ts",
@@ -33,9 +33,7 @@
   "readmeFilename": "README.md",
   "bootstrapper": "@nativescript/plugin-seed",
   "dependencies": {
-    "@nativescript/canvas-polyfill": "alpha"
-  },
-  "peerDependencies": {
-    "phaser": "^3.24.1"
+    "@nativescript/canvas-polyfill": "alpha",
+    "phaser": "~3.60.0"
   }
 }
diff --git a/packages/canvas-pixi/package.json b/packages/canvas-pixi/package.json
index d5e938eff..aaa4565f1 100644
--- a/packages/canvas-pixi/package.json
+++ b/packages/canvas-pixi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-pixi",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "description": "Plugin for using pixi.js in NativeScript",
   "main": "index",
   "typings": "index.d.ts",
@@ -33,9 +33,7 @@
   "readmeFilename": "README.md",
   "bootstrapper": "nativescript-plugin-seed",
   "dependencies": {
-    "@nativescript/canvas-polyfill": "alpha"
-  },
-  "peerDependencies": {
-    "pixi.js": "^7.2.3"
+    "@nativescript/canvas-polyfill": "alpha",
+    "pixi.js": "~7.3.1"
   }
 }
diff --git a/packages/canvas-polyfill/package.json b/packages/canvas-polyfill/package.json
index c8f6b697b..6e35dc1a8 100644
--- a/packages/canvas-polyfill/package.json
+++ b/packages/canvas-polyfill/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-polyfill",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "description": "Polyfill for making NativeScript compatible with web libs like pixi.js, three.js, phaser.js, babylon.js, etc....",
   "main": "index",
   "typings": "index.d.ts",
diff --git a/packages/canvas-polyfill/platforms/android/canvas_polyfill.aar b/packages/canvas-polyfill/platforms/android/canvas_polyfill.aar
index 821c83f26..fb01dc54e 100644
Binary files a/packages/canvas-polyfill/platforms/android/canvas_polyfill.aar and b/packages/canvas-polyfill/platforms/android/canvas_polyfill.aar differ
diff --git a/packages/canvas-three/package.json b/packages/canvas-three/package.json
index 4b769c231..5af607a2b 100644
--- a/packages/canvas-three/package.json
+++ b/packages/canvas-three/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-three",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "description": "Utilities for using THREE.js on NativeScript",
   "main": "index",
   "typings": "index.d.ts",
@@ -33,9 +33,7 @@
   "readmeFilename": "README.md",
   "bootstrapper": "@nativescript/plugin-seed",
   "dependencies": {
-    "@nativescript/canvas-polyfill": "alpha"
-  },
-  "peerDependencies": {
-    "three": "^0.151.3"
+    "@nativescript/canvas-polyfill": "alpha",
+    "three": "~0.157.0"
   }
 }
diff --git a/packages/canvas/WebGL/WebGLRenderingContext/index.ts b/packages/canvas/WebGL/WebGLRenderingContext/index.ts
index 9740edcfd..519a8bf13 100644
--- a/packages/canvas/WebGL/WebGLRenderingContext/index.ts
+++ b/packages/canvas/WebGL/WebGLRenderingContext/index.ts
@@ -45,7 +45,7 @@ import { Helpers } from '../../helpers';
 let ctor;
 
 export class WebGLRenderingContext extends WebGLRenderingContextBase {
-	public static isDebug = true;
+	public static isDebug = false;
 	public static filter: 'both' | 'error' | 'args' = 'both';
 	_context;
 
diff --git a/packages/canvas/package.json b/packages/canvas/package.json
index b61a4ab1d..7758b564b 100644
--- a/packages/canvas/package.json
+++ b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "description": "DOM Canvas API for NativeScript",
   "main": "index",
   "typings": "index.d.ts",
diff --git a/packages/canvas/platforms/android/canvas-release.aar b/packages/canvas/platforms/android/canvas-release.aar
index 344991ef1..b2d844638 100644
Binary files a/packages/canvas/platforms/android/canvas-release.aar and b/packages/canvas/platforms/android/canvas-release.aar differ
diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative
index 1e18a35d5..9d1aa73c9 100755
Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative differ
diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo
index a0fd69102..2f9c459f5 100644
Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo differ
diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative
index c08573580..e37f8cd96 100644
Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative differ
diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative
index 5d8a9e0a9..1ee0d1318 100755
Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative differ
diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo
index fd4d1589f..ae65451c5 100644
Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo differ
diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo
index 002618f9c..3f3abae23 100644
Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo differ
diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
index 607becb5d..dcfcc6fc5 100644
--- a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
+++ b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
@@ -26,11 +26,11 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		204esojqKbAD0l6NaFsf16L39Go=
+		ePAowlczAp5HJpTw2x1X4+QPbXI=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		VaXP9gsiEL68cygtyXTpSv6pd54=
+		nNOxlc4WyDn3qBIS0haTpXjmNw8=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
@@ -115,14 +115,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			+TL0tv+RJdwUM1m9WA5LYGS62wIJtogLIn7qHHf6mHI=
+			XXNQyzWBPNQc0LabYVFSq1+6FgiCA1PYg3CVpz1A/Ao=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			cDISfqanYqzJVnqnxypUw+tozwSO6gEvJJQihjeGHZc=
+			MxYisuRzDnLJu8bdCdbZ+bLSCKuVjNrePs2w2NFQu8M=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
diff --git a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative
index 4dcc85558..5f273c43c 100644
Binary files a/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative and b/packages/canvas/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative differ
diff --git a/packages/canvas/platforms/ios/src/cpp/CanvasJSIModule.cpp b/packages/canvas/platforms/ios/src/cpp/CanvasJSIModule.cpp
index cbea4f679..4b873d5e3 100644
--- a/packages/canvas/platforms/ios/src/cpp/CanvasJSIModule.cpp
+++ b/packages/canvas/platforms/ios/src/cpp/CanvasJSIModule.cpp
@@ -150,8 +150,8 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
     if (image->IsObject()) {
         auto imageObject = image.As<v8::Object>();
         auto isArrayBuffer = imageObject->IsArrayBuffer();
-        auto isTypedArray = imageObject->IsTypedArray();
-        if (isArrayBuffer || isTypedArray) {
+        auto IsArrayBufferView = imageObject->IsArrayBufferView();
+        if (isArrayBuffer || IsArrayBufferView) {
 
             if (len == 1 || len == 2) {
                 if (len == 2) {
@@ -256,20 +256,20 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                 }
 
 
-                auto ta = imageObject.As<v8::TypedArray>();
+                auto ta = imageObject.As<v8::ArrayBufferView>();
 
 
                 auto array = ta->Buffer();
                 auto offset = ta->ByteOffset();
-                auto size = ta->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto size = ta->ByteLength();
+                auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
 
 
-                v8::Global<v8::TypedArray> ab(isolate, ta);
+                v8::Global<v8::ArrayBufferView> ab(isolate, ta);
 
                 std::thread thread(
                         [jsi_callback, &options, shared_asset, data_ptr, size](
-                                v8::Global<v8::TypedArray> ab) {
+                                v8::Global<v8::ArrayBufferView> ab) {
 
                             auto done = canvas_native_image_bitmap_create_from_encoded_bytes_with_output(
                                     data_ptr, size,
@@ -373,21 +373,21 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                     return;
                 }
 
-                auto ta = imageObject.As<v8::TypedArray>();
+                auto ta = imageObject.As<v8::ArrayBufferView>();
 
 
                 auto array = ta->Buffer();
                 auto offset = ta->ByteOffset();
-                auto size = ta->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto size = ta->ByteLength();
+                auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
 
 
-                v8::Global<v8::TypedArray> ab(isolate, ta);
+                v8::Global<v8::ArrayBufferView> ab(isolate, ta);
 
 
                 std::thread thread(
                         [jsi_callback, &options, shared_asset, data_ptr, size, current_queue](
-                                v8::Global<v8::TypedArray> ab
+                                v8::Global<v8::ArrayBufferView> ab
                         ) {
 
                             auto done = canvas_native_image_bitmap_create_from_encoded_bytes_with_output(
@@ -564,22 +564,22 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                     return;
                 }
 
-                auto ta = bufferValue.As<v8::TypedArray>();
+                auto ta = bufferValue.As<v8::ArrayBufferView>();
 
                 auto array = ta->Buffer();
                 auto offset = ta->ByteOffset();
-                auto size = ta->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto size = ta->ByteLength();
+                auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
 
 
-                v8::Global<v8::TypedArray> ab(isolate, ta);
+                v8::Global<v8::ArrayBufferView> ab(isolate, ta);
                 std::thread thread(
                         [jsi_callback, &options, shared_asset, data_ptr, size](
                                 float sx_or_options,
                                 float sy,
                                 float sw,
                                 float sh,
-                                v8::Global<v8::TypedArray> ab
+                                v8::Global<v8::ArrayBufferView> ab
                         ) {
 
                             auto done = canvas_native_image_bitmap_create_from_encoded_bytes_src_rect_with_output(
@@ -702,23 +702,23 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                     return;
                 }
 
-                auto ta = bufferValue.As<v8::TypedArray>();
+                auto ta = bufferValue.As<v8::ArrayBufferView>();
 
                 auto array = ta->Buffer();
                 auto offset = ta->ByteOffset();
-                auto size = ta->Length();
-                auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+                auto size = ta->ByteLength();
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
 
 
 
-                v8::Global<v8::TypedArray> ab(isolate, ta);
+                v8::Global<v8::ArrayBufferView> ab(isolate, ta);
                 std::thread thread(
                         [jsi_callback, &options, data_ptr, size, shared_asset, current_queue](
                                 float sx_or_options,
                                 float sy,
                                 float sw,
                                 float sh,
-                                v8::Global<v8::TypedArray> ab
+                                v8::Global<v8::ArrayBufferView> ab
                         ) {
 
                             auto done = canvas_native_image_bitmap_create_from_encoded_bytes_src_rect_with_output(
diff --git a/packages/canvas/platforms/ios/src/cpp/TextDecoderImpl.cpp b/packages/canvas/platforms/ios/src/cpp/TextDecoderImpl.cpp
index 700752934..929980325 100644
--- a/packages/canvas/platforms/ios/src/cpp/TextDecoderImpl.cpp
+++ b/packages/canvas/platforms/ios/src/cpp/TextDecoderImpl.cpp
@@ -109,6 +109,7 @@ void TextDecoderImpl::Decode(const v8::FunctionCallbackInfo<v8::Value> &args) {
         return;
     }
     auto isolate = args.GetIsolate();
+    auto context = isolate->GetCurrentContext();
 
     if (args.Length() == 1) {
         auto value = args[0];
@@ -142,13 +143,28 @@ void TextDecoderImpl::Decode(const v8::FunctionCallbackInfo<v8::Value> &args) {
         }
 
 
-        if (buf->IsTypedArray()) {
+        if (buf->IsArrayBufferView()) {
 
-            auto buffer = buf.As<v8::TypedArray>();
+            auto buffer = buf.As<v8::ArrayBufferView>();
+            
 
             auto store = buffer->Buffer()->GetBackingStore();
-            auto buffer_data = static_cast<u_int8_t *>(store->Data()) + buffer->ByteOffset();
-            auto len = buffer->Length();
+            auto buffer_data = static_cast<uint8_t *>(store->Data()) + buffer->ByteOffset();
+            
+            auto len = buffer->ByteLength();
+            
+//            v8::Local<v8::Value> size;
+//
+//            buf->Get(context, ConvertToV8String(isolate, "BYTES_PER_ELEMENT")).ToLocal(&size);
+//
+//            size_t len = 0;
+//
+//            if(!size.IsEmpty()){
+//                len =  buffer->Length() * (size_t)size->NumberValue(context).FromMaybe(0);
+//            }
+            
+          //  auto len = buffer->ByteLength();
+            
             auto decoded = canvas_native_text_decoder_decode(
                     ptr->GetTextDecoder(),
                                                              buffer_data, len);
diff --git a/packages/canvas/platforms/ios/src/cpp/webgl/WebGLRenderingContext.cpp b/packages/canvas/platforms/ios/src/cpp/webgl/WebGLRenderingContext.cpp
index f83ba0938..8103e3d05 100644
--- a/packages/canvas/platforms/ios/src/cpp/webgl/WebGLRenderingContext.cpp
+++ b/packages/canvas/platforms/ios/src/cpp/webgl/WebGLRenderingContext.cpp
@@ -663,12 +663,12 @@ void WebGLRenderingContext::BufferData(const v8::FunctionCallbackInfo<v8::Value>
             auto sizeOrBuf = args[1];
             if (sizeOrBuf->IsArrayBufferView()) {
                 if (sizeOrBuf->IsUint16Array()) {
-                    auto buf = sizeOrBuf.As<v8::TypedArray>();
+                    auto buf = sizeOrBuf.As<v8::Uint16Array>();
 
                     auto array = buf->Buffer();
                     auto offset = buf->ByteOffset();
                     auto size = buf->Length();
-                    auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                    auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                     auto data = static_cast<uint16_t *>((void *) data_ptr);
 
                     canvas_native_webgl_buffer_data_u16(
@@ -678,12 +678,12 @@ void WebGLRenderingContext::BufferData(const v8::FunctionCallbackInfo<v8::Value>
                             ptr->GetState()
                     );
                 } else if (sizeOrBuf->IsFloat32Array()) {
-                    auto buf = sizeOrBuf.As<v8::TypedArray>();
+                    auto buf = sizeOrBuf.As<v8::Float32Array>();
 
                     auto array = buf->Buffer();
                     auto offset = buf->ByteOffset();
                     auto size = buf->Length();
-                    auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                    auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                     auto data = static_cast<float *>((void *) data_ptr);
 
                     canvas_native_webgl_buffer_data_f32(
@@ -693,12 +693,12 @@ void WebGLRenderingContext::BufferData(const v8::FunctionCallbackInfo<v8::Value>
                             ptr->GetState()
                     );
                 } else {
-                    auto buf = sizeOrBuf.As<v8::TypedArray>();
+                    auto buf = sizeOrBuf.As<v8::ArrayBufferView>();
 
                     auto array = buf->Buffer();
                     auto offset = buf->ByteOffset();
-                    auto size = buf->Length();
-                    auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                    auto size = buf->ByteLength();
+                    auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                     auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
@@ -762,13 +762,13 @@ void WebGLRenderingContext::BufferSubData(const v8::FunctionCallbackInfo<v8::Val
         if (args[2]->IsObject()) {
             auto buf = args[2];
 
-            if (buf->IsTypedArray()) {
-                auto buff = buf.As<v8::TypedArray>();
+            if (buf->IsArrayBufferView()) {
+                auto buff = buf.As<v8::ArrayBufferView>();
 
                 auto array = buff->Buffer();
                 auto os = buff->ByteOffset();
-                auto size = buff->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + os;
+                auto size = buff->ByteLength();
+                auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + os;
                 auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
@@ -995,13 +995,13 @@ void WebGLRenderingContext::CompressedTexImage2D(const v8::FunctionCallbackInfo<
         auto border = (int32_t) args[5]->NumberValue(context).ToChecked();
         auto pixels = args[6];
         if (pixels->IsObject()) {
-            if (pixels->IsTypedArray()) {
-                auto buf = pixels.As<v8::TypedArray>();
+            if (pixels->IsArrayBufferView()) {
+                auto buf = pixels.As<v8::ArrayBufferView>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
-                auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto size = buf->ByteLength();
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
@@ -1060,12 +1060,12 @@ WebGLRenderingContext::CompressedTexSubImage2D(const v8::FunctionCallbackInfo<v8
         auto format = (uint32_t) args[6]->NumberValue(context).ToChecked();
         if (args[7]->IsObject()) {
             auto pixels = args[7];
-            if (pixels->IsTypedArray()) {
-                auto buf = pixels.As<v8::TypedArray>();
+            if (pixels->IsArrayBufferView()) {
+                auto buf = pixels.As<v8::ArrayBufferView>();
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
-                auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto size = array->ByteLength();
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<uint8_t *>((void *) data_ptr);
 
                 canvas_native_webgl_compressed_tex_sub_image2d(
@@ -3447,13 +3447,13 @@ WebGLRenderingContext::ReadPixels(const v8::FunctionCallbackInfo<v8::Value> &arg
                 context).ToChecked();
 
         auto pixels = args[6];
-        if (pixels->IsTypedArray()) {
-            auto buf = pixels.As<v8::TypedArray>();
+        if (pixels->IsArrayBufferView()) {
+            auto buf = pixels.As<v8::ArrayBufferView>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+            auto size = array->ByteLength();
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
@@ -3945,13 +3945,13 @@ WebGLRenderingContext::TexImage2D(const v8::FunctionCallbackInfo<v8::Value> &arg
                     type,
                     ptr->GetState()
             );
-        } else if (value->IsTypedArray()) {
-            auto buf = value.As<v8::TypedArray>();
+        } else if (value->IsArrayBufferView()) {
+            auto buf = value.As<v8::ArrayBufferView>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+            auto size = array->ByteLength();
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
@@ -4170,13 +4170,13 @@ WebGLRenderingContext::TexSubImage2D(const v8::FunctionCallbackInfo<v8::Value> &
         auto pixels = args[8];
 
 
-        if (pixels->IsTypedArray()) {
-            auto buf = pixels.As<v8::TypedArray>();
+        if (pixels->IsArrayBufferView()) {
+            auto buf = pixels.As<v8::ArrayBufferView>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+            auto size = array->ByteLength();
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
@@ -4332,12 +4332,12 @@ WebGLRenderingContext::VertexAttrib1fv(const v8::FunctionCallbackInfo<v8::Value>
 
         auto value = args[1];
         if (value->IsFloat32Array()) {
-            auto buf = value.As<v8::TypedArray>();
+            auto buf = value.As<v8::Float32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<float *>((void *) data_ptr);
 
 
@@ -4364,12 +4364,12 @@ WebGLRenderingContext::VertexAttrib2fv(const v8::FunctionCallbackInfo<v8::Value>
 
         auto value = args[1];
         if (value->IsFloat32Array()) {
-            auto buf = value.As<v8::TypedArray>();
+            auto buf = value.As<v8::Float32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<float *>((void *) data_ptr);
 
 
@@ -4396,12 +4396,12 @@ WebGLRenderingContext::VertexAttrib3fv(const v8::FunctionCallbackInfo<v8::Value>
 
         auto value = args[1];
         if (value->IsFloat32Array()) {
-            auto buf = value.As<v8::TypedArray>();
+            auto buf = value.As<v8::Float32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<float *>((void *) data_ptr);
 
 
@@ -4428,12 +4428,12 @@ WebGLRenderingContext::VertexAttrib4fv(const v8::FunctionCallbackInfo<v8::Value>
 
         auto value = args[1];
         if (value->IsFloat32Array()) {
-            auto buf = value.As<v8::TypedArray>();
+            auto buf = value.As<v8::Float32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<float *>((void *) data_ptr);
 
 
@@ -4619,12 +4619,12 @@ WebGLRenderingContext::Uniform1fv(const v8::FunctionCallbackInfo<v8::Value> &arg
 
         if (location != nullptr) {
             if (v0Value->IsFloat32Array()) {
-                auto buf = v0Value.As<v8::TypedArray>();
+                auto buf = v0Value.As<v8::Float32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void *) data_ptr);
 
 
@@ -4681,12 +4681,12 @@ WebGLRenderingContext::Uniform2fv(const v8::FunctionCallbackInfo<v8::Value> &arg
 
         if (location != nullptr) {
             if (v0Value->IsFloat32Array()) {
-                auto buf = v0Value.As<v8::TypedArray>();
+                auto buf = v0Value.As<v8::Float32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void *) data_ptr);
 
 
@@ -4743,12 +4743,12 @@ WebGLRenderingContext::Uniform3fv(const v8::FunctionCallbackInfo<v8::Value> &arg
 
         if (location != nullptr) {
             if (v0Value->IsFloat32Array()) {
-                auto buf = v0Value.As<v8::TypedArray>();
+                auto buf = v0Value.As<v8::Float32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void *) data_ptr);
 
 
@@ -4804,12 +4804,12 @@ WebGLRenderingContext::Uniform4fv(const v8::FunctionCallbackInfo<v8::Value> &arg
 
         if (location != nullptr) {
             if (v0Value->IsFloat32Array()) {
-                auto buf = v0Value.As<v8::TypedArray>();
+                auto buf = v0Value.As<v8::Float32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void *) data_ptr);
 
 
@@ -4992,12 +4992,12 @@ WebGLRenderingContext::Uniform1iv(const v8::FunctionCallbackInfo<v8::Value> &arg
 
         if (location != nullptr) {
             if (v0Value->IsInt32Array()) {
-                auto buf = v0Value.As<v8::TypedArray>();
+                auto buf = v0Value.As<v8::Int32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<int32_t *>((void *) data_ptr);
 
 
@@ -5050,12 +5050,12 @@ WebGLRenderingContext::Uniform2iv(const v8::FunctionCallbackInfo<v8::Value> &arg
 
         if (location != nullptr) {
             if (v0Value->IsInt32Array()) {
-                auto buf = v0Value.As<v8::TypedArray>();
+                auto buf = v0Value.As<v8::Int32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<int32_t *>((void *) data_ptr);
 
                 canvas_native_webgl_uniform2iv(
@@ -5107,11 +5107,11 @@ WebGLRenderingContext::Uniform3iv(const v8::FunctionCallbackInfo<v8::Value> &arg
 
         if (location != nullptr) {
             if (v0Value->IsInt32Array()) {
-                auto buf = v0Value.As<v8::TypedArray>();
+                auto buf = v0Value.As<v8::Int32Array>();
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<int32_t *>((void *) data_ptr);
 
 
@@ -5165,11 +5165,11 @@ WebGLRenderingContext::Uniform4iv(const v8::FunctionCallbackInfo<v8::Value> &arg
 
         if (location != nullptr) {
             if (v0Value->IsInt32Array()) {
-                auto buf = v0Value.As<v8::TypedArray>();
+                auto buf = v0Value.As<v8::Int32Array>();
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<int32_t *>((void *) data_ptr);
 
 
@@ -5222,11 +5222,11 @@ WebGLRenderingContext::UniformMatrix2fv(const v8::FunctionCallbackInfo<v8::Value
 
         if (location != nullptr) {
             if (value->IsFloat32Array()) {
-                auto buf = value.As<v8::TypedArray>();
+                auto buf = value.As<v8::Float32Array>();
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void *) data_ptr);
 
                 canvas_native_webgl_uniform_matrix2fv(
@@ -5283,12 +5283,12 @@ WebGLRenderingContext::UniformMatrix3fv(const v8::FunctionCallbackInfo<v8::Value
 
         if (location != nullptr) {
             if (value->IsFloat32Array()) {
-                auto buf = value.As<v8::TypedArray>();
+                auto buf = value.As<v8::Float32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void *) data_ptr);
 
                 canvas_native_webgl_uniform_matrix3fv(
@@ -5346,12 +5346,12 @@ WebGLRenderingContext::UniformMatrix4fv(const v8::FunctionCallbackInfo<v8::Value
 
         if (location != nullptr) {
             if (value->IsFloat32Array()) {
-                auto buf = value.As<v8::TypedArray>();
+                auto buf = value.As<v8::Float32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t *) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void *) data_ptr);
 
 
diff --git a/packages/canvas/platforms/ios/src/cpp/webgl/extensions/OES_vertex_array_objectImpl.cpp b/packages/canvas/platforms/ios/src/cpp/webgl/extensions/OES_vertex_array_objectImpl.cpp
index 9675413fb..469e17edb 100644
--- a/packages/canvas/platforms/ios/src/cpp/webgl/extensions/OES_vertex_array_objectImpl.cpp
+++ b/packages/canvas/platforms/ios/src/cpp/webgl/extensions/OES_vertex_array_objectImpl.cpp
@@ -18,7 +18,6 @@ void OES_vertex_array_objectImpl::CreateVertexArrayOES(
         return;
     }
     auto isolate = args.GetIsolate();
-    auto context = isolate->GetCurrentContext();
 
     auto ret = canvas_native_webgl_oes_vertex_array_object_create_vertex_array_oes(
             ptr->GetVertexArrayObject());
diff --git a/packages/canvas/platforms/ios/src/cpp/webgl2/WebGL2RenderingContext.cpp b/packages/canvas/platforms/ios/src/cpp/webgl2/WebGL2RenderingContext.cpp
index a3d2bb01e..77f5aa24e 100644
--- a/packages/canvas/platforms/ios/src/cpp/webgl2/WebGL2RenderingContext.cpp
+++ b/packages/canvas/platforms/ios/src/cpp/webgl2/WebGL2RenderingContext.cpp
@@ -310,11 +310,11 @@ void WebGL2RenderingContext::ClearBufferfv(const v8::FunctionCallbackInfo<v8::Va
             );
 
         } else if (values->IsFloat32Array()) {
-            auto buf = values.As<v8::TypedArray>();
+            auto buf = values.As<v8::Float32Array>();
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<float *>((void*) data_ptr);
 
 
@@ -368,12 +368,12 @@ void WebGL2RenderingContext::ClearBufferiv(const v8::FunctionCallbackInfo<v8::Va
             );
 
         } else if (values->IsInt32Array()) {
-            auto buf = values.As<v8::TypedArray>();
+            auto buf = values.As<v8::Int32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<int32_t *>((void*) data_ptr);
 
 
@@ -457,11 +457,11 @@ void WebGL2RenderingContext::ClearBufferuiv(const v8::FunctionCallbackInfo<v8::V
             );
 
         } else if (values->IsUint32Array()) {
-            auto buf = values.As<v8::TypedArray>();
+            auto buf = values.As<v8::Uint32Array>();
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint32_t *>((void*) data_ptr);
 
 
@@ -530,12 +530,12 @@ WebGL2RenderingContext::CompressedTexSubImage3D(const v8::FunctionCallbackInfo<v
 
         auto imageSizeOrBufValue = args[0];
         if (args[9]->IsObject()) {
-            if (imageSizeOrBufValue->IsTypedArray()) {
-                auto buf = imageSizeOrBufValue.As<v8::TypedArray>();
+            if (imageSizeOrBufValue->IsArrayBufferView()) {
+                auto buf = imageSizeOrBufValue.As<v8::ArrayBufferView>();
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
-                auto size = buf->Length();
-                auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+                auto size = buf->ByteLength();
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<uint8_t *>((void*) data_ptr);
 
                 size_t srcOffset = 0;
@@ -1272,9 +1272,9 @@ void WebGL2RenderingContext::GetBufferSubData(const v8::FunctionCallbackInfo<v8:
         auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
         auto srcByteOffset = args[1]->NumberValue(context).ToChecked();
 
-        if (dstDataObject->IsTypedArray()) {
+        if (dstDataObject->IsArrayBufferView()) {
 
-            auto array = dstDataObject.As<v8::TypedArray>();
+            auto array = dstDataObject.As<v8::ArrayBufferView>();
 
             auto buf = array->Buffer();
             auto offset = array->ByteOffset();
@@ -2230,13 +2230,13 @@ void WebGL2RenderingContext::TexImage3D(const v8::FunctionCallbackInfo<v8::Value
         }
 
 
-        if (imageOrPixelsOrOffset->IsTypedArray()) {
-            auto buf = imageOrPixelsOrOffset.As<v8::TypedArray>();
+        if (imageOrPixelsOrOffset->IsArrayBufferView()) {
+            auto buf = imageOrPixelsOrOffset.As<v8::ArrayBufferView>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto size = buf->ByteLength();
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint8_t *>((void*) data_ptr);
 
 
@@ -2336,13 +2336,13 @@ void WebGL2RenderingContext::TexImage3D(const v8::FunctionCallbackInfo<v8::Value
                     context).ToChecked());
         }
 
-        if (imageOrPixelsOrOffset->IsTypedArray()) {
-            auto buf = imageOrPixelsOrOffset.As<v8::TypedArray>();
+        if (imageOrPixelsOrOffset->IsArrayBufferView()) {
+            auto buf = imageOrPixelsOrOffset.As<v8::ArrayBufferView>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto size = buf->ByteLength();
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint8_t *>((void*) data_ptr);
 
             srcOffsetValue =
@@ -2491,13 +2491,13 @@ void WebGL2RenderingContext::TexSubImage3D(const v8::FunctionCallbackInfo<v8::Va
 
         auto imageOrPixelsOrOffsetObject = args[10];
 
-        if (imageOrPixelsOrOffsetObject->IsTypedArray()) {
-            auto buf = imageOrPixelsOrOffsetObject.As<v8::TypedArray>();
+        if (imageOrPixelsOrOffsetObject->IsArrayBufferView()) {
+            auto buf = imageOrPixelsOrOffsetObject.As<v8::ArrayBufferView>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto size = buf->ByteLength();
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint8_t *>((void*) data_ptr);
 
 
@@ -2576,13 +2576,13 @@ void WebGL2RenderingContext::TexSubImage3D(const v8::FunctionCallbackInfo<v8::Va
         auto imageOrPixelsOrOffsetObject = args[10];
 
 
-        if (imageOrPixelsOrOffsetObject->IsTypedArray()) {
-            auto buf = imageOrPixelsOrOffsetObject.As<v8::TypedArray>();
+        if (imageOrPixelsOrOffsetObject->IsArrayBufferView()) {
+            auto buf = imageOrPixelsOrOffsetObject.As<v8::ArrayBufferView>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto size = buf->ByteLength();
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint8_t *>((void*) data_ptr);
 
 
@@ -2826,11 +2826,11 @@ void WebGL2RenderingContext::Uniform1uiv(const v8::FunctionCallbackInfo<v8::Valu
         auto data = args[1];
         if (location != nullptr &&
             data->IsUint32Array()) {
-            auto buf = data.As<v8::TypedArray>();
+            auto buf = data.As<v8::Uint32Array>();
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint32_t *>((void*) data_ptr);
 
 
@@ -2884,11 +2884,11 @@ void WebGL2RenderingContext::Uniform2uiv(const v8::FunctionCallbackInfo<v8::Valu
         auto data = args[1];
         if (location != nullptr &&
             data->IsUint32Array()) {
-            auto buf = data.As<v8::TypedArray>();
+            auto buf = data.As<v8::Uint32Array>();
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint32_t *>((void*) data_ptr);
 
 
@@ -2942,12 +2942,12 @@ void WebGL2RenderingContext::Uniform3uiv(const v8::FunctionCallbackInfo<v8::Valu
         auto data = args[1];
         if (location != nullptr &&
             data->IsUint32Array()) {
-            auto buf = data.As<v8::TypedArray>();
+            auto buf = data.As<v8::Uint32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint32_t *>((void*) data_ptr);
 
 
@@ -3000,12 +3000,12 @@ void WebGL2RenderingContext::Uniform4uiv(const v8::FunctionCallbackInfo<v8::Valu
         auto data = args[1];
         if (location != nullptr &&
             data->IsUint32Array()) {
-            auto buf = data.As<v8::TypedArray>();
+            auto buf = data.As<v8::Uint32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint32_t *>((void*) data_ptr);
 
 
@@ -3091,11 +3091,11 @@ void WebGL2RenderingContext::UniformMatrix2x3fv(const v8::FunctionCallbackInfo<v
             auto data = args[2];
 
             if (data->IsFloat32Array()) {
-                auto buf = data.As<v8::TypedArray>();
+                auto buf = data.As<v8::Float32Array>();
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void*) data_ptr);
 
 
@@ -3156,12 +3156,12 @@ void WebGL2RenderingContext::UniformMatrix2x4fv(const v8::FunctionCallbackInfo<v
             auto data = args[2];
 
             if (data->IsFloat32Array()) {
-                auto buf = data.As<v8::TypedArray>();
+                auto buf = data.As<v8::Float32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void*) data_ptr);
 
 
@@ -3223,13 +3223,13 @@ void WebGL2RenderingContext::UniformMatrix3x2fv(const v8::FunctionCallbackInfo<v
             auto data = args[2];
 
             if (data->IsFloat32Array()) {
-                auto buf = data.As<v8::TypedArray>();
+                auto buf = data.As<v8::Float32Array>();
 
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void*) data_ptr);
 
 
@@ -3291,11 +3291,11 @@ void WebGL2RenderingContext::UniformMatrix3x4fv(const v8::FunctionCallbackInfo<v
             auto data = args[2];
 
             if (data->IsFloat32Array()) {
-                auto buf = data.As<v8::TypedArray>();
+                auto buf = data.As<v8::Float32Array>();
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void*) data_ptr);
 
 
@@ -3357,12 +3357,12 @@ void WebGL2RenderingContext::UniformMatrix4x2fv(const v8::FunctionCallbackInfo<v
             auto data = args[2];
 
             if (data->IsFloat32Array()) {
-                auto buf = data.As<v8::TypedArray>();
+                auto buf = data.As<v8::Float32Array>();
 
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void*) data_ptr);
 
                 canvas_native_webgl2_uniform_matrix4x2fv(
@@ -3423,11 +3423,11 @@ void WebGL2RenderingContext::UniformMatrix4x3fv(const v8::FunctionCallbackInfo<v
             auto data = args[2];
 
             if (data->IsFloat32Array()) {
-                auto buf = data.As<v8::TypedArray>();
+                auto buf = data.As<v8::Float32Array>();
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->Length();
-                auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
                 auto data = static_cast<float *>((void*) data_ptr);
 
                 canvas_native_webgl2_uniform_matrix4x3fv(
@@ -3540,12 +3540,12 @@ void WebGL2RenderingContext::VertexAttribI4iv(const v8::FunctionCallbackInfo<v8:
                 context).ToChecked();
         auto value = args[1];
         if (value->IsInt32Array()) {
-            auto buf = value.As<v8::TypedArray>();
+            auto buf = value.As<v8::Int32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<int32_t *>((void*) data_ptr);
 
 
@@ -3628,11 +3628,11 @@ void WebGL2RenderingContext::VertexAttribI4uiv(const v8::FunctionCallbackInfo<v8
                 context).ToChecked();
         auto value = args[1];
         if (value->IsUint32Array()) {
-            auto buf = value.As<v8::TypedArray>();
+            auto buf = value.As<v8::Uint32Array>();
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = (uint8_t*) array->GetBackingStore()->Data() + offset;
+            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
             auto data = static_cast<uint32_t *>((void*) data_ptr);
 
 
diff --git a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/NSCCanvas.kt b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/NSCCanvas.kt
index f2372cdc9..194d6aa8c 100644
--- a/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/NSCCanvas.kt
+++ b/packages/canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/NSCCanvas.kt
@@ -43,7 +43,7 @@ class NSCCanvas : FrameLayout {
 	var upscale: Boolean = false
 		set(value) {
 			field = value
-			//updateParams(width, height)
+			updateParams(width, height)
 		}
 
 	var ignorePixelScaling: Boolean
diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative
index 1e18a35d5..9d1aa73c9 100755
Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative differ
diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo
index a0fd69102..2f9c459f5 100644
Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo differ
diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative
index c08573580..e37f8cd96 100644
Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative differ
diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative
index 5d8a9e0a9..1ee0d1318 100755
Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative differ
diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo
index fd4d1589f..ae65451c5 100644
Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo differ
diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo
index 002618f9c..3f3abae23 100644
Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo differ
diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
index 607becb5d..dcfcc6fc5 100644
--- a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
+++ b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources
@@ -26,11 +26,11 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		204esojqKbAD0l6NaFsf16L39Go=
+		ePAowlczAp5HJpTw2x1X4+QPbXI=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		VaXP9gsiEL68cygtyXTpSv6pd54=
+		nNOxlc4WyDn3qBIS0haTpXjmNw8=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
@@ -115,14 +115,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			+TL0tv+RJdwUM1m9WA5LYGS62wIJtogLIn7qHHf6mHI=
+			XXNQyzWBPNQc0LabYVFSq1+6FgiCA1PYg3CVpz1A/Ao=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			cDISfqanYqzJVnqnxypUw+tozwSO6gEvJJQihjeGHZc=
+			MxYisuRzDnLJu8bdCdbZ+bLSCKuVjNrePs2w2NFQu8M=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
diff --git a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative
index 4dcc85558..5f273c43c 100644
Binary files a/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative and b/packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative differ
diff --git a/packages/canvas/src-native/canvas-native/canvas-android/Cargo.toml b/packages/canvas/src-native/canvas-native/canvas-android/Cargo.toml
index c6649a8c5..9f92e221b 100644
--- a/packages/canvas/src-native/canvas-native/canvas-android/Cargo.toml
+++ b/packages/canvas/src-native/canvas-native/canvas-android/Cargo.toml
@@ -20,7 +20,7 @@ canvas-webgl = { path = "../canvas-webgl" }
 canvas-c = { path = "../canvas-c", features = ["2d", "webgl"] }
 gl-bindings = { path = "../gl-bindings" }
 raw-window-handle = "0.5.2"
-ureq = "2.6.2"
+ureq = "2.8.0"
 parking_lot = "0.12.1"
 jni = "0.21.0"
 once_cell = "1.10.0"
diff --git a/packages/canvas/src-native/canvas-native/canvas-c/src/lib.rs b/packages/canvas/src-native/canvas-native/canvas-c/src/lib.rs
index 51e7a7e31..b5e461f54 100644
--- a/packages/canvas/src-native/canvas-native/canvas-c/src/lib.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-c/src/lib.rs
@@ -4036,7 +4036,6 @@ pub extern "C" fn canvas_native_text_decoder_decode(
         .unwrap()
         .into_raw()
 }
-
 #[no_mangle]
 pub extern "C" fn canvas_native_text_decoder_get_encoding(
     decoder: *const TextDecoder,
diff --git a/packages/canvas/src-native/canvas-native/canvas-c/src/raf/android.rs b/packages/canvas/src-native/canvas-native/canvas-c/src/raf/android.rs
index 9f9de419a..fc1533662 100644
--- a/packages/canvas/src-native/canvas-native/canvas-c/src/raf/android.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-c/src/raf/android.rs
@@ -69,7 +69,7 @@ impl Raf {
                 lock.is_prepared = true;
             }
             let instance = AChoreographer_getInstance();
-            let data = Box::into_raw(Box::new(self.clone())) as *const c_void;
+            let data = Box::into_raw(Box::new(self.clone())) as *mut c_void;
             if lock.use_deprecated {
                 AChoreographer_postFrameCallback(instance, Some(Raf::callback), data);
             } else {
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml b/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml
index 712e8f660..a51fcb602 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml
+++ b/packages/canvas/src-native/canvas-native/canvas-core/Cargo.toml
@@ -17,14 +17,14 @@ once_cell = "1.14.0"
 log = "0.4.17"
 
 [target.'cfg(target_os = "ios")'.dependencies]
-icrate = {version = "0.0.2", features = ["objc2", "Foundation" , "Foundation_NSData"]}
+icrate = {version = "0.0.4", features = ["objc2", "Foundation" , "Foundation_NSData"]}
 core-foundation = "0.9.3"
 
-#[target.'cfg(target_os = "android")'.dependencies]
-#egl = "0.2.7"
-#glutin = "0.30.10"
-##glutin = { git = "https://github.com/triniwiz/glutin", rev = "1b2cbbe" }
-#android_log = "0.1.3"
+[target.'cfg(target_os = "android")'.dependencies]
+egl = "0.2.7"
+glutin = "0.30.10"
+#glutin = { git = "https://github.com/triniwiz/glutin", rev = "1b2cbbe" }
+android_log = "0.1.3"
 
 #[target.'cfg(target_os = "macos")'.dependencies]
 #winit = "0.28.1"
diff --git a/packages/canvas/src-native/canvas-native/canvas-core/src/gl/ios.rs b/packages/canvas/src-native/canvas-native/canvas-core/src/gl/ios.rs
index 8fb15a78b..33826da52 100644
--- a/packages/canvas/src-native/canvas-native/canvas-core/src/gl/ios.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-core/src/gl/ios.rs
@@ -1,16 +1,14 @@
 use std::cell::RefCell;
-use std::ffi::{c_int, c_long, c_void};
-use std::fmt::{Debug, Formatter};
+use std::ffi::{c_long, c_void};
+use std::fmt::Debug;
 use std::ptr::NonNull;
 use std::rc::Rc;
 use core_foundation::base::TCFType;
 use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName};
 use core_foundation::string::CFString;
-use icrate::objc2::ffi::{objc_class, BOOL};
-use icrate::objc2::rc::{Allocated, Owned};
-use icrate::objc2::Encoding::Void;
+use icrate::objc2::ffi::BOOL;
 use icrate::objc2::{
-    class, extern_class, msg_send, msg_send_id, rc::Id, rc::Shared, runtime::Object, sel,
+    class, msg_send, msg_send_id, rc::Id, runtime::AnyObject,
     ClassType, Encode, Encoding,
 };
 use icrate::Foundation::{NSData, NSInteger, NSObject, NSUInteger};
@@ -67,14 +65,14 @@ unsafe impl Encode for EAGLRenderingAPI {
 }
 
 #[derive(Clone, Debug)]
-pub(crate) struct EAGLSharegroup(Id<Object, Shared>);
+pub(crate) struct EAGLSharegroup(Id<NSObject>);
 
 impl EAGLSharegroup {
     pub fn new() -> Self {
         unsafe {
             let cls = class!(EAGLSharegroup);
             let sharegroup = msg_send_id![cls, alloc];
-            let sharegroup: Id<Object, Shared> =
+            let sharegroup: Id<NSObject> =
                 msg_send_id![sharegroup, initWithAPI: EAGLRenderingAPI::GLES3];
 
             Self(sharegroup)
@@ -89,14 +87,15 @@ impl Default for EAGLSharegroup {
 }
 
 #[derive(Clone, Debug)]
-pub(crate) struct EAGLContext(Id<Object, Shared>);
+pub(crate) struct EAGLContext(Id<NSObject>);
+
 
 impl EAGLContext {
     pub fn new_with_api(api: EAGLRenderingAPI) -> Option<Self> {
         unsafe {
             let cls = class!(EAGLContext);
             let context = msg_send_id![cls, alloc];
-            let mut context: Option<Id<Object, Shared>> = msg_send_id![context, initWithAPI: api];
+            let mut context: Option<Id<NSObject>> = msg_send_id![context, initWithAPI: api];
             context.map(EAGLContext)
         }
     }
@@ -108,7 +107,7 @@ impl EAGLContext {
         unsafe {
             let cls = class!(EAGLContext);
             let context = msg_send_id![cls, alloc];
-            let context: Option<Id<Object, Shared>> =
+            let context: Option<Id<NSObject>> =
                 msg_send_id![context, initWithAPI: api, sharegroup: &*sharegroup.0];
             context.map(EAGLContext)
         }
@@ -122,7 +121,7 @@ impl EAGLContext {
                 instance
             },
             None => unsafe {
-                let nil: *mut Object = std::ptr::null_mut();
+                let nil: *mut NSObject = std::ptr::null_mut();
                 let instance: BOOL = msg_send![cls, setCurrentContext: nil];
                 instance
             },
@@ -132,7 +131,7 @@ impl EAGLContext {
     pub fn get_current_context() -> Option<Self> {
         unsafe {
             let cls = class!(EAGLContext);
-            let context: Option<Id<Object, Shared>> = msg_send_id![cls, currentContext];
+            let context: Option<Id<NSObject>> = msg_send_id![cls, currentContext];
 
             context.map(EAGLContext)
         }
@@ -141,7 +140,7 @@ impl EAGLContext {
     pub fn remove_if_current(&self) -> bool {
         unsafe {
             let cls = class!(EAGLContext);
-            let current: Option<Id<Object, Shared>> = msg_send_id![cls, currentContext];
+            let current: Option<Id<NSObject>> = msg_send_id![cls, currentContext];
 
             match current {
                 Some(current) => {
@@ -150,7 +149,7 @@ impl EAGLContext {
                         unsafe {
                             gl_bindings::Flush();
                         }
-                        let nil: *mut Object = std::ptr::null_mut();
+                        let nil: *mut NSObject = std::ptr::null_mut();
                         return msg_send![cls, setCurrentContext: nil];
                     }
                     false
@@ -265,7 +264,7 @@ impl TryFrom<i32> for GLKViewDrawableMultisample {
 }
 
 #[derive(Clone, Debug)]
-pub(crate) struct GLKView(Id<Object, Shared>);
+pub(crate) struct GLKView(Id<NSObject>);
 
 impl GLKView {
     pub fn new() -> Self {
@@ -326,12 +325,12 @@ impl GLKView {
     }
 
     pub fn set_alpha(&self, alpha: bool) {
-        let layer: Id<Object, Shared> = unsafe { msg_send_id![&self.0, layer] };
+        let layer: Id<NSObject> = unsafe { msg_send_id![&self.0, layer] };
         let _: () = unsafe { msg_send![&layer, setOpaque: alpha] };
     }
 
     pub fn get_alpha(&self) -> bool {
-        let layer: Id<Object, Shared> = unsafe { msg_send_id![&self.0, layer] };
+        let layer: Id<NSObject> = unsafe { msg_send_id![&self.0, layer] };
         let ret: bool = unsafe { msg_send![&layer, isOpaque] };
         ret
     }
@@ -370,14 +369,14 @@ impl GLKView {
                 let _: () = unsafe { msg_send![&self.0, setContext: &*context.0] };
             }
             None => {
-                let nil: *mut Object = std::ptr::null_mut();
+                let nil: *mut NSObject = std::ptr::null_mut();
                 let _: () = unsafe { msg_send![&self.0, setContext: nil] };
             }
         }
     }
 
     pub fn get_context(&self) -> Option<EAGLContext> {
-        let context: Option<Id<Object, Shared>> = unsafe { msg_send_id![&self.0, context] };
+        let context: Option<Id<NSObject>> = unsafe { msg_send_id![&self.0, context] };
         context.map(EAGLContext)
     }
 
@@ -393,7 +392,7 @@ impl GLKView {
 
 impl GLContext {
     pub fn set_surface(&mut self, view: NonNull<c_void>) -> bool {
-        let glview = unsafe { Id::<Object, Shared>::new(view.as_ptr() as _) };
+        let glview = unsafe { Id::<NSObject>::new(view.as_ptr() as _) };
         match glview {
             None => false,
             Some(glview) => {
@@ -409,7 +408,7 @@ impl GLContext {
         view: NonNull<c_void>,
         context: &GLContext,
     ) -> Option<GLContext> {
-        let glview = unsafe { Id::<Object, Shared>::new(view.as_ptr() as _) };
+        let glview = unsafe { Id::<NSObject>::new(view.as_ptr() as _) };
         match glview {
             None => None,
             Some(glview) => {
@@ -423,7 +422,7 @@ impl GLContext {
         context_attrs: &mut ContextAttributes,
         view: NonNull<c_void>,
     ) -> Option<GLContext> {
-        let glview = unsafe { Id::<Object, Shared>::new(view.as_ptr() as _) };
+        let glview = unsafe { Id::<NSObject>::new(view.as_ptr() as _) };
         match glview {
             None => None,
             Some(glview) => {
@@ -522,7 +521,7 @@ impl GLContext {
         if let Some(context) = inner.context.as_ref() {
             unsafe {
                 let cls = class!(EAGLContext);
-                let current: Option<Id<Object, Shared>> = msg_send_id![cls, currentContext];
+                let current: Option<Id<NSObject>> = msg_send_id![cls, currentContext];
 
                 match current {
                     Some(current) => {
@@ -537,7 +536,7 @@ impl GLContext {
 
             // unsafe {
             //     let cls = class!(EAGLContext);
-            //     let current: Option<Id<Object, Shared>> = msg_send_id![cls, currentContext];
+            //     let current: Option<Id<NSObject>> = msg_send_id![cls, currentContext];
             //
             //     match current {
             //         Some(current) => {
diff --git a/packages/canvas/src-native/canvas-native/canvas-cxx/Cargo.toml b/packages/canvas/src-native/canvas-native/canvas-cxx/Cargo.toml
index d2801eec3..9dea1dc2f 100644
--- a/packages/canvas/src-native/canvas-native/canvas-cxx/Cargo.toml
+++ b/packages/canvas/src-native/canvas-native/canvas-cxx/Cargo.toml
@@ -20,7 +20,7 @@ canvas-core = { path = "../canvas-core", features = ["2d"] }
 canvas-2d = { path = "../canvas-2d", optional = true, features = ["gl"] }
 canvas-webgl = { path = "../canvas-webgl", optional = true }
 parking_lot = "0.12.0"
-ureq = "2.5.0"
+ureq = "2.8.0"
 
 [target.'cfg(target_os="ios")'.dependencies]
 display-link = "0.2.0"
diff --git a/packages/canvas/src-native/canvas-native/canvas-ffi/target/canvas-ffi.h b/packages/canvas/src-native/canvas-native/canvas-ffi/target/canvas-ffi.h
deleted file mode 100644
index 1eeecc372..000000000
--- a/packages/canvas/src-native/canvas-native/canvas-ffi/target/canvas-ffi.h
+++ /dev/null
@@ -1,1154 +0,0 @@
-#ifndef CBINDGEN_BINDINGS_H
-#define CBINDGEN_BINDINGS_H
-
-/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum CompositeOperationType {
-  SourceOver = 0,
-  SourceIn = 1,
-  SourceOut = 2,
-  SourceAtop = 3,
-  DestinationOver = 4,
-  DestinationIn = 5,
-  DestinationOut = 6,
-  DestinationAtop = 7,
-  Lighter = 8,
-  Copy = 9,
-  Xor = 10,
-  Multiply = 11,
-  Screen = 12,
-  Overlay = 13,
-  Darken = 14,
-  Lighten = 15,
-  ColorDodge = 16,
-  ColorBurn = 17,
-  HardLight = 18,
-  SoftLight = 19,
-  Difference = 20,
-  Exclusion = 21,
-  Hue = 22,
-  Saturation = 23,
-  Color = 24,
-  Luminosity = 25,
-} CompositeOperationType;
-
-typedef enum FillRule {
-  NonZero = 0,
-  EvenOdd = 1,
-} FillRule;
-
-typedef enum ImageSmoothingQuality {
-  Low = 0,
-  Medium = 1,
-  High = 2,
-} ImageSmoothingQuality;
-
-typedef enum LineCap {
-  CapButt = 0,
-  CapRound = 1,
-  CapSquare = 2,
-} LineCap;
-
-typedef enum LineJoin {
-  JoinRound = 0,
-  JoinBevel = 1,
-  JoinMiter = 2,
-} LineJoin;
-
-typedef enum PaintStyleValueType {
-  PaintStyleValueTypeColor = 0,
-  PaintStyleValueTypeGradient = 1,
-  PaintStyleValueTypePattern = 2,
-} PaintStyleValueType;
-
-typedef enum Repetition {
-  Repeat = 0,
-  RepeatX = 1,
-  RepeatY = 2,
-  NoRepeat = 3,
-} Repetition;
-
-typedef enum TextAlign {
-  START = 0,
-  LEFT = 1,
-  CENTER = 2,
-  RIGHT = 3,
-  END = 4,
-} TextAlign;
-
-typedef enum TextBaseLine {
-  TOP = 0,
-  HANGING = 1,
-  MIDDLE = 2,
-  ALPHABETIC = 3,
-  IDEOGRAPHIC = 4,
-  BOTTOM = 5,
-} TextBaseLine;
-
-typedef enum TextDirection {
-  LTR = 0,
-  RTL = 1,
-} TextDirection;
-
-typedef struct ContextWrapper ContextWrapper;
-
-typedef struct ImageAsset ImageAsset;
-
-typedef struct ImageData ImageData;
-
-typedef struct Matrix Matrix;
-
-typedef struct PaintStyle PaintStyle;
-
-typedef struct Path Path;
-
-typedef struct TextDecoder TextDecoder;
-
-typedef struct TextEncoder TextEncoder;
-
-typedef struct TextMetrics {
-  float width;
-  float actual_bounding_box_left;
-  float actual_bounding_box_right;
-  float font_bounding_box_ascent;
-  float font_bounding_box_descent;
-  float actual_bounding_box_ascent;
-  float actual_bounding_box_descent;
-  float em_height_ascent;
-  float em_height_descent;
-  float hanging_baseline;
-  float alphabetic_baseline;
-  float ideographic_baseline;
-} TextMetrics;
-
-typedef struct I8Array {
-  int8_t *data;
-  uintptr_t data_len;
-} I8Array;
-
-typedef struct I16Array {
-  int16_t *data;
-  uintptr_t data_len;
-} I16Array;
-
-typedef struct I32Array {
-  int32_t *data;
-  uintptr_t data_len;
-} I32Array;
-
-typedef struct U8Array {
-  uint8_t *data;
-  uintptr_t data_len;
-} U8Array;
-
-typedef struct U16Array {
-  uint16_t *data;
-  uintptr_t data_len;
-} U16Array;
-
-typedef struct U32Array {
-  uint32_t *data;
-  uintptr_t data_len;
-} U32Array;
-
-typedef struct F32Array {
-  float *data;
-  uintptr_t data_len;
-} F32Array;
-
-typedef struct F64Array {
-  double *data;
-  uintptr_t data_len;
-} F64Array;
-
-typedef struct PaintStyleValue {
-  long long value;
-  enum PaintStyleValueType value_type;
-} PaintStyleValue;
-
-void canvas_native_destroy_string(const char *string);
-
-void canvas_native_destroy_context(struct ContextWrapper *context);
-
-void canvas_native_destroy_paint_style(struct PaintStyle *style);
-
-void canvas_native_destroy_text_metrics(struct TextMetrics *metrics);
-
-int8_t *canvas_native_get_i8_array_data(struct I8Array *array);
-
-uintptr_t canvas_native_get_i8_array_data_len(struct I8Array *array);
-
-void canvas_native_destroy_i8_array(struct I8Array *array);
-
-int16_t *canvas_native_get_i16_array_data(struct I16Array *array);
-
-uintptr_t canvas_native_get_i16_array_data_len(struct I16Array *array);
-
-void canvas_native_destroy_i16_array(struct I16Array *array);
-
-int *canvas_native_get_I32_array_data(struct I32Array *array);
-
-uintptr_t canvas_native_get_I32_array_data_len(struct I32Array *array);
-
-void canvas_native_destroy_i32_array(struct I32Array *array);
-
-uint8_t *canvas_native_get_u8_array_data(struct U8Array *array);
-
-uintptr_t canvas_native_get_u8_array_data_len(struct U8Array *array);
-
-void canvas_native_destroy_u8_array(struct U8Array *array);
-
-uint16_t *canvas_native_get_u16_array_data(struct U16Array *array);
-
-uintptr_t canvas_native_get_u16_array_data_len(struct U16Array *array);
-
-void canvas_native_destroy_u16_array(struct U16Array *array);
-
-uint32_t *canvas_native_get_u32_array_data(struct U32Array *array);
-
-uintptr_t canvas_native_get_u32_array_data_len(struct U32Array *array);
-
-void canvas_native_destroy_u32_array(struct U32Array *array);
-
-float *canvas_native_get_f32_array_data(struct F32Array *array);
-
-uintptr_t canvas_native_get_f32_array_data_len(struct F32Array *array);
-
-void canvas_native_destroy_f32_array(struct F32Array *array);
-
-double *canvas_native_get_f64_array_data(struct F64Array *array);
-
-uintptr_t canvas_native_get_f64_array_data_len(struct F64Array *array);
-
-void canvas_native_destroy_f64_array(struct F64Array *array);
-
-struct ContextWrapper *canvas_native_context_init(float width,
-                                                  float height,
-                                                  float density,
-                                                  bool alpha,
-                                                  int font_color,
-                                                  float ppi,
-                                                  enum TextDirection direction);
-
-void canvas_native_context_resize(struct ContextWrapper *context,
-                                  float width,
-                                  float height,
-                                  float density,
-                                  bool alpha,
-                                  float ppi);
-
-const char *canvas_native_context_data_url(struct ContextWrapper *context,
-                                           const char *format,
-                                           float quality);
-
-struct U8Array *canvas_native_context_snapshot_canvas(struct ContextWrapper *context);
-
-void canvas_native_context_flush(struct ContextWrapper *context);
-
-void canvas_native_context_custom_with_buffer_flush(struct ContextWrapper *context,
-                                                    uint8_t *buf,
-                                                    uintptr_t buf_size,
-                                                    float width,
-                                                    float height);
-
-void canvas_native_context_set_direction(struct ContextWrapper *context,
-                                         enum TextDirection direction);
-
-enum TextDirection canvas_native_context_get_direction(const struct ContextWrapper *context);
-
-void canvas_native_context_set_fill_style(struct ContextWrapper *context, struct PaintStyle *style);
-
-struct PaintStyleValue *canvas_native_context_get_fill_style(struct ContextWrapper *context);
-
-long long canvas_native_context_get_style_value(struct PaintStyleValue *style);
-
-enum PaintStyleValueType canvas_native_context_get_style_type(struct PaintStyleValue *style);
-
-void canvas_native_context_set_filter(struct ContextWrapper *context, const char *filter);
-
-const char *canvas_native_context_get_filter(struct ContextWrapper *context);
-
-void canvas_native_context_set_font(struct ContextWrapper *context, const char *filter);
-
-const char *canvas_native_context_get_font(struct ContextWrapper *context);
-
-void canvas_native_context_set_global_alpha(struct ContextWrapper *context, float alpha);
-
-float canvas_native_context_get_global_alpha(struct ContextWrapper *context);
-
-void canvas_native_context_set_global_composite_operation(struct ContextWrapper *context,
-                                                          enum CompositeOperationType operation);
-
-enum CompositeOperationType canvas_native_context_get_global_composite_operation(struct ContextWrapper *context);
-
-void canvas_native_context_set_image_smoothing_enabled(struct ContextWrapper *context,
-                                                       bool enabled);
-
-bool canvas_native_context_get_image_smoothing_enabled(struct ContextWrapper *context);
-
-void canvas_native_context_set_image_smoothing_quality(struct ContextWrapper *context,
-                                                       enum ImageSmoothingQuality quality);
-
-enum ImageSmoothingQuality canvas_native_context_get_image_smoothing_quality(struct ContextWrapper *context);
-
-void canvas_native_context_set_line_cap(struct ContextWrapper *context, enum LineCap cap);
-
-enum LineCap canvas_native_context_get_line_cap(struct ContextWrapper *context);
-
-void canvas_native_context_set_line_dash_offset(struct ContextWrapper *context, float offset);
-
-float canvas_native_context_get_line_dash_offset(struct ContextWrapper *context);
-
-void canvas_native_context_set_line_join(struct ContextWrapper *context, enum LineJoin join);
-
-enum LineJoin canvas_native_context_get_line_join(struct ContextWrapper *context);
-
-void canvas_native_context_set_line_width(struct ContextWrapper *context, float width);
-
-float canvas_native_context_get_line_width(struct ContextWrapper *context);
-
-void canvas_native_context_set_miter_limit(struct ContextWrapper *context, float limit);
-
-float canvas_native_context_get_miter_limit(struct ContextWrapper *context);
-
-void canvas_native_context_set_shadow_blur(struct ContextWrapper *context, float blur);
-
-float canvas_native_context_get_shadow_blur(struct ContextWrapper *context);
-
-void canvas_native_context_set_shadow_color(struct ContextWrapper *context,
-                                            uint8_t r,
-                                            uint8_t g,
-                                            uint8_t b,
-                                            uint8_t a);
-
-void canvas_native_context_set_shadow_color_string(struct ContextWrapper *context,
-                                                   const char *color);
-
-const char *canvas_native_context_get_shadow_color(struct ContextWrapper *context);
-
-void canvas_native_context_set_shadow_offset_x(struct ContextWrapper *context, float x);
-
-float canvas_native_context_get_shadow_offset_x(struct ContextWrapper *context);
-
-void canvas_native_context_set_shadow_offset_y(struct ContextWrapper *context, float y);
-
-float canvas_native_context_get_shadow_offset_y(struct ContextWrapper *context);
-
-void canvas_native_context_set_stroke_style(struct ContextWrapper *context,
-                                            struct PaintStyle *style);
-
-struct PaintStyleValue *canvas_native_context_get_stroke_style(struct ContextWrapper *context);
-
-void canvas_native_context_set_text_align(struct ContextWrapper *context, enum TextAlign align);
-
-enum TextAlign canvas_native_context_get_text_align(struct ContextWrapper *context);
-
-void canvas_native_context_set_text_baseline(struct ContextWrapper *context,
-                                             enum TextBaseLine baseline);
-
-enum TextBaseLine canvas_native_context_get_text_baseline(struct ContextWrapper *context);
-
-void canvas_native_context_arc(struct ContextWrapper *context,
-                               float x,
-                               float y,
-                               float radius,
-                               float start_angle,
-                               float end_angle,
-                               bool anti_clockwise);
-
-void canvas_native_context_arc_to(struct ContextWrapper *context,
-                                  float x1,
-                                  float y1,
-                                  float x2,
-                                  float y2,
-                                  float radius);
-
-void canvas_native_context_begin_path(struct ContextWrapper *context);
-
-void canvas_native_context_bezier_curve_to(struct ContextWrapper *context,
-                                           float cp1x,
-                                           float cp1y,
-                                           float cp2x,
-                                           float cp2y,
-                                           float x,
-                                           float y);
-
-void canvas_native_context_clear_rect(struct ContextWrapper *context,
-                                      float x,
-                                      float y,
-                                      float width,
-                                      float height);
-
-void canvas_native_context_clip(struct ContextWrapper *context,
-                                struct Path *path,
-                                enum FillRule rule);
-
-void canvas_native_context_clip_rule(struct ContextWrapper *context, enum FillRule rule);
-
-void canvas_native_context_close_path(struct ContextWrapper *context);
-
-struct ImageData *canvas_native_context_create_image_data(int width, int height);
-
-struct PaintStyle *canvas_native_context_create_linear_gradient(struct ContextWrapper *context,
-                                                                float x0,
-                                                                float y0,
-                                                                float x1,
-                                                                float y1);
-
-struct PaintStyle *canvas_native_context_create_pattern(struct ContextWrapper *context,
-                                                        const uint8_t *image_data,
-                                                        uintptr_t image_len,
-                                                        int width,
-                                                        int height,
-                                                        enum Repetition repetition);
-
-struct PaintStyle *canvas_native_context_create_pattern_asset(struct ContextWrapper *context,
-                                                              struct ImageAsset *asset,
-                                                              enum Repetition repetition);
-
-struct PaintStyle *canvas_native_context_create_pattern_encoded(struct ContextWrapper *context,
-                                                                const uint8_t *image_data,
-                                                                uintptr_t image_len,
-                                                                enum Repetition repetition);
-
-struct PaintStyle *canvas_native_context_create_radial_gradient(struct ContextWrapper *context,
-                                                                float x0,
-                                                                float y0,
-                                                                float r0,
-                                                                float x1,
-                                                                float y1,
-                                                                float r1);
-
-void canvas_native_context_draw_image_dx_dy(struct ContextWrapper *context,
-                                            const uint8_t *image_data,
-                                            uintptr_t image_len,
-                                            float width,
-                                            float height,
-                                            float dx,
-                                            float dy);
-
-void canvas_native_context_draw_image_dx_dy_dw_dh(struct ContextWrapper *context,
-                                                  const uint8_t *image_data,
-                                                  uintptr_t image_len,
-                                                  float width,
-                                                  float height,
-                                                  float dx,
-                                                  float dy,
-                                                  float d_width,
-                                                  float d_height);
-
-void canvas_native_context_draw_image(struct ContextWrapper *context,
-                                      const uint8_t *image_data,
-                                      uintptr_t image_len,
-                                      float width,
-                                      float height,
-                                      float sx,
-                                      float sy,
-                                      float s_width,
-                                      float s_height,
-                                      float dx,
-                                      float dy,
-                                      float d_width,
-                                      float d_height);
-
-void canvas_native_context_draw_image_encoded_dx_dy(struct ContextWrapper *context,
-                                                    const uint8_t *image_data,
-                                                    uintptr_t image_len,
-                                                    float dx,
-                                                    float dy);
-
-void canvas_native_context_draw_image_encoded_dx_dy_dw_dh(struct ContextWrapper *context,
-                                                          const uint8_t *image_data,
-                                                          uintptr_t image_len,
-                                                          float dx,
-                                                          float dy,
-                                                          float d_width,
-                                                          float d_height);
-
-void canvas_native_context_draw_image_encoded(struct ContextWrapper *context,
-                                              const uint8_t *image_data,
-                                              uintptr_t image_len,
-                                              float sx,
-                                              float sy,
-                                              float s_width,
-                                              float s_height,
-                                              float dx,
-                                              float dy,
-                                              float d_width,
-                                              float d_height);
-
-void canvas_native_context_draw_image_dx_dy_asset(struct ContextWrapper *context,
-                                                  struct ImageAsset *asset,
-                                                  float dx,
-                                                  float dy);
-
-void canvas_native_context_draw_image_dx_dy_dw_dh_asset(struct ContextWrapper *context,
-                                                        struct ImageAsset *asset,
-                                                        float dx,
-                                                        float dy,
-                                                        float d_width,
-                                                        float d_height);
-
-void canvas_native_context_draw_image_asset(struct ContextWrapper *context,
-                                            struct ImageAsset *asset,
-                                            float sx,
-                                            float sy,
-                                            float s_width,
-                                            float s_height,
-                                            float dx,
-                                            float dy,
-                                            float d_width,
-                                            float d_height);
-
-void canvas_native_context_ellipse(struct ContextWrapper *context,
-                                   float x,
-                                   float y,
-                                   float radius_x,
-                                   float radius_y,
-                                   float rotation,
-                                   float start_angle,
-                                   float end_angle,
-                                   bool anticlockwise);
-
-void canvas_native_context_fill(struct ContextWrapper *context,
-                                struct Path *path,
-                                enum FillRule rule);
-
-void canvas_native_context_fill_rect(struct ContextWrapper *context,
-                                     float x,
-                                     float y,
-                                     float width,
-                                     float height);
-
-void canvas_native_context_fill_text(struct ContextWrapper *context,
-                                     const char *text,
-                                     float x,
-                                     float y,
-                                     float width);
-
-struct ImageData *canvas_native_context_get_image_data(struct ContextWrapper *context,
-                                                       float sx,
-                                                       float sy,
-                                                       float sw,
-                                                       float sh);
-
-struct F32Array *canvas_native_context_get_line_dash(struct ContextWrapper *context);
-
-struct Matrix *canvas_native_context_get_transform(struct ContextWrapper *context);
-
-bool canvas_native_context_is_point_in_path(struct ContextWrapper *context,
-                                            struct Path *path,
-                                            float x,
-                                            float y,
-                                            enum FillRule rule);
-
-bool canvas_native_context_is_point_in_stroke(struct ContextWrapper *context,
-                                              struct Path *path,
-                                              float x,
-                                              float y);
-
-void canvas_native_context_line_to(struct ContextWrapper *context, float x, float y);
-
-long long canvas_native_context_measure_text(struct ContextWrapper *context, const char *text);
-
-void canvas_native_context_move_to(struct ContextWrapper *context, float x, float y);
-
-void canvas_native_context_put_image_data(struct ContextWrapper *context,
-                                          struct ImageData *image_data,
-                                          float dx,
-                                          float dy,
-                                          float dirty_x,
-                                          float dirty_y,
-                                          float dirty_width,
-                                          float dirty_height);
-
-void canvas_native_context_quadratic_curve_to(struct ContextWrapper *context,
-                                              float cpx,
-                                              float cpy,
-                                              float x,
-                                              float y);
-
-void canvas_native_context_rect(struct ContextWrapper *context,
-                                float x,
-                                float y,
-                                float width,
-                                float height);
-
-void canvas_native_context_reset_transform(struct ContextWrapper *context);
-
-void canvas_native_context_restore(struct ContextWrapper *context);
-
-void canvas_native_context_rotate(struct ContextWrapper *context, float angle);
-
-void canvas_native_context_save(struct ContextWrapper *context);
-
-void canvas_native_context_scale(struct ContextWrapper *context, float x, float y);
-
-void canvas_native_context_set_line_dash(struct ContextWrapper *context,
-                                         const float *data,
-                                         uintptr_t data_length);
-
-void canvas_native_context_set_transform(struct ContextWrapper *context,
-                                         float a,
-                                         float b,
-                                         float c,
-                                         float d,
-                                         float e,
-                                         float f);
-
-void canvas_native_context_set_transform_matrix(struct ContextWrapper *context,
-                                                struct Matrix *matrix);
-
-void canvas_native_context_stroke(struct ContextWrapper *context, struct Path *path);
-
-void canvas_native_context_stroke_rect(struct ContextWrapper *context,
-                                       float x,
-                                       float y,
-                                       float width,
-                                       float height);
-
-void canvas_native_context_stroke_text(struct ContextWrapper *context,
-                                       const char *text,
-                                       float x,
-                                       float y,
-                                       float width);
-
-void canvas_native_context_transform(struct ContextWrapper *context,
-                                     float a,
-                                     float b,
-                                     float c,
-                                     float d,
-                                     float e,
-                                     float f);
-
-void canvas_native_context_translate(struct ContextWrapper *context, float x, float y);
-
-void canvas_native_gl_tex_image_2D_asset(unsigned int target,
-                                         int level,
-                                         int internalformat,
-                                         int border,
-                                         unsigned int format,
-                                         unsigned int image_type,
-                                         struct ImageAsset *asset,
-                                         bool flip_y);
-
-void canvas_native_gl_tex_sub_image_2D_asset(unsigned int target,
-                                             int level,
-                                             int xoffset,
-                                             int yoffset,
-                                             unsigned int format,
-                                             unsigned int image_type,
-                                             struct ImageAsset *asset,
-                                             bool flip_y);
-
-void canvas_native_gl_tex_image_3D_asset(unsigned int target,
-                                         int level,
-                                         int internalformat,
-                                         int width,
-                                         int height,
-                                         int depth,
-                                         int border,
-                                         unsigned int format,
-                                         unsigned int image_type,
-                                         struct ImageAsset *asset,
-                                         bool flip_y);
-
-void canvas_native_gl_tex_sub_image_3D_asset(unsigned int target,
-                                             int level,
-                                             int xoffset,
-                                             int yoffset,
-                                             int zoffset,
-                                             int width,
-                                             int height,
-                                             int depth,
-                                             unsigned int format,
-                                             unsigned int image_type,
-                                             struct ImageAsset *asset,
-                                             bool flip_y);
-
-void canvas_native_gl_vertex_attrib_pointer(unsigned int index,
-                                            int size,
-                                            unsigned int pointer_type,
-                                            bool normalized,
-                                            int stride,
-                                            long long offset);
-
-long long canvas_native_gl_get_vertex_attrib_offset(unsigned int index, unsigned int pname);
-
-void canvas_native_gradient_add_color_stop(struct PaintStyle *style, float stop, const char *color);
-
-struct ImageAsset *canvas_native_image_asset_create(void);
-
-bool canvas_native_image_asset_load_from_path(struct ImageAsset *asset, const char *path);
-
-bool canvas_native_image_asset_load_from_raw(struct ImageAsset *asset,
-                                             const uint8_t *array,
-                                             uintptr_t size);
-
-struct U8Array *canvas_native_image_asset_get_bytes(struct ImageAsset *asset);
-
-struct U8Array *canvas_native_image_asset_get_rgba_bytes(struct ImageAsset *asset);
-
-struct U8Array *canvas_native_image_asset_get_rgb_bytes(struct ImageAsset *asset);
-
-unsigned int canvas_native_image_asset_width(struct ImageAsset *asset);
-
-unsigned int canvas_native_image_asset_height(struct ImageAsset *asset);
-
-const char *canvas_native_image_asset_get_error(struct ImageAsset *asset);
-
-bool canvas_native_image_asset_has_error(struct ImageAsset *asset);
-
-bool canvas_native_image_asset_scale(struct ImageAsset *asset, unsigned int x, unsigned int y);
-
-bool canvas_native_image_asset_flip_x(struct ImageAsset *asset);
-
-bool canvas_native_image_asset_flip_x_in_place(struct ImageAsset *asset);
-
-bool canvas_native_image_asset_flip_y(struct ImageAsset *asset);
-
-void canvas_native_image_asset_flip_y_in_place_owned(uint8_t *buf, uintptr_t length);
-
-void canvas_native_image_asset_flip_x_in_place_owned(uint8_t *buf, uintptr_t length);
-
-bool canvas_native_image_asset_flip_y_in_place(struct ImageAsset *asset);
-
-bool canvas_native_image_asset_save_path(struct ImageAsset *asset,
-                                         const char *path,
-                                         unsigned int format);
-
-void canvas_native_destroy_image_asset(struct ImageAsset *asset);
-
-long long canvas_native_image_bitmap_create_from_bytes(const uint8_t *image_bytes,
-                                                       uintptr_t image_size,
-                                                       float image_width,
-                                                       float image_height,
-                                                       bool flip_y,
-                                                       int32_t premultiply_alpha,
-                                                       int32_t color_space_conversion,
-                                                       int32_t resize_quality,
-                                                       float resize_width,
-                                                       float resize_height);
-
-long long canvas_native_image_bitmap_create_from_bytes_src_rect(const uint8_t *image_bytes,
-                                                                uintptr_t image_size,
-                                                                float image_width,
-                                                                float image_height,
-                                                                float sx,
-                                                                float sy,
-                                                                float s_width,
-                                                                float s_height,
-                                                                bool flip_y,
-                                                                int32_t premultiply_alpha,
-                                                                int32_t color_space_conversion,
-                                                                int32_t resize_quality,
-                                                                float resize_width,
-                                                                float resize_height);
-
-long long canvas_native_image_bitmap_create_from_image_asset(long long asset,
-                                                             bool flip_y,
-                                                             int premultiply_alpha,
-                                                             int color_space_conversion,
-                                                             int resize_quality,
-                                                             float resize_width,
-                                                             float resize_height);
-
-long long canvas_native_image_bitmap_create_from_image_asset_src_rect(long long asset,
-                                                                      float sx,
-                                                                      float sy,
-                                                                      float s_width,
-                                                                      float s_height,
-                                                                      bool flip_y,
-                                                                      int premultiply_alpha,
-                                                                      int color_space_conversion,
-                                                                      int resize_quality,
-                                                                      float resize_width,
-                                                                      float resize_height);
-
-long long canvas_native_image_bitmap_create_from_bytes_encoded(const uint8_t *image_bytes,
-                                                               uintptr_t image_size,
-                                                               bool flip_y,
-                                                               int32_t premultiply_alpha,
-                                                               int32_t color_space_conversion,
-                                                               int32_t resize_quality,
-                                                               float resize_width,
-                                                               float resize_height);
-
-long long canvas_native_image_bitmap_create_from_bytes_encoded_src_rect(const uint8_t *image_bytes,
-                                                                        uintptr_t image_size,
-                                                                        float sx,
-                                                                        float sy,
-                                                                        float s_width,
-                                                                        float s_height,
-                                                                        bool flip_y,
-                                                                        int32_t premultiply_alpha,
-                                                                        int32_t color_space_conversion,
-                                                                        int32_t resize_quality,
-                                                                        float resize_width,
-                                                                        float resize_height);
-
-long long canvas_native_image_bitmap_create_from_image_data(long long image_data,
-                                                            bool flip_y,
-                                                            int premultiply_alpha,
-                                                            int color_space_conversion,
-                                                            int resize_quality,
-                                                            float resize_width,
-                                                            float resize_height);
-
-long long canvas_native_image_bitmap_create_from_image_data_src_rect(long long image_data,
-                                                                     float sx,
-                                                                     float sy,
-                                                                     float s_width,
-                                                                     float s_height,
-                                                                     bool flip_y,
-                                                                     int premultiply_alpha,
-                                                                     int color_space_conversion,
-                                                                     int resize_quality,
-                                                                     float resize_width,
-                                                                     float resize_height);
-
-struct ImageData *canvas_native_image_data_create(int width, int height);
-
-int canvas_native_image_data_width(struct ImageData *image_data);
-
-int canvas_native_image_data_height(struct ImageData *image_data);
-
-uint8_t *canvas_native_image_data_data(struct ImageData *image_data);
-
-uintptr_t canvas_native_image_data_data_length(struct ImageData *image_data);
-
-struct ImageData *canvas_native_image_data_get_shared_instance(struct ImageData *image_data);
-
-void canvas_native_destroy_image_data(struct ImageData *image_data);
-
-struct Matrix *canvas_native_matrix_create(void);
-
-void canvas_native_matrix_update(struct Matrix *matrix, const float *data, uintptr_t data_len);
-
-float canvas_native_matrix_a(struct Matrix *matrix);
-
-void canvas_native_matrix_set_a(struct Matrix *matrix, float a);
-
-float canvas_native_matrix_b(struct Matrix *matrix);
-
-void canvas_native_matrix_set_b(struct Matrix *matrix, float b);
-
-float canvas_native_matrix_c(struct Matrix *matrix);
-
-void canvas_native_matrix_set_c(struct Matrix *matrix, float c);
-
-float canvas_native_matrix_d(struct Matrix *matrix);
-
-void canvas_native_matrix_set_d(struct Matrix *matrix, float d);
-
-float canvas_native_matrix_e(struct Matrix *matrix);
-
-void canvas_native_matrix_set_e(struct Matrix *matrix, float e);
-
-float canvas_native_matrix_f(struct Matrix *matrix);
-
-void canvas_native_matrix_set_f(struct Matrix *matrix, float f);
-
-float canvas_native_matrix_m11(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m11(struct Matrix *matrix, float m11);
-
-float canvas_native_matrix_m12(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m12(struct Matrix *matrix, float m12);
-
-float canvas_native_matrix_m13(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m13(struct Matrix *matrix, float m13);
-
-float canvas_native_matrix_m14(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m14(struct Matrix *matrix, float m14);
-
-float canvas_native_matrix_m21(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m21(struct Matrix *matrix, float m21);
-
-float canvas_native_matrix_m22(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m22(struct Matrix *matrix, float m22);
-
-float canvas_native_matrix_m23(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m23(struct Matrix *matrix, float m23);
-
-float canvas_native_matrix_m24(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m24(struct Matrix *matrix, float m24);
-
-float canvas_native_matrix_m31(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m31(struct Matrix *matrix, float m31);
-
-float canvas_native_matrix_m32(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m32(struct Matrix *matrix, float m32);
-
-float canvas_native_matrix_m33(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m33(struct Matrix *matrix, float m33);
-
-float canvas_native_matrix_m34(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m34(struct Matrix *matrix, float m34);
-
-float canvas_native_matrix_m41(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m41(struct Matrix *matrix, float m41);
-
-float canvas_native_matrix_m42(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m42(struct Matrix *matrix, float m42);
-
-float canvas_native_matrix_m43(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m43(struct Matrix *matrix, float m43);
-
-float canvas_native_matrix_m44(struct Matrix *matrix);
-
-void canvas_native_matrix_set_m44(struct Matrix *matrix, float m44);
-
-void destroy_matrix(struct Matrix *matrix);
-
-void canvas_native_paint_style_set_fill_color_with_string(struct ContextWrapper *context,
-                                                          const char *color);
-
-void canvas_native_paint_style_set_stroke_color_with_string(struct ContextWrapper *context,
-                                                            const char *color);
-
-const char *canvas_native_paint_style_get_color_string(struct PaintStyle *color);
-
-void canvas_native_destroy_paint_style_value(struct PaintStyleValue *value);
-
-struct Path *canvas_native_path_create(void);
-
-struct Path *canvas_native_path_create_with_path(struct Path *path);
-
-struct Path *canvas_native_path_create_with_string(const char *string);
-
-void canvas_native_path_add_path(struct Path *path, struct Path *path_to_add);
-
-void canvas_native_path_add_path_with_matrix(struct Path *path,
-                                             struct Path *path_to_add,
-                                             struct Matrix *matrix);
-
-void canvas_native_path_close_path(struct Path *path);
-
-void canvas_native_path_move_to(struct Path *path, float x, float y);
-
-void canvas_native_path_line_to(struct Path *path, float x, float y);
-
-void canvas_native_path_bezier_curve_to(struct Path *path,
-                                        float cp1x,
-                                        float cp1y,
-                                        float cp2x,
-                                        float cp2y,
-                                        float x,
-                                        float y);
-
-void canvas_native_path_quadratic_curve_to(struct Path *path,
-                                           float cpx,
-                                           float cpy,
-                                           float x,
-                                           float y);
-
-void canvas_native_path_arc(struct Path *path,
-                            float x,
-                            float y,
-                            float radius,
-                            float start_angle,
-                            float end_angle,
-                            bool anti_clockwise);
-
-void canvas_native_path_arc_to(struct Path *path,
-                               float x1,
-                               float y1,
-                               float x2,
-                               float y2,
-                               float radius);
-
-void canvas_native_path_ellipse(struct Path *path,
-                                float x,
-                                float y,
-                                float radius_x,
-                                float radius_y,
-                                float rotation,
-                                float start_angle,
-                                float end_angle,
-                                bool anticlockwise);
-
-void canvas_native_path_rect(struct Path *path, float x, float y, float width, float height);
-
-void canvas_native_destroy_path(struct Path *path);
-
-void canvas_native_pattern_set_transform(struct PaintStyle *pattern, struct Matrix *matrix);
-
-void canvas_native_svg_draw_from_string(struct ContextWrapper *context, const char *svg);
-
-void canvas_native_svg_draw_from_path(struct ContextWrapper *context, const char *path);
-
-struct TextDecoder *canvas_native_text_decoder_create(const char *decoding);
-
-const char *canvas_native_text_decoder_get_encoding(struct TextDecoder *decoder);
-
-const char *canvas_native_text_decoder_decode(struct TextDecoder *decoder,
-                                              const uint8_t *data,
-                                              uintptr_t len);
-
-const struct U8Array *canvas_native_text_decoder_decode_to_bytes(struct TextDecoder *decoder,
-                                                                 const uint8_t *data,
-                                                                 uintptr_t len);
-
-const char *canvas_native_text_decoder_decode_u16(struct TextDecoder *decoder,
-                                                  const uint16_t *data,
-                                                  uintptr_t len);
-
-const char *canvas_native_text_decoder_decode_i16(struct TextDecoder *decoder,
-                                                  const int16_t *data,
-                                                  uintptr_t len);
-
-const char *canvas_native_text_decoder_decode_i32(struct TextDecoder *decoder,
-                                                  const int32_t *data,
-                                                  uintptr_t len);
-
-void canvas_native_destroy_text_decoder(struct TextDecoder *decoder);
-
-struct U8Array *canvas_native_text_decoder_decode_bytes(struct TextDecoder *decoder,
-                                                        const uint8_t *data,
-                                                        uintptr_t len);
-
-struct U8Array *canvas_native_text_decoder_decode_u16_bytes(struct TextDecoder *decoder,
-                                                            const uint16_t *data,
-                                                            uintptr_t len);
-
-struct U8Array *canvas_native_text_decoder_decode_i16_bytes(struct TextDecoder *decoder,
-                                                            const int16_t *data,
-                                                            uintptr_t len);
-
-struct U8Array *canvas_native_text_decoder_decode_i32_bytes(struct TextDecoder *decoder,
-                                                            const int32_t *data,
-                                                            uintptr_t len);
-
-struct U8Array *canvas_native_text_decoder_decode_u32_bytes(struct TextDecoder *decoder,
-                                                            const uint32_t *data,
-                                                            uintptr_t len);
-
-struct TextEncoder *canvas_native_text_encoder_create(const char *encoding);
-
-const char *canvas_native_text_encoder_get_encoding(struct TextEncoder *encoder);
-
-struct U8Array *canvas_native_text_encoder_encode(struct TextEncoder *encoder, const char *text);
-
-void canvas_native_destroy_text_encoder(struct TextEncoder *encoder);
-
-float canvas_native_text_metrics_get_width(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_actual_bounding_box_left(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_actual_bounding_box_right(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_actual_bounding_box_ascent(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_actual_bounding_box_descent(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_font_bounding_box_ascent(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_font_bounding_box_descent(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_em_height_ascent(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_em_height_descent(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_hanging_baseline(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_alphabetic_baseline(struct TextMetrics *metrics);
-
-float canvas_native_text_metrics_get_ideographic_baseline(struct TextMetrics *metrics);
-
-void flip_y_in_place(uint8_t *data, uintptr_t length, uintptr_t bytes_per_row, uintptr_t height);
-
-void flip_y_in_place_3d(uint8_t *data,
-                        uintptr_t length,
-                        uintptr_t bytes_per_row,
-                        uintptr_t height,
-                        uintptr_t depth);
-
-void flip_y_in_place_3d_i8(int8_t *data,
-                           uintptr_t length,
-                           uintptr_t bytes_per_row,
-                           uintptr_t height,
-                           uintptr_t depth);
-
-void flip_y_in_place_3d_u16(uint16_t *data,
-                            uintptr_t length,
-                            uintptr_t bytes_per_row,
-                            uintptr_t height,
-                            uintptr_t depth);
-
-void flip_y_in_place_3d_i16(int16_t *data,
-                            uintptr_t length,
-                            uintptr_t bytes_per_row,
-                            uintptr_t height,
-                            uintptr_t depth);
-
-void flip_y_in_place_3d_u32(uint32_t *data,
-                            uintptr_t length,
-                            uintptr_t bytes_per_row,
-                            uintptr_t height,
-                            uintptr_t depth);
-
-void flip_y_in_place_3d_i32(int32_t *data,
-                            uintptr_t length,
-                            uintptr_t bytes_per_row,
-                            uintptr_t height,
-                            uintptr_t depth);
-
-void flip_y_in_place_3d_f32(float *data,
-                            uintptr_t length,
-                            uintptr_t bytes_per_row,
-                            uintptr_t height,
-                            uintptr_t depth);
-
-void flip_y_in_place_3d_f64(double *data,
-                            uintptr_t length,
-                            uintptr_t bytes_per_row,
-                            uintptr_t height,
-                            uintptr_t depth);
-
-void flip_y_in_place_i8(int8_t *data, uintptr_t length, uintptr_t bytes_per_row, uintptr_t height);
-
-void flip_y_in_place_u16(uint16_t *data,
-                         uintptr_t length,
-                         uintptr_t bytes_per_row,
-                         uintptr_t height);
-
-void flip_y_in_place_i16(int16_t *data,
-                         uintptr_t length,
-                         uintptr_t bytes_per_row,
-                         uintptr_t height);
-
-void flip_y_in_place_u32(uint32_t *data,
-                         uintptr_t length,
-                         uintptr_t bytes_per_row,
-                         uintptr_t height);
-
-void flip_y_in_place_i32(int32_t *data,
-                         uintptr_t length,
-                         uintptr_t bytes_per_row,
-                         uintptr_t height);
-
-void flip_y_in_place_f32(float *data, uintptr_t length, uintptr_t bytes_per_row, uintptr_t height);
-
-void flip_y_in_place_f64(double *data, uintptr_t length, uintptr_t bytes_per_row, uintptr_t height);
-
-#endif /* CBINDGEN_BINDINGS_H */
diff --git a/packages/canvas/src-native/canvas-native/canvas-ios/Cargo.toml b/packages/canvas/src-native/canvas-native/canvas-ios/Cargo.toml
index 21f136976..e41bd4a60 100644
--- a/packages/canvas/src-native/canvas-native/canvas-ios/Cargo.toml
+++ b/packages/canvas/src-native/canvas-native/canvas-ios/Cargo.toml
@@ -17,9 +17,8 @@ canvas-webgl = { path = "../canvas-webgl" }
 canvas-c = { path = "../canvas-c", features = ["2d", "webgl"] }
 gl-bindings = { path = "../gl-bindings" }
 raw-window-handle = "0.5.0"
-ureq = "2.5.0"
+ureq = "2.8.0"
 parking_lot = "0.12.0"
 once_cell = "1.10.0"
 utf16string = "0.2.0"
-log = "0.4.17"
-icrate = { version = "0.0.2", features = ["Foundation_NSString", "Foundation", "Foundation_NSData"] }
\ No newline at end of file
+log = "0.4.17"
\ No newline at end of file
diff --git a/packages/canvas/src-native/canvas-native/canvas-ios/src/lib.rs b/packages/canvas/src-native/canvas-native/canvas-ios/src/lib.rs
index 91f11ac91..fd91c6390 100644
--- a/packages/canvas/src-native/canvas-native/canvas-ios/src/lib.rs
+++ b/packages/canvas/src-native/canvas-native/canvas-ios/src/lib.rs
@@ -1,27 +1,17 @@
 use std::cell::RefCell;
-use std::ffi::{c_float, c_int, c_long, c_longlong, c_uchar, c_void, CStr, CString};
+use std::ffi::{c_longlong, c_void, CStr, CString};
 use std::ops::DerefMut;
 use std::os::raw::c_char;
 use std::ptr::NonNull;
-use std::sync::Once;
-
-use icrate::objc2::declare::ClassBuilder;
-use icrate::objc2::ffi::BOOL;
-use icrate::objc2::rc::{autoreleasepool, Id, Owned, Shared};
-use icrate::objc2::runtime::{Bool, Class, Object, Sel};
-use icrate::objc2::{declare_class, sel, ClassType, Encoding, Message, RefEncode};
-use icrate::Foundation::{NSData, NSObject, NSString};
-use raw_window_handle::HasRawWindowHandle;
 
 use canvas_2d::context::fill_and_stroke_styles::pattern::Repetition;
 use canvas_2d::utils::image::from_image_slice;
+pub use canvas_c::*;
+use canvas_c::CanvasRenderingContext2D;
+use canvas_c::PaintStyle;
 use canvas_core::context_attributes::ContextAttributes;
 use canvas_core::gl::GLContext;
 use canvas_core::image_asset::ImageAsset;
-use canvas_c::CanvasRenderingContext2D;
-use canvas_c::PaintStyle;
-
-pub use canvas_c::*;
 
 #[allow(non_camel_case_types)]
 pub(crate) enum iOSView {
diff --git a/tools/demo/canvas-babylon/index.ts b/tools/demo/canvas-babylon/index.ts
index 3a56ea8a0..b4924a9c3 100644
--- a/tools/demo/canvas-babylon/index.ts
+++ b/tools/demo/canvas-babylon/index.ts
@@ -35,11 +35,11 @@ export class DemoSharedCanvasBabylon extends DemoSharedBase {
 		if (!engine) throw 'engine should not be null.';
 		//this.createMDN(engine)
 
-		sceneToRender = this.createChart(engine);
+		//sceneToRender = this.createChart(engine);
 		//sceneToRender = this.createWaterScene(engine);
 		//sceneToRender = this.createScene(engine);
 		//sceneToRender = this.createSkullScene(engine);
-		//sceneToRender = this.createLightTexture(engine);
+		sceneToRender = this.createLightTexture(engine);
 		//sceneToRender = this.createParticleScene(engine);
 		engine.runRenderLoop(function () {
 			if (sceneToRender) {
diff --git a/tools/demo/canvas-chartjs/index.ts b/tools/demo/canvas-chartjs/index.ts
new file mode 100644
index 000000000..995ccfb5f
--- /dev/null
+++ b/tools/demo/canvas-chartjs/index.ts
@@ -0,0 +1,9 @@
+import { DemoSharedBase } from '../utils';
+import {  } from '@nativescript/canvas-chartjs';
+
+export class DemoSharedCanvasChartjs extends DemoSharedBase {
+
+  testIt() {
+    console.log('test canvas-chartjs!');
+  }
+}
\ No newline at end of file
diff --git a/tools/demo/canvas-three/examples/webgl_materials_lightmap.ts b/tools/demo/canvas-three/examples/webgl_materials_lightmap.ts
index a365d6ad5..93b68eccb 100644
--- a/tools/demo/canvas-three/examples/webgl_materials_lightmap.ts
+++ b/tools/demo/canvas-three/examples/webgl_materials_lightmap.ts
@@ -5,21 +5,19 @@ import * as THREE from 'three';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
 
 import { MeshBasicNodeMaterial, vec4, color, positionLocal, mix } from 'three/examples/jsm/nodes/Nodes';
-import { nodeFrame } from 'three/examples/jsm/renderers/webgl/nodes/WebGLNodes.js';
+import { nodeFrame } from 'three/examples/jsm/renderers/webgl-legacy/nodes/WebGLNodes.js';
 
 let container; // stats;
 let camera, scene, renderer;
 
 const root = '~/assets/three/';
-
+let context;
 async function init(canvas) {
-	const context = canvas.getContext('webgl2') as WebGLRenderingContext;
+	context = canvas.getContext('webgl2') as WebGLRenderingContext;
 
 	const { drawingBufferWidth, drawingBufferHeight } = context;
 
-	// CAMERA
-
-	camera = new THREE.PerspectiveCamera(40, drawingBufferWidth / drawingBufferWidth, 1, 10000);
+	camera = new THREE.PerspectiveCamera(40, drawingBufferWidth / drawingBufferHeight, 1, 10000);
 	camera.position.set(700, 200, -500);
 
 	// SCENE
@@ -28,7 +26,7 @@ async function init(canvas) {
 
 	// LIGHTS
 
-	const light = new THREE.DirectionalLight(0xaabbff, 0.3);
+	const light = new THREE.DirectionalLight(0xd5deff);
 	light.position.x = 300;
 	light.position.y = 250;
 	light.position.z = -500;
@@ -36,12 +34,12 @@ async function init(canvas) {
 
 	// SKYDOME
 
-	const topColor = new THREE.Color().copy(light.color).convertSRGBToLinear();
-	const bottomColor = new THREE.Color(0xffffff).convertSRGBToLinear();
+	const topColor = new THREE.Color().copy(light.color);
+	const bottomColor = new THREE.Color(0xffffff);
 	const offset = 400;
 	const exponent = 0.6;
 
-	const h = positionLocal.add(offset).normalize().y;
+	const h = (positionLocal as any).add(offset).normalize().y;
 
 	const skyMat = new MeshBasicNodeMaterial();
 	skyMat.colorNode = vec4(mix(color(bottomColor), color(topColor), h.max(0.0).pow(exponent)), 1.0);
@@ -50,30 +48,22 @@ async function init(canvas) {
 	const sky = new THREE.Mesh(new THREE.SphereGeometry(4000, 32, 15), skyMat);
 	scene.add(sky);
 
-	// RENDERER
+	// RENDERER                                                                                                         
 
-	renderer = new THREE.WebGLRenderer({ context, antialias: true });
+	renderer = new THREE.WebGLRenderer({context, antialias: true });
 	renderer.setPixelRatio(window.devicePixelRatio);
 	renderer.setSize(drawingBufferWidth, drawingBufferHeight);
-	//container.appendChild(renderer.domElement);
-	renderer.outputEncoding = THREE.sRGBEncoding;
 
 	// CONTROLS
 
-	const controls = new OrbitControls(camera, canvas);
+	const controls = new OrbitControls(camera, renderer.domElement);
 	controls.maxPolarAngle = (0.9 * Math.PI) / 2;
 	controls.enableZoom = false;
 
-	// STATS
-
-	//stats = new Stats();
-	//container.appendChild(stats.dom);
-
 	// MODEL
 
 	const loader = new THREE.ObjectLoader();
-	const object = await loader.loadAsync(root + 'models/json/lightmap/lightmap.json');
-
+	const object = await loader.loadAsync('~/assets/three/models/json/lightmap/lightmap.json');
 	scene.add(object);
 
 	//
@@ -82,10 +72,12 @@ async function init(canvas) {
 }
 
 function onWindowResize() {
-	camera.aspect = window.innerWidth / window.innerHeight;
+	const { drawingBufferWidth, drawingBufferHeight } = context;
+
+	camera.aspect = drawingBufferWidth / drawingBufferHeight;
 	camera.updateProjectionMatrix();
 
-	renderer.setSize(window.innerWidth, window.innerHeight);
+	renderer.setSize(drawingBufferWidth, drawingBufferHeight);
 }
 
 //
diff --git a/tools/demo/canvas-three/index.ts b/tools/demo/canvas-three/index.ts
index 78b1d5b45..9621fdcd0 100644
--- a/tools/demo/canvas-three/index.ts
+++ b/tools/demo/canvas-three/index.ts
@@ -27,11 +27,10 @@ import { webgl_shadowmap } from './examples/webgl_shadowmap';
 import { webgl_shadowmap_performance } from './examples/webgl_shadowmap_performance';
 import { webgl_shadowmap_pointlight } from './examples/webgl_shadowmap_pointlight';
 import { webgl_shadowmap_vsm } from './examples/webgl_shadowmap_vsm';
-import { setTimeout } from '@nativescript/core/timer';
 
 class IconMesh extends THREE.Mesh {
 	constructor() {
-		super(new THREE.BoxBufferGeometry(5.0, 5.0, 5.0), new THREE.MeshNormalMaterial());
+		super(new THREE.BoxGeometry(5.0, 5.0, 5.0), new THREE.MeshNormalMaterial());
 	}
 }
 
@@ -73,10 +72,10 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 		//const canvas = document.createElement('canvas') as any;
 		//canvas.width = 1000;
 		//canvas.height = 1000;
-		//this.threeOcean(this.canvas);
+		this.threeOcean(this.canvas);
 
 		//this.skinningAndMorphing(this.canvas);
-
+		
 		//this.geoColors(canvas);
 		// setTimeout(()=>{
 		// 	console.log(canvas.toDataURL());
@@ -87,9 +86,9 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 		// 	console.log(NSString.alloc().initWithDataEncoding(base, NSUTF8StringEncoding));
 		// }, 10000);
 		//this.threeCube(this.canvas);
-		this.threeCar(this.canvas);
+		//this.threeCar(this.canvas);
 		//this.threeKeyframes(this.canvas);
-
+		
 		//this.webGLHelpers(this.canvas);
 		//this.fbxLoader(this.canvas);
 		//this.gtlfLoader(this.canvas);
@@ -103,6 +102,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 		//this.panorama_cube(this.canvas);
 	}
 
+
 	gtlfLoader(canvas) {
 		var container, controls, context, width, height;
 		var camera, scene, renderer;
@@ -140,14 +140,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 				var loader = new GLTFLoader().setPath(this.root + '/models/gltf/DamagedHelmet/glTF/');
 				loader.load('DamagedHelmet.gltf', function (gltf) {
-					gltf.scene.traverse(function (child) {
-						// @ts-ignore
-						if (child.isMesh) {
-							// TOFIX RoughnessMipmapper seems to be broken with WebGL 2.0
-							// roughnessMipmapper.generateMipmaps( child.material );
-						}
-					});
-
+					
 					scene.add(gltf.scene);
 
 					//	roughnessMipmapper.dispose();
@@ -155,13 +148,12 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 					render();
 				});
 			});
-
+			
 			renderer = new THREE.WebGLRenderer({ context, antialias: true });
 			renderer.setPixelRatio(window.devicePixelRatio);
 			renderer.setSize(width, height);
 			renderer.toneMapping = THREE.ACESFilmicToneMapping;
 			renderer.toneMappingExposure = 1;
-			renderer.outputEncoding = THREE.sRGBEncoding;
 
 			var pmremGenerator = new THREE.PMREMGenerator(renderer);
 			pmremGenerator.compileEquirectangularShader();
@@ -282,12 +274,16 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 			// model
 
-			gltf.scene.traverse(function (child) {
-				if (child.isMesh) {
-					mesh = child;
-					scene.add(mesh);
-				}
-			});
+
+			mesh = gltf.scene.getObjectByName( 'node_damagedHelmet_-6514' );
+			scene.add( mesh );
+
+			// gltf.scene.traverse(function (child) {
+			// 	if (child.isMesh) {
+			// 		mesh = child;
+			// 		scene.add(mesh);
+			// 	}
+			// });
 
 			render();
 
@@ -358,7 +354,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 		scene = new THREE.Scene();
 
-		const ring = new THREE.TorusBufferGeometry(5, 0.5, 64, 64);
+		const ring = new THREE.TorusGeometry(5, 0.5, 64, 64);
 		const ringMaterial = new THREE.MeshStandardMaterial({
 			transparent: true,
 			color: 'blue',
@@ -368,7 +364,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 			depthWrite: true,
 		});
 		const ringMesh = new THREE.Mesh(ring, ringMaterial);
-		const cylinder = new THREE.CylinderBufferGeometry(5, 5, 1, 64);
+		const cylinder = new THREE.CylinderGeometry(5, 5, 1, 64);
 		cylinder.rotateX(Math.PI / 2);
 		cylinder.rotateZ(-Math.PI / 2);
 		const cylinderMaterial = new THREE.MeshStandardMaterial({
@@ -740,7 +736,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 			//
 
-			var sphereGeometry = new THREE.SphereBufferGeometry(0.1, 32, 32);
+			var sphereGeometry = new THREE.SphereGeometry(0.1, 32, 32);
 			var sphereMaterial = new THREE.MeshBasicMaterial({ color: 0xff0000 });
 
 			for (var i = 0; i < 40; i++) {
@@ -854,7 +850,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 			// ground
 			var mesh = new THREE.Mesh(
-				new THREE.PlaneBufferGeometry(2000, 2000),
+				new THREE.PlaneGeometry(2000, 2000),
 				new THREE.MeshPhongMaterial({
 					color: 0x999999,
 					depthWrite: false,
@@ -1072,7 +1068,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 				var shapes = font.generateShapes(message, 100);
 
-				var geometry = new THREE.ShapeBufferGeometry(shapes);
+				var geometry = new THREE.ShapeGeometry(shapes);
 
 				geometry.computeBoundingBox();
 
@@ -1109,7 +1105,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 					var shape = shapes[i];
 
 					var points = shape.getPoints();
-					var geometry = new THREE.BufferGeometry().setFromPoints(points);
+					const geometry = new THREE.BufferGeometry().setFromPoints(points);
 
 					geometry.translate(xMid, 0, 0);
 
@@ -1193,7 +1189,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 			var shadowTexture = new THREE.CanvasTexture(shadow);
 
 			var shadowMaterial = new THREE.MeshBasicMaterial({ map: shadowTexture });
-			var shadowGeo = new THREE.PlaneBufferGeometry(300, 300, 1, 1);
+			var shadowGeo = new THREE.PlaneGeometry(300, 300, 1, 1);
 
 			var shadowMesh;
 
@@ -1216,7 +1212,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 			var radius = 200;
 
-			var geometry1 = new THREE.IcosahedronBufferGeometry(radius, 1);
+			var geometry1 = new THREE.IcosahedronGeometry(radius, 1);
 
 			var count = geometry1.attributes.position.count;
 			geometry1.setAttribute('color', new THREE.BufferAttribute(new Float32Array(count * 3), 3));
@@ -1271,6 +1267,8 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 			scene.add(mesh);
 			const gl = canvas.getContext('webgl2', { antialias: false }) as WebGL2RenderingContext;
 
+	
+
 			renderer = new THREE.WebGLRenderer({ context: gl, antialias: false });
 			//renderer.setPixelRatio(window.devicePixelRatio);
 			renderer.setSize(width, height);
@@ -1477,7 +1475,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 			window.addEventListener('resize', onWindowResize, false);
 
 			//
-			camera = new THREE.PerspectiveCamera(75, width / height, 0.1, 1000);
+			camera = new THREE.PerspectiveCamera(75,width / height, 0.1, 1000);
 			camera.position.set(4.25, 1.4, -7);
 
 			controls = new OrbitControls(camera, canvas);
@@ -1574,7 +1572,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 				// shadow
 				const mesh = new THREE.Mesh(
-					new THREE.PlaneBufferGeometry(0.655 * 4, 1.3 * 4),
+					new THREE.PlaneGeometry(0.655 * 4, 1.3 * 4),
 					new THREE.MeshBasicMaterial({
 						map: shadow,
 						toneMapped: false,
@@ -1588,6 +1586,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 				scene.add(carModel);
 			});
 
+
 			renderer.setAnimationLoop(render);
 
 			controls.update();
@@ -1761,7 +1760,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 				}
 			}
 
-			textureAnimation = new THREE.DataTexture(tData, tWidth, tHeight, THREE.RGBFormat, THREE.FloatType);
+			textureAnimation = new THREE.DataTexture(tData, tWidth, tHeight, THREE.RGBAFormat, THREE.FloatType);
 			textureAnimation.needsUpdate = true;
 
 			const vertices = [],
@@ -2340,13 +2339,14 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 			const posAttr1 = new THREE.GLBufferAttribute(pos, gl.FLOAT, 3, 4, particles);
 			// @ts-ignore
 			const posAttr2 = new THREE.GLBufferAttribute(pos2, gl.FLOAT, 3, 4, particles);
-			geometry.setAttribute('position', posAttr1);
+			geometry.setAttribute('position', posAttr1 as never);
 
 			setInterval(function () {
 				const attr = geometry.getAttribute('position');
 
-				geometry.setAttribute('position', attr === posAttr1 ? posAttr2 : posAttr1);
+				geometry.setAttribute('position', (attr === posAttr1 as never ? posAttr2 : posAttr1) as never);
 			}, 2000);
+			
 
 			// @ts-ignore
 			geometry.setAttribute('color', new THREE.GLBufferAttribute(rgb, gl.FLOAT, 3, 4, particles));
@@ -2571,7 +2571,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 	*/
 
 	skinningAndMorphing(canvas) {
-		const context = canvas.getContext('webgl2', { antialias: true }) as WebGL2RenderingContext;
+		const context = canvas.getContext('webgl2', {antialias: true}) as WebGL2RenderingContext;
 
 		const { drawingBufferWidth: width, drawingBufferHeight: height } = context;
 		var container, stats, clock, gui, mixer, actions, activeAction, previousAction;
@@ -2603,7 +2603,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 			// ground
 
 			var mesh = new THREE.Mesh(
-				new THREE.PlaneBufferGeometry(2000, 2000),
+				new THREE.PlaneGeometry(2000, 2000),
 				new THREE.MeshPhongMaterial({
 					color: 0x999999,
 					depthWrite: false,
@@ -2857,6 +2857,8 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 			const pmremGenerator = new THREE.PMREMGenerator(renderer);
 			let renderTarget;
 
+			const sceneEnv = new THREE.Scene();
+
 			function updateSun() {
 				const phi = THREE.MathUtils.degToRad(90 - parameters.elevation);
 				const theta = THREE.MathUtils.degToRad(parameters.azimuth);
@@ -2868,8 +2870,9 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 				if (renderTarget !== undefined) renderTarget.dispose();
 
-				renderTarget = pmremGenerator.fromScene(sky);
-
+				sceneEnv.add( sky );
+				renderTarget = pmremGenerator.fromScene(sceneEnv);
+				scene.add( sky );
 				scene.environment = renderTarget.texture;
 			}
 
@@ -2958,7 +2961,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 
 			var texture = new THREE.TextureLoader().load(this.root + '/textures/crate.gif');
 			// texture.flipY = false;
-			var geometry = new THREE.BoxBufferGeometry(200, 200, 200);
+			var geometry = new THREE.BoxGeometry(200, 200, 200);
 			var material = new THREE.MeshBasicMaterial({ map: texture });
 
 			mesh = new THREE.Mesh(geometry, material);
@@ -3030,7 +3033,7 @@ export class DemoSharedCanvasThree extends DemoSharedBase {
 		scene.add(shadowHelper);
 
 		// Create a plane that receives shadows (but does not cast them).
-		const planeGeometry = new THREE.PlaneBufferGeometry(10, 10, 32, 32);
+		const planeGeometry = new THREE.PlaneGeometry(10, 10, 32, 32);
 		const planeMaterial = new THREE.MeshStandardMaterial({
 			color: 0x00ff00,
 			side: THREE.DoubleSide,
diff --git a/tools/demo/canvas/canvas.worker.js b/tools/demo/canvas/canvas.worker.js
index 120223695..5dd7f4ae2 100644
--- a/tools/demo/canvas/canvas.worker.js
+++ b/tools/demo/canvas/canvas.worker.js
@@ -93,3 +93,4 @@ onmessage = ev => {
 onerror = error =>{
     console.log('Worker: Error', error)
 }
+
diff --git a/tools/demo/canvas/index.ts b/tools/demo/canvas/index.ts
index 8b78ea901..cc2ca648c 100644
--- a/tools/demo/canvas/index.ts
+++ b/tools/demo/canvas/index.ts
@@ -56,7 +56,7 @@ import { cancelEnvironmentMap, cancelFog, draw_image_space, draw_instanced, envi
 // declare var com, java;
 let zen3d;
 import * as Svg from '@nativescript/canvas/SVG';
-import { issue54 } from './issues';
+import { issue54, issue93 } from './issues';
 var Chart;
 var Vex;
 export class DemoSharedCanvas extends DemoSharedBase {
@@ -646,12 +646,14 @@ export class DemoSharedCanvas extends DemoSharedBase {
 		//this.multiCanvas(this.canvas);
 		//triangle(this.canvas);
 		//this.zen3dCube(this.canvas);
-		this.zen3dGeometryLoaderGltf(this.canvas);
+		//this.zen3dGeometryLoaderGltf(this.canvas);
 		//this.playCanvas(this.canvas);
 		//this.drawRandomFullscreenImage(this.canvas);
 		//issue54(this.canvas);
 		//this.decoder()
 		//this.context2DTest(this.canvas);
+
+		issue93(this.canvas);
 	}
 
 	drawRandomFullscreenImage(canvas) {
diff --git a/tools/demo/canvas/issues.ts b/tools/demo/canvas/issues.ts
index 96ca99f09..10f6f289f 100644
--- a/tools/demo/canvas/issues.ts
+++ b/tools/demo/canvas/issues.ts
@@ -9,3 +9,12 @@ export function issue54(canvas) {
 		ctx.fillRect(0, 0, 300, 300);
 	});
 }
+
+export function issue93(canvas) {
+	const ctx = canvas.getContext('2d');
+
+	ctx.rect(50, 20, 200, 120);
+	ctx.stroke();
+	ctx.fillStyle = 'red';
+	setTimeout(() => ctx.fillRect(0, 0, 150, 100), 2000);
+}
diff --git a/tools/demo/index.ts b/tools/demo/index.ts
index e10074fed..2706bcc0f 100644
--- a/tools/demo/index.ts
+++ b/tools/demo/index.ts
@@ -1,6 +1,7 @@
 export * from './utils';
 export * from './canvas';
 export * from './canvas-babylon';
+export * from './canvas-chartjs';
 export * from './canvas-media';
 export * from './canvas-phaser';
 export * from './canvas-phaser-ce';
diff --git a/tools/workspace-scripts.js b/tools/workspace-scripts.js
index 95d7784cb..cf43728a0 100644
--- a/tools/workspace-scripts.js
+++ b/tools/workspace-scripts.js
@@ -117,6 +117,13 @@ module.exports = {
 					description: '@nativescript/canvas-media: Build',
 				},
 			},
+			// @nativescript/canvas-chartjs
+			'canvas-chartjs': {
+				build: {
+					script: 'nx run canvas-chartjs:build.all',
+					description: '@nativescript/canvas-chartjs: Build',
+				},
+			},
 			'build-all': {
 				script: 'nx run-many --target=build.all --all',
 				description: 'Build all packages',
@@ -169,6 +176,10 @@ module.exports = {
 				script: 'nx run canvas-media:focus',
 				description: 'Focus on @nativescript/canvas-media',
 			},
+			'canvas-chartjs': {
+				script: 'nx run canvas-chartjs:focus',
+				description: 'Focus on @nativescript/canvas-chartjs',
+			},
 			reset: {
 				script: 'nx g @nativescript/plugin-tools:focus-packages',
 				description: 'Reset Focus',
diff --git a/tsconfig.base.json b/tsconfig.base.json
index f0563b44f..75d0eac9b 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1,36 +1,65 @@
 {
-	"compilerOptions": {
-		"rootDir": ".",
-		"sourceMap": true,
-		"declaration": true,
-		"moduleResolution": "node",
-		"emitDecoratorMetadata": true,
-		"experimentalDecorators": true,
-		"noEmitHelpers": false,
-		"target": "ES2020",
-		"module": "ESNext",
-		"lib": ["ESNext", "dom"],
-		"skipLibCheck": true,
-		"skipDefaultLibCheck": true,
-		"baseUrl": ".",
-		"plugins": [
-			{
-				"transform": "@nativescript/webpack/dist/transformers/NativeClass",
-				"type": "raw"
-			}
-		],
-		"paths": {
-			"@demo/shared": ["tools/demo/index.ts"],
-			"@nativescript/canvas": ["packages/canvas/index.ts"],
-			"@nativescript/canvas-babylon": ["packages/canvas-babylon/index.ts"],
-			"@nativescript/canvas-media": ["packages/canvas-media/index.ts"],
-			"@nativescript/canvas-phaser": ["packages/canvas-phaser/index.ts"],
-			"@nativescript/canvas-phaser-ce": ["packages/canvas-phaser-ce/index.ts"],
-			"@nativescript/canvas-pixi": ["packages/canvas-pixi/index.ts"],
-			"@nativescript/canvas-polyfill": ["packages/canvas-polyfill/index.ts"],
-			"@nativescript/canvas-three": ["packages/canvas-three/index.ts"],
-			"@nativescript/canvas/angular": ["packages/canvas/angular/index.ts"]
-		}
-	},
-	"exclude": ["node_modules", "tmp"]
+  "compilerOptions": {
+    "rootDir": ".",
+    "sourceMap": true,
+    "declaration": true,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "noEmitHelpers": false,
+    "target": "ES2020",
+    "module": "ESNext",
+    "lib": [
+      "ESNext",
+      "dom"
+    ],
+    "skipLibCheck": true,
+    "skipDefaultLibCheck": true,
+    "baseUrl": ".",
+    "plugins": [
+      {
+        "transform": "@nativescript/webpack/dist/transformers/NativeClass",
+        "type": "raw"
+      }
+    ],
+    "paths": {
+      "@demo/shared": [
+        "tools/demo/index.ts"
+      ],
+      "@nativescript/canvas": [
+        "packages/canvas/index.ts"
+      ],
+      "@nativescript/canvas-babylon": [
+        "packages/canvas-babylon/index.ts"
+      ],
+      "@nativescript/canvas-media": [
+        "packages/canvas-media/index.ts"
+      ],
+      "@nativescript/canvas-phaser": [
+        "packages/canvas-phaser/index.ts"
+      ],
+      "@nativescript/canvas-phaser-ce": [
+        "packages/canvas-phaser-ce/index.ts"
+      ],
+      "@nativescript/canvas-pixi": [
+        "packages/canvas-pixi/index.ts"
+      ],
+      "@nativescript/canvas-polyfill": [
+        "packages/canvas-polyfill/index.ts"
+      ],
+      "@nativescript/canvas-three": [
+        "packages/canvas-three/index.ts"
+      ],
+      "@nativescript/canvas/angular": [
+        "packages/canvas/angular/index.ts"
+      ],
+      "@nativescript/canvas-chartjs": [
+        "packages/canvas-chartjs/index.d.ts"
+      ]
+    }
+  },
+  "exclude": [
+    "node_modules",
+    "tmp"
+  ]
 }