@meta2d/core 1.0.63 → 1.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.0.63",
+  "version": "1.0.64",
   "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,7 +129,7 @@ export declare class Canvas {
     listen(): void;
     onCopy: (event: ClipboardEvent) => void;
     onCut: (event: ClipboardEvent) => void;
-    onPaste: (event: ClipboardEvent) => void;
+    onPaste: (event: ClipboardEvent) => Promise<void>;
     onMessage: (e: MessageEvent) => void;
     onwheel: (e: WheelEvent) => void;
     onkeydown: (e: KeyboardEvent) => void;

package/src/canvas/canvas.js

@@ -285,7 +285,7 @@ export class Canvas {
         }
         this.cut();
     };
-    onPaste = (event) => {
+    onPaste = async (event) => {
         if (this.store.data.locked || this.store.options.disableClipboard) {
             return;
         }
@@ -316,29 +316,39 @@ export class Canvas {
                         const blob = items[i].getAsFile();
                         let name = items[i].type.slice(6) === 'gif' ? 'gif' : 'image';
                         if (blob !== null) {
-                            let base64_str;
-                            const reader = new FileReader();
-                            reader.onload = (e) => {
-                                base64_str = e.target.result;
-                                const image = new Image();
-                                image.src = base64_str;
-                                image.onload = () => {
-                                    const { width, height } = image;
-                                    const pen = {
-                                        name,
-                                        x: x - 50 / 2,
-                                        y: y - (height / width) * 50,
-                                        externElement: name === 'gif',
-                                        width: 100,
-                                        height: (height / width) * 100,
-                                        image: base64_str,
-                                    };
-                                    this.addPens([pen]);
-                                    this.active([pen]);
-                                    this.copy([pen]);
-                                };
-                            };
-                            reader.readAsDataURL(blob);
+                            const isGif = name === 'gif';
+                            const pen = await this.fileToPen(blob, isGif);
+                            pen.height = (pen.height / pen.width) * 100,
+                                pen.width = 100;
+                            pen.x = x - 50 / 2,
+                                pen.y = y - (pen.height / pen.width) * 50,
+                                pen.externElement = isGif,
+                                this.addPens([pen]);
+                            this.active([pen]);
+                            this.copy([pen]);
+                            // let base64_str: any;
+                            // const reader = new FileReader();
+                            // reader.onload = (e) => {
+                            //   base64_str = e.target.result;
+                            //   const image = new Image();
+                            //   image.src = base64_str;
+                            //   image.onload = () => {
+                            //     const { width, height } = image;
+                            //     const pen = {
+                            //       name,
+                            //       x: x - 50 / 2,
+                            //       y: y - (height / width) * 50,
+                            //       externElement: name === 'gif',
+                            //       width: 100,
+                            //       height: (height / width) * 100,
+                            //       image: base64_str as any,
+                            //     };
+                            //     this.addPens([pen]);
+                            //     this.active([pen]);
+                            //     this.copy([pen]);
+                            //   };
+                            // };
+                            // reader.readAsDataURL(blob);
                         }
                     }
                 }
@@ -6171,6 +6181,7 @@ export class Canvas {
             this.dropdown.style.background = pen.dropdownBackground || '#fff';
             this.dropdown.style.color = pen.dropdownColor || '#bdc7db';
             this.setDropdownList();
+            this.externalElements.style.zIndex = '9999';
         }
         else {
             // this.inputRight.style.display = 'none';
@@ -6353,6 +6364,7 @@ export class Canvas {
         });
     }
     hideInput = () => {
+        this.externalElements.style.zIndex = '5';
         if (this.inputParent.style.display === 'flex') {
             this.inputParent.style.display = 'none';
             const pen = this.store.pens[this.inputDiv.dataset.penId];