From f065614b9f0e715aeca48e5358d20d452158c545 Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Wed, 3 Apr 2024 22:41:09 +0800 Subject: [PATCH] Assign bridgeProxy if module has _bridgeProxy ivar --- .../Libraries/LinkingIOS/RCTLinkingManager.mm | 12 ++++-------- .../ios/ReactCommon/RCTTurboModuleManager.mm | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.mm b/packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.mm index e11217da70468b..3fa06c43979bfd 100644 --- a/packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.mm +++ b/packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.mm @@ -8,7 +8,6 @@ #import #import -#import #import #import #import @@ -154,15 +153,12 @@ - (void)handleOpenURLNotification:(NSNotification *)notification RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject) { - RCTBridge *bridge = self.bridge; - if (!bridge) { - bridge = [RCTBridge currentBridge]; - } NSURL *initialURL = nil; - if (bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) { - initialURL = bridge.launchOptions[UIApplicationLaunchOptionsURLKey]; + if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) { + initialURL = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]; } else { - NSDictionary *userActivityDictionary = bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey]; + NSDictionary *userActivityDictionary = + self.bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey]; if ([userActivityDictionary[UIApplicationLaunchOptionsUserActivityTypeKey] isEqual:NSUserActivityTypeBrowsingWeb]) { initialURL = ((NSUserActivity *)userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"]).webpageURL; } diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm index d93d606fce4117..9a34ab1ab7d357 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm @@ -674,7 +674,7 @@ - (BOOL)_shouldCreateObjCModule:(Class)moduleClass */ if (_bridge) { [(id)module setValue:_bridge forKey:@"bridge"]; - } else if (_bridgeProxy && [self _isLegacyModuleClass:[module class]]) { + } else if (_bridgeProxy) { [(id)module setValue:_bridgeProxy forKey:@"bridge"]; } } @catch (NSException *exception) {