expo-router 7.0.0-canary-20251223-b83b31e → 7.0.0-canary-20260105-6b962e6

package/ios/LinkPreview/LinkPreviewNativeActionView.swift

@@ -2,150 +2,34 @@ import ExpoModulesCore
 
 class LinkPreviewNativeActionView: RouterViewWithLogger, LinkPreviewMenuUpdatable {
   var identifier: String = ""
-  // TODO(@ubax): Add @ReactiveProp similar to RouterToolbar to reduce repetition
   // MARK: - Shared props
-  var title: String = "" {
-    didSet {
-      updateUiAction()
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var icon: String? {
-    didSet {
-      updateUiAction()
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var destructive: Bool? {
-    didSet {
-      updateUiAction()
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var disabled: Bool = false {
-    didSet {
-      updateUiAction()
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
+  @NativeActionProp(updateAction: true, updateMenu: true) var title: String = ""
+  @NativeActionProp(updateAction: true, updateMenu: true) var icon: String?
+  @NativeActionProp(updateAction: true, updateMenu: true) var destructive: Bool?
+  @NativeActionProp(updateAction: true, updateMenu: true) var disabled: Bool = false
 
   // MARK: - Action only props
-  var isOn: Bool? {
-    didSet {
-      updateUiAction()
-    }
-  }
-  var keepPresented: Bool? {
-    didSet {
-      updateUiAction()
-    }
-  }
-  var discoverabilityLabel: String? {
-    didSet {
-      updateUiAction()
-    }
-  }
-  var subtitle: String? {
-    didSet {
-      updateUiAction()
-    }
-  }
+  @NativeActionProp(updateAction: true) var isOn: Bool?
+  @NativeActionProp(updateAction: true) var keepPresented: Bool?
+  @NativeActionProp(updateAction: true) var discoverabilityLabel: String?
+  @NativeActionProp(updateAction: true, updateMenu: true) var subtitle: String?
 
   // MARK: - Menu only props
-  var singleSelection: Bool = false {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var displayAsPalette: Bool = false {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var displayInline: Bool = false {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
+  @NativeActionProp(updateMenu: true) var singleSelection: Bool = false
+  @NativeActionProp(updateMenu: true) var displayAsPalette: Bool = false
+  @NativeActionProp(updateMenu: true) var displayInline: Bool = false
+  @NativeActionProp(updateMenu: true) var preferredElementSize: MenuElementSize?
 
   // MARK: - UIBarButtonItem props
-  var routerHidden: Bool = false {
-    didSet {
-      updateUiAction()
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var titleStyle: TitleStyle? {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var sharesBackground: Bool? {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var hidesSharedBackground: Bool? {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var customTintColor: UIColor? {
-    didSet {
-      updateUiAction()
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var barButtonItemStyle: UIBarButtonItem.Style? {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var subActions: [LinkPreviewNativeActionView] = [] {
-    didSet {
-      updateMenu()
-    }
-  }
-  var accessibilityLabelForMenu: String? {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
-  var accessibilityHintForMenu: String? {
-    didSet {
-      if isMenuAction {
-        updateMenu()
-      }
-    }
-  }
+  @NativeActionProp(updateAction: true, updateMenu: true) var routerHidden: Bool = false
+  @NativeActionProp(updateMenu: true) var titleStyle: TitleStyle?
+  @NativeActionProp(updateMenu: true) var sharesBackground: Bool?
+  @NativeActionProp(updateMenu: true) var hidesSharedBackground: Bool?
+  @NativeActionProp(updateAction: true, updateMenu: true) var customTintColor: UIColor?
+  @NativeActionProp(updateMenu: true) var barButtonItemStyle: UIBarButtonItem.Style?
+  @NativeActionProp(updateMenu: true) var subActions: [LinkPreviewNativeActionView] = []
+  @NativeActionProp(updateMenu: true) var accessibilityLabelForMenu: String?
+  @NativeActionProp(updateMenu: true) var accessibilityHintForMenu: String?
 
   // MARK: - Events
   let onSelected = EventDispatcher()
@@ -199,10 +83,20 @@ class LinkPreviewNativeActionView: RouterViewWithLogger, LinkPreviewMenuUpdatabl
       children: subActions
     )
 
+    if let subtitle = subtitle {
+      menuAction.subtitle = subtitle
+    }
+
+    if #available(iOS 16.0, *) {
+      if let preferredElementSize = preferredElementSize {
+        menuAction.preferredElementSize = preferredElementSize.toUIMenuElementSize()
+      }
+    }
+
     parentMenuUpdatable?.updateMenu()
   }
 
-  private func updateUiAction() {
+  func updateUiAction() {
     var attributes: UIMenuElement.Attributes = []
     if destructive == true { attributes.insert(.destructive) }
     if disabled == true { attributes.insert(.disabled) }
@@ -249,6 +143,55 @@ class LinkPreviewNativeActionView: RouterViewWithLogger, LinkPreviewMenuUpdatabl
       )
     }
   }
+
+  @propertyWrapper
+  struct NativeActionProp<Value: Equatable> {
+    var value: Value
+    let updateAction: Bool
+    let updateMenu: Bool
+
+    init(wrappedValue: Value, updateAction: Bool = false, updateMenu: Bool = false) {
+      self.value = wrappedValue
+      self.updateAction = updateAction
+      self.updateMenu = updateMenu
+    }
+
+    static subscript<EnclosingSelf: LinkPreviewNativeActionView>(
+      _enclosingInstance instance: EnclosingSelf,
+      wrapped wrappedKeyPath: ReferenceWritableKeyPath<EnclosingSelf, Value>,
+      storage storageKeyPath: ReferenceWritableKeyPath<EnclosingSelf, NativeActionProp<Value>>
+    ) -> Value {
+      get {
+        instance[keyPath: storageKeyPath].value
+      }
+      set {
+        let oldValue = instance[keyPath: storageKeyPath].value
+        if oldValue != newValue {
+          instance[keyPath: storageKeyPath].value = newValue
+          if instance[keyPath: storageKeyPath].updateAction {
+            instance.updateUiAction()
+          }
+          if instance[keyPath: storageKeyPath].updateMenu {
+            instance.updateMenu()
+          }
+        }
+      }
+    }
+
+    var wrappedValue: Value {
+      get { value }
+      set { value = newValue }
+    }
+  }
+}
+
+// Needed to allow optional properties without default `= nil` to avoid repetition
+extension LinkPreviewNativeActionView.NativeActionProp where Value: ExpressibleByNilLiteral {
+  init(updateAction: Bool = false, updateMenu: Bool = false) {
+    self.value = nil
+    self.updateAction = updateAction
+    self.updateMenu = updateMenu
+  }
 }
 
 protocol LinkPreviewMenuUpdatable: AnyObject {

package/ios/LinkPreview/LinkPreviewNativeModule.swift

@@ -106,7 +106,9 @@ public class LinkPreviewNativeModule: Module {
       Prop("barButtonItemStyle") { (view: LinkPreviewNativeActionView, style: BarItemStyle?) in
         view.barButtonItemStyle = style?.toUIBarButtonItemStyle()
       }
-
+      Prop("preferredElementSize") { (view: LinkPreviewNativeActionView, preferredElementSize: MenuElementSize?) in
+        view.preferredElementSize = preferredElementSize
+      }
       Events("onSelected")
     }
 
@@ -175,3 +177,28 @@ struct LinkSourceAlignmentRect: Record {
   @Field var width: Double
   @Field var height: Double
 }
+
+enum MenuElementSize: String, Enumerable {
+  case small
+  case medium
+  case large
+  case auto
+
+  @available(iOS 16.0, *)
+  func toUIMenuElementSize() -> UIMenu.ElementSize {
+    switch self {
+    case .small:
+      return .small
+    case .medium:
+      return .medium
+    case .large:
+      return .large
+    case .auto:
+      if #available(iOS 17.0, *) {
+        return .automatic
+      } else {
+        return .medium
+      }
+    }
+  }
+}

package/local-maven-repo/expo/modules/router/expo.modules.router/{7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.module → 7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.router",
     "module": "expo.modules.router",
-    "version": "7.0.0-canary-20251223-b83b31e",
+    "version": "7.0.0-canary-20260105-6b962e6",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.router-7.0.0-canary-20251223-b83b31e.aar",
-          "url": "expo.modules.router-7.0.0-canary-20251223-b83b31e.aar",
+          "name": "expo.modules.router-7.0.0-canary-20260105-6b962e6.aar",
+          "url": "expo.modules.router-7.0.0-canary-20260105-6b962e6.aar",
           "size": 13665,
           "sha512": "0c996832cda246cbf02acf875f7c3add8610a0e5e7c466bbe5fa2f073a6a644933eec90d1bff2a7fac7fd3c0c5bdae8a695373cebdec4f9853ce116658960554",
           "sha256": "054876f9b960d2ed5b7762c66b32c7e994f942c05013456f5e41e1fe6c71ee54",
@@ -60,8 +60,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.router-7.0.0-canary-20251223-b83b31e.aar",
-          "url": "expo.modules.router-7.0.0-canary-20251223-b83b31e.aar",
+          "name": "expo.modules.router-7.0.0-canary-20260105-6b962e6.aar",
+          "url": "expo.modules.router-7.0.0-canary-20260105-6b962e6.aar",
           "size": 13665,
           "sha512": "0c996832cda246cbf02acf875f7c3add8610a0e5e7c466bbe5fa2f073a6a644933eec90d1bff2a7fac7fd3c0c5bdae8a695373cebdec4f9853ce116658960554",
           "sha256": "054876f9b960d2ed5b7762c66b32c7e994f942c05013456f5e41e1fe6c71ee54",
@@ -80,8 +80,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.router-7.0.0-canary-20251223-b83b31e-sources.jar",
-          "url": "expo.modules.router-7.0.0-canary-20251223-b83b31e-sources.jar",
+          "name": "expo.modules.router-7.0.0-canary-20260105-6b962e6-sources.jar",
+          "url": "expo.modules.router-7.0.0-canary-20260105-6b962e6-sources.jar",
           "size": 2318,
           "sha512": "9864add8e93e3c0a9a9c930aaed67016b15054c3fafd59a0bd3a5402d7cdc5827be84c22c2c137f3e5acb4e39270d9bfb9ca3fe11234458d4f2e0d4c78747f48",
           "sha256": "d5dff6259e86de721fc0f07fe740a5e18088e19b76738719b0a6f94caef06224",

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.module.md5

@@ -0,0 +1 @@
+90abec401d62a4819a7dc940d1f9df4e

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.module.sha1

@@ -0,0 +1 @@
+2ce2049be651bc461a3460cf4f3099357b4fc2b7

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.module.sha256

@@ -0,0 +1 @@
+59fd00e72c4b1472fd699bb7b0e007cbe31febb1cf415c8e55ef6f2870a7c3a6

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.module.sha512

@@ -0,0 +1 @@
+bcfb2a5502996bb33373e7ae422e47d2f80220da0f7bc5166d0b45e9265569ec14d0e0d54fd4aefb52851036864bd85ced4c7f467a0f33fe5d62843cec7bd681

package/local-maven-repo/expo/modules/router/expo.modules.router/{7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.pom → 7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.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-20251223-b83b31e</version>
+  <version>7.0.0-canary-20260105-6b962e6</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-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.pom.md5

@@ -0,0 +1 @@
+78fdca262e645cfb1da978f7de568b42

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.pom.sha1

@@ -0,0 +1 @@
+a0bc7b4fb1ac9948c7c80566fea158a9f99c577a

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.pom.sha256

@@ -0,0 +1 @@
+5597fc545d4d1a5363b7be7c7b5e48ce55c54c8d632ee768c613bcb4ccdc465a

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20260105-6b962e6/expo.modules.router-7.0.0-canary-20260105-6b962e6.pom.sha512

@@ -0,0 +1 @@
+95b58814ac6ee513134a4c54e96dcc8fc2f8ea566f863b6b0add06fb1141102a5f478767cba6a10b24e3a6a64873e109cbb82ea8f2f9b3dd58726ce8092ef0c8

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-20251223-b83b31e</latest>
-    <release>7.0.0-canary-20251223-b83b31e</release>
+    <latest>7.0.0-canary-20260105-6b962e6</latest>
+    <release>7.0.0-canary-20260105-6b962e6</release>
     <versions>
-      <version>7.0.0-canary-20251223-b83b31e</version>
+      <version>7.0.0-canary-20260105-6b962e6</version>
     </versions>
-    <lastUpdated>20251223153337</lastUpdated>
+    <lastUpdated>20260105102046</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-9c8ae8fb77072b90906f286d15f6e53f
+e829e60362210f4398ff5e2a24b272e5

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

@@ -1 +1 @@
-7a3eefae0cda2474676727908158cf3ba05d25bd
+6798dc4e485b5fac54acaeb62447b135bfdd7167

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

@@ -1 +1 @@
-6fb5bb2f365acc0c8f814d933f3225471ede23ccd394d1688bd28f5b48a75e00
+c5e374f93c69a59a05cf52d8cb10f6d10ae9d9f1d33216b4a4362ab3db436478

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

@@ -1 +1 @@
-cd68ca26ba6472608fe2574607710dd2c39b53cb321b346c65428fd6947e1dfb164917ea612cd0e400ecfb66b68a895591d4977f2586ab94049df87b5b0b5dc2
+d74864c99af9ea1c792690f5eacf35a903c13a7681541885c11faeead20be944f38564b2f5d86b6d530ace66b561ba3e131283e38c9a461ba471f77ecb19278d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "7.0.0-canary-20251223-b83b31e",
+  "version": "7.0.0-canary-20260105-6b962e6",
   "description": "Expo Router is a file-based router for React Native and web applications.",
   "author": "650 Industries, Inc.",
   "license": "MIT",
@@ -83,13 +83,13 @@
     "expo"
   ],
   "peerDependencies": {
-    "@expo/metro-runtime": "6.2.0-canary-20251223-b83b31e",
-    "@expo/log-box": "0.0.13-canary-20251223-b83b31e",
+    "@expo/metro-runtime": "6.2.0-canary-20260105-6b962e6",
+    "@expo/log-box": "0.0.13-canary-20260105-6b962e6",
     "@react-navigation/drawer": "^7.7.2",
     "@testing-library/react-native": ">= 12.0.0",
-    "expo": "55.0.0-canary-20251223-b83b31e",
-    "expo-constants": "18.1.0-canary-20251223-b83b31e",
-    "expo-linking": "8.0.12-canary-20251223-b83b31e",
+    "expo": "55.0.0-canary-20260105-6b962e6",
+    "expo-constants": "18.1.0-canary-20260105-6b962e6",
+    "expo-linking": "8.0.12-canary-20260105-6b962e6",
     "react": "*",
     "react-dom": "*",
     "react-native": "*",
@@ -134,8 +134,8 @@
     "react-server-dom-webpack": "~19.0.3"
   },
   "dependencies": {
-    "@expo/metro-runtime": "6.2.0-canary-20251223-b83b31e",
-    "@expo/schema-utils": "0.1.9-canary-20251223-b83b31e",
+    "@expo/metro-runtime": "6.2.0-canary-20260105-6b962e6",
+    "@expo/schema-utils": "0.1.9-canary-20260105-6b962e6",
     "@radix-ui/react-slot": "1.2.0",
     "@radix-ui/react-tabs": "^1.1.12",
     "@react-navigation/bottom-tabs": "^7.7.3",
@@ -144,8 +144,8 @@
     "client-only": "^0.0.1",
     "debug": "^4.3.4",
     "escape-string-regexp": "^4.0.0",
-    "expo-server": "1.0.6-canary-20251223-b83b31e",
-    "expo-symbols": "1.1.0-canary-20251223-b83b31e",
+    "expo-server": "1.0.6-canary-20260105-6b962e6",
+    "expo-symbols": "1.1.0-canary-20260105-6b962e6",
     "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-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.module.md5

@@ -1 +0,0 @@
-ab80616c366d0071d9d96071df1d8b54

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.module.sha1

@@ -1 +0,0 @@
-f8a3e12f108de77455f6194d1235057fe3bfd242

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.module.sha256

@@ -1 +0,0 @@
-3b9f7564b9434b424d7a623c3f10175fe5657680c52dbd8e108eac5fd9adcd3e

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.module.sha512

@@ -1 +0,0 @@
-09cb0020c7eeaef845fe7c52a8fefac3225d8afd12d7cc162cef4efd92aebb0c18be600c748cd953d6447b63ef63ab0aed844ac486cc2f8e391298d55b8ab4be

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.pom.md5

@@ -1 +0,0 @@
-1b60d677576b778126ad102d0ab2ef14

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.pom.sha1

@@ -1 +0,0 @@
-74e088b3cd0062c93ecad90743bdd97fb6e1ce9e

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.pom.sha256

@@ -1 +0,0 @@
-c13e7578b30b90ef59c0fd130ab800262e2fda67235b97e3c568a12983bcf794

package/local-maven-repo/expo/modules/router/expo.modules.router/7.0.0-canary-20251223-b83b31e/expo.modules.router-7.0.0-canary-20251223-b83b31e.pom.sha512

@@ -1 +0,0 @@
-c321f92895b53d8d5e3e142f8dd69499e4b42b6c281c61eade79775de6a3357e75e96f2936a595a41bbe484e22d921cfc51afab1313b7a29144d10efa5179ba8