@meta2d/core 1.0.57 → 1.0.58

package/src/core.js

@@ -1,6 +1,6 @@
 import { commonAnchors, commonPens, cube } from './diagrams';
 import { Canvas } from './canvas';
-import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers, isInteraction } from './pen';
+import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers, isInteraction, calcWorldAnchors } from './pen';
 import { rotatePoint } from './point';
 import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, useStore, } from './store';
 import { formatPadding, loadCss, s8, valueInArray, valueInRange, } from './utils';
@@ -144,7 +144,7 @@ export class Meta2d {
         this.render();
     }
     setDatabyOptions(options = {}) {
-        const { color, activeColor, activeBackground, grid, gridColor, gridSize, fromArrow, toArrow, rule, ruleColor, textColor, } = options;
+        const { color, activeColor, activeBackground, grid, gridColor, gridSize, fromArrow, toArrow, rule, ruleColor, textColor, x = 0, y = 0, } = options;
         this.setRule({ rule, ruleColor });
         this.setGrid({
             grid,
@@ -158,6 +158,8 @@ export class Meta2d {
             activeBackground,
             fromArrow,
             toArrow,
+            x,
+            y
         });
     }
     init(parent) {
@@ -1328,9 +1330,26 @@ export class Meta2d {
         const pIdx = pens.findIndex(pen => pen.name === 'combine' && pen.showChild !== undefined);
         if (pIdx !== -1) {
             let parent = pens[pIdx];
-            this.pushChildren(parent, [...pens.slice(0, pIdx), ...pens.slice(pIdx + 1)]);
+            // this.pushChildren(parent,[...pens.slice(0, pIdx), ...pens.slice(pIdx + 1)]);
+            const rect = getRect(pens);
+            Object.assign(parent, rect);
+            Object.assign(parent.calculative.worldRect, rect);
+            calcWorldAnchors(parent);
+            parent.children.forEach(penId => {
+                const pen = this.store.pens[penId];
+                const childRect = calcRelativeRect(pen.calculative.worldRect, rect);
+                Object.assign(pen, childRect);
+            });
             pens.forEach((pen) => {
-                calcInView(pen, true);
+                if (pen.id !== parent.id) {
+                    parent.children.push(pen.id);
+                    pen.parentId = parent.id;
+                    const childRect = calcRelativeRect(pen.calculative.worldRect, rect);
+                    Object.assign(pen, childRect);
+                    pen.locked = pen.lockedOnCombine ?? LockState.DisableMove;
+                    pen.locked = (pen.interaction || isInteraction.includes(pen.name)) ? 0 : pen.locked;
+                    calcInView(pen, true);
+                }
             });
             this.initImageCanvas(pens);
             this.render();