@meta2d/core 1.1.9 → 1.1.11

package/package.json

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

@@ -1148,6 +1148,11 @@ export class Canvas {
     };
     async dropPens(pens, e) {
         this.randomIdObj = {};
+        if (this.parent.store.options.textPresetStyle) {
+            if (pens.length === 1 && !pens[0].temPreset && pens[0].name === 'text') {
+                Object.assign(pens[0], this.parent.store.options.textPresetStyle);
+            }
+        }
         for (const pen of pens) {
             // 只修改 树根处的 祖先节点, randomCombineId 会递归更改子节点
             !pen.parentId && this.randomCombineId(pen, pens);
@@ -1338,13 +1343,13 @@ export class Canvas {
             return [];
         }
         const list = [];
-        for (const pen of pens) {
-            if (!pen.id) {
-                pen.id = s8();
-            }
-            !pen.calculative && (pen.calculative = { canvas: this });
-            this.store.pens[pen.id] = pen;
-        }
+        // for (const pen of pens) {
+        //   if (!pen.id) {
+        //     pen.id = s8();
+        //   }
+        //   !pen.calculative && (pen.calculative = { canvas: this });
+        //   this.store.pens[pen.id] = pen;
+        // }
         for (const pen of pens) {
             if (this.beforeAddPen && this.beforeAddPen(pen) != true) {
                 continue;
@@ -1617,8 +1622,8 @@ export class Canvas {
                 canvas: this,
                 active: true,
                 worldAnchors: [pt],
-                lineWidth: lineWidth * scale,
-                ...options.linePresetStyle
+                ...options.linePresetStyle,
+                lineWidth: options.linePresetStyle.lineWidth ? options.linePresetStyle.lineWidth * scale : lineWidth * scale
             },
             fromArrow: data.fromArrow || options.fromArrow,
             toArrow: data.toArrow || options.toArrow,
@@ -5233,7 +5238,7 @@ export class Canvas {
             if (pen.name.endsWith('Dom') ||
                 isDomShapes.includes(pen.name) ||
                 this.store.options.domShapes.includes(pen.name) ||
-                pen.image) {
+                pen.image || pen.isDom) {
                 // 修改名称会执行 onDestroy ，清空它
                 value.name = 'rectangle';
                 value.onDestroy = undefined;
@@ -7065,6 +7070,12 @@ export class Canvas {
             e.stopPropagation();
         };
         this.inputDiv.onkeydown = (e) => {
+            if (e.key === 'Enter') {
+                const pen = this.store.pens[this.inputDiv.dataset.penId];
+                if (pen.input && pen.whiteSpace === 'nowrap') {
+                    this.hideInput();
+                }
+            }
             e.stopPropagation();
         };
         this.inputDiv.onmousedown = this.stopPropagation;