@meta2d/core 1.0.3 → 1.0.4

package/package.json

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

@@ -237,6 +237,25 @@ var Canvas = /** @class */ (function () {
             }
             e.preventDefault();
             e.stopPropagation();
+            //禁止触摸屏双指缩放操作
+            if (_this.store.options.disableTouchPadScale &&
+                e.ctrlKey &&
+                e.deltaY !== 0) {
+                return;
+            }
+            //window触控板只允许平移 触摸屏一般不超过100
+            var isWin = navigator.userAgent.indexOf('Win') !== -1;
+            if (isWin && !e.ctrlKey && Math.abs(e.deltaY) < 100) {
+                _this.translate(-e.deltaX, -e.deltaY);
+                return;
+            }
+            //mac触控板只允许平移（排除普通鼠标的情况）
+            var isMac = /macintosh|mac os x/i.test(navigator.userAgent) ||
+                navigator.platform.indexOf('Mac') !== -1;
+            if (isMac && !e.ctrlKey && e.wheelDeltaY % 240 !== 0) {
+                _this.translate(-e.deltaX, -e.deltaY);
+                return;
+            }
             if (_this.store.options.scroll && !e.ctrlKey && !e.metaKey && _this.scroll) {
                 _this.scroll.wheel(e.deltaY < 0);
                 return;
@@ -542,6 +561,20 @@ var Canvas = /** @class */ (function () {
                     _this.store.options.disableAnchor = !_this.store.options.disableAnchor;
                     _this.store.emitter.emit('disableAnchor', _this.store.options.disableAnchor);
                     break;
+                case '=':
+                    if (e.ctrlKey || e.metaKey) {
+                        _this.scale(_this.store.data.scale + 0.1);
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                    break;
+                case '-':
+                    if (e.ctrlKey || e.metaKey) {
+                        _this.scale(_this.store.data.scale - 0.1);
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                    break;
             }
             _this.render(false);
         };
@@ -779,7 +812,7 @@ var Canvas = /** @class */ (function () {
             }
             //shift 快捷添加锚点并连线
             if (!_this.store.options.autoAnchor && !_this.drawingLine) {
-                if (e.shiftKey) {
+                if (e.shiftKey && !e.ctrlKey) {
                     _this.setAnchor(_this.store.pointAt);
                     _this.drawingLineName = _this.store.options.drawingLineName;
                     var anchor = _this.store.activeAnchor;
@@ -2310,7 +2343,7 @@ var Canvas = /** @class */ (function () {
                     : pen.textHeight * font_scale) + "px;";
             }
             else {
-                var tem = pen.height / scale - (pen.textTop || 0);
+                var tem = pen.calculative.worldRect.height / scale - (pen.textTop || 0);
                 if (tem < 0) {
                     tem = 0;
                 }
@@ -2357,8 +2390,10 @@ var Canvas = /** @class */ (function () {
             }
             if (pen.whiteSpace !== 'nowrap') {
                 var textWidth = pen.fontSize * 1.2 * pen.text.length;
-                var contentWidth = (pen.textWidth || pen.width / scale) *
-                    Math.floor(pen.height / scale / (pen.lineHeight * pen.fontSize));
+                var contentWidth = (pen.textWidth || pen.calculative.worldRect.width / scale) *
+                    Math.floor(pen.calculative.worldRect.height /
+                        scale /
+                        (pen.lineHeight * pen.fontSize));
                 if (textWidth > contentWidth) {
                     style += 'justify-content: start;';
                 }
@@ -4638,7 +4673,7 @@ var Canvas = /** @class */ (function () {
             return;
         }
         var initPens = !doing && deepClone(pens, true);
-        translateRect(this.activeRect, x, y);
+        this.activeRect && translateRect(this.activeRect, x, y);
         var containChildPens = this.getAllByPens(pens);
         pens.forEach(function (pen) {
             var _a, _b;
@@ -4677,7 +4712,7 @@ var Canvas = /** @class */ (function () {
             _this.updateLines(pen);
             (_b = pen.onMove) === null || _b === void 0 ? void 0 : _b.call(pen, pen);
         });
-        this.getSizeCPs();
+        this.activeRect && this.getSizeCPs();
         this.render();
         this.tooltip.translate(x, y);
         if (!doing) {