status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-27 09:45:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix RCTRootView invalidation using the wrong bridge

Browse Source 
Reviewed By: majak

Differential Revision: D3696533

fbshipit-source-id: e7ef4373e975e585f4c34df71966c8b5b30d3e9a
This commit is contained in:
Pieter De Baets 2016-08-10 07:41:54 -07:00 committed by Facebook Github Bot 1
parent 0cc3b4b079
commit 4afaf5e538
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Libraries/Utilities/MessageQueue.js
View File

@ -218,8 +218,8 @@ class MessageQueue {
const moduleMethods = this._callableModules[module];
invariant(
!!moduleMethods,
'Module %s is not a registered callable module.',
module
'Module %s is not a registered callable module (calling %s)',
module, method
);
invariant(
!!moduleMethods[method],

6
React/Base/RCTRootView.m
View File

@ -15,6 +15,7 @@
#import "RCTAssert.h"
#import "RCTBridge.h"
#import "RCTBridge+Private.h"
#import "RCTEventDispatcher.h"
#import "RCTKeyCommands.h"
#import "RCTLog.h"
@ -92,7 +93,7 @@ NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotificat
object:self];
if (!_bridge.loading) {
[self bundleFinishedLoading:_bridge];
[self bundleFinishedLoading:[_bridge batchedBridge]];
}
[self showLoadingView];
@ -199,6 +200,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
- (void)javaScriptDidLoad:(NSNotification *)notification
{
RCTAssertMainQueue();
// Use the (batched) bridge that's sent in the notification payload, so the
// RCTRootContentView is scoped to the right bridge
RCTBridge *bridge = notification.userInfo[@"bridge"];
[self bundleFinishedLoading:bridge];
}