modern-canvas 0.4.31 → 0.4.33

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { colord, extend } from 'colord';
+import { extend } from 'colord';
 import namesPlugin from 'colord/plugins/names';
-import { normalizeFill, normalizeBackground, normalizeForeground, normalizeGeometry, normalizeOutline, normalizeShadow, getDefaultStyle, normalizeText } from 'modern-idoc';
+import { parseColor, normalizeFill, normalizeBackground, normalizeForeground, normalizeGeometry, normalizeOutline, normalizeShadow, getDefaultStyle, normalizeText } from 'modern-idoc';
 import { Path2D, Path2DSet, svgToDOM, svgToPath2DSet, Matrix3 as Matrix3$1 } from 'modern-path2d';
 import { Text, textDefaultStyle } from 'modern-text';
 import { loadYoga, BoxSizing, PositionType, Edge, Overflow, Gutter, Justify, Wrap, FlexDirection, Display, Direction, Align } from 'yoga-layout/load';
@@ -555,7 +555,17 @@ class CoreObject extends EventEmitter {
     }
   }
   toJSON() {
-    return this.getProperties(Array.from(this._changedProperties));
+    const json = {};
+    const properties = this.getProperties(Array.from(this._changedProperties));
+    for (const key in properties) {
+      const value = properties[key];
+      if (value && typeof value === "object" && "toJSON" in value && typeof value.toJSON === "function") {
+        json[key] = value.toJSON();
+      } else {
+        json[key] = value;
+      }
+    }
+    return json;
   }
   clone() {
     return new this.constructor(this.toJSON());
@@ -1058,27 +1068,7 @@ class Color {
     return this._value;
   }
   set value(value) {
-    if (value === void 0 || this._value === value)
-      return;
-    this._value = value;
-    let input;
-    if (typeof value === "number") {
-      input = {
-        r: value >> 24 & 255,
-        g: value >> 16 & 255,
-        b: value >> 8 & 255,
-        a: (value & 255) / 255
-      };
-    } else {
-      input = value;
-    }
-    const parsed = colord(input);
-    if (parsed.isValid()) {
-      this._colord = parsed;
-    } else {
-      this._colord = colord("#000000");
-      console.warn(`Unable to convert color ${value}`);
-    }
+    this._colord = parseColor(value ?? "none");
   }
   get r8() {
     return this._colord.rgba.r;
@@ -5996,14 +5986,14 @@ let Node = class extends CoreObject {
   remove() {
     this._parent?.removeChild(this);
   }
-  forEach(fn) {
-    this.getChildren().forEach(fn);
+  forEachChild(callbackfn) {
+    this.getChildren().forEach(callbackfn);
     return this;
   }
-  deepForEach(fn) {
+  forEachDescendant(callbackfn) {
     this.getChildren().forEach((child) => {
-      fn(child);
-      child.deepForEach(fn);
+      callbackfn(child);
+      child.forEachDescendant(callbackfn);
     });
     return this;
   }
@@ -7306,6 +7296,11 @@ let CanvasItem = class extends TimelineNode {
   requestRelayout() {
     this._relayouting = true;
     this.requestUpdate();
+    this.forEachChild((node) => {
+      if (node instanceof CanvasItem) {
+        node.requestRelayout();
+      }
+    });
   }
   requestRepaint() {
     this._repainting = true;
@@ -9203,12 +9198,6 @@ __decorateClass$q([
 __decorateClass$q([
   property({ default: "solid" })
 ], BaseElement2DOutline.prototype, "style");
-__decorateClass$q([
-  property()
-], BaseElement2DOutline.prototype, "src");
-__decorateClass$q([
-  property({ default: 1 })
-], BaseElement2DOutline.prototype, "opacity");
 
 var __defProp$i = Object.defineProperty;
 var __decorateClass$p = (decorators, target, key, kind) => {
@@ -9797,13 +9786,13 @@ let BaseElement2D = class extends Node2D {
     return {
       ...json,
       props: {
+        ...json.props,
         style: this.style.toJSON(),
         text: this.text.toJSON(),
         geometry: this.geometry.toJSON(),
         fill: this.fill.toJSON(),
         outline: this.outline.toJSON(),
-        shadow: this.shadow.toJSON(),
-        ...json.props
+        shadow: this.shadow.toJSON()
       }
     };
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.4.31",
+  "version": "0.4.33",
   "packageManager": "pnpm@9.15.1",
   "description": "A JavaScript WebGL rendering engine.",
   "author": "wxm",
@@ -70,26 +70,26 @@
     "colord": "^2.9.3",
     "earcut": "^3.0.1",
     "modern-font": "^0.4.1",
-    "modern-idoc": "^0.4.0",
-    "modern-path2d": "^1.2.18",
-    "modern-text": "^1.3.5",
+    "modern-idoc": "^0.5.3",
+    "modern-path2d": "^1.2.19",
+    "modern-text": "^1.3.10",
     "yoga-layout": "^3.2.1"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.12.0",
+    "@antfu/eslint-config": "^4.13.0",
     "@types/earcut": "^3.0.0",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.15.17",
     "bumpp": "^10.1.0",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.24.0",
-    "lint-staged": "^15.5.0",
+    "eslint": "^9.26.0",
+    "lint-staged": "^15.5.2",
     "lottie-web": "^5.12.2",
     "modern-gif": "^2.0.4",
-    "simple-git-hooks": "^2.12.1",
+    "simple-git-hooks": "^2.13.0",
     "typescript": "^5.8.3",
     "unbuild": "^3.5.0",
-    "vite": "^6.2.5",
-    "vitest": "^3.1.1"
+    "vite": "^6.3.5",
+    "vitest": "^3.1.3"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"