expo-router 5.2.0-canary-20250613-b29d676-2 → 5.2.0-canary-20250630-547cd82

package/ios/LinkPreview/LinkPreviewNativeView.swift

@@ -0,0 +1,193 @@
+import ExpoModulesCore
+
+class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate {
+  private var trigger: NativeLinkPreviewTrigger?
+  private var preview: NativeLinkPreviewContentView?
+  private var interaction: UIContextMenuInteraction?
+  private var nextScreenId: String?
+  private var actions: [LinkPreviewNativeActionView] = []
+
+  private let linkPreviewNativeNavigation = LinkPreviewNativeNavigation()
+
+  let onPreviewTapped = EventDispatcher()
+  let onWillPreviewOpen = EventDispatcher()
+  let onDidPreviewOpen = EventDispatcher()
+  let onPreviewWillClose = EventDispatcher()
+  let onPreviewDidClose = EventDispatcher()
+  let onActionSelected = EventDispatcher()
+
+  required init(appContext: AppContext? = nil) {
+    super.init(appContext: appContext)
+    self.interaction = UIContextMenuInteraction(delegate: self)
+  }
+
+  // MARK: - Props
+
+  func setNextScreenId(_ screenId: String) {
+    self.nextScreenId = screenId
+      linkPreviewNativeNavigation.updatePreloadedView(screenId, with: self)
+  }
+
+  // MARK: - Children
+
+  override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+    if let triggerView = childComponentView as? NativeLinkPreviewTrigger {
+      trigger = triggerView
+      if let interaction = self.interaction, self.preview != nil {
+        trigger?.addInteraction(interaction)
+      }
+      super.mountChildComponentView(childComponentView, index: index)
+    } else if let previewView = childComponentView as? NativeLinkPreviewContentView {
+      preview = previewView
+      if let interaction = self.interaction, let trigger = self.trigger {
+        trigger.addInteraction(interaction)
+      }
+    } else if let actionView = childComponentView as? LinkPreviewNativeActionView {
+      actions.append(actionView)
+    } else {
+      print(
+        "ExpoRouter: Unknown child component view (\(childComponentView)) mounted to NativeLinkPreviewView"
+      )
+    }
+  }
+
+  override func unmountChildComponentView(_ child: UIView, index: Int) {
+    if child is NativeLinkPreviewTrigger {
+      if let interaction = self.interaction {
+        trigger?.removeInteraction(interaction)
+      }
+      trigger = nil
+      super.unmountChildComponentView(child, index: index)
+    } else if child is NativeLinkPreviewContentView {
+      preview = nil
+      if let interaction = self.interaction {
+        trigger?.removeInteraction(interaction)
+      }
+    } else if let actionView = child as? LinkPreviewNativeActionView {
+      actions.removeAll(where: {
+        $0 == actionView
+      })
+    } else {
+      print(
+        "ExpoRouter: Unknown child component view (\(child)) unmounted from NativeLinkPreviewView")
+    }
+  }
+
+  // MARK: - UIContextMenuInteractionDelegate
+
+  func contextMenuInteraction(
+    _ interaction: UIContextMenuInteraction,
+    configurationForMenuAtLocation location: CGPoint
+  ) -> UIContextMenuConfiguration? {
+    onWillPreviewOpen()
+    return UIContextMenuConfiguration(
+      identifier: nil,
+      previewProvider: { [weak self] in
+        self?.createPreviewViewController()
+      },
+      actionProvider: { [weak self] _ in
+        self?.createContextMenu()
+      })
+  }
+
+  func contextMenuInteraction(
+    _ interaction: UIContextMenuInteraction,
+    configuration: UIContextMenuConfiguration,
+    highlightPreviewForItemWithIdentifier identifier: any NSCopying
+  ) -> UITargetedPreview? {
+    if let trigger = self.trigger {
+      let target = UIPreviewTarget(container: self, center: trigger.center)
+
+      let parameters = UIPreviewParameters()
+      parameters.backgroundColor = .clear
+      parameters.shadowPath = UIBezierPath(roundedRect: trigger.bounds, cornerRadius: 10)
+
+      return UITargetedPreview(view: trigger, parameters: parameters, target: target)
+    }
+    return nil
+  }
+
+  func contextMenuInteraction(
+    _ interaction: UIContextMenuInteraction,
+    willDisplayMenuFor configuration: UIContextMenuConfiguration,
+    animator: UIContextMenuInteractionAnimating?
+  ) {
+    // This happens when preview starts to become visible.
+    // It is not yet fully extended at this moment though
+    self.onDidPreviewOpen()
+    animator?.addCompletion {
+      // This happens around a second after the preview is opened and thus gives us no real value
+      // User could have already interacted with preview beforehand
+    }
+  }
+
+  func contextMenuInteraction(
+    _ interaction: UIContextMenuInteraction,
+    willEndFor configuration: UIContextMenuConfiguration,
+    animator: UIContextMenuInteractionAnimating?
+  ) {
+    onPreviewWillClose()
+    animator?.addCompletion {
+      self.onPreviewDidClose()
+    }
+  }
+
+  func contextMenuInteraction(
+    _ interaction: UIContextMenuInteraction,
+    willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration,
+    animator: UIContextMenuInteractionCommitAnimating
+  ) {
+    linkPreviewNativeNavigation.pushPreloadedView()
+    animator.addCompletion { [weak self] in
+      self?.onPreviewTapped()
+    }
+  }
+
+  // MARK: - Context Menu Helpers
+
+  private func createPreviewViewController() -> UIViewController {
+    guard let preview = preview else {
+      return UIViewController()
+    }
+
+    let vc = PreviewViewController(linkPreviewNativePreview: preview)
+    vc.view.addSubview(preview)
+    let preferredSize = preview.preferredContentSize
+    vc.preferredContentSize.width = preferredSize.width
+    vc.preferredContentSize.height = preferredSize.height
+    return vc
+  }
+
+  private func createContextMenu() -> UIMenu {
+    let uiActions = actions.map { action in
+      return UIAction(
+        title: action.title
+      ) { _ in
+        self.onActionSelected([
+          "id": action.id
+        ])
+      }
+    }
+
+    return UIMenu(title: "", children: uiActions)
+  }
+}
+
+class PreviewViewController: UIViewController {
+  private let linkPreviewNativePreview: NativeLinkPreviewContentView
+  init(linkPreviewNativePreview: NativeLinkPreviewContentView) {
+    self.linkPreviewNativePreview = linkPreviewNativePreview
+    super.init(nibName: nil, bundle: nil)
+  }
+
+  @available(*, unavailable)
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  // TODO: Consider using setViewSize from ExpoFabricView
+  override func viewDidAppear(_ animated: Bool) {
+    super.viewDidAppear(animated)
+    linkPreviewNativePreview.setInitialSize(bounds: self.view.bounds)
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "5.2.0-canary-20250613-b29d676-2",
+  "version": "5.2.0-canary-20250630-547cd82",
   "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-20250613-b29d676-1",
-    "expo-constants": "17.1.7-canary-20250613-b29d676-1",
-    "expo-linking": "7.1.6-canary-20250613-b29d676-1",
+    "expo": "54.0.0-canary-20250630-547cd82",
+    "expo-constants": "17.1.7-canary-20250630-547cd82",
+    "expo-linking": "7.1.6-canary-20250630-547cd82",
     "react-native-reanimated": "*",
     "react-native-safe-area-context": "*",
     "react-native-screens": "*"
@@ -105,8 +105,8 @@
     "tsd": "^0.28.1"
   },
   "dependencies": {
-    "@expo/metro-runtime": "5.0.5-canary-20250613-b29d676",
-    "@expo/server": "0.6.3-canary-20250613-b29d676",
+    "@expo/metro-runtime": "6.0.0-canary-20250630-547cd82",
+    "@expo/server": "0.6.4-canary-20250630-547cd82",
     "@radix-ui/react-slot": "1.2.0",
     "@react-navigation/bottom-tabs": "^7.3.10",
     "@react-navigation/native": "^7.1.6",

package/plugin/options.json

@@ -91,7 +91,7 @@
                 "description": "The target file path that this route should redirect to",
                 "type": "string"
               },
-              "temporary": {
+              "permanent": {
                 "description": "Whether the redirect is temporary or permanent. Defaults to `false`.",
                 "type": "boolean",
                 "default": false
@@ -107,6 +107,34 @@
               }
             }
           }
+        },
+        "rewrites": {
+          "description": "Enable static rewrites",
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "type": "object",
+            "required": ["source", "destination"],
+            "properties": {
+              "source": {
+                "description": "The previous file path that should be rewritten",
+                "type": "string"
+              },
+              "destination": {
+                "description": "The target file path that this route should rewrite",
+                "type": "string"
+              },
+              "methods": {
+                "description": "HTTP methods that should be rewritten. Omit to rewrite all methods.",
+                "type": "array",
+                "uniqueItems": true,
+                "items": {
+                  "type": "string",
+                  "enum": ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"]
+                }
+              }
+            }
+          }
         }
       },
       "additionalProperties": false