Skip to content

fix(codegen): skip third-party components whose class is not linked #3128

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

Draft
YevheniiKotyrlo wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(codegen): skip third-party components whose class is not linked #3128

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
38 changes: 33 additions & 5 deletions ...t-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,24 @@ exports[`execute test-app "ReactCodegen/RCTThirdPartyComponentsProvider.mm" shou
static dispatch_once_t nativeComponentsToken;

dispatch_once(&nativeComponentsToken, ^{
thirdPartyComponents = @{
@\\"TestAppComponent\\": NSClassFromString(@\\"RCTTestAppComponent\\"), // test-app
@\\"TestLibraryComponent\\": NSClassFromString(@\\"RCTTestLibraryComponent\\"), // test-library
NSDictionary<NSString *, NSString *> * componentMapping = @{
@\\"TestAppComponent\\": @\\"RCTTestAppComponent\\", // test-app
@\\"TestLibraryComponent\\": @\\"RCTTestLibraryComponent\\", // test-library
};

NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithCapacity:componentMapping.count];

for (NSString *key in componentMapping) {
// Nil for a library this target does not link (an app extension, macOS).
Class klass = NSClassFromString(componentMapping[key]);
if (!klass) {
continue;
}

[dict setObject:klass forKey:key];
}

thirdPartyComponents = dict;
});

return thirdPartyComponents;
Expand Down Expand Up @@ -817,9 +831,23 @@ exports[`execute test-app-legacy "ReactCodegen/RCTThirdPartyComponentsProvider.m
static dispatch_once_t nativeComponentsToken;

dispatch_once(&nativeComponentsToken, ^{
thirdPartyComponents = @{
@\\"TestAppDeprecatedComponent\\": NSClassFromString(@\\"RCTTestAppDeprecatedComponentClass\\"), // test-app-legacy
NSDictionary<NSString *, NSString *> * componentMapping = @{
@\\"TestAppDeprecatedComponent\\": @\\"RCTTestAppDeprecatedComponentClass\\", // test-app-legacy
};

NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithCapacity:componentMapping.count];

for (NSString *key in componentMapping) {
// Nil for a library this target does not link (an app extension, macOS).
Class klass = NSClassFromString(componentMapping[key]);
if (!klass) {
continue;
}

[dict setObject:klass forKey:key];
}

thirdPartyComponents = dict;
});

return thirdPartyComponents;
Expand Down
2 changes: 1 addition & 1 deletion ...act-native/scripts/codegen/generate-artifacts-executor/generateRCTThirdPartyComponents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ function generateRCTThirdPartyComponents(
.flatMap(library => {
const components = componentsInLibraries[library];
return components.map(({componentName, className}) => {
return `\t\t@"${componentName}": NSClassFromString(@"${className}"), // ${library}`;
return `\t\t@"${componentName}": @"${className}", // ${library}`;
});
})
.join('\n');
Expand Down
16 changes: 15 additions & 1 deletion packages/react-native/scripts/codegen/templates/RCTThirdPartyComponentsProviderMM.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,23 @@
static dispatch_once_t nativeComponentsToken;

dispatch_once(&nativeComponentsToken, ^{
thirdPartyComponents = @{
NSDictionary<NSString *, NSString *> * componentMapping = @{
{thirdPartyComponentsMapping}
};

NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithCapacity:componentMapping.count];

for (NSString *key in componentMapping) {
// Nil for a library this target does not link (an app extension, macOS).
Class klass = NSClassFromString(componentMapping[key]);
if (!klass) {
continue;
}

[dict setObject:klass forKey:key];
}

thirdPartyComponents = dict;
});

return thirdPartyComponents;
Expand Down