From 690f7bdfb3d161873935646a740631f7d56a6715 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Fri, 14 Mar 2025 12:15:38 +1100
Subject: [PATCH] Improve reroute re-connecting UX (#781)

More intuitive UX when connecting reroutes to each other.
- Remove middle reroutes when connecting around them
- Fix earlier reroutes in chain lost when stitching
- Fix all reroutes removed when stitching in reverse
---
 src/canvas/LinkConnector.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/canvas/LinkConnector.ts b/src/canvas/LinkConnector.ts
index 4ff4f910f..4747dca62 100644
--- a/src/canvas/LinkConnector.ts
+++ b/src/canvas/LinkConnector.ts
@@ -341,15 +341,24 @@ export class LinkConnector {
             const newLink = outputNode.connectSlots(outputSlot, inputNode, input, fromReroute?.id)
             if (newLink) this.events.dispatch("input-moved", renderLink)
           } else {
+            const { node: outputNode, fromSlot, fromReroute } = renderLink
+
             const reroutes = reroute.getReroutes()
             if (reroutes === null) throw new Error("Reroute loop detected.")
 
             if (reroutes) {
-              for (const reroute of reroutes.slice(0, -1)) {
+              for (const r of reroutes) {
+                if (r.id === fromReroute?.id) break
+                if (r.id === reroute.id) {
+                  throw new Error("Cannot connect to reroute that is a parent of the reroute being connected to.")
+                }
+              }
+
+              for (const reroute of reroutes.slice(0, -1).reverse()) {
+                if (reroute.id === fromReroute?.id) break
                 reroute.remove()
               }
             }
-            const { node: outputNode, fromSlot, fromReroute } = renderLink
             // Set the parentId of the reroute we dropped on, to the reroute we dragged from
             reroute.parentId = fromReroute?.id
 
@@ -403,7 +412,6 @@ export class LinkConnector {
       }
     }
     this.events.dispatch("dropped-on-canvas", event)
-    this.reset()
   }
 
   /**