Skip to content

Commit fcc586d

Browse files
committed
fix(core): move the tool overlay out of the graph
1 parent e4d2453 commit fcc586d

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

packages/core/src/view/Graph.tsx

+26-24
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, h } from 'preact';
1+
import { Component, Fragment, h } from 'preact';
22
import { observer, inject } from 'mobx-react';
33
import { map } from 'lodash-es';
44
import GraphModel from '../model/GraphModel';
@@ -69,33 +69,35 @@ class Graph extends Component<IProps> {
6969
const { adjustEdge } = editConfig;
7070

7171
return (
72-
<div
73-
className="lf-graph"
74-
{...dnd.eventMap()}
75-
style={style}
76-
>
77-
<CanvasOverlay
78-
graphModel={graphModel}
79-
eventCenter={eventCenter}
72+
<Fragment>
73+
<div
74+
className="lf-graph"
75+
{...dnd.eventMap()}
76+
style={style}
8077
>
81-
<g className="lf-base">
78+
<CanvasOverlay
79+
graphModel={graphModel}
80+
eventCenter={eventCenter}
81+
>
82+
<g className="lf-base">
83+
{
84+
map(graphModel.sortElements, (nodeModel) => (
85+
this.getComponent(nodeModel, graphModel, eventCenter)
86+
))
87+
}
88+
</g>
8289
{
83-
map(graphModel.sortElements, (nodeModel) => (
84-
this.getComponent(nodeModel, graphModel, eventCenter)
85-
))
90+
fakerNode ? this.getComponent(fakerNode, graphModel, eventCenter) : ''
8691
}
87-
</g>
88-
{
89-
fakerNode ? this.getComponent(fakerNode, graphModel, eventCenter) : ''
90-
}
91-
{adjustEdge ? <BezierAdjustOverlay graphModel={graphModel} /> : ''}
92-
<OutlineOverlay graphModel={graphModel} />
93-
{!options.isSilentMode && options.snapline !== false ? <SnaplineOverlay snaplineModel={snaplineModel} /> : ''}
94-
</CanvasOverlay>
92+
{adjustEdge ? <BezierAdjustOverlay graphModel={graphModel} /> : ''}
93+
<OutlineOverlay graphModel={graphModel} />
94+
{!options.isSilentMode && options.snapline !== false ? <SnaplineOverlay snaplineModel={snaplineModel} /> : ''}
95+
</CanvasOverlay>
96+
{options.background && <BackgroundOverlay background={options.background} />}
97+
{options.grid && <Grid {...options.grid} graphModel={graphModel} />}
98+
</div>
9599
<ToolOverlay graphModel={graphModel} tool={tool} />
96-
{options.background && <BackgroundOverlay background={options.background} />}
97-
{options.grid && <Grid {...options.grid} graphModel={graphModel} />}
98-
</div>
100+
</Fragment>
99101
);
100102
}
101103
}

0 commit comments

Comments
 (0)