Merge branch 'next' into refactor/xy-drag-use-map

packages/system/src/utils/general.ts

@@ -226,31 +226,27 @@ export function nodeHasDimensions<NodeType extends NodeBase = NodeBase>(node: No
 }
 
 /**
- * Helper to calculate the absolute position of a node
+ * Convert child position to aboslute position
  *
  * @internal
- * @param node
+ * @param position
+ * @param parentId
  * @param nodeLookup
  * @param nodeOrigin
  * @returns an internal node with an absolute position
  */
-export function evaluateNodePosition(
-  node: NodeBase | InternalNodeBase,
+export function evaluateAbsolutePosition(
+  position: XYPosition,
+  parentId: string,
   nodeLookup: NodeLookup,
   nodeOrigin: NodeOrigin = [0, 0]
-): InternalNodeBase | null {
-  const internalNode = nodeLookup.get(node.id);
+): XYPosition {
+  let nextParentId: string | undefined = parentId;
+  const positionAbsolute = { ...position };
 
-  if (!internalNode) {
-    return null;
-  }
-
-  let parentId = internalNode.parentId;
-  const positionAbsolute = { ...node.position };
-
-  while (parentId) {
+  while (nextParentId) {
     const parent = nodeLookup.get(parentId);
-    parentId = parent?.parentId;
+    nextParentId = parent?.parentId;
 
     if (parent) {
       const origin = parent.origin || nodeOrigin;
@@ -261,11 +257,5 @@ export function evaluateNodePosition(
     }
   }
 
-  return {
-    ...internalNode,
-    internals: {
-      ...internalNode.internals,
-      positionAbsolute,
-    },
-  };
+  return positionAbsolute;
 }