From e35819e68d46096b5e995a882baab2bfb05e2fcd Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Thu, 21 Feb 2019 08:59:46 -0800 Subject: [PATCH] Renamed nativeHookIndex -> index --- src/backend/ReactDebugHooks.js | 8 ++++---- src/backend/agent.js | 6 +++--- src/backend/renderer.js | 4 ++-- src/backend/types.js | 6 +++--- src/devtools/views/HooksTree.js | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/backend/ReactDebugHooks.js b/src/backend/ReactDebugHooks.js index 86bfac4fc3..2490ba861d 100644 --- a/src/backend/ReactDebugHooks.js +++ b/src/backend/ReactDebugHooks.js @@ -225,7 +225,7 @@ type ReactCurrentDispatcher = { }; type HooksNode = { - nativeHookIndex: number, + index: number, name: string, value: mixed, subHooks: Array, @@ -367,7 +367,7 @@ function buildTree(rootStack, readHookLog): HooksTree { const rootChildren = []; let prevStack = null; let levelChildren = rootChildren; - let nativeHookIndex = 0; + let index = 0; const stackOfChildren = []; for (let i = 0; i < readHookLog.length; i++) { const hook = readHookLog[i]; @@ -401,7 +401,7 @@ function buildTree(rootStack, readHookLog): HooksTree { levelChildren.push({ name: parseCustomHookName(stack[j - 1].functionName), value: undefined, - nativeHookIndex: -1, + index: -1, subHooks: children, }); stackOfChildren.push(levelChildren); @@ -412,7 +412,7 @@ function buildTree(rootStack, readHookLog): HooksTree { levelChildren.push({ name: hook.primitive, value: hook.value, - nativeHookIndex: hook.primitive === 'DebugValue' ? -1 : nativeHookIndex++, + index: hook.primitive === 'DebugValue' ? -1 : index++, subHooks: [], }); } diff --git a/src/backend/agent.js b/src/backend/agent.js index 0319026b20..d90fa82fc0 100644 --- a/src/backend/agent.js +++ b/src/backend/agent.js @@ -25,7 +25,7 @@ type InspectSelectParams = {| type OverrideHookParams = {| id: number, - nativeHookIndex: number, + index: number, path: Array, rendererID: number, value: any, @@ -133,7 +133,7 @@ export default class Agent extends EventEmitter { overrideHook = ({ id, - nativeHookIndex, + index, path, rendererID, value, @@ -142,7 +142,7 @@ export default class Agent extends EventEmitter { if (renderer == null) { console.warn(`Invalid renderer id "${rendererID}" for element "${id}"`); } else { - renderer.setInHook(id, nativeHookIndex, path, value); + renderer.setInHook(id, index, path, value); } }; diff --git a/src/backend/renderer.js b/src/backend/renderer.js index 42ebfb65ea..82bf60155a 100644 --- a/src/backend/renderer.js +++ b/src/backend/renderer.js @@ -1168,14 +1168,14 @@ export function attach( function setInHook( id: number, - nativeHookIndex: number, + index: number, path: Array, value: any ) { const fiber = findCurrentFiberUsingSlowPath(idToFiberMap.get(id)); if (fiber !== null) { if (typeof overrideHook === 'function') { - overrideHook(fiber, nativeHookIndex, path, value); + overrideHook(fiber, index, path, value); } } } diff --git a/src/backend/types.js b/src/backend/types.js index 8ff4a670d8..6a2378c66b 100644 --- a/src/backend/types.js +++ b/src/backend/types.js @@ -37,7 +37,7 @@ export type ReactRenderer = { // 16.9+ overrideHook?: ?( fiber: Object, - nativeHookIndex: number, + index: number, path: Array, value: any ) => void, @@ -68,7 +68,7 @@ export type RendererInterface = { setInContext: (id: number, path: Array, value: any) => void, setInHook: ( id: number, - nativeHookIndex: number, + index: number, path: Array, value: any ) => void, @@ -99,7 +99,7 @@ export type DevToolsHook = { }; export type HooksNode = { - nativeHookIndex: number, + index: number, name: string, value: mixed, subHooks: Array, diff --git a/src/devtools/views/HooksTree.js b/src/devtools/views/HooksTree.js index 6bf51ef381..173d5c6b01 100644 --- a/src/devtools/views/HooksTree.js +++ b/src/devtools/views/HooksTree.js @@ -56,7 +56,7 @@ type HookViewProps = {| |}; function HookView({ canEditHooks, hook, id, path = [] }: HookViewProps) { - const { name, nativeHookIndex, subHooks, value } = hook; + const { name, index, subHooks, value } = hook; const bridge = useContext(BridgeContext); const store = useContext(StoreContext); @@ -126,7 +126,7 @@ function HookView({ canEditHooks, hook, id, path = [] }: HookViewProps) { const rendererID = store.getRendererIDForElement(id); bridge.send('overrideHook', { id, - nativeHookIndex, + index, path, rendererID, value,