From b3872e807df3a9f92a14ccc2462f3f62bcd5ffc4 Mon Sep 17 00:00:00 2001 From: Alex Dvornikov Date: Thu, 6 Apr 2017 00:40:27 -0700 Subject: [PATCH] Check that RCTDidInitializeModuleNotification is being called with the correct bridge Reviewed By: javache Differential Revision: D4800110 fbshipit-source-id: acc8bc512ed17a84abeac74afb91db51ab4c5043 --- React/Base/RCTBridge+Private.h | 6 ++++++ React/Base/RCTModuleData.mm | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/React/Base/RCTBridge+Private.h b/React/Base/RCTBridge+Private.h index e3f0156243..46f735a83d 100644 --- a/React/Base/RCTBridge+Private.h +++ b/React/Base/RCTBridge+Private.h @@ -79,6 +79,12 @@ RCT_EXTERN void RCTVerifyAllModulesExported(NSArray *extraModules); */ @property (nonatomic, weak, readonly) id javaScriptExecutor; +/** + * Used by RCTModuleData + */ + +@property (nonatomic, weak, readonly) RCTBridge *parentBridge; + /** * Used by RCTModuleData */ diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm index 69d367f2c1..4db8ea6dfb 100644 --- a/React/Base/RCTModuleData.mm +++ b/React/Base/RCTModuleData.mm @@ -163,7 +163,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init); [_bridge registerModuleForFrameUpdates:_instance withModuleData:self]; [[NSNotificationCenter defaultCenter] postNotificationName:RCTDidInitializeModuleNotification object:_bridge - userInfo:@{@"module": _instance}]; + userInfo:@{@"module": _instance, @"bridge": RCTNullIfNil(_bridge.parentBridge)}]; RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @""); } }