From 864d4188089b3e7f45b18f8a63e02758ee183f7f Mon Sep 17 00:00:00 2001
From: Dylan Middendorf <middendorf.dylan@gmail.com>
Date: Fri, 6 Jun 2025 21:47:54 -0400
Subject: [PATCH] :bug: Fix incorrect node position clamping for non-child
 nodes

---
 .changeset/easy-parents-hammer.md  | 5 +++++
 packages/system/src/utils/graph.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/easy-parents-hammer.md

diff --git a/.changeset/easy-parents-hammer.md b/.changeset/easy-parents-hammer.md
new file mode 100644
index 00000000..c8d43f69
--- /dev/null
+++ b/.changeset/easy-parents-hammer.md
@@ -0,0 +1,5 @@
+---
+'@xyflow/system': patch
+---
+
+Fix incorrect node position clamping for non-child nodes
diff --git a/packages/system/src/utils/graph.ts b/packages/system/src/utils/graph.ts
index 402067d2..d859265e 100644
--- a/packages/system/src/utils/graph.ts
+++ b/packages/system/src/utils/graph.ts
@@ -413,7 +413,7 @@ export function calculateNodePosition<NodeType extends NodeBase>({
   const { x: parentX, y: parentY } = parentNode ? parentNode.internals.positionAbsolute : { x: 0, y: 0 };
 
   const origin = node.origin ?? nodeOrigin;
-  let extent = nodeExtent;
+  let extent = node.extent || nodeExtent;
 
   if (node.extent === 'parent' && !node.expandParent) {
     if (!parentNode) {