@plait/mind 0.7.0 → 0.8.0

package/fesm2020/plait-mind.mjs

@@ -591,8 +591,7 @@ const getAvailableProperty = (board, element, propertyKey) => {
  */
 const getBranchColorByMindElement = (board, element) => {
     const branchColor = getAvailableProperty(board, element, 'branchColor');
-    const parentBranchColor = MindElement.getParent(element)?.branchColor;
-    return parentBranchColor || branchColor || getDefaultBranchColor(board, element);
+    return branchColor || getDefaultBranchColor(board, element);
 };
 const getBranchShapeByMindElement = (board, element) => {
     const branchShape = getAvailableProperty(board, element, 'branchShape');
@@ -864,11 +863,13 @@ const getPathByDropTarget = (board, dropTarget) => {
     }
     // 水平布局/标准布局：上下是兄弟节点，左右是子节点
     if (isHorizontalLogicLayout(layout)) {
-        if (dropTarget.detectResult === 'right' && !PlaitMind.isMind(dropTarget?.target)) {
-            targetPath.push(children.length);
-        }
-        if (dropTarget.detectResult === 'right' && PlaitMind.isMind(dropTarget?.target) && isStandardLayout(layout)) {
-            targetPath.push(dropTarget?.target.rightNodeCount);
+        if (dropTarget.detectResult === 'right') {
+            if (PlaitMind.isMind(dropTarget?.target) && isStandardLayout(layout)) {
+                targetPath.push(dropTarget?.target.rightNodeCount);
+            }
+            else {
+                targetPath.push(children.length);
+            }
         }
         if (dropTarget.detectResult === 'left') {
             targetPath.push(children.length);
@@ -1047,7 +1048,7 @@ const transformPlacement = (placement, direction) => {
 function drawIndentedLink(board, node, child, defaultStroke = null, needDrawUnderline = true, defaultStrokeWidth) {
     const branchShape = getBranchShapeByMindElement(board, node.origin);
     const branchWidth = defaultStrokeWidth || getBranchWidthByMindElement(board, node.origin);
-    const branchColor = defaultStroke || getBranchColorByMindElement(board, child.origin);
+    const branchColor = defaultStroke || node.origin?.branchColor || getBranchColorByMindElement(board, child.origin);
     const isUnderlineShape = getShapeByElement(board, child.origin) === MindElementShape.underline;
     let beginX, beginY, endX, endY, beginNode = node, endNode = child;
     const beginRectangle = getRectangleByNode(beginNode);
@@ -1083,7 +1084,8 @@ function drawIndentedLink(board, node, child, defaultStroke = null, needDrawUnde
         const polylinePoints = [
             [beginX, beginY],
             [beginX, endY],
-            [endX, endY]
+            [endX, endY],
+            isUnderlineShape && needDrawUnderline ? [endX + (endNode.width - endNode.hGap * 2) * plusMinus[0], endY] : [endX, endY]
         ];
         return drawLinearPath(polylinePoints, { stroke: branchColor, strokeWidth: branchWidth });
     }
@@ -1093,9 +1095,9 @@ function drawIndentedLink(board, node, child, defaultStroke = null, needDrawUnde
 
 function drawLogicLink(board, parent, node, isHorizontal, defaultStroke = null, defaultStrokeWidth) {
     const branchShape = getBranchShapeByMindElement(board, parent.origin);
-    const branchColor = defaultStroke || getBranchColorByMindElement(board, node.origin);
+    const branchColor = defaultStroke || parent.origin?.branchColor || getBranchColorByMindElement(board, node.origin);
     const branchWidth = defaultStrokeWidth || getBranchWidthByMindElement(board, parent.origin);
-    const hasStraightLine = !parent.origin.isRoot;
+    const hasStraightLine = branchShape === BranchShape.polyline ? true : !parent.origin.isRoot;
     const parentShape = getShapeByElement(board, parent.origin);
     const shape = node.origin.shape ? node.origin.shape : parentShape;
     const hasUnderlineShape = shape === MindElementShape.underline;
@@ -2009,7 +2011,7 @@ function drawAbstractLink(board, node, isHorizontal) {
     const branchWidth = getAbstractBranchWidth(board, node.origin);
     const branchColor = getAbstractBranchColor(board, node.origin);
     const parent = node.parent;
-    const branchShape = getBranchShapeByMindElement(board, parent.origin);
+    const branchShape = getBranchShapeByMindElement(board, node.origin);
     const abstractRectangle = getRectangleByNode(node);
     let includedElements = parent.children.slice(node.origin.start, node.origin.end + 1).map(node => {
         return node.origin;
@@ -2226,7 +2228,9 @@ const setTopicSize = (board, element, width, height) => {
         height: height / board.viewport.zoom
     };
     const path = PlaitBoard.findPath(board, element);
-    Transforms.setNode(board, newElement, path);
+    if (newElement.width !== element.width || newElement.height !== element.height) {
+        Transforms.setNode(board, newElement, path);
+    }
 };
 const removeElements = (board, elements) => {
     const deletableElements = getFirstLevelElement(elements);
@@ -2969,7 +2973,7 @@ class MindNodeComponent extends PlaitPluginElementComponent {
                 const hideCircleG = this.roughSVG.circle(extendLineXY[1][0] + circleOffset[0], extendLineXY[1][1] + circleOffset[1], EXTEND_RADIUS - 1, {
                     fill: '#fff',
                     stroke,
-                    strokeWidth: branchWidth,
+                    strokeWidth: branchWidth > 3 ? 3 : branchWidth,
                     fillStyle: 'solid'
                 });
                 collapseG.appendChild(hideCircleG);
@@ -3322,6 +3326,7 @@ const withDnd = (board) => {
         });
         if (activeElements.length) {
             correspondingElements = getOverallAbstracts(board, activeElements);
+            event.preventDefault();
         }
         mousedown(event);
     };