mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Attach RCTBundleManager to NativeModules
Summary: After this diff, every NativeModule that has `synthesize bundleManager = _bundleManager`, will get access to an RCTBundleManager, that it can use to read from/write to the bridge's bundle URL. Changelog: [iOS][Added] - Attach RCTBundleManager to NativeModules Reviewed By: PeteTheHeat Differential Revision: D28086319 fbshipit-source-id: 6e4cd815d300e9036957ec8c743e947d2cb3f365
This commit is contained in:
1 parent
4a1bafe591
commit
329f58ee46
4 files changed
+44
-8
No files matched your search
@@ -15,6 +15,7 @@
|
||||
@class RCTBridge;
|
||||
@class RCTModuleRegistry;
|
||||
@class RCTViewRegistry;
|
||||
@class RCTBundleManager;
|
||||
|
||||
typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
|
||||
|
||||
@@ -23,18 +24,21 @@ typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
|
||||
- (instancetype)initWithModuleClass:(Class)moduleClass
|
||||
bridge:(RCTBridge *)bridge
|
||||
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED;
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
|
||||
bundleManager:(RCTBundleManager *)bundleManager;
|
||||
|
||||
- (instancetype)initWithModuleClass:(Class)moduleClass
|
||||
moduleProvider:(RCTBridgeModuleProvider)moduleProvider
|
||||
bridge:(RCTBridge *)bridge
|
||||
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED NS_DESIGNATED_INITIALIZER;
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
|
||||
bundleManager:(RCTBundleManager *)bundleManager NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
- (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
|
||||
bridge:(RCTBridge *)bridge
|
||||
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED NS_DESIGNATED_INITIALIZER;
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
|
||||
bundleManager:(RCTBundleManager *)bundleManager NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
/**
|
||||
* Calls `constantsToExport` on the module and stores the result. Note that
|
||||
|
||||
@@ -50,6 +50,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
|
||||
BOOL _setupComplete;
|
||||
RCTModuleRegistry *_moduleRegistry;
|
||||
RCTViewRegistry *_viewRegistry_DEPRECATED;
|
||||
RCTBundleManager *_bundleManager;
|
||||
}
|
||||
|
||||
@synthesize methods = _methods;
|
||||
@@ -103,6 +104,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
|
||||
bridge:(RCTBridge *)bridge
|
||||
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
|
||||
bundleManager:(RCTBundleManager *)bundleManager
|
||||
{
|
||||
return [self initWithModuleClass:moduleClass
|
||||
moduleProvider:^id<RCTBridgeModule> {
|
||||
@@ -110,7 +112,8 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
|
||||
}
|
||||
bridge:bridge
|
||||
moduleRegistry:moduleRegistry
|
||||
viewRegistry_DEPRECATED:viewRegistry_DEPRECATED];
|
||||
viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
|
||||
bundleManager:bundleManager];
|
||||
}
|
||||
|
||||
- (instancetype)initWithModuleClass:(Class)moduleClass
|
||||
@@ -118,6 +121,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
|
||||
bridge:(RCTBridge *)bridge
|
||||
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
|
||||
bundleManager:(RCTBundleManager *)bundleManager
|
||||
{
|
||||
if (self = [super init]) {
|
||||
_bridge = bridge;
|
||||
@@ -125,6 +129,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
|
||||
_moduleProvider = [moduleProvider copy];
|
||||
_moduleRegistry = moduleRegistry;
|
||||
_viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
|
||||
_bundleManager = bundleManager;
|
||||
[self setUp];
|
||||
}
|
||||
return self;
|
||||
@@ -134,6 +139,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
|
||||
bridge:(RCTBridge *)bridge
|
||||
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
|
||||
viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
|
||||
bundleManager:(RCTBundleManager *)bundleManager
|
||||
{
|
||||
if (self = [super init]) {
|
||||
_bridge = bridge;
|
||||
@@ -141,6 +147,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
|
||||
_moduleClass = [instance class];
|
||||
_moduleRegistry = moduleRegistry;
|
||||
_viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
|
||||
_bundleManager = bundleManager;
|
||||
[self setUp];
|
||||
}
|
||||
return self;
|
||||
@@ -203,6 +210,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
|
||||
[self setBridgeForInstance];
|
||||
[self setModuleRegistryForInstance];
|
||||
[self setViewRegistryForInstance];
|
||||
[self setBundleManagerForInstance];
|
||||
}
|
||||
|
||||
[self setUpMethodQueue];
|
||||
@@ -284,6 +292,23 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setBundleManagerForInstance
|
||||
{
|
||||
if ([_instance respondsToSelector:@selector(bundleManager)] && _instance.bundleManager != _bundleManager) {
|
||||
RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setBundleManagerForInstance]", nil);
|
||||
@try {
|
||||
[(id)_instance setValue:_bundleManager forKey:@"bundleManager"];
|
||||
} @catch (NSException *exception) {
|
||||
RCTLogError(
|
||||
@"%@ has no setter or ivar for its module registry, which is not "
|
||||
"permitted. You must either @synthesize the bundleManager property, "
|
||||
"or provide your own setter method.",
|
||||
self.name);
|
||||
}
|
||||
RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
|
||||
}
|
||||
}
|
||||
|
||||
- (void)finishSetupForInstance
|
||||
{
|
||||
if (!_setupComplete && _instance) {
|
||||
|
||||
@@ -236,6 +236,7 @@ struct RCTInstanceCallback : public InstanceCallback {
|
||||
|
||||
RCTModuleRegistry *_objCModuleRegistry;
|
||||
RCTViewRegistry *_viewRegistry_DEPRECATED;
|
||||
RCTBundleManager *_bundleManager;
|
||||
}
|
||||
|
||||
@synthesize bridgeDescription = _bridgeDescription;
|
||||
@@ -300,6 +301,8 @@ struct RCTInstanceCallback : public InstanceCallback {
|
||||
_moduleDataByID = [NSMutableArray new];
|
||||
_objCModuleRegistry = [RCTModuleRegistry new];
|
||||
[_objCModuleRegistry setBridge:self];
|
||||
_bundleManager = [RCTBundleManager new];
|
||||
[_bundleManager setBridge:self];
|
||||
_viewRegistry_DEPRECATED = [RCTViewRegistry new];
|
||||
[_viewRegistry_DEPRECATED setBridge:self];
|
||||
|
||||
@@ -778,7 +781,8 @@ struct RCTInstanceCallback : public InstanceCallback {
|
||||
moduleData = [[RCTModuleData alloc] initWithModuleClass:moduleClass
|
||||
bridge:self
|
||||
moduleRegistry:_objCModuleRegistry
|
||||
viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED];
|
||||
viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
|
||||
bundleManager:_bundleManager];
|
||||
BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
|
||||
|
||||
_moduleDataByName[moduleName] = moduleData;
|
||||
@@ -853,7 +857,8 @@ struct RCTInstanceCallback : public InstanceCallback {
|
||||
RCTModuleData *moduleData = [[RCTModuleData alloc] initWithModuleInstance:module
|
||||
bridge:self
|
||||
moduleRegistry:_objCModuleRegistry
|
||||
viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED];
|
||||
viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
|
||||
bundleManager:_bundleManager];
|
||||
BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
|
||||
|
||||
_moduleDataByName[moduleName] = moduleData;
|
||||
@@ -907,7 +912,8 @@ struct RCTInstanceCallback : public InstanceCallback {
|
||||
moduleData = [[RCTModuleData alloc] initWithModuleClass:moduleClass
|
||||
bridge:self
|
||||
moduleRegistry:_objCModuleRegistry
|
||||
viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED];
|
||||
viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
|
||||
bundleManager:_bundleManager];
|
||||
BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
|
||||
|
||||
_moduleDataByName[moduleName] = moduleData;
|
||||
|
||||
@@ -624,7 +624,8 @@ static Class getFallbackClassFromName(const char *name)
|
||||
RCTModuleData *data = [[RCTModuleData alloc] initWithModuleInstance:(id<RCTBridgeModule>)module
|
||||
bridge:_bridge
|
||||
moduleRegistry:_moduleRegistry
|
||||
viewRegistry_DEPRECATED:nil];
|
||||
viewRegistry_DEPRECATED:nil
|
||||
bundleManager:nil];
|
||||
[_bridge registerModuleForFrameUpdates:(id<RCTBridgeModule>)module withModuleData:data];
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user