fix: fix for latest canvas plugin

Author: farfromrefug

package.json

@@ -39,9 +39,10 @@
         "@angular/core": "^12.2.9",
         "@commitlint/cli": "^16.2.3",
         "@commitlint/config-conventional": "^16.2.1",
-        "@nativescript-community/gesturehandler": "^2.0.1",
+        "@nativescript-community/arraybuffers": "^1.0.1",
+        "@nativescript-community/gesturehandler": "^2.0.5",
         "@nativescript-community/tween": "0.0.14",
-        "@nativescript-community/ui-canvas": "4.4.1",
+        "@nativescript-community/ui-canvas": "4.4.4",
         "@nativescript/core": "8.2.2",
         "@nativescript/types-android": "8.2.0",
         "@nativescript/types-ios": "8.2.1",

plugin/package.json

@@ -32,8 +32,9 @@
     "main": "charts/index.js",
     "typings": "charts/index.d.ts",
     "dependencies": {
-        "@nativescript-community/gesturehandler": "^2.0.1",
-        "@nativescript-community/ui-canvas": "^4.4.1",
+        "@nativescript-community/arraybuffers": "^1.0.1",
+        "@nativescript-community/gesturehandler": "^2.0.5",
+        "@nativescript-community/ui-canvas": "^4.4.4",
         "additween": "^3.0.0",
         "downsample": "^1.4.0",
         "number-format.js": "^2.0.9"

src/charting/renderer/CandleStickChartRenderer.ts

@@ -201,9 +201,9 @@ export class CandleStickChartRenderer extends LineScatterCandleRadarRenderer {
                 if (customRender && customRender.drawLines) {
                     customRender.drawLines(c, e, rangeBuffers, openBuffers, closeBuffers, renderPaint);
                 } else {
-                    c.drawLines(Utils.arrayToNativeArray(rangeBuffers, false, false), renderPaint);
-                    c.drawLines(Utils.arrayToNativeArray(openBuffers, false, false), renderPaint);
-                    c.drawLines(Utils.arrayToNativeArray(closeBuffers, false, false), renderPaint);
+                    c.drawLines(Utils.pointsFromBuffer(rangeBuffers, false, false) as number[], renderPaint);
+                    c.drawLines(Utils.pointsFromBuffer(openBuffers, false, false) as number[], renderPaint);
+                    c.drawLines(Utils.pointsFromBuffer(closeBuffers, false, false) as number[], renderPaint);
                 }
             }
         }

src/charting/utils/Utils.ts

@@ -1,14 +1,5 @@
+import { Align, Canvas, FontMetrics, Matrix, Paint, Path, Rect, RectF, StaticLayout, Style } from '@nativescript-community/ui-canvas';
 import {
-    Align,
-    Canvas,
-    FontMetrics,
-    Matrix,
-    Paint,
-    Path,
-    Rect,
-    RectF,
-    StaticLayout,
-    Style,
     TypedArray,
     arrayToNativeArray as arrayToNativeArrayFn,
     createArrayBuffer as createArrayBufferFn,
@@ -17,7 +8,7 @@ import {
     nativeArrayToArray as nativeArrayToArrayFn,
     pointsFromBuffer as pointsFromBufferFn,
     supportsDirectArrayBuffers as supportsDirectArrayBuffersFn
-} from '@nativescript-community/ui-canvas';
+} from '@nativescript-community/arraybuffers';
 import Shape from '@nativescript-community/ui-canvas/shapes/shape';
 import { Color, ImageSource, ObservableArray, Trace } from '@nativescript/core';
 import { Screen } from '@nativescript/core/platform';
@@ -691,16 +682,16 @@ export namespace Utils {
     export const nativeArrayToArray = nativeArrayToArrayFn;
     export const arrayToNativeArray = arrayToNativeArrayFn;
 
-    const mTempArrays: { [k: string]: number[] | TypedArray } = {};
+    const mTempArrays: { [k: string]: TypedArray } = {};
     export function getTempArray(length, useInts = false, canReturnBuffer = true, optKey?: string) {
-        let key = length + '' + useInts;
+        let key = length + '' + useInts + '' + canReturnBuffer;
         if (optKey) {
             key += optKey;
         }
         if (mTempArrays[key]) {
             return mTempArrays[key];
         }
-        const buf = (mTempArrays[key] = createArrayBufferOrNativeArray(length, useInts, canReturnBuffer));
+        const buf = (mTempArrays[key] = createArrayBuffer(length, useInts, canReturnBuffer));
         return buf;
     }
 

src/charting/utils/ViewPortHandler.ts

@@ -379,7 +379,7 @@ export class ViewPortHandler {
      */
     public limitTransAndScale(matrix: Matrix, content: Rect) {
         if (!this.mMatrixBuffer) {
-            this.mMatrixBuffer = Utils.createArrayBufferOrNativeArray(9);
+            this.mMatrixBuffer = Utils.createArrayBuffer(9);
         }
         const matrixBuffer = this.mMatrixBuffer;
         matrix.getValues(matrixBuffer);