Merge pull request #455 from Adyen/expo-router

Improve expo-router compatibility
Adyen · May 31, 2024 · fe5ef7e · fe5ef7e
2 parents e757649 + d8bd3eb
commit fe5ef7e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -101,7 +101,7 @@ In case you are using `RCTLinkingManager` or other deep-linking techniques, plac
 
 ```objc
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
-  return [ADYRedirectComponent applicationDidOpenURL:url] || [RCTLinkingManager application:application openURL:url options:options];
+  return [ADYRedirectComponent applicationDidOpenURL:url] || [super application:application openURL:url options:options] || [RCTLinkingManager application:application openURL:url options:options];
 }
 ```
 
@@ -110,11 +110,12 @@ For Universal Link support, use:
 - (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
   if ([[userActivity activityType] isEqualToString:NSUserActivityTypeBrowsingWeb]) {
    NSURL *url = [userActivity webpageURL];
-    if (![url isEqual:[NSNull null]]) {
-      return [ADYRedirectComponent applicationDidOpenURL:url];
+    if (![url isEqual:[NSNull null]] && [ADYRedirectComponent applicationDidOpenURL:url]) {
+      return YES;
     }
   }
-  return [super application:application continueUserActivity:userActivity restorationHandler:restorationHandler];
+  BOOL result = [RCTLinkingManager application:application continueUserActivity:userActivity restorationHandler:restorationHandler];
+  return [super application:application continueUserActivity:userActivity restorationHandler:restorationHandler] || result;
 }
 ```
 

diff --git a/plugin/src/setApplicationContinueUserActivity.ts b/plugin/src/setApplicationContinueUserActivity.ts
@@ -9,8 +9,8 @@ export function setApplicationContinueUserActivity(contents: string): string {
       '- (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {\n' +
       '  if ([[userActivity activityType] isEqualToString:NSUserActivityTypeBrowsingWeb]) {\n' +
       '   NSURL *url = [userActivity webpageURL];\n' +
-      '    if (![url isEqual:[NSNull null]]) {\n' +
-      '      return [ADYRedirectComponent applicationDidOpenURL:url];\n' +
+      '    if (![url isEqual:[NSNull null]] && [ADYRedirectComponent applicationDidOpenURL:url]) {\n' +
+      '      return YES;\n' +
       '    }\n' +
       '  }\n'
     );
@@ -21,11 +21,12 @@ export function setApplicationContinueUserActivity(contents: string): string {
       '- (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {\n' +
       '  if ([[userActivity activityType] isEqualToString:NSUserActivityTypeBrowsingWeb]) {\n' +
       '    NSURL *url = [userActivity webpageURL];\n' +
-      '    if (![url isEqual:[NSNull null]]) {\n' +
-      '      return [ADYRedirectComponent applicationDidOpenURL:url];\n' +
+      '    if (![url isEqual:[NSNull null]] && [ADYRedirectComponent applicationDidOpenURL:url]) {\n' +
+      '      return YES;\n' +
       '    }\n' +
       '  }\n' +
-      '  return [super application:application continueUserActivity:userActivity restorationHandler:restorationHandler];\n' +
+      '  BOOL result = [RCTLinkingManager application:application continueUserActivity:userActivity restorationHandler:restorationHandler];\n' +
+      '  return [super application:application continueUserActivity:userActivity restorationHandler:restorationHandler] || result;\n' +
       '}\n' +
       '@end'
     );

diff --git a/plugin/src/setApplicationOpenUrl.ts b/plugin/src/setApplicationOpenUrl.ts
@@ -25,7 +25,7 @@ export function setApplicationOpenUrl(contents: string): string {
       '@end',
       `\n` +
         `- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {\n` +
-        `  return [ADYRedirectComponent applicationDidOpenURL:url];\n` +
+        `  return [ADYRedirectComponent applicationDidOpenURL:url] || [super application:application openURL:url options:options] || [RCTLinkingManager application:application openURL:url options:options];\n` +
         `}\n` +
         '@end'
     );
-Original file line number
+Diff line change
@@ Expand Up @@
           '@end',
           `\n` +
             `- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {\n` +
-            `  return [ADYRedirectComponent applicationDidOpenURL:url];\n` +
+            `  return [ADYRedirectComponent applicationDidOpenURL:url] || [super application:application openURL:url options:options] || [RCTLinkingManager application:application openURL:url options:options];\n` +
             `}\n` +
             '@end'
         );
@@ Expand Down @@