@meta2d/core 1.0.84-alpha.1 → 1.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.0.84-alpha.1",
+  "version": "1.0.85",
   "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

@@ -1,5 +1,5 @@
 import { KeydownType } from '../options';
-import { addLineAnchor, calcIconRect, calcTextRect, calcWorldAnchors, calcWorldRects, LockState, nearestAnchor, PenType, pushPenAnchor, removePenAnchor, renderPen, scalePen, translateLine, deleteTempAnchor, connectLine, disconnectLine, getAnchor, calcAnchorDock, calcMoveDock, calcTextLines, setNodeAnimate, setLineAnimate, calcPenRect, setChildrenActive, getParent, setHover, randomId, getPensLock, getToAnchor, getFromAnchor, calcPadding, getPensDisableRotate, getPensDisableResize, needCalcTextRectProps, calcResizeDock, needPatchFlagsPenRectProps, needCalcIconRectProps, isDomShapes, renderPenRaw, needSetPenProps, getAllChildren, calcInView, isShowChild, getTextColor, clearLifeCycle, rotatePen, calcTextAutoWidth, getGradientAnimatePath, CanvasLayer, ctxFlip, ctxRotate, setGlobalAlpha, drawImage, setElemPosition, getAllFollowers, calcChildrenInitRect, } from '../pen';
+import { addLineAnchor, calcIconRect, calcTextRect, calcWorldAnchors, calcWorldRects, LockState, nearestAnchor, PenType, pushPenAnchor, removePenAnchor, renderPen, scalePen, translateLine, deleteTempAnchor, connectLine, disconnectLine, getAnchor, calcAnchorDock, calcMoveDock, calcTextLines, setNodeAnimate, setLineAnimate, calcPenRect, setChildrenActive, getParent, setHover, randomId, getPensLock, getToAnchor, getFromAnchor, calcPadding, getPensDisableRotate, getPensDisableResize, needCalcTextRectProps, calcResizeDock, needPatchFlagsPenRectProps, needCalcIconRectProps, isDomShapes, renderPenRaw, needSetPenProps, getAllChildren, calcInView, isShowChild, getTextColor, clearLifeCycle, rotatePen, calcTextAutoWidth, getGradientAnimatePath, CanvasLayer, ctxFlip, ctxRotate, setGlobalAlpha, drawImage, setElemPosition, getAllFollowers, calcChildrenInitRect, needImgCanvasPatchFlagsProps, } from '../pen';
 import { calcRotate, distance, getDistance, hitPoint, PointType, PrevNextType, rotatePoint, samePoint, scalePoint, translatePoint, TwoWay, } from '../point';
 import { calcCenter, calcRightBottom, calcRelativePoint, getRect, getRectOfPoints, pointInRect, pointInSimpleRect, rectInRect, rectToPoints, resizeRect, translateRect, pointInPolygon } from '../rect';
 import { EditType, globalStore, } from '../store';
@@ -2256,6 +2256,9 @@ export class Canvas {
                         this.store.hover.onShowInput(this.store.hover, e);
                     }
                     else {
+                        if (this.store.hover.parentId) {
+                            this.active([this.store.hover]);
+                        }
                         this.showInput(this.store.hover);
                     }
                 }
@@ -4094,6 +4097,9 @@ export class Canvas {
         }, 50);
     }
     initGlobalStyle() {
+        if (this.store.options.themeOnlyCanvas || this.store.data.themeOnlyCanvas) {
+            return;
+        }
         const options = {};
         const data = {};
         const theme = {};
@@ -4177,9 +4183,9 @@ export class Canvas {
             if (pen.canvasLayer === CanvasLayer.CanvasTemplate) {
                 continue;
             }
-            if (pen.name === 'combine' && !pen.draw) {
-                continue;
-            }
+            // if (pen.name === 'combine' && !pen.draw){
+            //   continue;
+            // }
             if (pen.calculative.inView) {
                 if (pen.canvasLayer === CanvasLayer.CanvasMain &&
                     pen.name !== 'gif' &&
@@ -4211,9 +4217,9 @@ export class Canvas {
     };
     renderPenContainChild = (ctx, pen) => {
         if (pen.calculative.inView) {
-            if (!(pen.name === 'combine' && !pen.draw)) {
-                renderPen(ctx, pen); // 可见才绘制，组合为状态只显示其中一个
-            }
+            // if (!(pen.name === 'combine' && !pen.draw)){
+            renderPen(ctx, pen); // 可见才绘制，组合为状态只显示其中一个
+            // }
         }
         pen.children?.forEach((id) => {
             const child = this.store.pens[id];
@@ -6954,7 +6960,7 @@ export class Canvas {
                 if (needCalcIconRectProps.includes(k)) {
                     willCalcIconRect = true;
                 }
-                if (pen.image && pen.name !== 'gif' && ['globalAlpha', 'flipY', 'flipX', 'x', 'y', 'width', 'height', 'iconWidth', 'iconHeight', 'imageRatio', 'iconLeft', 'iconTop', 'iconAlign', 'rotate', 'visible'].includes(k)) {
+                if (pen.image && pen.name !== 'gif' && needImgCanvasPatchFlagsProps.includes(k)) {
                     willRenderImage = true;
                 }
             }
@@ -7193,7 +7199,7 @@ export class Canvas {
         // }
         ctx.textBaseline = 'middle'; // 默认垂直居中
         ctx.scale(scale, scale);
-        const background = this.store.data.background || this.store.styles.background;
+        const background = this.store.options.downloadBgTransparent ? undefined : (this.store.data.background || this.store.styles.background);
         // this.store.data.background || this.store.options.background;
         if (background && isV) {
             // 绘制背景颜色
@@ -7250,9 +7256,9 @@ export class Canvas {
             if (!isShowChild(pen, this.store) || pen.visible == false) {
                 continue;
             }
-            if (pen.name === 'combine' && !pen.draw) {
-                continue;
-            }
+            // if (pen.name === 'combine' && !pen.draw){
+            //   continue;
+            // }
             // TODO: hover 待考虑，若出现再补上
             const { active } = pen.calculative;
             pen.calculative.active = false;
@@ -7307,7 +7313,7 @@ export class Canvas {
         const ctx = canvas.getContext('2d');
         ctx.textBaseline = 'middle'; // 默认垂直居中
         ctx.scale(scale, scale);
-        const background = this.store.data.background || this.store.styles.background;
+        const background = this.store.options.downloadBgTransparent ? undefined : (this.store.data.background || this.store.styles.background);
         // this.store.data.background || this.store.options.background;
         if (background) {
             // 绘制背景颜色
@@ -7324,9 +7330,9 @@ export class Canvas {
                 if (!isShowChild(pen, this.store) || pen.visible == false) {
                     continue;
                 }
-                if (pen.name === 'combine' && !pen.draw) {
-                    continue;
-                }
+                // if (pen.name === 'combine' && !pen.draw){
+                //   continue;
+                // }
                 const { active } = pen.calculative;
                 pen.calculative.active = false;
                 if (pen.calculative.img) {