Skip to content

Commit c4c3d3b

Browse files
cortinicofacebook-github-bot
authored andcommitted
Do not use $ in identifiers for event emitters. (#49792)
Summary: Pull Request resolved: #49792 This removes the `$` from the `event` and `payload` identifier inside codegen. This is causing the `-Wdollar-in-identifier-extension` warning to fire. As I'm looking into enabling `-Wall -Werror` for React Common, this should be addressed as well. Changelog: [Internal] [Changed] - Reviewed By: cipolleschi Differential Revision: D70500543 fbshipit-source-id: c593680961b1b98561c3985f92ade5d6ba448ac9
1 parent a724b27 commit c4c3d3b

File tree

3 files changed

+117
-117
lines changed

3 files changed

+117
-117
lines changed

packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateEventEmitterCpp-test.js.snap

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -149,22 +149,22 @@ Object {
149149
150150
namespace facebook::react {
151151
152-
void EventNestedObjectPropsNativeComponentViewEventEmitter::onChange(OnChange $event) const {
153-
dispatchEvent(\\"change\\", [$event=std::move($event)](jsi::Runtime &runtime) {
154-
auto $payload = jsi::Object(runtime);
152+
void EventNestedObjectPropsNativeComponentViewEventEmitter::onChange(OnChange event) const {
153+
dispatchEvent(\\"change\\", [event=std::move(event)](jsi::Runtime &runtime) {
154+
auto payload = jsi::Object(runtime);
155155
{
156156
auto location = jsi::Object(runtime);
157157
{
158158
auto source = jsi::Object(runtime);
159-
source.setProperty(runtime, \\"url\\", $event.location.source.url);
159+
source.setProperty(runtime, \\"url\\", event.location.source.url);
160160
location.setProperty(runtime, \\"source\\", source);
161161
}
162-
location.setProperty(runtime, \\"x\\", $event.location.x);
163-
location.setProperty(runtime, \\"y\\", $event.location.y);
162+
location.setProperty(runtime, \\"x\\", event.location.x);
163+
location.setProperty(runtime, \\"y\\", event.location.y);
164164
165-
auto arrayOfObjects = jsi::Array(runtime, $event.location.arrayOfObjects.size());
165+
auto arrayOfObjects = jsi::Array(runtime, event.location.arrayOfObjects.size());
166166
size_t arrayOfObjectsIndex = 0;
167-
for (auto arrayOfObjectsValue : $event.location.arrayOfObjects) {
167+
for (auto arrayOfObjectsValue : event.location.arrayOfObjects) {
168168
auto arrayOfObjectsObject = jsi::Object(runtime);
169169
{
170170
auto value = jsi::Object(runtime);
@@ -175,9 +175,9 @@ void EventNestedObjectPropsNativeComponentViewEventEmitter::onChange(OnChange $e
175175
}
176176
location.setProperty(runtime, \\"arrayOfObjects\\", arrayOfObjects);
177177
178-
$payload.setProperty(runtime, \\"location\\", location);
178+
payload.setProperty(runtime, \\"location\\", location);
179179
}
180-
return $payload;
180+
return payload;
181181
});
182182
}
183183
@@ -203,59 +203,59 @@ Object {
203203
204204
namespace facebook::react {
205205
206-
void EventPropsNativeComponentViewEventEmitter::onChange(OnChange $event) const {
207-
dispatchEvent(\\"paperDirectName\\", [$event=std::move($event)](jsi::Runtime &runtime) {
208-
auto $payload = jsi::Object(runtime);
209-
$payload.setProperty(runtime, \\"value\\", $event.value);
210-
$payload.setProperty(runtime, \\"source\\", $event.source);
211-
$payload.setProperty(runtime, \\"progress\\", $event.progress);
212-
$payload.setProperty(runtime, \\"scale\\", $event.scale);
213-
return $payload;
206+
void EventPropsNativeComponentViewEventEmitter::onChange(OnChange event) const {
207+
dispatchEvent(\\"paperDirectName\\", [event=std::move(event)](jsi::Runtime &runtime) {
208+
auto payload = jsi::Object(runtime);
209+
payload.setProperty(runtime, \\"value\\", event.value);
210+
payload.setProperty(runtime, \\"source\\", event.source);
211+
payload.setProperty(runtime, \\"progress\\", event.progress);
212+
payload.setProperty(runtime, \\"scale\\", event.scale);
213+
return payload;
214214
});
215215
}
216216
217217
218-
void EventPropsNativeComponentViewEventEmitter::onEventDirect(OnEventDirect $event) const {
219-
dispatchEvent(\\"eventDirect\\", [$event=std::move($event)](jsi::Runtime &runtime) {
220-
auto $payload = jsi::Object(runtime);
221-
$payload.setProperty(runtime, \\"value\\", $event.value);
222-
return $payload;
218+
void EventPropsNativeComponentViewEventEmitter::onEventDirect(OnEventDirect event) const {
219+
dispatchEvent(\\"eventDirect\\", [event=std::move(event)](jsi::Runtime &runtime) {
220+
auto payload = jsi::Object(runtime);
221+
payload.setProperty(runtime, \\"value\\", event.value);
222+
return payload;
223223
});
224224
}
225225
226226
227-
void EventPropsNativeComponentViewEventEmitter::onEventDirectWithPaperName(OnEventDirectWithPaperName $event) const {
228-
dispatchEvent(\\"paperDirectName\\", [$event=std::move($event)](jsi::Runtime &runtime) {
229-
auto $payload = jsi::Object(runtime);
230-
$payload.setProperty(runtime, \\"value\\", $event.value);
231-
return $payload;
227+
void EventPropsNativeComponentViewEventEmitter::onEventDirectWithPaperName(OnEventDirectWithPaperName event) const {
228+
dispatchEvent(\\"paperDirectName\\", [event=std::move(event)](jsi::Runtime &runtime) {
229+
auto payload = jsi::Object(runtime);
230+
payload.setProperty(runtime, \\"value\\", event.value);
231+
return payload;
232232
});
233233
}
234234
235235
236-
void EventPropsNativeComponentViewEventEmitter::onOrientationChange(OnOrientationChange $event) const {
237-
dispatchEvent(\\"paperBubblingName\\", [$event=std::move($event)](jsi::Runtime &runtime) {
238-
auto $payload = jsi::Object(runtime);
239-
$payload.setProperty(runtime, \\"orientation\\", toString($event.orientation));
240-
return $payload;
236+
void EventPropsNativeComponentViewEventEmitter::onOrientationChange(OnOrientationChange event) const {
237+
dispatchEvent(\\"paperBubblingName\\", [event=std::move(event)](jsi::Runtime &runtime) {
238+
auto payload = jsi::Object(runtime);
239+
payload.setProperty(runtime, \\"orientation\\", toString(event.orientation));
240+
return payload;
241241
});
242242
}
243243
244244
245-
void EventPropsNativeComponentViewEventEmitter::onEnd(OnEnd $event) const {
245+
void EventPropsNativeComponentViewEventEmitter::onEnd(OnEnd event) const {
246246
dispatchEvent(\\"end\\", [](jsi::Runtime &runtime) {
247-
auto $payload = jsi::Object(runtime);
247+
auto payload = jsi::Object(runtime);
248248
249-
return $payload;
249+
return payload;
250250
});
251251
}
252252
253253
254-
void EventPropsNativeComponentViewEventEmitter::onEventBubblingWithPaperName(OnEventBubblingWithPaperName $event) const {
254+
void EventPropsNativeComponentViewEventEmitter::onEventBubblingWithPaperName(OnEventBubblingWithPaperName event) const {
255255
dispatchEvent(\\"paperBubblingName\\", [](jsi::Runtime &runtime) {
256-
auto $payload = jsi::Object(runtime);
256+
auto payload = jsi::Object(runtime);
257257
258-
return $payload;
258+
return payload;
259259
});
260260
}
261261
@@ -347,11 +347,11 @@ Object {
347347
348348
namespace facebook::react {
349349
350-
void InterfaceOnlyNativeComponentViewEventEmitter::onChange(OnChange $event) const {
351-
dispatchEvent(\\"change\\", [$event=std::move($event)](jsi::Runtime &runtime) {
352-
auto $payload = jsi::Object(runtime);
353-
$payload.setProperty(runtime, \\"value\\", $event.value);
354-
return $payload;
350+
void InterfaceOnlyNativeComponentViewEventEmitter::onChange(OnChange event) const {
351+
dispatchEvent(\\"change\\", [event=std::move(event)](jsi::Runtime &runtime) {
352+
auto payload = jsi::Object(runtime);
353+
payload.setProperty(runtime, \\"value\\", event.value);
354+
return payload;
355355
});
356356
}
357357

packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ const ComponentTemplate = ({
6868
dispatchEventName: string,
6969
implementation: string,
7070
}) => {
71-
const capture = implementation.includes('$event')
72-
? '$event=std::move($event)'
71+
const capture = implementation.includes('event')
72+
? 'event=std::move(event)'
7373
: '';
7474
return `
75-
void ${className}EventEmitter::${eventName}(${structName} $event) const {
75+
void ${className}EventEmitter::${eventName}(${structName} event) const {
7676
dispatchEvent("${dispatchEventName}", [${capture}](jsi::Runtime &runtime) {
7777
${implementation}
7878
});
@@ -103,7 +103,7 @@ function generateSetter(
103103
valueMapper: string => string = value => value,
104104
) {
105105
const eventChain = usingEvent
106-
? `$event.${[...propertyParts, propertyName].join('.')}`
106+
? `event.${[...propertyParts, propertyName].join('.')}`
107107
: [...propertyParts, propertyName].join('.');
108108
return `${variableName}.setProperty(runtime, "${propertyName}", ${valueMapper(
109109
eventChain,
@@ -156,7 +156,7 @@ function generateArraySetter(
156156
usingEvent: boolean,
157157
): string {
158158
const eventChain = usingEvent
159-
? `$event.${[...propertyParts, propertyName].join('.')}`
159+
? `event.${[...propertyParts, propertyName].join('.')}`
160160
: [...propertyParts, propertyName].join('.');
161161
const indexVar = `${propertyName}Index`;
162162
const innerLoopVar = `${propertyName}Value`;
@@ -376,14 +376,14 @@ function generateEvent(
376376

377377
if (event.typeAnnotation.argument) {
378378
const implementation = `
379-
auto $payload = jsi::Object(runtime);
379+
auto payload = jsi::Object(runtime);
380380
${generateSetters(
381-
'$payload',
381+
'payload',
382382
event.typeAnnotation.argument.properties,
383383
[],
384384
extraIncludes,
385385
)}
386-
return $payload;
386+
return payload;
387387
`.trim();
388388

389389
if (!event.name.startsWith('on')) {

0 commit comments

Comments
 (0)