Fix #5633

packages/react/src/store/index.ts

@@ -14,6 +14,8 @@ import {
   NodeOrigin,
   CoordinateExtent,
   fitViewport,
+  getHandlePosition,
+  Position,
 } from '@xyflow/system';
 
 import { applyEdgeChanges, applyNodeChanges, createSelectionChange, getSelectionChanges } from '../utils/changes';
@@ -176,7 +178,7 @@ const createStore = ({
       updateNodePositions: (nodeDragItems, dragging = false) => {
         const parentExpandChildren: ParentExpandChild[] = [];
         const changes = [];
-        const { nodeLookup, triggerNodeChanges } = get();
+        const { nodeLookup, triggerNodeChanges, connection, updateConnection } = get();
 
         for (const [id, dragItem] of nodeDragItems) {
           // we are using the nodelookup to be sure to use the current expandParent and parentId value
@@ -188,13 +190,18 @@ const createStore = ({
             type: 'position',
             position: expandParent
               ? {
-                  x: Math.max(0, dragItem.position.x),
-                  y: Math.max(0, dragItem.position.y),
-                }
+                x: Math.max(0, dragItem.position.x),
+                y: Math.max(0, dragItem.position.y),
+              }
               : dragItem.position,
             dragging,
           };
 
+          if (node && connection.inProgress && connection.fromNode.id == node.id) {
+            const updatedFrom = getHandlePosition(node, connection.fromHandle, Position.Left, true);
+            updateConnection({...connection,from: updatedFrom})
+          }
+
           if (expandParent && node.parentId) {
             parentExpandChildren.push({
               id,