Address review
Dan Abramov committed
Apr 8, 2019 at 18:00 UTC
c6ee445ea974e133ea9974aec37c65d387fdcfd7
4 files changed
+10
-10
src/backend/agent.js
+4
-4
@@ -226,14 +226,14 @@ export default class Agent extends EventEmitter {
226
227
highlightElementInDOM = ({
228
displayName,
229
+ hideAfterTimeout,
230
id,
230
- isSticky,
231
rendererID,
232
scrollIntoView,
233
}: {
234
displayName: string,
235
+ hideAfterTimeout: boolean,
236
id: number,
236
- isSticky: boolean,
237
rendererID: number,
238
scrollIntoView: boolean,
239
}) => {
@@ -253,7 +253,7 @@ export default class Agent extends EventEmitter {
253
// We may want to reconsider this; it might be a little disruptive.
254
node.scrollIntoView({ block: 'nearest', inline: 'nearest' });
255
}
256
- showOverlay(((node: any): HTMLElement), displayName, isSticky);
256
+ showOverlay(((node: any): HTMLElement), displayName, hideAfterTimeout);
257
} else {
258
hideOverlay();
259
}
@@ -477,6 +477,6 @@ export default class Agent extends EventEmitter {
477
478
// Don't pass the name explicitly.
479
// It will be inferred from DOM tag and Fiber owner.
480
- showOverlay(target, null, true);
480
+ showOverlay(target, null, false);
481
};
482
}
src/backend/views/Highlighter.js
+2
-2
@@ -19,7 +19,7 @@ export function hideOverlay() {
19
export function showOverlay(
20
element: HTMLElement | null,
21
componentName: string | null,
22
- isSticky: boolean
22
+ hideAfterTimeout: boolean
23
) {
24
if (timeoutID !== null) {
25
clearTimeout(timeoutID);
@@ -35,7 +35,7 @@ export function showOverlay(
35
36
overlay.inspect(element, componentName);
37
38
- if (!isSticky) {
38
+ if (hideAfterTimeout) {
39
timeoutID = setTimeout(hideOverlay, SHOW_DURATION);
40
}
41
}
src/devtools/views/Components/Element.js
+2
-2
@@ -86,17 +86,17 @@ export default function ElementView({ index, style, data }: Props) {
86
[id, selectElementByID]
87
);
88
89
- const rendererID = store.getRendererIDForElement(element.id) || null;
89
+ const rendererID = store.getRendererIDForElement(element.id);
90
// Individual elements don't have a corresponding leave handler.
91
// Instead, it's implemented on the tree level.
92
const handleMouseEnter = useCallback(() => {
93
if (rendererID !== null) {
94
bridge.send('highlightElementInDOM', {
95
displayName: element.displayName,
96
+ hideAfterTimeout: false,
97
id: element.id,
98
rendererID,
99
scrollIntoView: false,
99
- isSticky: true,
100
});
101
}
102
}, [bridge, element, rendererID]);
src/devtools/views/Components/SelectedElement.js
+2
-2
@@ -45,10 +45,10 @@ export default function SelectedElement(_: Props) {
45
if (rendererID !== null) {
46
bridge.send('highlightElementInDOM', {
47
displayName: element.displayName,
48
+ hideAfterTimeout: true,
49
id: selectedElementID,
50
rendererID,
51
scrollIntoView: true,
51
- isSticky: false,
52
});
53
}
54
}
@@ -271,7 +271,7 @@ function useInspectedElement(id: number | null): InspectedElement | null {
271
return () => {};
272
}
273
274
- const rendererID = store.getRendererIDForElement(id) || null;
274
+ const rendererID = store.getRendererIDForElement(id);
275
276
// Update the $r variable.
277
bridge.send('selectElement', { id, rendererID });