expo-router 5.2.0-canary-20250713-8f814f8 → 5.2.0-canary-20250722-599a28f

package/ios/LinkPreview/LinkPreviewNativeModule.swift

@@ -11,6 +11,7 @@ public class LinkPreviewNativeModule: Module {
 
       Events(
         "onPreviewTapped",
+        "onPreviewTappedAnimationCompleted",
         "onWillPreviewOpen",
         "onDidPreviewOpen",
         "onPreviewWillClose",

package/ios/LinkPreview/LinkPreviewNativeNavigation.h

@@ -1,5 +1,7 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
+#import <RNScreens/RNSScreenStack.h>
+
 @interface LinkPreviewNativeNavigation: NSObject
 
 /*
@@ -16,3 +18,7 @@
 
 @end
 
+@protocol LinkPreviewModalDismissible <RNSDismissibleModalProtocol>
+@required
+@end
+

package/ios/LinkPreview/LinkPreviewNativeNavigation.mm

@@ -2,6 +2,7 @@
 
 #import "LinkPreviewNativeNavigation.h"
 #import <Foundation/Foundation.h>
+#include <Foundation/NSObjCRuntime.h>
 #import <RNScreens/RNSScreen.h>
 #import <RNScreens/RNSScreenStack.h>
 
@@ -16,6 +17,38 @@
     // React native screens will then handle the rest.
     [preloadedScreenView setActivityState:2];
     [stackView markChildUpdated];
+    // If the screen is modal with header then it will have exactly one child -
+    // RNSNavigationController.
+    // https://github.com/software-mansion/react-native-screens/blob/8b82e081e8fdfa6e0864821134bda9e87a745b00/src/components/ScreenStackItem.tsx#L146-L160
+    if (preloadedScreenView.isModal &&
+        preloadedScreenView.controller.childViewControllers.count == 1) {
+      // The first child should be RNSNavigationController (<ScreenStack>).
+      UIViewController *navController =
+          preloadedScreenView.controller.childViewControllers[0];
+      if ([navController isKindOfClass:[RNSNavigationController class]]) {
+        RNSNavigationController *rnsNavController =
+            (RNSNavigationController *)navController;
+        // The delegate of RNSNavigationController is RNSScreenStackView.
+        id<UINavigationControllerDelegate> delegate = rnsNavController.delegate;
+        if ([delegate isKindOfClass:[RNSScreenStackView class]]) {
+          RNSScreenStackView *innerScreenStack = (RNSScreenStackView *)delegate;
+          // The first and only child of the inner screen stack should be
+          // RNSScreenView (<ScreenStackItem>).
+          UIView *firstChild = innerScreenStack.reactSubviews != nil
+                                   ? innerScreenStack.reactSubviews[0]
+                                   : nil;
+          if (firstChild != nil &&
+              [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.
+            // https://github.com/software-mansion/react-native-screens/blob/8b82e081e8fdfa6e0864821134bda9e87a745b00/src/components/ScreenStackItem.tsx#L151
+            [screenContentView setActivityState:2];
+            [innerScreenStack markChildUpdated];
+          }
+        }
+      }
+    }
     NSLog(@"ExpoRouter: Preloaded screen view pushed.");
   } else {
     NSLog(@"ExpoRouter: No preloaded screen view found. Relying on JS "
@@ -38,8 +71,8 @@
   }
 }
 
-- (nonnull NSArray<RNSScreenStackView *> *)findAllScreenStackViewsInResponderChain:
-    (nonnull UIResponder *)responder {
+- (nonnull NSArray<RNSScreenStackView *> *)
+    findAllScreenStackViewsInResponderChain:(nonnull UIResponder *)responder {
   NSMutableArray<RNSScreenStackView *> *stackViews = [NSMutableArray array];
 
   while (responder) {
@@ -93,9 +126,9 @@
   return NO;
 }
 
-- (nullable RNSScreenView *)findPreloadedScreenView:
-                       (nonnull NSArray<RNSScreenView *> *)screenViews
-                              withScreenId:(nonnull NSString *)screenId {
+- (nullable RNSScreenView *)
+    findPreloadedScreenView:(nonnull NSArray<RNSScreenView *> *)screenViews
+               withScreenId:(nonnull NSString *)screenId {
   for (RNSScreenView *screenView in screenViews) {
     if (screenView.activityState == 0 &&
         [screenView.screenId isEqualToString:screenId]) {

package/ios/LinkPreview/LinkPreviewNativeView.swift

@@ -1,6 +1,6 @@
 import ExpoModulesCore
 
-class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate {
+class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate, LinkPreviewModalDismissible {
   private var trigger: NativeLinkPreviewTrigger?
   private var preview: NativeLinkPreviewContentView?
   private var interaction: UIContextMenuInteraction?
@@ -10,6 +10,7 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate {
   private let linkPreviewNativeNavigation = LinkPreviewNativeNavigation()
 
   let onPreviewTapped = EventDispatcher()
+  let onPreviewTappedAnimationCompleted = EventDispatcher()
   let onWillPreviewOpen = EventDispatcher()
   let onDidPreviewOpen = EventDispatcher()
   let onPreviewWillClose = EventDispatcher()
@@ -21,6 +22,12 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate {
     self.interaction = UIContextMenuInteraction(delegate: self)
   }
 
+  // MARK: - LinkPreviewModalDismissable
+
+  func isDismissible() -> Bool {
+    return false
+  }
+
   // MARK: - Props
 
   func setNextScreenId(_ screenId: String) {
@@ -137,9 +144,10 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate {
     willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration,
     animator: UIContextMenuInteractionCommitAnimating
   ) {
-    linkPreviewNativeNavigation.pushPreloadedView()
-    onPreviewTapped()
+    self.onPreviewTapped()
     animator.addCompletion { [weak self] in
+      self?.linkPreviewNativeNavigation.pushPreloadedView()
+      self?.onPreviewTappedAnimationCompleted()
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "5.2.0-canary-20250713-8f814f8",
+  "version": "5.2.0-canary-20250722-599a28f",
   "description": "Expo Router is a file-based router for React Native and web applications.",
   "author": "650 Industries, Inc.",
   "license": "MIT",
@@ -76,9 +76,9 @@
   ],
   "peerDependencies": {
     "@react-navigation/drawer": "^7.3.9",
-    "expo": "54.0.0-canary-20250713-8f814f8",
-    "expo-constants": "17.1.8-canary-20250713-8f814f8",
-    "expo-linking": "7.1.8-canary-20250713-8f814f8",
+    "expo": "54.0.0-canary-20250722-599a28f",
+    "expo-constants": "17.1.8-canary-20250722-599a28f",
+    "expo-linking": "7.1.8-canary-20250722-599a28f",
     "react-native-reanimated": "*",
     "react-native-safe-area-context": "*",
     "react-native-screens": "*"
@@ -105,8 +105,8 @@
     "tsd": "^0.28.1"
   },
   "dependencies": {
-    "@expo/metro-runtime": "6.0.0-canary-20250713-8f814f8",
-    "@expo/server": "0.6.4-canary-20250713-8f814f8",
+    "@expo/metro-runtime": "6.0.0-canary-20250722-599a28f",
+    "@expo/server": "0.6.4-canary-20250722-599a28f",
     "@radix-ui/react-slot": "1.2.0",
     "@react-navigation/bottom-tabs": "^7.3.10",
     "@react-navigation/native": "^7.1.6",