expo-router 7.0.0-canary-20251127-587bc53 → 7.0.0-canary-20251205-a1dedc6

package/ios/LinkPreview/LinkPreviewNativeView.swift

@@ -1,11 +1,11 @@
 import ExpoModulesCore
+import RNScreens
 
 class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
-  LinkPreviewModalDismissible, LinkPreviewMenuUpdatable
-{
+  RNSDismissibleModalProtocol, LinkPreviewMenuUpdatable {
   private var preview: NativeLinkPreviewContentView?
   private var interaction: UIContextMenuInteraction?
-  private var directChild: UIView?
+  var directChild: UIView?
   var nextScreenId: String? {
     didSet {
       performUpdateOfPreloadedView()
@@ -18,7 +18,9 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
   }
   private var actions: [LinkPreviewNativeActionView] = []
 
-  private let linkPreviewNativeNavigation = LinkPreviewNativeNavigation()
+  private lazy var linkPreviewNativeNavigation: LinkPreviewNativeNavigation = {
+    return LinkPreviewNativeNavigation(logger: appContext?.jsLogger)
+  }()
 
   let onPreviewTapped = EventDispatcher()
   let onPreviewTappedAnimationCompleted = EventDispatcher()
@@ -67,7 +69,11 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
         }
         directChild = childComponentView
         if let interaction = self.interaction {
-          childComponentView.addInteraction(interaction)
+          if let indirectTrigger = childComponentView as? LinkPreviewIndirectTriggerProtocol {
+            indirectTrigger.indirectTrigger?.addInteraction(interaction)
+          } else {
+            childComponentView.addInteraction(interaction)
+          }
         }
         super.mountChildComponentView(childComponentView, index: index)
       }
@@ -89,7 +95,11 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
             return
           }
           if let interaction = self.interaction {
-            directChild.removeInteraction(interaction)
+            if let indirectTrigger = directChild as? LinkPreviewIndirectTriggerProtocol {
+              indirectTrigger.indirectTrigger?.removeInteraction(interaction)
+            } else {
+              directChild.removeInteraction(interaction)
+            }
           }
           super.unmountChildComponentView(child, index: index)
         } else {
@@ -124,16 +134,16 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
     configuration: UIContextMenuConfiguration,
     highlightPreviewForItemWithIdentifier identifier: any NSCopying
   ) -> UITargetedPreview? {
-    if let superview = self.superview {
-      if let directChild = self.directChild {
-        let target = UIPreviewTarget(
-          container: superview, center: self.convert(directChild.center, to: superview))
+    if let superview, let directChild {
+      let triggerView: UIView =
+        (directChild as? LinkPreviewIndirectTriggerProtocol)?.indirectTrigger ?? directChild
+      let target = UIPreviewTarget(
+        container: superview, center: self.convert(triggerView.center, to: superview))
 
-        let parameters = UIPreviewParameters()
-        parameters.backgroundColor = .clear
+      let parameters = UIPreviewParameters()
+      parameters.backgroundColor = .clear
 
-        return UITargetedPreview(view: directChild, parameters: parameters, target: target)
-      }
+      return UITargetedPreview(view: triggerView, parameters: parameters, target: target)
     }
     return nil
   }
@@ -232,3 +242,7 @@ class PreviewViewController: UIViewController {
     linkPreviewNativePreview.setInitialSize(bounds: self.view.bounds)
   }
 }
+
+protocol LinkPreviewIndirectTriggerProtocol {
+  var indirectTrigger: UIView? { get }
+}

package/ios/LinkPreview/LinkZoomTransition.swift

@@ -0,0 +1,227 @@
+import ExpoModulesCore
+import RNScreens
+import UIKit
+
+class LinkSourceInfo {
+  let alignment: CGRect?
+  weak var view: UIView?
+
+  init(alignment: CGRect?, view: UIView) {
+    self.alignment = alignment
+    self.view = view
+  }
+}
+
+class LinkZoomTransitionsSourceRepository {
+  private var sources: [String: LinkSourceInfo] = [:]
+  private let lock = NSLock()
+
+  init() {}
+
+  func registerSource(
+    identifier: String,
+    source: LinkSourceInfo
+  ) {
+    lock.lock()
+    defer { lock.unlock() }
+    if sources[identifier] != nil {
+      print(
+        "[expo-router] LinkPreviewZoomTransitionSource with identifier \(identifier) is already registered. Overwriting the existing source."
+      )
+    }
+    if !identifier.isEmpty {
+      sources[identifier] = source
+    }
+  }
+
+  func unregisterSource(identifier: String) {
+    lock.lock()
+    defer { lock.unlock() }
+    sources.removeValue(forKey: identifier)
+  }
+
+  func getSource(identifier: String) -> LinkSourceInfo? {
+    lock.lock()
+    defer { lock.unlock() }
+    return sources[identifier]
+  }
+
+  func updateIdentifier(
+    oldIdentifier: String,
+    newIdentifier: String
+  ) {
+    lock.lock()
+    defer { lock.unlock() }
+    if let source = sources[oldIdentifier] {
+      if !newIdentifier.isEmpty {
+        sources[newIdentifier] = source
+      }
+      sources.removeValue(forKey: oldIdentifier)
+    }
+  }
+
+  func updateAlignment(
+    identifier: String,
+    alignment: CGRect?
+  ) {
+    lock.lock()
+    defer { lock.unlock() }
+    if let source = sources[identifier], let view = source.view, !identifier.isEmpty {
+      sources[identifier] = LinkSourceInfo(
+        alignment: alignment,
+        view: view
+      )
+    }
+  }
+}
+
+class LinkZoomTransitionSource: LinkZoomExpoView, LinkPreviewIndirectTriggerProtocol {
+  var child: UIView?
+
+  var indirectTrigger: UIView? {
+    return child
+  }
+
+  var alignment: CGRect? {
+    didSet {
+      // Update alignment info in the repository
+      if child != nil {
+        repository?.updateAlignment(
+          identifier: identifier,
+          alignment: alignment
+        )
+      }
+    }
+  }
+
+  var identifier: String = "" {
+    didSet {
+      guard identifier != oldValue else { return }
+      if let child {
+        if oldValue.isEmpty {
+          repository?.registerSource(
+            identifier: identifier,
+            source: LinkSourceInfo(alignment: alignment, view: child)
+          )
+        } else {
+          repository?.updateIdentifier(
+            oldIdentifier: oldValue,
+            newIdentifier: identifier
+          )
+        }
+      } else {
+        repository?.unregisterSource(
+          identifier: oldValue
+        )
+      }
+    }
+  }
+
+  override func mountChildComponentView(
+    _ childComponentView: UIView,
+    index: Int
+  ) {
+    if child != nil {
+      print(
+        "[expo-router] LinkZoomTransitionSource can only have one child view."
+      )
+      return
+    }
+    child = childComponentView
+    repository?.registerSource(
+      identifier: identifier,
+      source: LinkSourceInfo(alignment: alignment, view: childComponentView)
+    )
+    super.mountChildComponentView(childComponentView, index: index)
+  }
+
+  override func unmountChildComponentView(_ child: UIView, index: Int) {
+    if child == self.child {
+      self.child = nil
+      repository?.unregisterSource(
+        identifier: identifier
+      )
+    }
+    super.unmountChildComponentView(child, index: index)
+  }
+}
+
+class LinkZoomTransitionEnabler: LinkZoomExpoView {
+  var zoomTransitionSourceIdentifier: String = ""
+  var isPreventingInteractiveDismissal: Bool = false
+
+  override func didMoveToSuperview() {
+    super.didMoveToSuperview()
+    if superview != nil {
+      // Need to run this async. Otherwise the view has no view controller yet
+      DispatchQueue.main.async {
+        self.setupZoomTransition()
+      }
+    }
+  }
+
+  private func setupZoomTransition() {
+    if self.zoomTransitionSourceIdentifier.isEmpty {
+      print("[expo-router] No zoomTransitionSourceIdentifier passed to LinkZoomTransitionEnabler")
+      return
+    }
+    if let controller = self.findViewController() {
+      if #available(iOS 18.0, *) {
+        let options = UIViewController.Transition.ZoomOptions()
+
+        options.alignmentRectProvider = { _ in
+          let sourceInfo = self.repository?.getSource(
+            identifier: self.zoomTransitionSourceIdentifier)
+          return sourceInfo?.alignment
+        }
+        options.interactiveDismissShouldBegin = { _ in
+          !self.isPreventingInteractiveDismissal
+        }
+        controller.preferredTransition = .zoom(options: options) { _ in
+          let sourceInfo = self.repository?.getSource(
+            identifier: self.zoomTransitionSourceIdentifier)
+          var view: UIView? = sourceInfo?.view
+          if let linkPreviewView = view as? NativeLinkPreviewView {
+            view = linkPreviewView.directChild
+          }
+          guard let view else {
+            print(
+              "[expo-router] No source view found for identifier \(self.zoomTransitionSourceIdentifier) to enable zoom transition"
+            )
+            return nil
+          }
+          return view
+        }
+        return
+      }
+    } else {
+      print("[expo-router] No navigation controller found to enable zoom transition")
+    }
+  }
+
+  private func findViewController() -> RNSScreen? {
+    var responder: UIResponder? = self
+    while let r = responder {
+      if let r = r as? RNSScreen {
+        return r
+      }
+      responder = r.next
+    }
+    return nil
+  }
+}
+
+class LinkZoomExpoView: ExpoView {
+  var module: LinkPreviewNativeModule? {
+    return appContext?.moduleRegistry.get(moduleWithName: LinkPreviewNativeModule.moduleName)
+      as? LinkPreviewNativeModule
+  }
+
+  var repository: LinkZoomTransitionsSourceRepository? {
+    guard let module else {
+      print("[expo-router] LinkPreviewNativeModule not loaded")
+      return nil
+    }
+    return module.zoomSourceRepository
+  }
+}

package/ios/Toolbar/RouterToolbarHostView.swift

@@ -0,0 +1,140 @@
+import ExpoModulesCore
+import RNScreens
+import UIKit
+
+class RouterToolbarHostView: ExpoView, LinkPreviewMenuUpdatable {
+  // Mutable map of toolbar items
+  var toolbarItemsArray: [String] = []
+  var toolbarItemsMap: [String: RouterToolbarItemView] = [:]
+  var menuItemsMap: [String: LinkPreviewNativeActionView] = [:]
+
+  required init(appContext: AppContext? = nil) {
+    super.init(appContext: appContext)
+  }
+
+  private func addRouterToolbarItemAtIndex(
+    _ item: RouterToolbarItemView,
+    index: Int
+  ) {
+    let identifier = item.identifier
+    toolbarItemsArray.insert(identifier, at: index)
+    toolbarItemsMap[identifier] = item
+    item.host = self
+  }
+
+  private func addMenuToolbarItemAtIndex(
+    _ item: LinkPreviewNativeActionView,
+    index: Int
+  ) {
+    let identifier = item.identifier
+    toolbarItemsArray.insert(identifier, at: index)
+    menuItemsMap[identifier] = item
+  }
+
+  private func removeToolbarItemWithId(_ id: String) {
+    if let index = toolbarItemsArray.firstIndex(of: id) {
+      toolbarItemsArray.remove(at: index)
+      toolbarItemsMap.removeValue(forKey: id)
+      menuItemsMap.removeValue(forKey: id)
+    }
+  }
+
+  func updateToolbarItem(withId id: String) {
+    if let controller = self.findViewController() {
+      let index = toolbarItemsArray.firstIndex(of: id)
+      if let index = index, let item = toolbarItemsMap[id] {
+        controller.toolbarItems?[index] = item.barButtonItem
+      }
+    }
+  }
+
+  func updateToolbarItems() {
+    if let controller = self.findViewController() {
+      if #available(iOS 18.0, *) {
+        controller.setToolbarItems(
+          toolbarItemsArray.compactMap {
+            if let item = toolbarItemsMap[$0] {
+              return item.barButtonItem
+            }
+            if let menu = menuItemsMap[$0] {
+              return UIBarButtonItem(
+                title: menu.title,
+                image: menu.icon.flatMap { UIImage(systemName: $0) },
+                primaryAction: nil,
+                menu: menu.uiAction as? UIMenu
+              )
+            }
+            print(
+              "[expo-router] Warning: Could not find toolbar item or menu for identifier \($0)"
+            )
+            return nil
+          }, animated: true)
+        controller.navigationController?.setToolbarHidden(
+          false, animated: true)
+        return
+      }
+    } else {
+      print(
+        "[expo-router] Warning: Could not find owning UIViewController for RouterToolbarHostView")
+    }
+  }
+
+  override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+    if let toolbarItem = childComponentView as? RouterToolbarItemView {
+      if toolbarItem.identifier.isEmpty {
+        print("[expo-router] RouterToolbarItemView identifier is empty")
+        return
+      }
+      addRouterToolbarItemAtIndex(toolbarItem, index: index)
+    } else if let menu = childComponentView as? LinkPreviewNativeActionView {
+      addMenuToolbarItemAtIndex(menu, index: index)
+    } else {
+      print(
+        "ExpoRouter: Unknown child component view (\(childComponentView)) mounted to RouterToolbarHost"
+      )
+    }
+    updateToolbarItems()
+  }
+
+  override func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
+    if let toolbarItem = childComponentView as? RouterToolbarItemView {
+      if toolbarItem.identifier.isEmpty {
+        print("[expo-router] RouterToolbarItemView identifier is empty")
+        return
+      }
+      removeToolbarItemWithId(toolbarItem.identifier)
+    } else if let menu = childComponentView as? LinkPreviewNativeActionView {
+      if menu.identifier.isEmpty {
+        print("[expo-router] Menu identifier is empty")
+        return
+      }
+      removeToolbarItemWithId(menu.identifier)
+    } else {
+      print(
+        "ExpoRouter: Unknown child component view (\(childComponentView)) unmounted from RouterToolbarHost"
+      )
+    }
+    updateToolbarItems()
+  }
+
+  override func didMoveToWindow() {
+    super.didMoveToWindow()
+    // Update toolbar items when the view is added to the window
+    updateToolbarItems()
+  }
+
+  func updateMenu() {
+    updateToolbarItems()
+  }
+
+  private func findViewController() -> RNSScreen? {
+    var responder: UIResponder? = self
+    while let r = responder {
+      if let r = r as? RNSScreen {
+        return r
+      }
+      responder = r.next
+    }
+    return nil
+  }
+}

package/ios/Toolbar/RouterToolbarItemView.swift

@@ -0,0 +1,171 @@
+import ExpoModulesCore
+import React
+import UIKit
+
+class RouterToolbarItemView: ExpoView {
+  var identifier: String = ""
+  @ReactiveProp var type: ItemType?
+  @ReactiveProp var title: String?
+  @ReactiveProp var systemImageName: String?
+  @ReactiveProp var customView: UIView?
+  @ReactiveProp var customTintColor: UIColor?
+  @ReactiveProp var hidesSharedBackground: Bool = false
+  @ReactiveProp var sharesBackground: Bool = true
+  @ReactiveProp var barButtonItemStyle: UIBarButtonItem.Style?
+  @ReactiveProp var width: Double?
+  // Using "routerHidden" to avoid conflict with UIView's "isHidden"
+  @ReactiveProp var routerHidden: Bool = false
+  @ReactiveProp var selected: Bool = false
+  @ReactiveProp var possibleTitles: Set<String>?
+  @ReactiveProp var badgeConfiguration: BadgeConfiguration?
+
+  var host: RouterToolbarHostView?
+
+  let onSelected = EventDispatcher()
+
+  func performUpdate() {
+    self.host?.updateToolbarItem(withId: self.identifier)
+  }
+
+  @objc func handleAction() {
+    onSelected()
+  }
+
+  var barButtonItem: UIBarButtonItem {
+    var item = UIBarButtonItem()
+    if let customView {
+      item = UIBarButtonItem(customView: customView)
+    } else if type == .fluidSpacer {
+      item = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+    } else if type == .fixedSpacer {
+      item = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil)
+    } else {
+      if let title {
+        item.title = title
+      }
+      item.possibleTitles = possibleTitles
+      if let systemImageName {
+        item.image = UIImage(systemName: systemImageName)
+      }
+      if let tintColor = customTintColor {
+        item.tintColor = tintColor
+      }
+    }
+    if #available(iOS 26.0, *) {
+      item.hidesSharedBackground = hidesSharedBackground
+      item.sharesBackground = sharesBackground
+    }
+    if let barButtonItemStyle {
+      item.style = barButtonItemStyle
+    }
+    item.target = self
+    item.action = #selector(handleAction)
+    if let width = width {
+      item.width = CGFloat(width)
+    }
+    if #available(iOS 16.0, *) {
+      item.isHidden = routerHidden
+    }
+    item.isSelected = selected
+    if #available(iOS 26.0, *) {
+      if let badgeConfig = badgeConfiguration {
+        var badge = UIBarButtonItem.Badge.indicator()
+        if let value = badgeConfig.value {
+          badge = .string(value)
+        }
+        if let backgroundColor = badgeConfig.backgroundColor {
+          badge.backgroundColor = backgroundColor
+        }
+        if let foregroundColor = badgeConfig.color {
+          badge.foregroundColor = foregroundColor
+        }
+        if badgeConfig.fontFamily != nil || badgeConfig.fontSize != nil
+          || badgeConfig.fontWeight != nil {
+          let font = RCTFont.update(
+            nil,
+            withFamily: badgeConfig.fontFamily,
+            size: badgeConfig.fontSize != nil ? NSNumber(value: badgeConfig.fontSize!) : nil,
+            weight: badgeConfig.fontWeight,
+            style: nil,
+            variant: nil,
+            scaleMultiplier: 1.0)
+          badge.font = font
+        }
+        // TODO: Find out why this does not work
+        item.badge = badge
+      }
+    }
+
+    return item
+  }
+
+  required init(appContext: AppContext? = nil) {
+    super.init(appContext: appContext)
+  }
+
+  override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+    if customView != nil {
+      print(
+        "[expo-router] Warning: RouterToolbarItemView can only have one child view"
+      )
+      return
+    }
+    customView = childComponentView
+    performUpdate()
+  }
+
+  override func unmountChildComponentView(_ childComponentView: UIView, index: Int) {
+    if customView == childComponentView {
+      childComponentView.removeFromSuperview()
+      customView = nil
+      performUpdate()
+    }
+  }
+}
+
+enum ItemType: String, Enumerable {
+  case normal
+  case fixedSpacer
+  case fluidSpacer
+}
+
+struct BadgeConfiguration: Equatable {
+  var value: String?
+  var backgroundColor: UIColor?
+  var color: UIColor?
+  var fontFamily: String?
+  var fontSize: Double?
+  var fontWeight: String?
+}
+
+@propertyWrapper
+struct ReactiveProp<Value: Equatable> {
+  private var value: Value
+
+  init(wrappedValue: Value) {
+    self.value = wrappedValue
+  }
+
+  static subscript<EnclosingSelf: RouterToolbarItemView>(
+    _enclosingInstance instance: EnclosingSelf,
+    wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
+    storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, ReactiveProp<Value>>
+  ) -> Value {
+    get {
+      instance[keyPath: storageKeyPath].value
+    }
+    set {
+      let oldValue = instance[keyPath: storageKeyPath].value
+      if oldValue != newValue {
+        instance[keyPath: storageKeyPath].value = newValue
+        instance.performUpdate()
+      }
+    }
+  }
+
+  @available(*, unavailable, message: "Use the enclosing instance subscript.")
+  var wrappedValue: Value {
+    get { fatalError() }
+    set { fatalError() }
+  }
+}