Skip to content

Commit 044d06e

Browse files
committed
Merge branch 'performance' into main
2 parents e2c0e8a + 7033f9b commit 044d06e

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

src/app/components/ComponentMap.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export default function ComponentMap({
188188
left = node.y;
189189
}
190190

191-
//mousing controls
191+
//mousing controls & Tooltip display logic
192192
const handleMouseOver = (event) => {
193193
() => dispatch(onHover(node.data.rtid));
194194
const coords = localPoint(
@@ -240,6 +240,8 @@ export default function ComponentMap({
240240
//test feature
241241
onMouseOver={handleMouseOver}
242242
onMouseOut={hideTooltip}
243+
onMouseEnter={() => dispatch(onHover(node.data.rtid))}
244+
onMouseLeave={() => dispatch(onHoverExit(node.data.rtid))}
243245
/>
244246
)}
245247
{/* Display text inside of each component node */}

src/app/components/StateRoute.tsx

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,17 @@ const StateRoute = (props: StateRouteProps) => {
136136
return (
137137
<Router>
138138
<div className="navbar">
139-
<NavLink
139+
<NavLink
140140
className="router-link"
141141
activeClassName="is-active"
142-
exact
143-
to="/"
142+
exact to="/"
144143
>
145-
Tree
144+
Performance
145+
</NavLink>
146+
<NavLink className="router-link"
147+
activeClassName="is-active"
148+
to="/map">
149+
Map
146150
</NavLink>
147151
<NavLink
148152
className="router-link"
@@ -151,10 +155,13 @@ const StateRoute = (props: StateRouteProps) => {
151155
>
152156
History
153157
</NavLink>
154-
<NavLink className="router-link" activeClassName="is-active" to="/map">
155-
Map
158+
<NavLink
159+
className="router-link"
160+
activeClassName="is-active"
161+
to="/tree"
162+
>
163+
Tree
156164
</NavLink>
157-
158165
{isRecoil && (
159166
<NavLink
160167
className="router-link"
@@ -164,21 +171,13 @@ const StateRoute = (props: StateRouteProps) => {
164171
AtomsRecoil
165172
</NavLink>
166173
)}
167-
168-
<NavLink
169-
className="router-link"
170-
activeClassName="is-active"
171-
to="/performance"
172-
>
173-
Performance
174-
</NavLink>
175174
</div>
176175
<Switch>
177176
<Route path="/map" render={renderComponentMap} />
178177
<Route path="/history" render={renderHistory} />
179178
<Route path="/relationship" render={renderAtomsRelationship} />
180-
<Route path="/performance" render={renderPerfView} />
181-
<Route path="/" render={renderTree} />
179+
<Route path="/tree" render={renderTree} />
180+
<Route path="/" render={renderPerfView} />
182181
</Switch>
183182
</Router>
184183
);

0 commit comments

Comments
 (0)