{"body":"","files":[{"path":"src\/devtools\/views\/DevTools.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/FilterModal.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/Profiler.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/ProfilerContext.js","status":"A"},{"path":"src\/devtools\/views\/Profiler\/ProfilerDataContext.js","status":"D"},{"path":"src\/devtools\/views\/Profiler\/ProfilerStatusContext.js","status":"D"},{"path":"src\/devtools\/views\/Profiler\/RecordToggle.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/SnapshotCommitList.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/SnapshotCommitListItem.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/SnapshotSelector.css","status":"M"},{"path":"src\/devtools\/views\/Profiler\/SnapshotSelector.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/constants.js","status":"M"},{"path":"src\/devtools\/views\/hooks.js","status":"M"}],"parents":["e8f84dd5c4d02ca8278d57e0d1406ff075a7ffb1"],"patch":"diff --git a\/src\/devtools\/views\/DevTools.js b\/src\/devtools\/views\/DevTools.js\nindex d2d9cb8474..3473582f04 100644\n--- a\/src\/devtools\/views\/DevTools.js\n+++ b\/src\/devtools\/views\/DevTools.js\n@@ -9,6 +9,7 @@ import Settings from '.\/Settings\/Settings';\n import TabBar from '.\/TabBar';\n import { SettingsContextController } from '.\/Settings\/SettingsContext';\n import { TreeContextController } from '.\/Elements\/TreeContext';\n+import { ProfilerContextController } from '.\/Profiler\/ProfilerContext';\n import ReactLogo from '.\/ReactLogo';\n \n import styles from '.\/DevTools.css';\n@@ -104,27 +105,31 @@ export default function DevTools({\n \n \n \n-

\n- {showTabBar && (\n-

\n- \n- \n- {process.env.DEVTOOLS_VERSION}\n- <\/span>\n-

\n- \n- <\/div>\n- )}\n-

{tabElement}<\/div>\n- <\/div>\n+ \n+

\n+ {showTabBar && (\n+

\n+ \n+ \n+ {process.env.DEVTOOLS_VERSION}\n+ <\/span>\n+

\n+ \n+ <\/div>\n+ )}\n+

{tabElement}<\/div>\n+ <\/div>\n+ <\/ProfilerContextController>\n <\/TreeContextController>\n <\/SettingsContextController>\n <\/StoreContext.Provider>\ndiff --git a\/src\/devtools\/views\/Profiler\/FilterModal.js b\/src\/devtools\/views\/Profiler\/FilterModal.js\nindex 085fee0a7f..363919c08f 100644\n--- a\/src\/devtools\/views\/Profiler\/FilterModal.js\n+++ b\/src\/devtools\/views\/Profiler\/FilterModal.js\n@@ -1,7 +1,8 @@\n \/\/ @flow\n \n-import React, { useCallback, useEffect, useRef } from 'react';\n-import { useLocalStorage, useModalDismissSignal } from '..\/hooks';\n+import React, { useCallback, useContext, useEffect, useRef } from 'react';\n+import { ProfilerContext } from '.\/ProfilerContext';\n+import { useModalDismissSignal } from '..\/hooks';\n \n import styles from '.\/FilterModal.css';\n \n@@ -10,14 +11,12 @@ type Props = {|\n |};\n \n export default function FilterModal({ dismissModal }: Props) {\n- const [\n+ const {\n isCommitFilterEnabled,\n+ minCommitDuration,\n setIsCommitFilterEnabled,\n- ] = useLocalStorage('isCommitFilterEnabled', false);\n- const [minCommitDuration, setMinCommitDuration] = useLocalStorage(\n- 'minCommitDuration',\n- 0\n- );\n+ setMinCommitDuration,\n+ } = useContext(ProfilerContext);\n \n const handleNumberChange = useCallback(\n ({ currentTarget }) => {\ndiff --git a\/src\/devtools\/views\/Profiler\/Profiler.js b\/src\/devtools\/views\/Profiler\/Profiler.js\nindex 2e835066b5..0a647919e9 100644\n--- a\/src\/devtools\/views\/Profiler\/Profiler.js\n+++ b\/src\/devtools\/views\/Profiler\/Profiler.js\n@@ -1,11 +1,7 @@\n \/\/ @flow\n \n import React, { Suspense, useCallback, useContext, useState } from 'react';\n-import { ProfilerDataContextController } from '.\/ProfilerDataContext';\n-import {\n- ProfilerStatusContext,\n- ProfilerStatusContextController,\n-} from '.\/ProfilerStatusContext';\n+import { ProfilerContext } from '.\/ProfilerContext';\n import Button from '..\/Button';\n import ButtonIcon from '..\/ButtonIcon';\n import TabBar from '..\/TabBar';\n@@ -15,46 +11,68 @@ import SnapshotSelector from '.\/SnapshotSelector';\n \n import styles from '.\/Profiler.css';\n \n-export type Props = {||};\n+export default function Profiler(_: {||}) {\n+ const { hasProfilingData, isProfiling } = useContext(ProfilerContext);\n \n-export default function ProfilerOuter(_: Props) {\n- return (\n- \n+ if (isProfiling || !hasProfilingData) {\n+ return ;\n+ } else {\n+ return (\n }>\n- \n- \n- <\/ProfilerDataContextController>\n+ \n <\/Suspense>\n- <\/ProfilerStatusContextController>\n+ );\n+ }\n+}\n+\n+\/\/ This view is rendered when there is no profiler data (either we haven't profiled yet or we're currently profiling).\n+\/\/ Nothing in this view's subtree suspends.\n+\/\/ By not suspending while profiling is in progress, we avoid potential cache invalidation trickiness.\n+function NonSuspendingProfiler({ isProfiling }: {| isProfiling: boolean |}) {\n+ const view = isProfiling ? : ;\n+\n+ return (\n+

\n+

\n+ \n+

dillon1000/react

Files changed