Skip to content

Commit 6370798

Browse files
fix
1 parent d172e99 commit 6370798

File tree

9 files changed

+32
-10
lines changed

9 files changed

+32
-10
lines changed

chrome/public/bundle/detector.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2376,6 +2376,8 @@
23762376
var fiber = getFiberNodeById(id);
23772377
if (!fiber)
23782378
return;
2379+
if (id === this._selectId)
2380+
return;
23792381
var domArray = getElementNodesFromFiber(fiber);
23802382
this._selectId = id;
23812383
this._selectDom = domArray[0];

chrome/public/bundle/hook.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,6 +2378,8 @@
23782378
var fiber = getFiberNodeById(id);
23792379
if (!fiber)
23802380
return;
2381+
if (id === this._selectId)
2382+
return;
23812383
var domArray = getElementNodesFromFiber(fiber);
23822384
this._selectId = id;
23832385
this._selectDom = domArray[0];

chrome/public/bundle/panel.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,6 +2447,8 @@
24472447
var fiber = getFiberNodeById(id);
24482448
if (!fiber)
24492449
return;
2450+
if (id === this._selectId)
2451+
return;
24502452
var domArray = getElementNodesFromFiber(fiber);
24512453
this._selectId = id;
24522454
this._selectDom = domArray[0];

chrome/public/bundle/proxy.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2376,6 +2376,8 @@
23762376
var fiber = getFiberNodeById(id);
23772377
if (!fiber)
23782378
return;
2379+
if (id === this._selectId)
2380+
return;
23792381
var domArray = getElementNodesFromFiber(fiber);
23802382
this._selectId = id;
23812383
this._selectDom = domArray[0];

chrome/public/bundle/service-worker.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2376,6 +2376,8 @@
23762376
var fiber = getFiberNodeById(id);
23772377
if (!fiber)
23782378
return;
2379+
if (id === this._selectId)
2380+
return;
23792381
var domArray = getElementNodesFromFiber(fiber);
23802382
this._selectId = id;
23812383
this._selectDom = domArray[0];

chrome/src/components/NameView.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,36 @@ export const NameView = () => {
2222

2323
const sizeClass = size === "sm" ? "text-[15px]" : size === "md" ? "text-[16px]" : "text-[17px]";
2424

25+
const sizeNum = size === "sm" ? 11 : size === "md" ? 12 : 13;
26+
2527
if (currentSelectDetail) {
2628
return (
2729
<div className={`p-2 ${sizeClass} sticky top-0 bg-content1 transition-transform-background z-50`}>
2830
<TreeItem node={currentSelectDetail} withCollapse={false} withSelect={false} withKey={false} />
2931
<ButtonGroup className="absolute right-4 top-0">
3032
<Tooltip content="force scroll to select" showArrow color="foreground" placement="bottom-end">
3133
<Button isIconOnly size="sm" variant="flat" onPress={scrollIntoView}>
32-
<Crosshair1Icon width="11" height="11" />
34+
<Crosshair1Icon width={sizeNum} height={sizeNum} />
3335
</Button>
3436
</Tooltip>
3537
<Tooltip content="store fiber node" showArrow color="foreground" placement="bottom-end">
3638
<Button isIconOnly size="sm" variant="flat" onPress={storeFiber}>
37-
<CubeIcon width="11" height="11" />
39+
<CubeIcon width={sizeNum} height={sizeNum} />
3840
</Button>
3941
</Tooltip>
4042
<Tooltip content="force trigger" showArrow color="foreground" placement="bottom-end">
4143
<Button isIconOnly size="sm" variant="flat" onPress={triggerFiber}>
42-
<PlayIcon width="11" height="11" />
44+
<PlayIcon width={sizeNum} height={sizeNum} />
4345
</Button>
4446
</Tooltip>
4547
<Tooltip content="inspect dom" showArrow color="foreground" placement="bottom-end">
4648
<Button isIconOnly size="sm" variant="flat" onPress={inspectDom}>
47-
<EyeOpenIcon width="11" height="11" />
49+
<EyeOpenIcon width={sizeNum} height={sizeNum} />
4850
</Button>
4951
</Tooltip>
5052
<Tooltip content="force reload" showArrow color="foreground" placement="bottom-end">
5153
<Button isIconOnly size="sm" variant="flat" onPress={forceReload}>
52-
<ReloadIcon width="10" height="10" />
54+
<ReloadIcon width={sizeNum - 1} height={sizeNum - 1} />
5355
</Button>
5456
</Tooltip>
5557
</ButtonGroup>

chrome/src/components/TreeView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ const TreeViewImpl = memo(({ onScroll, data, onMount }: { onScroll: () => void;
6868
);
6969
});
7070

71+
const hasLength = data.length > 0;
72+
7173
useEffect(() => {
7274
const cb = useTreeNode.subscribe(
7375
(s) => s.scroll,
@@ -81,9 +83,7 @@ const TreeViewImpl = memo(({ onScroll, data, onMount }: { onScroll: () => void;
8183
);
8284

8385
return cb;
84-
}, []);
85-
86-
const hasLength = data.length > 0;
86+
}, [hasLength]);
8787

8888
useEffect(() => {
8989
if (hasLength) {

chrome/src/utils/render.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ export const onRender = (data: DevToolMessageType) => {
3737

3838
setRender(detector);
3939
});
40+
41+
chrome.devtools?.inspectedWindow?.eval?.(`(() => {
42+
if (window['$$$$0'] !== $0) {
43+
window.__MY_REACT_DEVTOOL_INTERNAL__?.setSelectDom?.($0);
44+
window.__MY_REACT_DEVTOOL_INTERNAL__?.notifySelectSync?.();
45+
window['$$$$0'] = $0;
46+
}
47+
})()`);
4048
}
4149

4250
if (data.type === DevToolMessageEnum.dir) {
@@ -78,11 +86,11 @@ export const onRender = (data: DevToolMessageType) => {
7886
});
7987
}
8088

81-
if (data.type === DevToolMessageEnum['select-sync']) {
89+
if (data.type === DevToolMessageEnum["select-sync"]) {
8290
safeAction(() => {
8391
useTreeNode.getActions().setSelect(data.data as string);
8492
useTreeNode.getActions().scrollIntoView();
85-
})
93+
});
8694
}
8795

8896
if (data.type === DevToolMessageEnum.hmr) {

packages/core/src/instance.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,8 @@ export class DevToolCore {
467467

468468
if (!fiber) return;
469469

470+
if (id === this._selectId) return;
471+
470472
const domArray = getElementNodesFromFiber(fiber);
471473

472474
this._selectId = id;

0 commit comments

Comments
 (0)