@nativescript/canvas 2.0.0-beta.4 → 2.0.0-beta.6

package/Dom/shapes/Path.d.ts

@@ -1,8 +1,25 @@
+import { Property } from '@nativescript/core';
 import { Paint } from '../Paint';
-import { Path2D } from '../../Canvas2D';
+import { Path2D, DOMMatrix } from '../../Canvas2D';
 export declare const pathProperty: any;
+export declare const startProperty: Property<Path, number>;
+export declare const endProperty: Property<Path, number>;
 export declare class Path extends Paint {
     _path: Path2D;
-    path: string;
+    path: string | Path2D;
+    start: number;
+    end: number;
     draw(): void;
+    addPath(path: Path2D, transform?: DOMMatrix): void;
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    closePath(): void;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    lineTo(x: number, y: number): void;
+    moveTo(x: number, y: number): void;
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    rect(x: number, y: number, width: number, height: number): void;
+    roundRect(x: number, y: number, width: number, height: number, radii: number): void;
+    roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
 }

package/Dom/shapes/Path.js

@@ -7,29 +7,90 @@ export const pathProperty = new Property({
         target.invalidate();
     },
 });
+export const startProperty = new Property({
+    name: 'start',
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
+});
+export const endProperty = new Property({
+    name: 'end',
+    valueChanged(target, oldValue, newValue) {
+        target.invalidate();
+    },
+});
 export class Path extends Paint {
+    constructor() {
+        super(...arguments);
+        this._path = new Path2D();
+    }
     [pathProperty.setNative](value) {
         if (value) {
             this._path = new Path2D(value);
         }
     }
+    [startProperty.setNative](value) {
+        if (typeof value === 'number' && typeof this.end === 'number') {
+            this._path.trim(value, this.end);
+        }
+    }
+    [endProperty.setNative](value) {
+        if (typeof value === 'number' && typeof this.start === 'number') {
+            this._path.trim(this.start, value);
+        }
+    }
     draw() {
         if (this._path === undefined) {
             return;
         }
         const override_color = this.parent._overrideColor;
         const context = this._canvas.getContext('2d');
-        const style = this.paintStyle;
+        const style = this._getPaintStyle();
+        const color = this._getColor();
         if (style === 'fill') {
-            context.fillStyle = this.color.hex;
+            context.fillStyle = color;
             context.fill(this._path);
         }
         else if (style === 'stroke') {
-            context.lineWidth = this.strokeWidth;
-            context.strokeStyle = this.color.hex;
+            context.lineWidth = this._getStrokeWidth();
+            context.lineJoin = this._getStrokeJoin();
+            context.strokeStyle = color;
             context.stroke(this._path);
         }
     }
+    addPath(path, transform) {
+        this._path.addPath(path, transform);
+    }
+    arc(x, y, radius, startAngle, endAngle, anticlockwise = false) {
+        this._path.arc(x, y, radius, startAngle, endAngle, anticlockwise ?? false);
+    }
+    arcTo(x1, y1, x2, y2, radius) {
+        this._path.arcTo(x1, y1, x2, y2, radius);
+    }
+    bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) {
+        this._path.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y);
+    }
+    closePath() {
+        this._path.closePath();
+    }
+    ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise = false) {
+        this._path.ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise ?? false);
+    }
+    lineTo(x, y) {
+        this._path.lineTo(x, y);
+    }
+    moveTo(x, y) {
+        this._path.moveTo(x, y);
+    }
+    quadraticCurveTo(cpx, cpy, x, y) {
+        this._path.quadraticCurveTo(cpx, cpy, x, y);
+    }
+    rect(x, y, width, height) {
+        this._path.rect(x, y, width, height);
+    }
+    roundRect(x, y, width, height, radii) {
+        this._path.roundRect(x, y, width, height, radii);
+    }
 }
 pathProperty.register(Path);
 //# sourceMappingURL=Path.js.map

package/Dom/shapes/Path.js.map

@@ -1 +1 @@
-{"version":3,"file":"Path.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAe;IACtD,IAAI,EAAE,MAAM;IACZ,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,IAAK,SAAQ,KAAK;IAI9B,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,KAAK;QAC7B,IAAI,KAAK,EAAE;YACV,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;SAC/B;IACF,CAAC;IAED,IAAI;QACH,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,OAAO;SACP;QACD,MAAM,cAAc,GAAI,IAAI,CAAC,MAAc,CAAC,cAAc,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QAEjF,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9B,IAAI,KAAK,KAAK,MAAM,EAAE;YACrB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAY,CAAC,CAAC;SAChC;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;YACrC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YACrC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAY,CAAC,CAAC;SAClC;IACF,CAAC;CACD;AAED,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"Path.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Path.ts"],"names":[],"mappings":"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"}

package/Dom/shapes/Points.js

@@ -17,7 +17,9 @@ export class Points extends Paint {
     draw() {
         const override_color = this.parent._overrideColor;
         const context = this._canvas.getContext('2d');
-        context.strokeStyle = this.color.hex;
+        context.lineWidth = this._getStrokeWidth();
+        context.lineJoin = this._getStrokeJoin();
+        context.strokeStyle = this._getColor();
         context.drawPoints(this.mode ?? 'points', this.points);
     }
 }

package/Dom/shapes/Points.js.map

@@ -1 +1 @@
-{"version":3,"file":"Points.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Points.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAAoB,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAqC;IAC9E,IAAI,EAAE,QAAQ;IACd,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAyC;IAChF,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,QAAQ;IACtB,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,MAAO,SAAQ,KAAK;IAIhC,IAAI;QACH,MAAM,cAAc,GAAI,IAAI,CAAC,MAAc,CAAC,cAAc,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QACjF,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QACpC,OAAe,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACD;AAED,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAChC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"Points.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Points.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAAoB,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAqC;IAC9E,IAAI,EAAE,QAAQ;IACd,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAyC;IAChF,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,QAAQ;IACtB,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;QACtC,MAAM,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,MAAO,SAAQ,KAAK;IAIhC,IAAI;QACH,MAAM,cAAc,GAAI,IAAI,CAAC,MAAc,CAAC,cAAc,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QACjF,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3C,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACzC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,OAAe,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACD;AAED,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAChC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC"}

package/Dom/shapes/Rect.js

@@ -56,6 +56,7 @@ export class Rect extends Paint {
                     case 'stroke':
                         context.strokeStyle = color;
                         context.lineWidth = child._getStrokeWidth();
+                        context.lineJoin = child._getStrokeJoin();
                         context.stroke();
                         break;
                 }

package/Dom/shapes/Rect.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Rect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Rect.ts"],"names":[],"mappings":"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"}

package/Dom/shapes/RoundedRect.js

@@ -65,7 +65,8 @@ export class RoundedRect extends Rect {
                         break;
                     case 'stroke':
                         context.strokeStyle = color;
-                        context.lineWidth = child.strokeWidth;
+                        context.lineWidth = child._getStrokeWidth();
+                        context.lineJoin = child._getStrokeJoin();
                         if (child instanceof Shadow) {
                             const dx = context.shadowOffsetX;
                             const dy = context.shadowOffsetY;

package/Dom/shapes/RoundedRect.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoundedRect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/RoundedRect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RoundedRect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/RoundedRect.ts"],"names":[],"mappings":"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"}

package/Dom/shapes/index.d.ts

@@ -4,3 +4,8 @@ export * from './Circle';
 export * from './RoundedRect';
 export * from './Line';
 export * from './Points';
+export * from './Oval';
+export declare function vec(x: number, y: number): {
+    x: number;
+    y: number;
+};

package/Dom/shapes/index.js

@@ -4,4 +4,8 @@ export * from './Circle';
 export * from './RoundedRect';
 export * from './Line';
 export * from './Points';
+export * from './Oval';
+export function vec(x, y) {
+    return { x, y };
+}
 //# sourceMappingURL=index.js.map

package/Dom/shapes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AAEvB,MAAM,UAAU,GAAG,CAAC,CAAS,EAAE,CAAS;IACvC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "description": "DOM Canvas API for NativeScript",
   "main": "index",
   "typings": "index.d.ts",

package/platforms/ios/CanvasNative.xcframework/Info.plist

@@ -10,15 +10,18 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>CanvasNative.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -26,18 +29,15 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>CanvasNative.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_native.h

@@ -709,6 +709,12 @@ void canvas_native_context_fill_text_width(struct CanvasRenderingContext2D *cont
                                            float y,
                                            float width);
 
+void canvas_native_context_fill_oval(struct CanvasRenderingContext2D *context,
+                                     float x,
+                                     float y,
+                                     float width,
+                                     float height);
+
 struct ImageData *canvas_native_context_get_image_data(struct CanvasRenderingContext2D *context,
                                                        float sx,
                                                        float sy,
@@ -837,6 +843,12 @@ void canvas_native_context_stroke_text_width(struct CanvasRenderingContext2D *co
                                              float y,
                                              float width);
 
+void canvas_native_context_stroke_oval(struct CanvasRenderingContext2D *context,
+                                       float x,
+                                       float y,
+                                       float width,
+                                       float height);
+
 void canvas_native_context_transform(struct CanvasRenderingContext2D *context,
                                      float a,
                                      float b,
@@ -921,6 +933,8 @@ bool canvas_native_image_bitmap_create_from_encoded_bytes_src_rect_with_output(c
                                                                                float resize_height,
                                                                                struct ImageAsset *output);
 
+void canvas_native_path_trim(struct Path *path, float start, float end);
+
 void canvas_native_path_add_path(struct Path *path, const struct Path *path_to_add);
 
 struct Path *canvas_native_path_create(void);