Merge pull request #5370 from xyflow/fix/xyhandle-end-events

Fix/xyhandle end events

.changeset/strong-snails-melt.md

@@ -0,0 +1,5 @@
+---
+'@xyflow/system': patch
+---
+
+Only fire connection end events if connection was started

packages/system/src/xyhandle/XYHandle.ts

@@ -112,6 +112,7 @@ function onPointerDown(
   };
 
   function startConnection() {
+    connectionStarted = true;
     updateConnection(previousConnection);
     onConnectStart?.(event, { nodeId, handleId, handleType });
   }
@@ -132,8 +133,6 @@ function onPointerDown(
       }
 
       startConnection();
-
-      connectionStarted = nextConnectionStarted;
     }
 
     if (!getFromHandle() || !fromHandle) {
@@ -208,24 +207,27 @@ function onPointerDown(
   }
 
   function onPointerUp(event: MouseEvent | TouchEvent) {
-    if ((closestHandle || handleDomNode) && connection && isValid) {
+    if (connectionStarted) {
-      onConnect?.(connection);
+      if ((closestHandle || handleDomNode) && connection && isValid) {
-    }
+        onConnect?.(connection);
+      }
 
-    /*
+      /*
-     * it's important to get a fresh reference from the store here
+       * it's important to get a fresh reference from the store here
-     * in order to get the latest state of onConnectEnd
+       * in order to get the latest state of onConnectEnd
-     */
+       */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { inProgress, ...connectionState } = previousConnection;
+      const { inProgress, ...connectionState } = previousConnection;
-    const finalConnectionState = {
+      const finalConnectionState = {
-      ...connectionState,
+        ...connectionState,
-      toPosition: previousConnection.toHandle ? previousConnection.toPosition : null,
+        toPosition: previousConnection.toHandle ? previousConnection.toPosition : null,
-    };
+      };
-    onConnectEnd?.(event, finalConnectionState);
 
-    if (edgeUpdaterType) {
+      onConnectEnd?.(event, finalConnectionState);
-      onReconnectEnd?.(event, finalConnectionState);
+
+      if (edgeUpdaterType) {
+        onReconnectEnd?.(event, finalConnectionState);
+      }
     }
 
     cancelConnection();