@meta2d/core 1.0.17 → 1.0.18

package/package.json

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

@@ -76,6 +76,7 @@ export declare class Canvas {
     pointSize: 8;
     pasteOffset: number;
     opening: boolean;
+    maxZindex: number;
     /**
      * @deprecated 改用 beforeAddPens
      */
@@ -324,7 +325,7 @@ export declare class Canvas {
     getFrameProps(pen: any): {};
     animate(): void;
     get clipboardName(): string;
-    copy(pens?: Pen[]): Promise<void>;
+    copy(pens?: Pen[], emit?: boolean): Promise<void>;
     cut(pens?: Pen[]): void;
     paste(): Promise<void>;
     /**

package/src/canvas/canvas.js

@@ -125,6 +125,7 @@ var Canvas = /** @class */ (function () {
         this.pointSize = 8;
         this.pasteOffset = 10;
         this.opening = false;
+        this.maxZindex = 4;
         this.inputParent = document.createElement('div');
         // input = document.createElement('textarea');
         this.inputDiv = document.createElement('div');
@@ -238,11 +239,11 @@ var Canvas = /** @class */ (function () {
             if (_this.pencil) {
                 return;
             }
-            e.preventDefault();
-            e.stopPropagation();
             if (_this.store.options.disableScale) {
                 return;
             }
+            e.preventDefault();
+            e.stopPropagation();
             if (_this.store.data.locked === LockState.Disable)
                 return;
             if (_this.store.data.locked === LockState.DisableScale)
@@ -250,7 +251,7 @@ var Canvas = /** @class */ (function () {
             if (_this.store.data.locked === LockState.DisableMoveScale)
                 return;
             // e.ctrlKey: false - 平移； true - 缩放。老windows触摸板不支持
-            if (!e.ctrlKey) {
+            if (!e.ctrlKey && Math.abs(e.wheelDelta) < 100) {
                 if (_this.store.options.scroll && !e.metaKey && _this.scroll) {
                     _this.scroll.wheel(e.deltaY < 0);
                     return;
@@ -262,13 +263,26 @@ var Canvas = /** @class */ (function () {
             if (_this.store.options.disableTouchPadScale) {
                 return;
             }
-            var x = e.offsetX, y = e.offsetY;
-            if (e.deltaY < 0) {
-                _this.scale(_this.store.data.scale + 0.015, { x: x, y: y });
+            var scaleOff = 0.015;
+            var isMac = /mac os /i.test(navigator.userAgent);
+            if (isMac) {
+                if (!e.ctrlKey) {
+                    scaleOff *= e.wheelDeltaY / 240;
+                }
+                else if (e.deltaY > 0) {
+                    scaleOff *= -1;
+                }
             }
             else {
-                _this.scale(_this.store.data.scale - 0.015, { x: x, y: y });
+                if (e.deltaY > 0) {
+                    scaleOff = -0.2;
+                }
+                else {
+                    scaleOff = 0.2;
+                }
             }
+            var x = e.offsetX, y = e.offsetY;
+            _this.scale(_this.store.data.scale + scaleOff, { x: x, y: y });
             _this.externalElements.focus(); // 聚焦
         };
         this.onkeydown = function (e) {
@@ -573,34 +587,40 @@ var Canvas = /** @class */ (function () {
                             console.warn('canvas is locked, can not drop');
                             return [2 /*return*/];
                         }
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 4, , 5]);
-                        // TODO: 若画布锁定，阻止默认行为不再执行。在 firefox 上拖拽图片会打开新页
+                        // Fix bug: 在 firefox 上拖拽图片会打开新页
                         event.preventDefault();
                         event.stopPropagation();
                         json = event.dataTransfer.getData('Meta2d') ||
                             event.dataTransfer.getData('Text');
                         obj = null;
-                        if (!!json) return [3 /*break*/, 3];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 5, , 6]);
+                        if (!json) return [3 /*break*/, 2];
+                        obj = JSON.parse(json);
+                        return [3 /*break*/, 4];
+                    case 2:
                         files = event.dataTransfer.files;
-                        if (!(files.length && files[0].type.match('image.*'))) return [3 /*break*/, 3];
+                        if (!(files.length && files[0].type.match('image.*'))) return [3 /*break*/, 4];
                         isGif = files[0].type === 'image/gif';
                         return [4 /*yield*/, this.fileToPen(files[0], isGif)];
-                    case 2:
-                        obj = _a.sent();
-                        _a.label = 3;
                     case 3:
-                        !obj && (obj = JSON.parse(json));
-                        obj = Array.isArray(obj) ? obj : [obj];
-                        pt = { x: event.offsetX, y: event.offsetY };
-                        this.calibrateMouse(pt);
-                        this.dropPens(obj, pt);
-                        return [3 /*break*/, 5];
+                        obj = _a.sent();
+                        _a.label = 4;
                     case 4:
+                        if (obj && obj.draggable !== false) {
+                            obj = Array.isArray(obj) ? obj : [obj];
+                            pt = { x: event.offsetX, y: event.offsetY };
+                            this.calibrateMouse(pt);
+                            this.dropPens(obj, pt);
+                        }
+                        return [3 /*break*/, 6];
+                    case 5:
                         e_1 = _a.sent();
-                        return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6:
+                        this.store.emitter.emit('drop', obj || json);
+                        return [2 /*return*/];
                 }
             });
         }); };
@@ -3651,6 +3671,7 @@ var Canvas = /** @class */ (function () {
         else {
             this.initImageCanvas(action.pens);
         }
+        this.parent.onSizeUpdate();
         this.render();
         this.store.emitter.emit(undo ? 'undo' : 'redo', action);
     };
@@ -5244,7 +5265,8 @@ var Canvas = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Canvas.prototype.copy = function (pens) {
+    Canvas.prototype.copy = function (pens, emit) {
+        if (emit === void 0) { emit = true; }
         return __awaiter(this, void 0, void 0, function () {
             var page, _a, origin, scale, copyPens, clipboard, _b;
             var _this = this;
@@ -5294,14 +5316,17 @@ var Canvas = /** @class */ (function () {
                     case 5:
                         localStorage.setItem(this.clipboardName, JSON.stringify(clipboard));
                         _c.label = 6;
-                    case 6: return [2 /*return*/];
+                    case 6:
+                        emit && this.store.emitter.emit('copy', clipboard.pens);
+                        return [2 /*return*/];
                 }
             });
         });
     };
     Canvas.prototype.cut = function (pens) {
-        this.copy(pens);
+        this.copy(pens, false);
         this.delete(pens);
+        this.store.emitter.emit('cut', pens);
     };
     Canvas.prototype.paste = function () {
         var _a;
@@ -5388,6 +5413,7 @@ var Canvas = /** @class */ (function () {
                         this.pushHistory({ type: EditType.Add, pens: this.store.clipboard.pens });
                         this.render();
                         this.store.emitter.emit('add', this.store.clipboard.pens);
+                        this.store.emitter.emit('paste', this.store.clipboard.pens);
                         return [2 /*return*/];
                 }
             });