modern-canvas 0.6.8 → 0.6.10

package/dist/index.cjs

@@ -5776,9 +5776,6 @@ exports.Node = class Node extends CoreObject {
         return false;
     }
   }
-  _update(changed) {
-    super._update(changed);
-  }
   _updateProperty(key, value, oldValue, declaration) {
     super._updateProperty(key, value, oldValue, declaration);
   }
@@ -7104,29 +7101,26 @@ class CanvasContext extends modernPath2d.Path2D {
     }
   }
   stroke(options) {
-    const path = new modernPath2d.Path2D(this);
-    let texture = this._defaultStyle;
-    if (this.strokeStyle) {
-      texture = this._toTexture(this.strokeStyle);
-    }
-    if (this.curves.length) {
-      this._draws.push({
-        ...options,
-        type: "stroke",
-        path,
-        texture,
-        uvTransform: this.uvTransform,
-        vertTransform: this.vertTransform,
-        style: {
-          alignment: 0.5,
-          cap: this.lineCap ?? "butt",
-          join: this.lineJoin ?? "miter",
-          width: this.lineWidth ?? 1,
-          miterLimit: this.miterLimit ?? 10
-        }
-      });
-      super.reset();
+    if (!this.curves.length) {
+      return;
     }
+    const strokeStyle = this.strokeStyle ?? (typeof this.style.stroke === "string" ? this.style.stroke : void 0);
+    this._draws.push({
+      ...options,
+      type: "stroke",
+      path: new modernPath2d.Path2D(this),
+      texture: strokeStyle ? this._toTexture(strokeStyle) : this._defaultStyle,
+      uvTransform: this.uvTransform,
+      vertTransform: this.vertTransform,
+      style: {
+        alignment: 0.5,
+        cap: this.lineCap ?? "butt",
+        join: this.lineJoin ?? "miter",
+        width: this.lineWidth ?? 1,
+        miterLimit: this.miterLimit ?? 10
+      }
+    });
+    super.reset();
   }
   fillRect(x, y, width, height) {
     this.rect(x, y, width, height).fill();
@@ -7135,16 +7129,15 @@ class CanvasContext extends modernPath2d.Path2D {
     this.rect(x, y, width, height).stroke();
   }
   fill(options) {
-    const path = new modernPath2d.Path2D(this);
-    let texture = this._defaultStyle;
-    if (this.fillStyle) {
-      texture = this._toTexture(this.fillStyle);
+    if (!this.curves.length) {
+      return;
     }
+    const fillStyle = this.fillStyle ?? (typeof this.style.fill === "string" ? this.style.fill : void 0);
     this._draws.push({
       ...options,
       type: "fill",
-      path,
-      texture,
+      path: new modernPath2d.Path2D(this),
+      texture: fillStyle ? this._toTexture(fillStyle) : this._defaultStyle,
       uvTransform: this.uvTransform,
       vertTransform: this.vertTransform
     });
@@ -7303,15 +7296,12 @@ exports.CanvasItem = class CanvasItem extends exports.TimelineNode {
   }
   requestRedraw() {
     this._redrawing = true;
-    this.requestUpdate();
   }
   requestRelayout() {
     this._relayouting = true;
-    this.requestUpdate();
   }
   requestRepaint() {
     this._repainting = true;
-    this.requestUpdate();
   }
   _updateGlobalVisible() {
     this._parentGlobalVisible = this.getParent()?.globalVisible;
@@ -7350,22 +7340,14 @@ exports.CanvasItem = class CanvasItem extends exports.TimelineNode {
   _process(delta) {
     super._process(delta);
     const parent = this.getParent();
-    if (this._parentGlobalVisible !== parent?.globalVisible) {
-      this.requestUpdate();
-    }
-    if (this._parentGlobalOpacity !== parent?.globalOpacity) {
-      this.requestUpdate();
-    }
-  }
-  _update(changed) {
-    super._update(changed);
-    const parent = this.getParent();
     if (this._parentGlobalVisible !== parent?.globalVisible) {
       this._updateGlobalVisible();
     }
     if (this._parentGlobalOpacity !== parent?.globalOpacity) {
       this._updateGlobalOpacity();
     }
+  }
+  _updateBatchables() {
     const redrawing = this._redrawing;
     let relayouting = this._relayouting;
     let repainting = this._repainting;
@@ -7394,6 +7376,7 @@ exports.CanvasItem = class CanvasItem extends exports.TimelineNode {
     }
   }
   _render(renderer) {
+    this._updateBatchables();
     this._batchables.forEach((batchable) => {
       batchable.texture?.upload(renderer);
       renderer.batch2D.render({
@@ -9345,15 +9328,13 @@ class BaseElement2DText extends CoreObject {
   draw() {
     const ctx = this.parent.context;
     this.base.update();
-    this.base.paragraphs.forEach((p) => {
-      p.fragments.forEach((f) => {
-        f.characters.forEach((c) => {
-          ctx.fillStyle = c.computedStyle.color;
-          ctx.addPath(c.path);
-          ctx.style.fillRule = "evenodd";
-          ctx.closePath();
-          ctx.fill();
-        });
+    this.base.pathSets.forEach((pathSet) => {
+      pathSet.paths.forEach((path) => {
+        ctx.addPath(path);
+        ctx.style = { ...path.style };
+        ctx.fillStyle = void 0;
+        ctx.strokeStyle = void 0;
+        ctx.fill();
       });
     });
   }
@@ -9402,7 +9383,7 @@ exports.Node2D = class Node2D extends exports.CanvasItem {
     super._updateProperty(key, value, oldValue, declaration);
     switch (key) {
       case "rotation":
-        this.updateGlobalTransform();
+        this.requestRelayout();
         break;
     }
   }
@@ -13597,7 +13578,7 @@ exports.CanvasItemEditor = class CanvasItemEditor extends exports.Control {
     style: {
       width: 500,
       height: 500,
-      backgroundColor: "#FFFFFFFF",
+      backgroundColor: "#00FFFFFF",
       // overflow: 'hidden',
       pointerEvents: "none"
       // boxShadow: '2px 2px 2px 1px rgba(0, 0, 0, 0.2)',

package/dist/index.d.cts

@@ -1667,7 +1667,6 @@ declare class Node extends CoreObject {
     get lastSibling(): Node | undefined;
     canProcess(): boolean;
     canRender(): boolean;
-    protected _update(changed: Map<string, any>): void;
     protected _updateProperty(key: string, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
     protected _onTreeEnter(tree: SceneTree): void;
     protected _onTreeExit(oldTree: SceneTree): void;
@@ -1799,7 +1798,7 @@ declare class CanvasItem extends TimelineNode {
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _repaint(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
-    protected _update(changed: Map<string, any>): void;
+    protected _updateBatchables(): void;
     protected _render(renderer: WebGLRenderer): void;
 }
 

package/dist/index.d.mts

@@ -1667,7 +1667,6 @@ declare class Node extends CoreObject {
     get lastSibling(): Node | undefined;
     canProcess(): boolean;
     canRender(): boolean;
-    protected _update(changed: Map<string, any>): void;
     protected _updateProperty(key: string, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
     protected _onTreeEnter(tree: SceneTree): void;
     protected _onTreeExit(oldTree: SceneTree): void;
@@ -1799,7 +1798,7 @@ declare class CanvasItem extends TimelineNode {
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _repaint(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
-    protected _update(changed: Map<string, any>): void;
+    protected _updateBatchables(): void;
     protected _render(renderer: WebGLRenderer): void;
 }
 

package/dist/index.d.ts

@@ -1667,7 +1667,6 @@ declare class Node extends CoreObject {
     get lastSibling(): Node | undefined;
     canProcess(): boolean;
     canRender(): boolean;
-    protected _update(changed: Map<string, any>): void;
     protected _updateProperty(key: string, value: any, oldValue: any, declaration?: PropertyDeclaration): void;
     protected _onTreeEnter(tree: SceneTree): void;
     protected _onTreeExit(oldTree: SceneTree): void;
@@ -1799,7 +1798,7 @@ declare class CanvasItem extends TimelineNode {
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _repaint(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
-    protected _update(changed: Map<string, any>): void;
+    protected _updateBatchables(): void;
     protected _render(renderer: WebGLRenderer): void;
 }