Skip to content

Commit

Permalink
Updated to account for facebook/react/pull/14906/commits/cdd9ba4
Browse files Browse the repository at this point in the history
  • Loading branch information
bestlucky0825 committed Feb 28, 2019
1 parent 58fc6a4 commit 316e4ca
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 17 deletions.
25 changes: 18 additions & 7 deletions src/backend/ReactDebugHooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ type ReactCurrentDispatcher = {
};

type HooksNode = {
index: number,
isEditable: boolean,
id: number | null,
isStateEditable: boolean,
name: string,
value: mixed,
subHooks: Array<HooksNode>,
Expand Down Expand Up @@ -368,7 +368,7 @@ function buildTree(rootStack, readHookLog): HooksTree {
const rootChildren = [];
let prevStack = null;
let levelChildren = rootChildren;
let index = 0;
let nativeHookID = 0;
const stackOfChildren = [];
for (let i = 0; i < readHookLog.length; i++) {
const hook = readHookLog[i];
Expand Down Expand Up @@ -402,8 +402,8 @@ function buildTree(rootStack, readHookLog): HooksTree {
levelChildren.push({
name: parseCustomHookName(stack[j - 1].functionName),
value: undefined,
index: -1,
isEditable: false,
id: null,
isStateEditable: false,
subHooks: children,
});
stackOfChildren.push(levelChildren);
Expand All @@ -412,9 +412,20 @@ function buildTree(rootStack, readHookLog): HooksTree {
prevStack = stack;
}
const { primitive } = hook;

// For now, the "id" of stateful hooks is just the stateful hook index.
// Custom hooks have no ids, nor do non-stateful native hooks (e.g. Context, DebugValue).
const id =
primitive === 'Context' || primitive === 'DebugValue'
? null
: nativeHookID++;

// For the time being, only State and Reducer hooks support runtime overrides.
const isStateEditable = primitive === 'Reducer' || primitive === 'State';

levelChildren.push({
index: primitive === 'DebugValue' ? -1 : index++,
isEditable: primitive === 'Reducer' || primitive === 'State',
id,
isStateEditable,
name: primitive,
value: hook.value,
subHooks: [],
Expand Down
6 changes: 3 additions & 3 deletions src/backend/agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type InspectSelectParams = {|

type OverrideHookParams = {|
id: number,
index: number,
hookID: number,
path: Array<string | number>,
rendererID: number,
value: any,
Expand Down Expand Up @@ -134,7 +134,7 @@ export default class Agent extends EventEmitter {

overrideHookState = ({
id,
index,
hookID,
path,
rendererID,
value,
Expand All @@ -143,7 +143,7 @@ export default class Agent extends EventEmitter {
if (renderer == null) {
console.warn(`Invalid renderer id "${rendererID}" for element "${id}"`);
} else {
renderer.setInHook(id, index, path, value);
renderer.setInHook(id, hookID, path, value);
}
};

Expand Down
4 changes: 2 additions & 2 deletions src/backend/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ export type DevToolsHook = {
};

export type HooksNode = {
index: number,
isEditable: boolean,
id: number,
isStateEditable: boolean,
name: string,
value: mixed,
subHooks: Array<HooksNode>,
Expand Down
6 changes: 3 additions & 3 deletions src/devtools/views/HooksTree.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ type HookViewProps = {|
|};

function HookView({ canEditHooks, hook, id, path = [] }: HookViewProps) {
const { name, index, isEditable, subHooks, value } = hook;
const { name, id: hookID, isStateEditable, subHooks, value } = hook;

const bridge = useContext(BridgeContext);
const store = useContext(StoreContext);
Expand Down Expand Up @@ -141,12 +141,12 @@ function HookView({ canEditHooks, hook, id, path = [] }: HookViewProps) {
} else {
let overrideValueFn = null;
// TODO Maybe read editable value from debug hook?
if (canEditHooks && isEditable) {
if (canEditHooks && isStateEditable) {
overrideValueFn = (path: Array<string | number>, value: any) => {
const rendererID = store.getRendererIDForElement(id);
bridge.send('overrideHookState', {
id,
index,
hookID,
path,
rendererID,
value,
Expand Down
4 changes: 2 additions & 2 deletions src/devtools/views/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ export function serializeHooksForCopy(hooks: HooksTree | null): string {
const current = queue.pop();

// These aren't meaningful
delete current.isEditable;
delete current.index;
delete current.id;
delete current.isStateEditable;

if (current.subHooks.length > 0) {
queue.push(...current.subHooks);
Expand Down

0 comments on commit 316e4ca

Please sign in to comment.