Fix pending connection connecting cross editors #37

Author: miroiu

CHANGELOG.md

@@ -2,12 +2,19 @@
 
 #### **In development**
 
+> - Breaking Changes:
+> - Features:
+> - Bugfixes:
+
+#### **Version 4.0.0**
+
 > - Breaking Changes:
 >   - Removed Selection field from NodifyEditor
 >   - Removed InitialMousePosition, CurrentMousePosition, PreviousMousePosition fields from NodifyEditor
 >   - Removed ItemContainer.DraggableHost (use Editor.ItemsHost instead)
 >   - Made SelectionType required in SelectionHelper
 >   - Moved GroupingNode.SwitchMovementModeModifierKey to EditorGestures.GroupingNode
+>   - Pending connections are now restricted to connect only to Connectors or to NodifyEditors and ItemContainers if PendingConnection.AllowOnlyConnectors is false
 > - Features:
 >   - Added Connector.EnableStickyConnections to allow completing pending connections in two steps.
 >   - Added editor states which can be overriden by inheriting from NodifyEditor and implementing NodifyEditor.GetInitialState().
@@ -28,6 +35,7 @@
 >   - Fixed HandleRightClickAfterPanningThreshold not working as expected
 >   - Fixed DisablePanning not disabling auto panning in certain situations
 >   - Fixed GroupingNode selection not working with multiple selection modes
+>   - Fixed PendingConnection connecting cross editors
 
 #### **Version 3.0.0**
 

Nodify/Connections/Connector.cs

@@ -121,7 +121,7 @@ static Connector()
         /// <summary>
         /// Gets the <see cref="NodifyEditor"/> that owns this <see cref="Container"/>.
         /// </summary>
-        protected NodifyEditor? Editor { get; private set; }
+        protected internal NodifyEditor? Editor { get; private set; }
 
         /// <summary>
         /// Gets or sets the safe zone outside the editor's viewport that will not trigger optimizations.
@@ -428,17 +428,11 @@ protected virtual void OnConnectorDragCompleted(bool cancel = false)
         {
             if (IsPendingConnection)
             {
-                FrameworkElement? elem = null;
-                if (Editor != null)
-                {
-                    elem = PendingConnection.GetPotentialConnector(Editor, PendingConnection.GetAllowOnlyConnectorsAttached(Editor));
-                }
-
-                object? target = elem?.DataContext;
+                FrameworkElement? elem = Editor != null ? PendingConnection.GetPotentialConnector(Editor, PendingConnection.GetAllowOnlyConnectorsAttached(Editor)) : null;
 
                 var args = new PendingConnectionEventArgs(DataContext)
                 {
-                    TargetConnector = target,
+                    TargetConnector = elem?.DataContext,
                     RoutedEvent = PendingConnectionCompletedEvent,
                     Anchor = Anchor,
                     Source = this,

Nodify/Connections/PendingConnection.cs

@@ -276,7 +276,7 @@ protected virtual void OnPendingConnectionDrag(object sender, PendingConnectionE
                 if (Editor != null && (EnablePreview || EnableSnapping))
                 {
                     // Look for a potential connector
-                    FrameworkElement? connector = GetPotentialConnector(Editor.ItemsHost, AllowOnlyConnectors);
+                    FrameworkElement? connector = GetPotentialConnector(Editor, AllowOnlyConnectors);
 
                     // Update the connector's anchor and snap to it if snapping is enabled
                     if (EnableSnapping && connector is Connector target)
@@ -341,22 +341,24 @@ protected virtual void OnPendingConnectionCompleted(object sender, PendingConnec
 
         #region Helpers
 
-        /// <summary>
-        /// Searches for a potential connector prioritizing <see cref="Connector"/>s
-        /// </summary>
-        /// <param name="container">The container to scan</param>
-        /// <param name="allowOnlyConnectors">Will also look for <see cref="ItemContainer"/>s if false then for <see cref="FrameworkElement"/>s</param>
-        /// <returns>The connector if found</returns>
-        internal static FrameworkElement? GetPotentialConnector(FrameworkElement container, bool allowOnlyConnectors)
+        /// <summary>Searches for a potential connector prioritizing <see cref="Connector"/>s</summary>
+        /// <param name="editor">The editor to scan for connectors or item containers.</param>
+        /// <param name="allowOnlyConnectors">Will also look for <see cref="ItemContainer"/>s if false.</param>
+        /// <returns>A connector, an item container, the editor or null.</returns>
+        internal static FrameworkElement? GetPotentialConnector(NodifyEditor editor, bool allowOnlyConnectors)
         {
-            FrameworkElement? connector = container.GetElementUnderMouse<Connector>();
+            Connector? connector = editor.ItemsHost.GetElementUnderMouse<Connector>();
+            if (connector != null && connector.Editor == editor)
+                return connector;
 
-            if (connector == null && !allowOnlyConnectors)
-            {
-                connector = container.GetElementUnderMouse<ItemContainer>() ?? container.GetElementUnderMouse<FrameworkElement>();
-            }
+            if (allowOnlyConnectors)
+                return null;
+
+            var itemContainer = editor.ItemsHost.GetElementUnderMouse<ItemContainer>();
+            if (itemContainer != null && itemContainer.Editor == editor)
+                return itemContainer;
 
-            return connector;
+            return editor;
         }
 
         #endregion