Skip to content

Commit e516a87

Browse files
MrWangJustToDoMrWangJustToDo
committed
update
1 parent 907e5df commit e516a87

File tree

16 files changed

+263
-101
lines changed

16 files changed

+263
-101
lines changed

‎chrome/public/bundle/detector.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
DevToolMessageEnum["changed"] = "changed";
6868
DevToolMessageEnum["highlight"] = "highlight";
6969
DevToolMessageEnum["trigger"] = "trigger";
70+
DevToolMessageEnum["running"] = "running";
7071
DevToolMessageEnum["triggerStatus"] = "triggerStatus";
7172
DevToolMessageEnum["hmr"] = "hmr";
7273
DevToolMessageEnum["hmrStatus"] = "hmrStatus";

‎chrome/public/bundle/forward-dev.js‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
DevToolMessageEnum["changed"] = "changed";
188188
DevToolMessageEnum["highlight"] = "highlight";
189189
DevToolMessageEnum["trigger"] = "trigger";
190+
DevToolMessageEnum["running"] = "running";
190191
DevToolMessageEnum["triggerStatus"] = "triggerStatus";
191192
DevToolMessageEnum["hmr"] = "hmr";
192193
DevToolMessageEnum["hmrStatus"] = "hmrStatus";
@@ -3135,6 +3136,7 @@
31353136
DevToolMessageEnum["changed"] = "changed";
31363137
DevToolMessageEnum["highlight"] = "highlight";
31373138
DevToolMessageEnum["trigger"] = "trigger";
3139+
DevToolMessageEnum["running"] = "running";
31383140
DevToolMessageEnum["triggerStatus"] = "triggerStatus";
31393141
DevToolMessageEnum["hmr"] = "hmr";
31403142
DevToolMessageEnum["hmrStatus"] = "hmrStatus";
@@ -3162,7 +3164,7 @@
31623164
var DevToolSource = "@my-react/devtool";
31633165

31643166
var patchEvent = function (dispatch, runtime) {
3165-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
3167+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
31663168
if (dispatch["$$hasDevToolEvent"])
31673169
return;
31683170
dispatch["$$hasDevToolEvent"] = true;
@@ -3283,6 +3285,17 @@
32833285
runtime._error[id].push(args);
32843286
runtime.notifyError();
32853287
};
3288+
var onFiberRun = function (fiber) {
3289+
var id = getPlainNodeIdByFiber(fiber);
3290+
if (!id)
3291+
return;
3292+
if (!runtime._selectNode)
3293+
return;
3294+
var selectTree = runtime._selectNode._t || [];
3295+
if (!selectTree.includes(id))
3296+
return;
3297+
runtime.notifyRunning(id);
3298+
};
32863299
var onPerformanceWarn = function (fiber) {
32873300
var id = getPlainNodeIdByFiber(fiber);
32883301
if (!id)
@@ -3323,12 +3336,13 @@
33233336
(_d = dispatch.onPerformanceWarn) === null || _d === void 0 ? void 0 : _d.call(dispatch, onPerformanceWarn);
33243337
(_e = dispatch.onFiberChange) === null || _e === void 0 ? void 0 : _e.call(dispatch, onChange);
33253338
(_f = dispatch.onFiberUpdate) === null || _f === void 0 ? void 0 : _f.call(dispatch, onFiberUpdate);
3326-
(_g = dispatch.onFiberHMR) === null || _g === void 0 ? void 0 : _g.call(dispatch, onFiberHMR);
3327-
(_h = dispatch.onDOMUpdate) === null || _h === void 0 ? void 0 : _h.call(dispatch, onDOMUpdate);
3328-
(_j = dispatch.onDOMAppend) === null || _j === void 0 ? void 0 : _j.call(dispatch, onDOMAppend);
3329-
(_k = dispatch.onDOMSetRef) === null || _k === void 0 ? void 0 : _k.call(dispatch, onDOMSetRef);
3330-
(_l = dispatch.onFiberError) === null || _l === void 0 ? void 0 : _l.call(dispatch, onFiberError);
3331-
(_m = dispatch.onFiberWarn) === null || _m === void 0 ? void 0 : _m.call(dispatch, onFiberWarn);
3339+
(_g = dispatch.onAfterFiberRun) === null || _g === void 0 ? void 0 : _g.call(dispatch, onFiberRun);
3340+
(_h = dispatch.onFiberHMR) === null || _h === void 0 ? void 0 : _h.call(dispatch, onFiberHMR);
3341+
(_j = dispatch.onDOMUpdate) === null || _j === void 0 ? void 0 : _j.call(dispatch, onDOMUpdate);
3342+
(_k = dispatch.onDOMAppend) === null || _k === void 0 ? void 0 : _k.call(dispatch, onDOMAppend);
3343+
(_l = dispatch.onDOMSetRef) === null || _l === void 0 ? void 0 : _l.call(dispatch, onDOMSetRef);
3344+
(_m = dispatch.onFiberError) === null || _m === void 0 ? void 0 : _m.call(dispatch, onFiberError);
3345+
(_o = dispatch.onFiberWarn) === null || _o === void 0 ? void 0 : _o.call(dispatch, onFiberWarn);
33323346
}
33333347
else {
33343348
var originalAfterCommit_1 = dispatch.afterCommit;
@@ -4048,7 +4062,7 @@
40484062
function initialize() {
40494063
canvas = window.document.createElement("canvas");
40504064
canvas.setAttribute("popover", "manual");
4051-
canvas.style.cssText = "\n xx-background-color: red;\n xx-opacity: 0.5;\n bottom: 0;\n left: 0;\n pointer-events: none;\n position: fixed;\n right: 0;\n top: 0;\n background-color: transparent;\n outline: none;\n box-shadow: none;\n border: none;\n ";
4065+
canvas.style.cssText = "\n xx-background-color: red;\n xx-opacity: 0.5;\n bottom: 0;\n left: 0;\n pointer-events: none;\n position: fixed;\n right: 0;\n top: 0;\n padding: 0;\n background-color: transparent;\n outline: none;\n box-shadow: none;\n border: none;\n ";
40524066
canvas.setAttribute("data-update", "@my-react");
40534067
var root = window.document.documentElement;
40544068
root.insertBefore(canvas, root.firstChild);
@@ -4192,6 +4206,7 @@
41924206
this._hoverId = "";
41934207
this._selectId = "";
41944208
this._selectDom = null;
4209+
this._selectNode = null;
41954210
this._hasSelectChange = false;
41964211
this._tempDomHoverId = "";
41974212
this._domHoverId = "";
@@ -4489,12 +4504,19 @@
44894504
return;
44904505
var fiber = getFiberNodeById(id);
44914506
if (fiber) {
4492-
this._notify({ type: exports.DevToolMessageEnum.detail, data: inspectFiber(fiber) });
4507+
var detailNode = inspectFiber(fiber);
4508+
this._selectNode = detailNode;
4509+
this._notify({ type: exports.DevToolMessageEnum.detail, data: detailNode });
44934510
}
44944511
else {
44954512
this._notify({ type: exports.DevToolMessageEnum.detail, data: null });
44964513
}
44974514
};
4515+
DevToolCore.prototype.notifyRunning = function (id) {
4516+
if (!this.hasEnable)
4517+
return;
4518+
this._notify({ type: exports.DevToolMessageEnum.running, data: id });
4519+
};
44984520
DevToolCore.prototype.notifySelectSync = function () {
44994521
if (!this.hasEnable)
45004522
return;

‎chrome/public/bundle/hook.js‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
DevToolMessageEnum["changed"] = "changed";
188188
DevToolMessageEnum["highlight"] = "highlight";
189189
DevToolMessageEnum["trigger"] = "trigger";
190+
DevToolMessageEnum["running"] = "running";
190191
DevToolMessageEnum["triggerStatus"] = "triggerStatus";
191192
DevToolMessageEnum["hmr"] = "hmr";
192193
DevToolMessageEnum["hmrStatus"] = "hmrStatus";
@@ -3135,6 +3136,7 @@
31353136
DevToolMessageEnum["changed"] = "changed";
31363137
DevToolMessageEnum["highlight"] = "highlight";
31373138
DevToolMessageEnum["trigger"] = "trigger";
3139+
DevToolMessageEnum["running"] = "running";
31383140
DevToolMessageEnum["triggerStatus"] = "triggerStatus";
31393141
DevToolMessageEnum["hmr"] = "hmr";
31403142
DevToolMessageEnum["hmrStatus"] = "hmrStatus";
@@ -3162,7 +3164,7 @@
31623164
var DevToolSource = "@my-react/devtool";
31633165

31643166
var patchEvent = function (dispatch, runtime) {
3165-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
3167+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
31663168
if (dispatch["$$hasDevToolEvent"])
31673169
return;
31683170
dispatch["$$hasDevToolEvent"] = true;
@@ -3283,6 +3285,17 @@
32833285
runtime._error[id].push(args);
32843286
runtime.notifyError();
32853287
};
3288+
var onFiberRun = function (fiber) {
3289+
var id = getPlainNodeIdByFiber(fiber);
3290+
if (!id)
3291+
return;
3292+
if (!runtime._selectNode)
3293+
return;
3294+
var selectTree = runtime._selectNode._t || [];
3295+
if (!selectTree.includes(id))
3296+
return;
3297+
runtime.notifyRunning(id);
3298+
};
32863299
var onPerformanceWarn = function (fiber) {
32873300
var id = getPlainNodeIdByFiber(fiber);
32883301
if (!id)
@@ -3323,12 +3336,13 @@
33233336
(_d = dispatch.onPerformanceWarn) === null || _d === void 0 ? void 0 : _d.call(dispatch, onPerformanceWarn);
33243337
(_e = dispatch.onFiberChange) === null || _e === void 0 ? void 0 : _e.call(dispatch, onChange);
33253338
(_f = dispatch.onFiberUpdate) === null || _f === void 0 ? void 0 : _f.call(dispatch, onFiberUpdate);
3326-
(_g = dispatch.onFiberHMR) === null || _g === void 0 ? void 0 : _g.call(dispatch, onFiberHMR);
3327-
(_h = dispatch.onDOMUpdate) === null || _h === void 0 ? void 0 : _h.call(dispatch, onDOMUpdate);
3328-
(_j = dispatch.onDOMAppend) === null || _j === void 0 ? void 0 : _j.call(dispatch, onDOMAppend);
3329-
(_k = dispatch.onDOMSetRef) === null || _k === void 0 ? void 0 : _k.call(dispatch, onDOMSetRef);
3330-
(_l = dispatch.onFiberError) === null || _l === void 0 ? void 0 : _l.call(dispatch, onFiberError);
3331-
(_m = dispatch.onFiberWarn) === null || _m === void 0 ? void 0 : _m.call(dispatch, onFiberWarn);
3339+
(_g = dispatch.onAfterFiberRun) === null || _g === void 0 ? void 0 : _g.call(dispatch, onFiberRun);
3340+
(_h = dispatch.onFiberHMR) === null || _h === void 0 ? void 0 : _h.call(dispatch, onFiberHMR);
3341+
(_j = dispatch.onDOMUpdate) === null || _j === void 0 ? void 0 : _j.call(dispatch, onDOMUpdate);
3342+
(_k = dispatch.onDOMAppend) === null || _k === void 0 ? void 0 : _k.call(dispatch, onDOMAppend);
3343+
(_l = dispatch.onDOMSetRef) === null || _l === void 0 ? void 0 : _l.call(dispatch, onDOMSetRef);
3344+
(_m = dispatch.onFiberError) === null || _m === void 0 ? void 0 : _m.call(dispatch, onFiberError);
3345+
(_o = dispatch.onFiberWarn) === null || _o === void 0 ? void 0 : _o.call(dispatch, onFiberWarn);
33323346
}
33333347
else {
33343348
var originalAfterCommit_1 = dispatch.afterCommit;
@@ -4048,7 +4062,7 @@
40484062
function initialize() {
40494063
canvas = window.document.createElement("canvas");
40504064
canvas.setAttribute("popover", "manual");
4051-
canvas.style.cssText = "\n xx-background-color: red;\n xx-opacity: 0.5;\n bottom: 0;\n left: 0;\n pointer-events: none;\n position: fixed;\n right: 0;\n top: 0;\n background-color: transparent;\n outline: none;\n box-shadow: none;\n border: none;\n ";
4065+
canvas.style.cssText = "\n xx-background-color: red;\n xx-opacity: 0.5;\n bottom: 0;\n left: 0;\n pointer-events: none;\n position: fixed;\n right: 0;\n top: 0;\n padding: 0;\n background-color: transparent;\n outline: none;\n box-shadow: none;\n border: none;\n ";
40524066
canvas.setAttribute("data-update", "@my-react");
40534067
var root = window.document.documentElement;
40544068
root.insertBefore(canvas, root.firstChild);
@@ -4192,6 +4206,7 @@
41924206
this._hoverId = "";
41934207
this._selectId = "";
41944208
this._selectDom = null;
4209+
this._selectNode = null;
41954210
this._hasSelectChange = false;
41964211
this._tempDomHoverId = "";
41974212
this._domHoverId = "";
@@ -4489,12 +4504,19 @@
44894504
return;
44904505
var fiber = getFiberNodeById(id);
44914506
if (fiber) {
4492-
this._notify({ type: exports.DevToolMessageEnum.detail, data: inspectFiber(fiber) });
4507+
var detailNode = inspectFiber(fiber);
4508+
this._selectNode = detailNode;
4509+
this._notify({ type: exports.DevToolMessageEnum.detail, data: detailNode });
44934510
}
44944511
else {
44954512
this._notify({ type: exports.DevToolMessageEnum.detail, data: null });
44964513
}
44974514
};
4515+
DevToolCore.prototype.notifyRunning = function (id) {
4516+
if (!this.hasEnable)
4517+
return;
4518+
this._notify({ type: exports.DevToolMessageEnum.running, data: id });
4519+
};
44984520
DevToolCore.prototype.notifySelectSync = function () {
44994521
if (!this.hasEnable)
45004522
return;

‎chrome/public/bundle/panel.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
DevToolMessageEnum["changed"] = "changed";
139139
DevToolMessageEnum["highlight"] = "highlight";
140140
DevToolMessageEnum["trigger"] = "trigger";
141+
DevToolMessageEnum["running"] = "running";
141142
DevToolMessageEnum["triggerStatus"] = "triggerStatus";
142143
DevToolMessageEnum["hmr"] = "hmr";
143144
DevToolMessageEnum["hmrStatus"] = "hmrStatus";

‎chrome/public/bundle/proxy.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
DevToolMessageEnum["changed"] = "changed";
101101
DevToolMessageEnum["highlight"] = "highlight";
102102
DevToolMessageEnum["trigger"] = "trigger";
103+
DevToolMessageEnum["running"] = "running";
103104
DevToolMessageEnum["triggerStatus"] = "triggerStatus";
104105
DevToolMessageEnum["hmr"] = "hmr";
105106
DevToolMessageEnum["hmrStatus"] = "hmrStatus";

‎chrome/public/bundle/service-worker.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
DevToolMessageEnum["changed"] = "changed";
101101
DevToolMessageEnum["highlight"] = "highlight";
102102
DevToolMessageEnum["trigger"] = "trigger";
103+
DevToolMessageEnum["running"] = "running";
103104
DevToolMessageEnum["triggerStatus"] = "triggerStatus";
104105
DevToolMessageEnum["hmr"] = "hmr";
105106
DevToolMessageEnum["hmrStatus"] = "hmrStatus";

‎chrome/src/components/NodeView/RenderView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const RenderView = () => {
6161

6262
return (
6363
<div className={`ml-2`} key={node.i} onClick={scrollIntoView}>
64-
<TreeItem node={node} withCollapse={false} />
64+
<TreeItem node={node} withCollapse={false} withRunningCount />
6565
</div>
6666
);
6767
});

0 commit comments

Comments
 (0)