Merge pull request #131 from softflow24/itsWindows11/fix-invalid-conn…

…ections Fixed invalid connections being made
softflow24 · Oct 14, 2024 · 4df8b08 · 4df8b08
2 parents 4b8dc4a + 798873b
commit 4df8b08
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/packages/editor/src/hooks/useReactFlowEventHandlers.ts b/packages/editor/src/hooks/useReactFlowEventHandlers.ts
@@ -29,6 +29,7 @@ import {
 import { useReactFlowState } from "@hooks/useReactFlowState";
 import { setIsRightPanelVisible } from "@slices/layoutSlice";
 import { useHotkeys } from "react-hotkeys-hook";
+import { isValidConnection } from "@/utils/validation";
 
 export const useReactFlowEventHandlers = () => {
   const dispatch = useDispatch<AppDispatch>();
@@ -63,6 +64,9 @@ export const useReactFlowEventHandlers = () => {
   const onConnect: OnConnect = useCallback(
     (connection) => {
       const newEdges = addEdge(connection, edges);
+
+      if (!isValidConnection(connection, newEdges)) return;
+
       dispatch(setEdges(newEdges));
     },
     [edges, dispatch],

diff --git a/packages/editor/src/utils/validation.ts b/packages/editor/src/utils/validation.ts
@@ -0,0 +1,17 @@
+import { Connection, Edge } from "reactflow";
+
+export function isValidConnection(
+  connection: Connection,
+  newEdges: Edge[],
+): boolean {
+  const circularConnectionExists = newEdges.some(
+    (edge) =>
+      edge.sourceHandle === connection.targetHandle ||
+      edge.targetHandle === connection.sourceHandle,
+  );
+
+  return (
+    connection.sourceHandle !== connection.targetHandle &&
+    !circularConnectionExists
+  );
+}