fix..

Author: MrWangJustToDo

chrome/public/bundle/hook.js

@@ -2451,10 +2451,6 @@
     		};
 
     		var typeKeys = [];
-    		var platform = null;
-    		var setPlatform = function (p) {
-    		    platform = p;
-    		};
     		// SEE https://github.com/facebook/react/blob/main/compiler/packages/react-compiler-runtime/src/index.ts
     		var reactCompilerSymbol = Symbol.for("react.memo_cache_sentinel");
     		Object.keys(exports.NODE_TYPE).forEach(function (key) {
@@ -2825,6 +2821,18 @@
     		        };
     		    });
     		};
+    		var getDispatch = function (fiber) {
+    		    var dispatch;
+    		    while (fiber) {
+    		        var typedFiber = fiber;
+    		        if (typedFiber.renderDispatch) {
+    		            dispatch = typedFiber.renderDispatch;
+    		            break;
+    		        }
+    		        fiber = fiber.parent;
+    		    }
+    		    return dispatch;
+    		};
     		var getHookNormal = function (fiber) {
     		    var _a;
     		    var final = [];
@@ -2847,19 +2855,20 @@
     		    return final;
     		};
     		// disable all log
-    		var getHookStack = function (fiber) {
+    		var getHookStack = function (fiber, dispatch) {
     		    var final = [];
     		    if (!fiber.hookList)
     		        return final;
     		    disableLogs();
-    		    var hookTree = inspectHooksOfFiber(fiber, platform.dispatcher);
+    		    var hookTree = inspectHooksOfFiber(fiber, dispatch.dispatcher);
     		    reenableLogs();
     		    return parseHooksTreeToHOOKTree(hookTree, 0);
     		};
     		var getHook = function (fiber) {
-    		    if (platform && platform.dispatcher) {
+    		    var dispatch = getDispatch(fiber);
+    		    if (dispatch && dispatch.dispatcher) {
     		        try {
-    		            return getHookStack(fiber);
+    		            return getHookStack(fiber, dispatch);
     		        }
     		        catch (e) {
     		            console.error(e);
@@ -3893,7 +3902,7 @@
     		    }
     		}
     		function overridePatchToFiberInit(dispatch, runtime) {
-    		    if (typeof dispatch.onFiberInitial === 'function') {
+    		    if (typeof dispatch.onFiberInitial === "function") {
     		        dispatch.onFiberInitial(function (f) { return initPlainNode(f); });
     		    }
     		    else {
@@ -4019,7 +4028,6 @@
     		        }
     		        if (platform) {
     		            this._platform = platform;
-    		            setPlatform(this._platform);
     		        }
     		        this.patchDispatch(dispatch);
     		    };
@@ -4563,7 +4571,6 @@
     		exports.isValidElement = isValidElement;
     		exports.loopChangedTree = loopChangedTree;
     		exports.loopTree = loopTree;
-    		exports.setPlatform = setPlatform;
     		exports.shallowAssignFiber = shallowAssignFiber;
     		exports.throttle = throttle;
     		exports.typeKeys = typeKeys;

chrome/src/hooks/useConfig.ts

@@ -1,6 +1,6 @@
 import { createState } from "reactivity-store";
 
-export const useConfig = createState(() => ({ state: { enableEdit: false, enableHover: false, enableUpdate: false, enableHoverOnBrowser: false, enableRetrigger: false } }), {
+export const useConfig = createState(() => ({ state: { enableEdit: true, enableHover: false, enableUpdate: false, enableHoverOnBrowser: false, enableRetrigger: false } }), {
   withActions: (s) => ({
     setEnableEdit(enableEdit: boolean) {
       s.state.enableEdit = enableEdit;

packages/core/src/instance.ts

@@ -5,7 +5,6 @@ import { isNormalEquals } from "@my-react/react-shared";
 import { getNode, getNodeFromId } from "./data";
 import { DevToolMessageEnum, HMRStatus } from "./event";
 import { Highlight, Select } from "./highlight";
-import { type DispatcherType } from "./hook";
 import { disableBrowserHover, enableBrowserHover, inspectCom, inspectDom, inspectSource } from "./inspect";
 import { setupDispatch, type DevToolRenderDispatch } from "./setup";
 import {
@@ -19,7 +18,7 @@ import {
   getElementNodesFromFiber,
   updateFiberNode,
 } from "./tree";
-import { debounce, setPlatform, throttle } from "./utils";
+import { debounce, throttle } from "./utils";
 
 import type { Tree } from "./tree";
 import type { CustomRenderPlatform, MyReactFiberNode, UpdateState } from "@my-react/react-reconciler";
@@ -30,9 +29,7 @@ export type DevToolMessageType = {
   data: any;
 };
 
-export type DevToolRenderPlatform = CustomRenderPlatform & {
-  dispatcher: { current: DispatcherType };
-};
+export type DevToolRenderPlatform = CustomRenderPlatform;
 
 const map = new Map();
 
@@ -177,8 +174,6 @@ export class DevToolCore {
 
     if (platform) {
       this._platform = platform as DevToolRenderPlatform;
-
-      setPlatform(this._platform);
     }
 
     this.patchDispatch(dispatch);

packages/core/src/setup.ts

@@ -32,7 +32,7 @@ function overridePatchToFiberUnmount(dispatch: DevToolRenderDispatch, runtime: D
 }
 
 function overridePatchToFiberInit(dispatch: DevToolRenderDispatch, runtime: DevToolCore) {
-  if (typeof dispatch.onFiberInitial === 'function') {
+  if (typeof dispatch.onFiberInitial === "function") {
     dispatch.onFiberInitial((f) => initPlainNode(f, runtime));
   } else {
     if (__DEV__) {

packages/core/src/utils.ts

@@ -1,6 +1,5 @@
 /* eslint-disable max-lines */
 /* eslint-disable @typescript-eslint/no-unsafe-function-type */
-import { type MyReactFiberNode, type MyReactFiberNodeDev, type MyReactHookNode, type MyReactHookNodeDev } from "@my-react/react-reconciler";
 import {
   Consumer,
   Context,
@@ -25,12 +24,12 @@ import {
 } from "@my-react/react-shared";
 
 import { getNode } from "./data";
-import { inspectHooksOfFiber, type HooksTree } from "./hook";
+import { inspectHooksOfFiber } from "./hook";
 import { disableLogs, reenableLogs } from "./log";
 import { getPlainNodeByFiber } from "./tree";
 import { NODE_TYPE } from "./type";
 
-import type { DevToolRenderPlatform } from "./instance";
+import type { DispatcherType, HooksTree } from "./hook";
 import type { HOOKTree, PlainNode } from "./plain";
 import type { DevToolRenderDispatch } from "./setup";
 import type {
@@ -45,15 +44,17 @@ import type {
   lazy,
   memo,
 } from "@my-react/react";
+import type {
+  MyReactFiberNode,
+  MyReactHookNode,
+  MyReactFiberNodeDev,
+  MyReactFiberRoot,
+  MyReactHookNodeDev,
+  CustomRenderDispatch,
+} from "@my-react/react-reconciler";
 
 export const typeKeys: number[] = [];
 
-let platform: DevToolRenderPlatform | null = null;
-
-export const setPlatform = (p: DevToolRenderPlatform) => {
-  platform = p;
-};
-
 // SEE https://github.com/facebook/react/blob/main/compiler/packages/react-compiler-runtime/src/index.ts
 const reactCompilerSymbol = Symbol.for("react.memo_cache_sentinel");
 
@@ -443,6 +444,23 @@ const parseHooksTreeToHOOKTree = (node: HooksTree, d: number): HOOKTree[] => {
   });
 };
 
+const getDispatch = (fiber: MyReactFiberNode) => {
+  let dispatch: DevToolRenderDispatch | undefined;
+
+  while (fiber) {
+    const typedFiber = fiber as unknown as MyReactFiberRoot;
+
+    if (typedFiber.renderDispatch) {
+      dispatch = typedFiber.renderDispatch;
+
+      break;
+    }
+    fiber = fiber.parent;
+  }
+
+  return dispatch;
+};
+
 const getHookNormal = (fiber: MyReactFiberNodeDev) => {
   const final: HOOKTree[] = [];
 
@@ -469,24 +487,25 @@ const getHookNormal = (fiber: MyReactFiberNodeDev) => {
 };
 
 // disable all log
-const getHookStack = (fiber: MyReactFiberNodeDev) => {
+const getHookStack = (fiber: MyReactFiberNodeDev, dispatch: CustomRenderDispatch) => {
   const final: HOOKTree[] = [];
 
   if (!fiber.hookList) return final;
 
   disableLogs();
 
-  const hookTree = inspectHooksOfFiber(fiber, platform.dispatcher);
+  const hookTree = inspectHooksOfFiber(fiber, dispatch.dispatcher as { current: DispatcherType });
 
   reenableLogs();
 
   return parseHooksTreeToHOOKTree(hookTree, 0);
 };
 
 export const getHook = (fiber: MyReactFiberNodeDev) => {
-  if (platform && platform.dispatcher) {
+  const dispatch = getDispatch(fiber);
+  if (dispatch && dispatch.dispatcher) {
     try {
-      return getHookStack(fiber);
+      return getHookStack(fiber, dispatch);
     } catch (e) {
       console.error(e);
       return getHookNormal(fiber);