refactor[react-devtools]: propagate settings from global hook object …

…to frontend

packages/react-devtools-core/src/backend.js

@@ -162,7 +162,7 @@ export function connectToDevTools(options: ?ConnectOptions) {
     );
 
     if (devToolsSettingsManager != null && bridge != null) {
-      bridge.addListener('updateConsolePatchSettings', consolePatchSettings =>
+      bridge.addListener('updateHookSettings', consolePatchSettings =>
         cacheConsolePatchSettings(
           devToolsSettingsManager,
           consolePatchSettings,
@@ -368,7 +368,7 @@ export function connectWithCustomMessagingProtocol({
   );
 
   if (settingsManager != null) {
-    bridge.addListener('updateConsolePatchSettings', consolePatchSettings =>
+    bridge.addListener('updateHookSettings', consolePatchSettings =>
       cacheConsolePatchSettings(settingsManager, consolePatchSettings),
     );
   }

packages/react-devtools-core/src/cachedSettings.js

@@ -66,7 +66,7 @@ function parseConsolePatchSettings(
 
 export function cacheConsolePatchSettings(
   devToolsSettingsManager: DevToolsSettingsManager,
-  value: ConsolePatchSettings,
+  value: $ReadOnly<ConsolePatchSettings>,
 ): void {
   if (devToolsSettingsManager.setConsolePatchSettings == null) {
     return;

packages/react-devtools-shared/src/backend/agent.js

@@ -150,6 +150,7 @@ export default class Agent extends EventEmitter<{
   disableTraceUpdates: [],
   getIfHasUnsupportedRendererVersion: [],
   updateHookSettings: [DevToolsHookSettings],
+  getHookSettings: [],
 }> {
   _bridge: BackendBridge;
   _isProfiling: boolean = false;
@@ -213,10 +214,10 @@ export default class Agent extends EventEmitter<{
       this.syncSelectionFromBuiltinElementsPanel,
     );
     bridge.addListener('shutdown', this.shutdown);
-    bridge.addListener(
-      'updateConsolePatchSettings',
-      this.updateConsolePatchSettings,
-    );
+
+    bridge.addListener('updateHookSettings', this.updateHookSettings);
+    bridge.addListener('getHookSettings', this.getHookSettings);
+
     bridge.addListener('updateComponentFilters', this.updateComponentFilters);
     bridge.addListener('getEnvironmentNames', this.getEnvironmentNames);
     bridge.addListener(
@@ -802,18 +803,26 @@ export default class Agent extends EventEmitter<{
     }
   };
 
-  updateConsolePatchSettings: (
-    settings: $ReadOnly<DevToolsHookSettings>,
-  ) => void = settings => {
-    // Propagate the settings, so Backend can subscribe to it and modify hook
-    this.emit('updateHookSettings', {
-      appendComponentStack: settings.appendComponentStack,
-      breakOnConsoleErrors: settings.breakOnConsoleErrors,
-      showInlineWarningsAndErrors: settings.showInlineWarningsAndErrors,
-      hideConsoleLogsInStrictMode: settings.hideConsoleLogsInStrictMode,
-    });
+  updateHookSettings: (settings: $ReadOnly<DevToolsHookSettings>) => void =
+    settings => {
+      // Propagate the settings, so Backend can subscribe to it and modify hook
+      this.emit('updateHookSettings', {
+        appendComponentStack: settings.appendComponentStack,
+        breakOnConsoleErrors: settings.breakOnConsoleErrors,
+        showInlineWarningsAndErrors: settings.showInlineWarningsAndErrors,
+        hideConsoleLogsInStrictMode: settings.hideConsoleLogsInStrictMode,
+      });
+    };
+
+  getHookSettings: () => void = () => {
+    this.emit('getHookSettings');
   };
 
+  onHookSettings: (settings: $ReadOnly<DevToolsHookSettings>) => void =
+    settings => {
+      this._bridge.send('hookSettings', settings);
+    };
+
   updateComponentFilters: (componentFilters: Array<ComponentFilter>) => void =
     componentFilters => {
       for (const rendererIDString in this._rendererInterfaces) {

packages/react-devtools-shared/src/backend/index.js

@@ -54,6 +54,7 @@ export function initBackend(
     hook.sub('fastRefreshScheduled', agent.onFastRefreshScheduled),
     hook.sub('operations', agent.onHookOperations),
     hook.sub('traceUpdates', agent.onTraceUpdates),
+    hook.sub('settingsInitialized', agent.onHookSettings),
 
     // TODO Add additional subscriptions required for profiling mode
   ];
@@ -87,6 +88,12 @@ export function initBackend(
     hook.settings = settings;
   });
 
+  agent.addListener('getHookSettings', () => {
+    if (hook.settings != null) {
+      agent.onHookSettings(hook.settings);
+    }
+  });
+
   return () => {
     subs.forEach(fn => fn());
   };

packages/react-devtools-shared/src/bridge.js

@@ -207,6 +207,8 @@ export type BackendEvents = {
     {isSupported: boolean, validAttributes: ?$ReadOnlyArray<string>},
   ],
   NativeStyleEditor_styleAndLayout: [StyleAndLayoutPayload],
+
+  hookSettings: [$ReadOnly<DevToolsHookSettings>],
 };
 
 type FrontendEvents = {
@@ -241,7 +243,7 @@ type FrontendEvents = {
   storeAsGlobal: [StoreAsGlobalParams],
   updateComponentFilters: [Array<ComponentFilter>],
   getEnvironmentNames: [],
-  updateConsolePatchSettings: [DevToolsHookSettings],
+  updateHookSettings: [$ReadOnly<DevToolsHookSettings>],
   viewAttributeSource: [ViewAttributeSourceParams],
   viewElementSource: [ElementAndRendererID],
 
@@ -267,6 +269,8 @@ type FrontendEvents = {
 
   resumeElementPolling: [],
   pauseElementPolling: [],
+
+  getHookSettings: [],
 };
 
 class Bridge<

packages/react-devtools-shared/src/devtools/store.js

@@ -49,6 +49,7 @@ import type {
   BridgeProtocol,
 } from 'react-devtools-shared/src/bridge';
 import UnsupportedBridgeOperationError from 'react-devtools-shared/src/UnsupportedBridgeOperationError';
+import type {DevToolsHookSettings} from '../backend/types';
 
 const debug = (methodName: string, ...args: Array<string>) => {
   if (__DEBUG__) {
@@ -94,6 +95,7 @@ export default class Store extends EventEmitter<{
   collapseNodesByDefault: [],
   componentFilters: [],
   error: [Error],
+  hookSettings: [$ReadOnly<DevToolsHookSettings>],
   mutated: [[Array<number>, Map<number, number>]],
   recordChangeDescriptions: [],
   roots: [],
@@ -192,6 +194,7 @@ export default class Store extends EventEmitter<{
   _weightAcrossRoots: number = 0;
 
   _shouldCheckBridgeProtocolCompatibility: boolean = false;
+  _hookSettings: $ReadOnly<DevToolsHookSettings> | null = null;
 
   constructor(bridge: FrontendBridge, config?: Config) {
     super();
@@ -270,6 +273,7 @@ export default class Store extends EventEmitter<{
 
     bridge.addListener('backendVersion', this.onBridgeBackendVersion);
     bridge.addListener('saveToClipboard', this.onSaveToClipboard);
+    bridge.addListener('hookSettings', this.onHookSettings);
     bridge.addListener('backendInitialized', this.onBackendInitialized);
   }
 
@@ -1501,8 +1505,29 @@ export default class Store extends EventEmitter<{
 
     this._bridge.send('getBackendVersion');
     this._bridge.send('getIfHasUnsupportedRendererVersion');
+    this._bridge.send('getHookSettings'); // Warm up cached hook settings
   };
 
+  getHookSettings: () => void = () => {
+    if (this._hookSettings != null) {
+      this.emit('hookSettings', this._hookSettings);
+    } else {
+      this._bridge.send('getHookSettings');
+    }
+  };
+
+  updateHookSettings: (settings: $ReadOnly<DevToolsHookSettings>) => void =
+    settings => {
+      this._hookSettings = settings;
+      this._bridge.send('updateHookSettings', settings);
+    };
+
+  onHookSettings: (settings: $ReadOnly<DevToolsHookSettings>) => void =
+    settings => {
+      this._hookSettings = settings;
+      this.emit('hookSettings', settings);
+    };
+
   // The Store should never throw an Error without also emitting an event.
   // Otherwise Store errors will be invisible to users,
   // but the downstream errors they cause will be reported as bugs.

packages/react-devtools-shared/src/devtools/views/Settings/DebuggingSettings.js

@@ -8,22 +8,49 @@
  */
 
 import * as React from 'react';
-import {useContext} from 'react';
-import {SettingsContext} from './SettingsContext';
+import {use, useState, useEffect} from 'react';
+
+import type {DevToolsHookSettings} from 'react-devtools-shared/src/backend/types';
+import type Store from 'react-devtools-shared/src/devtools/store';
 
 import styles from './SettingsShared.css';
 
-export default function DebuggingSettings(_: {}): React.Node {
-  const {
+type Props = {
+  hookSettings: Promise<$ReadOnly<DevToolsHookSettings>>,
+  store: Store,
+};
+
+export default function DebuggingSettings({
+  hookSettings,
+  store,
+}: Props): React.Node {
+  const usedHookSettings = use(hookSettings);
+
+  const [appendComponentStack, setAppendComponentStack] = useState(
+    usedHookSettings.appendComponentStack,
+  );
+  const [breakOnConsoleErrors, setBreakOnConsoleErrors] = useState(
+    usedHookSettings.breakOnConsoleErrors,
+  );
+  const [hideConsoleLogsInStrictMode, setHideConsoleLogsInStrictMode] =
+    useState(usedHookSettings.hideConsoleLogsInStrictMode);
+  const [showInlineWarningsAndErrors, setShowInlineWarningsAndErrors] =
+    useState(usedHookSettings.showInlineWarningsAndErrors);
+
+  useEffect(() => {
+    store.updateHookSettings({
+      appendComponentStack,
+      breakOnConsoleErrors,
+      showInlineWarningsAndErrors,
+      hideConsoleLogsInStrictMode,
+    });
+  }, [
+    store,
     appendComponentStack,
     breakOnConsoleErrors,
-    hideConsoleLogsInStrictMode,
-    setAppendComponentStack,
-    setBreakOnConsoleErrors,
-    setShowInlineWarningsAndErrors,
     showInlineWarningsAndErrors,
-    setHideConsoleLogsInStrictMode,
-  } = useContext(SettingsContext);
+    hideConsoleLogsInStrictMode,
+  ]);
 
   return (
     <div className={styles.Settings}>

packages/react-devtools-shared/src/devtools/views/Settings/SettingsContext.js

@@ -20,11 +20,7 @@ import {
 import {
   LOCAL_STORAGE_BROWSER_THEME,
   LOCAL_STORAGE_PARSE_HOOK_NAMES_KEY,
-  LOCAL_STORAGE_SHOULD_BREAK_ON_CONSOLE_ERRORS,
-  LOCAL_STORAGE_SHOULD_APPEND_COMPONENT_STACK_KEY,
   LOCAL_STORAGE_TRACE_UPDATES_ENABLED_KEY,
-  LOCAL_STORAGE_SHOW_INLINE_WARNINGS_AND_ERRORS_KEY,
-  LOCAL_STORAGE_HIDE_CONSOLE_LOGS_IN_STRICT_MODE,
 } from 'react-devtools-shared/src/constants';
 import {
   COMFORTABLE_LINE_HEIGHT,
@@ -118,30 +114,10 @@ function SettingsContextController({
     LOCAL_STORAGE_BROWSER_THEME,
     'auto',
   );
-  const [appendComponentStack, setAppendComponentStack] =
-    useLocalStorageWithLog<boolean>(
-      LOCAL_STORAGE_SHOULD_APPEND_COMPONENT_STACK_KEY,
-      true,
-    );
-  const [breakOnConsoleErrors, setBreakOnConsoleErrors] =
-    useLocalStorageWithLog<boolean>(
-      LOCAL_STORAGE_SHOULD_BREAK_ON_CONSOLE_ERRORS,
-      false,
-    );
   const [parseHookNames, setParseHookNames] = useLocalStorageWithLog<boolean>(
     LOCAL_STORAGE_PARSE_HOOK_NAMES_KEY,
     false,
   );
-  const [hideConsoleLogsInStrictMode, setHideConsoleLogsInStrictMode] =
-    useLocalStorageWithLog<boolean>(
-      LOCAL_STORAGE_HIDE_CONSOLE_LOGS_IN_STRICT_MODE,
-      false,
-    );
-  const [showInlineWarningsAndErrors, setShowInlineWarningsAndErrors] =
-    useLocalStorageWithLog<boolean>(
-      LOCAL_STORAGE_SHOW_INLINE_WARNINGS_AND_ERRORS_KEY,
-      true,
-    );
   const [traceUpdatesEnabled, setTraceUpdatesEnabled] =
     useLocalStorageWithLog<boolean>(
       LOCAL_STORAGE_TRACE_UPDATES_ENABLED_KEY,
@@ -196,64 +172,33 @@ function SettingsContextController({
     }
   }, [browserTheme, theme, documentElements]);
 
-  useEffect(() => {
-    bridge.send('updateConsolePatchSettings', {
-      appendComponentStack,
-      breakOnConsoleErrors,
-      showInlineWarningsAndErrors,
-      hideConsoleLogsInStrictMode,
-    });
-  }, [
-    bridge,
-    appendComponentStack,
-    breakOnConsoleErrors,
-    showInlineWarningsAndErrors,
-    hideConsoleLogsInStrictMode,
-  ]);
-
   useEffect(() => {
     bridge.send('setTraceUpdatesEnabled', traceUpdatesEnabled);
   }, [bridge, traceUpdatesEnabled]);
 
   const value = useMemo(
     () => ({
-      appendComponentStack,
-      breakOnConsoleErrors,
       displayDensity,
       lineHeight:
         displayDensity === 'compact'
           ? COMPACT_LINE_HEIGHT
           : COMFORTABLE_LINE_HEIGHT,
       parseHookNames,
-      setAppendComponentStack,
-      setBreakOnConsoleErrors,
       setDisplayDensity,
       setParseHookNames,
       setTheme,
       setTraceUpdatesEnabled,
-      setShowInlineWarningsAndErrors,
-      showInlineWarningsAndErrors,
-      setHideConsoleLogsInStrictMode,
-      hideConsoleLogsInStrictMode,
       theme,
       browserTheme,
       traceUpdatesEnabled,
     }),
     [
-      appendComponentStack,
-      breakOnConsoleErrors,
       displayDensity,
       parseHookNames,
-      setAppendComponentStack,
-      setBreakOnConsoleErrors,
       setDisplayDensity,
       setParseHookNames,
       setTheme,
       setTraceUpdatesEnabled,
-      setShowInlineWarningsAndErrors,
-      showInlineWarningsAndErrors,
-      setHideConsoleLogsInStrictMode,
-      hideConsoleLogsInStrictMode,
       theme,
       browserTheme,
       traceUpdatesEnabled,