feat: edge supports portLinkToCenter attributes (#5447)

* feat(port): add linkToCenter attribute * fix: ci * refactor: rename getCurveControlPoint function * refactor: update snapshots related to port --------- Co-authored-by: banxuan.zyx <[email protected]>
antvis · Feb 20, 2024 · 095581a · 095581a
1 parent a4346dd
commit 095581a
Show file tree

Hide file tree

Showing 17 changed files with 151 additions and 111 deletions.
diff --git a/packages/g6/__tests__/integration/snapshots/static/edge-port.svg b/packages/g6/__tests__/integration/snapshots/static/edge-port.svg
diff --git a/packages/g6/__tests__/integration/snapshots/static/node-circle.svg b/packages/g6/__tests__/integration/snapshots/static/node-circle.svg
diff --git a/packages/g6/__tests__/integration/snapshots/static/node-ellipse.svg b/packages/g6/__tests__/integration/snapshots/static/node-ellipse.svg
diff --git a/packages/g6/__tests__/integration/snapshots/static/node-rect.svg b/packages/g6/__tests__/integration/snapshots/static/node-rect.svg
diff --git a/packages/g6/__tests__/integration/snapshots/static/node-star.svg b/packages/g6/__tests__/integration/snapshots/static/node-star.svg
diff --git a/packages/g6/__tests__/integration/snapshots/static/node-triangle.svg b/packages/g6/__tests__/integration/snapshots/static/node-triangle.svg
diff --git a/packages/g6/src/elements/edges/base-edge.ts b/packages/g6/src/elements/edges/base-edge.ts
@@ -19,8 +19,7 @@ import type {
   PrefixObject,
 } from '../../types';
 import { getCubicPath, getLabelPositionStyle, getLoopPoints } from '../../utils/edge';
-import { findPort, isSameNode } from '../../utils/element';
-import { getEllipseIntersectPoint } from '../../utils/point';
+import { findPort, getNodeConnectionPoint, getPortConnectionPoint, isSameNode } from '../../utils/element';
 import { omitStyleProps, subStyleProps } from '../../utils/prefix';
 import type { SymbolFactor } from '../../utils/symbol';
 import * as Symbol from '../../utils/symbol';
@@ -177,13 +176,13 @@ export abstract class BaseEdge<KT extends BaseEdgeProps<object>> extends BaseSha
     const targetPort = findPort(targetNode, targetPortKey, sourceNode);
 
     const sourcePoint = sourcePort
-      ? getEllipseIntersectPoint(targetNode.getCenter(), sourcePort.getBounds())
-      : sourceNode.getIntersectPoint(targetPort?.getPosition() || targetNode.getCenter());
+      ? getPortConnectionPoint(sourcePort, targetNode, targetPort)
+      : getNodeConnectionPoint(sourceNode, targetNode, targetPort);
     const targetPoint = targetPort
-      ? getEllipseIntersectPoint(sourceNode.getCenter(), targetPort.getBounds())
-      : targetNode.getIntersectPoint(sourcePort?.getPosition() || sourceNode.getCenter());
+      ? getPortConnectionPoint(targetPort, sourceNode, sourcePort)
+      : getNodeConnectionPoint(targetNode, sourceNode, sourcePort);
 
-    return [sourcePoint || sourceNode.getCenter(), targetPoint || targetNode.getCenter()];
+    return [sourcePoint, targetPoint];
   }
 
   protected getHaloStyle(attributes: ParsedBaseEdgeStyleProps<KT>): false | PathStyleProps {

diff --git a/packages/g6/src/elements/edges/cubic.ts b/packages/g6/src/elements/edges/cubic.ts
@@ -2,7 +2,7 @@ import type { DisplayObjectConfig } from '@antv/g';
 import type { PathArray } from '@antv/util';
 import { deepMix } from '@antv/util';
 import type { BaseEdgeProps, Point } from '../../types';
-import { calculateControlPoint, getCubicPath, parseCurveOffset, parseCurvePosition } from '../../utils/edge';
+import { getCubicPath, getCurveControlPoint, parseCurveOffset, parseCurvePosition } from '../../utils/edge';
 import type { BaseEdgeStyleProps } from './base-edge';
 import { BaseEdge } from './base-edge';
 
@@ -61,8 +61,8 @@ export class Cubic extends BaseEdge<CubicKeyStyleProps> {
     return controlPoints?.length === 2
       ? controlPoints
       : [
-          calculateControlPoint(sourcePoint, targetPoint, curvePosition[0], curveOffset[0]),
-          calculateControlPoint(sourcePoint, targetPoint, curvePosition[1], curveOffset[1]),
+          getCurveControlPoint(sourcePoint, targetPoint, curvePosition[0], curveOffset[0]),
+          getCurveControlPoint(sourcePoint, targetPoint, curvePosition[1], curveOffset[1]),
         ];
   }
 }
diff --git a/packages/g6/src/elements/edges/line.ts b/packages/g6/src/elements/edges/line.ts
@@ -5,7 +5,7 @@ import type { BaseEdgeProps } from '../../types';
 import type { BaseEdgeStyleProps, ParsedBaseEdgeStyleProps } from './base-edge';
 import { BaseEdge } from './base-edge';
 
-type LineKeyStyleProps = BaseEdgeProps<{}>;
+type LineKeyStyleProps = BaseEdgeProps;
 export type LineStyleProps = BaseEdgeStyleProps<LineKeyStyleProps>;
 type LineOptions = DisplayObjectConfig<LineStyleProps>;