@meta2d/core 1.0.86 → 1.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.0.86",
+  "version": "1.0.88",
   "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
   "main": "index.js",
   "types": "index.d.ts",

package/src/canvas/canvas.js

@@ -369,6 +369,12 @@ export class Canvas {
         }
         let data = JSON.parse(e.data);
         if (typeof data === 'object') {
+            if (data.name === 'onload') {
+                this.dialog.iframe.contentWindow.postMessage(JSON.stringify({
+                    name: 'dialog',
+                    data: this.dialog.data
+                }), '*');
+            }
             this.parent.doMessageEvent(data.name, JSON.stringify(data.data));
         }
         else {
@@ -2631,15 +2637,16 @@ export class Canvas {
             pen.calculative.hover = false;
             setChildrenActive(pen, false);
         });
-        !drawing && this.store.emitter.emit('inactive', this.store.active);
+        const activePens = [...this.store.active];
         this.store.active = [];
         this.activeRect = undefined;
         this.sizeCPs = undefined;
         this.store.activeAnchor = undefined;
         this.patchFlags = true;
+        !drawing && this.store.emitter.emit('inactive', activePens);
     }
     active(pens, emit = true) {
-        if (this.store.active) {
+        if (this.store.active && this.store.active.length) {
             emit && this.store.emitter.emit('inactive', this.store.active);
             for (const pen of this.store.active) {
                 pen.calculative.active = undefined;
@@ -4025,6 +4032,7 @@ export class Canvas {
         const scale = this.store.data.scale;
         pen.calculative.lineWidth = pen.lineWidth * scale;
         pen.calculative.fontSize = pen.fontSize * scale;
+        pen.calculative.letterSpacing = (pen.letterSpacing || 0) * scale;
         if (pen.fontSize < 1 && pen.fontSize > 0) {
             pen.calculative.fontSize =
                 pen.fontSize * pen.calculative.worldRect.height;
@@ -4081,22 +4089,24 @@ export class Canvas {
             });
         }
         pen.type && this.initLineRect(pen);
-        if (pen.calculative.gradientTimer) {
-            clearTimeout(pen.calculative.gradientTimer);
-        }
-        pen.calculative.gradientTimer = setTimeout(() => {
-            if (pen.calculative.lineGradient) {
-                pen.calculative.lineGradient = null;
-            }
-            if (pen.calculative.gradient) {
-                pen.calculative.gradient = null;
-            }
-            if (pen.calculative.radialGradient) {
-                pen.calculative.radialGradient = null;
+        if (pen.gradientColors || pen.lineGradientColors) {
+            if (pen.calculative.gradientTimer) {
+                clearTimeout(pen.calculative.gradientTimer);
             }
-            this.patchFlags = true;
-            pen.calculative.gradientTimer = undefined;
-        }, 50);
+            pen.calculative.gradientTimer = setTimeout(() => {
+                if (pen.calculative.lineGradient) {
+                    pen.calculative.lineGradient = null;
+                }
+                if (pen.calculative.gradient) {
+                    pen.calculative.gradient = null;
+                }
+                if (pen.calculative.radialGradient) {
+                    pen.calculative.radialGradient = null;
+                }
+                this.patchFlags = true;
+                pen.calculative.gradientTimer = undefined;
+            }, 50);
+        }
     }
     initGlobalStyle() {
         if (this.store.options.themeOnlyCanvas || this.store.data.themeOnlyCanvas) {
@@ -4106,15 +4116,16 @@ export class Canvas {
         const data = {};
         const theme = {};
         themeKeys.forEach(key => {
-            if (this.store.options[key] !== undefined) {
+            // 过滤调 null undefined ''
+            if (this.store.options[key] != null && this.store.options[key] !== '') {
                 options[key] = this.store.options[key];
             }
-            if (this.store.data[key] !== undefined) {
+            if (this.store.data[key] != null && this.store.data[key] !== '') {
                 data[key] = this.store.data[key];
             }
             if (this.store.data.theme) {
                 const value = this.store.theme[this.store.data.theme]?.[key];
-                if (value !== undefined) {
+                if (value != null && value !== '') {
                     theme[key] = value;
                 }
             }
@@ -4195,7 +4206,7 @@ export class Canvas {
                     pen.calculative.img) {
                     ctx.save();
                     ctxFlip(ctx, pen);
-                    if (pen.calculative.rotate) {
+                    if (pen.rotateByRoot || pen.calculative.rotate) {
                         ctxRotate(ctx, pen);
                     }
                     setGlobalAlpha(ctx, pen);
@@ -5554,7 +5565,10 @@ export class Canvas {
      * @param angle 本次的旋转值，加到 pen.calculative.rotate 上
      */
     rotatePen(pen, angle, rect) {
-        if (pen.type) {
+        if (pen.rotateByRoot) {
+            return;
+        }
+        if (pen.name === 'line') {
             pen.calculative.worldAnchors.forEach((anchor) => {
                 rotatePoint(anchor, angle, rect.center);
             });
@@ -6474,6 +6488,9 @@ export class Canvas {
             }
             style += `height:${height}px;`;
         }
+        if (pen.letterSpacing) {
+            style += `letter-spacing:${pen.calculative.letterSpacing}px;`;
+        }
         let _textWidth = null;
         if (pen.textWidth) {
             _textWidth =