Skip to content

Commit 37bf818

Browse files
committed
Assign bridgeProxy if module has _bridgeProxy ivar
1 parent 1a413a7 commit 37bf818

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.mm

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#import <React/RCTLinkingManager.h>
99

1010
#import <FBReactNativeSpec/FBReactNativeSpec.h>
11-
#import <React/RCTBridge+Private.h>
1211
#import <React/RCTBridge.h>
1312
#import <React/RCTLog.h>
1413
#import <React/RCTUtils.h>
@@ -154,15 +153,12 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
154153

155154
RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
156155
{
157-
RCTBridge *bridge = self.bridge;
158-
if (!bridge) {
159-
bridge = [RCTBridge currentBridge];
160-
}
161156
NSURL *initialURL = nil;
162-
if (bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
163-
initialURL = bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
157+
if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
158+
initialURL = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
164159
} else {
165-
NSDictionary *userActivityDictionary = bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
160+
NSDictionary *userActivityDictionary =
161+
self.bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
166162
if ([userActivityDictionary[UIApplicationLaunchOptionsUserActivityTypeKey] isEqual:NSUserActivityTypeBrowsingWeb]) {
167163
initialURL = ((NSUserActivity *)userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"]).webpageURL;
168164
}

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ - (BOOL)_shouldCreateObjCModule:(Class)moduleClass
674674
*/
675675
if (_bridge) {
676676
[(id)module setValue:_bridge forKey:@"bridge"];
677-
} else if (_bridgeProxy && [self _isLegacyModuleClass:[module class]]) {
677+
} else if (_bridgeProxy) {
678678
[(id)module setValue:_bridgeProxy forKey:@"bridge"];
679679
}
680680
} @catch (NSException *exception) {

0 commit comments

Comments
 (0)