@meta2d/core 1.0.29 → 1.0.31

package/package.json

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

@@ -273,6 +273,13 @@ var Canvas = /** @class */ (function () {
                 _this.translate(-e.deltaX, -e.deltaY);
                 return;
             }
+            if (Math.abs(e.wheelDelta) > 100) {
+                //鼠标滚轮滚动 scroll模式下是上下滚动而不是缩放
+                if (_this.store.options.scroll && _this.scroll) {
+                    _this.scroll.wheel(e.deltaY < 0);
+                    return;
+                }
+            }
             //禁止触摸屏双指缩放操作
             if (_this.store.options.disableTouchPadScale) {
                 return;
@@ -638,9 +645,11 @@ var Canvas = /** @class */ (function () {
                             }
                         }
                         catch (e) { }
-                        if (!(!obj && !(this.addCaches && this.addCaches.length))) return [3 /*break*/, 3];
+                        if (!!obj) return [3 /*break*/, 3];
                         files = event.dataTransfer.files;
-                        if (!(files.length && files[0].type.match('image.*'))) return [3 /*break*/, 2];
+                        if (!(files.length &&
+                            files[0].type.match('image.*') &&
+                            !(this.addCaches && this.addCaches.length))) return [3 /*break*/, 2];
                         isGif = files[0].type === 'image/gif';
                         return [4 /*yield*/, this.fileToPen(files[0], isGif)];
                     case 1:
@@ -1441,8 +1450,8 @@ var Canvas = /** @class */ (function () {
                         // 只存在一个缓存图元
                         if (_this.addCaches.length === 1) {
                             var target = _this.addCaches[0];
-                            target.width = _this.dragRect.width;
-                            target.height = _this.dragRect.height;
+                            target.width = _this.dragRect.width / _this.store.data.scale;
+                            target.height = _this.dragRect.height / _this.store.data.scale;
                             e.x = (_this.dragRect.x + _this.dragRect.ex) / 2;
                             e.y = (_this.dragRect.y + _this.dragRect.ey) / 2;
                         }
@@ -1745,6 +1754,7 @@ var Canvas = /** @class */ (function () {
                         _this.store.hover = pen;
                         _this.store.pointAt = pos.point;
                         _this.store.pointAtIndex = pos.i;
+                        _this.initTemplateCanvas([_this.store.hover]);
                         hoverType = HoverType.Line;
                         return "break";
                     }
@@ -1780,6 +1790,7 @@ var Canvas = /** @class */ (function () {
                             _this.externalElements.style.cursor = _this.store.options.hoverCursor;
                         }
                         _this.store.hover = pen;
+                        _this.initTemplateCanvas([_this.store.hover]);
                         hoverType = HoverType.Node;
                         _this.store.pointAt = pt;
                         // 锚点贴边吸附
@@ -2775,7 +2786,9 @@ var Canvas = /** @class */ (function () {
                 _this.store.hover = undefined;
             }
             _this.render();
-            if (e.toElement !== _this.tooltip.box) {
+            if (e.toElement !== _this.tooltip.box &&
+                e.toElement !== _this.tooltip.arrowUp &&
+                e.toElement !== _this.tooltip.arrowDown) {
                 _this.tooltip.hide();
                 _this.store.lastHover = undefined;
             }
@@ -2999,6 +3012,7 @@ var Canvas = /** @class */ (function () {
                                             { x: pen.x + pen.width, y: pen.y },
                                             { x: pen.x, y: pen.y + pen.height },
                                             { x: pen.x + pen.width, y: pen.y + pen.height },
+                                            { x: pen.x + pen.width / 2, y: pen.y + pen.height / 2 },
                                         ];
                                         if ((pen.x === rect_1.x &&
                                             pen.y === rect_1.y &&
@@ -3357,6 +3371,7 @@ var Canvas = /** @class */ (function () {
         if (!this.store.active.length) {
             return;
         }
+        this.initTemplateCanvas(this.store.active);
         this.store.active.forEach(function (pen) {
             pen.calculative.active = undefined;
             pen.calculative.activeAnchor = undefined;
@@ -3399,6 +3414,7 @@ var Canvas = /** @class */ (function () {
         (_b = this.store.active).push.apply(_b, __spreadArray([], __read(pens), false));
         this.activeRect = undefined;
         this.calcActiveRect();
+        this.initTemplateCanvas(pens);
         this.patchFlags = true;
         emit && this.store.emitter.emit('active', this.store.active);
     };
@@ -5198,6 +5214,9 @@ var Canvas = /** @class */ (function () {
         var from = getFromAnchor(line);
         var to = getToAnchor(line);
         var newAnchor = nearestAnchor(pen, lineAnchor === from ? to : from);
+        if (!newAnchor) {
+            return;
+        }
         lineAnchor.x = newAnchor.x;
         lineAnchor.y = newAnchor.y;
         lineAnchor.prev = undefined;