expo-router 7.0.0-canary-20251206-615dec1 → 7.0.0-canary-20251210-1f163e3

package/ios/LinkPreview/LinkZoomTransition.swift

@@ -6,7 +6,7 @@ class LinkSourceInfo {
   let alignment: CGRect?
   weak var view: UIView?
 
-  init(alignment: CGRect?, view: UIView) {
+  init(view: UIView, alignment: CGRect?) {
     self.alignment = alignment
     self.view = view
   }
@@ -68,13 +68,56 @@ class LinkZoomTransitionsSourceRepository {
     defer { lock.unlock() }
     if let source = sources[identifier], let view = source.view, !identifier.isEmpty {
       sources[identifier] = LinkSourceInfo(
+        view: view,
         alignment: alignment,
-        view: view
       )
     }
   }
 }
 
+class LinkZoomTransitionsAlignmentViewRepository {
+  private var alignmentViews: [String: WeakUIView] = [:]
+  private let lock = NSLock()
+
+  init() {}
+
+  func addIfNotExists(
+    identifier: String,
+    alignmentView: UIView
+  ) {
+    lock.lock()
+    defer { lock.unlock() }
+    if alignmentViews[identifier] == nil && !identifier.isEmpty {
+      alignmentViews[identifier] = WeakUIView(view: alignmentView)
+    }
+  }
+
+  func removeIfSame(
+    identifier: String,
+    alignmentView: UIView
+  ) {
+    lock.lock()
+    defer { lock.unlock() }
+    if let existing = alignmentViews[identifier], existing.view === alignmentView {
+      alignmentViews.removeValue(forKey: identifier)
+    }
+  }
+
+  func get(identifier: String) -> UIView? {
+    lock.lock()
+    defer { lock.unlock() }
+    return alignmentViews[identifier]?.view
+  }
+
+  private class WeakUIView {
+    weak var view: UIView?
+
+    init(view: UIView) {
+      self.view = view
+    }
+  }
+}
+
 class LinkZoomTransitionSource: LinkZoomExpoView, LinkPreviewIndirectTriggerProtocol {
   var child: UIView?
 
@@ -84,9 +127,9 @@ class LinkZoomTransitionSource: LinkZoomExpoView, LinkPreviewIndirectTriggerProt
 
   var alignment: CGRect? {
     didSet {
-      // Update alignment info in the repository
+      // Update alignment info in the sourceRepository
       if child != nil {
-        repository?.updateAlignment(
+        sourceRepository?.updateAlignment(
           identifier: identifier,
           alignment: alignment
         )
@@ -99,18 +142,18 @@ class LinkZoomTransitionSource: LinkZoomExpoView, LinkPreviewIndirectTriggerProt
       guard identifier != oldValue else { return }
       if let child {
         if oldValue.isEmpty {
-          repository?.registerSource(
+          sourceRepository?.registerSource(
             identifier: identifier,
-            source: LinkSourceInfo(alignment: alignment, view: child)
+            source: LinkSourceInfo(view: child, alignment: alignment)
           )
         } else {
-          repository?.updateIdentifier(
+          sourceRepository?.updateIdentifier(
             oldIdentifier: oldValue,
             newIdentifier: identifier
           )
         }
       } else {
-        repository?.unregisterSource(
+        sourceRepository?.unregisterSource(
           identifier: oldValue
         )
       }
@@ -128,9 +171,9 @@ class LinkZoomTransitionSource: LinkZoomExpoView, LinkPreviewIndirectTriggerProt
       return
     }
     child = childComponentView
-    repository?.registerSource(
+    sourceRepository?.registerSource(
       identifier: identifier,
-      source: LinkSourceInfo(alignment: alignment, view: childComponentView)
+      source: LinkSourceInfo(view: childComponentView, alignment: alignment)
     )
     super.mountChildComponentView(childComponentView, index: index)
   }
@@ -138,7 +181,7 @@ class LinkZoomTransitionSource: LinkZoomExpoView, LinkPreviewIndirectTriggerProt
   override func unmountChildComponentView(_ child: UIView, index: Int) {
     if child == self.child {
       self.child = nil
-      repository?.unregisterSource(
+      sourceRepository?.unregisterSource(
         identifier: identifier
       )
     }
@@ -146,6 +189,58 @@ class LinkZoomTransitionSource: LinkZoomExpoView, LinkPreviewIndirectTriggerProt
   }
 }
 
+class LinkZoomTransitionAlignmentRectDetector: LinkZoomExpoView {
+  private var child: UIView?
+
+  var identifier: String = "" {
+    didSet {
+      if oldValue != identifier && !oldValue.isEmpty {
+        print(
+          "[expo-router] LinkZoomTransitionAlignmentRectDetector does not support changing the identifier after it has been set."
+        )
+        return
+      }
+      if let child = child {
+        alignmentViewRepository?.addIfNotExists(
+          identifier: identifier,
+          alignmentView: child
+        )
+      }
+    }
+  }
+
+  override func mountChildComponentView(
+    _ childComponentView: UIView,
+    index: Int
+  ) {
+    if child != nil {
+      print(
+        "[expo-router] LinkZoomTransitionAlignmentRectDetector can only have one child view."
+      )
+      return
+    }
+    if !identifier.isEmpty {
+      alignmentViewRepository?.addIfNotExists(
+        identifier: identifier,
+        alignmentView: childComponentView
+      )
+    }
+    self.child = childComponentView
+    super.mountChildComponentView(childComponentView, index: index)
+  }
+
+  override func unmountChildComponentView(_ child: UIView, index: Int) {
+    if child == self.child {
+      self.child = nil
+      alignmentViewRepository?.removeIfSame(
+        identifier: identifier,
+        alignmentView: child
+      )
+    }
+    super.unmountChildComponentView(child, index: index)
+  }
+}
+
 class LinkZoomTransitionEnabler: LinkZoomExpoView {
   var zoomTransitionSourceIdentifier: String = ""
   var isPreventingInteractiveDismissal: Bool = false
@@ -169,16 +264,24 @@ class LinkZoomTransitionEnabler: LinkZoomExpoView {
       if #available(iOS 18.0, *) {
         let options = UIViewController.Transition.ZoomOptions()
 
-        options.alignmentRectProvider = { _ in
-          let sourceInfo = self.repository?.getSource(
+        options.alignmentRectProvider = { context in
+          let sourceInfo = self.sourceRepository?.getSource(
             identifier: self.zoomTransitionSourceIdentifier)
+          let alignmentView = self.alignmentViewRepository?.get(
+            identifier: self.zoomTransitionSourceIdentifier)
+          if let alignmentView = alignmentView {
+            return alignmentView.convert(
+              alignmentView.bounds,
+              to: context.zoomedViewController.view
+            )
+          }
           return sourceInfo?.alignment
         }
         options.interactiveDismissShouldBegin = { _ in
           !self.isPreventingInteractiveDismissal
         }
         controller.preferredTransition = .zoom(options: options) { _ in
-          let sourceInfo = self.repository?.getSource(
+          let sourceInfo = self.sourceRepository?.getSource(
             identifier: self.zoomTransitionSourceIdentifier)
           var view: UIView? = sourceInfo?.view
           if let linkPreviewView = view as? NativeLinkPreviewView {
@@ -217,11 +320,19 @@ class LinkZoomExpoView: ExpoView {
       as? LinkPreviewNativeModule
   }
 
-  var repository: LinkZoomTransitionsSourceRepository? {
+  var sourceRepository: LinkZoomTransitionsSourceRepository? {
     guard let module else {
       print("[expo-router] LinkPreviewNativeModule not loaded")
       return nil
     }
     return module.zoomSourceRepository
   }
+
+  var alignmentViewRepository: LinkZoomTransitionsAlignmentViewRepository? {
+    guard let module else {
+      print("[expo-router] LinkPreviewNativeModule not loaded")
+      return nil
+    }
+    return module.zoomAlignmentViewRepository
+  }
 }

package/ios/Toolbar/RouterToolbarHostView.swift

@@ -57,12 +57,15 @@ class RouterToolbarHostView: ExpoView, LinkPreviewMenuUpdatable {
               return item.barButtonItem
             }
             if let menu = menuItemsMap[$0] {
-              return UIBarButtonItem(
+              let item = UIBarButtonItem(
                 title: menu.title,
                 image: menu.icon.flatMap { UIImage(systemName: $0) },
                 primaryAction: nil,
                 menu: menu.uiAction as? UIMenu
               )
+              // Otherwise, the menu items will be reversed in the toolbar
+              item.preferredMenuElementOrder = .fixed
+              return item
             }
             print(
               "[expo-router] Warning: Could not find toolbar item or menu for identifier \($0)"
@@ -87,6 +90,7 @@ class RouterToolbarHostView: ExpoView, LinkPreviewMenuUpdatable {
       }
       addRouterToolbarItemAtIndex(toolbarItem, index: index)
     } else if let menu = childComponentView as? LinkPreviewNativeActionView {
+      menu.parentMenuUpdatable = self
       addMenuToolbarItemAtIndex(menu, index: index)
     } else {
       print(

package/local-maven-repo/expo/modules/router/expo.modules.router/{7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.module → 7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.router",
     "module": "expo.modules.router",
-    "version": "7.0.0-canary-20251206-615dec1",
+    "version": "7.0.0-canary-20251210-1f163e3",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.router-7.0.0-canary-20251206-615dec1.aar",
-          "url": "expo.modules.router-7.0.0-canary-20251206-615dec1.aar",
+          "name": "expo.modules.router-7.0.0-canary-20251210-1f163e3.aar",
+          "url": "expo.modules.router-7.0.0-canary-20251210-1f163e3.aar",
           "size": 13671,
           "sha512": "f51bd2a6d3fcc9075dbf99d66f77162d530586d0793d68e109a55f6edfbe4ff98bc9c9c5d587d0feec99807b6ae94a729232000e89f840278b21f4d423caa520",
           "sha256": "089d182f36875a201ad1b30b44d39812cd5155af987f3d33cd5eef8542103c82",
@@ -60,8 +60,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.router-7.0.0-canary-20251206-615dec1.aar",
-          "url": "expo.modules.router-7.0.0-canary-20251206-615dec1.aar",
+          "name": "expo.modules.router-7.0.0-canary-20251210-1f163e3.aar",
+          "url": "expo.modules.router-7.0.0-canary-20251210-1f163e3.aar",
           "size": 13671,
           "sha512": "f51bd2a6d3fcc9075dbf99d66f77162d530586d0793d68e109a55f6edfbe4ff98bc9c9c5d587d0feec99807b6ae94a729232000e89f840278b21f4d423caa520",
           "sha256": "089d182f36875a201ad1b30b44d39812cd5155af987f3d33cd5eef8542103c82",
@@ -80,8 +80,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.router-7.0.0-canary-20251206-615dec1-sources.jar",
-          "url": "expo.modules.router-7.0.0-canary-20251206-615dec1-sources.jar",
+          "name": "expo.modules.router-7.0.0-canary-20251210-1f163e3-sources.jar",
+          "url": "expo.modules.router-7.0.0-canary-20251210-1f163e3-sources.jar",
           "size": 2318,
           "sha512": "9864add8e93e3c0a9a9c930aaed67016b15054c3fafd59a0bd3a5402d7cdc5827be84c22c2c137f3e5acb4e39270d9bfb9ca3fe11234458d4f2e0d4c78747f48",
           "sha256": "d5dff6259e86de721fc0f07fe740a5e18088e19b76738719b0a6f94caef06224",

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.module.md5

@@ -0,0 +1 @@
+0bb6c53d7bf6c5877348b10e5a12c204

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.module.sha1

@@ -0,0 +1 @@
+9f9752ad577e8d537588e0ac11a9787abc660592

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.module.sha256

@@ -0,0 +1 @@
+5d3f207f18d97552b98aec6f8d3be4f2d8d79a86d1cf4ce5510846802cab9461

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.module.sha512

@@ -0,0 +1 @@
+a515fcf979f475e365d0b85ba6802ee22a632fec127125d56040f794b92f36c361cef86f37cda51e17a62549290a0a77397c88387b9f1f8168423ee05c545ef7

package/local-maven-repo/expo/modules/router/expo.modules.router/{7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.pom → 7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.router</groupId>
   <artifactId>expo.modules.router</artifactId>
-  <version>7.0.0-canary-20251206-615dec1</version>
+  <version>7.0.0-canary-20251210-1f163e3</version>
   <packaging>aar</packaging>
   <name>expo.modules.router</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.pom.md5

@@ -0,0 +1 @@
+628f05edbc3f6a8b7b6b645f96a48dbb

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.pom.sha1

@@ -0,0 +1 @@
+246fa2076ed77c372f6faae75f0aa88d00b27dd2

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.pom.sha256

@@ -0,0 +1 @@
+8ed862348caf26b9fb4e76ef024470fb6f422aaab1147a6604c84e670aff9a1c

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251210-1f163e3/expo.modules.router-7.0.0-canary-20251210-1f163e3.pom.sha512

@@ -0,0 +1 @@
+b51fabbef92547dabc18659dff3503dd1061831464384949c225e52f62843da9dc3dd9dd97cc7887620eb4600390c620ae3167d5d0474cf0ebe4acc5dd3fcd08

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>expo.modules.router</groupId>
   <artifactId>expo.modules.router</artifactId>
   <versioning>
-    <latest>7.0.0-canary-20251206-615dec1</latest>
-    <release>7.0.0-canary-20251206-615dec1</release>
+    <latest>7.0.0-canary-20251210-1f163e3</latest>
+    <release>7.0.0-canary-20251210-1f163e3</release>
     <versions>
-      <version>7.0.0-canary-20251206-615dec1</version>
+      <version>7.0.0-canary-20251210-1f163e3</version>
     </versions>
-    <lastUpdated>20251206225013</lastUpdated>
+    <lastUpdated>20251210173319</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml.md5

@@ -1 +1 @@
-39b41c75576233caeef30c6772340a2f
+666e7021b61603d388de573dd5a82fd4

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml.sha1

@@ -1 +1 @@
-76e4f2999a9e1c5d31680963568124e8e4604255
+2ad1e82770324771c1c2dd9b723146c670c6e286

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml.sha256

@@ -1 +1 @@
-a44ec56f4b67cd562e50472b26ecc39e84818afc96302f369308241ef5ccb864
+a73096d6e8f9fd65a40bcd6e50a37ec4d5bc8c3764d08123034a08e5f04aa3dd

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml.sha512

@@ -1 +1 @@
-db875d09df1ae2a14c2f31e6b3dea38fe924b1bcab9558c3854e248d4cb72e7f46dbbfd2b6f57b84f8500edbbec9e7e3f520f31a59c6fe9354137fdad9ef427f
+3c54461558c3d37336501695075e30064ad2e9313117032816445e5c38d6f7797acff409d5a39155844283842e42e31b4058442b4830a369c65fecf164ca51a2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "7.0.0-canary-20251206-615dec1",
+  "version": "7.0.0-canary-20251210-1f163e3",
   "description": "Expo Router is a file-based router for React Native and web applications.",
   "author": "650 Industries, Inc.",
   "license": "MIT",
@@ -83,14 +83,14 @@
     "expo"
   ],
   "peerDependencies": {
-    "@expo/metro-runtime": "6.2.0-canary-20251206-615dec1",
-    "@expo/log-box": "0.0.13-canary-20251206-615dec1",
+    "@expo/metro-runtime": "6.2.0-canary-20251210-1f163e3",
+    "@expo/log-box": "0.0.13-canary-20251210-1f163e3",
     "@react-navigation/drawer": "^7.7.2",
     "@testing-library/react-native": ">= 12.0.0",
-    "expo": "55.0.0-canary-20251206-615dec1",
-    "expo-constants": "18.1.0-canary-20251206-615dec1",
-    "expo-linking": "8.0.11-canary-20251206-615dec1",
-    "expo-symbols": "1.1.0-canary-20251206-615dec1",
+    "expo": "55.0.0-canary-20251210-1f163e3",
+    "expo-constants": "18.1.0-canary-20251210-1f163e3",
+    "expo-linking": "8.0.11-canary-20251210-1f163e3",
+    "expo-symbols": "1.1.0-canary-20251210-1f163e3",
     "react": "*",
     "react-dom": "*",
     "react-native": "*",
@@ -135,8 +135,8 @@
     "react-server-dom-webpack": "~19.0.1"
   },
   "dependencies": {
-    "@expo/metro-runtime": "6.2.0-canary-20251206-615dec1",
-    "@expo/schema-utils": "0.1.9-canary-20251206-615dec1",
+    "@expo/metro-runtime": "6.2.0-canary-20251210-1f163e3",
+    "@expo/schema-utils": "0.1.9-canary-20251210-1f163e3",
     "@radix-ui/react-slot": "1.2.0",
     "@radix-ui/react-tabs": "^1.1.12",
     "@react-navigation/bottom-tabs": "^7.7.3",
@@ -145,7 +145,7 @@
     "client-only": "^0.0.1",
     "debug": "^4.3.4",
     "escape-string-regexp": "^4.0.0",
-    "expo-server": "1.0.6-canary-20251206-615dec1",
+    "expo-server": "1.0.6-canary-20251210-1f163e3",
     "fast-deep-equal": "^3.1.3",
     "invariant": "^2.2.4",
     "nanoid": "^3.3.8",

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.module.md5

@@ -1 +0,0 @@
-e92ab331c80f691ee10d7962c868430b

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.module.sha1

@@ -1 +0,0 @@
-31d237532347ec7d8eabb030a99dc410c6f5f122

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.module.sha256

@@ -1 +0,0 @@
-abecb584f9f1163d5864beab7eb3a3df729ae04b04937d49c1045996302224f7

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.module.sha512

@@ -1 +0,0 @@
-9880b7b66c5cb7b9bddaae42392b9e47ad1ef16946140d9da816f36a04f63b64e658392e8cf8f26066e4f96b8f94953a7097873c70ec197e3b24eed7c9691ef9

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.pom.md5

@@ -1 +0,0 @@
-7bf900a075154bbee384a9b1800bf7db

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.pom.sha1

@@ -1 +0,0 @@
-e0f1c760dc0b9423eefe69a643251d8cd9e8339f

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.pom.sha256

@@ -1 +0,0 @@
-9fe8150040ac70dcbb2377e8f279713a8db2748da775ff83dc16d63ea3bc2729

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251206-615dec1/expo.modules.router-7.0.0-canary-20251206-615dec1.pom.sha512

@@ -1 +0,0 @@
-44cc302cc47d06d42eb822f082d8e3108817b411414e68653227eeb44e2f8c98d4613104ce319ee6aba1222125bc575dd267fb3bbd0aba94d0bb53626bd389f3