@plait/mind 0.90.1 → 0.92.0-next.0

package/fesm2022/plait-mind.mjs

@@ -1552,7 +1552,7 @@ function drawLogicLink(board, parent, node, isHorizontal, defaultStrokeColor = n
 }
 
 function drawLink(board, parentNode, node, isHorizontal, needDrawUnderline, defaultStrokeColor, defaultStrokeWidth, defaultStrokeStyle) {
-    return MindElement.isIndentedLayout(parentNode.origin)
+    return MindElement.isIndentedLayout(board, parentNode.origin)
         ? drawIndentedLink(board, parentNode, node, needDrawUnderline, defaultStrokeColor, defaultStrokeWidth, defaultStrokeStyle)
         : drawLogicLink(board, parentNode, node, isHorizontal, defaultStrokeColor, defaultStrokeWidth, defaultStrokeStyle);
 }
@@ -1654,7 +1654,7 @@ const drawFakeDropNode = (board, dropTarget, path) => {
     const target = dropTarget.target;
     const fakeDropNodeG = createG();
     const parent = PlaitNode.get(board, Path.parent(path));
-    const layout = MindQueries.getLayoutByElement(parent);
+    const layout = MindQueries.getCorrectLayoutByElement(board, parent);
     const isHorizontal = isHorizontalLayout(layout);
     const { hasNextNode, hasPreviousNode } = hasPreviousOrNextOfDropPath(parent, dropTarget, path);
     const width = 30;
@@ -1699,7 +1699,7 @@ const drawFakeDropNode = (board, dropTarget, path) => {
         const placement = [HorizontalPlacement.left, VerticalPlacement.top];
         transformPlacement(placement, linkDirection);
         let offset = -height;
-        if (MindElement.isIndentedLayout(parent)) {
+        if (MindElement.isIndentedLayout(board, parent)) {
             offset = isTopLayout(layout) ? offset / 2 + basicNode.height - basicNode.vGap : 0;
         }
         centerPoint = getPointByPlacement(nextRect, placement);
@@ -1713,7 +1713,7 @@ const drawFakeDropNode = (board, dropTarget, path) => {
         const placement = [HorizontalPlacement.left, VerticalPlacement.bottom];
         transformPlacement(placement, linkDirection);
         let offset = height;
-        if (MindElement.isIndentedLayout(parent)) {
+        if (MindElement.isIndentedLayout(board, parent)) {
             offset = isTopLayout(layout) ? -offset - (basicNode.height - basicNode.vGap) : offset;
         }
         centerPoint = getPointByPlacement(previousRect, placement);
@@ -1749,8 +1749,8 @@ const drawFakeDropNode = (board, dropTarget, path) => {
         y,
         width,
         height,
-        hGap: MindElement.isIndentedLayout(parent) ? BASE * 4 + (basicNode.origin.strokeWidth || STROKE_WIDTH) : 0,
-        vGap: MindElement.isIndentedLayout(parent) ? BASE : 0
+        hGap: MindElement.isIndentedLayout(board, parent) ? BASE * 4 + (basicNode.origin.strokeWidth || STROKE_WIDTH) : 0,
+        vGap: MindElement.isIndentedLayout(board, parent) ? BASE : 0
     };
     const fakeRectangleG = drawRoundRectangle(PlaitBoard.getRoughSVG(board), fakeNode.x, fakeNode.y, fakeNode.x + width, fakeNode.y + height, {
         stroke: PRIMARY_COLOR,
@@ -2240,25 +2240,9 @@ const getAvailableSubLayoutsByElement = (board, element) => {
     return undefined;
 };
 
-const getLayoutByElement = (element) => {
-    const layout = element.layout;
-    if (layout) {
-        return layout;
-    }
-    const parent = !PlaitMind.isMind(element) && MindElement.getParent(element);
-    if (AbstractNode.isAbstract(element) && parent) {
-        return getAbstractLayout(getLayoutByElement(parent));
-    }
-    if (parent) {
-        return getLayoutByElement(parent);
-    }
-    return getDefaultLayout();
-};
-
 const MindQueries = {
     getAvailableSubLayoutsByElement,
     getBranchLayouts,
-    getLayoutByElement,
     getCorrectLayoutByElement
 };
 
@@ -2269,12 +2253,8 @@ const PlaitMind = {
     }
 };
 const MindElement = {
-    hasLayout(value, layout) {
-        const _layout = MindQueries.getLayoutByElement(value);
-        return _layout === layout;
-    },
-    isIndentedLayout(value) {
-        const _layout = MindQueries.getLayoutByElement(value);
+    isIndentedLayout(board, value) {
+        const _layout = MindQueries.getCorrectLayoutByElement(board, value);
         return isIndentedLayout(_layout);
     },
     isMindElement(board, element) {
@@ -2446,7 +2426,7 @@ const setAbstractByElements = (board, groupParent, group) => {
     const indexArray = group.map((child) => groupParent.children.indexOf(child)).sort((a, b) => a - b);
     const rightNodeCount = groupParent?.rightNodeCount;
     const start = indexArray[0], end = indexArray[indexArray.length - 1];
-    if (isStandardLayout(MindQueries.getLayoutByElement(groupParent)) &&
+    if (isStandardLayout(MindQueries.getCorrectLayoutByElement(board, groupParent)) &&
         rightNodeCount &&
         start < rightNodeCount &&
         end >= rightNodeCount) {
@@ -2880,7 +2860,7 @@ const getNodeMoreKeyPosition = (board, element) => {
 };
 const getNodeMoreLayoutDirection = (board, element) => {
     const node = MindElement.getNode(element);
-    const layout = MindQueries.getLayoutByElement(element);
+    const layout = MindQueries.getCorrectLayoutByElement(board, element);
     const isHorizontal = isHorizontalLayout(layout);
     let layoutDirection = getLayoutDirection(node, isHorizontal);
     if (isIndentedLayout(layout)) {
@@ -2898,8 +2878,7 @@ const getNodeMoreStartPoint = (board, element, linkLineDirection, isLeft = false
     }
     transformPlacement(placement, linkLineDirection);
     // underline shape and horizontal
-    const layout = MindQueries.getLayoutByElement(element);
-    const isHorizontal = isHorizontalLayout(layout);
+    const isHorizontal = linkLineDirection === LayoutDirection.left || linkLineDirection === LayoutDirection.right;
     if (isHorizontal && isUnderlineShape && !PlaitMind.isMind(element)) {
         placement[1] = VerticalPlacement.bottom;
     }
@@ -3032,7 +3011,7 @@ class MindNodeComponent extends CommonElementFlavour {
         if (this.linkLineG) {
             this.linkLineG.remove();
         }
-        const layout = MindQueries.getLayoutByElement(parent);
+        const layout = MindQueries.getCorrectLayoutByElement(this.board, parent);
         if (AbstractNode.isAbstract(this.node.origin)) {
             this.linkLineG = drawAbstractLink(this.board, this.node, isHorizontalLayout(layout));
         }
@@ -3293,7 +3272,7 @@ const withAbstract = (board) => {
             const isHorizontal = isHorizontalLayout(nodeLayout);
             const parentElement = MindElement.getParent(activeAbstractElement);
             let children = parentElement.children;
-            const parentLayout = MindQueries.getLayoutByElement(parentElement);
+            const parentLayout = MindQueries.getCorrectLayoutByElement(board, parentElement);
             if (isStandardLayout(parentLayout)) {
                 const rightNodeCount = parentElement.rightNodeCount;
                 const { leftChildren, rightChildren } = separateChildren(parentElement);