diff --git a/React/DevSupport/RCTPackagerConnection.m b/React/DevSupport/RCTPackagerConnection.m index 6ced2f35a..d7c9c6b28 100644 --- a/React/DevSupport/RCTPackagerConnection.m +++ b/React/DevSupport/RCTPackagerConnection.m @@ -41,8 +41,8 @@ _bridge = bridge; _handlers = [NSMutableDictionary new]; - _handlers[@"reload"] = [[RCTReloadPackagerMethod alloc] initWithBridge:_bridge]; - _handlers[@"pokeSamplingProfiler"] = [[RCTSamplingProfilerPackagerMethod alloc] initWithBridge:_bridge]; + _handlers[@"reload"] = [[RCTReloadPackagerMethod alloc] initWithBridge:bridge]; + _handlers[@"pokeSamplingProfiler"] = [[RCTSamplingProfilerPackagerMethod alloc] initWithBridge:bridge]; [self connect]; } diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm index 69d47d0c7..e9c0e6600 100644 --- a/React/Modules/RCTDevSettings.mm +++ b/React/Modules/RCTDevSettings.mm @@ -141,7 +141,6 @@ RCT_EXPORT_MODULE() { if (self = [super init]) { _dataSource = dataSource; - [self _configurePackagerConnection]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jsLoaded:) @@ -156,6 +155,13 @@ RCT_EXPORT_MODULE() return self; } +- (void)setBridge:(RCTBridge *)bridge +{ + RCTAssert(_bridge == nil, @"RCTDevSettings module should not be reused"); + _bridge = bridge; + [self _configurePackagerConnection]; +} + - (dispatch_queue_t)methodQueue { return dispatch_get_main_queue();