{"patch":"diff --git a\/src\/__tests__\/inspectedElementContext-test.js b\/src\/__tests__\/inspectedElementContext-test.js\nindex 5a8c60c746..013f6403b0 100644\n--- a\/src\/__tests__\/inspectedElementContext-test.js\n+++ b\/src\/__tests__\/inspectedElementContext-test.js\n@@ -335,6 +335,7 @@ describe('InspectedElementContext', () => {\n expect(typed_array[meta.inspectable]).toBe(false);\n expect(typed_array[meta.name]).toBe('Uint8Array');\n expect(typed_array[meta.type]).toBe('typed_array');\n+ expect(date[meta.inspectable]).toBe(false);\n expect(date[meta.type]).toBe('date');\n \n done();\ndiff --git a\/src\/__tests__\/legacy\/inspectElement-test.js b\/src\/__tests__\/legacy\/inspectElement-test.js\nindex 49b15c6a44..23e384e529 100644\n--- a\/src\/__tests__\/legacy\/inspectElement-test.js\n+++ b\/src\/__tests__\/legacy\/inspectElement-test.js\n@@ -124,20 +124,27 @@ describe('InspectedElementContext', () => {\n typed_array,\n date,\n } = inspectedElement.value.props;\n+ expect(html_element[meta.inspectable]).toBe(false);\n expect(html_element[meta.name]).toBe('DIV');\n expect(html_element[meta.type]).toBe('html_element');\n+ expect(fn[meta.inspectable]).toBe(false);\n expect(fn[meta.name]).toBe('exmapleFunction');\n expect(fn[meta.type]).toBe('function');\n+ expect(symbol[meta.inspectable]).toBe(false);\n expect(symbol[meta.name]).toBe('Symbol(symbol)');\n expect(symbol[meta.type]).toBe('symbol');\n+ expect(react_element[meta.inspectable]).toBe(false);\n expect(react_element[meta.name]).toBe('span');\n expect(react_element[meta.type]).toBe('react_element');\n expect(array_buffer[meta.size]).toBe(3);\n+ expect(array_buffer[meta.inspectable]).toBe(false);\n expect(array_buffer[meta.name]).toBe('ArrayBuffer');\n expect(array_buffer[meta.type]).toBe('array_buffer');\n expect(typed_array[meta.size]).toBe(3);\n+ expect(typed_array[meta.inspectable]).toBe(false);\n expect(typed_array[meta.name]).toBe('Uint8Array');\n expect(typed_array[meta.type]).toBe('typed_array');\n+ expect(date[meta.inspectable]).toBe(false);\n expect(date[meta.type]).toBe('date');\n \n done();\ndiff --git a\/src\/backend\/legacy\/renderer.js b\/src\/backend\/legacy\/renderer.js\nindex 889b14c96f..1c389a3f9a 100644\n--- a\/src\/backend\/legacy\/renderer.js\n+++ b\/src\/backend\/legacy\/renderer.js\n@@ -562,22 +562,20 @@ export function attach(\n });\n }\n \n- function isKeyedPathWhitelisted(\n- key: string\n- ): (path: Array) => boolean {\n- return (path: Array) =>\n- isPathWhitelisted([key].concat(path));\n- }\n-\n- function isPathWhitelisted(path: Array): boolean {\n- let current = currentlyInspectedPaths;\n- for (let i = 0; i < path.length; i++) {\n- current = current[path[i]];\n+ function createIsPathWhitelisted(key: string) {\n+ return function isPathWhitelisted(path: Array): boolean {\n+ let current = currentlyInspectedPaths[key];\n if (!current) {\n return false;\n }\n- }\n- return true;\n+ for (let i = 0; i < path.length; i++) {\n+ current = current[path[i]];\n+ if (!current) {\n+ return false;\n+ }\n+ }\n+ return true;\n+ };\n }\n \n function inspectElement(\n@@ -603,15 +601,15 @@ export function attach(\n \n inspectedElement.context = cleanForBridge(\n inspectedElement.context,\n- isKeyedPathWhitelisted('context')\n+ createIsPathWhitelisted('context')\n );\n inspectedElement.props = cleanForBridge(\n inspectedElement.props,\n- isKeyedPathWhitelisted('props')\n+ createIsPathWhitelisted('props')\n );\n inspectedElement.state = cleanForBridge(\n inspectedElement.state,\n- isKeyedPathWhitelisted('state')\n+ createIsPathWhitelisted('state')\n );\n \n return {\ndiff --git a\/src\/backend\/renderer.js b\/src\/backend\/renderer.js\nindex 10b8cd6199..e75a4548c1 100644\n--- a\/src\/backend\/renderer.js\n+++ b\/src\/backend\/renderer.js\n@@ -2147,26 +2147,27 @@ export function attach(\n });\n }\n \n- function isKeyedPathWhitelisted(\n- key: string,\n- isHooks: boolean\n- ): (path: Array) => boolean {\n- return (path: Array) =>\n- isPathWhitelisted([key].concat(path)) ||\n+ function createIsPathWhitelisted(isHooksPath: boolean, key: string | null) {\n+ return function isPathWhitelisted(path: Array): boolean {\n \/\/ Dehydrating the 'subHooks' property makes the HooksTree UI a lot more complicated,\n \/\/ so it's easiest for now if we just don't break on this boundary.\n- (isHooks && path[path.length - 1] === 'subHooks');\n- }\n+ if (isHooksPath && path[path.length - 1] === 'subHooks') {\n+ return true;\n+ }\n \n- function isPathWhitelisted(path: Array): boolean {\n- let current = currentlyInspectedPaths;\n- for (let i = 0; i < path.length; i++) {\n- current = current[path[i]];\n+ let current =\n+ key === null ? currentlyInspectedPaths : currentlyInspectedPaths[key];\n if (!current) {\n return false;\n }\n- }\n- return true;\n+ for (let i = 0; i < path.length; i++) {\n+ current = current[path[i]];\n+ if (!current) {\n+ return false;\n+ }\n+ }\n+ return true;\n+ };\n }\n \n function inspectElement(\n@@ -2190,7 +2191,7 @@ export function attach(\n ((mostRecentlyInspectedElement: any): InspectedElement),\n path\n ),\n- isPathWhitelisted,\n+ createIsPathWhitelisted(path[0] === 'hooks', null),\n path\n ),\n };\n@@ -2228,23 +2229,23 @@ export function attach(\n \n cleanedInspectedElement.context = cleanForBridge(\n cleanedInspectedElement.context,\n- isKeyedPathWhitelisted('context', false)\n+ createIsPathWhitelisted(false, 'context')\n );\n cleanedInspectedElement.events = cleanForBridge(\n cleanedInspectedElement.events,\n- isKeyedPathWhitelisted('events', false)\n+ createIsPathWhitelisted(false, 'events')\n );\n cleanedInspectedElement.hooks = cleanForBridge(\n cleanedInspectedElement.hooks,\n- isKeyedPathWhitelisted('hooks', true)\n+ createIsPathWhitelisted(true, 'hooks')\n );\n cleanedInspectedElement.props = cleanForBridge(\n cleanedInspectedElement.props,\n- isKeyedPathWhitelisted('props', false)\n+ createIsPathWhitelisted(false, 'props')\n );\n cleanedInspectedElement.state = cleanForBridge(\n cleanedInspectedElement.state,\n- isKeyedPathWhitelisted('state', false)\n+ createIsPathWhitelisted(false, 'state')\n );\n \n return {\n","body":"","parents":["717af9f5c339523f4855c555b8c039f83f0fca8b"],"commit":{"authorName":"Brian Vaughn","authoredAt":"2019-06-17T14:49:19-07:00","revision":"6c03f6abbdc2d9154ac908ff648d50a2a4d7ddb6","authorEmail":"bvaughn@fb.com","subject":"Tidied up a bit","shortRevision":"6c03f6abbd"},"files":[{"status":"M","path":"src\/__tests__\/inspectedElementContext-test.js"},{"status":"M","path":"src\/__tests__\/legacy\/inspectElement-test.js"},{"status":"M","path":"src\/backend\/legacy\/renderer.js"},{"status":"M","path":"src\/backend\/renderer.js"}]}

dillon1000/react

Files changed