fix(subflow-node-origin): use node origin in node position calculation

packages/core/src/store/index.ts

@@ -23,7 +23,8 @@ const createRFStore = () =>
   createStore<ReactFlowState>((set, get) => ({
     ...initialState,
     setNodes: (nodes: Node[]) => {
-      set({ nodeInternals: createNodeInternals(nodes, get().nodeInternals) });
+      const { nodeInternals, nodeOrigin } = get();
+      set({ nodeInternals: createNodeInternals(nodes, nodeInternals, nodeOrigin) });
     },
     setEdges: (edges: Edge[]) => {
       const { defaultEdgeOptions = {} } = get();
@@ -33,7 +34,7 @@ const createRFStore = () =>
       const hasDefaultNodes = typeof nodes !== 'undefined';
       const hasDefaultEdges = typeof edges !== 'undefined';
 
-      const nodeInternals = hasDefaultNodes ? createNodeInternals(nodes, new Map()) : new Map();
+      const nodeInternals = hasDefaultNodes ? createNodeInternals(nodes, new Map(), get().nodeOrigin) : new Map();
       const nextEdges = hasDefaultEdges ? edges : [];
 
       set({ nodeInternals, edges: nextEdges, hasDefaultNodes, hasDefaultEdges });
@@ -102,7 +103,7 @@ const createRFStore = () =>
       }
     },
     updateNodePositions: (nodeDragItems: NodeDragItem[] | Node[], positionChanged = true, dragging = false) => {
-      const { onNodesChange, nodeInternals, hasDefaultNodes } = get();
+      const { onNodesChange, nodeInternals, hasDefaultNodes, nodeOrigin } = get();
 
       if (hasDefaultNodes || onNodesChange) {
         const changes = nodeDragItems.map((node) => {
@@ -123,7 +124,7 @@ const createRFStore = () =>
         if (changes?.length) {
           if (hasDefaultNodes) {
             const nodes = applyNodeChanges(changes, Array.from(nodeInternals.values()));
-            const nextNodeInternals = createNodeInternals(nodes, nodeInternals);
+            const nextNodeInternals = createNodeInternals(nodes, nodeInternals, nodeOrigin);
             set({ nodeInternals: nextNodeInternals });
           }
 

packages/core/src/store/utils.ts

@@ -2,7 +2,7 @@ import { zoomIdentity } from 'd3-zoom';
 import type { StoreApi } from 'zustand';
 
 import { internalsSymbol, isNumeric } from '../utils';
-import { getD3Transition, getRectOfNodes, getTransformForBounds } from '../utils/graph';
+import { getD3Transition, getRectOfNodes, getTransformForBounds, getNodePosition } from '../utils/graph';
 import type {
   Edge,
   EdgeSelectionChange,
@@ -12,6 +12,7 @@ import type {
   ReactFlowState,
   XYZPosition,
   FitViewOptions,
+  NodeOrigin,
 } from '../types';
 
 type ParentNodes = Record<string, boolean>;
@@ -20,21 +21,33 @@ function calculateXYZPosition(
   node: Node,
   nodeInternals: NodeInternals,
   parentNodes: ParentNodes,
-  result: XYZPosition
+  result: XYZPosition,
+  nodeOrigin: NodeOrigin
 ): XYZPosition {
   if (!node.parentNode) {
     return result;
   }
   const parentNode = nodeInternals.get(node.parentNode)!;
+  const parentNodePosition = getNodePosition(parentNode, nodeOrigin);
 
-  return calculateXYZPosition(parentNode, nodeInternals, parentNodes, {
-    x: (result.x ?? 0) + (parentNode.position?.x ?? 0),
-    y: (result.y ?? 0) + (parentNode.position?.y ?? 0),
-    z: (parentNode[internalsSymbol]?.z ?? 0) > (result.z ?? 0) ? parentNode[internalsSymbol]?.z ?? 0 : result.z ?? 0,
-  });
+  return calculateXYZPosition(
+    parentNode,
+    nodeInternals,
+    parentNodes,
+    {
+      x: (result.x ?? 0) + parentNodePosition.x,
+      y: (result.y ?? 0) + parentNodePosition.y,
+      z: (parentNode[internalsSymbol]?.z ?? 0) > (result.z ?? 0) ? parentNode[internalsSymbol]?.z ?? 0 : result.z ?? 0,
+    },
+    nodeOrigin
+  );
 }
 
-export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals): NodeInternals {
+export function createNodeInternals(
+  nodes: Node[],
+  nodeInternals: NodeInternals,
+  nodeOrigin: NodeOrigin
+): NodeInternals {
   const nextNodeInternals = new Map<string, Node>();
   const parentNodes: ParentNodes = {};
 
@@ -74,10 +87,16 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
     }
 
     if (node.parentNode || parentNodes[node.id]) {
-      const { x, y, z } = calculateXYZPosition(node, nextNodeInternals, parentNodes, {
-        ...node.position,
-        z: node[internalsSymbol]?.z ?? 0,
-      });
+      const { x, y, z } = calculateXYZPosition(
+        node,
+        nextNodeInternals,
+        parentNodes,
+        {
+          ...node.position,
+          z: node[internalsSymbol]?.z ?? 0,
+        },
+        nodeOrigin
+      );
 
       node.positionAbsolute = {
         x,