Merge pull request #1116 from clementloridan/main

fix(edge): change order of the first EdgeAnchor disturbed by the EdgeComponent
This commit is contained in:
Moritz Klack
2021-04-24 14:15:05 +02:00
committed by GitHub
2 changed files with 11 additions and 10 deletions
+9 -9
View File
@@ -184,15 +184,6 @@ export default (EdgeComponent: ComponentType<EdgeProps>) => {
onMouseMove={onEdgeMouseMove} onMouseMove={onEdgeMouseMove}
onMouseLeave={onEdgeMouseLeave} onMouseLeave={onEdgeMouseLeave}
> >
{handleEdgeUpdate && (
<g
onMouseDown={onEdgeUpdaterSourceMouseDown}
onMouseEnter={onEdgeUpdaterMouseEnter}
onMouseOut={onEdgeUpdaterMouseOut}
>
<EdgeAnchor position={sourcePosition} centerX={sourceX} centerY={sourceY} radius={edgeUpdaterRadius} />
</g>
)}
<EdgeComponent <EdgeComponent
id={id} id={id}
source={source} source={source}
@@ -218,6 +209,15 @@ export default (EdgeComponent: ComponentType<EdgeProps>) => {
sourceHandleId={sourceHandleId} sourceHandleId={sourceHandleId}
targetHandleId={targetHandleId} targetHandleId={targetHandleId}
/> />
{handleEdgeUpdate && (
<g
onMouseDown={onEdgeUpdaterSourceMouseDown}
onMouseEnter={onEdgeUpdaterMouseEnter}
onMouseOut={onEdgeUpdaterMouseOut}
>
<EdgeAnchor position={sourcePosition} centerX={sourceX} centerY={sourceY} radius={edgeUpdaterRadius} />
</g>
)}
{handleEdgeUpdate && ( {handleEdgeUpdate && (
<g <g
onMouseDown={onEdgeUpdaterTargetMouseDown} onMouseDown={onEdgeUpdaterTargetMouseDown}
+2 -1
View File
@@ -42,7 +42,7 @@
} }
.react-flow__edge { .react-flow__edge {
pointer-events: all; pointer-events: visibleStroke;
&.inactive { &.inactive {
pointer-events: none; pointer-events: none;
@@ -145,6 +145,7 @@
.react-flow__edgeupdater { .react-flow__edgeupdater {
cursor: move; cursor: move;
pointer-events: all;
} }
/* additional components */ /* additional components */