{"commit":{"shortRevision":"19ed98d0c2","revision":"19ed98d0c25fc4aeb3d96656c3f171497d623e29","authorName":"Brian Vaughn","authorEmail":"bvaughn@fb.com","authoredAt":"2019-06-10T14:57:26-07:00","subject":"Removed Settings panel in favor of new shared Settings modal"},"body":"","parents":["402a68d816504c76cac71078e4f10c6d987fcf79"],"files":[{"status":"M","path":"shells\/browser\/shared\/src\/main.js"},{"status":"D","path":"src\/devtools\/views\/Components\/ComponentFiltersModal.js"},{"status":"D","path":"src\/devtools\/views\/Components\/ComponentFiltersModalContext.js"},{"status":"M","path":"src\/devtools\/views\/Components\/Components.js"},{"status":"D","path":"src\/devtools\/views\/Components\/ToggleComponentFiltersModalButton.css"},{"status":"D","path":"src\/devtools\/views\/Components\/ToggleComponentFiltersModalButton.js"},{"status":"M","path":"src\/devtools\/views\/Components\/Tree.js"},{"status":"M","path":"src\/devtools\/views\/DevTools.js"},{"status":"D","path":"src\/devtools\/views\/Profiler\/CommitFilterModal.css"},{"status":"D","path":"src\/devtools\/views\/Profiler\/CommitFilterModal.js"},{"status":"D","path":"src\/devtools\/views\/Profiler\/CommitFilterModalContext.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/NoCommitData.js"},{"status":"M","path":"src\/devtools\/views\/Profiler\/Profiler.css"},{"status":"M","path":"src\/devtools\/views\/Profiler\/Profiler.js"},{"status":"D","path":"src\/devtools\/views\/Profiler\/ToggleCommitFilterModalButton.js"},{"status":"A","path":"src\/devtools\/views\/Settings\/ComponentsSettings.js"},{"status":"A","path":"src\/devtools\/views\/Settings\/GeneralSettings.js"},{"status":"A","path":"src\/devtools\/views\/Settings\/ProfilerSettings.js"},{"status":"D","path":"src\/devtools\/views\/Settings\/Settings.css"},{"status":"D","path":"src\/devtools\/views\/Settings\/Settings.js"},{"status":"A","path":"src\/devtools\/views\/Settings\/SettingsModal.css"},{"status":"A","path":"src\/devtools\/views\/Settings\/SettingsModal.js"},{"status":"A","path":"src\/devtools\/views\/Settings\/SettingsModalContext.js"},{"status":"A","path":"src\/devtools\/views\/Settings\/SettingsModalContextToggle.js"},{"previousPath":"src\/devtools\/views\/Components\/ComponentFiltersModal.css","status":"R065","path":"src\/devtools\/views\/Settings\/SettingsShared.css"},{"status":"M","path":"src\/devtools\/views\/TabBar.css"},{"status":"M","path":"src\/utils.js"}],"patch":"diff --git a\/shells\/browser\/shared\/src\/main.js b\/shells\/browser\/shared\/src\/main.js\nindex c9fb4c1df2..320e20678f 100644\n--- a\/shells\/browser\/shared\/src\/main.js\n+++ b\/shells\/browser\/shared\/src\/main.js\n@@ -269,23 +269,6 @@ function createPanelIfReactLoaded() {\n });\n });\n \n- chrome.devtools.panels.create('⚛ Settings', '', 'panel.html', panel => {\n- panel.onShown.addListener(panel => {\n- if (currentPanel === panel) {\n- return;\n- }\n-\n- currentPanel = panel;\n- settingsPortalContainer = panel.container;\n-\n- if (settingsPortalContainer != null) {\n- ensureInitialHTMLIsCleared(settingsPortalContainer);\n- render('settings');\n- panel.injectStyles(cloneStyleTags);\n- }\n- });\n- });\n-\n chrome.devtools.network.onNavigated.removeListener(checkPageForReact);\n \n \/\/ Shutdown bridge before a new page is loaded.\ndiff --git a\/src\/devtools\/views\/Components\/ComponentFiltersModal.js b\/src\/devtools\/views\/Components\/ComponentFiltersModal.js\ndeleted file mode 100644\nindex 53af031da5..0000000000\n--- a\/src\/devtools\/views\/Components\/ComponentFiltersModal.js\n+++ \/dev\/null\n@@ -1,445 +0,0 @@\n-\/\/ @flow\n-\n-import React, {\n- useCallback,\n- useContext,\n- useMemo,\n- useRef,\n- useState,\n-} from 'react';\n-import { useModalDismissSignal, useSubscription } from '..\/hooks';\n-import { ComponentFiltersModalContext } from '.\/ComponentFiltersModalContext';\n-import { StoreContext } from '..\/context';\n-import Button from '..\/Button';\n-import ButtonIcon from '..\/ButtonIcon';\n-import Toggle from '..\/Toggle';\n-import Store from 'src\/devtools\/store';\n-import {\n- ComponentFilterDisplayName,\n- ComponentFilterElementType,\n- ComponentFilterHOC,\n- ComponentFilterLocation,\n- ElementTypeClass,\n- ElementTypeContext,\n- ElementTypeEventTarget,\n- ElementTypeFunction,\n- ElementTypeForwardRef,\n- ElementTypeHostComponent,\n- ElementTypeMemo,\n- ElementTypeOtherOrUnknown,\n- ElementTypeProfiler,\n- ElementTypeSuspense,\n-} from 'src\/types';\n-import styles from '.\/ComponentFiltersModal.css';\n-\n-import type {\n- BooleanComponentFilter,\n- ComponentFilter,\n- ComponentFilterType,\n- ElementType,\n- ElementTypeComponentFilter,\n- RegExpComponentFilter,\n-} from 'src\/types';\n-\n-export default function ComponentFiltersModalWrapper(_: {||}) {\n- const store = useContext(StoreContext);\n- const { profilerStore } = store;\n-\n- const { isModalShowing, setIsModalShowing } = useContext(\n- ComponentFiltersModalContext\n- );\n-\n- \/\/ Re-mounting a tree while profiling is in progress might break a lot of assumptions.\n- \/\/ If necessary, we could support this- but it doesn't seem like a necessary use case.\n- const isProfilingSubscription = useMemo(\n- () => ({\n- getCurrentValue: () => profilerStore.isProfiling,\n- subscribe: (callback: Function) => {\n- profilerStore.addListener('isProfiling', callback);\n- return () => profilerStore.removeListener('isProfiling', callback);\n- },\n- }),\n- [profilerStore]\n- );\n- const isProfiling = useSubscription(isProfilingSubscription);\n- if (isProfiling && isModalShowing) {\n- setIsModalShowing(false);\n- }\n-\n- return isModalShowing ? (\n- \n- ) : null;\n-}\n-\n-type Props = {|\n- store: Store,\n- setIsModalShowing: (value: boolean) => void,\n-|};\n-\n-function ComponentFiltersModal({ store, setIsModalShowing }: Props) {\n- const dismissModal = useCallback(() => setIsModalShowing(false), [\n- setIsModalShowing,\n- ]);\n-\n- const modalRef = useRef(null);\n-\n- useModalDismissSignal(modalRef, dismissModal);\n-\n- const {\n- addFilter,\n- changeFilterType,\n- updateFilterValueElementType,\n- updateFilterValueRegExp,\n- componentFilters,\n- removeFilter,\n- saveFilters,\n- toggleFilterIsEnabled,\n- } = useComponentFilters();\n-\n- const saveAndClose = useCallback(() => {\n- saveFilters();\n- dismissModal();\n- }, [dismissModal, saveFilters]);\n-\n- return (\n-

\n-

\n-

\n-

Hide components where...<\/div>\n-

\n-

dillon1000/react

Files changed