Skip to content

Commit e68a3c9

Browse files
author
Brian Vaughn
committed
Cleaned up event names
1 parent 5b69234 commit e68a3c9

File tree

4 files changed

+37
-38
lines changed

4 files changed

+37
-38
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ export default class Agent extends EventEmitter<{|
126126

127127
this._bridge = bridge;
128128

129+
bridge.addListener('enableTraceUpdates', this.enableTraceUpdates);
129130
bridge.addListener('getProfilingData', this.getProfilingData);
130131
bridge.addListener('getProfilingStatus', this.getProfilingStatus);
131132
bridge.addListener('getOwnersList', this.getOwnersList);
@@ -149,7 +150,6 @@ export default class Agent extends EventEmitter<{|
149150
this.updateAppendComponentStack,
150151
);
151152
bridge.addListener('updateComponentFilters', this.updateComponentFilters);
152-
bridge.addListener('updateTraceUpdates', this.updateTraceUpdates);
153153
bridge.addListener('viewElementSource', this.viewElementSource);
154154

155155
if (this._isProfiling) {
@@ -204,6 +204,19 @@ export default class Agent extends EventEmitter<{|
204204
return null;
205205
}
206206

207+
enableTraceUpdates = (isEnabled: boolean) => {
208+
this._traceUpdatesEnabled = isEnabled;
209+
210+
toggleTraceUpdatesEnabled(isEnabled);
211+
212+
for (let rendererID in this._rendererInterfaces) {
213+
const renderer = ((this._rendererInterfaces[
214+
(rendererID: any)
215+
]: any): RendererInterface);
216+
renderer.toggleTraceUpdatesEnabled(isEnabled);
217+
}
218+
};
219+
207220
getProfilingData = ({rendererID}: {|rendererID: RendererID|}) => {
208221
const renderer = this._rendererInterfaces[rendererID];
209222
if (renderer == null) {
@@ -417,19 +430,6 @@ export default class Agent extends EventEmitter<{|
417430
}
418431
};
419432

420-
updateTraceUpdates = (isEnabled: boolean) => {
421-
this._traceUpdatesEnabled = isEnabled;
422-
423-
toggleTraceUpdatesEnabled(isEnabled);
424-
425-
for (let rendererID in this._rendererInterfaces) {
426-
const renderer = ((this._rendererInterfaces[
427-
(rendererID: any)
428-
]: any): RendererInterface);
429-
renderer.toggleTraceUpdatesEnabled(isEnabled);
430-
}
431-
};
432-
433433
viewElementSource = ({id, rendererID}: ElementAndRendererID) => {
434434
const renderer = this._rendererInterfaces[rendererID];
435435
if (renderer == null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ type BackendEvents = {|
9494

9595
type FrontendEvents = {|
9696
clearNativeElementHighlight: [],
97+
enableTraceUpdates: [boolean],
9798
getOwnersList: [ElementAndRendererID],
9899
getProfilingData: [{|rendererID: RendererID|}],
99100
getProfilingStatus: [],
@@ -115,7 +116,6 @@ type FrontendEvents = {|
115116
stopProfiling: [],
116117
updateAppendComponentStack: [boolean],
117118
updateComponentFilters: [Array<ComponentFilter>],
118-
updateTraceUpdates: [boolean],
119119
viewElementSource: [ElementAndRendererID],
120120

121121
// React Native style editor plug-in.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ export default function GeneralSettings(_: {||}) {
1818
const {
1919
appendComponentStack,
2020
displayDensity,
21-
traceUpdates,
2221
setAppendComponentStack,
23-
setTraceUpdates,
2422
setDisplayDensity,
2523
setTheme,
24+
setTraceUpdatesEnabled,
2625
theme,
26+
traceUpdatesEnabled,
2727
} = useContext(SettingsContext);
2828

2929
const {supportsTraceUpdates} = useContext(StoreContext);
@@ -60,9 +60,9 @@ export default function GeneralSettings(_: {||}) {
6060
<label>
6161
<input
6262
type="checkbox"
63-
checked={traceUpdates}
63+
checked={traceUpdatesEnabled}
6464
onChange={({currentTarget}) =>
65-
setTraceUpdates(currentTarget.checked)
65+
setTraceUpdatesEnabled(currentTarget.checked)
6666
}
6767
/>{' '}
6868
Highlight updates when components render.

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ type Context = {|
4141
theme: Theme,
4242
setTheme(value: Theme): void,
4343

44-
traceUpdates: boolean,
45-
setTraceUpdates: (value: boolean) => void,
44+
traceUpdatesEnabled: boolean,
45+
setTraceUpdatesEnabled: (value: boolean) => void,
4646
|};
4747

4848
const SettingsContext = createContext<Context>(((null: any): Context));
@@ -76,10 +76,9 @@ function SettingsContextController({
7676
const [appendComponentStack, setAppendComponentStack] = useLocalStorage<
7777
boolean,
7878
>(LOCAL_STORAGE_SHOULD_PATCH_CONSOLE_KEY, true);
79-
const [traceUpdates, setTraceUpdates] = useLocalStorage<boolean>(
80-
'React::DevTools::traceUpdates',
81-
false,
82-
);
79+
const [traceUpdatesEnabled, setTraceUpdatesEnabled] = useLocalStorage<
80+
boolean,
81+
>('React::DevTools::traceUpdatesEnabled', false);
8382

8483
const documentElements = useMemo<DocumentElements>(
8584
() => {
@@ -147,35 +146,35 @@ function SettingsContextController({
147146

148147
useEffect(
149148
() => {
150-
bridge.send('updateTraceUpdates', traceUpdates);
149+
bridge.send('enableTraceUpdates', traceUpdatesEnabled);
151150
},
152-
[bridge, traceUpdates],
151+
[bridge, traceUpdatesEnabled],
153152
);
154153

155154
const value = useMemo(
156155
() => ({
157-
displayDensity,
158-
setDisplayDensity,
159-
theme,
160-
setTheme,
161156
appendComponentStack,
162-
setAppendComponentStack,
163-
traceUpdates,
164-
setTraceUpdates,
157+
displayDensity,
165158
lineHeight:
166159
displayDensity === 'compact'
167160
? COMPACT_LINE_HEIGHT
168161
: COMFORTABLE_LINE_HEIGHT,
162+
setAppendComponentStack,
163+
setDisplayDensity,
164+
setTheme,
165+
setTraceUpdatesEnabled,
166+
theme,
167+
traceUpdatesEnabled,
169168
}),
170169
[
170+
appendComponentStack,
171171
displayDensity,
172+
setAppendComponentStack,
172173
setDisplayDensity,
173174
setTheme,
174-
appendComponentStack,
175-
setAppendComponentStack,
176-
traceUpdates,
177-
setTraceUpdates,
175+
setTraceUpdatesEnabled,
178176
theme,
177+
traceUpdatesEnabled,
179178
],
180179
);
181180

0 commit comments

Comments
 (0)