Skip to content

Fix TMManager moduleProviderForName #49835

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
wants to merge 1 commit into from
Closed

Fix TMManager moduleProviderForName #49835

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
25 changes: 13 additions & 12 deletions ...ive/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,21 +493,22 @@ - (BOOL)_isLegacyModuleClass:(Class)moduleClass

- (id<RCTModuleProvider>)_moduleProviderForName:(const char *)moduleName
{
id<RCTModuleProvider> moduleProvider = nil;
if ([_delegate respondsToSelector:@selector(getModuleProvider:)]) {
id<RCTModuleProvider> moduleProvider = [_delegate getModuleProvider:moduleName];
BOOL isTurboModule = [self _isTurboModule:moduleName];
if (RCTTurboModuleEnabled() && !isTurboModule && !moduleProvider) {
return nil;
}
moduleProvider = [_delegate getModuleProvider:moduleName];
}

if (moduleProvider) {
if ([moduleProvider conformsToProtocol:@protocol(RCTTurboModule)]) {
// moduleProvider is also a TM, we need to initialize objectiveC properties, like the dispatch queue
return (id<RCTModuleProvider>)[self _provideObjCModule:moduleName moduleProvider:moduleProvider];
}
// module is Cxx module
return moduleProvider;
if (RCTTurboModuleInteropEnabled() && ![self _isTurboModule:moduleName] && !moduleProvider) {
return nil;
}

if (moduleProvider) {
if ([moduleProvider conformsToProtocol:@protocol(RCTTurboModule)]) {
// moduleProvider is also a TM, we need to initialize objectiveC properties, like the dispatch queue
return (id<RCTModuleProvider>)[self _provideObjCModule:moduleName moduleProvider:moduleProvider];
}
// module is Cxx module
return moduleProvider;
}

// No module provider, the Module is registered without Codegen
Expand Down
Loading