modern-canvas 0.4.37 → 0.4.39

package/dist/index.cjs

@@ -2496,25 +2496,23 @@ class Transform2D extends Matrix3 {
     return t2d.multiply(this, this);
   }
   skewX(x) {
-    return this.skew(x, 1);
+    return this.skew(x, 0);
   }
   skewY(y) {
-    return this.skew(1, y);
+    return this.skew(0, y);
   }
   skew(x, y) {
     return this.premultiply(Transform2D._t2d.makeSkew(x, y));
   }
   makeSkew(x, y) {
-    const cx = Math.cos(y);
-    const sx = Math.sin(y);
-    const cy = -Math.sin(-x);
-    const sy = Math.cos(-x);
+    const tanX = Math.tan(x);
+    const tanY = Math.tan(y);
     this.set([
-      cx,
-      cy,
+      1,
+      tanY,
       0,
-      sx,
-      sy,
+      tanX,
+      1,
       0,
       0,
       0,
@@ -2563,7 +2561,7 @@ class Transform2D extends Matrix3 {
   scale(x, y, z = 1) {
     return this.premultiply(Transform2D._t2d.makeScale(x, y, z));
   }
-  makeScale(x, y, z = 1) {
+  makeScale(x, y, _z = 1) {
     this.set([
       x,
       0,
@@ -2573,7 +2571,7 @@ class Transform2D extends Matrix3 {
       0,
       0,
       0,
-      z
+      1
     ]);
     return this;
   }
@@ -6453,15 +6451,27 @@ exports.Node = class Node extends CoreObject {
     if (this.is(node) || node.hasParent()) {
       return node;
     }
+    let index = -1;
     switch (internalMode) {
       case "default":
+        index = this._children.findLastIndex((node2) => node2.internalMode === "default");
+        if (index > -1) {
+          index += 1;
+        } else {
+          index = this._children.findIndex((node2) => node2.internalMode === "back");
+        }
+        break;
       case "front": {
-        const targetMode = internalMode === "default" ? "back" : "front";
-        const index = this._children.findIndex((node2) => node2.internalMode === targetMode);
+        index = this._children.findLastIndex((node2) => node2.internalMode === "front");
         if (index > -1) {
-          this._children.splice(index, 0, node);
+          index += 1;
         } else {
-          this._children.push(node);
+          index = this._children.findIndex((node2) => node2.internalMode === "default");
+        }
+        if (index > -1) {
+          index += 1;
+        } else {
+          index = this._children.findIndex((node2) => node2.internalMode === "back");
         }
         break;
       }
@@ -6469,6 +6479,11 @@ exports.Node = class Node extends CoreObject {
         this._children.push(node);
         break;
     }
+    if (index > -1) {
+      this._children.splice(index, 0, node);
+    } else {
+      this._children.push(node);
+    }
     node.internalMode = internalMode;
     node.setParent(this);
     this.emit("appendChild", node);
@@ -10207,7 +10222,7 @@ exports.BaseElement2D = class BaseElement2D extends exports.Node2D {
     const offsetY = originY * height;
     this.transform.identity().translate(-offsetX, -offsetY).scale(this.scale.x, this.scale.y).skew(this.skew.x, this.skew.y).rotate(this.rotation);
     parseCSSTransform(this.style.transform, width, height, this.transform);
-    this.transform.translate(offsetX + this.position.x, offsetY + this.position.y);
+    this.transform.translate(this.position.x, this.position.y).translate(offsetX, offsetY);
   }
   _updateGlobalTransform() {
     super._updateGlobalTransform();
@@ -11231,22 +11246,23 @@ exports.Text2D = class Text2D extends TextureRect2D {
       this._subTextsCount = 0;
     }
     if (this.split) {
-      this.measureResult?.paragraphs.forEach((p) => {
+      this.measure().paragraphs.forEach((p) => {
         p.fragments.forEach((f) => {
           f.characters.forEach((c) => {
-            this.appendChild(
+            this.append(
               new exports.Text2D({
-                content: c.content,
+                internalMode: "front",
                 style: {
                   ...c.computedStyle,
                   left: c.inlineBox.x,
                   top: c.inlineBox.y,
                   width: 0,
-                  height: 0,
-                  effects: this.effects
-                }
-              }),
-              "front"
+                  height: 0
+                },
+                content: c.content,
+                effects: this.effects,
+                fonts: this.fonts
+              })
             );
             this._subTextsCount++;
           });

package/dist/index.d.cts

@@ -565,7 +565,7 @@ declare class Transform2D extends Matrix3 {
     scaleY(y: number): this;
     scale3d(x: number, y: number, z?: number): this;
     scale(x: number, y: number, z?: number): this;
-    makeScale(x: number, y: number, z?: number): this;
+    makeScale(x: number, y: number, _z?: number): this;
     rotateX(x: number): this;
     rotateY(y: number): this;
     rotateZ(z: number): this;

package/dist/index.d.mts

@@ -565,7 +565,7 @@ declare class Transform2D extends Matrix3 {
     scaleY(y: number): this;
     scale3d(x: number, y: number, z?: number): this;
     scale(x: number, y: number, z?: number): this;
-    makeScale(x: number, y: number, z?: number): this;
+    makeScale(x: number, y: number, _z?: number): this;
     rotateX(x: number): this;
     rotateY(y: number): this;
     rotateZ(z: number): this;

package/dist/index.d.ts

@@ -565,7 +565,7 @@ declare class Transform2D extends Matrix3 {
     scaleY(y: number): this;
     scale3d(x: number, y: number, z?: number): this;
     scale(x: number, y: number, z?: number): this;
-    makeScale(x: number, y: number, z?: number): this;
+    makeScale(x: number, y: number, _z?: number): this;
     rotateX(x: number): this;
     rotateY(y: number): this;
     rotateZ(z: number): this;