Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 818c480

Browse files
committedAug 28, 2020
Update UI in react-devtools extension
1 parent ddc6766 commit 818c480

File tree

9 files changed

+23
-15
lines changed

9 files changed

+23
-15
lines changed
 

‎packages/react-devtools-extensions/src/main.js

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Store from 'react-devtools-shared/src/devtools/store';
77
import {getBrowserName, getBrowserTheme} from './utils';
88
import {LOCAL_STORAGE_TRACE_UPDATES_ENABLED_KEY} from 'react-devtools-shared/src/constants';
99
import {
10+
getEnableDoubleLogging,
1011
getAppendComponentStack,
1112
getBreakOnConsoleErrors,
1213
getSavedComponentFilters,
@@ -30,12 +31,16 @@ let panelCreated = false;
3031
// Instead it relies on the extension to pass filters through.
3132
function syncSavedPreferences() {
3233
const appendComponentStack = getAppendComponentStack();
34+
const enableDoubleLogging = getEnableDoubleLogging();
3335
const breakOnConsoleErrors = getBreakOnConsoleErrors();
3436
const componentFilters = getSavedComponentFilters();
3537
chrome.devtools.inspectedWindow.eval(
3638
`window.__REACT_DEVTOOLS_APPEND_COMPONENT_STACK__ = ${JSON.stringify(
3739
appendComponentStack,
3840
)};
41+
window.__REACT_DEVTOOLS_ENABLE_DOUBLE_LOGGING__ = ${JSON.stringify(
42+
enableDoubleLogging,
43+
)};
3944
window.__REACT_DEVTOOLS_BREAK_ON_CONSOLE_ERRORS__ = ${JSON.stringify(
4045
breakOnConsoleErrors,
4146
)};

‎packages/react-devtools-inline/src/backend.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function startActivation(contentWindow: window) {
4141
if (contentWindow !== window) {
4242
window.__REACT_DEVTOOLS_APPEND_COMPONENT_STACK__ = appendComponentStack;
4343
window.__REACT_DEVTOOLS_BREAK_ON_CONSOLE_ERRORS__ = breakOnConsoleErrors;
44-
Window.__REACT_DEVTOOLS_ENABLE_DOUBLE_LOGGING__ = enableDoubleLogging;
44+
window.__REACT_DEVTOOLS_ENABLE_DOUBLE_LOGGING__ = enableDoubleLogging;
4545
window.__REACT_DEVTOOLS_COMPONENT_FILTERS__ = componentFilters;
4646
}
4747

‎packages/react-devtools-inline/src/frontend.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
getAppendComponentStack,
1010
getBreakOnConsoleErrors,
1111
getSavedComponentFilters,
12-
getEnableDoubleLogging
12+
getEnableDoubleLogging,
1313
} from 'react-devtools-shared/src/utils';
1414
import {
1515
MESSAGE_TYPE_GET_SAVED_PREFERENCES,

‎packages/react-devtools-shared/src/__tests__/console-test.js

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ describe('console', () => {
8686
appendComponentStack: true,
8787
breakOnWarn: false,
8888
});
89-
9089
expect(fakeConsole.error).toBe(error);
9190
expect(fakeConsole.warn).toBe(warn);
9291
});

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

+2
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,11 @@ export default class Agent extends EventEmitter<{|
446446
updateConsolePatchSettings = ({
447447
appendComponentStack,
448448
breakOnConsoleErrors,
449+
enableDoubleLogging,
449450
}: {|
450451
appendComponentStack: boolean,
451452
breakOnConsoleErrors: boolean,
453+
enableDoubleLogging: boolean,
452454
|}) => {
453455
// If the frontend preference has change,
454456
// or in the case of React Native- if the backend is just finding out the preference-

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ type NativeStyleEditor_SetValueParams = {|
8888
type UpdateConsolePatchSettingsParams = {|
8989
appendComponentStack: boolean,
9090
breakOnConsoleErrors: boolean,
91-
91+
enableDoubleLogging: boolean,
9292
|};
9393

9494
type BackendEvents = {|

‎packages/react-devtools-shared/src/constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const LOCAL_STORAGE_SHOULD_BREAK_ON_CONSOLE_ERRORS =
3232

3333
export const LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING =
3434
'React::DevTools::enableDoubleLogging';
35-
35+
3636
export const LOCAL_STORAGE_SHOULD_PATCH_CONSOLE_KEY =
3737
'React::DevTools::appendComponentStack';
3838

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

+10-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
LOCAL_STORAGE_SHOULD_BREAK_ON_CONSOLE_ERRORS,
2222
LOCAL_STORAGE_SHOULD_PATCH_CONSOLE_KEY,
2323
LOCAL_STORAGE_TRACE_UPDATES_ENABLED_KEY,
24-
LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING
24+
LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING,
2525
} from 'react-devtools-shared/src/constants';
2626
import {useLocalStorage} from '../hooks';
2727
import {BridgeContext} from '../context';
@@ -39,7 +39,7 @@ type Context = {|
3939
// Specified as a separate prop so it can trigger a re-render of FixedSizeList.
4040
lineHeight: number,
4141

42-
enableDoubleLogging : boolean,
42+
enableDoubleLogging: boolean,
4343
setEnableDoubleLogging: (value: boolean) => void,
4444

4545
appendComponentStack: boolean,
@@ -85,9 +85,12 @@ function SettingsContextController({
8585
);
8686

8787
const [
88-
enableDoubleLogging,
89-
setEnableDoubleLogging,
90-
] = useLocalStorage<boolean>(LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING, false);
88+
enableDoubleLogging,
89+
setEnableDoubleLogging,
90+
] = useLocalStorage<boolean>(
91+
LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING,
92+
false,
93+
);
9194

9295
const [
9396
appendComponentStack,
@@ -157,8 +160,9 @@ function SettingsContextController({
157160
bridge.send('updateConsolePatchSettings', {
158161
appendComponentStack,
159162
breakOnConsoleErrors,
163+
enableDoubleLogging,
160164
});
161-
}, [bridge, appendComponentStack, breakOnConsoleErrors]);
165+
}, [bridge, appendComponentStack, breakOnConsoleErrors, enableDoubleLogging]);
162166

163167
useEffect(() => {
164168
bridge.send('setTraceUpdatesEnabled', traceUpdatesEnabled);

‎packages/react-devtools-shared/src/utils.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import {
3434
LOCAL_STORAGE_FILTER_PREFERENCES_KEY,
3535
LOCAL_STORAGE_SHOULD_BREAK_ON_CONSOLE_ERRORS,
3636
LOCAL_STORAGE_SHOULD_PATCH_CONSOLE_KEY,
37-
LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING
37+
LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING,
3838
} from './constants';
3939
import {ComponentFilterElementType, ElementTypeHostComponent} from './types';
4040
import {
@@ -271,9 +271,7 @@ export function setEnableDoubleLogging(value: boolean): void {
271271

272272
export function getEnableDoubleLogging(): boolean {
273273
try {
274-
const raw = localStorageGetItem(
275-
LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING,
276-
);
274+
const raw = localStorageGetItem(LOCAL_STORAGE_SHOULD_ENABLE_DOUBLE_LOGGING);
277275
if (raw != null) {
278276
return JSON.parse(raw);
279277
}

0 commit comments

Comments
 (0)
Please sign in to comment.