From 323f07dd010a41ac5f0a70bf04490c6f9994d3ed Mon Sep 17 00:00:00 2001
From: peterkogo <peter@xyflow.com>
Date: Wed, 25 Jun 2025 15:43:01 +0200
Subject: [PATCH] revert some default behaviour from getElevatedZINdex

---
 packages/system/src/utils/edges/general.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/system/src/utils/edges/general.ts b/packages/system/src/utils/edges/general.ts
index db56b333..8562494b 100644
--- a/packages/system/src/utils/edges/general.ts
+++ b/packages/system/src/utils/edges/general.ts
@@ -34,12 +34,21 @@ export function getElevatedEdgeZIndex({
   sourceNode,
   targetNode,
   selected = false,
-  zIndex = 0,
+  zIndex,
   elevateOnSelect = false,
 }: GetEdgeZIndexParams): number {
-  const elevatedZ = Math.max(sourceNode.internals.z, targetNode.internals.z, elevateOnSelect && selected ? 1000 : 0);
+  if (zIndex !== undefined) {
+    return zIndex;
+  }
 
-  return zIndex + elevatedZ;
+  const edgeZ = elevateOnSelect && selected ? 1000 : 0;
+
+  const nodeZ = Math.max(
+    sourceNode.parentId ? sourceNode.internals.z : 0,
+    targetNode.parentId ? targetNode.internals.z : 0
+  );
+
+  return edgeZ + nodeZ;
 }
 
 type IsEdgeVisibleParams = {