@meta2d/core 1.0.61 → 1.0.62

package/package.json

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

@@ -106,7 +106,6 @@ export declare class Canvas {
     };
     inputParent: HTMLDivElement;
     inputDiv: HTMLDivElement;
-    inputRight: HTMLDivElement;
     dropdown: HTMLUListElement;
     tooltip: Tooltip;
     title: Title;

package/src/canvas/canvas.js

@@ -94,7 +94,7 @@ export class Canvas {
     inputParent = document.createElement('div');
     // input = document.createElement('textarea');
     inputDiv = document.createElement('div');
-    inputRight = document.createElement('div');
+    // inputRight = document.createElement('div');
     dropdown = document.createElement('ul');
     tooltip;
     title;
@@ -126,13 +126,13 @@ export class Canvas {
         this.canvasImage = new CanvasImage(parentElement, store);
         this.canvasImage.canvas.style.zIndex = '4';
         this.magnifierCanvas = new MagnifierCanvas(this, parentElement, store);
-        this.magnifierCanvas.canvas.style.zIndex = '100'; //放大镜盖过dom图元
+        this.magnifierCanvas.canvas.style.zIndex = '5';
         this.externalElements.style.position = 'absolute';
         this.externalElements.style.left = '0';
         this.externalElements.style.top = '0';
         this.externalElements.style.outline = 'none';
         this.externalElements.style.background = 'transparent';
-        this.externalElements.style.zIndex = '101';
+        this.externalElements.style.zIndex = '5';
         parentElement.style.position = 'relative';
         parentElement.appendChild(this.externalElements);
         this.createInput();
@@ -6149,15 +6149,15 @@ export class Canvas {
         this.inputDiv.contentEditable =
             pen.disableInput == undefined ? 'true' : pen.disableInput.toString();
         if (pen.dropdownList && this.dropdown.style.display !== 'block') {
-            if (!this.store.data.locked) {
-                this.inputRight.style.display = 'none';
-            }
+            // if (!this.store.data.locked) {
+            //   this.inputRight.style.display = 'none';
+            // }
             this.dropdown.style.background = pen.dropdownBackground || '#fff';
             this.dropdown.style.color = pen.dropdownColor || '#bdc7db';
             this.setDropdownList();
         }
         else {
-            this.inputRight.style.display = 'none';
+            // this.inputRight.style.display = 'none';
         }
         this.inputDiv.contentEditable = 'true';
         this.inputDiv.focus();
@@ -6385,10 +6385,10 @@ export class Canvas {
     };
     createInput() {
         this.inputParent.classList.add('meta2d-input');
-        this.inputRight.classList.add('right');
+        // this.inputRight.classList.add('right');
         this.inputDiv.classList.add('input-div');
         this.inputParent.appendChild(this.inputDiv);
-        this.inputParent.appendChild(this.inputRight);
+        // this.inputParent.appendChild(this.inputRight);
         this.dropdown.onmouseleave = () => {
             this.store.hover = null;
         };
@@ -6397,9 +6397,9 @@ export class Canvas {
         this.inputParent.onmousedown = this.stopPropagation;
         this.inputDiv.onmousedown = this.stopPropagation;
         this.inputDiv.contentEditable = 'false';
-        this.inputRight.onmousedown = this.stopPropagation;
+        // this.inputRight.onmousedown = this.stopPropagation;
         this.dropdown.onmousedown = this.stopPropagation;
-        this.inputRight.style.transform = 'rotate(135deg)';
+        // this.inputRight.style.transform = 'rotate(135deg)';
         let sheet;
         for (let i = 0; i < document.styleSheets.length; i++) {
             if (document.styleSheets[i].title === 'le5le.com') {
@@ -6493,11 +6493,11 @@ export class Canvas {
             const pen = this.store.pens[this.inputDiv.dataset.penId];
             if (this.dropdown.style.display === 'block') {
                 this.dropdown.style.display = 'none';
-                this.inputRight.style.transform = 'rotate(135deg)';
+                // this.inputRight.style.transform = 'rotate(135deg)';
             }
             else if (pen?.dropdownList && this.store.data.locked) {
                 this.dropdown.style.display = 'block';
-                this.inputRight.style.transform = 'rotate(315deg)';
+                // this.inputRight.style.transform = 'rotate(315deg)';
             }
             this.store.emitter.emit('clickInput', pen);
         };
@@ -6538,15 +6538,15 @@ export class Canvas {
             return;
         }
         this.dropdown.style.display = 'block';
-        this.inputRight.style.display = 'block';
-        setTimeout(() => {
-            this.inputRight.style.transform = 'rotate(315deg)';
-            this.inputRight.style.zoom = this.store.data.scale;
-        });
+        // this.inputRight.style.display = 'block';
+        // setTimeout(() => {
+        //   this.inputRight.style.transform = 'rotate(315deg)';
+        //   (this.inputRight.style as any).zoom = this.store.data.scale;
+        // });
         if (!pen || !pen.dropdownList) {
             this.dropdown.style.display = 'none';
-            this.inputRight.style.display = 'none';
-            this.inputRight.style.transform = 'rotate(135deg)';
+            // this.inputRight.style.display = 'none';
+            // this.inputRight.style.transform = 'rotate(135deg)';
             return;
         }
         if (!pen.dropdownList.length) {
@@ -7221,12 +7221,16 @@ export class Canvas {
         this.render();
     }
     showMagnifier() {
+        this.magnifierCanvas.canvas.style.zIndex = '100';
+        this.externalElements.style.zIndex = '101';
         this.magnifierCanvas.magnifier = true;
         this.magnifierCanvas.updateDomOffscreen();
         this.externalElements.style.cursor = 'default';
         this.render();
     }
     hideMagnifier() {
+        this.magnifierCanvas.canvas.style.zIndex = '5';
+        this.externalElements.style.zIndex = '5';
         this.magnifierCanvas.magnifier = false;
         this.externalElements.style.cursor = 'default';
         this.render();