expo-router 7.0.0-canary-20251216-6e1f9a7 → 7.0.0-canary-20251223-b83b31e

package/build/utils/font.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertTextStyleToRNTextStyle = convertTextStyleToRNTextStyle;
+const react_native_1 = require("react-native");
+function convertTextStyleToRNTextStyle(style) {
+    const flattenedStyle = react_native_1.StyleSheet.flatten(style);
+    if (!flattenedStyle) {
+        return undefined;
+    }
+    if ('fontWeight' in flattenedStyle) {
+        return {
+            ...flattenedStyle,
+            fontWeight: typeof flattenedStyle.fontWeight === 'number'
+                ? String(flattenedStyle.fontWeight)
+                : flattenedStyle.fontWeight,
+        };
+    }
+    return flattenedStyle;
+}
+//# sourceMappingURL=font.js.map

package/build/utils/font.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"font.js","sourceRoot":"","sources":["../../src/utils/font.ts"],"names":[],"mappings":";;AAMA,sEAqBC;AA3BD,+CAA0E;AAM1E,SAAgB,6BAA6B,CAC3C,KAA2C;IAM3C,MAAM,cAAc,GAAG,yBAAU,CAAC,OAAO,CAAC,KAAK,CAA8B,CAAC;IAC9E,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,YAAY,IAAI,cAAc,EAAE,CAAC;QACnC,OAAO;YACL,GAAG,cAAc;YACjB,UAAU,EACR,OAAO,cAAc,CAAC,UAAU,KAAK,QAAQ;gBAC3C,CAAC,CAAE,MAAM,CAAC,cAAc,CAAC,UAAU,CAA4B;gBAC/D,CAAC,CAAC,cAAc,CAAC,UAAU;SAChC,CAAC;IACJ,CAAC;IACD,OAAO,cAAmD,CAAC;AAC7D,CAAC","sourcesContent":["import { StyleSheet, type StyleProp, type TextStyle } from 'react-native';\n\ntype NumericFontWeight = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;\n\ntype ConvertedFontWeightType = Exclude<TextStyle['fontWeight'], number> | `${NumericFontWeight}`;\n\nexport function convertTextStyleToRNTextStyle<BaseStyleType extends Pick<TextStyle, 'fontWeight'>>(\n  style: StyleProp<BaseStyleType | undefined>\n):\n  | (Omit<BaseStyleType, 'fontWeight'> & {\n      fontWeight?: ConvertedFontWeightType;\n    })\n  | undefined {\n  const flattenedStyle = StyleSheet.flatten(style) as BaseStyleType | undefined;\n  if (!flattenedStyle) {\n    return undefined;\n  }\n  if ('fontWeight' in flattenedStyle) {\n    return {\n      ...flattenedStyle,\n      fontWeight:\n        typeof flattenedStyle.fontWeight === 'number'\n          ? (String(flattenedStyle.fontWeight) as `${NumericFontWeight}`)\n          : flattenedStyle.fontWeight,\n    };\n  }\n  return flattenedStyle as Omit<BaseStyleType, 'fontWeight'>;\n}\n\nexport type BasicTextStyle = Pick<TextStyle, 'fontSize' | 'fontWeight' | 'fontFamily' | 'color'>;\n"]}

package/expo-module.config.json

@@ -9,7 +9,7 @@
     "publication": {
       "groupId": "expo.modules.router",
       "artifactId": "expo.modules.router",
-      "version": "7.0.0-canary-20251216-6e1f9a7",
+      "version": "7.0.0-canary-20251223-b83b31e",
       "repository": "local-maven-repo"
     }
   }

package/ios/LinkPreview/LinkPreviewNativeActionView.swift

@@ -1,8 +1,8 @@
 import ExpoModulesCore
-import WebKit
 
-class LinkPreviewNativeActionView: ExpoView, LinkPreviewMenuUpdatable {
+class LinkPreviewNativeActionView: RouterViewWithLogger, LinkPreviewMenuUpdatable {
   var identifier: String = ""
+  // TODO(@ubax): Add @ReactiveProp similar to RouterToolbar to reduce repetition
   // MARK: - Shared props
   var title: String = "" {
     didSet {
@@ -28,13 +28,16 @@ class LinkPreviewNativeActionView: ExpoView, LinkPreviewMenuUpdatable {
       }
     }
   }
-
-  // MARK: - Action only props
-  var disabled: Bool? {
+  var disabled: Bool = false {
     didSet {
       updateUiAction()
+      if isMenuAction {
+        updateMenu()
+      }
     }
   }
+
+  // MARK: - Action only props
   var isOn: Bool? {
     didSet {
       updateUiAction()
@@ -45,6 +48,16 @@ class LinkPreviewNativeActionView: ExpoView, LinkPreviewMenuUpdatable {
       updateUiAction()
     }
   }
+  var discoverabilityLabel: String? {
+    didSet {
+      updateUiAction()
+    }
+  }
+  var subtitle: String? {
+    didSet {
+      updateUiAction()
+    }
+  }
 
   // MARK: - Menu only props
   var singleSelection: Bool = false {
@@ -68,11 +81,71 @@ class LinkPreviewNativeActionView: ExpoView, LinkPreviewMenuUpdatable {
       }
     }
   }
+
+  // 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()
+      }
+    }
+  }
 
   // MARK: - Events
   let onSelected = EventDispatcher()
@@ -133,6 +206,9 @@ class LinkPreviewNativeActionView: ExpoView, LinkPreviewMenuUpdatable {
     var attributes: UIMenuElement.Attributes = []
     if destructive == true { attributes.insert(.destructive) }
     if disabled == true { attributes.insert(.disabled) }
+    if routerHidden {
+      attributes.insert(.hidden)
+    }
 
     if #available(iOS 16.0, *) {
       if keepPresented == true { attributes.insert(.keepsMenuPresented) }
@@ -143,31 +219,36 @@ class LinkPreviewNativeActionView: ExpoView, LinkPreviewMenuUpdatable {
     baseUiAction.attributes = attributes
     baseUiAction.state = isOn == true ? .on : .off
 
+    if let subtitle = subtitle {
+      baseUiAction.subtitle = subtitle
+    }
+    if let label = discoverabilityLabel {
+      baseUiAction.discoverabilityTitle = label
+    }
+
     parentMenuUpdatable?.updateMenu()
   }
 
-  #if RCT_NEW_ARCH_ENABLED
-    override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
-      if let childActionView = childComponentView as? LinkPreviewNativeActionView {
-        subActions.insert(childActionView, at: index)
-        childActionView.parentMenuUpdatable = self
-      } else {
-        print(
-          "ExpoRouter: Unknown child component view (\(childComponentView)) mounted to NativeLinkPreviewActionView"
-        )
-      }
+  override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+    if let childActionView = childComponentView as? LinkPreviewNativeActionView {
+      subActions.insert(childActionView, at: index)
+      childActionView.parentMenuUpdatable = self
+    } else {
+      logger?.warn(
+        "[expo-router] Unknown child component view (\(childComponentView)) mounted to NativeLinkPreviewActionView. This is most likely a bug in expo-router."
+      )
     }
+  }
 
-    override func unmountChildComponentView(_ child: UIView, index: Int) {
-      if let childActionView = child as? LinkPreviewNativeActionView {
-        subActions.removeAll(where: { $0 == childActionView })
-      } else {
-        print(
-          "ExpoRouter: Unknown child component view (\(child)) unmounted from NativeLinkPreviewActionView"
-        )
-      }
+  override func unmountChildComponentView(_ child: UIView, index: Int) {
+    if let childActionView = child as? LinkPreviewNativeActionView {
+      subActions.removeAll(where: { $0 == childActionView })
+    } else {
+      logger?.warn(
+        "ExpoRouter: Unknown child component view (\(child)) unmounted from NativeLinkPreviewActionView. This is most likely a bug in expo-router."
+      )
     }
-  #endif
+  }
 }
 
 protocol LinkPreviewMenuUpdatable: AnyObject {

package/ios/LinkPreview/LinkPreviewNativeModule.swift

@@ -37,7 +37,7 @@ public class LinkPreviewNativeModule: Module {
         let height = size["height", default: 0]
 
         guard width >= 0, height >= 0 else {
-          print("Preferred content size cannot be negative (\(width), \(height))")
+          view.logger?.warn("[expo-router] Preferred content size cannot be negative (\(width), \(height))")
           return
         }
 
@@ -59,16 +59,28 @@ public class LinkPreviewNativeModule: Module {
         view.icon = icon
       }
       Prop("disabled") { (view: LinkPreviewNativeActionView, disabled: Bool?) in
-        view.disabled = disabled
+        view.disabled = disabled ?? false
       }
       Prop("destructive") { (view: LinkPreviewNativeActionView, destructive: Bool?) in
         view.destructive = destructive
       }
-      Prop("singleSelection") { (view: LinkPreviewNativeActionView, singleSelection: Bool) in
-        view.singleSelection = singleSelection
+      Prop("discoverabilityLabel") { (view: LinkPreviewNativeActionView, label: String?) in
+        view.discoverabilityLabel = label
       }
-      Prop("displayAsPalette") { (view: LinkPreviewNativeActionView, displayAsPalette: Bool) in
-        view.displayAsPalette = displayAsPalette
+      Prop("subtitle") { (view: LinkPreviewNativeActionView, subtitle: String?) in
+        view.subtitle = subtitle
+      }
+      Prop("accessibilityLabel") { (view: LinkPreviewNativeActionView, label: String?) in
+        view.accessibilityLabelForMenu = label
+      }
+      Prop("accessibilityHint") { (view: LinkPreviewNativeActionView, hint: String?) in
+        view.accessibilityHintForMenu = hint
+      }
+      Prop("singleSelection") { (view: LinkPreviewNativeActionView, singleSelection: Bool?) in
+        view.singleSelection = singleSelection ?? false
+      }
+      Prop("displayAsPalette") { (view: LinkPreviewNativeActionView, displayAsPalette: Bool?) in
+        view.displayAsPalette = displayAsPalette ?? false
       }
       Prop("isOn") { (view: LinkPreviewNativeActionView, isOn: Bool?) in
         view.isOn = isOn
@@ -76,8 +88,23 @@ public class LinkPreviewNativeModule: Module {
       Prop("keepPresented") { (view: LinkPreviewNativeActionView, keepPresented: Bool?) in
         view.keepPresented = keepPresented
       }
-      Prop("displayInline") { (view: LinkPreviewNativeActionView, displayInline: Bool) in
-        view.displayInline = displayInline
+      Prop("displayInline") { (view: LinkPreviewNativeActionView, displayInline: Bool?) in
+        view.displayInline = displayInline ?? false
+      }
+      Prop("hidden") { (view: LinkPreviewNativeActionView, hidden: Bool?) in
+        view.routerHidden = hidden ?? false
+      }
+      Prop("sharesBackground") { (view: LinkPreviewNativeActionView, sharesBackground: Bool?) in
+        view.sharesBackground = sharesBackground
+      }
+      Prop("hidesSharedBackground") { (view: LinkPreviewNativeActionView, hidesSharedBackground: Bool?) in
+        view.hidesSharedBackground = hidesSharedBackground
+      }
+      Prop("tintColor") { (view: LinkPreviewNativeActionView, tintColor: UIColor?) in
+        view.customTintColor = tintColor
+      }
+      Prop("barButtonItemStyle") { (view: LinkPreviewNativeActionView, style: BarItemStyle?) in
+        view.barButtonItemStyle = style?.toUIBarButtonItemStyle()
       }
 
       Events("onSelected")

package/ios/LinkPreview/LinkPreviewNativeNavigation.swift

@@ -8,8 +8,8 @@ struct TabChangeCommand {
 }
 
 internal class LinkPreviewNativeNavigation {
-  private var preloadedScreenView: RNSScreenView?
-  private var preloadedStackView: RNSScreenStackView?
+  private weak var preloadedScreenView: RNSScreenView?
+  private weak var preloadedStackView: RNSScreenStackView?
   private var tabChangeCommands: [TabChangeCommand] = []
   private let logger: Logger?
 
@@ -27,7 +27,7 @@ internal class LinkPreviewNativeNavigation {
       // If there were, the preview transition could be to a different tab only
       if self.tabChangeCommands.isEmpty {
         logger?.warn(
-          "expo-router: No preloaded screen view to push. You should only use Link.Preview when navigating inside a stack or native tabs navigator."
+          "[expo-router] No preloaded screen view to push. Link.Preview transition is only supported inside a native stack or native tabs navigators."
         )
       }
       return
@@ -45,22 +45,19 @@ internal class LinkPreviewNativeNavigation {
     let oldTabKeys = tabPath?.path.map { $0.oldTabKey } ?? []
     let stackOrTabView = findStackViewWithScreenIdOrTabBarController(
       screenId: screenId, tabKeys: oldTabKeys, responder: responder)
-    if stackOrTabView != nil {
-      if let tabView = stackOrTabView as? RNSBottomTabsScreenComponentView {
-        let newTabKeys = tabPath?.path.map { $0.newTabKey } ?? []
-        // The order is important here. findStackViewWithScreenIdInSubViews must be called
-        // even if screenId is nil to compute the tabChangeCommands.
-        if let stackView = findStackViewWithScreenIdInSubViews(
-          screenId: screenId, tabKeys: newTabKeys, rootView: tabView), let screenId {
-          setPreloadedView(stackView: stackView, screenId: screenId)
-        }
-      } else if let stackView = stackOrTabView as? RNSScreenStackView, let screenId {
+    guard let stackOrTabView else {
+      return
+    }
+    if let tabView = stackOrTabView as? RNSBottomTabsScreenComponentView {
+      let newTabKeys = tabPath?.path.map { $0.newTabKey } ?? []
+      // The order is important here. findStackViewWithScreenIdInSubViews must be called
+      // even if screenId is nil to compute the tabChangeCommands.
+      if let stackView = findStackViewWithScreenIdInSubViews(
+        screenId: screenId, tabKeys: newTabKeys, rootView: tabView), let screenId {
         setPreloadedView(stackView: stackView, screenId: screenId)
       }
-    } else {
-      logger?.warn(
-        "expo-router: No view found for link preview navigation. You should only use Link.Preview when navigating inside a stack or native tabs navigator."
-      )
+    } else if let stackView = stackOrTabView as? RNSScreenStackView, let screenId {
+      setPreloadedView(stackView: stackView, screenId: screenId)
     }
   }
 
@@ -88,8 +85,6 @@ internal class LinkPreviewNativeNavigation {
         // The first and only child of the inner screen stack should be
         // RNSScreenView (<ScreenStackItem>).
         let screenContentView = innerScreenStack.reactSubviews().first as? RNSScreenView {
-        print("screenView screenId:", screenView.screenId)
-        print("innerScreenStack screenIds:", innerScreenStack.screenIds)
         // 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.
@@ -152,7 +147,8 @@ internal class LinkPreviewNativeNavigation {
   ) -> (tabIndex: Int, tabView: UIView)? {
     let views = tabBarController.viewControllers?.compactMap { $0.view } ?? []
     let enumeratedViews = views.enumerated()
-    if let result = enumeratedViews
+    if let result =
+      enumeratedViews
       .first(where: { _, view in
         guard let tabView = view as? RNSBottomTabsScreenComponentView, let tabKey = tabView.tabKey
         else {

package/ios/LinkPreview/LinkPreviewNativePreviewView.swift

@@ -1,16 +1,9 @@
 import ExpoModulesCore
-import WebKit
 
-class NativeLinkPreviewContentView: ExpoView {
+class NativeLinkPreviewContentView: RouterViewWithLogger {
   var preferredContentSize: CGSize = .zero
 
-  required init(appContext: AppContext? = nil) {
-    super.init(appContext: appContext)
-  }
-
   func setInitialSize(bounds: CGRect) {
-#if RCT_NEW_ARCH_ENABLED
     self.setShadowNodeSize(Float(bounds.width), height: Float(bounds.height))
-#endif
   }
 }

package/ios/LinkPreview/LinkPreviewNativeView.swift

@@ -1,7 +1,7 @@
 import ExpoModulesCore
 import RNScreens
 
-class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
+class NativeLinkPreviewView: RouterViewWithLogger, UIContextMenuInteractionDelegate,
   RNSDismissibleModalProtocol, LinkPreviewMenuUpdatable {
   private var preview: NativeLinkPreviewContentView?
   private var interaction: UIContextMenuInteraction?
@@ -19,7 +19,7 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
   private var actions: [LinkPreviewNativeActionView] = []
 
   private lazy var linkPreviewNativeNavigation: LinkPreviewNativeNavigation = {
-    return LinkPreviewNativeNavigation(logger: appContext?.jsLogger)
+    return LinkPreviewNativeNavigation(logger: logger)
   }()
 
   let onPreviewTapped = EventDispatcher()
@@ -53,64 +53,62 @@ class NativeLinkPreviewView: ExpoView, UIContextMenuInteractionDelegate,
   }
 
   // MARK: - Children
-  #if RCT_NEW_ARCH_ENABLED
-    override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
-      if let previewView = childComponentView as? NativeLinkPreviewContentView {
-        preview = previewView
-      } else if let actionView = childComponentView as? LinkPreviewNativeActionView {
-        actionView.parentMenuUpdatable = self
-        actions.append(actionView)
-      } else {
-        if directChild != nil {
-          print(
-            "[expo-router] Found a second child of <Link.Trigger>. Only one is allowed. This is most likely a bug in expo-router."
+  override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+    if let previewView = childComponentView as? NativeLinkPreviewContentView {
+      preview = previewView
+    } else if let actionView = childComponentView as? LinkPreviewNativeActionView {
+      actionView.parentMenuUpdatable = self
+      actions.append(actionView)
+    } else {
+      if directChild != nil {
+        logger?.warn(
+          "[expo-router] Found a second child of <Link.Trigger>. Only one is allowed. This is most likely a bug in expo-router."
+        )
+        return
+      }
+      directChild = childComponentView
+      if let interaction = self.interaction {
+        if let indirectTrigger = childComponentView as? LinkPreviewIndirectTriggerProtocol {
+          indirectTrigger.indirectTrigger?.addInteraction(interaction)
+        } else {
+          childComponentView.addInteraction(interaction)
+        }
+      }
+      super.mountChildComponentView(childComponentView, index: index)
+    }
+  }
+
+  override func unmountChildComponentView(_ child: UIView, index: Int) {
+    if child is NativeLinkPreviewContentView {
+      preview = nil
+    } else if let actionView = child as? LinkPreviewNativeActionView {
+      actions.removeAll(where: {
+        $0 == actionView
+      })
+    } else {
+      if let directChild = directChild {
+        if directChild != child {
+          logger?.warn(
+            "[expo-router] Unmounting unexpected child from <Link.Trigger>. This is most likely a bug in expo-router."
           )
           return
         }
-        directChild = childComponentView
         if let interaction = self.interaction {
-          if let indirectTrigger = childComponentView as? LinkPreviewIndirectTriggerProtocol {
-            indirectTrigger.indirectTrigger?.addInteraction(interaction)
+          if let indirectTrigger = directChild as? LinkPreviewIndirectTriggerProtocol {
+            indirectTrigger.indirectTrigger?.removeInteraction(interaction)
           } else {
-            childComponentView.addInteraction(interaction)
+            directChild.removeInteraction(interaction)
           }
         }
-        super.mountChildComponentView(childComponentView, index: index)
-      }
-    }
-
-    override func unmountChildComponentView(_ child: UIView, index: Int) {
-      if child is NativeLinkPreviewContentView {
-        preview = nil
-      } else if let actionView = child as? LinkPreviewNativeActionView {
-        actions.removeAll(where: {
-          $0 == actionView
-        })
+        super.unmountChildComponentView(child, index: index)
       } else {
-        if let directChild = directChild {
-          if directChild != child {
-            print(
-              "[expo-router] Unmounting unexpected child from <Link.Trigger>. This is most likely a bug in expo-router."
-            )
-            return
-          }
-          if let interaction = self.interaction {
-            if let indirectTrigger = directChild as? LinkPreviewIndirectTriggerProtocol {
-              indirectTrigger.indirectTrigger?.removeInteraction(interaction)
-            } else {
-              directChild.removeInteraction(interaction)
-            }
-          }
-          super.unmountChildComponentView(child, index: index)
-        } else {
-          print(
-            "[expo-router] No link child found to unmount. This is most likely a bug in expo-router."
-          )
-          return
-        }
+        logger?.warn(
+          "[expo-router] No link child found to unmount. This is most likely a bug in expo-router."
+        )
+        return
       }
     }
-  #endif
+  }
 
   // MARK: - UIContextMenuInteractionDelegate
 

package/ios/LinkPreview/LinkZoomTransition.swift

@@ -244,7 +244,7 @@ class LinkZoomTransitionAlignmentRectDetector: LinkZoomExpoView {
   ) {
     guard child == nil else {
       logger?.warn(
-        "[expo-router] Link.AppleZoomTarget can only have a single native child."
+        "[expo-router] Link.AppleZoomTarget can only have a single native child. If you passed a single child, consider adding collapsible={false} to your component"
       )
       return
     }
@@ -287,7 +287,7 @@ class LinkZoomTransitionEnabler: LinkZoomExpoView {
 
   private func setupZoomTransition() {
     if self.zoomTransitionSourceIdentifier.isEmpty {
-      print("[expo-router] No zoomTransitionSourceIdentifier passed to LinkZoomTransitionEnabler")
+      logger?.warn("[expo-router] No zoomTransitionSourceIdentifier passed to LinkZoomTransitionEnabler. This is most likely a bug in expo-router.")
       return
     }
     if let controller = self.findViewController() {
@@ -329,8 +329,8 @@ class LinkZoomTransitionEnabler: LinkZoomExpoView {
             view = linkPreviewView.directChild
           }
           guard let view else {
-            print(
-              "[expo-router] No source view found for identifier \(self.zoomTransitionSourceIdentifier) to enable zoom transition"
+            self.logger?.warn(
+              "[expo-router] No source view found for identifier \(self.zoomTransitionSourceIdentifier) to enable zoom transition. This is most likely a bug in expo-router."
             )
             return nil
           }
@@ -339,7 +339,7 @@ class LinkZoomTransitionEnabler: LinkZoomExpoView {
         return
       }
     } else {
-      print("[expo-router] No navigation controller found to enable zoom transition")
+      logger?.warn("[expo-router] No navigation controller found to enable zoom transition. This is most likely a bug in expo-router.")
     }
   }
 
@@ -390,7 +390,7 @@ class LinkZoomTransitionEnabler: LinkZoomExpoView {
   }
 }
 
-class LinkZoomExpoView: ExpoView {
+class LinkZoomExpoView: RouterViewWithLogger {
   var module: LinkPreviewNativeModule? {
     return appContext?.moduleRegistry.get(moduleWithName: LinkPreviewNativeModule.moduleName)
       as? LinkPreviewNativeModule
@@ -398,7 +398,7 @@ class LinkZoomExpoView: ExpoView {
 
   var sourceRepository: LinkZoomTransitionsSourceRepository? {
     guard let module else {
-      print("[expo-router] LinkPreviewNativeModule not loaded")
+      logger?.warn("[expo-router] LinkPreviewNativeModule not loaded. Make sure expo-router is properly configured.")
       return nil
     }
     return module.zoomSourceRepository
@@ -406,11 +406,9 @@ class LinkZoomExpoView: ExpoView {
 
   var alignmentViewRepository: LinkZoomTransitionsAlignmentViewRepository? {
     guard let module else {
-      print("[expo-router] LinkPreviewNativeModule not loaded")
+      logger?.warn("[expo-router] LinkPreviewNativeModule not loaded.  Make sure expo-router is properly configured.")
       return nil
     }
     return module.zoomAlignmentViewRepository
   }
-
-  lazy var logger = appContext?.jsLogger
 }

package/ios/RouterViewWithLogger.swift

@@ -0,0 +1,5 @@
+import ExpoModulesCore
+
+class RouterViewWithLogger: ExpoView {
+  lazy var logger = appContext?.jsLogger
+}

package/ios/Toolbar/RouterFontUtils.swift

@@ -0,0 +1,50 @@
+import React
+import UIKit
+
+struct RouterFontUtils {
+  static func convertTitleStyleToFont(_ titleStyle: TitleStyle) -> UIFont {
+    let fontFamily = titleStyle.fontFamily
+    let fontWeight = titleStyle.fontWeight
+
+    let resolvedFontSize = resolveFontSize(titleStyle.fontSize)
+
+    if fontFamily != nil || fontWeight != nil {
+      return RCTFont.update(
+        nil,
+        withFamily: fontFamily,
+        size: NSNumber(value: Float(resolvedFontSize)),
+        weight: fontWeight,
+        style: nil,
+        variant: nil,
+        scaleMultiplier: 1.0)
+    }
+    return UIFont.systemFont(ofSize: resolvedFontSize)
+  }
+
+  static func setTitleStyle(fromConfig titleStyle: TitleStyle, for item: UIBarButtonItem) {
+    var attrs: [NSAttributedString.Key: Any] = [:]
+
+    attrs[.font] = convertTitleStyleToFont(titleStyle)
+
+    if let color = titleStyle.color {
+      attrs[.foregroundColor] = color
+    }
+
+    item.setTitleTextAttributes(attrs, for: .normal)
+    item.setTitleTextAttributes(attrs, for: .highlighted)
+    item.setTitleTextAttributes(attrs, for: .disabled)
+    item.setTitleTextAttributes(attrs, for: .selected)
+    item.setTitleTextAttributes(attrs, for: .focused)
+  }
+
+  private static func resolveFontSize(_ fontSize: Double?) -> CGFloat {
+    if let fontSize = fontSize {
+      return CGFloat(fontSize)
+    }
+    #if os(tvOS)
+      return 17.0
+    #else
+      return UIFont.labelFontSize
+    #endif
+  }
+}