Skip to content

Respect enum values for TurboModule c++ codegen (#56478) #56478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
christophpurrer wants to merge 1 commit into from
+14 −6
Closed

Respect enum values for TurboModule c++ codegen (#56478) #56478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ive-codegen/e2e/deep_imports/__tests__/modules/__snapshots__/GenerateModuleH-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ struct Bridging<NativeEnumTurboModuleStatusLowerCaseEnum> {

#pragma mark - NativeEnumTurboModuleStatusNumEnum

enum class NativeEnumTurboModuleStatusNumEnum { Active, Paused, Off };
enum class NativeEnumTurboModuleStatusNumEnum { Active = 2, Paused = 1, Off = 0 };

template <>
struct Bridging<NativeEnumTurboModuleStatusNumEnum> {
Expand Down Expand Up @@ -1749,7 +1749,7 @@ struct Bridging<NativeEnumTurboModuleStatusLowerCaseEnum> {

#pragma mark - NativeEnumTurboModuleStatusNumEnum

enum class NativeEnumTurboModuleStatusNumEnum { Active, Paused, Off };
enum class NativeEnumTurboModuleStatusNumEnum { Active = 2, Paused = 1, Off = 0 };

template <>
struct Bridging<NativeEnumTurboModuleStatusNumEnum> {
Expand Down
10 changes: 9 additions & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,15 @@ function generateEnum(

return EnumTemplate({
enumName,
values: members.map(member => toSafeCppString(member.name)).join(', '),
values: members
.map(member => {
const name = toSafeCppString(member.name);
if (Number.isInteger(member.value.value)) {
return `${name} = ${member.value.value}`;
}
return name;
})
.join(', '),
fromCases,
toCases,
nativeEnumMemberType,
Expand Down
6 changes: 3 additions & 3 deletions ...ative-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ namespace facebook::react {

#pragma mark - NativeSampleTurboModuleEnumInt

enum class NativeSampleTurboModuleEnumInt { IA, IB };
enum class NativeSampleTurboModuleEnumInt { IA = 23, IB = 42 };

template <>
struct Bridging<NativeSampleTurboModuleEnumInt> {
Expand Down Expand Up @@ -1713,7 +1713,7 @@ namespace facebook::react {

#pragma mark - NativeSampleTurboModuleNumEnum

enum class NativeSampleTurboModuleNumEnum { ONE, TWO };
enum class NativeSampleTurboModuleNumEnum { ONE = 1, TWO = 2 };

template <>
struct Bridging<NativeSampleTurboModuleNumEnum> {
Expand Down Expand Up @@ -1741,7 +1741,7 @@ struct Bridging<NativeSampleTurboModuleNumEnum> {

#pragma mark - NativeSampleTurboModuleFloatEnum

enum class NativeSampleTurboModuleFloatEnum { POINT_ZERO, POINT_ONE, POINT_TWO };
enum class NativeSampleTurboModuleFloatEnum { POINT_ZERO = 0, POINT_ONE, POINT_TWO };

template <>
struct Bridging<NativeSampleTurboModuleFloatEnum> {
Expand Down
Loading
⚡