Merge pull request #4855 from mhuggins/html-element-props
feat: accept any `path` element attribute as a prop
This commit is contained in:
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@xyflow/react': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Support passing `path` element attributes to `BaseEdge` component.
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
@keyframes react-flow-edge-dash {
|
||||||
|
from {
|
||||||
|
stroke-dashoffset: 100;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
stroke-dashoffset: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.react-flow__edge-custom3 {
|
||||||
|
stroke-dasharray: 100;
|
||||||
|
stroke-dashoffset: 100;
|
||||||
|
animation: react-flow-edge-dash 1s linear forwards;
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import { FC } from 'react';
|
||||||
|
import { BaseEdge, EdgeProps, EdgeText, getSmoothStepPath } from '@xyflow/react';
|
||||||
|
import './CustomEdge3.css';
|
||||||
|
|
||||||
|
const CustomEdge: FC<EdgeProps> = ({
|
||||||
|
id,
|
||||||
|
sourceX,
|
||||||
|
sourceY,
|
||||||
|
targetX,
|
||||||
|
targetY,
|
||||||
|
sourcePosition,
|
||||||
|
targetPosition,
|
||||||
|
data,
|
||||||
|
}) => {
|
||||||
|
const [edgePath, labelX, labelY] = getSmoothStepPath({
|
||||||
|
sourceX,
|
||||||
|
sourceY,
|
||||||
|
sourcePosition,
|
||||||
|
targetX,
|
||||||
|
targetY,
|
||||||
|
targetPosition,
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<BaseEdge id={id} path={edgePath} pathLength={100} />
|
||||||
|
<EdgeText
|
||||||
|
x={labelX}
|
||||||
|
y={labelY - 5}
|
||||||
|
label={data.text}
|
||||||
|
labelBgStyle={{ fill: 'transparent' }}
|
||||||
|
onClick={() => console.log(data)}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default CustomEdge;
|
||||||
@@ -16,6 +16,7 @@ import {
|
|||||||
|
|
||||||
import CustomEdge from './CustomEdge';
|
import CustomEdge from './CustomEdge';
|
||||||
import CustomEdge2 from './CustomEdge2';
|
import CustomEdge2 from './CustomEdge2';
|
||||||
|
import CustomEdge3 from './CustomEdge3';
|
||||||
|
|
||||||
const onNodeDragStop = (_: MouseEvent, node: Node) => console.log('drag stop', node);
|
const onNodeDragStop = (_: MouseEvent, node: Node) => console.log('drag stop', node);
|
||||||
const onNodeClick = (_: MouseEvent, node: Node) => console.log('click', node);
|
const onNodeClick = (_: MouseEvent, node: Node) => console.log('click', node);
|
||||||
@@ -63,6 +64,12 @@ const initialNodes: Node[] = [
|
|||||||
data: { label: 'Output 9' },
|
data: { label: 'Output 9' },
|
||||||
position: { x: 675, y: 500 },
|
position: { x: 675, y: 500 },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: '10',
|
||||||
|
type: 'output',
|
||||||
|
data: { label: 'Output 10' },
|
||||||
|
position: { x: 50, y: 400 },
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const initialEdges: Edge[] = [
|
const initialEdges: Edge[] = [
|
||||||
@@ -137,6 +144,13 @@ const initialEdges: Edge[] = [
|
|||||||
type: 'custom2',
|
type: 'custom2',
|
||||||
data: { text: 'custom edge 2' },
|
data: { text: 'custom edge 2' },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: 'e3a-10',
|
||||||
|
source: '3a',
|
||||||
|
target: '10',
|
||||||
|
type: 'custom3',
|
||||||
|
data: { text: 'custom edge 3' },
|
||||||
|
},
|
||||||
{
|
{
|
||||||
id: 'e5-6',
|
id: 'e5-6',
|
||||||
source: '5',
|
source: '5',
|
||||||
@@ -173,6 +187,7 @@ const initialEdges: Edge[] = [
|
|||||||
const edgeTypes: EdgeTypes = {
|
const edgeTypes: EdgeTypes = {
|
||||||
custom: CustomEdge,
|
custom: CustomEdge,
|
||||||
custom2: CustomEdge2,
|
custom2: CustomEdge2,
|
||||||
|
custom3: CustomEdge3,
|
||||||
};
|
};
|
||||||
|
|
||||||
const defaultEdgeOptions = {
|
const defaultEdgeOptions = {
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import { EdgeText } from './EdgeText';
|
|||||||
import type { BaseEdgeProps } from '../../types';
|
import type { BaseEdgeProps } from '../../types';
|
||||||
|
|
||||||
export function BaseEdge({
|
export function BaseEdge({
|
||||||
id,
|
|
||||||
path,
|
path,
|
||||||
labelX,
|
labelX,
|
||||||
labelY,
|
labelY,
|
||||||
@@ -15,23 +14,12 @@ export function BaseEdge({
|
|||||||
labelBgStyle,
|
labelBgStyle,
|
||||||
labelBgPadding,
|
labelBgPadding,
|
||||||
labelBgBorderRadius,
|
labelBgBorderRadius,
|
||||||
style,
|
|
||||||
markerEnd,
|
|
||||||
markerStart,
|
|
||||||
className,
|
|
||||||
interactionWidth = 20,
|
interactionWidth = 20,
|
||||||
|
...props
|
||||||
}: BaseEdgeProps) {
|
}: BaseEdgeProps) {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<path
|
<path {...props} d={path} fill="none" className={cc(['react-flow__edge-path', props.className])} />
|
||||||
id={id}
|
|
||||||
style={style}
|
|
||||||
d={path}
|
|
||||||
fill="none"
|
|
||||||
className={cc(['react-flow__edge-path', className])}
|
|
||||||
markerEnd={markerEnd}
|
|
||||||
markerStart={markerStart}
|
|
||||||
/>
|
|
||||||
{interactionWidth && (
|
{interactionWidth && (
|
||||||
<path
|
<path
|
||||||
d={path}
|
d={path}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||||
|
|
||||||
import type { CSSProperties, HTMLAttributes, ReactNode, MouseEvent as ReactMouseEvent, ComponentType } from 'react';
|
import type { CSSProperties, SVGAttributes, ReactNode, MouseEvent as ReactMouseEvent, ComponentType } from 'react';
|
||||||
import type {
|
import type {
|
||||||
EdgeBase,
|
EdgeBase,
|
||||||
BezierPathOptions,
|
BezierPathOptions,
|
||||||
@@ -14,7 +14,6 @@ import type {
|
|||||||
EdgePosition,
|
EdgePosition,
|
||||||
StepPathOptions,
|
StepPathOptions,
|
||||||
OnError,
|
OnError,
|
||||||
ConnectionState,
|
|
||||||
FinalConnectionState,
|
FinalConnectionState,
|
||||||
} from '@xyflow/system';
|
} from '@xyflow/system';
|
||||||
|
|
||||||
@@ -94,7 +93,7 @@ export type EdgeWrapperProps<EdgeType extends Edge = Edge> = {
|
|||||||
|
|
||||||
export type DefaultEdgeOptions = DefaultEdgeOptionsBase<Edge>;
|
export type DefaultEdgeOptions = DefaultEdgeOptionsBase<Edge>;
|
||||||
|
|
||||||
export type EdgeTextProps = HTMLAttributes<SVGElement> &
|
export type EdgeTextProps = SVGAttributes<SVGElement> &
|
||||||
EdgeLabelOptions & {
|
EdgeLabelOptions & {
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
@@ -123,28 +122,17 @@ export type EdgeProps<EdgeType extends Edge = Edge> = Pick<
|
|||||||
* BaseEdge component props
|
* BaseEdge component props
|
||||||
* @public
|
* @public
|
||||||
*/
|
*/
|
||||||
export type BaseEdgeProps = EdgeLabelOptions & {
|
export type BaseEdgeProps = Omit<SVGAttributes<SVGPathElement>, 'd'> &
|
||||||
/** Unique id of edge */
|
EdgeLabelOptions & {
|
||||||
id?: string;
|
/** Additional padding where interacting with an edge is still possible */
|
||||||
/** Additional padding where interacting with an edge is still possible */
|
interactionWidth?: number;
|
||||||
interactionWidth?: number;
|
/** The x position of edge label */
|
||||||
className?: string;
|
labelX?: number;
|
||||||
/** The x position of edge label */
|
/** The y position of edge label */
|
||||||
labelX?: number;
|
labelY?: number;
|
||||||
/** The y position of edge label */
|
/** SVG path of the edge */
|
||||||
labelY?: number;
|
path: string;
|
||||||
/** Marker at start of edge
|
};
|
||||||
* @example 'url(#arrow)'
|
|
||||||
*/
|
|
||||||
markerStart?: string;
|
|
||||||
/** Marker at end of edge
|
|
||||||
* @example 'url(#arrow)'
|
|
||||||
*/
|
|
||||||
markerEnd?: string;
|
|
||||||
/** SVG path of the edge */
|
|
||||||
path: string;
|
|
||||||
style?: CSSProperties;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper type for edge components that get exported by the library
|
* Helper type for edge components that get exported by the library
|
||||||
|
|||||||
Reference in New Issue
Block a user