modern-canvas 0.6.11 → 0.6.13

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';
@@ -955,6 +955,8 @@ class CoreObject extends EventEmitter {
       if (value && typeof value === "object") {
         if ("toJSON" in value && typeof value.toJSON === "function") {
           json[key] = value.toJSON();
+        } else if (Array.isArray(value)) {
+          json[key] = [...value];
         } else {
           json[key] = { ...value };
         }
@@ -2439,7 +2441,7 @@ attribute vec4 aColorMatrixOffset;
 attribute vec4 aDisableWrapMode;
 
 uniform mat3 projectionMatrix;
-uniform mat3 translationMatrix;
+uniform mat3 worldTransformMatrix;
 uniform vec4 modulate;
 
 varying float vTextureId;
@@ -2451,8 +2453,14 @@ varying vec4 vColorMatrixOffset;
 varying vec4 vDisableWrapMode;
 
 void main(void) {
+  mat3 modelMatrix = mat3(
+    1.0, 0.0, 0.0,
+    0.0, 1.0, 0.0,
+    0.0, 0.0, 1.0
+  );
   vTextureId = aTextureId;
-  gl_Position = vec4((projectionMatrix * translationMatrix * vec3(aPosition, 1.0)).xy, 0.0, 1.0);
+  mat3 modelViewProjectionMatrix = projectionMatrix * worldTransformMatrix * modelMatrix;
+  gl_Position = vec4((modelViewProjectionMatrix * vec3(aPosition, 1.0)).xy, 0.0, 1.0);
   vUv = aUv;
   vModulate = aModulate * modulate;
   vBackgroundColor = aBackgroundColor;
@@ -2543,7 +2551,6 @@ void main(void) {
         renderer2.program.updateUniforms(program, {
           samplers,
           modulate: [1, 1, 1, 1],
-          translationMatrix: [1, 0, 0, 0, 1, 0, 0, 0, 1],
           ...renderer2.program.uniforms
         });
         renderer2.vertexArray.bind(vao ?? vertexArray);
@@ -3198,7 +3205,8 @@ class WebGLProgramModule extends WebGLModule {
   }
   boundProgram = null;
   uniforms = {
-    projectionMatrix: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+    projectionMatrix: [1, 0, 0, 0, 1, 0, 0, 0, 1],
+    worldTransformMatrix: [1, 0, 0, 0, 1, 0, 0, 0, 1]
   };
   create(options) {
     const program = this.gl.createProgram();
@@ -3400,7 +3408,10 @@ ${gl.getShaderInfoLog(shader)}`);
   reset() {
     super.reset();
     this.boundProgram = null;
-    this.uniforms = {};
+    this.uniforms = {
+      projectionMatrix: [1, 0, 0, 0, 1, 0, 0, 0, 1],
+      worldTransformMatrix: [1, 0, 0, 0, 1, 0, 0, 0, 1]
+    };
   }
   free() {
     super.free();
@@ -6047,18 +6058,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;
   }
@@ -7100,7 +7114,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",
@@ -7128,7 +7154,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",
@@ -9273,6 +9311,8 @@ class BaseElement2DText extends CoreObject {
       switch (args[0]) {
         case "content":
         case "effects":
+        case "fill":
+        case "outline":
           this.setter(args[0], args[1]);
           break;
       }
@@ -9289,12 +9329,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;
     }
@@ -9345,8 +9387,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.11",
+  "version": "0.6.13",
   "packageManager": "pnpm@9.15.1",
   "description": "A JavaScript WebGL rendering engine.",
   "author": "wxm",
@@ -70,15 +70,15 @@
     "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.6",
+    "modern-path2d": "^1.4.5",
+    "modern-text": "^1.7.1",
     "yoga-layout": "^3.2.1"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.16.2",
     "@types/earcut": "^3.0.0",
-    "@types/node": "^24.0.12",
+    "@types/node": "^24.0.13",
     "bumpp": "^10.2.0",
     "conventional-changelog-cli": "^5.0.0",
     "eslint": "^9.30.1",
@@ -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": {