modern-canvas 0.4.53 → 0.4.55

package/dist/index.cjs

@@ -743,14 +743,14 @@ class Input extends EventEmitter {
       this.target.removeEventListener("pointerdown", this.onPointerDown);
       this.target.removeEventListener("pointerleave", this.onPointerOver);
       this.target.removeEventListener("pointerover", this.onPointerOver);
-      this.target.ownerDocument.removeEventListener("pointermove", this.onPointerMove);
-      this.target.ownerDocument.removeEventListener("pointerup", this.onPointerUp);
+      this.target.removeEventListener("pointermove", this.onPointerMove);
+      this.target.removeEventListener("pointerup", this.onPointerUp);
     } else {
       this.target.removeEventListener("mousedown", this.onPointerDown);
       this.target.removeEventListener("mouseout", this.onPointerOver);
       this.target.removeEventListener("mouseover", this.onPointerOver);
-      this.target.ownerDocument.removeEventListener("mousemove", this.onPointerMove);
-      this.target.ownerDocument.removeEventListener("mouseup", this.onPointerUp);
+      this.target.removeEventListener("mousemove", this.onPointerMove);
+      this.target.removeEventListener("mouseup", this.onPointerUp);
     }
     if (SUPPORTS_TOUCH_EVENTS) {
       this.target.removeEventListener("touchstart", this.onPointerDown);
@@ -778,14 +778,14 @@ class Input extends EventEmitter {
       this.target.addEventListener("pointerdown", this.onPointerDown);
       this.target.addEventListener("pointerleave", this.onPointerOver);
       this.target.addEventListener("pointerover", this.onPointerOver);
-      this.target.ownerDocument.addEventListener("pointermove", this.onPointerMove);
-      this.target.ownerDocument.addEventListener("pointerup", this.onPointerUp);
+      this.target.addEventListener("pointermove", this.onPointerMove);
+      this.target.addEventListener("pointerup", this.onPointerUp);
     } else {
       this.target.addEventListener("mousedown", this.onPointerDown);
       this.target.addEventListener("mouseout", this.onPointerOver);
       this.target.addEventListener("mouseover", this.onPointerOver);
-      this.target.ownerDocument.addEventListener("mousemove", this.onPointerMove);
-      this.target.ownerDocument.addEventListener("mouseup", this.onPointerUp);
+      this.target.addEventListener("mousemove", this.onPointerMove);
+      this.target.addEventListener("mouseup", this.onPointerUp);
     }
     if (SUPPORTS_TOUCH_EVENTS) {
       this.target.addEventListener("touchstart", this.onPointerDown);
@@ -8910,6 +8910,7 @@ class BaseElement2DFill extends CoreObject {
       case "rotateWithShape":
       case "tile":
       case "opacity":
+      case "enabled":
         this.parent.requestRedraw();
         break;
       case "image":
@@ -8938,7 +8939,7 @@ class BaseElement2DFill extends CoreObject {
   }
   canDraw() {
     return Boolean(
-      this._texture || this.color
+      this.enabled && (this._texture || this.color)
     );
   }
   _getDrawOptions() {
@@ -8989,6 +8990,9 @@ class BaseElement2DFill extends CoreObject {
     });
   }
 }
+__decorateClass$u([
+  modernIdoc.property({ default: true })
+], BaseElement2DFill.prototype, "enabled");
 __decorateClass$u([
   modernIdoc.property()
 ], BaseElement2DFill.prototype, "color");
@@ -9080,13 +9084,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() {
@@ -9098,6 +9103,9 @@ class BaseElement2DOutline extends BaseElement2DFill {
     ctx.stroke({ disableWrapMode });
   }
 }
+__decorateClass$r([
+  modernIdoc.property({ default: true })
+], BaseElement2DOutline.prototype, "enabled");
 __decorateClass$r([
   modernIdoc.property({ default: 0 })
 ], BaseElement2DOutline.prototype, "color");
@@ -9154,6 +9162,9 @@ class BaseElement2DShadow extends CoreObject {
     }
   }
 }
+__decorateClass$q([
+  modernIdoc.property({ default: true })
+], BaseElement2DShadow.prototype, "enabled");
 __decorateClass$q([
   modernIdoc.property({ default: "#000000" })
 ], BaseElement2DShadow.prototype, "color");
@@ -9194,6 +9205,7 @@ class BaseElement2DShape extends CoreObject {
       case "svg":
       case "paths":
       case "viewBox":
+      case "enabled":
         this._updatePath2DSet();
         this.parent.requestRedraw();
         break;
@@ -9224,7 +9236,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) => {
@@ -9247,6 +9259,9 @@ class BaseElement2DShape extends CoreObject {
     }
   }
 }
+__decorateClass$p([
+  modernIdoc.property({ default: true })
+], BaseElement2DShape.prototype, "enabled");
 __decorateClass$p([
   modernIdoc.property()
 ], BaseElement2DShape.prototype, "preset");
@@ -9307,6 +9322,7 @@ class BaseElement2DText extends CoreObject {
       case "measureDOM":
       case "fonts":
       case "split":
+      case "enabled":
         this.parent.requestRedraw();
         break;
     }
@@ -9330,7 +9346,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() {
@@ -9355,6 +9371,9 @@ class BaseElement2DText extends CoreObject {
     ctx.fill();
   }
 }
+__decorateClass$o([
+  modernIdoc.property({ default: true })
+], BaseElement2DText.prototype, "enabled");
 __decorateClass$o([
   modernIdoc.property({ alias: "base.content" })
 ], BaseElement2DText.prototype, "content");
@@ -13522,9 +13541,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) {
@@ -13541,7 +13577,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) => {
@@ -14016,6 +14052,7 @@ async function task(options) {
   engine.resize(width, height, true);
   (Array.isArray(data) ? data : [data]).forEach((v) => {
     if (v instanceof exports.Node) {
+      v.parent = void 0;
       engine.root.appendChild(v);
     } else {
       engine.root.appendChild(exports.Node.parse(v));

package/dist/index.d.cts

@@ -1888,6 +1888,7 @@ interface BaseElement2DFill extends NormalizedFill {
 }
 declare class BaseElement2DFill extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     color?: NormalizedFill['color'];
     image?: NormalizedFill['image'];
     linearGradient?: NormalizedFill['linearGradient'];
@@ -1928,6 +1929,7 @@ declare class BaseElement2DForeground extends BaseElement2DFill {
 }
 
 declare class BaseElement2DOutline extends BaseElement2DFill {
+    enabled: boolean;
     color: NormalizedOutline['color'];
     width: NormalizedOutline['width'];
     style: NormalizedOutline['style'];
@@ -1939,6 +1941,7 @@ declare class BaseElement2DOutline extends BaseElement2DFill {
 
 declare class BaseElement2DShadow extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     color: NormalizedShadow['color'];
     blur: NormalizedShadow['blur'];
     offsetY: NormalizedShadow['offsetX'];
@@ -1951,6 +1954,7 @@ declare class BaseElement2DShadow extends CoreObject {
 
 declare class BaseElement2DShape extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     preset?: Required<NormalizedShape>['preset'];
     svg?: Required<NormalizedShape>['svg'];
     viewBox?: Required<NormalizedShape>['viewBox'];
@@ -1978,6 +1982,7 @@ declare class BaseElement2DStyle extends Resource {
 
 declare class BaseElement2DText extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     content: Text['content'];
     effects?: Text['effects'];
     measureDOM?: Text['measureDOM'];

package/dist/index.d.mts

@@ -1888,6 +1888,7 @@ interface BaseElement2DFill extends NormalizedFill {
 }
 declare class BaseElement2DFill extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     color?: NormalizedFill['color'];
     image?: NormalizedFill['image'];
     linearGradient?: NormalizedFill['linearGradient'];
@@ -1928,6 +1929,7 @@ declare class BaseElement2DForeground extends BaseElement2DFill {
 }
 
 declare class BaseElement2DOutline extends BaseElement2DFill {
+    enabled: boolean;
     color: NormalizedOutline['color'];
     width: NormalizedOutline['width'];
     style: NormalizedOutline['style'];
@@ -1939,6 +1941,7 @@ declare class BaseElement2DOutline extends BaseElement2DFill {
 
 declare class BaseElement2DShadow extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     color: NormalizedShadow['color'];
     blur: NormalizedShadow['blur'];
     offsetY: NormalizedShadow['offsetX'];
@@ -1951,6 +1954,7 @@ declare class BaseElement2DShadow extends CoreObject {
 
 declare class BaseElement2DShape extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     preset?: Required<NormalizedShape>['preset'];
     svg?: Required<NormalizedShape>['svg'];
     viewBox?: Required<NormalizedShape>['viewBox'];
@@ -1978,6 +1982,7 @@ declare class BaseElement2DStyle extends Resource {
 
 declare class BaseElement2DText extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     content: Text['content'];
     effects?: Text['effects'];
     measureDOM?: Text['measureDOM'];

package/dist/index.d.ts

@@ -1888,6 +1888,7 @@ interface BaseElement2DFill extends NormalizedFill {
 }
 declare class BaseElement2DFill extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     color?: NormalizedFill['color'];
     image?: NormalizedFill['image'];
     linearGradient?: NormalizedFill['linearGradient'];
@@ -1928,6 +1929,7 @@ declare class BaseElement2DForeground extends BaseElement2DFill {
 }
 
 declare class BaseElement2DOutline extends BaseElement2DFill {
+    enabled: boolean;
     color: NormalizedOutline['color'];
     width: NormalizedOutline['width'];
     style: NormalizedOutline['style'];
@@ -1939,6 +1941,7 @@ declare class BaseElement2DOutline extends BaseElement2DFill {
 
 declare class BaseElement2DShadow extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     color: NormalizedShadow['color'];
     blur: NormalizedShadow['blur'];
     offsetY: NormalizedShadow['offsetX'];
@@ -1951,6 +1954,7 @@ declare class BaseElement2DShadow extends CoreObject {
 
 declare class BaseElement2DShape extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     preset?: Required<NormalizedShape>['preset'];
     svg?: Required<NormalizedShape>['svg'];
     viewBox?: Required<NormalizedShape>['viewBox'];
@@ -1978,6 +1982,7 @@ declare class BaseElement2DStyle extends Resource {
 
 declare class BaseElement2DText extends CoreObject {
     parent: BaseElement2D;
+    enabled: boolean;
     content: Text['content'];
     effects?: Text['effects'];
     measureDOM?: Text['measureDOM'];