diff --git a/React/CoreModules/RCTDevLoadingView.mm b/React/CoreModules/RCTDevLoadingView.mm index dd3b994cfa..a4be3ed955 100644 --- a/React/CoreModules/RCTDevLoadingView.mm +++ b/React/CoreModules/RCTDevLoadingView.mm @@ -34,7 +34,6 @@ using namespace facebook::react; dispatch_block_t _initialMessageBlock; } -@synthesize bridge = _bridge; @synthesize bundleManager = _bundleManager; RCT_EXPORT_MODULE() @@ -64,15 +63,6 @@ RCT_EXPORT_MODULE() return YES; } -- (void)setBundleManager:(RCTBundleManager *)bundleManager -{ - _bundleManager = bundleManager; - - if (_bridge.loading) { - [self showWithURL:bundleManager.bundleURL]; - } -} - - (void)clearInitialMessageDelay { if (self->_initialMessageBlock != nil) { diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index 2e4bf04813..496b26756f 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -495,6 +495,14 @@ struct RCTInstanceCallback : public InstanceCallback { // Load the source asynchronously, then store it for later execution. dispatch_group_enter(prepareBridge); __block NSData *sourceCode; + +#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include() + { + id loadingView = [self moduleForName:@"DevLoadingView" lazilyLoadIfNecessary:YES]; + [loadingView showWithURL:self.bundleURL]; + } +#endif + [self loadSource:^(NSError *error, RCTSource *source) { if (error) {