Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link dblclick segmentable #431

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/Blazor.Diagrams.Core/Models/Base/BaseLinkModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public abstract class BaseLinkModel : SelectableModel, IHasBounds, ILinkable
public event Action<BaseLinkModel, Anchor, Anchor>? SourceChanged;
public event Action<BaseLinkModel, Anchor, Anchor>? TargetChanged;
public event Action<BaseLinkModel>? TargetAttached;
public event Action<BaseLinkModel, LinkVertexModel>? VertexAdded;
public event Action<BaseLinkModel, LinkVertexModel>? VertexRemoved;

protected BaseLinkModel(Anchor source, Anchor target)
{
Expand All @@ -38,6 +40,7 @@ protected BaseLinkModel(string id, Anchor source, Anchor target) : base(id)
public LinkMarker? SourceMarker { get; set; }
public LinkMarker? TargetMarker { get; set; }
public bool Segmentable { get; set; } = false;
public bool DoubleClickToSegment { get; set; } = false;
public List<LinkVertexModel> Vertices { get; } = new();
public List<LinkLabelModel> Labels { get; } = new();
public IReadOnlyList<BaseLinkModel> Links => _links;
Expand Down Expand Up @@ -67,9 +70,27 @@ public LinkVertexModel AddVertex(Point? position = null)
{
var vertex = new LinkVertexModel(this, position);
Vertices.Add(vertex);
VertexAdded?.Invoke(this, vertex);
Refresh();
return vertex;
}

public LinkVertexModel InsertVertex(Point? position, int index)
{
var vex = new LinkVertexModel(this, position);
Vertices.Insert(index, vex);
VertexAdded?.Invoke(this, vex);
Refresh();
return vex;
}

public void RemoveVertex(LinkVertexModel vertex)
{
Vertices.Remove(vertex);
VertexRemoved?.Invoke(this, vertex);
Refresh();
}

public void SetSource(Anchor anchor)
{
ArgumentNullException.ThrowIfNull(anchor, nameof(anchor));
Expand Down
19 changes: 14 additions & 5 deletions src/Blazor.Diagrams/Components/LinkWidget.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,31 @@ private RenderFragment GetSelectionHelperPath(string color, string d, int index)
builder.AddAttribute(8, "onmouseenter", EventCallback.Factory.Create<MouseEventArgs>(this, OnMouseEnter));
builder.AddAttribute(9, "onmouseleave", EventCallback.Factory.Create<MouseEventArgs>(this, OnMouseLeave));
builder.AddAttribute(10, "onpointerdown", EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.PointerEventArgs>(this, e => OnPointerDown(e, index)));
builder.AddEventStopPropagationAttribute(11, "onpointerdown", Link.Segmentable);
builder.AddAttribute(10, "ondblclick", EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, e => OnPointerDoubleClick(e, index)));
builder.AddEventStopPropagationAttribute(11, "onpointerdown", Link.Segmentable && !Link.DoubleClickToSegment);
builder.AddEventStopPropagationAttribute(11, "ondblclick", Link.Segmentable && Link.DoubleClickToSegment);
builder.CloseElement();
};
}

private void OnPointerDown(PointerEventArgs e, int index)
{
if (!Link.Segmentable)
if (!Link.Segmentable || Link.DoubleClickToSegment)
return;

var vertex = CreateVertex(e.ClientX, e.ClientY, index);
BlazorDiagram.TriggerPointerDown(vertex, e.ToCore());
}

private void OnPointerDoubleClick(MouseEventArgs e, int index)
{
if (!Link.Segmentable || !Link.DoubleClickToSegment)
return;

var vertex = CreateVertex(e.ClientX, e.ClientY, index);
BlazorDiagram.TriggerPointerDoubleClick(vertex, e.ToCore());
}

private void OnMouseEnter(MouseEventArgs e)
{
_hovered = true;
Expand All @@ -54,9 +65,7 @@ private void OnMouseLeave(MouseEventArgs e)
private LinkVertexModel CreateVertex(double clientX, double clientY, int index)
{
var rPt = BlazorDiagram.GetRelativeMousePoint(clientX, clientY);
var vertex = new LinkVertexModel(Link, rPt);
Link.Vertices.Insert(index, vertex);
Link.Refresh();
var vertex = Link.InsertVertex(rPt, index);
return vertex;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ private void OnPointerUp(PointerEventArgs e)

private void OnDoubleClick(MouseEventArgs e)
{
Vertex.Parent.Vertices.Remove(Vertex);
Vertex.Parent.Refresh();
Vertex.Parent.RemoveVertex(Vertex);
}
}