fix(edge-drag): update to new version

This commit is contained in:
moklick
2020-11-05 16:26:02 +01:00
parent 28ad06a7bd
commit 9dfe7ea8e3
7 changed files with 33 additions and 43 deletions
+7 -22
View File
@@ -15,7 +15,7 @@ import {
ConnectionLineType,
ConnectionLineComponent,
Connection,
OnEdgeUpdateFunc
OnEdgeUpdateFunc,
} from '../../types';
import { onMouseDown, SetSourceIdFunc } from '../../components/Handle/BaseHandle';
@@ -140,7 +140,7 @@ function renderEdge(
selectedElements: Elements | null,
elementsSelectable: boolean,
setConnectionNodeId: SetSourceIdFunc,
setPosition: (pos: XYPosition) => void,
setPosition: (pos: XYPosition) => void
) {
const sourceId = edge.source;
const sourceHandleId = edge.sourceHandle || null;
@@ -197,7 +197,7 @@ function renderEdge(
if (onEdgeUpdate) {
onEdgeUpdate(edge, connection);
}
}
};
const handleEitherEndOfEdgePress = (event: React.MouseEvent, edge: Edge, isEdgeHeader = false) => {
const { source, target } = edge;
@@ -205,16 +205,8 @@ function renderEdge(
const isValidConnection = () => true;
const isTarget = !isEdgeHeader;
onMouseDown(
event,
nodeId,
setConnectionNodeId,
setPosition,
onConnect,
isTarget,
isValidConnection,
)
}
onMouseDown(event, null, nodeId, setConnectionNodeId, setPosition, onConnect, isTarget, isValidConnection);
};
return (
<EdgeComponent
@@ -282,15 +274,8 @@ const EdgeRenderer = (props: EdgeRendererProps) => {
<MarkerDefinitions color={arrowHeadColor} />
<g transform={transformStyle}>
{edges.map((edge: Edge) =>
renderEdge(
edge,
props,
nodes,
selectedElements,
elementsSelectable,
setConnectionNodeId,
setPosition,
))}
renderEdge(edge, props, nodes, selectedElements, elementsSelectable, setConnectionNodeId, setPosition)
)}
{renderConnectionLine && (
<ConnectionLine
nodes={nodes}
+2 -2
View File
@@ -20,7 +20,7 @@ import {
OnConnectStartFunc,
OnConnectStopFunc,
OnConnectEndFunc,
TranslateExtent,
TranslateExtent,
OnEdgeUpdateFunc,
} from '../../types';
@@ -76,7 +76,7 @@ export interface GraphViewProps {
panOnScrollSpeed?: number;
zoomOnDoubleClick?: boolean;
paneMoveable?: boolean;
onEdgeUpdate?: OnEdgeUpdateFunc;
onEdgeUpdate?: OnEdgeUpdateFunc;
}
const GraphView = ({
+4 -1
View File
@@ -159,7 +159,10 @@ const ZoomPane = ({
}
// when the target element is a node, we still allow zooming
if (event.target.closest('.react-flow__node') && event.type !== 'wheel') {
if (
(event.target.closest('.react-flow__node') || event.target.closest('.react-flow__edgeupdater')) &&
event.type !== 'wheel'
) {
return false;
}