{"commit":{"revision":"99b6a44beb5b10a517c4af93e2e5b5ea07ed86e9","shortRevision":"99b6a44beb","authorEmail":"bvaughn@fb.com","subject":"Updated event subscriptions and getters to use new ProfilerStore","authorName":"Brian Vaughn","authoredAt":"2019-05-22T07:40:41-07:00"},"body":"","patch":"diff --git a\/src\/__tests__\/profilerStore-test.js b\/src\/__tests__\/profilerStore-test.js\nindex d2f7eefef7..08f64b344b 100644\n--- a\/src\/__tests__\/profilerStore-test.js\n+++ b\/src\/__tests__\/profilerStore-test.js\n@@ -34,14 +34,14 @@ describe('ProfilerStore', () => {\n ReactDOM.render(, containerB);\n });\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n \n utils.act(() => {\n ReactDOM.render(, containerA);\n ReactDOM.render(, containerB);\n });\n \n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n const rootA = store.roots[0];\n const rootB = store.roots[1];\ndiff --git a\/src\/__tests__\/profilingCache-test.js b\/src\/__tests__\/profilingCache-test.js\nindex 04e4a9fdda..8ea903dee1 100644\n--- a\/src\/__tests__\/profilingCache-test.js\n+++ b\/src\/__tests__\/profilingCache-test.js\n@@ -51,11 +51,11 @@ describe('ProfilingCache', () => {\n const container = document.createElement('div');\n \n utils.act(() => ReactDOM.render(, container));\n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n let profilingDataForRoot = null;\n \n@@ -120,12 +120,12 @@ describe('ProfilingCache', () => {\n \n const container = document.createElement('div');\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n const allCommitData = [];\n \n@@ -200,11 +200,11 @@ describe('ProfilingCache', () => {\n return null;\n };\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() =>\n ReactDOM.render(, document.createElement('div'))\n );\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n let commitData = null;\n \n@@ -262,11 +262,11 @@ describe('ProfilingCache', () => {\n return data;\n };\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n await utils.actAsync(() =>\n ReactDOM.render(, document.createElement('div'))\n );\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n const allCommitData = [];\n \n@@ -317,16 +317,16 @@ describe('ProfilingCache', () => {\n \n const container = document.createElement('div');\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n const allFiberCommits = [];\n \n function Suspender({ fiberID, previousFiberCommits, rootID }) {\n- const fiberCommits = store.profilingCache.getFiberCommits({\n+ const fiberCommits = store.profilerStore.profilingCache.getFiberCommits({\n fiberID,\n rootID,\n });\n@@ -407,7 +407,7 @@ describe('ProfilingCache', () => {\n \n const container = document.createElement('div');\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() =>\n SchedulerTracing.unstable_trace(\n 'mount: one child',\n@@ -422,14 +422,16 @@ describe('ProfilingCache', () => {\n () => ReactDOM.render(, container)\n )\n );\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n let interactions = null;\n \n function Suspender({ previousInteractions, rootID }) {\n- interactions = store.profilingCache.getInteractionsChartData({\n- rootID,\n- }).interactions;\n+ interactions = store.profilerStore.profilingCache.getInteractionsChartData(\n+ {\n+ rootID,\n+ }\n+ ).interactions;\n if (previousInteractions != null) {\n expect(interactions).toEqual(previousInteractions);\n } else {\ndiff --git a\/src\/__tests__\/profilingCharts-test.js b\/src\/__tests__\/profilingCharts-test.js\nindex 33d698600b..cebbdc0d54 100644\n--- a\/src\/__tests__\/profilingCharts-test.js\n+++ b\/src\/__tests__\/profilingCharts-test.js\n@@ -47,7 +47,7 @@ describe('profiling charts', () => {\n \n const container = document.createElement('div');\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() =>\n SchedulerTracing.unstable_trace('mount', Scheduler.unstable_now(), () =>\n ReactDOM.render(, container)\n@@ -60,20 +60,22 @@ describe('profiling charts', () => {\n () => ReactDOM.render(, container)\n )\n );\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n let renderFinished = false;\n \n function Suspender({ commitIndex, rootID }) {\n- const commitTree = store.profilingCache.getCommitTree({\n+ const commitTree = store.profilerStore.profilingCache.getCommitTree({\n commitIndex,\n rootID,\n });\n- const chartData = store.profilingCache.getFlamegraphChartData({\n- commitIndex,\n- commitTree,\n- rootID,\n- });\n+ const chartData = store.profilerStore.profilingCache.getFlamegraphChartData(\n+ {\n+ commitIndex,\n+ commitTree,\n+ rootID,\n+ }\n+ );\n expect(commitTree).toMatchSnapshot(`${commitIndex}: CommitTree`);\n expect(chartData).toMatchSnapshot(\n `${commitIndex}: FlamegraphChartData`\n@@ -127,7 +129,7 @@ describe('profiling charts', () => {\n \n const container = document.createElement('div');\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() =>\n SchedulerTracing.unstable_trace('mount', Scheduler.unstable_now(), () =>\n ReactDOM.render(, container)\n@@ -140,20 +142,22 @@ describe('profiling charts', () => {\n () => ReactDOM.render(, container)\n )\n );\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n let renderFinished = false;\n \n function Suspender({ commitIndex, rootID }) {\n- const commitTree = store.profilingCache.getCommitTree({\n+ const commitTree = store.profilerStore.profilingCache.getCommitTree({\n commitIndex,\n rootID,\n });\n- const chartData = store.profilingCache.getRankedChartData({\n- commitIndex,\n- commitTree,\n- rootID,\n- });\n+ const chartData = store.profilerStore.profilingCache.getRankedChartData(\n+ {\n+ commitIndex,\n+ commitTree,\n+ rootID,\n+ }\n+ );\n expect(commitTree).toMatchSnapshot(`${commitIndex}: CommitTree`);\n expect(chartData).toMatchSnapshot(`${commitIndex}: RankedChartData`);\n renderFinished = true;\n@@ -203,7 +207,7 @@ describe('profiling charts', () => {\n \n const container = document.createElement('div');\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() =>\n SchedulerTracing.unstable_trace('mount', Scheduler.unstable_now(), () =>\n ReactDOM.render(, container)\n@@ -216,14 +220,16 @@ describe('profiling charts', () => {\n () => ReactDOM.render(, container)\n )\n );\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n let renderFinished = false;\n \n function Suspender({ commitIndex, rootID }) {\n- const chartData = store.profilingCache.getInteractionsChartData({\n- rootID,\n- });\n+ const chartData = store.profilerStore.profilingCache.getInteractionsChartData(\n+ {\n+ rootID,\n+ }\n+ );\n expect(chartData).toMatchSnapshot('Interactions');\n renderFinished = true;\n return null;\ndiff --git a\/src\/__tests__\/profilingCommitTreeBuilder-test.js b\/src\/__tests__\/profilingCommitTreeBuilder-test.js\nindex 31d7acafcf..17cf9b9e7b 100644\n--- a\/src\/__tests__\/profilingCommitTreeBuilder-test.js\n+++ b\/src\/__tests__\/profilingCommitTreeBuilder-test.js\n@@ -38,17 +38,17 @@ describe('commit tree', () => {\n \n const container = document.createElement('div');\n \n- utils.act(() => store.startProfiling());\n+ utils.act(() => store.profilerStore.startProfiling());\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n utils.act(() => ReactDOM.render(, container));\n- utils.act(() => store.stopProfiling());\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n let renderFinished = false;\n \n function Suspender({ commitIndex, rootID }) {\n- const commitTree = store.profilingCache.getCommitTree({\n+ const commitTree = store.profilerStore.profilingCache.getCommitTree({\n commitIndex,\n rootID,\n });\ndiff --git a\/src\/__tests__\/storeComponentFilters-test.js b\/src\/__tests__\/storeComponentFilters-test.js\nindex 3030646bf6..dff169e924 100644\n--- a\/src\/__tests__\/storeComponentFilters-test.js\n+++ b\/src\/__tests__\/storeComponentFilters-test.js\n@@ -1,11 +1,13 @@\n \/\/ @flow\n \n+import type Store from 'src\/devtools\/store';\n+\n describe('Store component filters', () => {\n let React;\n let ReactDOM;\n let TestUtils;\n let Types;\n- let store;\n+ let store: Store;\n let utils;\n \n const act = (callback: Function) => {\n@@ -28,7 +30,7 @@ describe('Store component filters', () => {\n });\n \n it('should throw if filters are updated while profiling', () => {\n- act(() => store.startProfiling());\n+ act(() => store.profilerStore.startProfiling());\n expect(() => (store.componentFilters = [])).toThrow(\n 'Cannot modify filter preferences while profiling'\n );\ndiff --git a\/src\/devtools\/ProfilerStore.js b\/src\/devtools\/ProfilerStore.js\nindex 41b547682a..9f255fd963 100644\n--- a\/src\/devtools\/ProfilerStore.js\n+++ b\/src\/devtools\/ProfilerStore.js\n@@ -114,10 +114,6 @@ export default class ProfilerStore extends EventEmitter {\n throw Error(`Could not find commit data for root \"${rootID}\"`);\n }\n \n- get cache(): ProfilingCache {\n- return this._cache;\n- }\n-\n \/\/ Profiling data has been recorded for at least one root.\n get hasProfilingData(): boolean {\n return (\n@@ -125,21 +121,6 @@ export default class ProfilerStore extends EventEmitter {\n );\n }\n \n- \/\/ TODO (profarc) Remove this getter\n- get initialSnapshotsByRootID(): Map> {\n- return this._initialSnapshotsByRootID;\n- }\n-\n- \/\/ TODO (profarc) Remove this getter\n- get inProgressOperationsByRootID(): Map> {\n- return this._inProgressOperationsByRootID;\n- }\n-\n- \/\/ TODO (profarc) Remove this getter\n- get inProgressScreenshotsByRootID(): Map> {\n- return this._inProgressScreenshotsByRootID;\n- }\n-\n get isProcessingData(): boolean {\n return this._rendererQueue.size > 0 || this._dataBackends.length > 0;\n }\n@@ -148,6 +129,10 @@ export default class ProfilerStore extends EventEmitter {\n return this._isProfiling;\n }\n \n+ get profilingCache(): ProfilingCache {\n+ return this._cache;\n+ }\n+\n get profilingData(): ProfilingDataFrontend | null {\n return this._dataFrontend;\n }\n@@ -159,8 +144,6 @@ export default class ProfilerStore extends EventEmitter {\n this._inProgressScreenshotsByRootID.clear();\n this._cache.invalidate();\n \n- \/\/ TODO (profarc) Remove subscriptions to Store for this\n- this._store.emit('profilingData');\n this.emit('profilingData');\n }\n \n@@ -175,8 +158,6 @@ export default class ProfilerStore extends EventEmitter {\n \/\/ Note that we clear now because any existing data is \"stale\".\n this._cache.invalidate();\n \n- \/\/ TODO (profarc) Remove subscriptions to Store for this\n- this._store.emit('isProfiling');\n this.emit('isProfiling');\n }\n \n@@ -282,8 +263,6 @@ export default class ProfilerStore extends EventEmitter {\n \n this._dataBackends.splice(0);\n \n- \/\/ TODO (profarc) Remove subscriptions to Store for this\n- this._store.emit('isProcessingData');\n this.emit('isProcessingData');\n }\n };\n@@ -320,8 +299,6 @@ export default class ProfilerStore extends EventEmitter {\n \/\/ (That would have resolved a now-stale value without any profiling data.)\n this._cache.invalidate();\n \n- \/\/ TODO (profarc) Remove subscriptions to Store for this\n- this._store.emit('isProfiling');\n this.emit('isProfiling');\n \n \/\/ If we've just finished a profiling session, we need to fetch data stored in each renderer interface\n@@ -339,8 +316,6 @@ export default class ProfilerStore extends EventEmitter {\n }\n }\n \n- \/\/ TODO (profarc) Remove subscriptions to Store for this\n- this._store.emit('isProcessingData');\n this.emit('isProcessingData');\n }\n }\ndiff --git a\/src\/devtools\/store.js b\/src\/devtools\/store.js\nindex be368ee794..41b4534cc0 100644\n--- a\/src\/devtools\/store.js\n+++ b\/src\/devtools\/store.js\n@@ -15,15 +15,10 @@ import {\n utfDecodeString,\n } from '..\/utils';\n import { __DEBUG__ } from '..\/constants';\n-import ProfilingCache from '.\/ProfilingCache';\n import { printStore } from 'src\/__tests__\/storeSerializer';\n import ProfilerStore from '.\/ProfilerStore';\n \n import type { Element } from '.\/views\/Components\/types';\n-import type {\n- ProfilingDataFrontend,\n- SnapshotNode,\n-} from '.\/views\/Profiler\/types';\n import type { Bridge, ComponentFilter, ElementType } from '..\/types';\n \n const debug = (methodName, ...args) => {\n@@ -236,53 +231,10 @@ export default class Store extends EventEmitter {\n return this._hasOwnerMetadata;\n }\n \n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this value.\n- get hasProfilingData(): boolean {\n- return this._profilerStore.hasProfilingData;\n- }\n-\n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this value.\n- get isProcessingProfilingData(): boolean {\n- return this._profilerStore.isProcessingData;\n- }\n-\n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this value.\n- get isProfiling(): boolean {\n- return this._profilerStore.isProfiling;\n- }\n-\n get numElements(): number {\n return this._weightAcrossRoots;\n }\n \n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this value.\n- get profilingCache(): ProfilingCache {\n- return this._profilerStore.cache;\n- }\n-\n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this value.\n- get profilingData(): ProfilingDataFrontend | null {\n- return this._profilerStore.profilingData;\n- }\n- set profilingData(value: ProfilingDataFrontend | null): void {\n- this._profilerStore.profilingData = value;\n- }\n-\n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this value.\n- get profilingOperationsByRootID(): Map> {\n- return this._profilerStore.inProgressOperationsByRootID;\n- }\n-\n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this value.\n- get profilingScreenshotsByRootID(): Map> {\n- return this._profilerStore.inProgressScreenshotsByRootID;\n- }\n-\n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this value.\n- get profilingSnapshotsByRootID(): Map> {\n- return this._profilerStore.initialSnapshotsByRootID;\n- }\n-\n get profilerStore(): ProfilerStore {\n return this._profilerStore;\n }\n@@ -311,11 +263,6 @@ export default class Store extends EventEmitter {\n return this._supportsReloadAndProfile;\n }\n \n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this method.\n- clearProfilingData(): void {\n- this._profilerStore.clear();\n- }\n-\n containsElement(id: number): boolean {\n return this._idToElement.get(id) != null;\n }\n@@ -541,16 +488,6 @@ export default class Store extends EventEmitter {\n return false;\n }\n \n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this method.\n- startProfiling(): void {\n- this._profilerStore.startProfiling();\n- }\n-\n- \/\/ TODO (profarc) Update views to use ProfilerStore directly to access this method.\n- stopProfiling(): void {\n- this._profilerStore.stopProfiling();\n- }\n-\n \/\/ TODO Maybe split this into two methods: expand() and collapse()\n toggleIsCollapsed(id: number, isCollapsed: boolean): void {\n let didMutate = false;\ndiff --git a\/src\/devtools\/views\/Components\/ComponentFiltersModal.js b\/src\/devtools\/views\/Components\/ComponentFiltersModal.js\nindex 45e00b7ff4..7797dcbf24 100644\n--- a\/src\/devtools\/views\/Components\/ComponentFiltersModal.js\n+++ b\/src\/devtools\/views\/Components\/ComponentFiltersModal.js\n@@ -41,6 +41,7 @@ import type {\n \n export default function ComponentFiltersModalWrapper(_: {||}) {\n const store = useContext(StoreContext);\n+ const { profilerStore } = store;\n \n const { isModalShowing, setIsModalShowing } = useContext(\n ComponentFiltersModalContext\n@@ -50,13 +51,13 @@ export default function ComponentFiltersModalWrapper(_: {||}) {\n \/\/ If necessary, we could support this- but it doesn't seem like a necessary use case.\n const isProfilingSubscription = useMemo(\n () => ({\n- getCurrentValue: () => store.isProfiling,\n+ getCurrentValue: () => profilerStore.isProfiling,\n subscribe: (callback: Function) => {\n- store.addListener('isProfiling', callback);\n- return () => store.removeListener('isProfiling', callback);\n+ profilerStore.addListener('isProfiling', callback);\n+ return () => profilerStore.removeListener('isProfiling', callback);\n },\n }),\n- [store]\n+ [profilerStore]\n );\n const isProfiling = useSubscription(isProfilingSubscription);\n if (isProfiling && isModalShowing) {\ndiff --git a\/src\/devtools\/views\/Components\/ToggleComponentFiltersModalButton.js b\/src\/devtools\/views\/Components\/ToggleComponentFiltersModalButton.js\nindex 189454d349..e1d237f33a 100644\n--- a\/src\/devtools\/views\/Components\/ToggleComponentFiltersModalButton.js\n+++ b\/src\/devtools\/views\/Components\/ToggleComponentFiltersModalButton.js\n@@ -14,6 +14,7 @@ import type { ComponentFilter } from 'src\/types';\n \n export default function ToggleComponentFiltersModalButton() {\n const store = useContext(StoreContext);\n+ const { profilerStore } = store;\n \n const { isModalShowing, setIsModalShowing } = useContext(\n ComponentFiltersModalContext\n@@ -23,13 +24,13 @@ export default function ToggleComponentFiltersModalButton() {\n \/\/ If necessary, we could support this- but it doesn't seem like a necessary use case.\n const isProfilingSubscription = useMemo(\n () => ({\n- getCurrentValue: () => store.isProfiling,\n+ getCurrentValue: () => profilerStore.isProfiling,\n subscribe: (callback: Function) => {\n- store.addListener('isProfiling', callback);\n- return () => store.removeListener('isProfiling', callback);\n+ profilerStore.addListener('isProfiling', callback);\n+ return () => profilerStore.removeListener('isProfiling', callback);\n },\n }),\n- [store]\n+ [profilerStore]\n );\n const isProfiling = useSubscription(isProfilingSubscription);\n \ndiff --git a\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js b\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js\nindex a8be6b0f6c..c99f370fce 100644\n--- a\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js\n+++ b\/src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js\n@@ -8,13 +8,14 @@ import { StoreContext } from '..\/context';\n \n export default function ClearProfilingDataButton() {\n const store = useContext(StoreContext);\n- const { isProfiling } = useContext(ProfilerContext);\n+ const { hasProfilingData, isProfiling } = useContext(ProfilerContext);\n+ const { profilerStore } = store;\n \n- const clear = useCallback(() => store.clearProfilingData(), [store]);\n+ const clear = useCallback(() => profilerStore.clear(), [profilerStore]);\n \n return (\n \ndiff --git a\/src\/devtools\/views\/Profiler\/CommitFlamegraph.js b\/src\/devtools\/views\/Profiler\/CommitFlamegraph.js\nindex 58c714b523..e9f8718d16 100644\n--- a\/src\/devtools\/views\/Profiler\/CommitFlamegraph.js\n+++ b\/src\/devtools\/views\/Profiler\/CommitFlamegraph.js\n@@ -25,10 +25,11 @@ export type ItemData = {|\n |};\n \n export default function CommitFlamegraphAutoSizer(_: {||}) {\n- const { profilingCache } = useContext(StoreContext);\n+ const { profilerStore } = useContext(StoreContext);\n const { rootID, selectedCommitIndex, selectFiber } = useContext(\n ProfilerContext\n );\n+ const { profilingCache } = profilerStore;\n \n const deselectCurrentFiber = useCallback(\n event => {\ndiff --git a\/src\/devtools\/views\/Profiler\/CommitRanked.js b\/src\/devtools\/views\/Profiler\/CommitRanked.js\nindex 466475c16b..55e039ae90 100644\n--- a\/src\/devtools\/views\/Profiler\/CommitRanked.js\n+++ b\/src\/devtools\/views\/Profiler\/CommitRanked.js\n@@ -25,10 +25,11 @@ export type ItemData = {|\n |};\n \n export default function CommitRankedAutoSizer(_: {||}) {\n- const { profilingCache } = useContext(StoreContext);\n+ const { profilerStore } = useContext(StoreContext);\n const { rootID, selectedCommitIndex, selectFiber } = useContext(\n ProfilerContext\n );\n+ const { profilingCache } = profilerStore;\n \n const deselectCurrentFiber = useCallback(\n event => {\ndiff --git a\/src\/devtools\/views\/Profiler\/Interactions.js b\/src\/devtools\/views\/Profiler\/Interactions.js\nindex 6c560f7ed9..1ec5597603 100644\n--- a\/src\/devtools\/views\/Profiler\/Interactions.js\n+++ b\/src\/devtools\/views\/Profiler\/Interactions.js\n@@ -45,10 +45,11 @@ function Interactions({ height, width }: {| height: number, width: number |}) {\n selectTab,\n } = useContext(ProfilerContext);\n const { profilerStore } = useContext(StoreContext);\n+ const { profilingCache } = profilerStore;\n \n const dataForRoot = profilerStore.getDataForRoot(((rootID: any): number));\n \n- const chartData = profilerStore.cache.getInteractionsChartData({\n+ const chartData = profilingCache.getInteractionsChartData({\n rootID: ((rootID: any): number),\n });\n \ndiff --git a\/src\/devtools\/views\/Profiler\/ProfilerContext.js b\/src\/devtools\/views\/Profiler\/ProfilerContext.js\nindex c0d4433090..ac4b3b17e6 100644\n--- a\/src\/devtools\/views\/Profiler\/ProfilerContext.js\n+++ b\/src\/devtools\/views\/Profiler\/ProfilerContext.js\n@@ -141,8 +141,13 @@ function ProfilerContextController({ children }: Props) {\n }\n }\n \n- const startProfiling = useCallback(() => store.startProfiling(), [store]);\n- const stopProfiling = useCallback(() => store.stopProfiling(), [store]);\n+ const startProfiling = useCallback(\n+ () => store.profilerStore.startProfiling(),\n+ [store]\n+ );\n+ const stopProfiling = useCallback(() => store.profilerStore.stopProfiling(), [\n+ store,\n+ ]);\n \n const [\n isCommitFilterEnabled,\ndiff --git a\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js b\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js\nindex f7807e02db..fc429a9f65 100644\n--- a\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js\n+++ b\/src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js\n@@ -55,7 +55,7 @@ export default function ProfilingImportExportButtons() {\n const profilingDataExport = ((JSON.parse(\n raw\n ): any): ProfilingDataExport);\n- store.profilingData = prepareProfilingDataFrontendFromExport(\n+ profilerStore.profilingData = prepareProfilingDataFrontendFromExport(\n profilingDataExport\n );\n } catch (error) {\n@@ -76,7 +76,7 @@ export default function ProfilingImportExportButtons() {\n \/\/ TODO (profiling) Handle fileReader errors.\n fileReader.readAsText(input.files[0]);\n }\n- }, [modalDialogDispatch, store]);\n+ }, [modalDialogDispatch, profilerStore]);\n \n return (\n \ndiff --git a\/src\/devtools\/views\/Profiler\/SidebarInteractions.js b\/src\/devtools\/views\/Profiler\/SidebarInteractions.js\nindex 035dfec507..c23a2106fc 100644\n--- a\/src\/devtools\/views\/Profiler\/SidebarInteractions.js\n+++ b\/src\/devtools\/views\/Profiler\/SidebarInteractions.js\n@@ -18,7 +18,8 @@ export default function SidebarInteractions(_: Props) {\n selectTab,\n } = useContext(ProfilerContext);\n \n- const { profilingCache, profilerStore } = useContext(StoreContext);\n+ const { profilerStore } = useContext(StoreContext);\n+ const { profilingCache } = profilerStore;\n \n if (selectedInteractionID === null) {\n return

Nothing selected<\/div>;\ndiff --git a\/src\/devtools\/views\/Profiler\/SidebarSelectedFiberInfo.js b\/src\/devtools\/views\/Profiler\/SidebarSelectedFiberInfo.js\nindex c99d0cdb02..c83b0bc00e 100644\n--- a\/src\/devtools\/views\/Profiler\/SidebarSelectedFiberInfo.js\n+++ b\/src\/devtools\/views\/Profiler\/SidebarSelectedFiberInfo.js\n@@ -12,7 +12,7 @@ import styles from '.\/SidebarSelectedFiberInfo.css';\n export type Props = {||};\n \n export default function SidebarSelectedFiberInfo(_: Props) {\n- const { profilingCache, profilerStore } = useContext(StoreContext);\n+ const { profilerStore } = useContext(StoreContext);\n const {\n rootID,\n selectCommitIndex,\n@@ -21,6 +21,7 @@ export default function SidebarSelectedFiberInfo(_: Props) {\n selectedFiberName,\n selectFiber,\n } = useContext(ProfilerContext);\n+ const { profilingCache } = profilerStore;\n \n const commitIndices = profilingCache.getFiberCommits({\n fiberID: ((selectedFiberID: any): number),\n","parents":["2d4bb01c01121ff55faa82f7ec30536f595bb807"],"files":[{"path":"src\/__tests__\/profilerStore-test.js","status":"M"},{"path":"src\/__tests__\/profilingCache-test.js","status":"M"},{"path":"src\/__tests__\/profilingCharts-test.js","status":"M"},{"path":"src\/__tests__\/profilingCommitTreeBuilder-test.js","status":"M"},{"path":"src\/__tests__\/storeComponentFilters-test.js","status":"M"},{"path":"src\/devtools\/ProfilerStore.js","status":"M"},{"path":"src\/devtools\/store.js","status":"M"},{"path":"src\/devtools\/views\/Components\/ComponentFiltersModal.js","status":"M"},{"path":"src\/devtools\/views\/Components\/ToggleComponentFiltersModalButton.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/ClearProfilingDataButton.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/CommitFlamegraph.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/CommitRanked.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/Interactions.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/ProfilerContext.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/ProfilingImportExportButtons.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/SidebarInteractions.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/SidebarSelectedFiberInfo.js","status":"M"}]}

dillon1000/react

Files changed