@meta2d/core 1.0.88 → 1.0.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.0.88",
+  "version": "1.0.89",
   "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

@@ -15,6 +15,7 @@ import { MagnifierCanvas } from './magnifierCanvas';
 import { lockedError } from '../utils/error';
 import { Dialog } from '../dialog';
 import { setter } from '../utils/object';
+import { isNumber } from '../utils/tool';
 import { Title } from '../title';
 import { CanvasTemplate } from './canvasTemplate';
 import { getLinePoints } from '../diagrams/line';
@@ -4037,31 +4038,51 @@ export class Canvas {
             pen.calculative.fontSize =
                 pen.fontSize * pen.calculative.worldRect.height;
         }
-        pen.calculative.iconSize = pen.iconSize * scale;
-        pen.calculative.iconWidth = pen.iconWidth * scale;
-        pen.calculative.iconHeight = pen.iconHeight * scale;
-        pen.calculative.iconLeft =
-            pen.iconLeft < 1 && pen.iconLeft > -1
-                ? pen.iconLeft
-                : pen.iconLeft * scale;
-        pen.calculative.iconTop =
-            pen.iconTop < 1 && pen.iconTop > -1 ? pen.iconTop : pen.iconTop * scale;
-        pen.calculative.textWidth =
-            pen.textWidth < 1 && pen.textWidth > -1
-                ? pen.textWidth
-                : pen.textWidth * scale;
-        pen.calculative.textHeight =
-            pen.textHeight < 1 && pen.textHeight > -1
-                ? pen.textHeight
-                : pen.textHeight * scale;
-        pen.calculative.textLeft =
-            pen.textLeft < 1 && pen.textLeft > -1
-                ? pen.textLeft * pen.calculative.worldRect.width
-                : pen.textLeft * scale;
-        pen.calculative.textTop =
-            pen.textTop < 1 && pen.textTop > -1 ? pen.textTop * pen.calculative.worldRect.height : pen.textTop * scale;
-        if (pen.type === PenType.Line && pen.borderWidth) {
-            pen.calculative.borderWidth = pen.borderWidth * scale;
+        if (isNumber(pen.iconSize)) {
+            pen.calculative.iconSize = pen.iconSize * scale;
+        }
+        if (isNumber(pen.iconWidth)) {
+            pen.calculative.iconWidth = pen.iconWidth * scale;
+        }
+        if (isNumber(pen.iconHeight)) {
+            pen.calculative.iconHeight = pen.iconHeight * scale;
+        }
+        if (isNumber(pen.iconLeft)) {
+            pen.calculative.iconLeft =
+                pen.iconLeft < 1 && pen.iconLeft > -1
+                    ? pen.iconLeft
+                    : pen.iconLeft * scale;
+        }
+        if (isNumber(pen.iconTop)) {
+            pen.calculative.iconTop =
+                pen.iconTop < 1 && pen.iconTop > -1 ? pen.iconTop : pen.iconTop * scale;
+        }
+        if (isNumber(pen.textWidth)) {
+            pen.calculative.textWidth =
+                pen.textWidth < 1 && pen.textWidth > -1
+                    ? pen.textWidth
+                    : pen.textWidth * scale;
+        }
+        if (isNumber(pen.textHeight)) {
+            pen.calculative.textHeight =
+                pen.textHeight < 1 && pen.textHeight > -1
+                    ? pen.textHeight
+                    : pen.textHeight * scale;
+        }
+        if (isNumber(pen.textLeft)) {
+            pen.calculative.textLeft =
+                pen.textLeft < 1 && pen.textLeft > -1
+                    ? pen.textLeft * pen.calculative.worldRect.width
+                    : pen.textLeft * scale;
+        }
+        if (isNumber(pen.textTop)) {
+            pen.calculative.textTop =
+                pen.textTop < 1 && pen.textTop > -1 ? pen.textTop * pen.calculative.worldRect.height : pen.textTop * scale;
+        }
+        if (isNumber(pen.borderWidth)) {
+            if (pen.type === PenType.Line && pen.borderWidth) {
+                pen.calculative.borderWidth = pen.borderWidth * scale;
+            }
         }
     }
     updatePenRect(pen, { worldRectIsReady, playingAnimate, } = {}) {
@@ -6596,7 +6617,7 @@ export class Canvas {
                 this.store.emitter.emit('change', pen);
                 this.store.emitter.emit('valueUpdate', pen);
             }
-            else if (pen.text === this.inputDiv.dataset.value && pen.calculative.textLines.length == 0) {
+            else if (pen.text === this.inputDiv.dataset.value && pen.calculative.textLines && pen.calculative.textLines.length == 0) {
                 calcTextRect(pen);
             }
             this.initTemplateCanvas([pen]);
@@ -7018,7 +7039,7 @@ export class Canvas {
             this.updatePenRect(pen);
         }
         else {
-            willCalcTextRect && calcTextRect(pen);
+            !pen.hiddenText && willCalcTextRect && calcTextRect(pen);
             willCalcIconRect && calcIconRect(this.store.pens, pen);
             if (willUpdatePath) {
                 globalStore.path2dDraws[pen.name] &&