@meta2d/core 1.0.36 → 1.0.37

package/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.36",
+    "version": "1.0.37",
     "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
-    "main": "index.js",
+    "main": "index.ts",
     "types": "index.d.ts",
     "scripts": {
         "copy": "shx cp package.build.json ../../dist/core/package.json",

package/src/canvas/canvas.js

@@ -317,7 +317,8 @@ var Canvas = /** @class */ (function () {
             var _a, _b, _c;
             if (_this.store.data.locked >= LockState.DisableEdit &&
                 e.target.tagName !== 'INPUT' &&
-                e.target.tagName !== 'TEXTAREA') {
+                e.target.tagName !== 'TEXTAREA' &&
+                !e.target.dataset.meta2dIgnore) {
                 _this.store.active.forEach(function (pen) {
                     var _a;
                     (_a = pen.onKeyDown) === null || _a === void 0 ? void 0 : _a.call(pen, pen, e.key);
@@ -325,7 +326,8 @@ var Canvas = /** @class */ (function () {
             }
             if (_this.store.data.locked >= LockState.DisableEdit ||
                 e.target.tagName === 'INPUT' ||
-                e.target.tagName === 'TEXTAREA') {
+                e.target.tagName === 'TEXTAREA' ||
+                e.target.dataset.meta2dIgnore) {
                 return;
             }
             if (_this.store.options.unavailableKeys.includes(e.key)) {
@@ -3693,28 +3695,27 @@ var Canvas = /** @class */ (function () {
             }
         }
         //取最近角度
-        var _min = 999;
-        var index = -1;
-        for (var i = 0; i < angleArr.length; i++) {
-            if (angle < 0) {
-                if (Math.abs(angle + angleArr[i]) < _min) {
-                    index = i;
-                    _min = Math.abs(angle + angleArr[i]);
-                }
-            }
-            else {
-                if (Math.abs(angle - angleArr[i]) < _min) {
-                    index = i;
-                    _min = Math.abs(angle - angleArr[i]);
-                }
-            }
-        }
-        if (angle < 0) {
-            angle = -angleArr[index];
-        }
-        else {
-            angle = angleArr[index];
-        }
+        // let _min = 999;
+        // let index = -1;
+        // for (let i = 0; i < angleArr.length; i++) {
+        //   if (angle < 0) {
+        //     if (Math.abs(angle + angleArr[i]) < _min) {
+        //       index = i;
+        //       _min = Math.abs(angle + angleArr[i]);
+        //     }
+        //   } else {
+        //     if (Math.abs(angle - angleArr[i]) < _min) {
+        //       index = i;
+        //       _min = Math.abs(angle - angleArr[i]);
+        //     }
+        //   }
+        // }
+        // if (angle < 0) {
+        //   angle = -angleArr[index];
+        // } else {
+        //   angle = angleArr[index];
+        // }
+        angle = Math.round(angle / 15) * 15;
         var length = Math.sqrt((last.x - to.x) * (last.x - to.x) + (last.y - to.y) * (last.y - to.y));
         to.x = last.x + Math.cos((angle / 180) * Math.PI) * length;
         to.y = last.y - Math.sin((angle / 180) * Math.PI) * length;
@@ -4109,6 +4110,59 @@ var Canvas = /** @class */ (function () {
                 });
                 action.type = EditType.Add;
                 break;
+            case EditType.Replace: {
+                // undo pens则为新的pen
+                var pens_9 = undo ? action.initPens : action.pens;
+                var unPens_2 = undo ? action.pens : action.initPens;
+                // 删除旧的
+                unPens_2.forEach(function (aPen) {
+                    var _a;
+                    var pen = deepClone(aPen, true);
+                    var i = _this.store.data.pens.findIndex(function (item) { return item.id === pen.id; });
+                    if (i > -1) {
+                        (_a = pen.onDestroy) === null || _a === void 0 ? void 0 : _a.call(pen, _this.store.data.pens.find(function (i) { return i.id === pen.id; }));
+                        var i_1 = _this.store.data.pens.findIndex(function (item) { return item.id === pen.id; });
+                        _this.store.data.pens.splice(i_1, 1);
+                        _this.store.pens[pen.id] = undefined;
+                        if (!pen.calculative) {
+                            pen.calculative = {};
+                        }
+                        pen.calculative.canvas = _this;
+                        _this.store.animates.delete(pen);
+                        _this.store.animateMap.delete(pen);
+                    }
+                });
+                // 放置新的
+                pens_9.reverse().forEach(function (aPen) {
+                    var _a, _b;
+                    var pen = deepClone(aPen, true);
+                    if (!pen.calculative) {
+                        pen.calculative = {};
+                    }
+                    _this.store.data.pens.splice(((_a = pen.calculative) === null || _a === void 0 ? void 0 : _a.layer) !== -1
+                        ? (_b = pen.calculative) === null || _b === void 0 ? void 0 : _b.layer
+                        : _this.store.data.pens.length, 0, pen);
+                    // 先放进去，pens 可能是子节点在前，而父节点在后
+                    _this.store.pens[pen.id] = pen;
+                    if (pen.type && pen.lastConnected) {
+                        for (var key in pen.lastConnected) {
+                            _this.store.pens[key].connectedLines = pen.lastConnected[key];
+                        }
+                    }
+                    pen.calculative.canvas = _this;
+                });
+                pens_9.reverse().forEach(function (aPen) {
+                    var pen = _this.store.data.pens.find(function (i) { return i.id === aPen.id; });
+                    var rect = _this.getPenRect(pen, action.origin, action.scale);
+                    _this.setPenRect(pen, rect, false);
+                    pen.calculative.image = undefined;
+                    pen.calculative.backgroundImage = undefined;
+                    pen.calculative.strokeImage = undefined;
+                    _this.loadImage(pen);
+                });
+                action.type = EditType.Replace;
+                break;
+            }
         }
         if (action.type === EditType.Update) {
             var pens = __spreadArray(__spreadArray([], __read(action.pens), false), __read(action.initPens), false);
@@ -5208,25 +5262,29 @@ var Canvas = /** @class */ (function () {
         else {
             var offsetX = 0;
             var offsetY = 0;
-            if (line.lineName === 'line' &&
-                line.calculative.worldAnchors[line.calculative.worldAnchors.length - 1] === this.store.activeAnchor) {
+            if (line.lineName === 'line') {
+                var index = line.calculative.worldAnchors.findIndex(function (anchor) { return anchor.id === _this.store.activeAnchor.id; });
+                if (index === 0) {
+                    index = 2;
+                }
+                var relativePt = line.calculative.worldAnchors[index - 1];
                 if (keyOptions.ctrlKey && keyOptions.shiftKey) {
                     var _pt = deepClone(pt);
-                    this.getSpecialAngle(_pt, line.calculative.worldAnchors[line.calculative.worldAnchors.length - 2]);
+                    this.getSpecialAngle(_pt, relativePt);
                     offsetX = _pt.x - this.store.activeAnchor.x;
                     offsetY = _pt.y - this.store.activeAnchor.y;
                 }
                 else if (!keyOptions.ctrlKey && keyOptions.shiftKey) {
                     var _pt = {
                         x: pt.x,
-                        y: line.calculative.worldAnchors[line.calculative.worldAnchors.length - 2].y,
+                        y: relativePt.y,
                     };
                     offsetX = _pt.x - this.store.activeAnchor.x;
                     offsetY = _pt.y - this.store.activeAnchor.y;
                 }
                 else if (keyOptions.ctrlKey && !keyOptions.shiftKey) {
                     var _pt = {
-                        x: line.calculative.worldAnchors[line.calculative.worldAnchors.length - 2].x,
+                        x: relativePt.x,
                         y: pt.y,
                     };
                     offsetX = _pt.x - this.store.activeAnchor.x;
@@ -6196,15 +6254,15 @@ var Canvas = /** @class */ (function () {
         var e_21, _a;
         var retPens = [];
         try {
-            for (var pens_9 = __values(pens), pens_9_1 = pens_9.next(); !pens_9_1.done; pens_9_1 = pens_9.next()) {
-                var pen = pens_9_1.value;
+            for (var pens_10 = __values(pens), pens_10_1 = pens_10.next(); !pens_10_1.done; pens_10_1 = pens_10.next()) {
+                var pen = pens_10_1.value;
                 retPens.push.apply(retPens, __spreadArray([], __read(deepClone(getAllChildren(pen, this.store), true)), false));
             }
         }
         catch (e_21_1) { e_21 = { error: e_21_1 }; }
         finally {
             try {
-                if (pens_9_1 && !pens_9_1.done && (_a = pens_9.return)) _a.call(pens_9);
+                if (pens_10_1 && !pens_10_1.done && (_a = pens_10.return)) _a.call(pens_10);
             }
             finally { if (e_21) throw e_21.error; }
         }
@@ -6330,6 +6388,8 @@ var Canvas = /** @class */ (function () {
                         this.render();
                         // TODO: 连线的删除 ，连接的 node 的 connectLines 会变化（删除 node ，line 的 anchors 类似），未记历史记录
                         if (history) {
+                            if (deletePens.length === 0)
+                                return [2 /*return*/];
                             this.pushHistory({ type: EditType.Delete, pens: deletePens });
                         }
                         this.store.emitter.emit('delete', pens);