npm - @nativescript/canvas - Versions diffs - 2.0.0-beta.0 → 2.0.0-beta.2 - Mend

@nativescript/canvas 2.0.0-beta.0 → 2.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

package/Canvas2D/CanvasRenderingContext2D/index.d.ts +2 -0
package/Canvas2D/CanvasRenderingContext2D/index.js +10 -1
package/Canvas2D/CanvasRenderingContext2D/index.js.map +1 -1
package/Canvas2D/DOMMatrix/index.js +5 -3
package/Canvas2D/DOMMatrix/index.js.map +1 -1
package/Dom/Dom.js +7 -2
package/Dom/Dom.js.map +1 -1
package/Dom/Group.d.ts +7 -7
package/Dom/Group.js +47 -21
package/Dom/Group.js.map +1 -1
package/Dom/Image.js +2 -3
package/Dom/Image.js.map +1 -1
package/Dom/Paint.d.ts +1 -0
package/Dom/Paint.js +9 -3
package/Dom/Paint.js.map +1 -1
package/Dom/Text.js +3 -4
package/Dom/Text.js.map +1 -1
package/Dom/shapes/Circle.js +1 -1
package/Dom/shapes/Circle.js.map +1 -1
package/Dom/shapes/Path.js +1 -0
package/Dom/shapes/Path.js.map +1 -1
package/Dom/shapes/Rect.js +2 -2
package/Dom/shapes/Rect.js.map +1 -1
package/Dom/shapes/RoundedRect.js +8 -9
package/Dom/shapes/RoundedRect.js.map +1 -1
package/package.json +1 -1
package/platforms/android/canvas-release.aar +0 -0
package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative +0 -0
package/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative +0 -0
package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative +0 -0
package/platforms/ios/src/cpp/ObjectWrapperImpl.h +8 -6
package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.cpp +43 -45
package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.h +3 -0
package/platforms/ios/src/cpp/canvas2d/MatrixImpl.h +1 -1
package/platforms/ios/src/cpp/webgl/WebGLRenderingContext.h +4 -4

package/Canvas2D/CanvasRenderingContext2D/index.d.ts CHANGED Viewed

@@ -93,6 +93,7 @@ export declare class CanvasRenderingContext2D {
     fillText(text: string, x: number, y: number, maxWidth: number): void;
     getImageData(sx: number, sy: number, sw: number, sh: number): ImageData;
     getLineDash(): number[];
+    getTransform(): DOMMatrix;
     isPointInPath(x: number, y: number, fillRule: string): boolean;
     isPointInPath(path: Path2D, x: number, y: number, fillRule: string): boolean;
     isPointInStroke(x: number, y: number): boolean;
@@ -116,6 +117,7 @@ export declare class CanvasRenderingContext2D {
     scrollPathIntoView(): void;
     scrollPathIntoView(path: Path2D): void;
     setLineDash(segments: number[]): void;
+    setTransform(matrix: DOMMatrix): void;
     setTransform(a: number, b: number, c: number, d: number, e: number, f: number): void;
     stroke(): void;
     strokeRect(x: number, y: number, width: number, height: number): void;

package/Canvas2D/CanvasRenderingContext2D/index.js CHANGED Viewed

@@ -509,6 +509,9 @@ export class CanvasRenderingContext2D {
     getLineDash() {
         return this.context.getLineDash();
     }
+    getTransform() {
+        return new DOMMatrix(this.context.getTransform());
+    }
     isPointInPath(...args) {
         if (args.length === 2) {
             return this.context.isPointInPath(args[0], args[1]);
@@ -581,7 +584,13 @@ export class CanvasRenderingContext2D {
         this.context.setLineDash(segments);
     }
     setTransform(a, b, c, d, e, f) {
-        this.context.setTransform(a, b, c, d, e, f);
+        if (typeof a === 'object') {
+            // @ts-ignore
+            this.context.setTransform(a.native);
+        }
+        else {
+            this.context.setTransform(a, b, c, d, e, f);
+        }
     }
     stroke(path) {
         if (path) {

package/Canvas2D/CanvasRenderingContext2D/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasRenderingContext2D/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAU,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,IAAI,IAAI,CAAC;AAGT,SAAS,UAAU,CAAC,IAAY;IAC/B,QAAQ,IAAI,EAAE;QACb,KAAK,SAAS;YACb,OAAO,CAAC,CAAC;QACV,KAAK,SAAS;YACb,OAAO,CAAC,CAAC;QACV;YACC,OAAO,CAAC,CAAC,CAAC,CAAC,kBAAkB;KAC9B;AACF,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAChC,QAAQ,KAAK,EAAE;QACd,KAAK,KAAK;YACT,OAAO,CAAC,CAAC;QACV,KAAK,SAAS;YACb,OAAO,CAAC,CAAC;QACV,KAAK,QAAQ;YACZ,OAAO,CAAC,CAAC;QACV,KAAK,YAAY;YAChB,OAAO,CAAC,CAAC;QACV,KAAK,aAAa;YACjB,OAAO,CAAC,CAAC;QACV,KAAK,QAAQ;YACZ,OAAO,CAAC,CAAC;QACV;YACC,OAAO,CAAC,CAAC,CAAC;KACX;AACF,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IAClC,QAAQ,KAAK,EAAE;QACd,KAAK,CAAC;YACL,OAAO,KAAK,CAAC;QACd,KAAK,CAAC;YACL,OAAO,SAAS,CAAC;QAClB,KAAK,CAAC;YACL,OAAO,QAAQ,CAAC;QACjB,KAAK,CAAC;YACL,OAAO,YAAY,CAAC;QACrB,KAAK,CAAC;YACL,OAAO,aAAa,CAAC;QACtB,KAAK,CAAC;YACL,OAAO,QAAQ,CAAC;QACjB;YACC,OAAO,IAAI,CAAC;KACb;AACF,CAAC;AAED,MAAM,OAAO,wBAAwB;IAUpC,YAAY,OAAY,EAAE,cAAc;QAexC,UAAK,GAAW,MAAM,CAAC;QAdtB;;;;;;;;;UASE;QACF,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAGD,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAGD,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACjC,CAAC;IAED,IAAI,WAAW,CAAC,KAAa;QAC5B,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;IAClC,CAAC;IAED,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,IAAI,IAAI,CAAC,KAAa;QACrB,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS,CAAC,KAAa;QAC1B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;IAChC,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACjC,CAAC;IAED,IAAI,WAAW,CAAC,KAAa;QAC5B,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;IAClC,CAAC;IAED,IAAI,qBAAqB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC;IAC3C,CAAC;IAED,IAAI,qBAAqB,CAAC,OAAgB;QACzC,IAAI,CAAC,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;IAC9C,CAAC;IAED,IAAI,qBAAqB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC;IAC3C,CAAC;IAED,IAAI,qBAAqB,CAAC,OAAe;QACxC,IAAI,CAAC,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;IAC9C,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IACpC,CAAC;IAED,IAAI,cAAc,CAAC,MAAc;QAChC,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,MAAM,CAAC;IACtC,CAAC;IAED,IAAI,aAAa;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;IACnC,CAAC;IAED,IAAI,aAAa,CAAC,OAAe;QAChC,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED,IAAI,QAAQ,CAAC,IAAY;QACxB,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO,CAAC,GAAW;QACtB,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC;IAC5B,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IAChC,CAAC;IAED,IAAI,UAAU,CAAC,KAAa;QAC3B,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC;IACjC,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IAChC,CAAC;IAED,IAAI,UAAU,CAAC,IAAY;QAC1B,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAChC,CAAC;IAED,IAAI,aAAa;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;IACnC,CAAC;IAED,IAAI,aAAa,CAAC,CAAS;QAC1B,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,aAAa;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;IACnC,CAAC;IAED,IAAI,aAAa,CAAC,CAAS;QAC1B,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS,CAAC,SAAiB;QAC9B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IACpC,CAAC;IAED,IAAI,YAAY;QACf,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,YAAY,CAAC,QAAgB;QAChC,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACjB,OAAO;SACP;QACD,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC;IACnC,CAAC;IAED,IAAI,wBAAwB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC;IAC9C,CAAC;IAED,IAAI,wBAAwB,CAAC,SAAiB;QAC7C,IAAI,CAAC,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC;IACnD,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS,CAAC,KAA8C;QAC3D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;YAC1C,OAAO;SACP;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3E,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM,CAAC,KAAa;QACvB,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACjC,CAAC;IAED,IAAI,WAAW,CAAC,KAA8C;QAC7D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;YAC1C,OAAO;SACP;QACD,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7E,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS,CAAC,KAAa;QAC1B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;IAChC,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACjC,CAAC;IAED,IAAI,WAAW,CAAC,OAAe;QAC9B,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC;IACpC,CAAC;IAED,WAAW,CAAC,OAAe,WAAW,EAAE,UAAkB,EAAE;QAC3D,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,YAAY,CAAC,MAAW,IAAS,CAAC;IAElC,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,MAAc,EAAE,UAAkB,EAAE,QAAgB,EAAE,gBAAyB,KAAK;QAC7G,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,IAAI,KAAK,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,MAAc;QACnE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,SAAS;QACR,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS;QACzF,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,eAAe,KAAU,CAAC;IAE1B,SAAS,CAAC,CAAS,EAAE,CAAS,EAAE,KAAa,EAAE,MAAc;QAC5D,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAQD,IAAI,CAAC,GAAG,IAAS;QAChB,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;YAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,MAAM,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;YACpE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACvD;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;SAClC;aAAM;YACN,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SACpB;IACF,CAAC;IAED,SAAS;QACR,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAMD,eAAe,CAAC,KAAyB,EAAE,MAAe;QACzD,IAAI,KAAK,YAAY,SAAS,EAAE;YAC/B,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;SAChD;aAAM;YACN,OAAO,IAAI,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SACpC;IACF,CAAC;IAED,oBAAoB,CAAC,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU;QAClE,OAAO,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,aAAa,CAAC,KAAU,EAAE,UAAkB;QAC3C,IAAI,UAAU,KAAK,SAAS,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAC/D,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;YACtE,CAAC,CAAC,IAAI,GAAG,aAAa,CAAC;YACvB,MAAM,CAAC,CAAC;SACR;QAED,yDAAyD;QACzD,mDAAmD;QACnD,IAAI,GAAG,CAAC;QAER,IAAI,KAAK,EAAE,KAAK,KAAK,IAAI,IAAI,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;YACjE,GAAG,GAAI,KAAa,CAAC,MAAM,CAAC;SAC5B;aAAM,IAAI,KAAK,YAAY,WAAW,EAAE;YACxC,2EAA2E;YAC3E,+GAA+G;YAC/G,IAAI,MAAM,CAAC,SAAS,EAAE;gBACrB,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;gBACpB,MAAM,OAAO,GAAI,GAAW,CAAC,YAAY,CAAC,MAAM,CAAC,2BAA2B,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;gBAC/I,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;aAC1E;YAED,IAAI,MAAM,CAAC,KAAK,EAAE;gBACjB,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;gBAChB,MAAM,OAAO,GAAG,2BAA2B,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;gBACxG,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;aAC1E;YAED,OAAO,IAAI,CAAC;SACZ;aAAM,IAAI,MAAM,CAAC,SAAS,IAAI,KAAK,YAAY,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE;YACxE,2EAA2E;YAC3E,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,+CAA+C;YAC7G,IAAI,MAAM,CAAC,SAAS,EAAE;gBACrB,MAAM,OAAO,GAAI,GAAW,CAAC,YAAY,CAAC,MAAM,CAAC,2BAA2B,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;gBACjJ,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;aAC1E;YAED,IAAI,MAAM,CAAC,KAAK,EAAE;gBACjB,MAAM,OAAO,GAAG,2BAA2B,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;gBAC1G,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;aAC1E;YAED,OAAO,IAAI,CAAC;SACZ;aAAM,IAAI,KAAK,YAAY,UAAU,EAAE;YACvC,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC;SACnB;aAAM,IAAI,KAAK,YAAY,MAAM,EAAE;YACnC,GAAG,GAAI,KAAa,CAAC,MAAM,CAAC;SAC5B;aAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE;YAChH,IAAI,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,YAAY,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACxE,UAAU;gBACV,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC;aACnB;iBAAM,IAAI,KAAK,CAAC,MAAM,YAAY,UAAU,EAAE;gBAC9C,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;aAC1B;iBAAM,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE;gBACzC,2EAA2E;gBAC3E,+GAA+G;gBAC/G,IAAI,MAAM,CAAC,SAAS,EAAE;oBACrB,GAAG,GAAG,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;oBAClD,MAAM,OAAO,GAAI,GAAW,CAAC,YAAY,CAAC,MAAM,CAAC,2BAA2B,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;oBAC/I,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC1E;gBAED,IAAI,MAAM,CAAC,KAAK,EAAE;oBACjB,GAAG,GAAG,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;oBAClD,MAAM,OAAO,GAAG,2BAA2B,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;oBACxG,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC1E;gBAED,OAAO,IAAI,CAAC;aACZ;SACD;aAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,YAAY,MAAM,EAAE;YACvH,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;SAC3B;aAAM,IAAI,KAAK,YAAY,WAAW,EAAE;YACxC,GAAG,GAAI,KAAa,CAAC,MAAM,CAAC;SAC5B;QACD,IAAI,CAAC,GAAG,EAAE;YACT,OAAO,IAAI,CAAC;SACZ;QAED,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,oBAAoB,CAAC,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU;QAC1F,OAAO,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED,mBAAmB,CAAC,UAAkB,EAAE,CAAS,EAAE,CAAS;QAC3D,OAAO,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,SAAS,CAAC,KAAa;QACtB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,SAAS,CAAC,CAAS,EAAE,CAAS;QAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,UAAU,CAAC,IAAoC,EAAE,MAAkC;QAClF,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAMD,iBAAiB,CAAC,GAAG,IAAS,IAAS,CAAC;IAQxC,SAAS,CAAC,GAAG,IAAI;QAChB,2EAA2E;QAE3E,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACvC,2EAA2E;YAC3E,+EAA+E;YAE/E,IAAI,KAAK,GAAG,KAAK,CAAC;YAElB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,IAAI,MAAM,CAAC,SAAS,EAAE;oBACrB,KAAK,GAAI,GAAW,CAAC,YAAY,CAAC,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC3I;gBAED,IAAI,MAAM,CAAC,KAAK,EAAE;oBACjB,KAAK,GAAG,2BAA2B,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACpG;aACD;iBAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,IAAI,MAAM,CAAC,SAAS,EAAE;oBACrB,KAAK,GAAI,GAAW,CAAC,YAAY,CAAC,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC7J;gBAED,IAAI,MAAM,CAAC,KAAK,EAAE;oBACjB,KAAK,GAAG,2BAA2B,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACtH;aACD;iBAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,IAAI,MAAM,CAAC,OAAO,EAAE;oBACnB,KAAK,GAAI,GAAW,CAAC,YAAY,CAAC,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBACjM;gBAED,IAAI,MAAM,CAAC,KAAK,EAAE;oBACjB,KAAK,GAAG,2BAA2B,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC1J;aACD;YAED,IAAI,KAAK,EAAE;gBACV,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;aAC3B;QACF,CAAC,CAAC;QAEF,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,KAAK,EAAE,KAAK,KAAK,IAAI,IAAI,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;YACjE,KAAK,GAAI,KAAa,CAAC,MAAM,CAAC;SAC9B;aAAM,IAAI,KAAK,YAAY,UAAU,EAAE;YACvC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;SACrB;aAAM,IAAI,KAAK,YAAY,WAAW,EAAE;YACxC,IAAI,MAAM,CAAC,SAAS,EAAE;gBACrB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;aACrC;YACD,IAAI,MAAM,CAAC,KAAK,EAAE;gBACjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;aACjC;YACD,OAAO;SACP;aAAM,IAAI,MAAM,CAAC,SAAS,IAAI,KAAK,YAAY,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE;YACxE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7B,OAAO;SACP;aAAM,IAAI,MAAM,CAAC,KAAK,IAAI,KAAK,YAAY,OAAO,EAAE;YACpD,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7B,OAAO;SACP;aAAM,IAAI,KAAK,YAAY,MAAM,EAAE;YACnC,KAAK,GAAI,KAAa,CAAC,MAAM,CAAC;SAC9B;aAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE;YAChH,IAAI,KAAK,CAAC,YAAY,YAAY,WAAW,EAAE;gBAC9C,IAAI,MAAM,CAAC,SAAS,EAAE;oBACrB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;iBAClD;gBACD,IAAI,MAAM,CAAC,KAAK,EAAE;oBACjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;iBAC9C;gBACD,OAAO;aACP;iBAAM,IAAI,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,YAAY,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE;gBAC/E,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBACpC,OAAO;aACP;iBAAM,IAAI,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,YAAY,OAAO,EAAE;gBAC3D,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBACpC,OAAO;aACP;iBAAM,IAAI,KAAK,CAAC,MAAM,YAAY,UAAU,EAAE;gBAC9C,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;aAC5B;iBAAM,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE;gBACzC,KAAK,GAAG,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;gBACpD,IAAI,MAAM,CAAC,SAAS,EAAE;oBACrB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;iBACrC;gBACD,IAAI,MAAM,CAAC,KAAK,EAAE;oBACjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;iBACjC;gBACD,OAAO;aACP;SACD;aAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,YAAY,MAAM,EAAE;YACvH,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;SAC7B;aAAM,IAAI,KAAK,YAAY,WAAW,EAAE;YACxC,KAAK,GAAI,KAAa,CAAC,MAAM,CAAC;SAC9B;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SAChD;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SAClE;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACtG;IACF,CAAC;IAED,OAAO,CAAC,CAAS,EAAE,CAAS,EAAE,OAAe,EAAE,OAAe,EAAE,QAAgB,EAAE,UAAkB,EAAE,QAAgB,EAAE,gBAAyB,KAAK;QACrJ,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,IAAI,KAAK,CAAC,CAAC;IACtG,CAAC;IAQD,IAAI,CAAC,GAAG,IAAS;QAChB,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;YAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,MAAM,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;YACpE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACvD;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;SAClC;aAAM;YACN,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SACpB;IACF,CAAC;IAED,QAAQ,CAAC,CAAS,EAAE,CAAS,EAAE,KAAa,EAAE,MAAc;QAC3D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,CAAS,EAAE,CAAS,EAAE,QAAgB;QAC5D,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACjC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;SACjD;aAAM;YACN,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACvC;IACF,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,EAAU;QAC1D,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,WAAW;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACnC,CAAC;IAMD,aAAa,CAAC,GAAG,IAAI;QACpB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACpD;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACzE;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE;YAC1D,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACzF;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAMD,eAAe,CAAC,GAAG,IAAI;QACtB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACtD;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE;YAC1D,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACtE;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,CAAC,CAAS,EAAE,CAAS;QAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED,WAAW,CAAC,IAAY;QACvB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,CAAS,EAAE,CAAS;QAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC;IAQD,YAAY,CAAC,GAAG,IAAI;QACnB,IAAI,CAAC,IAAI,EAAE;YACV,OAAO;SACP;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAQ,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACzD;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7F;IACF,CAAC;IAED,gBAAgB,CAAC,GAAW,EAAE,GAAW,EAAE,CAAS,EAAE,CAAS;QAC9D,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,KAAa,EAAE,MAAc;QACvD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAIM,SAAS,CAAC,CAAU,EAAE,CAAU,EAAE,KAAc,EAAE,MAAe,EAAE,KAAc;QACvF,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,eAAe,CAAC,EAAU,IAAS,CAAC;IAEpC,cAAc;QACb,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAED,OAAO;QACN,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,KAAa;QACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI;QACH,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,CAAS,EAAE,CAAS;QACzB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,CAAC;IAMD,kBAAkB,CAAC,IAAa,IAAS,CAAC;IAE1C,WAAW,CAAC,QAAkB;QAC7B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS;QAC5E,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;IAID,MAAM,CAAC,IAAa;QACnB,IAAI,IAAI,EAAE;YACT,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACjC;aAAM;YACN,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;SACtB;IACF,CAAC;IAED,UAAU,CAAC,CAAS,EAAE,CAAS,EAAE,KAAa,EAAE,MAAc;QAC7D,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,UAAU,CAAC,IAAY,EAAE,CAAS,EAAE,CAAS,EAAE,QAAiB;QAC/D,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACjC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;SACnD;aAAM;YACN,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACzC;IACF,CAAC;IAED,SAAS,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS;QACzE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,SAAS,CAAC,CAAS,EAAE,CAAS;QAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;;AA9qBa,gCAAO,GAAG,IAAI,CAAC;AAG7B;IACC,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,gDAAgD;IAChD,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,0BAA0B,CAAC;AACvD,CAAC,GAAA,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasRenderingContext2D/index.ts"],"names":[],"mappings":"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"}

package/Canvas2D/DOMMatrix/index.js CHANGED Viewed

@@ -3,10 +3,13 @@ let ctor;
 export class DOMMatrix {
     constructor(instance) {
         if (Array.isArray(instance)) {
-            this._native = new ctor(instance);
+            this._native = new global.CanvasModule.DOMMatrix(instance);
         }
         else if (!instance) {
-            this._native = new ctor();
+            this._native = new global.CanvasModule.DOMMatrix();
+        }
+        else {
+            this._native = instance;
         }
     }
     get native() {
@@ -176,6 +179,5 @@ export class DOMMatrix {
 }
 (() => {
     Helpers.initialize();
-    ctor = global.CanvasModule.DOMMatrix;
 })();
 //# sourceMappingURL=index.js.map

package/Canvas2D/DOMMatrix/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/DOMMatrix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,IAAI,IAAI,CAAC;AAET,MAAM,OAAO,SAAS;~~IAMrB~~,YAAY,QAAS;QACpB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC5B,IAAI,CAAC,OAAO,GAAG,IAAI,~~IAAI~~,CAAC,QAAQ,CAAC,CAAC;~~SAClC~~;aAAM,IAAI,CAAC,QAAQ,EAAE;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,~~IAAI~~,EAAE,CAAC;~~SAC1B~~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~~AAnOA~~;IACC,OAAO,CAAC,UAAU,EAAE,CAAC;~~IACrB~~,~~IAAI,GAAG,MAAM,~~CAAC,~~YAAY,CAAC,SAAS,CAAC;AACtC,CAAC,~~GAAA,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/DOMMatrix/index.ts"],"names":[],"mappings":"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"}

package/Dom/Dom.js CHANGED Viewed

@@ -17,9 +17,14 @@ export class Dom extends LayoutBase {
         this._addView(this._canvas);
     }
     _ready(args) {
-        this._children.forEach((child) => {
+        console.time('_ready');
+        for (const child of this._children) {
             child.draw();
-        });
+        }
+        // this._children.forEach((child) => {
+        // 	child.draw();
+        // });
+        console.timeEnd('_ready');
     }
     _addViewToNativeVisualTree(view, atIndex) {
         if (view === this._canvas) {

package/Dom/Dom.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Dom.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Dom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAY,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,MAAM,OAAO,GAAI,SAAQ,UAAU;IAIlC;QACC,KAAK,EAAE,CAAC;QAHT,cAAS,GAAG,EAAE,CAAC;QAId,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;IAED,cAAc;QACb,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,IAAe;QACrB,~~IAAI~~,CAAC,~~SAAS~~,CAAC,~~OAAO~~,CAAC,CAAC,KAAK,~~EAAE~~,EAAE;~~YAChC~~,KAAK,CAAC,IAAI,EAAE,CAAC;~~QACd~~,CAAC,CAAC,CAAC;~~IACJ~~,CAAC;IACD,0BAA0B,CAAC,IAAc,EAAE,OAAgB;QAC1D,IAAI,IAAI,KAAK,IAAI,CAAC,OAAO,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;SACZ;aAAM,IAAI,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,EAAE;YAC1D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD"}
1	+ {"version":3,"file":"Dom.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Dom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAY,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,MAAM,OAAO,GAAI,SAAQ,UAAU;IAIlC;QACC,KAAK,EAAE,CAAC;QAHT,cAAS,GAAG,EAAE,CAAC;QAId,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;IAED,cAAc;QACb,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,IAAe;QACrB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE;YACnC,KAAK,CAAC,IAAI,EAAE,CAAC;SACb;QAED,sCAAsC;QACtC,iBAAiB;QACjB,MAAM;QACN,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IACD,0BAA0B,CAAC,IAAc,EAAE,OAAgB;QAC1D,IAAI,IAAI,KAAK,IAAI,CAAC,OAAO,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;SACZ;aAAM,IAAI,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,EAAE;YAC1D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD"}

package/Dom/Group.d.ts CHANGED Viewed

@@ -5,17 +5,17 @@ export declare const originProperty: ShorthandProperty<Style, {
     x: number;
     y: number;
 }>;
-export declare const transformProperty: Property<Group, any>;
+export declare const transformProperty: Property<Group, any[]>;
 export declare class Group extends Paint {
     _children: Set<Paint>;
     _matrix: DOMMatrix;
-    origin: {
-        x: number;
-        y: number;
-    };
-    transform: any;
+    originX: number;
+    originY: number;
+    transform: any[];
     constructor();
+    set origin(value: any);
+    get origin(): any;
     draw(): void;
-    _addViewToNativeVisualTree(view: ViewBase, atIndex?: number): boolean;
+    _addViewToNativeVisualTree(view: ViewBase, _atIndex?: number): boolean;
     _removeViewFromNativeVisualTree(view: ViewBase): void;
 }

package/Dom/Group.js CHANGED Viewed

@@ -19,10 +19,10 @@ export const originProperty = new ShorthandProperty({
         const type = typeof value;
         if (type === 'string') {
             try {
-                const val = JSON.parse(value);
+                const val = JSON.parse(JSON.stringify(value));
                 return [
-                    [originXProperty, val.x],
-                    [originYProperty, val.y],
+                    [originXProperty, val.x ?? 0],
+                    [originYProperty, val.y ?? 0],
                 ];
             }
             catch (error) { }
@@ -68,9 +68,21 @@ M11 = 0,
     M43 = 14,
     M44 = 15,
 */
-function parseTransformation(value, transform) {
+function parseTransformation(value, _transform) {
     /*
-        {matrix: number[]}, {perspective: number}, {rotate: string}, {rotateX: string}, {rotateY: string}, {rotateZ: string}, {scale: number}, {scaleX: number}, {scaleY: number}, {translateX: number}, {translateY: number}, {skewX: string}, {skewY: string}
+        {matrix: number[]},
+         {perspective: number},
+          {rotate: string},
+          {rotateX: string},
+           {rotateY: string},
+            {rotateZ: string},
+            {scale: number},
+            {scaleX: number},
+             {scaleY: number},
+              {translateX: number},
+              {translateY: number},
+               {skewX: string},
+                {skewY: string}
         */
     const matrix = value.matrix;
     if (Array.isArray(matrix)) {
@@ -119,47 +131,61 @@ function parseTransformation(value, transform) {
         return;
     }
     const skewX = value.skewX;
+    if (typeof skewX === 'number') {
+        _transform.c = skewX;
+    }
     if (typeof skewX === 'string') {
         return;
     }
-    const skewY = value.translateY;
+    const skewY = value.skewY;
+    if (typeof skewY === 'number') {
+        _transform.b = skewY;
+    }
     if (typeof skewY === 'string') {
         return;
     }
 }
-[{ skewX: Math.PI / 6 }];
 export class Group extends Paint {
     constructor() {
         super();
         this._children = new Set();
+        this.originX = 0;
+        this.originY = 0;
     }
     [transformProperty.setNative](value) {
-        if (typeof value === 'string') {
-            try {
-                const val = JSON.parse(JSON.stringify(value));
-                const matrix = new DOMMatrix();
-                if (Array.isArray(val)) {
-                    val.forEach((item) => {
-                        parseTransformation(val, matrix);
-                    });
-                }
-                this._matrix = matrix;
-            }
-            catch (error) { }
+        if (Array.isArray(value)) {
+            const matrix = new DOMMatrix();
+            value.forEach((item) => {
+                parseTransformation(item, matrix);
+            });
+            this._matrix = matrix;
         }
     }
+    set origin(value) {
+        // @ts-ignore
+        this.style.origin = value;
+    }
+    get origin() {
+        // @ts-ignore
+        return this.style.origin;
+    }
     draw() {
         if (this._children.size > 0) {
             const context = this._canvas.getContext('2d');
             context.save();
-            context.translate(this.originX, this.originY);
+            const origin = this.origin;
+            context.translate(origin.x ?? 0, origin.y ?? 0);
+            if (this._matrix) {
+                context.setTransform(this._matrix);
+            }
+            context.lineWidth = this.strokeWidth;
             this._children.forEach((child) => {
                 child.draw();
             });
             context.restore();
         }
     }
-    _addViewToNativeVisualTree(view, atIndex) {
+    _addViewToNativeVisualTree(view, _atIndex) {
         if (view instanceof Paint || view instanceof Image) {
             view._addCanvas(this._canvas);
             view._inGroup = true;

package/Dom/Group.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,QAAQ,EAAE,iBAAiB,EAAE,KAAK,EAAY,MAAM,oBAAoB,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAmB;IAC5D,IAAI,EAAE,QAAQ;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,iBAAiB,CAAkC;IACpF,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE;QACP,MAAM,IAAI,GAAG,IAAW,CAAC;QACzB,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7C,CAAC;IACD,SAAS,CAAC,KAAU;QACnB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;YAC1C,OAAO,EAAE,CAAC;SACV;QACD,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC;QAC1B,IAAI,IAAI,KAAK,QAAQ,EAAE;YACtB,IAAI;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAY,CAAC,CAAC;~~gBACrC~~,OAAO;oBACN,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;~~oBACxB~~,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;~~iBACxB~~,CAAC;aACF;YAAC,OAAO,KAAK,EAAE,GAAE;SAClB;QAED,IAAI,IAAI,KAAK,QAAQ,EAAE;YACtB,OAAO;gBACN,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;gBAC1B,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;aAC1B,CAAC;SACF;QAED,OAAO,EAAE,CAAC;IACX,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,QAAQ,~~CAAa~~;~~IACzD~~,IAAI,EAAE,WAAW;CACjB,CAAC,CAAC;AAEH;;;;;;;;;;EAUE;AAEF;;;;;;;;;;;;;;;;;EAiBE;AAEF,SAAS,mBAAmB,CAAC,KAAK,EAAE,~~SAAoB~~;~~IACvD;;UAEG~~;IAEH,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAC1B,OAAO;QACP,oCAAoC;QACpC,OAAO;KACP;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;IAEtC,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACpC,OAAO;KACP;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC/B,OAAO;KACP;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAE9B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAChC,OAAO;KACP;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAE9B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAChC,OAAO;KACP;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAE9B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAChC,OAAO;KACP;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAE1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC9B,OAAO;KACP;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC/B,OAAO;KACP;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC/B,OAAO;KACP;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;IAEpC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QACnC,OAAO;KACP;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;IAEpC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QACnC,OAAO;KACP;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAE1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC9B,OAAO;KACP;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,~~UAAU~~,CAAC;~~IAE/B~~,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC9B,~~OAAO;KACP;AACF~~,CAAC~~;AAED~~,CAAC,~~EAAE~~,KAAK,~~EAAE~~,IAAI,~~CAAC~~,~~EAAE~~,~~GAAG~~,~~CAAC~~,EAAE,~~CAAC~~,CAAC;~~AAEzB~~,MAAM,OAAO,KAAM,SAAQ,KAAK;~~IAM~~/B;QACC,KAAK,EAAE,CAAC;~~QANT~~,cAAS,GAAe,IAAI,GAAG,EAAE,CAAC;~~IAOlC~~,CAAC;IACD,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,KAAK;QAClC,IAAI,~~OAAO,~~KAAK,~~KAAK,QAAQ,EAAE;YAC9B,IAAI;gBACH,MAAM,GAAG,GAAG,IAAI,~~CAAC,~~KAAK~~,CAAC,~~IAAI,CAAC,SAAS,CAAC,~~KAAK,CAAC,~~CAAU,CAAC~~;~~gBAEvD~~,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;~~gBAE~~/B,~~IAAI,~~KAAK,CAAC,OAAO,CAAC,~~GAAG,~~CAAC,EAAE;~~oBACvB~~,~~GAAG~~,CAAC,~~OAAO~~,CAAC,CAAC,~~IAAI~~,~~EAAE~~,~~EAAE~~;~~wBACpB~~,~~mBAAmB~~,CAAC,GAAG,~~EAAE,~~MAAM,CAAC,CAAC;~~oBAClC~~,~~CAAC~~,CAAC,~~CAAC~~;~~iBACH~~;~~gBAED~~,IAAI,CAAC,~~OAAO~~,~~GAAG~~,MAAM,CAAC;~~aACtB~~;~~YAAC~~,OAAO,KAAK,~~EAAE~~,~~GAAE~~;~~SAClB;IACF~~,CAAC;~~IACD~~,IAAI;QACH,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;YACjF,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;~~YAC9C~~,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChC,KAAK,CAAC,IAAI,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;~~YACH~~,OAAO,CAAC,OAAO,EAAE,CAAC;SAClB;IACF,CAAC;IAED,0BAA0B,CAAC,IAAc,EAAE,~~OAAgB~~;~~QAC1D~~,IAAI,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,EAAE;YACnD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,IAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC;SAChC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IACD,+BAA+B,CAAC,IAAc;QAC5C,IAAY,CAAC,QAAQ,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAW,CAAC,CAAC;QACnC,KAAK,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;CACD;AAED,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC/B,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC/B,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}
1	+ {"version":3,"file":"Group.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Group.ts"],"names":[],"mappings":"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"}

package/Dom/Image.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Property, View, Screen } from '@nativescript/core';
+import { Property, View } from '@nativescript/core';
 const xProperty = new Property({
     name: 'x',
     valueConverter(value) {
@@ -23,8 +23,7 @@ export class Image extends View {
             return;
         }
         const context = this._canvas.getContext('2d');
-        const scale = Screen.mainScreen.scale;
-        context.drawImage(this.image, this.x * scale, this.y * scale, this.width * scale, this.height * scale);
+        context.drawImage(this.image, this.x, this.y, this.width, this.height);
     }
 }
 imageProperty.register(Image);

package/Dom/Image.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,QAAQ,EAAE,IAAI,~~EAAY~~,MAAM,~~EAAE,MAAM,~~oBAAoB,CAAC;AAI/F,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAgB;IAC7C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAgB;IAC7C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAa;IAC9C,IAAI,EAAE,OAAO;CACb,CAAC,CAAC;AAEH,MAAM,OAAO,KAAM,SAAQ,IAAI;IAO9B,UAAU,CAAC,MAAc;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAID,IAAI;QACH,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,OAAO;SACP;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAQ,CAAC;~~QACrD~~,~~MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;QAEtC,~~OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,KAAY,EAAE,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,KAAK,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,MAAM,~~GAAG,KAAK,~~CAAC,CAAC;IAC/G,CAAC;CACD;AAED,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC9B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC1B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}
1	+ {"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,QAAQ,EAAE,IAAI,EAAoB,MAAM,oBAAoB,CAAC;AAI/F,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAgB;IAC7C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAgB;IAC7C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAa;IAC9C,IAAI,EAAE,OAAO;CACb,CAAC,CAAC;AAEH,MAAM,OAAO,KAAM,SAAQ,IAAI;IAO9B,UAAU,CAAC,MAAc;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAID,IAAI;QACH,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,OAAO;SACP;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAQ,CAAC;QAErD,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,KAAY,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/E,CAAC;CACD;AAED,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC9B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC1B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}

package/Dom/Paint.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export declare class Paint extends LayoutBase {
     paintStyle: 'fill' | 'stroke';
     _paintStyleDirty: boolean;
     _inGroup: boolean;
+    _getStrokeWidth(): any;
     _getPaintStyle(): any;
     _getColor(): any;
     draw(): void;

package/Dom/Paint.js CHANGED Viewed

@@ -7,6 +7,7 @@ export const strokeWidthProperty = new Property({
     name: 'strokeWidth',
     defaultValue: 1,
 });
+const defaultColor = new Color('black');
 export class Paint extends LayoutBase {
     constructor() {
         super(...arguments);
@@ -19,6 +20,9 @@ export class Paint extends LayoutBase {
     [paintStyleProperty.setNative](value) {
         this._paintStyleDirty = true;
     }
+    _getStrokeWidth() {
+        return this.parent?.strokeWidth ?? this.strokeWidth;
+    }
     _getPaintStyle() {
         const paintStyle = this.paintStyle;
         if (paintStyle !== 'fill') {
@@ -30,9 +34,9 @@ export class Paint extends LayoutBase {
         return 'fill';
     }
     _getColor() {
-        const color = this.color ?? new Color('black');
+        const color = this.color ?? defaultColor;
         const hex = color.hex;
-        if (color.name !== 'black' || hex !== '#000000') {
+        if (color.name !== 'black' && hex !== '#000000') {
             return hex;
         }
         return this.parent?.color?.hex ?? hex;
@@ -40,16 +44,18 @@ export class Paint extends LayoutBase {
     draw() {
         const color = this._getColor();
         const context = this._canvas.getContext('2d');
-        context.lineWidth = this.strokeWidth;
         const style = this._getPaintStyle();
+        context.closePath();
         if (style === 'fill') {
             context.fillStyle = color;
             context.fill();
         }
         else if (style === 'stroke') {
+            context.lineWidth = this._getStrokeWidth();
             context.strokeStyle = color;
             context.stroke();
         }
+        context.beginPath();
     }
 }
 paintStyleProperty.register(Paint);

package/Dom/Paint.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Paint.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Paint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGjE,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,QAAQ,CAA2B;IACxE,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,MAAM;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,QAAQ,CAAgB;IAC9D,IAAI,EAAE,aAAa;IACnB,YAAY,EAAE,CAAC;CACf,CAAC,CAAC;AAEH,MAAM,OAAO,KAAM,SAAQ,UAAU;IAArC;;QASC,qBAAgB,GAAG,KAAK,CAAC;QAEzB,aAAQ,GAAG,KAAK,CAAC;~~IA2ClB~~,CAAC;~~IAnDA~~,UAAU,CAAC,MAAc;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAQD,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,KAAK;QACnC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,cAAc;QACb,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,UAAU,KAAK,MAAM,EAAE;YAC1B,OAAO,UAAU,CAAC;SAClB;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAQ,IAAI,CAAC,MAAc,CAAC,UAAU,CAAC;SACvC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAED,SAAS;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,~~IAAI~~,~~KAAK,~~CAAC~~,OAAO,CAAC,CAAC~~;~~QAC/C~~,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;QACtB,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,KAAK,SAAS,EAAE;YAChD,OAAO,GAAG,CAAC;SACX;QACD,OAAQ,IAAI,CAAC,MAAc,EAAE,KAAK,EAAE,GAAG,IAAI,GAAG,CAAC;IAChD,CAAC;IAED,IAAI;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QAEjF,~~OAAO~~,~~CAAC~~,~~SAAS,~~GAAG,IAAI,CAAC,~~WAAW~~,CAAC;~~QAErC~~,~~MAAM~~,~~KAAK,GAAG,IAAI,~~CAAC,~~cAAc~~,EAAE,CAAC;~~QAEpC~~,IAAI,KAAK,KAAK,MAAM,EAAE;YACrB,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;YAC1B,OAAO,CAAC,IAAI,EAAE,CAAC;SACf;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;YAC5B,OAAO,CAAC,MAAM,EAAE,CAAC;SACjB;~~IACF~~,CAAC;CACD;AAED,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACnC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}
1	+ {"version":3,"file":"Paint.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Paint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGjE,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,QAAQ,CAA2B;IACxE,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,MAAM;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,QAAQ,CAAgB;IAC9D,IAAI,EAAE,aAAa;IACnB,YAAY,EAAE,CAAC;CACf,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AACxC,MAAM,OAAO,KAAM,SAAQ,UAAU;IAArC;;QASC,qBAAgB,GAAG,KAAK,CAAC;QAEzB,aAAQ,GAAG,KAAK,CAAC;IAiDlB,CAAC;IAzDA,UAAU,CAAC,MAAc;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACvB,CAAC;IAQD,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,KAAK;QACnC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,eAAe;QACd,OAAQ,IAAI,CAAC,MAAc,EAAE,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC;IAC9D,CAAC;IACD,cAAc;QACb,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,UAAU,KAAK,MAAM,EAAE;YAC1B,OAAO,UAAU,CAAC;SAClB;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAQ,IAAI,CAAC,MAAc,CAAC,UAAU,CAAC;SACvC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAED,SAAS;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC;QACzC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;QACtB,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,KAAK,SAAS,EAAE;YAChD,OAAO,GAAG,CAAC;SACX;QACD,OAAQ,IAAI,CAAC,MAAc,EAAE,KAAK,EAAE,GAAG,IAAI,GAAG,CAAC;IAChD,CAAC;IAED,IAAI;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QAEjF,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEpC,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpB,IAAI,KAAK,KAAK,MAAM,EAAE;YACrB,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;YAC1B,OAAO,CAAC,IAAI,EAAE,CAAC;SACf;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC3C,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;YAC5B,OAAO,CAAC,MAAM,EAAE,CAAC;SACjB;QAED,OAAO,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;CACD;AAED,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACnC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}

package/Dom/Text.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Property, Screen } from '@nativescript/core';
+import { Property } from '@nativescript/core';
 import { Paint } from './Paint';
 const xProperty = new Property({
     name: 'x',
@@ -25,7 +25,6 @@ export class Text extends Paint {
             return;
         }
         const context = this._canvas.getContext('2d');
-        const scale = Screen.mainScreen.scale;
         if (typeof this._font === 'string') {
             context.font = this._font;
         }
@@ -34,12 +33,12 @@ export class Text extends Paint {
         switch (style) {
             case 'fill':
                 context.fillStyle = color;
-                context.fillText(this.text, this.x * scale, this.y * scale);
+                context.fillText(this.text, this.x, this.y);
                 break;
             case 'stroke':
                 context.strokeStyle = color;
                 context.lineWidth = this.strokeWidth;
-                context.strokeText(this.text, this.x * scale, this.y * scale);
+                context.strokeText(this.text, this.x, this.y);
                 break;
         }
     }

package/Dom/Text.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Text.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,~~EAAE~~,MAAM,~~EAAE,MAAM,~~oBAAoB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IAC5C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IAC5C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAe;IAC/C,IAAI,EAAE,MAAM;CACZ,CAAC,CAAC;AAEH,MAAM,OAAO,IAAK,SAAQ,KAAK;IAK9B,IAAI,IAAI,CAAC,KAAK;QACb,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,IAAI;QACH,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;YAClC,OAAO;SACP;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAQ,CAAC;~~QACrD~~,~~MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;QAEtC,~~IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE;YACnC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;SAC1B;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,QAAQ,KAAK,EAAE;YACd,KAAK,MAAM;gBACV,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;gBAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~CAAC,CAAC;~~gBAC5D~~,MAAM;YACP,KAAK,QAAQ;gBACZ,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;gBAC5B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;gBACrC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~CAAC,CAAC;~~gBAC9D~~,MAAM;SACP;IACF,CAAC;CACD;AAED,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC5B,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACzB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC"}
1	+ {"version":3,"file":"Text.js","sourceRoot":"","sources":["../../../../packages/canvas/Dom/Text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAU,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IAC5C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IAC5C,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAe;IAC/C,IAAI,EAAE,MAAM;CACZ,CAAC,CAAC;AAEH,MAAM,OAAO,IAAK,SAAQ,KAAK;IAK9B,IAAI,IAAI,CAAC,KAAK;QACb,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,IAAI;QACH,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;YAClC,OAAO;SACP;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAQ,CAAC;QAErD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE;YACnC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;SAC1B;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,QAAQ,KAAK,EAAE;YACd,KAAK,MAAM;gBACV,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;gBAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC5C,MAAM;YACP,KAAK,QAAQ;gBACZ,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;gBAC5B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;gBACrC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9C,MAAM;SACP;IACF,CAAC;CACD;AAED,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC5B,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACzB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC"}

package/Dom/shapes/Circle.js CHANGED Viewed

@@ -70,7 +70,7 @@ export class Circle extends Paint {
                         break;
                     case 'stroke':
                         context.strokeStyle = color;
-                        context.lineWidth = child.strokeWidth;
+                        context.lineWidth = child._getStrokeWidth();
                         context.stroke();
                         break;
                 }

package/Dom/shapes/Circle.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Circle.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Circle.ts"],"names":[],"mappings":"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~~WAAW~~,CAAC;~~wBACtC~~,OAAO,CAAC,MAAM,EAAE,CAAC;wBACjB,MAAM;iBACP;YACF,CAAC,CAAC,CAAC;SACH;aAAM;YACN,KAAK,CAAC,IAAI,EAAE,CAAC;SACb;IACF,CAAC;IAED,0BAA0B,CAAC,IAAc,EAAE,OAAgB;QAC1D,IAAI,IAAI,KAAK,IAAI,CAAC,OAAO,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;SACZ;aAAM,IAAI,IAAI,YAAY,KAAK,EAAE;YACjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAED,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC5B,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC5B,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC3B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC"}
1	+ {"version":3,"file":"Circle.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Circle.ts"],"names":[],"mappings":"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"}

package/Dom/shapes/Path.js CHANGED Viewed

@@ -22,6 +22,7 @@ export class Path extends Paint {
             context.fill(this._path);
         }
         else if (style === 'stroke') {
+            context.lineWidth = this.strokeWidth;
             context.strokeStyle = this.color.hex;
             context.stroke(this._path);
         }

package/Dom/shapes/Path.js.map CHANGED Viewed

	@@ -1 +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;CACZ,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,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"}
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;CACZ,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"}

package/Dom/shapes/Rect.js CHANGED Viewed

@@ -33,7 +33,7 @@ export class Rect extends Paint {
         const context = this._canvas.getContext('2d');
         context.rect(this.x, this.y, this.width, this.height);
         if (this._children.length > 0) {
-            this._children.forEach((child) => {
+            for (const child of this._children) {
                 switch (child.paintStyle) {
                     case 'fill':
                         context.fillStyle = child.color.hex;
@@ -45,7 +45,7 @@ export class Rect extends Paint {
                         context.stroke();
                         break;
                 }
-            });
+            }
         }
         else {
             super.draw();

package/Dom/shapes/Rect.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Rect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAA8B,MAAM,oBAAoB,CAAC;AAEzF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAe;IACvD,IAAI,EAAE,OAAO;IACb,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAe;IACxD,IAAI,EAAE,QAAQ;IACd,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,IAAK,SAAQ,KAAK;IAA/B;;QAMC,cAAS,GAAY,EAAE,CAAC;~~IA+BzB~~,CAAC;~~IA7BA~~,IAAI;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QACjF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;~~QAEtD~~,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9B,~~IAAI~~,~~CAAC~~,~~SAAS~~,~~CAAC~~,~~OAAO~~,CAAC,~~CAAC~~,~~KAAK,~~EAAE~~,EAAE~~;~~gBAChC~~,QAAQ,KAAK,CAAC,UAAU,EAAE;oBACzB,KAAK,MAAM;wBACV,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;wBACpC,OAAO,CAAC,IAAI,EAAE,CAAC;wBACf,MAAM;oBACP,KAAK,QAAQ;wBACZ,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;wBACtC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC;wBACtC,OAAO,CAAC,MAAM,EAAE,CAAC;wBACjB,MAAM;iBACP;~~YACF,CAAC,CAAC,CAAC~~;~~SACH~~;aAAM;YACN,KAAK,CAAC,IAAI,EAAE,CAAC;SACb;IACF,CAAC;IAED,0BAA0B,CAAC,IAAc,EAAE,OAAgB;QAC1D,IAAI,IAAI,YAAY,KAAK,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAED,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACzB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC"}
1	+ {"version":3,"file":"Rect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/Rect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAA8B,MAAM,oBAAoB,CAAC;AAEzF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAe;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAe;IACvD,IAAI,EAAE,OAAO;IACb,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,QAAQ,CAAe;IACxD,IAAI,EAAE,QAAQ;IACd,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,IAAK,SAAQ,KAAK;IAA/B;;QAMC,cAAS,GAAY,EAAE,CAAC;IA8BzB,CAAC;IA5BA,IAAI;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAoC,CAAC;QACjF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE;gBACnC,QAAQ,KAAK,CAAC,UAAU,EAAE;oBACzB,KAAK,MAAM;wBACV,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;wBACpC,OAAO,CAAC,IAAI,EAAE,CAAC;wBACf,MAAM;oBACP,KAAK,QAAQ;wBACZ,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;wBACtC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC;wBACtC,OAAO,CAAC,MAAM,EAAE,CAAC;wBACjB,MAAM;iBACP;aACD;SACD;aAAM;YACN,KAAK,CAAC,IAAI,EAAE,CAAC;SACb;IACF,CAAC;IAED,0BAA0B,CAAC,IAAc,EAAE,OAAgB;QAC1D,IAAI,IAAI,YAAY,KAAK,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAED,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACzB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC"}

package/Dom/shapes/RoundedRect.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Property, Screen } from '@nativescript/core';
+import { Property } from '@nativescript/core';
 import { Paint } from '../Paint';
 import { Shadow } from '../Shadow';
 const xProperty = new Property({
@@ -25,10 +25,9 @@ export class RoundedRect extends Paint {
         this._children = [];
     }
     draw() {
-        const scale = Screen.mainScreen.scale;
         const context = this._canvas.getContext('2d');
         const color = this._getColor();
-        context.roundRect(this.x * scale, this.y * scale, this.width * scale, this.height * scale, this.r * scale);
+        context.roundRect(this.x, this.y, this.width, this.height, this.r);
         if (this._children.length > 0) {
             this._children.forEach((child) => {
                 const child_color = child._getColor();
@@ -40,9 +39,9 @@ export class RoundedRect extends Paint {
                             const dy = context.shadowOffsetY;
                             const blur = context.shadowBlur;
                             const shadowColor = context.shadowColor;
-                            context.shadowOffsetX = child.dx * scale;
-                            context.shadowOffsetY = child.dy * scale;
-                            context.shadowBlur = child.blur * scale;
+                            context.shadowOffsetX = child.dx;
+                            context.shadowOffsetY = child.dy;
+                            context.shadowBlur = child.blur;
                             context.shadowColor = child_color;
                             context.fill();
                             context.shadowOffsetX = dx;
@@ -62,9 +61,9 @@ export class RoundedRect extends Paint {
                             const dy = context.shadowOffsetY;
                             const blur = context.shadowBlur;
                             const shadowColor = context.shadowColor;
-                            context.shadowOffsetX = child.dx * scale;
-                            context.shadowOffsetY = child.dy * scale;
-                            context.shadowBlur = child.blur * scale;
+                            context.shadowOffsetX = child.dx;
+                            context.shadowOffsetY = child.dy;
+                            context.shadowBlur = child.blur;
                             context.shadowColor = child_color;
                             context.stroke();
                             context.shadowOffsetX = dx;

package/Dom/shapes/RoundedRect.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RoundedRect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/RoundedRect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,~~EAA8B~~,MAAM,~~EAAE,MAAM,~~oBAAoB,CAAC;AAEjG,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAsB;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAsB;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAsB;IACnD,IAAI,EAAE,GAAG;IACT,cAAc,CAAC,KAAK;QACnB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,OAAO,WAAY,SAAQ,KAAK;IAAtC;;QAOC,cAAS,GAAY,EAAE,CAAC;~~IA0EzB~~,CAAC;~~IAxEA~~,IAAI;QACH,MAAM,~~KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;QACtC,MAAM,~~OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAQ,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,KAAK,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,MAAM,~~GAAG,KAAK,~~EAAE,IAAI,CAAC,CAAC,~~GAAG,KAAK,~~CAAC,CAAC;~~QAC3G~~,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChC,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;gBACtC,QAAQ,KAAK,CAAC,UAAU,EAAE;oBACzB,KAAK,MAAM;wBACV,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;wBAC1B,IAAI,KAAK,YAAY,MAAM,EAAE;4BAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;4BACjC,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;4BACjC,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;4BAChC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;4BAExC,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,EAAE,~~GAAG,KAAK,~~CAAC;~~4BACzC~~,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,EAAE,~~GAAG,KAAK,~~CAAC;~~4BACzC~~,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,~~GAAG,KAAK,~~CAAC;~~4BACxC~~,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;4BAElC,OAAO,CAAC,IAAI,EAAE,CAAC;4BAEf,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;4BAC3B,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;4BAC3B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;4BAC1B,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;yBAClC;6BAAM;4BACN,OAAO,CAAC,IAAI,EAAE,CAAC;yBACf;wBAED,MAAM;oBACP,KAAK,QAAQ;wBACZ,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;wBAC5B,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC;wBAEtC,IAAI,KAAK,YAAY,MAAM,EAAE;4BAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;4BACjC,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;4BACjC,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;4BAChC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;4BAExC,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,EAAE,~~GAAG,KAAK,~~CAAC;~~4BACzC~~,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,EAAE,~~GAAG,KAAK,~~CAAC;~~4BACzC~~,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,~~GAAG,KAAK,~~CAAC;~~4BACxC~~,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;4BAElC,OAAO,CAAC,MAAM,EAAE,CAAC;4BAEjB,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;4BAC3B,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;4BAC3B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;4BAC1B,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;yBAClC;6BAAM;4BACN,OAAO,CAAC,MAAM,EAAE,CAAC;yBACjB;wBAED,MAAM;iBACP;YACF,CAAC,CAAC,CAAC;SACH;aAAM;YACN,KAAK,CAAC,IAAI,EAAE,CAAC;SACb;IACF,CAAC;IAED,0BAA0B,CAAC,IAAc,EAAE,OAAgB;QAC1D,IAAI,IAAI,YAAY,KAAK,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAED,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAChC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAChC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC"}
1	+ {"version":3,"file":"RoundedRect.js","sourceRoot":"","sources":["../../../../../packages/canvas/Dom/shapes/RoundedRect.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

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

package/platforms/android/canvas-release.aar CHANGED Viewed

Binary file

package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/CanvasNative CHANGED Viewed

Binary file

package/platforms/ios/CanvasNative.xcframework/ios-arm64/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative CHANGED Viewed

Binary file

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/CanvasNative CHANGED Viewed

Binary file

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/dSYMs/CanvasNative.framework.dSYM/Contents/Resources/DWARF/CanvasNative CHANGED Viewed

Binary file

package/platforms/ios/src/cpp/ObjectWrapperImpl.h CHANGED Viewed

@@ -12,17 +12,19 @@
 class ObjectWrapperImpl {
 public:
-    void BindFinalizer(v8::Isolate *isolate, const v8::Local<v8::Object> &object) {
-        v8::HandleScope scopedHandle(isolate);
-        weakHandle_.Reset(isolate, object);
-        weakHandle_.SetWeak(this, Finalizer, v8::WeakCallbackType::kParameter);
-    }
     static void Finalizer(const v8::WeakCallbackInfo<ObjectWrapperImpl> &data) {
         auto *pThis = data.GetParameter();
         pThis->weakHandle_.Reset();
         delete pThis;
     }
+    void BindFinalizer(v8::Isolate *isolate, const v8::Local<v8::Object> &object) {
+        v8::HandleScope scopedHandle(isolate);
+        weakHandle_.Reset(isolate, object);
+        weakHandle_.SetWeak(this, Finalizer, v8::WeakCallbackType::kParameter);
+    }
 private:
     v8::Global<v8::Object> weakHandle_;

package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.cpp CHANGED Viewed

@@ -429,6 +429,10 @@ v8::Local<v8::FunctionTemplate> CanvasRenderingContext2DImpl::GetCtor(v8::Isolat
                                fast_set_transform_overloads_, v8::Local<v8::Value>());
+    tmpl->Set(ConvertToV8String(isolate, "getTransform"),
+              v8::FunctionTemplate::New(isolate, &GetTransform));
     SetFastMethodWithOverLoads(isolate, tmpl, "stroke", Stroke, fast_stroke_overloads_,
                                v8::Local<v8::Value>());
@@ -2007,33 +2011,19 @@ CanvasRenderingContext2DImpl::Fill(const v8::FunctionCallbackInfo<v8::Value> &ar
             if (object != nullptr) {
                 auto rule = args[1]->Uint32Value(context).ToChecked();
-                switch (rule) {
-                    case 0:
-                    case 1:
-                        canvas_native_context_fill_with_path(
-                                ptr->GetContext(),
-                                object->GetPath(), rule);
-                        ptr->UpdateInvalidateState();
-                        break;
-                    default:
-                        break;
-                }
+                canvas_native_context_fill_with_path(
+                        ptr->GetContext(),
+                        object->GetPath(), rule);
+                ptr->UpdateInvalidateState();
             }
         }
     } else if (count == 1) {
-        if (value->IsInt32()) {
-            auto rule = args[1]->Uint32Value(context).ToChecked();
-            switch (rule) {
-                case 0:
-                    canvas_native_context_fill(
-                            ptr->GetContext(),
-                            rule);
-                    ptr->UpdateInvalidateState();
-                    break;
-                default:
-                    break;
-            }
+        if (value->IsUint32()) {
+            auto rule = value->Uint32Value(context).ToChecked();
+            canvas_native_context_fill(
+                    ptr->GetContext(),
+                    rule);
+            ptr->UpdateInvalidateState();
         } else if (value->IsObject()) {
             auto type = GetNativeType(value.As<v8::Object>());
             if (type == NativeType::Path2D) {
@@ -2186,16 +2176,8 @@ CanvasRenderingContext2DImpl::IsPointInPath(const v8::FunctionCallbackInfo<v8::V
         auto x = static_cast<float>(args[0]->NumberValue(context).ToChecked());
         auto y = static_cast<float>(args[1]->NumberValue(context).ToChecked());
         auto rule = args[2]->Uint32Value(context).ToChecked();
-        bool ret = false;
-        switch (rule) {
-            case 0:
-            case 1:
-                ret = canvas_native_context_is_point_in_path(
-                        ptr->GetContext(), x, y, rule);
-                break;
-            default:
-                break;
-        }
+        bool ret = canvas_native_context_is_point_in_path(
+                ptr->GetContext(), x, y, rule);
         args.GetReturnValue().Set(ret);
         return;
     } else if (count == 4 &&
@@ -2210,20 +2192,12 @@ CanvasRenderingContext2DImpl::IsPointInPath(const v8::FunctionCallbackInfo<v8::V
             auto x = static_cast<float>(args[1]->NumberValue(context).ToChecked());
             auto y = static_cast<float>(args[2]->NumberValue(context).ToChecked());
             auto rule = args[3]->Uint32Value(context).ToChecked();
-            bool ret = false;
             if (path != nullptr) {
-                switch (rule) {
-                    case 0:
-                    case 1:
-                        ret = canvas_native_context_is_point_in_path_with_path(
-                                ptr->GetContext(),
-                                path->GetPath(), x, y, rule);
-                        break;
-                    default:
-                        break;
-                }
+                bool ret = canvas_native_context_is_point_in_path_with_path(
+                        ptr->GetContext(),
+                        path->GetPath(), x, y, rule);
                 args.GetReturnValue().Set(ret);
                 return;
@@ -2607,6 +2581,30 @@ CanvasRenderingContext2DImpl::SetTransform(const v8::FunctionCallbackInfo<v8::Va
     }
 }
+void
+CanvasRenderingContext2DImpl::GetTransform(const v8::FunctionCallbackInfo<v8::Value> &args) {
+    CanvasRenderingContext2DImpl *ptr = GetPointer(args.This());
+    auto isolate = args.GetIsolate();
+    auto context = isolate->GetCurrentContext();
+    auto matrix = canvas_native_context_get_transform(ptr->GetContext());
+    auto ret = MatrixImpl::GetCtor(isolate)->GetFunction(context).ToLocalChecked()->NewInstance(
+            context).ToLocalChecked();
+    auto object = new MatrixImpl(matrix);
+    ret->SetAlignedPointerInInternalField(0, object);
+    SetNativeType(ret, NativeType::Matrix);
+    object->BindFinalizer(isolate, ret);
+    args.GetReturnValue().Set(ret);
+}
 void
 CanvasRenderingContext2DImpl::Stroke(const v8::FunctionCallbackInfo<v8::Value> &args) {
     CanvasRenderingContext2DImpl *ptr = GetPointer(args.This());

package/platforms/ios/src/cpp/canvas2d/CanvasRenderingContext2DImpl.h CHANGED Viewed

@@ -1279,6 +1279,9 @@ public:
                 f);
     }
+    static void GetTransform(const v8::FunctionCallbackInfo<v8::Value> &args);
     static void Stroke(const v8::FunctionCallbackInfo<v8::Value> &args);
     static void FastStroke(v8::Local<v8::Object> receiver_obj) {

package/platforms/ios/src/cpp/canvas2d/MatrixImpl.h CHANGED Viewed

@@ -8,7 +8,7 @@
 #include "Helpers.h"
 #include "ObjectWrapperImpl.h"
-class MatrixImpl: ObjectWrapperImpl {
+class MatrixImpl: public ObjectWrapperImpl {
 public:
     MatrixImpl(Matrix* matrix);
     ~MatrixImpl(){

package/platforms/ios/src/cpp/webgl/WebGLRenderingContext.h CHANGED Viewed

@@ -1557,13 +1557,13 @@ public:
             return;
         }
-        DrawArraysImpl(
-                ptr,
+        canvas_native_webgl_draw_arrays(
                 mode,
                 first,
-                count
+                count,
+                ptr->GetState()
         );
+        ptr->UpdateInvalidateState();
     }
     static void DrawElements(const v8::FunctionCallbackInfo<v8::Value> &args);