feat: Don't show links unless they are initialized

joezearing · Mar 15, 2021 · 855568e · 855568e
1 parent 6ea1252
commit 855568e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Blazor.Diagrams/Components/LinkWidget.razor b/src/Blazor.Diagrams/Components/LinkWidget.razor
@@ -5,6 +5,9 @@
     var pathGenerator = Link.PathGenerator ?? Diagram.Options.Links.DefaultPathGenerator;
     var route = router(Diagram, Link);
     (var source, var target) = FindConnectionPoints(route);
+    if (source == null || target == null)
+        return;
+
     var result = pathGenerator(Diagram, Link, route, source, target);
     var color = Link.Selected ? (Link.SelectedColor ?? Diagram.Options.Links.DefaultSelectedColor)
         : (Link.Color ?? Diagram.Options.Links.DefaultColor);

diff --git a/src/Blazor.Diagrams/Components/LinkWidget.razor.cs b/src/Blazor.Diagrams/Components/LinkWidget.razor.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Components.Web;
 using Blazor.Diagrams.Core.Geometry;
 using System.Collections.Generic;
+using System;
 
 namespace Blazor.Diagrams.Components
 {
@@ -30,11 +31,8 @@ private void OnMouseDown(MouseEventArgs e, int index)
         {
             if (Link.SourcePort == null) // Portless
             {
-                var source = Point.Zero;
-                var target = Point.Zero;
-
                 if (Link.SourceNode.Size == null || Link.TargetNode?.Size == null)
-                    return (source, target);
+                    return (null, null);
 
                 var sourceCenter = Link.SourceNode.GetBounds().Center;
                 var targetCenter = Link.TargetNode?.GetBounds().Center ?? Link.OnGoingPosition;
@@ -50,6 +48,9 @@ private void OnMouseDown(MouseEventArgs e, int index)
             }
             else
             {
+                if (!Link.SourcePort.Initialized || Link.TargetPort?.Initialized == false)
+                    return (null, null);
+
                 return (Link.SourcePort.MiddlePosition, Link.TargetPort?.MiddlePosition ?? Link.OnGoingPosition);
             }
         }