modern-canvas 0.6.10 → 0.6.12

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { defineProperty, EventEmitter, getDeclarations, parseColor, property, RawWeakMap as RawWeakMap$1, isGradient, clearUndef, idGenerator, normalizeFill, isNone, normalizeBackground, normalizeForeground, normalizeOutline, normalizeShadow, normalizeShape, getDefaultStyle, normalizeText } from 'modern-idoc';
+import { defineProperty, EventEmitter, getDeclarations, parseColor, property, RawWeakMap as RawWeakMap$1, isGradient, clearUndef, idGenerator, isColorFillObject, normalizeFill, isNone, normalizeBackground, normalizeForeground, normalizeOutline, normalizeShadow, normalizeShape, getDefaultStyle, normalizeText } from 'modern-idoc';
 import { extend } from 'colord';
 import namesPlugin from 'colord/plugins/names';
 import { Path2D, Path2DSet, svgToDom, svgToPath2DSet, Matrix3 as Matrix3$1 } from 'modern-path2d';
@@ -5593,7 +5593,6 @@ function getNodeIid(key) {
   return iid;
 }
 let Node = class extends CoreObject {
-  meta = {};
   _readyed = false;
   constructor(properties, nodes = []) {
     super();
@@ -6048,18 +6047,21 @@ let Node = class extends CoreObject {
   toJSON() {
     return clearUndef({
       ...super.toJSON(),
-      is: this.is,
       children: this._children.length ? [...this._children.map((child) => child.toJSON())] : void 0,
-      meta: Object.keys(this.meta).length ? { ...this.meta } : void 0
+      meta: {
+        ...this.meta,
+        inCanvasIs: this.is
+      }
     });
   }
   static parse(value) {
     if (Array.isArray(value)) {
       return value.map((val) => this.parse(val));
     }
-    const { is, props, children } = value;
-    const Class = customNodes.get(is) ?? Node;
-    const node = new Class(props);
+    const { meta = {}, children, ...props } = value;
+    const { inCanvasIs = "Node" } = meta;
+    const Class = customNodes.get(inCanvasIs) ?? Node;
+    const node = new Class({ ...props, meta });
     children?.forEach((child) => node.appendChild(this.parse(child)));
     return node;
   }
@@ -6082,6 +6084,9 @@ __decorateClass$R([
 __decorateClass$R([
   property({ fallback: "default" })
 ], Node.prototype, "internalMode", 2);
+__decorateClass$R([
+  property({ default: () => ({}) })
+], Node.prototype, "meta", 2);
 __decorateClass$R([
   property({ protected: true })
 ], Node.prototype, "mask", 2);
@@ -7098,7 +7103,19 @@ class CanvasContext extends Path2D {
     if (!this.curves.length) {
       return;
     }
-    const strokeStyle = this.strokeStyle ?? (typeof this.style.stroke === "string" ? this.style.stroke : void 0);
+    let strokeStyle = this.strokeStyle;
+    if (!strokeStyle && this.style.stroke) {
+      switch (typeof this.style.stroke) {
+        case "string":
+          strokeStyle = this.style.stroke;
+          break;
+        case "object":
+          if (isColorFillObject(this.style.stroke)) {
+            strokeStyle = this.style.stroke.color;
+          }
+          break;
+      }
+    }
     this._draws.push({
       ...options,
       type: "stroke",
@@ -7126,7 +7143,19 @@ class CanvasContext extends Path2D {
     if (!this.curves.length) {
       return;
     }
-    const fillStyle = this.fillStyle ?? (typeof this.style.fill === "string" ? this.style.fill : void 0);
+    let fillStyle = this.fillStyle;
+    if (!fillStyle && this.style.fill) {
+      switch (typeof this.style.fill) {
+        case "string":
+          fillStyle = this.style.fill;
+          break;
+        case "object":
+          if (isColorFillObject(this.style.fill)) {
+            fillStyle = this.style.fill.color;
+          }
+          break;
+      }
+    }
     this._draws.push({
       ...options,
       type: "fill",
@@ -9271,6 +9300,8 @@ class BaseElement2DText extends CoreObject {
       switch (args[0]) {
         case "content":
         case "effects":
+        case "fill":
+        case "outline":
           this.setter(args[0], args[1]);
           break;
       }
@@ -9287,12 +9318,14 @@ class BaseElement2DText extends CoreObject {
   _updateProperty(key, value, oldValue, declaration) {
     super._updateProperty(key, value, oldValue, declaration);
     switch (key) {
+      case "enabled":
       case "content":
       case "effects":
-      case "measureDOM":
+      case "measureDom":
       case "fonts":
+      case "fill":
+      case "outline":
       case "split":
-      case "enabled":
         this.parent.requestRedraw();
         break;
     }
@@ -9343,8 +9376,14 @@ __decorateClass$o([
   property({ alias: "base.effects" })
 ], BaseElement2DText.prototype, "effects");
 __decorateClass$o([
-  property({ protected: true, alias: "base.measureDOM" })
-], BaseElement2DText.prototype, "measureDOM");
+  property({ alias: "base.fill" })
+], BaseElement2DText.prototype, "fill");
+__decorateClass$o([
+  property({ alias: "base.outline" })
+], BaseElement2DText.prototype, "outline");
+__decorateClass$o([
+  property({ protected: true, alias: "base.measureDom" })
+], BaseElement2DText.prototype, "measureDom");
 __decorateClass$o([
   property({ protected: true, alias: "base.fonts" })
 ], BaseElement2DText.prototype, "fonts");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "packageManager": "pnpm@9.15.1",
   "description": "A JavaScript WebGL rendering engine.",
   "author": "wxm",
@@ -70,9 +70,9 @@
     "colord": "^2.9.3",
     "earcut": "^3.0.1",
     "modern-font": "^0.4.1",
-    "modern-idoc": "^0.8.4",
-    "modern-path2d": "^1.4.3",
-    "modern-text": "^1.6.4",
+    "modern-idoc": "^0.8.5",
+    "modern-path2d": "^1.4.5",
+    "modern-text": "^1.7.1",
     "yoga-layout": "^3.2.1"
   },
   "devDependencies": {
@@ -88,7 +88,7 @@
     "simple-git-hooks": "^2.13.0",
     "typescript": "^5.8.3",
     "unbuild": "^3.5.0",
-    "vite": "^7.0.3",
+    "vite": "^7.0.4",
     "vitest": "^3.2.4"
   },
   "simple-git-hooks": {