fix: deep and universal links when app is running

thiagobrez · okwasniewski · commit f21197d4ce1d · 2024-04-10T10:32:32.000+02:00
diff --git a/packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.h b/packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.h
@@ -24,4 +24,6 @@
     continueUserActivity:(nonnull NSUserActivity *)userActivity
       restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler;
 
++ (void)onOpenURL:(nonnull NSURL *)url NS_SWIFT_NAME(onOpenURL(url:));
+
 @end
diff --git a/packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.mm b/packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.mm
@@ -15,6 +15,7 @@
 #import "RCTLinkingPlugins.h"
 
 static NSString *const kOpenURLNotification = @"RCTOpenURLNotification";
+static NSURL *initialURL = nil;
 
 static void postNotificationWithURL(NSURL *URL, id sender)
 {
@@ -81,6 +82,16 @@ + (BOOL)application:(UIApplication *)application
   return YES;
 }
 
+
++ (void)onOpenURL:(NSURL *)url
+{
+  if (initialURL == nil) {
+    initialURL = url;
+  } else {
+    postNotificationWithURL(url, self);
+  }
+}
+
 - (void)handleOpenURLNotification:(NSNotification *)notification
 {
   [self sendEventWithName:@"url" body:notification.userInfo];
@@ -153,6 +164,7 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
 
 RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
 {
+#if !TARGET_OS_VISION
   NSURL *initialURL = nil;
   if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
     initialURL = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
@@ -163,6 +175,8 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
       initialURL = ((NSUserActivity *)userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"]).webpageURL;
     }
   }
+#endif
+  // React Native visionOS uses static property to retrieve initialURL.
   resolve(RCTNullIfNil(initialURL.absoluteString));
 }
 
diff --git a/packages/react-native/Libraries/SwiftExtensions/RCTMainWindow.swift b/packages/react-native/Libraries/SwiftExtensions/RCTMainWindow.swift
@@ -20,6 +20,7 @@ import SwiftUI
 public struct RCTMainWindow: Scene {
   var moduleName: String
   var initialProps: RCTRootViewRepresentable.InitialPropsType
+  var onOpenURLCallback: ((URL) -> ())?
   
   public init(moduleName: String, initialProps: RCTRootViewRepresentable.InitialPropsType = nil) {
     self.moduleName = moduleName
@@ -30,10 +31,21 @@ public struct RCTMainWindow: Scene {
     WindowGroup {
       RCTRootViewRepresentable(moduleName: moduleName, initialProps: initialProps)
         .modifier(WindowHandlingModifier())
+        .onOpenURL(perform: { url in
+          onOpenURLCallback?(url)
+        })
     }
   }
 }
 
+extension RCTMainWindow {
+  public func onOpenURL(perform action: @escaping (URL) -> ()) -> some Scene {
+    var scene = self
+    scene.onOpenURLCallback = action
+    return scene
+  }
+}
+
 /**
  Handles data sharing between React Native and SwiftUI views.
  */
diff --git a/packages/rn-tester/RNTester-visionOS/App.swift b/packages/rn-tester/RNTester-visionOS/App.swift
@@ -11,6 +11,9 @@ struct RNTesterApp: App {
   
   var body: some Scene {
     RCTMainWindow(moduleName: "RNTesterApp")
+      .onOpenURL(perform: { url in
+        RCTLinkingManager.onOpenURL(url: url)
+      })
     
     RCTWindow(id: "SecondWindow", sceneData: reactContext.getSceneData(id: "SecondWindow"))
       .defaultSize(CGSize(width: 400, height: 700))
diff --git a/packages/rn-tester/RNTester-visionOS/Info.plist b/packages/rn-tester/RNTester-visionOS/Info.plist
@@ -2,6 +2,19 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>com.reactjs.ios</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>rntester</string>
+			</array>
+		</dict>
+	</array>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationPreferredDefaultSceneSessionRole</key>
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
@@ -105,6 +105,7 @@
 		763DC37C2B0F824400D2C0C5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		763DC37F2B0F824400D2C0C5 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		763DC3812B0F824400D2C0C5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		76A65A522BC590CE0074A122 /* RNTester.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = RNTester.entitlements; path = RNTester/RNTester.entitlements; sourceTree = "<group>"; };
 		76E4BB272B34909800B02A15 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
 		76E4BB2B2B34932200B02A15 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7CDA7A212644C6BB8C0D00D8 /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
@@ -230,6 +231,7 @@
 		13B07FAE1A68108700A75B9A /* RNTester */ = {
 			isa = PBXGroup;
 			children = (
+				76A65A522BC590CE0074A122 /* RNTester.entitlements */,
 				F0D621C22BBB9E38005960AC /* PrivacyInfo.xcprivacy */,
 				AC474BFB29BBD4A1002BDAED /* RNTester.xctestplan */,
 				E771AEEA22B44E3100EA1189 /* Info.plist */,
@@ -963,6 +965,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 				DEVELOPMENT_TEAM = "";
 				HEADER_SEARCH_PATHS = (
 					"${PODS_ROOT}/Headers/Private/Yoga",
@@ -1004,6 +1007,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = RNTester/RNTester.entitlements;
 				DEVELOPMENT_TEAM = "";
 				EXCLUDED_ARCHS = "";
 				HEADER_SEARCH_PATHS = (
@@ -1050,9 +1054,11 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = "RNTester-visionOS/RNTester-visionOS.entitlements";
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_ASSET_PATHS = "\"RNTester-visionOS/Preview Content\"";
+				DEVELOPMENT_TEAM = Z3M9P6G4WY;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1123,7 +1129,7 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.meta.RNTester.localDevelopment.RNTester-visionOS";
+				PRODUCT_BUNDLE_IDENTIFIER = com.okwasniewski.rntester;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "xros xrsimulator";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
@@ -1148,10 +1154,12 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = "RNTester-visionOS/RNTester-visionOS.entitlements";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "\"RNTester-visionOS/Preview Content\"";
+				DEVELOPMENT_TEAM = Z3M9P6G4WY;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1220,7 +1228,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.meta.RNTester.localDevelopment.RNTester-visionOS";
+				PRODUCT_BUNDLE_IDENTIFIER = com.okwasniewski.rntester;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "xros xrsimulator";
 				SWIFT_COMPILATION_MODE = wholemodule;

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#import "RCTLinkingPlugins.h"`
`16`	`16`
`17`	`17`	`static NSString *const kOpenURLNotification = @"RCTOpenURLNotification";`
	`18`	`+static NSURL *initialURL = nil;`
`18`	`19`
`19`	`20`	`static void postNotificationWithURL(NSURL *URL, id sender)`
`20`	`21`	`{`
`@@ -81,6 +82,16 @@ + (BOOL)application:(UIApplication *)application`
`81`	`82`	`return YES;`
`82`	`83`	`}`
`83`	`84`
	`85`	`+`
	`86`	`++ (void)onOpenURL:(NSURL *)url`
	`87`	`+{`
	`88`	`+ if (initialURL == nil) {`
	`89`	`+ initialURL = url;`
	`90`	`+ } else {`
	`91`	`+ postNotificationWithURL(url, self);`
	`92`	`+ }`
	`93`	`+}`
	`94`	`+`
`84`	`95`	`- (void)handleOpenURLNotification:(NSNotification *)notification`
`85`	`96`	`{`
`86`	`97`	`[self sendEventWithName:@"url" body:notification.userInfo];`
`@@ -153,6 +164,7 @@ - (void)handleOpenURLNotification:(NSNotification *)notification`
`153`	`164`
`154`	`165`	`RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)`
`155`	`166`	`{`
	`167`	`+#if !TARGET_OS_VISION`
`156`	`168`	`NSURL *initialURL = nil;`
`157`	`169`	`if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {`
`158`	`170`	`initialURL = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey];`
`@@ -163,6 +175,8 @@ - (void)handleOpenURLNotification:(NSNotification *)notification`
`163`	`175`	`initialURL = ((NSUserActivity *)userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"]).webpageURL;`
`164`	`176`	`}`
`165`	`177`	`}`
	`178`	`+#endif`
	`179`	`+ // React Native visionOS uses static property to retrieve initialURL.`
`166`	`180`	`resolve(RCTNullIfNil(initialURL.absoluteString));`
`167`	`181`	`}`
`168`	`182`