modern-canvas 0.4.53 → 0.4.54

package/dist/index.mjs

@@ -8904,6 +8904,7 @@ class BaseElement2DFill extends CoreObject {
       case "rotateWithShape":
       case "tile":
       case "opacity":
+      case "enabled":
         this.parent.requestRedraw();
         break;
       case "image":
@@ -8932,7 +8933,7 @@ class BaseElement2DFill extends CoreObject {
   }
   canDraw() {
     return Boolean(
-      this._texture || this.color
+      this.enabled && (this._texture || this.color)
     );
   }
   _getDrawOptions() {
@@ -8983,6 +8984,9 @@ class BaseElement2DFill extends CoreObject {
     });
   }
 }
+__decorateClass$u([
+  property({ default: true })
+], BaseElement2DFill.prototype, "enabled");
 __decorateClass$u([
   property()
 ], BaseElement2DFill.prototype, "color");
@@ -9074,13 +9078,14 @@ class BaseElement2DOutline extends BaseElement2DFill {
     switch (key) {
       case "width":
       case "style":
+      case "enabled":
         this.parent.requestRedraw();
         break;
     }
   }
   canDraw() {
     return Boolean(
-      this.width || this.color || super.canDraw()
+      this.enabled && (this.width || this.color || super.canDraw())
     );
   }
   draw() {
@@ -9092,6 +9097,9 @@ class BaseElement2DOutline extends BaseElement2DFill {
     ctx.stroke({ disableWrapMode });
   }
 }
+__decorateClass$r([
+  property({ default: true })
+], BaseElement2DOutline.prototype, "enabled");
 __decorateClass$r([
   property({ default: 0 })
 ], BaseElement2DOutline.prototype, "color");
@@ -9148,6 +9156,9 @@ class BaseElement2DShadow extends CoreObject {
     }
   }
 }
+__decorateClass$q([
+  property({ default: true })
+], BaseElement2DShadow.prototype, "enabled");
 __decorateClass$q([
   property({ default: "#000000" })
 ], BaseElement2DShadow.prototype, "color");
@@ -9188,6 +9199,7 @@ class BaseElement2DShape extends CoreObject {
       case "svg":
       case "paths":
       case "viewBox":
+      case "enabled":
         this._updatePath2DSet();
         this.parent.requestRedraw();
         break;
@@ -9218,7 +9230,7 @@ class BaseElement2DShape extends CoreObject {
     });
   }
   draw() {
-    if (this._path2DSet.paths.length) {
+    if (this.enabled && this._path2DSet.paths.length) {
       const ctx = this.parent.context;
       const { width, height } = this.parent.size;
       this._path2DSet.paths.forEach((path) => {
@@ -9241,6 +9253,9 @@ class BaseElement2DShape extends CoreObject {
     }
   }
 }
+__decorateClass$p([
+  property({ default: true })
+], BaseElement2DShape.prototype, "enabled");
 __decorateClass$p([
   property()
 ], BaseElement2DShape.prototype, "preset");
@@ -9301,6 +9316,7 @@ class BaseElement2DText extends CoreObject {
       case "measureDOM":
       case "fonts":
       case "split":
+      case "enabled":
         this.parent.requestRedraw();
         break;
     }
@@ -9324,7 +9340,7 @@ class BaseElement2DText extends CoreObject {
   }
   canDraw() {
     return Boolean(
-      !/^\s*$/.test(this.base.toString()) && this.texture?.valid
+      this.enabled && !/^\s*$/.test(this.base.toString()) && this.texture?.valid
     );
   }
   draw() {
@@ -9349,6 +9365,9 @@ class BaseElement2DText extends CoreObject {
     ctx.fill();
   }
 }
+__decorateClass$o([
+  property({ default: true })
+], BaseElement2DText.prototype, "enabled");
 __decorateClass$o([
   property({ alias: "base.content" })
 ], BaseElement2DText.prototype, "content");
@@ -13516,9 +13535,26 @@ class Assets {
     return fetch(url);
   }
   _fixSVG(dataURI) {
-    const svg = new DOMParser().parseFromString(decodeURIComponent(dataURI.split(",")[1]), "image/svg+xml").documentElement;
-    svg.setAttribute("width", "512");
-    svg.setAttribute("height", "512");
+    let xml;
+    if (dataURI.includes(";base64,")) {
+      xml = atob(dataURI.split(",")[1]);
+    } else {
+      xml = decodeURIComponent(dataURI.split(",")[1]);
+    }
+    const svg = new DOMParser().parseFromString(xml, "image/svg+xml").documentElement;
+    const width = svg.getAttribute("width");
+    const height = svg.getAttribute("height");
+    const isValidWidth = width && /^[\d.]+$/.test(width);
+    const isValidHeight = height && /^[\d.]+$/.test(height);
+    if (!isValidWidth || !isValidHeight) {
+      const viewBox = svg.getAttribute("viewBox")?.split(" ").map((v) => Number(v));
+      if (!isValidWidth) {
+        svg.setAttribute("width", String(viewBox ? viewBox[2] - viewBox[0] : 512));
+      }
+      if (!isValidHeight) {
+        svg.setAttribute("height", String(viewBox ? viewBox[3] - viewBox[1] : 512));
+      }
+    }
     return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg.outerHTML)}`;
   }
   async fetchImageBitmap(url, options) {
@@ -13535,7 +13571,7 @@ class Assets {
         return createImageBitmap(blob, options);
       });
     } else {
-      if (url.startsWith("data:image/svg+xml;charset=utf-8,")) {
+      if (url.startsWith("data:image/svg+xml;")) {
         url = this._fixSVG(url);
       }
       return new Promise((resolve) => {
@@ -14010,6 +14046,7 @@ async function task(options) {
   engine.resize(width, height, true);
   (Array.isArray(data) ? data : [data]).forEach((v) => {
     if (v instanceof Node) {
+      v.parent = void 0;
       engine.root.appendChild(v);
     } else {
       engine.root.appendChild(Node.parse(v));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.4.53",
+  "version": "0.4.54",
   "packageManager": "pnpm@9.15.1",
   "description": "A JavaScript WebGL rendering engine.",
   "author": "wxm",