alighasami/xyflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1969 from joeyballentine/v10-bezier-fix

Browse Source 
refactor(bezier-edge): path calculation
This commit is contained in:
Moritz Klack
2022-03-14 19:26:41 +01:00
committed by GitHub
parent 9fff0e5c69 9128967ea7
commit 64f8d10ff2
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/src/EdgeTypes/utils.ts
+1 -1
View File
@@ -9,7 +9,7 @@ const sourceTargetPositions = [
{ source: Position.Right, target: Position.Left }, { source: Position.Right, target: Position.Left },
]; ];
const nodeColors = [ const nodeColors = [
['#1e9e99', '#4cb3ac', '#6ec9c0', '#8ddfd4', '#c4fff7'], ['#0c5956', '#1e9e99', '#4cb3ac', '#6ec9c0', '#8ddfd4'],
['#0f4c75', '#1b5d8b', '#276fa1', '#3282b8', '#4fa6e0'], ['#0f4c75', '#1b5d8b', '#276fa1', '#3282b8', '#4fa6e0'],
]; ];
const edgeTypes = ['default', 'step', 'smoothstep', 'straight', 'simplebezier']; const edgeTypes = ['default', 'step', 'smoothstep', 'straight', 'simplebezier'];
src/components/Edges/BezierEdge.tsx
+25 -29
View File
@@ -1,8 +1,8 @@
import React, { memo } from 'react'; import React, { memo } from 'react';
import { EdgeProps, Position } from '../../types';
import BaseEdge from './BaseEdge'; import BaseEdge from './BaseEdge';
import { getCenter } from './utils'; import { getCenter } from './utils';
import { EdgeProps, Position } from '../../types';
export interface GetBezierPathParams { export interface GetBezierPathParams {
sourceX: number; sourceX: number;
@@ -23,7 +23,7 @@ export function getBezierPath({
targetX, targetX,
targetY, targetY,
targetPosition = Position.Top, targetPosition = Position.Top,
curvature = 0.5, curvature = 0.4,
centerX, centerX,
centerY, centerY,
}: GetBezierPathParams): string { }: GetBezierPathParams): string {
@@ -32,39 +32,35 @@ export function getBezierPath({
let cX, let cX,
cY = 0; cY = 0;
if (!hasCurvature) { const [_centerX, _centerY] = getCenter({ sourceX, sourceY, targetX, targetY });
const [_centerX, _centerY] = getCenter({ sourceX, sourceY, targetX, targetY });
cX = typeof centerX !== 'undefined' ? centerX : _centerX;
cY = typeof centerY !== 'undefined' ? centerY : _centerY;
}
let path = '';
if (leftAndRight.includes(sourcePosition) && leftAndRight.includes(targetPosition)) { if (leftAndRight.includes(sourcePosition) && leftAndRight.includes(targetPosition)) {
const distanceX = sourceX - targetX; cX = typeof centerX !== 'undefined' ? centerX : _centerX;
const scalarX = Math.min(curvature, Math.max(0, distanceX / 10000)); const distanceX = targetX - sourceX;
const hx1 = sourceX + Math.abs(targetX - sourceX) * (curvature - scalarX); const absDistanceX = Math.abs(Math.min(0, distanceX));
const hx2 = targetX - Math.abs(targetX - sourceX) * (curvature - scalarX); const amtX = (Math.sqrt(absDistanceX) / 2) * (50 * curvature);
path = hasCurvature const hx1 = hasCurvature && distanceX < 0 ? sourceX + amtX : cX;
? `M${sourceX},${sourceY} C${hx1},${sourceY} ${hx2},${targetY}, ${targetX},${targetY}` const hx2 = hasCurvature && distanceX < 0 ? targetX - amtX : cX;
: `M${sourceX},${sourceY} C${cX},${sourceY} ${cX},${targetY} ${targetX},${targetY}`;
return `M${sourceX},${sourceY} C${hx1},${sourceY} ${hx2},${targetY}, ${targetX},${targetY}`
} else if (leftAndRight.includes(targetPosition)) { } else if (leftAndRight.includes(targetPosition)) {
path = `M${sourceX},${sourceY} Q${sourceX},${targetY} ${targetX},${targetY}`; return `M${sourceX},${sourceY} Q${sourceX},${targetY} ${targetX},${targetY}`;
} else if (leftAndRight.includes(sourcePosition)) { } else if (leftAndRight.includes(sourcePosition)) {
path = `M${sourceX},${sourceY} Q${targetX},${sourceY} ${targetX},${targetY}`; return `M${sourceX},${sourceY} Q${targetX},${sourceY} ${targetX},${targetY}`;
} else {
const distanceY = sourceY - targetY;
const scalarY = Math.min(curvature, Math.max(0, distanceY / 10000));
const hy1 = sourceY + Math.abs(targetY - sourceY) * (curvature - scalarY);
const hy2 = targetY - Math.abs(targetY - sourceY) * (curvature - scalarY);
path = hasCurvature
? `M${sourceX},${sourceY} C${sourceX},${hy1} ${targetX},${hy2} ${targetX},${targetY}`
: `M${sourceX},${sourceY} C${sourceX},${cY} ${targetX},${cY} ${targetX},${targetY}`;
} }
return path; cY = typeof centerY !== 'undefined' ? centerY : _centerY;
const distanceY = targetY - sourceY;
const absDistanceY = Math.abs(Math.min(0, distanceY));
const amtY = (Math.sqrt(absDistanceY) / 2) * (50 * curvature);
const hy1 = hasCurvature && distanceY < 0 ? sourceY + amtY : cY;
const hy2 = hasCurvature && distanceY < 0 ? targetY - amtY : cY;
return `M${sourceX},${sourceY} C${sourceX},${hy1} ${targetX},${hy2} ${targetX},${targetY}`
} }
export default memo( export default memo(