From e9011567bd2ee72763a87fc9b458efc5c76cfd53 Mon Sep 17 00:00:00 2001
From: darshanr0107 <darshan@mermaidchart.com>
Date: Wed, 20 Aug 2025 12:01:10 +0530
Subject: [PATCH] fix: edge intersection issue in tidy tree layout

on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
---
 cypress/platform/mindmap-layouts.html         | 13 ++--
 .../mermaid-layout-tidy-tree/src/layout.ts    | 64 +++----------------
 2 files changed, 15 insertions(+), 62 deletions(-)

diff --git a/cypress/platform/mindmap-layouts.html b/cypress/platform/mindmap-layouts.html
index 0a857ebf7..0aef65d42 100644
--- a/cypress/platform/mindmap-layouts.html
+++ b/cypress/platform/mindmap-layouts.html
@@ -101,14 +101,7 @@
         C
         D
     </pre>
-    <pre class="mermaid">
-      mindmap
-      root((mindmap is a long thing))
-        A
-        B
-        C
-        D
-    </pre>
+
     <pre class="mermaid">
     ---
       config:
@@ -369,6 +362,10 @@
     <hr />
     <script type="module">
       import mermaid from '/mermaid.esm.mjs';
+      import tidytree from '/mermaid-layout-tidy-tree.esm.mjs';
+      import layouts from './mermaid-layout-elk.esm.mjs';
+      mermaid.registerLayoutLoaders(layouts);
+      mermaid.registerLayoutLoaders(tidytree);
       mermaid.initialize({
         theme: 'default',
         logLevel: 3,
diff --git a/packages/mermaid-layout-tidy-tree/src/layout.ts b/packages/mermaid-layout-tidy-tree/src/layout.ts
index 7519ffd4a..a9c350d34 100644
--- a/packages/mermaid-layout-tidy-tree/src/layout.ts
+++ b/packages/mermaid-layout-tidy-tree/src/layout.ts
@@ -8,6 +8,8 @@ import type {
   Node,
   Edge,
 } from './types.js';
+import { log } from 'mermaid/src/logger.js';
+import { intersection } from 'mermaid/src/rendering-util/rendering-elements/edges.js';
 
 /**
  * Execute the tidy-tree layout algorithm on generic layout data
@@ -23,8 +25,6 @@ export function executeTidyTreeLayout(
   data: LayoutData,
   _config: MermaidConfig
 ): Promise<LayoutResult> {
-  let intersectionShift = 50;
-
   return new Promise((resolve, reject) => {
     try {
       if (!data.nodes || !Array.isArray(data.nodes) || data.nodes.length === 0) {
@@ -39,7 +39,7 @@ export function executeTidyTreeLayout(
 
       const gap = 20;
       const bottomPadding = 40;
-      intersectionShift = 30;
+      const intersectionShift = 30;
 
       const bb = new BoundingBox(gap, bottomPadding);
       const layout = new Layout(bb);
@@ -74,7 +74,6 @@ export function executeTidyTreeLayout(
         positionedNodes,
         intersectionShift
       );
-
       resolve({
         nodes: positionedNodes,
         edges: positionedEdges,
@@ -118,8 +117,12 @@ function convertToDualTreeFormat(data: LayoutData): {
   });
 
   const rootNodeData = nodes.find((node) => !parents.has(node.id));
-  if (!rootNodeData && nodes.length === 0) {
-    throw new Error('No nodes available to create tree');
+  if (!rootNodeData) {
+    // If no clear root, use the first node
+    if (nodes.length === 0) {
+      throw new Error('No nodes available to create tree');
+    }
+    log.warn('No root node found, using first node as root');
   }
 
   const actualRoot = rootNodeData ?? nodes[0];
@@ -408,54 +411,7 @@ function computeCircleEdgeIntersection(
 }
 
 /**
- * Calculate intersection point of a line with a rectangle
- * This is a simplified version that we'll use instead of importing from mermaid
- */
-function intersection(
-  node: { x: number; y: number; width?: number; height?: number },
-  point1: { x: number; y: number },
-  point2: { x: number; y: number }
-): { x: number; y: number } {
-  const nodeWidth = node.width ?? 100;
-  const nodeHeight = node.height ?? 50;
-
-  const centerX = node.x;
-  const centerY = node.y;
-
-  const dx = point2.x - point1.x;
-  const dy = point2.y - point1.y;
-
-  if (dx === 0 && dy === 0) {
-    return { x: centerX, y: centerY };
-  }
-
-  const halfWidth = nodeWidth / 2;
-  const halfHeight = nodeHeight / 2;
-
-  let intersectionX = centerX;
-  let intersectionY = centerY;
-
-  if (Math.abs(dx) > Math.abs(dy)) {
-    if (dx > 0) {
-      intersectionX = centerX + halfWidth;
-      intersectionY = centerY + (halfWidth * dy) / dx;
-    } else {
-      intersectionX = centerX - halfWidth;
-      intersectionY = centerY - (halfWidth * dy) / dx;
-    }
-  } else {
-    if (dy > 0) {
-      intersectionY = centerY + halfHeight;
-      intersectionX = centerX + (halfHeight * dx) / dy;
-    } else {
-      intersectionY = centerY - halfHeight;
-      intersectionX = centerX - (halfHeight * dx) / dy;
-    }
-  }
-
-  return { x: intersectionX, y: intersectionY };
-}
-
+ 
 /**
  * Calculate edge positions based on positioned nodes
  * Now includes tree membership and node dimensions for precise edge calculations