@meta2d/core 1.1.15 → 1.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.1.15",
+  "version": "1.1.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.js

@@ -855,7 +855,12 @@ export class Canvas {
             case 'z':
             case 'Z':
                 if (e.ctrlKey || e.metaKey) {
-                    this.undo();
+                    if (e.shiftKey) {
+                        this.redo();
+                    }
+                    else {
+                        this.undo();
+                    }
                 }
                 else if (e.shiftKey) {
                     this.redo();
@@ -1089,7 +1094,7 @@ export class Canvas {
             img.onerror = (e) => {
                 reject(e);
             };
-            img.crossOrigin = 'anonymous';
+            img.crossOrigin = this.store.options.crossOrigin || 'anonymous';
             img.src = url;
         });
     }
@@ -4001,6 +4006,7 @@ export class Canvas {
             const image64 = 'data:image/svg+xml;base64,' + svg64;
             // set that as your image source
             img.src = image64;
+            img.crossOrigin = pen.crossOrigin || this.store.options.crossOrigin || 'anonymous';
             // do your canvas work
             img.onload = () => {
                 pen.calculative.img = img;
@@ -4044,7 +4050,7 @@ export class Canvas {
                         img.crossOrigin =
                             pen.crossOrigin === 'undefined'
                                 ? undefined
-                                : pen.crossOrigin || 'anonymous';
+                                : pen.crossOrigin || this.store.options.crossOrigin || 'anonymous';
                         img.src = pen.image;
                         if (this.store.options.cdn &&
                             !(pen.image.startsWith('http') ||
@@ -4080,7 +4086,7 @@ export class Canvas {
                 }
                 else {
                     const img = new Image();
-                    img.crossOrigin = 'anonymous';
+                    img.crossOrigin = pen.crossOrigin || this.store.options.crossOrigin || 'anonymous';
                     img.src = pen.backgroundImage;
                     if (this.store.options.cdn &&
                         !(pen.backgroundImage.startsWith('http') ||
@@ -4110,7 +4116,7 @@ export class Canvas {
                 }
                 else {
                     const img = new Image();
-                    img.crossOrigin = 'anonymous';
+                    img.crossOrigin = pen.crossOrigin || this.store.options.crossOrigin || 'anonymous';
                     img.src = pen.strokeImage;
                     if (this.store.options.cdn &&
                         !(pen.strokeImage.startsWith('http') ||
@@ -4142,7 +4148,7 @@ export class Canvas {
         const promise = new Promise((resolve, reject) => {
             if (!globalStore.htmlElements[src]) {
                 const img = new Image();
-                img.crossOrigin = 'anonymous';
+                img.crossOrigin = this.store.options.crossOrigin || 'anonymous';
                 // 处理 CDN 路径
                 if (this.store.options.cdn &&
                     !(src.startsWith('http') ||
@@ -4354,12 +4360,20 @@ export class Canvas {
             return;
         }
         if (now - this.lastRender < this.store.options.interval) {
+            if (this.store.options.interval > this.store.options.minFPSNumber && this.store.options.autoFPS) {
+                this.store.options.interval--;
+                this.store.options.animateInterval = this.store.options.interval;
+            }
             if (this.renderTimer) {
                 cancelAnimationFrame(this.renderTimer);
             }
             this.renderTimer = requestAnimationFrame(this.render);
             return;
         }
+        else if (now - this.lastRender - this.store.options.interval > 10 && this.store.options.autoFPS && document.visibilityState === 'visible') {
+            this.store.options.interval++;
+            this.store.options.animateInterval = this.store.options.interval;
+        }
         this.renderTimer = undefined;
         this.lastRender = now;
         const offscreenCtx = this.offscreen.getContext('2d');
@@ -7183,6 +7197,7 @@ export class Canvas {
         li.onmousedown = this.stopPropagation;
         li.dataset.i = index + '';
         li.onclick = this.selectDropdown;
+        li.ontouchstart = this.selectDropdown;
         const pen = this.store.pens[this.inputDiv.dataset.penId];
         li.onmouseenter = () => {
             li.style.background = pen.dropdownHoverBackground || this.store.styles["activeBg"] || '#eee';
@@ -7195,6 +7210,7 @@ export class Canvas {
         this.dropdown.appendChild(li);
     }
     selectDropdown = (e) => {
+        e.stopPropagation();
         const li = e.target;
         const pen = this.store.pens[this.inputDiv.dataset.penId];
         if (!li || !pen || !pen.dropdownList) {