Merge remote-tracking branch 'origin/master'

farfromrefug · farfromrefug · commit 4a58ae5557ce · 2024-11-04T17:31:32.000+01:00
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/docs/classes/ui_canvas.CanvasView.html b/docs/classes/ui_canvas.CanvasView.html
diff --git a/docs/classes/ui_svg.SVGView.html b/docs/classes/ui_svg.SVGView.html
diff --git a/packages/ui-canvas/CHANGELOG.md b/packages/ui-canvas/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.34](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.6.33...@nativescript-community/ui-canvas@4.6.34) (2024-09-25)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvas
+
+## [4.6.33](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.6.32...@nativescript-community/ui-canvas@4.6.33) (2024-08-03)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvas
+
 ## [4.6.32](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvas@4.6.31...@nativescript-community/ui-canvas@4.6.32) (2024-08-01)
 
 **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.32",
+    "version": "4.6.34",
     "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,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.37](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvaslabel@1.2.36...@nativescript-community/ui-canvaslabel@1.2.37) (2024-09-25)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvaslabel
+
+## [1.2.36](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvaslabel@1.2.35...@nativescript-community/ui-canvaslabel@1.2.36) (2024-08-03)
+
+**Note:** Version bump only for package @nativescript-community/ui-canvaslabel
+
 ## [1.2.35](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-canvaslabel@1.2.34...@nativescript-community/ui-canvaslabel@1.2.35) (2024-08-01)
 
 **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.35",
+    "version": "1.2.37",
     "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,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.6](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.2.5...@nativescript-community/ui-svg@0.2.6) (2024-09-25)
+
+**Note:** Version bump only for package @nativescript-community/ui-svg
+
+## [0.2.5](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.2.4...@nativescript-community/ui-svg@0.2.5) (2024-08-03)
+
+**Note:** Version bump only for package @nativescript-community/ui-svg
+
 ## [0.2.4](https://github.com/nativescript-community/ui-canvas/compare/@nativescript-community/ui-svg@0.2.3...@nativescript-community/ui-svg@0.2.4) (2024-08-01)
 
 **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.4",
+    "version": "0.2.6",
     "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
@@ -347,7 +347,14 @@ export class ColorMatrixColorFilter extends ProxyClass<android.graphics.ColorMat
 export class Path extends ProxyClass<com.akylas.canvas.CanvasPath> {
     constructor(path?: com.akylas.canvas.CanvasPath) {
         super();
-        this.mNative = path ? new com.akylas.canvas.CanvasPath(path) : new com.akylas.canvas.CanvasPath();
+
+        if (path) {
+            const param = (path as any).getNative ? (path as any).getNative() : path;
+            this.mNative = new com.akylas.canvas.CanvasPath(param);
+        } else {
+            this.mNative = new com.akylas.canvas.CanvasPath();
+        }
+
         return this;
     }
 }
diff --git a/src/ui-canvas/canvas.ios.ts b/src/ui-canvas/canvas.ios.ts
@@ -551,8 +551,8 @@ export class Path implements IPath {
     private mBPath?: UIBezierPath;
     private mFillType: FillType;
 
-    constructor() {
-        this.mPath = CGPathCreateMutable();
+    constructor(path?: Path) {
+        this.mPath = path ? CGPathCreateMutableCopy(path.getCGPath()) : CGPathCreateMutable();
         this.mFillType = FillType.WINDING;
         // this._path = UIBezierPath.bezierPath();
     }
@@ -611,7 +611,7 @@ export class Path implements IPath {
         if (points.length <= 0 || points.length % 2 !== 0) {
             console.error('wrong points number');
         }
-        UIBezierPath.addLinesOffsetCountCloseToPath(points, offset, length, close, this.mPath);
+        UIBezierPath.addLinesOffsetCountCloseToPath(points, offset, length, close, this.getCGPath());
     }
     setLines(points: number[], offset?: number, length?: number, close?: boolean) {
         this.reset();
@@ -632,21 +632,25 @@ export class Path implements IPath {
         // if (close === true) {
         //     CGPathCloseSubpath(this._path);
         // }
-        UIBezierPath.addCubicLinesOffsetCountCloseToPath(points, offset, length, close, this.mPath);
+        UIBezierPath.addCubicLinesOffsetCountCloseToPath(points, offset, length, close, this.getCGPath());
     }
     setCubicLines(points: number[], offset?: number, length?: number, close?: boolean) {
         this.reset();
         this.addCubicLines(points, offset, length, close);
     }
     arcTo(rect: Rect, startAngle: number, sweepAngle: number, forceMoveTo?: boolean) {
         const center = CGPointMake(rect.centerX(), rect.centerY());
+        // This is how Android does things in arcTo
+        const endAngle = (startAngle + sweepAngle) % 360;
+
         let t = CGAffineTransformMakeTranslation(center.x, center.y);
         t = CGAffineTransformConcat(CGAffineTransformMakeScale(1.0, rect.height() / rect.width()), t);
+
         if (this.mBPath) {
-            this.mBPath.addArcWithCenterRadiusStartAngleEndAngleClockwise(center, rect.width() / 2, (startAngle * Math.PI) / 180, ((startAngle + sweepAngle) * Math.PI) / 180, sweepAngle < 0);
+            this.mBPath.addArcWithCenterRadiusStartAngleEndAngleClockwise(center, rect.width() / 2, (startAngle * Math.PI) / 180, (endAngle * Math.PI) / 180, sweepAngle < 0);
             this.mBPath.applyTransform(t);
         } else {
-            CGPathAddArc(this.mPath, new interop.Reference(t), 0, 0, rect.width() / 2, (startAngle * Math.PI) / 180, ((startAngle + sweepAngle) * Math.PI) / 180, sweepAngle < 0);
+            CGPathAddArc(this.mPath, new interop.Reference(t), 0, 0, rect.width() / 2, (startAngle * Math.PI) / 180, (endAngle * Math.PI) / 180, sweepAngle < 0);
         }
     }
     //@ts-ignore
@@ -909,7 +913,7 @@ export class Path implements IPath {
     //@ts-ignore
     set(path: Path): void {
         this.mBPath = null;
-        this.mPath = CGPathCreateMutableCopy(path.mPath);
+        this.mPath = CGPathCreateMutableCopy(path.getCGPath());
     }
 }
 
@@ -2369,7 +2373,8 @@ export class StaticLayout {
         private spacingadd?,
         private includepad?,
         private ellipsize?,
-        private ellipsizedWidth?
+        private ellipsizedWidth?,
+        private height?
     ) {
         if (text instanceof NSAttributedString) {
             this.nsAttributedString = text;
@@ -2456,7 +2461,7 @@ export class StaticLayout {
             CGContextTranslateCTM(ctx, offsetx, 0);
         }
         this.mToDraw.drawWithRectOptionsContext(
-            CGRectMake(0, 0, this.width, maxHeight),
+            CGRectMake(0, 0, this.width, Math.min(maxHeight, this.height || Number.MAX_VALUE)),
             NSStringDrawingOptions.UsesLineFragmentOrigin | NSStringDrawingOptions.TruncatesLastVisibleLine | NSStringDrawingOptions.UsesFontLeading,
             null
         );
diff --git a/yarn.lock b/yarn.lock
@@ -1219,7 +1219,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nativescript-community/arraybuffers@npm:^1.1.3":
+"@nativescript-community/arraybuffers@npm:^1.1.3, @nativescript-community/arraybuffers@npm:^1.1.5":
   version: 1.1.5
   resolution: "@nativescript-community/arraybuffers@npm:1.1.5"
   checksum: b6d0aca5cfdba26048f543095d1ebba4bfcaa2407e9c17e3ff2da5d0ee25f5c4b959a9483ccb63ea89b5e868954116cad7e31aa93dd57a430d1d9585e65a4035
@@ -1366,8 +1366,8 @@ __metadata:
 "@nativescript-community/ui-canvas@npm:*, @nativescript-community/ui-canvas@workspace:packages/ui-canvas":
   version: 0.0.0-use.local
   resolution: "@nativescript-community/ui-canvas@workspace:packages/ui-canvas"
-  peerDependencies:
-    "@nativescript-community/arraybuffers": ^1.1.3
+  dependencies:
+    "@nativescript-community/arraybuffers": "npm:^1.1.5"
   languageName: unknown
   linkType: soft
 
@@ -1400,7 +1400,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@nativescript-community/ui-svg@workspace:packages/ui-svg"
   peerDependencies:
-    "@nativescript-community/ui-canvas": ^4.5.1
+    "@nativescript-community/ui-canvas": ^4.6.27
   languageName: unknown
   linkType: soft
 

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.32",`
	`3`	`+ "version": "4.6.34",`
`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.35",`
	`3`	`+ "version": "1.2.37",`
`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.4",`
	`3`	`+ "version": "0.2.6",`
`4`	`4`	`"description": "Adds support for SVGs in your NativeScript apps.",`
`5`	`5`	`"main": "./index",`
`6`	`6`	`"sideEffects": false,`