{"parents":["19ed98d0c25fc4aeb3d96656c3f171497d623e29"],"files":[{"status":"M","path":"src\/devtools\/views\/Components\/Components.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/Profiler.js"},{"status":"M","path":"src\/devtools\/views\/Settings\/SettingsModal.js"}],"patch":"diff --git a\/src\/devtools\/views\/Components\/Components.js b\/src\/devtools\/views\/Components\/Components.js\nindex 2e22471929..997d051678 100644\n--- a\/src\/devtools\/views\/Components\/Components.js\n+++ b\/src\/devtools\/views\/Components\/Components.js\n@@ -28,7 +28,7 @@ function Components(_: {||}) {\n <\/Suspense>\n <\/div>\n \n- \n+ \n <\/div>\n <\/InspectedElementContextController>\n <\/OwnersListContextController>\ndiff --git a\/src\/devtools\/views\/Profiler\/Profiler.js b\/src\/devtools\/views\/Profiler\/Profiler.js\nindex 06e74b2f6f..efa729d258 100644\n--- a\/src\/devtools\/views\/Profiler\/Profiler.js\n+++ b\/src\/devtools\/views\/Profiler\/Profiler.js\n@@ -111,7 +111,7 @@ function Profiler(_: {||}) {\n <\/div>\n <\/div>\n

{sidebar}<\/div>\n- \n+ \n <\/div>\n <\/SettingsModalContextController>\n );\ndiff --git a\/src\/devtools\/views\/Settings\/SettingsModal.js b\/src\/devtools\/views\/Settings\/SettingsModal.js\nindex 4dd6bafa4f..d6618a6fed 100644\n--- a\/src\/devtools\/views\/Settings\/SettingsModal.js\n+++ b\/src\/devtools\/views\/Settings\/SettingsModal.js\n@@ -6,7 +6,6 @@ import React, {\n useEffect,\n useMemo,\n useRef,\n- useState,\n } from 'react';\n import { SettingsModalContext } from '.\/SettingsModalContext';\n import Store from 'src\/devtools\/store';\n@@ -14,7 +13,11 @@ import Button from '..\/Button';\n import ButtonIcon from '..\/ButtonIcon';\n import TabBar from '..\/TabBar';\n import { StoreContext } from '..\/context';\n-import { useModalDismissSignal, useSubscription } from '..\/hooks';\n+import {\n+ useLocalStorage,\n+ useModalDismissSignal,\n+ useSubscription,\n+} from '..\/hooks';\n import ComponentsSettings from '.\/ComponentsSettings';\n import GeneralSettings from '.\/GeneralSettings';\n import ProfilerSettings from '.\/ProfilerSettings';\n@@ -23,11 +26,7 @@ import styles from '.\/SettingsModal.css';\n \n type TabID = 'general' | 'components' | 'profiler';\n \n-type Props = {|\n- defaultTabID: TabID,\n-|};\n-\n-export default function SettingsModal({ defaultTabID = 'general' }: Props) {\n+export default function SettingsModal(_: {||}) {\n const { isModalShowing, setIsModalShowing } = useContext(\n SettingsModalContext\n );\n@@ -55,16 +54,19 @@ export default function SettingsModal({ defaultTabID = 'general' }: Props) {\n return null;\n }\n \n- return ;\n+ return ;\n }\n \n-function SettingsModalImpl({ defaultTabID }: Props) {\n+function SettingsModalImpl(_: {||}) {\n const { setIsModalShowing } = useContext(SettingsModalContext);\n const dismissModal = useCallback(() => setIsModalShowing(false), [\n setIsModalShowing,\n ]);\n \n- const [selectedTabID, selectTab] = useState(defaultTabID);\n+ const [selectedTabID, selectTab] = useLocalStorage(\n+ 'React::DevTools::selectedSettingsTabID',\n+ 'general'\n+ );\n \n const modalRef = useRef(null);\n useModalDismissSignal(modalRef, dismissModal);\n@@ -117,18 +119,15 @@ const tabs = [\n id: 'general',\n icon: 'settings',\n label: 'General',\n- title: 'General preferences',\n },\n {\n id: 'components',\n icon: 'components',\n label: 'Components',\n- title: 'Components preferences',\n },\n {\n id: 'profiler',\n icon: 'profiler',\n label: 'Profiler',\n- title: 'Profiler preferences',\n },\n ];\n","commit":{"subject":"Remember last preferences tab via local storage","shortRevision":"e2e598c824","revision":"e2e598c8245169c8875dcfdc70cde2bfdb5e4074","authorName":"Brian Vaughn","authoredAt":"2019-06-10T15:03:05-07:00","authorEmail":"bvaughn@fb.com"},"body":""}

dillon1000/react

Files changed