expo-router 5.2.0-canary-20250729-d8899ae → 6.0.0-beta.0

package/ios/LinkPreview/LinkPreviewNativeModule.swift

@@ -6,7 +6,11 @@ public class LinkPreviewNativeModule: Module {
 
     View(NativeLinkPreviewView.self) {
       Prop("nextScreenId") { (view: NativeLinkPreviewView, nextScreenId: String) in
-        view.setNextScreenId(nextScreenId)
+        view.nextScreenId = nextScreenId
+      }
+
+      Prop("tabPath") { (view: NativeLinkPreviewView, tabPath: TabPathPayload) in
+        view.tabPath = tabPath
       }
 
       Events(
@@ -16,7 +20,6 @@ public class LinkPreviewNativeModule: Module {
         "onDidPreviewOpen",
         "onPreviewWillClose",
         "onPreviewDidClose",
-        "onActionSelected"
       )
     }
 
@@ -38,17 +41,52 @@ public class LinkPreviewNativeModule: Module {
     }
 
     View(LinkPreviewNativeActionView.self) {
-      Prop("id") { (view: LinkPreviewNativeActionView, id: String) in
-        view.id = id
-      }
       Prop("title") { (view: LinkPreviewNativeActionView, title: String) in
         view.title = title
       }
       Prop("icon") { (view: LinkPreviewNativeActionView, icon: String) in
         view.icon = icon
       }
+      Prop("disabled") { (view: LinkPreviewNativeActionView, disabled: Bool) in
+        view.disabled = disabled
+      }
+      Prop("destructive") { (view: LinkPreviewNativeActionView, destructive: Bool) in
+        view.destructive = destructive
+      }
+      Prop("singleSelection") { (view: LinkPreviewNativeActionView, singleSelection: Bool) in
+        view.singleSelection = singleSelection
+      }
+      Prop("displayAsPalette") { (view: LinkPreviewNativeActionView, displayAsPalette: Bool) in
+        view.displayAsPalette = displayAsPalette
+      }
+      Prop("isOn") { (view: LinkPreviewNativeActionView, isOn: Bool) in
+        view.isOn = isOn
+      }
+      Prop("keepPresented") { (view: LinkPreviewNativeActionView, keepPresented: Bool) in
+        view.keepPresented = keepPresented
+      }
+      Prop("displayInline") { (view: LinkPreviewNativeActionView, displayInline: Bool) in
+        view.displayInline = displayInline
+      }
+
+      Events("onSelected")
     }
 
-    View(NativeLinkPreviewTrigger.self) {}
+    View(NativeLinkPreviewTrigger.self) {
+      Prop("borderRadius") { (view, borderRadius: Double?) in
+        if let borderRadius = borderRadius {
+          view.triggerBorderRadius = borderRadius
+        }
+      }
+    }
   }
 }
+
+struct TabPathPayload: Record {
+  @Field var path: [TabStatePath]
+}
+
+struct TabStatePath: Record {
+  @Field var oldTabKey: String
+  @Field var newTabKey: String
+}

package/ios/LinkPreview/LinkPreviewNativeNavigation.h

@@ -1,24 +1,50 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
-#import <RNScreens/RNSScreenStack.h>
+#import <RNScreens/RNSDismissibleModalProtocol.h>
+#import <RNScreens/RNSTabBarController.h>
 
-@interface LinkPreviewNativeNavigation: NSObject
+@interface LinkPreviewNativeNavigationObjC : NSObject
 
 /*
-* Updates the preloaded view with the given screenId and UIResponder.
-* This function will go through the responder's view hierarchy to find the screen view with the given screenId and activity state 0.
-*/
-- (void)updatePreloadedView:(NSString *)screenId withUiResponder:(UIResponder *)responder;
+ * Pushes the previously preloaded view.
+ * This function will set the activity state of the preloaded screen view to 2
+ */
++ (void)pushPreloadedView:(nonnull UIView *)view
+            ontoStackView:(nonnull UIView *)rawStackView;
 
 /*
-* Pushes the previously preloaded view.
-* This function will set the activity state of the preloaded screen view to 2
-*/
-- (void)pushPreloadedView;
+ * Helper function to check if the view is a RNSScreenStackView. Can be used in
+ * Swift
+ */
++ (BOOL)isRNSScreenStackView:(UIView *)view;
+/*
+ * Helper function to get all screen IDs from a RNSScreenStackView.
+ */
++ (nonnull NSArray<NSString *> *)getStackViewScreenIds:(UIView *)view;
+/*
+ * Helper function to get all screen views from a RNSScreenStackView.
+ */
++ (nonnull NSArray<UIView *> *)getScreenViews:(UIView *)view;
+/*
+ * Helper function to get the screen ID of a RNSScreenView.
+ */
++ (nonnull NSString *)getScreenId:(UIView *)view;
+
++ (nonnull NSString *)getTabKey:(UIView *)view;
+
++ (BOOL)isRNSBottomTabsScreenComponentView:(UIView *)view;
+
++ (BOOL)isRNSTabBarController:(UIView *)view;
+
++ (nullable RNSTabBarController *)getBottomTabControllerFromView:(UIView *)view;
+
++ (BOOL)isRNSBottomTabsHostComponentView:(UIView *)view;
+
++ (nullable UIView *)getTab:(UITabBarController *)controller
+                    withKey:(NSString *)key;
 
 @end
 
 @protocol LinkPreviewModalDismissible <RNSDismissibleModalProtocol>
 @required
 @end
-

package/ios/LinkPreview/LinkPreviewNativeNavigation.mm

@@ -6,12 +6,116 @@
 #import <RNScreens/RNSScreen.h>
 #import <RNScreens/RNSScreenStack.h>
 
-@implementation LinkPreviewNativeNavigation {
-  RNSScreenView *preloadedScreenView;
-  RNSScreenStackView *stackView;
+@implementation LinkPreviewNativeNavigationObjC {
 }
 
-- (void)pushPreloadedView {
++ (BOOL)isRNSScreenStackView:(UIView *)view {
+  if (view != nil) {
+    return [view isKindOfClass:[RNSScreenStackView class]];
+  }
+
+  return NO;
+}
+
++ (BOOL)isRNSBottomTabsScreenComponentView:(UIView *)view {
+  if (view != nil) {
+    return [view isKindOfClass:[RNSBottomTabsScreenComponentView class]];
+  }
+
+  return NO;
+}
+
++ (BOOL)isRNSBottomTabsHostComponentView:(UIView *)view {
+  if (view != nil) {
+    return [view isKindOfClass:[RNSBottomTabsHostComponentView class]];
+  }
+
+  return NO;
+}
+
++ (nullable UITabBarController *)getBottomTabControllerFromView:(UIView *)view {
+  if ([view isKindOfClass:[RNSBottomTabsScreenComponentView class]]) {
+    RNSBottomTabsScreenComponentView *bottomTabsView =
+        (RNSBottomTabsScreenComponentView *)view;
+    UIViewController *reactVC = [bottomTabsView reactViewController];
+    if (reactVC != nil &&
+        [reactVC.tabBarController isKindOfClass:[RNSTabBarController class]]) {
+      RNSTabBarController *tabBarController =
+          (RNSTabBarController *)reactVC.tabBarController;
+      return tabBarController;
+    }
+  }
+  if ([view isKindOfClass:[RNSBottomTabsHostComponentView class]]) {
+    RNSBottomTabsHostComponentView *bottomTabsView =
+        (RNSBottomTabsHostComponentView *)view;
+    return [bottomTabsView controller];
+  }
+  return nil;
+}
+
++ (nullable UIView *)getTab:(UITabBarController *)controller
+                    withKey:(NSString *)key {
+  if (controller != nil) {
+    for (UIViewController *subcontroller in controller.viewControllers) {
+      if ([subcontroller.view
+              isKindOfClass:[RNSBottomTabsScreenComponentView class]]) {
+        if (((RNSBottomTabsScreenComponentView *)subcontroller.view).tabKey ==
+            key) {
+          return subcontroller.view;
+        }
+      }
+    }
+  }
+
+  return nil;
+}
+
++ (nonnull NSArray<NSString *> *)getStackViewScreenIds:(UIView *)view {
+  if (view != nil && [view isKindOfClass:[RNSScreenStackView class]]) {
+    RNSScreenStackView *stackView = (RNSScreenStackView *)view;
+    return stackView.screenIds;
+  }
+  return @[];
+}
+
++ (nonnull NSArray<UIView *> *)getScreenViews:(UIView *)view {
+  if (view != nil && [view isKindOfClass:[RNSScreenStackView class]]) {
+    RNSScreenStackView *stackView = (RNSScreenStackView *)view;
+    return stackView.reactSubviews;
+  }
+  return @[];
+}
+
++ (nonnull NSString *)getScreenId:(UIView *)view {
+  if (view != nil && [view isKindOfClass:[RNSScreenView class]]) {
+    RNSScreenView *screenView = (RNSScreenView *)view;
+    return screenView.screenId;
+  }
+  return nil;
+}
+
++ (nonnull NSString *)getTabKey:(UIView *)view {
+  if (view != nil &&
+      [view isKindOfClass:[RNSBottomTabsScreenComponentView class]]) {
+    RNSBottomTabsScreenComponentView *tabScreenView =
+        (RNSBottomTabsScreenComponentView *)view;
+    return tabScreenView.tabKey;
+  }
+  return @"";
+}
+
++ (void)pushPreloadedView:(nonnull UIView *)view
+            ontoStackView:(nonnull UIView *)rawStackView {
+  if (![LinkPreviewNativeNavigationObjC isRNSScreenStackView:rawStackView]) {
+    NSLog(@"ExpoRouter: The provided stack view is not a RNSScreenStackView.");
+    return;
+  }
+  if (![view isKindOfClass:[RNSScreenView class]]) {
+    NSLog(@"ExpoRouter: The provided view is not a RNSScreenView.");
+    return;
+  }
+  RNSScreenStackView *stackView = (RNSScreenStackView *)rawStackView;
+  RNSScreenView *preloadedScreenView = (RNSScreenView *)view;
   if (preloadedScreenView != nil && stackView != nil) {
     // Instead of pushing the preloaded screen view, we set its activity state
     // React native screens will then handle the rest.
@@ -41,7 +145,8 @@
               [firstChild isKindOfClass:[RNSScreenView class]]) {
             RNSScreenView *screenContentView = (RNSScreenView *)firstChild;
             // Same as above, we let React Native Screens handle the transition.
-            // We need to set the activity of inner screen as well, because its react value is the same as the preloaded screen - 0.
+            // We need to set the activity of inner screen as well, because its
+            // react value is the same as the preloaded screen - 0.
             // https://github.com/software-mansion/react-native-screens/blob/8b82e081e8fdfa6e0864821134bda9e87a745b00/src/components/ScreenStackItem.tsx#L151
             [screenContentView setActivityState:2];
             [innerScreenStack markChildUpdated];
@@ -56,86 +161,4 @@
   }
 }
 
-- (void)updatePreloadedView:(nullable NSString *)screenId
-            withUiResponder:(nonnull UIResponder *)responder {
-  if (screenId != nil && [screenId length] > 0) {
-    if ([self setPreloadedScreenViewWithScreenId:screenId
-                                 withUiResponder:responder]) {
-      NSLog(@"ExpoRouter: Preloaded screen view updated.");
-    } else {
-      NSLog(@"ExpoRouter: No native screen view found with screenId: %@",
-            screenId);
-    }
-  } else {
-    preloadedScreenView = nil;
-  }
-}
-
-- (nonnull NSArray<RNSScreenStackView *> *)
-    findAllScreenStackViewsInResponderChain:(nonnull UIResponder *)responder {
-  NSMutableArray<RNSScreenStackView *> *stackViews = [NSMutableArray array];
-
-  while (responder) {
-    responder = [responder nextResponder];
-    if ([responder isKindOfClass:[RNSScreenStackView class]]) {
-      [stackViews addObject:(RNSScreenStackView *)responder];
-    }
-  }
-
-  return stackViews;
-}
-
-- (nonnull NSArray<RNSScreenView *> *)extractScreenViewsFromSubviews:
-    (nonnull NSArray<UIView *> *)subviews {
-  NSMutableArray<RNSScreenView *> *screenViews = [NSMutableArray array];
-
-  for (UIView *subview in subviews) {
-    if ([subview isKindOfClass:[RNSScreenView class]]) {
-      [screenViews addObject:(RNSScreenView *)subview];
-    }
-  }
-  return screenViews;
-}
-
-- (BOOL)setPreloadedScreenViewWithScreenId:(nonnull NSString *)screenId
-                           withUiResponder:(nonnull UIResponder *)responder {
-  NSArray<RNSScreenStackView *> *stacks =
-      [self findAllScreenStackViewsInResponderChain:responder];
-
-  for (RNSScreenStackView *stack in stacks) {
-    if ([stack.screenIds containsObject:screenId] &&
-        [self setPreloadedScreenViewWithScreenId:screenId
-                                   withStackView:stack]) {
-      return YES;
-    }
-  }
-  return NO;
-}
-
-- (BOOL)setPreloadedScreenViewWithScreenId:(nonnull NSString *)screenId
-                             withStackView:(nonnull RNSScreenStackView *)stack {
-  NSArray<RNSScreenView *> *screenSubviews =
-      [self extractScreenViewsFromSubviews:stack.reactSubviews];
-  RNSScreenView *screenView = [self findPreloadedScreenView:screenSubviews
-                                               withScreenId:screenId];
-  if (screenView != nil) {
-    preloadedScreenView = screenView;
-    stackView = stack;
-    return YES;
-  }
-  return NO;
-}
-
-- (nullable RNSScreenView *)
-    findPreloadedScreenView:(nonnull NSArray<RNSScreenView *> *)screenViews
-               withScreenId:(nonnull NSString *)screenId {
-  for (RNSScreenView *screenView in screenViews) {
-    if (screenView.activityState == 0 &&
-        [screenView.screenId isEqualToString:screenId]) {
-      return screenView;
-    }
-  }
-  return nil;
-}
-
 @end

package/ios/LinkPreview/LinkPreviewNativeNavigation.swift

@@ -0,0 +1,136 @@
+import UIKit
+
+struct TabChangeCommand {
+  weak var tabBarController: UITabBarController?
+  let tabIndex: Int
+}
+
+internal class LinkPreviewNativeNavigation {
+  private var preloadedView: UIView?
+  private var preloadedStackView: UIView?
+  private var tabChangeCommands: [TabChangeCommand] = []
+
+  init() {}
+
+  func pushPreloadedView() {
+    self.tabChangeCommands.forEach { command in
+      command.tabBarController?.selectedIndex = command.tabIndex
+    }
+    guard let preloadedView,
+      let preloadedStackView
+    else {
+      return
+    }
+    LinkPreviewNativeNavigationObjC.pushPreloadedView(
+      preloadedView, ontoStackView: preloadedStackView)
+  }
+
+  func updatePreloadedView(screenId: String?, tabPath: TabPathPayload?, responder: UIView) {
+    self.tabChangeCommands = []
+    let oldTabKeys = tabPath?.path.map { $0.oldTabKey } ?? []
+    let stackOrTabView = findStackViewWithScreenIdOrTabBarController(
+      screenId: screenId, tabKeys: oldTabKeys, responder: responder)
+    if let stackOrTabView = stackOrTabView {
+      if LinkPreviewNativeNavigationObjC.isRNSBottomTabsScreenComponentView(stackOrTabView) {
+        let tabView = stackOrTabView
+        let newTabKeys = tabPath?.path.map { $0.newTabKey } ?? []
+        let stackView = findStackViewWithScreenIdInSubViews(
+          screenId: screenId, tabKeys: newTabKeys, rootView: tabView)
+        if let stackView = stackView {
+          let screenViews = LinkPreviewNativeNavigationObjC.getScreenViews(stackView)
+          if let screenView = screenViews.first(where: {
+            LinkPreviewNativeNavigationObjC.getScreenId($0) == screenId
+          }) {
+            preloadedView = screenView
+            preloadedStackView = stackView
+            print("LinkPreviewNativeNavigation: Preloaded view for screenId \(screenId).")
+          }
+        }
+      } else if LinkPreviewNativeNavigationObjC.isRNSScreenStackView(stackOrTabView) {
+        let stackView = stackOrTabView
+        let screenViews = LinkPreviewNativeNavigationObjC.getScreenViews(stackView)
+        if let screenView = screenViews.first(where: {
+          LinkPreviewNativeNavigationObjC.getScreenId($0) == screenId
+        }) {
+          preloadedView = screenView
+          preloadedStackView = stackView
+          print("LinkPreviewNativeNavigation: Preloaded view for screenId \(screenId).")
+        }
+      }
+    } else {
+      print("LinkPreviewNativeNavigation: No stack view found for screenId \(screenId).")
+    }
+  }
+
+  private func findStackViewWithScreenIdInSubViews(
+    screenId: String?, tabKeys: [String], rootView: UIView
+  ) -> UIView? {
+    if LinkPreviewNativeNavigationObjC.isRNSScreenStackView(rootView),
+      let _screenId = screenId {
+      let screenIds = LinkPreviewNativeNavigationObjC.getStackViewScreenIds(rootView)
+      if screenIds.contains(_screenId) {
+        return rootView
+      }
+    } else if LinkPreviewNativeNavigationObjC.isRNSBottomTabsScreenComponentView(rootView)
+      || LinkPreviewNativeNavigationObjC.isRNSBottomTabsHostComponentView(rootView) {
+      let tabBarController = LinkPreviewNativeNavigationObjC.getBottomTabController(from: rootView)
+      if let tabBarController = tabBarController {
+        let views = tabBarController.viewControllers?.compactMap { $0.view } ?? []
+        let enumeratedViews = views.enumerated()
+        if let (tabIndex, tabView) =
+          enumeratedViews
+          .first(where: { _, view in
+            LinkPreviewNativeNavigationObjC.isRNSBottomTabsScreenComponentView(view)
+              && tabKeys.contains(LinkPreviewNativeNavigationObjC.getTabKey(view))
+          }) {
+          self.tabChangeCommands.append(
+            TabChangeCommand(tabBarController: tabBarController, tabIndex: tabIndex))
+          let test = tabBarController.viewControllers
+
+          for subview in tabView.subviews {
+            let result = findStackViewWithScreenIdInSubViews(
+              screenId: screenId, tabKeys: tabKeys, rootView: subview)
+            if result != nil {
+              return result
+            }
+          }
+        }
+      }
+    } else {
+      for subview in rootView.subviews {
+        let result = findStackViewWithScreenIdInSubViews(
+          screenId: screenId, tabKeys: tabKeys, rootView: subview)
+        if result != nil {
+          return result
+        }
+      }
+    }
+
+    return nil
+  }
+
+  private func findStackViewWithScreenIdOrTabBarController(
+    screenId: String?, tabKeys: [String], responder: UIView
+  ) -> UIView? {
+    var currentResponder: UIResponder? = responder
+
+    while let nextResponder = currentResponder?.next {
+      if let view = nextResponder as? UIView,
+        LinkPreviewNativeNavigationObjC.isRNSScreenStackView(view),
+        let _screenId = screenId {
+        let screenIds = LinkPreviewNativeNavigationObjC.getStackViewScreenIds(view)
+        if screenIds.contains(_screenId) {
+          return view
+        }
+      } else if let tabView = nextResponder as? UIView,
+        LinkPreviewNativeNavigationObjC.isRNSBottomTabsScreenComponentView(tabView) {
+        let tabKey = LinkPreviewNativeNavigationObjC.getTabKey(tabView)
+        if tabKeys.contains(tabKey) {
+          return tabView
+        }
+      }
+      currentResponder = nextResponder
+    }
+    return nil
+  }
+}

package/ios/LinkPreview/LinkPreviewNativePreviewView.swift

@@ -6,7 +6,6 @@ class NativeLinkPreviewContentView: ExpoView {
 
   required init(appContext: AppContext? = nil) {
     super.init(appContext: appContext)
-    clipsToBounds = true
   }
 
   func setInitialSize(bounds: CGRect) {

package/ios/LinkPreview/LinkPreviewNativeTriggerView.swift

@@ -2,8 +2,8 @@ import ExpoModulesCore
 import WebKit
 
 class NativeLinkPreviewTrigger: ExpoView {
+  var triggerBorderRadius: Double = 0
   required init(appContext: AppContext? = nil) {
     super.init(appContext: appContext)
-    clipsToBounds = true
   }
 }