Cleaned up event and method names

facebook · Oct 2, 2019 · 6044a56 · 6044a56
1 parent 5b69234
commit 6044a56
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 45 deletions.
diff --git a/packages/react-devtools-shared/src/backend/agent.js b/packages/react-devtools-shared/src/backend/agent.js
@@ -23,7 +23,7 @@ import {
 import setupHighlighter from './views/Highlighter';
 import {
   initialize as setupTraceUpdates,
-  toggleEnabled as toggleTraceUpdatesEnabled,
+  toggleEnabled as setTraceUpdatesEnabled,
 } from './views/TraceUpdates';
 import {patch as patchConsole, unpatch as unpatchConsole} from './console';
 
@@ -137,6 +137,7 @@ export default class Agent extends EventEmitter<{|
     bridge.addListener('overrideState', this.overrideState);
     bridge.addListener('overrideSuspense', this.overrideSuspense);
     bridge.addListener('reloadAndProfile', this.reloadAndProfile);
+    bridge.addListener('setTraceUpdatesEnabled', this.setTraceUpdatesEnabled);
     bridge.addListener('startProfiling', this.startProfiling);
     bridge.addListener('stopProfiling', this.stopProfiling);
     bridge.addListener(
@@ -149,7 +150,6 @@ export default class Agent extends EventEmitter<{|
       this.updateAppendComponentStack,
     );
     bridge.addListener('updateComponentFilters', this.updateComponentFilters);
-    bridge.addListener('updateTraceUpdates', this.updateTraceUpdates);
     bridge.addListener('viewElementSource', this.viewElementSource);
 
     if (this._isProfiling) {
@@ -348,7 +348,7 @@ export default class Agent extends EventEmitter<{|
       rendererInterface.startProfiling(this._recordChangeDescriptions);
     }
 
-    rendererInterface.toggleTraceUpdatesEnabled(this._traceUpdatesEnabled);
+    rendererInterface.setTraceUpdatesEnabled(this._traceUpdatesEnabled);
 
     // When the renderer is attached, we need to tell it whether
     // we remember the previous selection that we'd like to restore.
@@ -359,6 +359,19 @@ export default class Agent extends EventEmitter<{|
     }
   }
 
+  setTraceUpdatesEnabled = (traceUpdatesEnabled: boolean) => {
+    this._traceUpdatesEnabled = traceUpdatesEnabled;
+
+    setTraceUpdatesEnabled(traceUpdatesEnabled);
+
+    for (let rendererID in this._rendererInterfaces) {
+      const renderer = ((this._rendererInterfaces[
+        (rendererID: any)
+      ]: any): RendererInterface);
+      renderer.setTraceUpdatesEnabled(traceUpdatesEnabled);
+    }
+  };
+
   syncSelectionFromNativeElementsPanel = () => {
     const target = window.__REACT_DEVTOOLS_GLOBAL_HOOK__.$0;
     if (target == null) {
@@ -417,19 +430,6 @@ export default class Agent extends EventEmitter<{|
     }
   };
 
-  updateTraceUpdates = (isEnabled: boolean) => {
-    this._traceUpdatesEnabled = isEnabled;
-
-    toggleTraceUpdatesEnabled(isEnabled);
-
-    for (let rendererID in this._rendererInterfaces) {
-      const renderer = ((this._rendererInterfaces[
-        (rendererID: any)
-      ]: any): RendererInterface);
-      renderer.toggleTraceUpdatesEnabled(isEnabled);
-    }
-  };
-
   viewElementSource = ({id, rendererID}: ElementAndRendererID) => {
     const renderer = this._rendererInterfaces[rendererID];
     if (renderer == null) {

diff --git a/packages/react-devtools-shared/src/backend/legacy/renderer.js b/packages/react-devtools-shared/src/backend/legacy/renderer.js
@@ -912,7 +912,7 @@ export function attach(
     // Not implemented.
   }
 
-  function toggleTraceUpdatesEnabled(enabled: boolean) {
+  function setTraceUpdatesEnabled(enabled: boolean) {
     // Not implemented.
   }
 
@@ -949,10 +949,10 @@ export function attach(
     setInHook,
     setInProps,
     setInState,
+    setTraceUpdatesEnabled,
     setTrackedPath,
     startProfiling,
     stopProfiling,
     updateComponentFilters,
-    toggleTraceUpdatesEnabled,
   };
 }
diff --git a/packages/react-devtools-shared/src/backend/renderer.js b/packages/react-devtools-shared/src/backend/renderer.js
@@ -3104,7 +3104,7 @@ export function attach(
     }
   };
 
-  function toggleTraceUpdatesEnabled(isEnabled: boolean): void {
+  function setTraceUpdatesEnabled(isEnabled: boolean): void {
     traceUpdatesEnabled = isEnabled;
   }
 
@@ -3129,10 +3129,10 @@ export function attach(
     setInHook,
     setInProps,
     setInState,
+    setTraceUpdatesEnabled,
     setTrackedPath,
     startProfiling,
     stopProfiling,
     updateComponentFilters,
-    toggleTraceUpdatesEnabled,
   };
 }
diff --git a/packages/react-devtools-shared/src/backend/types.js b/packages/react-devtools-shared/src/backend/types.js
@@ -252,11 +252,11 @@ export type RendererInterface = {
   ) => void,
   setInProps: (id: number, path: Array<string | number>, value: any) => void,
   setInState: (id: number, path: Array<string | number>, value: any) => void,
+  setTraceUpdatesEnabled: (enabled: boolean) => void,
   setTrackedPath: (path: Array<PathFrame> | null) => void,
   startProfiling: (recordChangeDescriptions: boolean) => void,
   stopProfiling: () => void,
   updateComponentFilters: (componentFilters: Array<ComponentFilter>) => void,
-  toggleTraceUpdatesEnabled: (enabled: boolean) => void,
 };
 
 export type Handler = (data: any) => void;

diff --git a/packages/react-devtools-shared/src/bridge.js b/packages/react-devtools-shared/src/bridge.js
@@ -108,14 +108,14 @@ type FrontendEvents = {|
   profilingData: [ProfilingDataBackend],
   reloadAndProfile: [boolean],
   selectFiber: [number],
+  setTraceUpdatesEnabled: [boolean],
   shutdown: [],
   startInspectingNative: [],
   startProfiling: [boolean],
   stopInspectingNative: [boolean],
   stopProfiling: [],
   updateAppendComponentStack: [boolean],
   updateComponentFilters: [Array<ComponentFilter>],
-  updateTraceUpdates: [boolean],
   viewElementSource: [ElementAndRendererID],
 
   // React Native style editor plug-in.

diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/GeneralSettings.js b/packages/react-devtools-shared/src/devtools/views/Settings/GeneralSettings.js
@@ -18,12 +18,12 @@ export default function GeneralSettings(_: {||}) {
   const {
     appendComponentStack,
     displayDensity,
-    traceUpdates,
     setAppendComponentStack,
-    setTraceUpdates,
     setDisplayDensity,
     setTheme,
+    setTraceUpdatesEnabled,
     theme,
+    traceUpdatesEnabled,
   } = useContext(SettingsContext);
 
   const {supportsTraceUpdates} = useContext(StoreContext);
@@ -60,9 +60,9 @@ export default function GeneralSettings(_: {||}) {
           <label>
             <input
               type="checkbox"
-              checked={traceUpdates}
+              checked={traceUpdatesEnabled}
               onChange={({currentTarget}) =>
-                setTraceUpdates(currentTarget.checked)
+                setTraceUpdatesEnabled(currentTarget.checked)
               }
             />{' '}
             Highlight updates when components render.

diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/SettingsContext.js b/packages/react-devtools-shared/src/devtools/views/Settings/SettingsContext.js
@@ -41,8 +41,8 @@ type Context = {|
   theme: Theme,
   setTheme(value: Theme): void,
 
-  traceUpdates: boolean,
-  setTraceUpdates: (value: boolean) => void,
+  traceUpdatesEnabled: boolean,
+  setTraceUpdatesEnabled: (value: boolean) => void,
 |};
 
 const SettingsContext = createContext<Context>(((null: any): Context));
@@ -76,10 +76,9 @@ function SettingsContextController({
   const [appendComponentStack, setAppendComponentStack] = useLocalStorage<
     boolean,
   >(LOCAL_STORAGE_SHOULD_PATCH_CONSOLE_KEY, true);
-  const [traceUpdates, setTraceUpdates] = useLocalStorage<boolean>(
-    'React::DevTools::traceUpdates',
-    false,
-  );
+  const [traceUpdatesEnabled, setTraceUpdatesEnabled] = useLocalStorage<
+    boolean,
+  >('React::DevTools::traceUpdatesEnabled', false);
 
   const documentElements = useMemo<DocumentElements>(
     () => {
@@ -147,35 +146,35 @@ function SettingsContextController({
 
   useEffect(
     () => {
-      bridge.send('updateTraceUpdates', traceUpdates);
+      bridge.send('setTraceUpdatesEnabled', traceUpdatesEnabled);
     },
-    [bridge, traceUpdates],
+    [bridge, traceUpdatesEnabled],
   );
 
   const value = useMemo(
     () => ({
-      displayDensity,
-      setDisplayDensity,
-      theme,
-      setTheme,
       appendComponentStack,
-      setAppendComponentStack,
-      traceUpdates,
-      setTraceUpdates,
+      displayDensity,
       lineHeight:
         displayDensity === 'compact'
           ? COMPACT_LINE_HEIGHT
           : COMFORTABLE_LINE_HEIGHT,
+      setAppendComponentStack,
+      setDisplayDensity,
+      setTheme,
+      setTraceUpdatesEnabled,
+      theme,
+      traceUpdatesEnabled,
     }),
     [
+      appendComponentStack,
       displayDensity,
+      setAppendComponentStack,
       setDisplayDensity,
       setTheme,
-      appendComponentStack,
-      setAppendComponentStack,
-      traceUpdates,
-      setTraceUpdates,
+      setTraceUpdatesEnabled,
       theme,
+      traceUpdatesEnabled,
     ],
   );