@meta2d/core 1.1.4 → 1.1.6

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@meta2d/core",
-  "version": "1.1.4",
-  "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "scripts": {
-    "copy": "copyfiles  package.json ../../dist/core/",
-    "build": "tsc && npm run copy"
-  },
-  "keywords": [
-    "meta2d",
-    "diagram",
-    "2D",
-    "canvas"
-  ],
-  "author": "alsmile123@qq.com",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/le5le-com/meta2d.js.git"
-  },
-  "bugs": {
-    "url": "https://github.com/le5le-com/meta2d.js/issues"
-  },
-  "homepage": "https://github.com/le5le-com/meta2d.js#readme",
-  "devDependencies": {
-    "@types/marked": "^4.0.3",
-    "@types/offscreencanvas": "latest",
-    "@types/zrender": "^4.0.0"
-  },
-  "dependencies": {
-    "mitt": "^2.1.0",
-    "mqtt": "^4.2.6"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "gitHead": "78f2a53ca1839c89b56e2e498d17ba4eb987ad14"
-}
+{
+  "name": "@meta2d/core",
+  "version": "1.1.6",
+  "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "scripts": {
+    "copy": "copyfiles  package.json ../../dist/core/",
+    "build": "tsc && npm run copy"
+  },
+  "keywords": [
+    "meta2d",
+    "diagram",
+    "2D",
+    "canvas"
+  ],
+  "author": "alsmile123@qq.com",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/le5le-com/meta2d.js.git"
+  },
+  "bugs": {
+    "url": "https://github.com/le5le-com/meta2d.js/issues"
+  },
+  "homepage": "https://github.com/le5le-com/meta2d.js#readme",
+  "devDependencies": {
+    "@types/marked": "^4.0.3",
+    "@types/offscreencanvas": "latest",
+    "@types/zrender": "^4.0.0"
+  },
+  "dependencies": {
+    "mitt": "^2.1.0",
+    "mqtt": "^4.2.6"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "78f2a53ca1839c89b56e2e498d17ba4eb987ad14"
+}

package/src/canvas/canvas.js

@@ -181,9 +181,16 @@ export class Canvas {
         this.externalElements.ondrop = this.ondrop;
         this.externalElements.oncontextmenu = (e) => e.preventDefault();
         this.store.options.interval = 50;
-        this.externalElements.ontouchstart = this.ontouchstart;
-        this.externalElements.ontouchmove = this.ontouchmove;
-        this.externalElements.ontouchend = this.ontouchend;
+        if (this.store.options.parentTouch) {
+            this.parentElement.ontouchstart = this.ontouchstart;
+            this.parentElement.ontouchmove = this.ontouchmove;
+            this.parentElement.ontouchend = this.ontouchend;
+        }
+        else {
+            this.externalElements.ontouchstart = this.ontouchstart;
+            this.externalElements.ontouchmove = this.ontouchmove;
+            this.externalElements.ontouchend = this.ontouchend;
+        }
         this.externalElements.onmousedown = (e) => {
             if (this.isMobile) {
                 return;
@@ -1390,6 +1397,7 @@ export class Canvas {
                 buttons: 1,
             });
             if (e.touches.length === 2) {
+                this.mouseDown = undefined;
                 this.initTouchDis = Math.hypot(e.touches[0].pageX - e.touches[1].pageX, e.touches[0].pageY - e.touches[1].pageY);
                 this.initScale = this.store.data.scale;
                 this.startTouches = e.touches;
@@ -1457,16 +1465,17 @@ export class Canvas {
             });
         }
         else if (len === 2 && this.startTouches?.length === 2) {
+            this.mouseDown = undefined;
             if (!this.touchMoving && !this.touchScaling) {
                 const x1 = this.startTouches[0].pageX - touches[0].pageX;
                 const x2 = this.startTouches[1].pageX - touches[1].pageX;
                 const y1 = this.startTouches[0].pageY - touches[0].pageY;
                 const y2 = this.startTouches[1].pageY - touches[1].pageY;
-                if (((x1 >= 0 && x2 < 0) || (x1 <= 0 && x2 > 0)) &&
-                    ((y1 >= 0 && y2 < 0) || (y1 <= 0 && y2 > 0))) {
+                if ((((x1 >= 0 && x2 < 0) || (x1 <= 0 && x2 > 0)) &&
+                    ((y1 >= 0 && y2 < 0) || (y1 <= 0 && y2 > 0))) || (x2 == 0 && y2 == 0) || (x1 == 0 && y1 == 0)) {
                     this.touchScaling = true;
                 }
-                else {
+                else if (y1 * y2 > 0 && x1 * x2 > 0) {
                     this.touchMoving = true;
                 }
             }
@@ -6833,8 +6842,8 @@ export class Canvas {
         }
         sheet.deleteRule(0);
         sheet.deleteRule(0);
-        sheet.insertRule(`.meta2d-input
-      .input-div{
+        sheet.insertRule(`.meta2d-input
+      .input-div{
         resize:none;border:none;outline:none;background:transparent;position:absolute;flex-grow:1;height:100%;width: 100%;position:absolute;left:0;top:0;display:flex;flex-direction: column;cursor: text;${style}}`);
         sheet.insertRule(`.input-div div{${div_style}}`);
         // sheet.insertRule(`.meta2d-input .input-div-font{${style_font}}`);
@@ -8170,9 +8179,16 @@ export class Canvas {
         this.externalElements.removeEventListener('gesturestart', this.onGesturestart);
         this.externalElements.ondragover = (e) => e.preventDefault();
         this.externalElements.ondrop = undefined;
-        this.externalElements.ontouchstart = undefined;
-        this.externalElements.ontouchmove = undefined;
-        this.externalElements.ontouchend = undefined;
+        if (this.store.options.parentTouch) {
+            this.parentElement.ontouchstart = undefined;
+            this.parentElement.ontouchmove = undefined;
+            this.parentElement.ontouchend = undefined;
+        }
+        else {
+            this.externalElements.ontouchstart = undefined;
+            this.externalElements.ontouchmove = undefined;
+            this.externalElements.ontouchend = undefined;
+        }
         this.externalElements.onmousedown = undefined;
         this.externalElements.onmousemove = undefined;
         this.externalElements.onmouseup = undefined;