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.

Sign up for GitHub

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

Jump to bottom

feat(core): make loopback edges appear nicely #998

Closed
wants to merge 2 commits into from
+87 −7
Closed

feat(core): make loopback edges appear nicely #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0596bc0
Make loopback edges appear nicely
atyshka Jun 19, 2023
6c03349
Add other edge types & horizontal edges
atyshka Jun 21, 2023
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
23 changes: 22 additions & 1 deletion packages/core/src/components/Edges/BezierEdge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,37 @@ import type { FunctionalComponent } from 'vue'
import { h } from 'vue'
import BaseEdge from './BaseEdge'
import { getBezierPath } from './utils'
import type { BezierEdgeProps } from '~/types'
import type { BezierEdgeProps, GraphNode } from '~/types'
import { Position } from '~/types'

const BezierEdge: FunctionalComponent<BezierEdgeProps> = function (
{ sourcePosition = Position.Bottom, targetPosition = Position.Top, ...props },
{ attrs },
) {
let controlOffsetX = 0
let controlOffsetY = 0
if (attrs.sourceNode === attrs.targetNode) {
if (
(sourcePosition === Position.Bottom && targetPosition === Position.Top) ||
(sourcePosition === Position.Top && targetPosition === Position.Bottom)
) {
const source = attrs.sourceNode as GraphNode
controlOffsetX = ((-40 - source.dimensions.width / 2) * 4) / 3
controlOffsetY = 0
} else if (
(sourcePosition === Position.Left && targetPosition === Position.Right) ||
(sourcePosition === Position.Right && targetPosition === Position.Left)
) {
const source = attrs.sourceNode as GraphNode
controlOffsetX = 0
controlOffsetY = ((20 + source.dimensions.height / 2) * 4) / 3
}
}
const [path, labelX, labelY] = getBezierPath({
sourcePosition,
targetPosition,
controlOffsetX,
controlOffsetY,
...props,
})

Expand Down
23 changes: 22 additions & 1 deletion packages/core/src/components/Edges/SimpleBezierEdge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,37 @@ import type { FunctionalComponent } from 'vue'
import { h } from 'vue'
import BaseEdge from './BaseEdge'
import { getSimpleBezierPath } from './utils'
import type { SimpleBezierEdgeProps } from '~/types'
import type { GraphNode, SimpleBezierEdgeProps } from '~/types'
import { Position } from '~/types'

const SimpleBezierEdge: FunctionalComponent<SimpleBezierEdgeProps> = function (
{ sourcePosition = Position.Bottom, targetPosition = Position.Top, ...props },
{ attrs },
) {
let controlOffsetX = 0
let controlOffsetY = 0
if (attrs.sourceNode === attrs.targetNode) {
if (
(sourcePosition === Position.Bottom && targetPosition === Position.Top) ||
(sourcePosition === Position.Top && targetPosition === Position.Bottom)
) {
const source = attrs.sourceNode as GraphNode
controlOffsetX = ((-40 - source.dimensions.width / 2) * 4) / 3
controlOffsetY = 0
} else if (
(sourcePosition === Position.Left && targetPosition === Position.Right) ||
(sourcePosition === Position.Right && targetPosition === Position.Left)
) {
const source = attrs.sourceNode as GraphNode
controlOffsetX = 0
controlOffsetY = ((20 + source.dimensions.height / 2) * 4) / 3
}
}
const [path, labelX, labelY] = getSimpleBezierPath({
sourcePosition,
targetPosition,
controlOffsetX,
controlOffsetY,
...props,
})

Expand Down
22 changes: 21 additions & 1 deletion packages/core/src/components/Edges/SmoothStepEdge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,36 @@ import type { FunctionalComponent } from 'vue'
import { h } from 'vue'
import BaseEdge from './BaseEdge'
import { getSmoothStepPath } from './utils'
import type { SmoothStepEdgeProps } from '~/types'
import type { GraphNode, SmoothStepEdgeProps } from '~/types'
import { Position } from '~/types'

const SmoothStepEdge: FunctionalComponent<SmoothStepEdgeProps> = function (
{ sourcePosition = Position.Bottom, targetPosition = Position.Top, ...props },
{ attrs },
) {
let centerX, centerY
if (attrs.sourceNode === attrs.targetNode) {
if (
(sourcePosition === Position.Bottom && targetPosition === Position.Top) ||
(sourcePosition === Position.Top && targetPosition === Position.Bottom)
) {
const source = attrs.sourceNode as GraphNode
centerX = props.sourceX - (props.offset ?? 40) - source.dimensions.width / 2
centerY = (props.sourceY + props.targetY) / 2
} else if (
(sourcePosition === Position.Left && targetPosition === Position.Right) ||
(sourcePosition === Position.Right && targetPosition === Position.Left)
) {
const source = attrs.sourceNode as GraphNode
centerX = (props.sourceX + props.targetX) / 2
centerY = props.sourceY + (props.offset ?? 20) + source.dimensions.height / 2
}
}
const [path, labelX, labelY] = getSmoothStepPath({
sourcePosition,
targetPosition,
centerX,
centerY,
...props,
})

Expand Down
13 changes: 11 additions & 2 deletions packages/core/src/components/Edges/utils/bezier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export interface GetBezierPathParams {
targetY: number
targetPosition?: Position
curvature?: number
controlOffsetX?: number
controlOffsetY?: number
}

interface GetControlWithCurvatureParams {
Expand Down Expand Up @@ -59,16 +61,18 @@ export function getBezierPath({
targetY,
targetPosition = Position.Top,
curvature = 0.25,
controlOffsetX = 0,
controlOffsetY = 0,
}: GetBezierPathParams): [path: string, labelX: number, labelY: number, offsetX: number, offsetY: number] {
const [sourceControlX, sourceControlY] = getControlWithCurvature({
let [sourceControlX, sourceControlY] = getControlWithCurvature({
pos: sourcePosition,
x1: sourceX,
y1: sourceY,
x2: targetX,
y2: targetY,
c: curvature,
})
const [targetControlX, targetControlY] = getControlWithCurvature({
let [targetControlX, targetControlY] = getControlWithCurvature({
pos: targetPosition,
x1: targetX,
y1: targetY,
Expand All @@ -77,6 +81,11 @@ export function getBezierPath({
c: curvature,
})

sourceControlX += controlOffsetX
sourceControlY += controlOffsetY
targetControlX += controlOffsetX
targetControlY += controlOffsetY

const [centerX, centerY, offsetX, offsetY] = getBezierEdgeCenter({
sourceX,
sourceY,
Expand Down
13 changes: 11 additions & 2 deletions packages/core/src/components/Edges/utils/simple-bezier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ export interface GetSimpleBezierPathParams {
targetX: number
targetY: number
targetPosition?: Position
controlOffsetX?: number
controlOffsetY?: number
}

interface GetControlParams {
Expand Down Expand Up @@ -42,22 +44,29 @@ export function getSimpleBezierPath({
targetX,
targetY,
targetPosition = Position.Top,
controlOffsetX = 0,
controlOffsetY = 0,
}: GetSimpleBezierPathParams): [path: string, labelX: number, labelY: number, offsetX: number, offsetY: number] {
const [sourceControlX, sourceControlY] = getControl({
let [sourceControlX, sourceControlY] = getControl({
pos: sourcePosition,
x1: sourceX,
y1: sourceY,
x2: targetX,
y2: targetY,
})
const [targetControlX, targetControlY] = getControl({
let [targetControlX, targetControlY] = getControl({
pos: targetPosition,
x1: targetX,
y1: targetY,
x2: sourceX,
y2: sourceY,
})

sourceControlX += controlOffsetX
sourceControlY += controlOffsetY
targetControlX += controlOffsetX
targetControlY += controlOffsetY

const [centerX, centerY, offsetX, offsetY] = getBezierEdgeCenter({
sourceX,
sourceY,
Expand Down