{"commit":{"shortRevision":"eb9705abc8","authoredAt":"2019-04-30T08:17:20-07:00","revision":"eb9705abc87d6b9a03eaec55cdf8465e69e9ab14","subject":"Removed FilterList UI for now (collapsed into Settings component)","authorEmail":"bvaughn@fb.com","authorName":"Brian Vaughn"},"parents":["a241780dc249bc959c6b7e663dbe2e6deec1ab42"],"body":"","files":[{"status":"D","path":"src\/devtools\/views\/Settings\/FilterList.css"},{"status":"D","path":"src\/devtools\/views\/Settings\/FilterList.js"},{"status":"M","path":"src\/devtools\/views\/Settings\/Settings.js"}],"patch":"diff --git a\/src\/devtools\/views\/Settings\/FilterList.css b\/src\/devtools\/views\/Settings\/FilterList.css\ndeleted file mode 100644\nindex 52b592e5e9..0000000000\n--- a\/src\/devtools\/views\/Settings\/FilterList.css\n+++ \/dev\/null\n@@ -1,4 +0,0 @@\n-.Filter {\n- display: block;\n- padding: 0 0 0.5rem;\n-}\ndiff --git a\/src\/devtools\/views\/Settings\/FilterList.js b\/src\/devtools\/views\/Settings\/FilterList.js\ndeleted file mode 100644\nindex af9e8c36f2..0000000000\n--- a\/src\/devtools\/views\/Settings\/FilterList.js\n+++ \/dev\/null\n@@ -1,61 +0,0 @@\n-\/\/ @flow\n-\n-import React, { Fragment, useCallback, useContext, useMemo } from 'react';\n-import { ElementTypeHostComponent } from 'src\/types';\n-import Store from 'src\/devtools\/store';\n-import { StoreContext } from '..\/context';\n-import { useSubscription } from '..\/hooks';\n-\n-import styles from '.\/FilterList.css';\n-\n-import type { FilterPreferences } from 'src\/types';\n-\n-export default function FilterList(_: {||}) {\n- const store = useContext(StoreContext);\n-\n- const filterPreferencesSubscription = useMemo(\n- () => ({\n- getCurrentValue: () => store.filterPreferences,\n- subscribe: (callback: Function) => {\n- store.addListener('filterPreferences', callback);\n- return () => store.removeListener('filterPreferences', callback);\n- },\n- }),\n- [store]\n- );\n- const filterPreferences = useSubscription(\n- filterPreferencesSubscription\n- );\n-\n- const updateFilterPreferences = useCallback(\n- ({ currentTarget }) => {\n- const filterPreferences = store.filterPreferences;\n- if (currentTarget.checked) {\n- filterPreferences.hideElementsWithTypes.add(ElementTypeHostComponent);\n- } else {\n- filterPreferences.hideElementsWithTypes.delete(\n- ElementTypeHostComponent\n- );\n- }\n- store.filterPreferences = { ...filterPreferences };\n- },\n- [store]\n- );\n-\n- \/\/ TODO (filter) Disable toggles if isProfiling\n-\n- return (\n- \n- \n- {' '}\n- Hide host components (e.g.

<div><\/code>)\n-      <\/label>\n-    <\/Fragment>\n-  );\n-}\ndiff --git a\/src\/devtools\/views\/Settings\/Settings.js b\/src\/devtools\/views\/Settings\/Settings.js\nindex ae23bbbc7d..4ede5f1bf6 100644\n--- a\/src\/devtools\/views\/Settings\/Settings.js\n+++ b\/src\/devtools\/views\/Settings\/Settings.js\n@@ -1,15 +1,17 @@\n \/\/ @flow\n \n import React, { useCallback, useContext, useMemo } from 'react';\n+import { ElementTypeHostComponent } from 'src\/types';\n import { useSubscription } from '..\/hooks';\n import { StoreContext } from '..\/context';\n import { SettingsContext } from '.\/SettingsContext';\n import Store from 'src\/devtools\/store';\n-import FilterList from '.\/FilterList';\n import portaledContent from '..\/portaledContent';\n \n import styles from '.\/Settings.css';\n \n+import type { FilterPreferences } from 'src\/types';\n+\n function Settings(_: {||}) {\n   const store = useContext(StoreContext);\n   const { displayDensity, setDisplayDensity, theme, setTheme } = useContext(\n@@ -44,6 +46,35 @@ function Settings(_: {||}) {\n     collapseNodesByDefaultSubscription\n   );\n \n+  const filterPreferencesSubscription = useMemo(\n+    () => ({\n+      getCurrentValue: () => store.filterPreferences,\n+      subscribe: (callback: Function) => {\n+        store.addListener('filterPreferences', callback);\n+        return () => store.removeListener('filterPreferences', callback);\n+      },\n+    }),\n+    [store]\n+  );\n+  const filterPreferences = useSubscription(\n+    filterPreferencesSubscription\n+  );\n+\n+  const updateFilterPreferences = useCallback(\n+    ({ currentTarget }) => {\n+      const filterPreferences = store.filterPreferences;\n+      if (currentTarget.checked) {\n+        filterPreferences.hideElementsWithTypes.add(ElementTypeHostComponent);\n+      } else {\n+        filterPreferences.hideElementsWithTypes.delete(\n+          ElementTypeHostComponent\n+        );\n+      }\n+      store.filterPreferences = { ...filterPreferences };\n+    },\n+    [store]\n+  );\n+\n   const updateDisplayDensity = useCallback(\n     ({ currentTarget }) => {\n       setDisplayDensity(currentTarget.value);\n@@ -145,7 +176,16 @@ function Settings(_: {||}) {\n           Collapse newly added components by default\n         <\/label>\n \n-        \n+        \n+          {' '}\n+          Hide host components (e.g. <div><\/code>)\n+        <\/label>\n       <\/div>\n \n       {store.supportsCaptureScreenshots && (\n"}

dillon1000/react

Files changed