{"body":"","parents":["0608b1a5548af0aff332ba8afe1e0f0d8bae725d"],"files":[{"status":"M","path":"src\/devtools\/views\/DevTools.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/Profiler.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/ProfilerContext.js"}],"patch":"diff --git a\/src\/devtools\/views\/DevTools.js b\/src\/devtools\/views\/DevTools.js\nindex 766ddd82ed..c02eef4fe1 100644\n--- a\/src\/devtools\/views\/DevTools.js\n+++ b\/src\/devtools\/views\/DevTools.js\n@@ -5,7 +5,7 @@\n import '@reach\/menu-button\/styles.css';\n import '@reach\/tooltip\/styles.css';\n \n-import React, { useMemo, useState } from 'react';\n+import React, { useState } from 'react';\n import Store from '..\/store';\n import { BridgeContext, StoreContext } from '.\/context';\n import Components from '.\/Components\/Components';\n@@ -18,7 +18,6 @@ import ViewElementSourceContext from '.\/Components\/ViewElementSourceContext';\n import { ProfilerContextController } from '.\/Profiler\/ProfilerContext';\n import { ModalDialogContextController } from '.\/ModalDialog';\n import ReactLogo from '.\/ReactLogo';\n-import { useSubscription } from '.\/hooks';\n \n import styles from '.\/DevTools.css';\n \n@@ -92,20 +91,6 @@ export default function DevTools({\n setTab(overrideTab);\n }\n \n- const supportsProfilingSubscription = useMemo(\n- () => ({\n- getCurrentValue: () => store.supportsProfiling,\n- subscribe: (callback: Function) => {\n- store.addListener('supportsProfiling', callback);\n- return () => store.removeListener('supportsProfiling', callback);\n- },\n- }),\n- [store]\n- );\n- const supportsProfiling = useSubscription(\n- supportsProfilingSubscription\n- );\n-\n return (\n \n \n@@ -146,10 +131,7 @@ export default function DevTools({\n className={styles.TabContent}\n hidden={tab !== 'profiler'}\n >\n- \n+ \n <\/div>\n \n

\n- \n+ \n \n \n \ndiff --git a\/src\/devtools\/views\/Profiler\/ProfilerContext.js b\/src\/devtools\/views\/Profiler\/ProfilerContext.js\nindex da5090b1b2..99650c07f2 100644\n--- a\/src\/devtools\/views\/Profiler\/ProfilerContext.js\n+++ b\/src\/devtools\/views\/Profiler\/ProfilerContext.js\n@@ -21,6 +21,9 @@ import type { ProfilingDataFrontend } from '.\/types';\n export type TabID = 'flame-chart' | 'ranked-chart' | 'interactions';\n \n export type Context = {|\n+ \/\/ Does the Store support profiling?\n+ supportsProfiling: boolean,\n+\n \/\/ Which tab is selexted in the Profiler UI?\n selectedTabID: TabID,\n selectTab(id: TabID): void,\n@@ -77,6 +80,7 @@ type StoreProfilingState = {|\n isProcessingData: boolean,\n isProfiling: boolean,\n profilingData: ProfilingDataFrontend | null,\n+ supportsProfiling: boolean,\n |};\n \n type Props = {|\n@@ -97,25 +101,29 @@ function ProfilerContextController({ children }: Props) {\n isProcessingData: profilerStore.isProcessingData,\n isProfiling: profilerStore.isProfiling,\n profilingData: profilerStore.profilingData,\n+ supportsProfiling: store.supportsProfiling,\n }),\n subscribe: (callback: Function) => {\n profilerStore.addListener('profilingData', callback);\n profilerStore.addListener('isProcessingData', callback);\n profilerStore.addListener('isProfiling', callback);\n+ store.addListener('supportsProfiling', callback);\n return () => {\n profilerStore.removeListener('profilingData', callback);\n profilerStore.removeListener('isProcessingData', callback);\n profilerStore.removeListener('isProfiling', callback);\n+ store.removeListener('supportsProfiling', callback);\n };\n },\n }),\n- [profilerStore]\n+ [profilerStore, store]\n );\n const {\n didRecordCommits,\n isProcessingData,\n isProfiling,\n profilingData,\n+ supportsProfiling,\n } = useSubscription(subscription);\n \n const [prevProfilingData, setPrevProfilingData] = useState();\n@@ -221,6 +229,7 @@ function ProfilerContextController({ children }: Props) {\n profilingData,\n startProfiling,\n stopProfiling,\n+ supportsProfiling,\n \n rootID,\n setRootID,\n@@ -250,6 +259,7 @@ function ProfilerContextController({ children }: Props) {\n profilingData,\n startProfiling,\n stopProfiling,\n+ supportsProfiling,\n \n rootID,\n setRootID,\n","commit":{"authoredAt":"2019-05-23T08:48:51-07:00","subject":"Moved profiling-supported subscription into ProfilerContext","shortRevision":"541dd6c4b6","revision":"541dd6c4b6a51e853aa0e09843aed64dda313c3f","authorName":"Brian Vaughn","authorEmail":"bvaughn@fb.com"}}

dillon1000/react

Files changed