refactor(onConnect): param can be edge or connection
This commit is contained in:
@@ -20,7 +20,7 @@ export interface GraphViewProps {
|
|||||||
onElementClick: (element: Node | Edge) => void;
|
onElementClick: (element: Node | Edge) => void;
|
||||||
onElementsRemove: (elements: Elements) => void;
|
onElementsRemove: (elements: Elements) => void;
|
||||||
onNodeDragStop: (node: Node) => void;
|
onNodeDragStop: (node: Node) => void;
|
||||||
onConnect: (conneciton: Connection) => void;
|
onConnect: (connection: Connection | Edge) => void;
|
||||||
onLoad: OnLoadFunc;
|
onLoad: OnLoadFunc;
|
||||||
onMove: () => void;
|
onMove: () => void;
|
||||||
selectionKeyCode: number;
|
selectionKeyCode: number;
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ export interface ReactFlowProps extends Omit<HTMLAttributes<HTMLDivElement>, 'on
|
|||||||
onElementClick: (element: Node | Edge) => void;
|
onElementClick: (element: Node | Edge) => void;
|
||||||
onElementsRemove: (elements: Elements) => void;
|
onElementsRemove: (elements: Elements) => void;
|
||||||
onNodeDragStop: (node: Node) => void;
|
onNodeDragStop: (node: Node) => void;
|
||||||
onConnect: (connection: Connection) => void;
|
onConnect: (connection: Edge | Connection) => void;
|
||||||
onLoad: OnLoadFunc;
|
onLoad: OnLoadFunc;
|
||||||
onMove: () => void;
|
onMove: () => void;
|
||||||
nodeTypes: NodeTypesType;
|
nodeTypes: NodeTypesType;
|
||||||
|
|||||||
+13
-6
@@ -1,7 +1,7 @@
|
|||||||
import { zoomIdentity } from 'd3-zoom';
|
import { zoomIdentity } from 'd3-zoom';
|
||||||
|
|
||||||
import store from '../store';
|
import store from '../store';
|
||||||
import { ElementId, Node, Edge, Elements, Transform, XYPosition, Rect, FitViewParams, Box } from '../types';
|
import { ElementId, Node, Edge, Elements, Transform, XYPosition, Rect, FitViewParams, Box, Connection } from '../types';
|
||||||
|
|
||||||
export const isEdge = (element: Node | Edge): boolean =>
|
export const isEdge = (element: Node | Edge): boolean =>
|
||||||
element.hasOwnProperty('source') && element.hasOwnProperty('target');
|
element.hasOwnProperty('source') && element.hasOwnProperty('target');
|
||||||
@@ -31,17 +31,24 @@ export const removeElements = (elementsToRemove: Elements, elements: Elements):
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const getEdgeId = ({ source, target }: Edge): ElementId => `reactflow__edge-${source}-${target}`;
|
const getEdgeId = ({ source, target }: Connection): ElementId => `reactflow__edge-${source}-${target}`;
|
||||||
|
|
||||||
export const addEdge = (edgeParams: Edge, elements: Elements): Elements => {
|
export const addEdge = (edgeParams: Edge | Connection, elements: Elements): Elements => {
|
||||||
if (!edgeParams.source || !edgeParams.target) {
|
if (!edgeParams.source || !edgeParams.target) {
|
||||||
throw new Error('Can not create edge. An edge needs a source and a target');
|
throw new Error('Can not create edge. An edge needs a source and a target');
|
||||||
}
|
}
|
||||||
|
|
||||||
return elements.concat({
|
if (edgeParams.hasOwnProperty('id')) {
|
||||||
|
const edge = { ...edgeParams } as Edge;
|
||||||
|
return elements.concat(edge);
|
||||||
|
}
|
||||||
|
|
||||||
|
const edge = {
|
||||||
...edgeParams,
|
...edgeParams,
|
||||||
id: typeof edgeParams.id !== 'undefined' ? edgeParams.id : getEdgeId(edgeParams),
|
id: getEdgeId(edgeParams),
|
||||||
});
|
} as Edge;
|
||||||
|
|
||||||
|
return elements.concat(edge);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const pointToRendererPoint = (
|
export const pointToRendererPoint = (
|
||||||
|
|||||||
Reference in New Issue
Block a user