@meta2d/core 1.0.54 → 1.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.54",
+    "version": "1.0.55",
     "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
     "main": "index.js",
     "types": "index.d.ts",

package/src/canvas/canvas.d.ts

@@ -129,6 +129,7 @@ export declare class Canvas {
     onCopy: (event: ClipboardEvent) => void;
     onCut: (event: ClipboardEvent) => void;
     onPaste: (event: ClipboardEvent) => void;
+    onMessage: (e: MessageEvent) => void;
     onwheel: (e: WheelEvent) => void;
     onkeydown: (e: KeyboardEvent) => void;
     /**

package/src/canvas/canvas.js

@@ -233,6 +233,20 @@ var Canvas = /** @class */ (function () {
                 _this.paste();
             }
         };
+        this.onMessage = function (e) {
+            if (typeof e.data !== 'string' ||
+                !e.data ||
+                e.data.startsWith('setImmediate')) {
+                return;
+            }
+            var data = JSON.parse(e.data);
+            if (typeof data === 'object') {
+                _this.parent.doMessageEvent(data.name);
+            }
+            else {
+                _this.parent.doMessageEvent(data);
+            }
+        };
         this.onwheel = function (e) {
             //输入模式不允许滚动
             if (_this.inputDiv.contentEditable === 'true') {
@@ -251,7 +265,7 @@ var Canvas = /** @class */ (function () {
                     return;
                 }
             }
-            if (_this.store.options.disableScale) {
+            if (_this.store.data.disableScale || _this.store.options.disableScale) {
                 return;
             }
             e.preventDefault();
@@ -279,8 +293,8 @@ var Canvas = /** @class */ (function () {
                 return;
             }
             if (Math.abs(e.wheelDelta) > 100) {
-                //鼠标滚轮滚动 scroll模式下是上下滚动而不是缩放
-                if (_this.store.options.scroll && _this.scroll && !_this.store.options.scrollButScale) {
+                //鼠标滚轮滚动 scroll模式下是上下滚动而不是缩放 ctrl可以控制缩放
+                if (_this.store.options.scroll && _this.scroll && !_this.store.options.scrollButScale && !(e.ctrlKey || e.metaKey)) {
                     _this.scroll.wheel(e.deltaY < 0);
                     return;
                 }
@@ -961,7 +975,7 @@ var Canvas = /** @class */ (function () {
                     }
                 }
                 if (_this.touchScaling) {
-                    if (_this.store.options.disableScale) {
+                    if (_this.store.data.disableScale || _this.store.options.disableScale) {
                         return;
                     }
                     var scale = Math.hypot(touches[0].pageX - touches[1].pageX, touches[0].pageY - touches[1].pageY) / _this.initTouchDis;
@@ -970,6 +984,7 @@ var Canvas = /** @class */ (function () {
                 if (_this.touchMoving) {
                     if ((_this.store.data.locked >= LockState.DisableMove &&
                         _this.store.data.locked !== LockState.DisableScale) ||
+                        _this.store.data.disableScale ||
                         _this.store.options.disableScale) {
                         return;
                     }
@@ -1322,7 +1337,7 @@ var Canvas = /** @class */ (function () {
                     return;
                 }
             }
-            if (_this.mouseDown && !_this.store.options.disableTranslate) {
+            if (_this.mouseDown && !_this.store.options.disableTranslate && !_this.store.data.disableTranslate) {
                 // 画布平移前提
                 if (_this.mouseRight === MouseRight.Down) {
                     _this.mouseRight = MouseRight.Translate;
@@ -1859,15 +1874,17 @@ var Canvas = /** @class */ (function () {
                         }
                     }
                     else {
-                        _this.store.hoverContainer = undefined;
-                        if (_this.store.lastHoverContainer !== _this.store.hoverContainer) {
-                            _this.patchFlags = true;
-                            var movingPen = _this.store.lastHoverContainer.calculative.canvas.store.pens[_this.store.lastHoverContainer.id + movingSuffix];
-                            if (_this.store.lastHoverContainer && !movingPen) {
-                                _this.store.lastHoverContainer.calculative.containerHover = false;
-                                _this.store.emitter.emit('leave', _this.store.lastHoverContainer);
+                        if (pen === _this.store.hoverContainer) {
+                            _this.store.hoverContainer = undefined;
+                            if (_this.store.lastHoverContainer !== _this.store.hoverContainer) {
+                                _this.patchFlags = true;
+                                var movingPen = _this.store.lastHoverContainer.calculative.canvas.store.pens[_this.store.lastHoverContainer.id + movingSuffix];
+                                if (_this.store.lastHoverContainer && !movingPen) {
+                                    _this.store.lastHoverContainer.calculative.containerHover = false;
+                                    _this.store.emitter.emit('leave', _this.store.lastHoverContainer);
+                                }
+                                _this.store.lastHoverContainer = _this.store.hoverContainer;
                             }
-                            _this.store.lastHoverContainer = _this.store.hoverContainer;
                         }
                     }
                 }
@@ -3100,6 +3117,7 @@ var Canvas = /** @class */ (function () {
         this.listen();
         window === null || window === void 0 ? void 0 : window.addEventListener('resize', this.onResize);
         window === null || window === void 0 ? void 0 : window.addEventListener('scroll', this.onScroll);
+        window === null || window === void 0 ? void 0 : window.addEventListener('message', this.onMessage);
     }
     Canvas.prototype.listen = function () {
         var _this = this;
@@ -8159,6 +8177,7 @@ var Canvas = /** @class */ (function () {
         document.removeEventListener('copy', this.onCopy);
         document.removeEventListener('cut', this.onCut);
         document.removeEventListener('paste', this.onPaste);
+        window && window.removeEventListener('message', this.onMessage);
         window && window.removeEventListener('resize', this.onResize);
         window && window.removeEventListener('scroll', this.onScroll);
     };