Merge remote-tracking branch 'origin/master'

farfromrefug · farfromrefug · commit d107afeda4ab · 2025-09-05T16:29:21.000+02:00
# Conflicts:
#	src/ui-canvas/index.android.ts
diff --git a/docs/assets/hierarchy.js b/docs/assets/hierarchy.js
diff --git a/docs/assets/navigation.js b/docs/assets/navigation.js
diff --git a/docs/assets/search.js b/docs/assets/search.js
diff --git a/packages/ui-canvas/CHANGELOG.md b/packages/ui-canvas/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.41](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.6.40...@nativescript-community/ui-canvas@4.6.41) (2025-07-02)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvas
+
+## [4.6.40](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.6.39...@nativescript-community/ui-canvas@4.6.40) (2025-06-29)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvas
+
+## [4.6.39](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.6.38...@nativescript-community/ui-canvas@4.6.39) (2025-01-02)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvas
+
 ## [4.6.38](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.6.37...@nativescript-community/ui-canvas@4.6.38) (2024-12-18)
 
 **Note:** Version bump only for package @nativescript-community/ui-canvas
diff --git a/packages/ui-canvas/package.json b/packages/ui-canvas/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-canvas",
-    "version": "4.6.38",
+    "version": "4.6.41",
     "description": "Implement Canvas into your NativeScript apps.",
     "main": "./index",
     "sideEffects": false,
diff --git a/packages/ui-canvaslabel/CHANGELOG.md b/packages/ui-canvaslabel/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.44](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvaslabel@1.2.43...@nativescript-community/ui-canvaslabel@1.2.44) (2025-07-02)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvaslabel
+
+## [1.2.43](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvaslabel@1.2.42...@nativescript-community/ui-canvaslabel@1.2.43) (2025-06-29)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvaslabel
+
+## [1.2.42](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvaslabel@1.2.41...@nativescript-community/ui-canvaslabel@1.2.42) (2025-01-02)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvaslabel
+
 ## [1.2.41](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvaslabel@1.2.40...@nativescript-community/ui-canvaslabel@1.2.41) (2024-12-18)
 
 **Note:** Version bump only for package @nativescript-community/ui-canvaslabel
diff --git a/packages/ui-canvaslabel/package.json b/packages/ui-canvaslabel/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-canvaslabel",
-    "version": "1.2.41",
+    "version": "1.2.44",
     "description": "Alternative to the built-in NativeScript Label but uses canvas which allows extreme complexity and customization.",
     "main": "./canvaslabel",
     "sideEffects": false,
diff --git a/packages/ui-svg/CHANGELOG.md b/packages/ui-svg/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.13](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.2.12...@nativescript-community/ui-svg@0.2.13) (2025-07-02)
+
+**Note:** Version bump only for package @nativescript-community/ui-svg
+
+## [0.2.12](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.2.11...@nativescript-community/ui-svg@0.2.12) (2025-06-29)
+
+**Note:** Version bump only for package @nativescript-community/ui-svg
+
+## [0.2.11](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.2.10...@nativescript-community/ui-svg@0.2.11) (2025-01-02)
+
+**Note:** Version bump only for package @nativescript-community/ui-svg
+
 ## [0.2.10](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.2.9...@nativescript-community/ui-svg@0.2.10) (2024-12-18)
 
 **Note:** Version bump only for package @nativescript-community/ui-svg
diff --git a/packages/ui-svg/package.json b/packages/ui-svg/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-svg",
-    "version": "0.2.10",
+    "version": "0.2.13",
     "description": "Adds support for SVGs in your NativeScript apps.",
     "main": "./index",
     "sideEffects": false,
diff --git a/src/ui-canvas/canvas.android.ts b/src/ui-canvas/canvas.android.ts
@@ -33,9 +33,9 @@ function createColorParam(param) {
 function drawViewOnCanvas(canvas: android.graphics.Canvas, view: View, rect?: android.graphics.Rect) {
     if (!view.nativeView) {
         const activity = Application.android.foregroundActivity;
-        (view as any)._setupAsRootView(activity);
-        (view as any)._isAddedToNativeVisualTree = true;
-        (view as any).callLoaded();
+        view._setupAsRootView(activity);
+        view._isAddedToNativeVisualTree = true;
+        view.callLoaded();
     }
     if (view.nativeView) {
         if (rect) {
@@ -46,7 +46,7 @@ function drawViewOnCanvas(canvas: android.graphics.Canvas, view: View, rect?: an
             canvas.save();
             canvas.translate(rect.left, rect.top);
         }
-        view.nativeView.draw(canvas as any);
+        view.nativeView.draw(canvas);
         if (rect) {
             canvas.restore();
         }
@@ -192,6 +192,13 @@ export class Paint extends ProxyClass<android.graphics.Paint> {
         super();
         if (paint) {
             this.mNative = new android.graphics.Paint(paint.getNative());
+            //we need to clone the typeface or it is shared
+            const original = this.mNative.getTypeface();
+            if (original) {
+                const style = original.getStyle();
+                const cloned = android.graphics.Typeface.create(original, style);
+                this.mNative.setTypeface(cloned);
+            }
         } else {
             this.mNative = new android.graphics.Paint(1); //android.graphics.Paint.ANTI_ALIAS_FLAG
         }
@@ -287,7 +294,7 @@ export class Paint extends ProxyClass<android.graphics.Paint> {
         }
     }
     set color(color) {
-        (this as any).setColor(color);
+        this['setColor'](color);
     }
     set strokeWidth(value: number) {
         this.mNative.setStrokeWidth(value);
diff --git a/src/ui-canvas/canvas.ios.ts b/src/ui-canvas/canvas.ios.ts
@@ -1762,9 +1762,9 @@ export class Canvas implements ICanvas {
     @paint
     drawView(view: View, rect?: Rect) {
         if (!view.nativeView) {
-            (view as any)._setupAsRootView({});
-            (view as any)._isAddedToNativeVisualTree = true;
-            (view as any).callLoaded();
+            view._setupAsRootView({});
+            view._isAddedToNativeVisualTree = true;
+            view.callLoaded();
         }
         if (view.nativeView) {
             const uiView = view.nativeView as UIView;
@@ -2233,13 +2233,13 @@ export class LinearGradient {
                 }
 
                 const cgColors = this.colors.map((c) => (c instanceof Color ? c : new Color(c)).ios.CGColor);
-                this.mGradient = CGGradientCreateWithColors(CGColorSpaceCreateDeviceRGB(), cgColors as any, stopsRef);
+                this.mGradient = CGGradientCreateWithColors(CGColorSpaceCreateDeviceRGB(), cgColors, stopsRef);
                 if (this.mGradient) {
                     CFRetain(this.mGradient);
                 }
             } else {
                 const cgColors = [this.colors, this.stops].map((c) => (c instanceof Color ? c : new Color(c)).ios.CGColor);
-                this.mGradient = CGGradientCreateWithColors(CGColorSpaceCreateDeviceRGB(), cgColors as any, null);
+                this.mGradient = CGGradientCreateWithColors(CGColorSpaceCreateDeviceRGB(), cgColors, null);
                 if (this.mGradient) {
                     CFRetain(this.mGradient);
                 }
diff --git a/src/ui-canvas/index.android.ts b/src/ui-canvas/index.android.ts
@@ -1,6 +1,6 @@
 import { CSSType, Utils } from '@nativescript/core';
 import { Canvas, Paint } from './canvas';
-import { CanvasBase, hardwareAcceleratedProperty } from './index.common';
+import { CanvasBase, DEFAULT_SCALE, hardwareAcceleratedProperty } from './index.common';
 import { sdkVersion } from './canvas.common';
 
 export * from './canvas';
@@ -62,11 +62,11 @@ export class CanvasView extends CanvasBase {
                 const owner = that?.get();
                 if (owner) {
                     const drawFrameRate = this.drawFrameRate;
+                    const scale = DEFAULT_SCALE;
                     let startTime;
                     if (drawFrameRate) {
                         startTime = Date.now();
                     }
-                    const scale = this.density;
                     canvas.save();
                     canvas.scale(scale, scale); // always scale to device density to work with dp
                     this.augmentedCanvas.setNative(canvas);
diff --git a/tools b/tools
@@ -1 +1 @@
-Subproject commit ee8465a1d0f325eaaea9dadabdf245e2e8795a65
+Subproject commit 2abe53b7dd57f5a02e0132d20ba30acba56bb81c

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript-community/ui-canvas",`
`3`		`- "version": "4.6.38",`
	`3`	`+ "version": "4.6.41",`
`4`	`4`	`"description": "Implement Canvas into your NativeScript apps.",`
`5`	`5`	`"main": "./index",`
`6`	`6`	`"sideEffects": false,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript-community/ui-canvaslabel",`
`3`		`- "version": "1.2.41",`
	`3`	`+ "version": "1.2.44",`
`4`	`4`	`"description": "Alternative to the built-in NativeScript Label but uses canvas which allows extreme complexity and customization.",`
`5`	`5`	`"main": "./canvaslabel",`
`6`	`6`	`"sideEffects": false,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript-community/ui-svg",`
`3`		`- "version": "0.2.10",`
	`3`	`+ "version": "0.2.13",`
`4`	`4`	`"description": "Adds support for SVGs in your NativeScript apps.",`
`5`	`5`	`"main": "./index",`
`6`	`6`	`"sideEffects": false,`