@jacques_gordon/expo-mapbox-navigation 2.2.3 → 2.2.5

package/ExpoMapboxNavigation.podspec

@@ -10,46 +10,40 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-
-  # ── 16 KB / SPM minimum: Mapbox Navigation SDK v3 for iOS requires iOS 14+,
-  # but Swift Package Manager dependencies resolved through CocoaPods'
-  # spm_dependency() mechanism require iOS 15.1+ as the minimum deployment
-  # target (Apple's SPM-via-CocoaPods bridging constraint).
-  s.platforms      = { :ios => '15.1' }
+  s.platforms      = { :ios => '14.0' }
   s.swift_version  = '5.9'
   s.source         = { git: package['repository']['url'], tag: "v#{s.version}" }
-  s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
 
-  # ── iOS: Mapbox Navigation SDK v3 via Swift Package Manager ─────────────────
+  # ── iOS: Mapbox Navigation SDK v3 ───────────────────────────────────────────
   #
-  # IMPORTANT: earlier versions of this podspec referenced prebuilt
-  # .xcframework files (MapboxNavigationUIKit.xcframework,
-  # MapboxNavigationCore.xcframework, MapboxDirections.xcframework) that were
-  # NEVER actually built or shipped in the npm package — this caused
-  # "Unimplemented component: ViewManagerAdapter_ExpoMapboxNavigation" at
-  # runtime on iOS, since no native module was ever registered.
+  # IMPORTANT — do NOT use spm_dependency() here.
   #
-  # The Mapbox Navigation SDK v3 for iOS is officially distributed ONLY via
-  # Swift Package Manager (CocoaPods support is not provided by Mapbox).
-  # We use CocoaPods' built-in spm_dependency() helper (available since
-  # CocoaPods 1.13+, and exactly the mechanism Expo's own modules use for
-  # this exact situation) to pull the SPM package transparently as part of
-  # `pod install` / `expo prebuild`. No manual Xcode steps, no vendored
-  # binaries to build or maintain.
-  spm_dependency(
-    s,
-    url: 'https://github.com/mapbox/mapbox-navigation-ios.git',
-    requirement: { kind: 'upToNextMajorVersion', minimumVersion: '3.24.2' },
-    products: ['MapboxNavigationCore', 'MapboxNavigationUIKit', 'MapboxDirections']
-  )
-
-  s.source_files = 'ios/**/*.{swift,h,m,mm}'
-
+  # spm_dependency() causes "43029 duplicate symbols" linker errors when used
+  # alongside @rnmapbox/maps in an Expo project (confirmed: React Native
+  # GitHub issue #47344, Expo GitHub issue #37813). The root cause is that
+  # spm_dependency() links the SPM framework into both the Pod target AND
+  # the main app target simultaneously, so the linker sees every symbol twice.
+  #
+  # The correct approach for Expo modules that need SPM-only packages:
+  # add the SPM dependency directly to the Xcode project's main target via
+  # the config plugin (withXcodeProject + withDangerousMod), which is exactly
+  # what our plugin/src/index.js does via the addMapboxNavigationSPM function.
+  # That way there is only ONE copy of each framework in the final binary.
+  #
+  # MapboxNavigationCore and MapboxNavigationUIKit are therefore listed as
+  # weak framework references here so the module compiles against them, while
+  # the actual linking happens at the app level from the SPM dependency added
+  # by the config plugin.
   s.pod_target_xcconfig = {
-    'DEFINES_MODULE' => 'YES',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule',
-    'IPHONEOS_DEPLOYMENT_TARGET' => '15.1'
+    'DEFINES_MODULE'                          => 'YES',
+    'SWIFT_COMPILATION_MODE'                  => 'wholemodule',
+    'OTHER_SWIFT_FLAGS'                       => '$(inherited) -Xfrontend -disable-reflection-metadata',
+    'FRAMEWORK_SEARCH_PATHS'                  => '$(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks',
+    'OTHER_LDFLAGS'                           => '$(inherited)',
+    'IPHONEOS_DEPLOYMENT_TARGET'              => '14.0',
   }
+
+  s.source_files = 'ios/**/*.{swift,h,m,mm}'
 end

package/README.md

@@ -99,6 +99,42 @@ export default function Navigation() {
 }
 ```
 
+### Color customization (Android)
+
+All color props are optional — if not provided, the defaults below are applied automatically.
+
+```tsx
+<MapboxNavigationView
+  // Maneuver banner (turn-by-turn instruction banner)
+  maneuverBackgroundColorDay="#1E2433"   // default: Mapbox native style color
+  maneuverTurnIconColor="#1A73E8"        // default: Mapbox native style color
+
+  // Bottom ETA / duration / distance bar
+  etaBarBackgroundColor="#1E2433"        // default: #1E2433 (dark navy)
+  etaTextColor="#FFFFFF"                 // default: #FFFFFF (white)
+
+  // Control buttons (mute, overview, recenter)
+  iconButtonColor="#1A73E8"              // default: #1A73E8 (Google Blue)
+  iconButtonMutedColor="#EA4335"         // default: #EA4335 (Google Red)
+
+  // Route line color — set via plugin config, not a view prop
+  // (uses androidColorOverrides in app.json)
+  {...otherProps}
+/>
+```
+
+```json
+// app.json — route line and other Mapbox native resource colors
+["@jacques_gordon/expo-mapbox-navigation", {
+  "accessToken": "pk.xxx",
+  "downloadsToken": "sk.xxx",
+  "androidColorOverrides": {
+    "mapbox_primary_route_color": "#0055FF",
+    "mapbox_main_maneuver_background_color": "#FF5500"
+  }
+}]
+```
+
 ---
 
 ## Props

package/android/src/main/java/expo/modules/mapboxnavigation/ExpoMapboxNavigationView.kt

@@ -882,6 +882,11 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
             .voiceUnits(resolveVoiceUnits())
             .coordinatesList(points)
             .annotations("maxspeed,congestion,duration,speed")
+            // overview("full") is required by Mapbox support (GitHub issue #4069)
+            // to maximize the coverage of maxspeed annotations in the response.
+            // Without it, many road segments return no maxspeed data even when
+            // the speed limit is known — confirmed via Mapbox Support correspondence.
+            .overview("full")
             // ── FIX: Lane guidance was not displaying ───────────────────────────
             // Root cause: BannerInstructions.sub() (which carries lane data) is
             // only returned by the Directions API when explicitly requested.

package/app.plugin.js

@@ -1,4 +1,4 @@
-const { withAppBuildGradle, withProjectBuildGradle, withAndroidManifest, withInfoPlist, withDangerousMod } = require('@expo/config-plugins');
+const { withAppBuildGradle, withProjectBuildGradle, withAndroidManifest, withInfoPlist, withDangerousMod, withXcodeProject } = require('@expo/config-plugins');
 const fs = require('fs');
 const path = require('path');
 
@@ -232,6 +232,54 @@ configurations.all {
     },
   ]);
 
+  // ── iOS: Add Mapbox Navigation SPM to Xcode project main target ───────────
+  //
+  // WHY NOT spm_dependency() IN THE PODSPEC:
+  // Using spm_dependency() in ExpoMapboxNavigation.podspec causes
+  // "43029 duplicate symbols" linker errors (React Native GitHub #47344,
+  // Expo GitHub #37813). The framework ends up linked in both the Pod target
+  // AND the main app target, so the linker sees every symbol twice.
+  //
+  // THE CORRECT APPROACH:
+  // Add MapboxNavigation as a Swift Package directly to the Xcode project's
+  // main target via withXcodeProject. This ensures only ONE copy of each
+  // framework is linked in the final binary — exactly the same technique
+  // used by rnmapbox/maps itself for MapboxMaps.
+  config = withXcodeProject(config, (mod) => {
+    const xcodeProject = mod.modResults;
+    const MAPBOX_NAV_REPO = 'https://github.com/mapbox/mapbox-navigation-ios.git';
+    const MAPBOX_NAV_VERSION = '3.25.0';
+
+    // Check if already added to avoid duplicates on repeated prebuild
+    const existingPackages = xcodeProject.pbxXCRemoteSwiftPackageReferenceSection
+      ? Object.values(xcodeProject.pbxXCRemoteSwiftPackageReferenceSection())
+      : [];
+    const alreadyAdded = existingPackages.some(
+      (pkg) => pkg && pkg.repositoryURL && pkg.repositoryURL.includes('mapbox-navigation-ios')
+    );
+
+    if (!alreadyAdded) {
+      // Add the SPM package reference to the project
+      const packageRef = xcodeProject.addSwiftPackage(
+        MAPBOX_NAV_REPO,
+        {
+          repositoryURL: MAPBOX_NAV_REPO,
+          requirement: {
+            kind: 'upToNextMajorVersion',
+            minimumVersion: MAPBOX_NAV_VERSION,
+          },
+        },
+        [
+          // Products from MapboxNavigation SPM package that our Swift files import
+          { product: 'MapboxNavigationCore' },
+          { product: 'MapboxNavigationUIKit' },
+        ]
+      );
+    }
+
+    return mod;
+  });
+
   return config;
 };
 

package/ios/ExpoMapboxNavigationView.swift

@@ -5,390 +5,301 @@ import MapboxDirections
 import MapboxNavigationCore
 import MapboxNavigationUIKit
 
-/// ExpoMapboxNavigationView (iOS)
-///
-/// Mirrors expo-mapbox-navigation's Android `ExpoMapboxNavigationView.kt` feature
-/// for feature, using the official Mapbox Navigation SDK v3 for iOS
-/// (`MapboxNavigationCore` + `MapboxNavigationUIKit`, installed via Swift Package
-/// Manager — NOT prebuilt xcframeworks).
-///
-/// Unlike Android, where each UI piece (maneuver banner, speed limit, lane
-/// guidance, voice instructions, recenter/overview camera) had to be wired up
-/// individually, iOS's `NavigationViewController` is an official "drop-in" UI
-/// that already includes ALL of these out of the box:
-///   - Top maneuver banner with lane guidance (no extra code needed)
-///   - Bottom trip progress bar (ETA, duration, distance)
-///   - Speed limit display
-///   - Voice instructions (spoken automatically)
-///   - Recenter button (built into NavigationMapView's UserCourseView)
-///   - Overview / following camera switching
-///
-/// What we still implement ourselves to match the Android module's public API
-/// exactly:
-///   - Route fetching parity with Android's RouteOptions flags
-///     (bannerInstructions, steps, roundaboutExits, annotations)
-///   - Voice unit resolution parity (issue #31 fix)
-///   - Day/night automatic style switching parity
-///   - All the same events (onRoutesReady, onRouteProgressChanged, etc.)
-///   - Tap-to-open full steps list (onManeuverBannerPressed), mirroring the
-///     Android `emitFullRouteSteps()` feature
+// MARK: - Custom styles (replaces removed NavigationDayStyle/NavigationNightStyle in v3)
+// In Navigation SDK v3, NavigationDayStyle and NavigationNightStyle were removed.
+// The correct pattern is to pass custom Style subclasses via NavigationOptions.styles.
+// If no custom styles are needed, simply omit the styles param — the SDK uses
+// its own default day/night styles automatically.
+
 public class ExpoMapboxNavigationView: ExpoView {
 
-  // MARK: - Event dispatchers (mirror Android's EventDispatcher fields)
-
-  let onRouteProgressChanged = EventDispatcher()
-  let onRoutesReady = EventDispatcher()
-  let onNavigationFinished = EventDispatcher()
-  let onNavigationCancelled = EventDispatcher()
-  let onRoutesFailed = EventDispatcher()
-  let onArrival = EventDispatcher()
-  let onManeuverBannerPressed = EventDispatcher()
-
-  // MARK: - Mapbox Navigation core
-
-  private var mapboxNavigationProvider: MapboxNavigationProvider?
-  private var mapboxNavigation: MapboxNavigation?
-  private var navigationViewController: NavigationViewController?
-  private var currentNavigationRoutes: NavigationRoutes?
-
-  // MARK: - State
-
-  private var isNightMode = false
-  private var routeRequestTask: Task<Void, Never>?
-
-  // MARK: - Props (mirror Android's private var props exactly)
-
-  private var coordinates: [[String: Double]] = []
-  private var waypointIndices: [Int]?
-  private var language: String?
-  private var voiceUnits: String?
-  private var navigationProfile: String?
-  private var excludeTypes: [String]?
-  private var mapStyle: String?
-  private var mute: Bool = false
-  private var maxHeight: Double?
-  private var maxWidth: Double?
-  private var useMapMatching: Bool = false
-  private var customRasterTileUrl: String?
-  private var customRasterAboveLayerId: String?
-
-  // MARK: - Init
-
-  public required init(appContext: AppContext? = nil) {
-    super.init(appContext: appContext)
-    setupNavigationProvider()
-  }
-
-  private func setupNavigationProvider() {
-    // CoreConfig() uses MBXAccessToken from Info.plist automatically — same
-    // pattern as Android reading mapbox_access_token from string resources.
-    let provider = MapboxNavigationProvider(coreConfig: .init())
-    self.mapboxNavigationProvider = provider
-    self.mapboxNavigation = provider.mapboxNavigation
-  }
-
-  // MARK: - Day / Night auto switching (parity with Android getAutoStyle/checkAndSwitchDayNight)
-
-  private func isDaytime() -> Bool {
-    let hour = Calendar.current.component(.hour, from: Date())
-    return hour >= 6 && hour < 20
-  }
-
-  // MARK: - Voice units resolution (Issue #31 parity)
-
-  private func resolveVoiceUnits() -> String {
-    if let units = voiceUnits?.lowercased(), units == "metric" || units == "imperial" {
-      return units
+    // MARK: - Event dispatchers
+    let onRouteProgressChanged = EventDispatcher()
+    let onRoutesReady = EventDispatcher()
+    let onNavigationFinished = EventDispatcher()
+    let onNavigationCancelled = EventDispatcher()
+    let onRoutesFailed = EventDispatcher()
+    let onArrival = EventDispatcher()
+    let onManeuverBannerPressed = EventDispatcher()
+
+    // MARK: - Mapbox core
+    private var mapboxNavigationProvider: MapboxNavigationProvider?
+    private var mapboxNavigation: MapboxNavigation?
+    private var navigationViewController: NavigationViewController?
+    private var currentNavigationRoutes: NavigationRoutes?
+    private var routeRequestTask: Task<Void, Never>?
+
+    // MARK: - Props
+    private var coordinates: [[String: Double]] = []
+    private var waypointIndices: [Int]?
+    private var language: String?
+    private var voiceUnits: String?
+    private var navigationProfile: String?
+    private var excludeTypes: [String]?
+    private var mapStyle: String?
+    private var mute: Bool = false
+    private var maxHeight: Double?
+    private var maxWidth: Double?
+    private var useMapMatching: Bool = false
+    private var customRasterTileUrl: String?
+    private var customRasterAboveLayerId: String?
+
+    // MARK: - Init
+    public required init(appContext: AppContext? = nil) {
+        super.init(appContext: appContext)
+        let provider = MapboxNavigationProvider(coreConfig: .init())
+        self.mapboxNavigationProvider = provider
+        self.mapboxNavigation = provider.mapboxNavigation
     }
-    let localeIdentifier = language ?? Locale.current.identifier
-    let locale = Locale(identifier: localeIdentifier)
-    let regionCode = locale.region?.identifier ?? ""
-    let imperialCountries: Set<String> = ["US", "GB", "LR", "MM"]
-    return imperialCountries.contains(regionCode) ? "imperial" : "metric"
-  }
-
-  // MARK: - Route fetching (parity with Android fetchRoutes())
-
-  private func fetchRoutes() {
-    guard coordinates.count >= 2, let mapboxNavigation = mapboxNavigation else { return }
-
-    let waypoints = coordinates.map { coord -> Waypoint in
-      let lat = coord["latitude"] ?? 0.0
-      let lon = coord["longitude"] ?? 0.0
-      return Waypoint(coordinate: CLLocationCoordinate2D(latitude: lat, longitude: lon))
+
+    // MARK: - Voice units (Issue #31 parity with Android)
+    // FIX: use locale.regionCode instead of locale.region?.identifier
+    // (locale.region is only available on iOS 16+, regionCode works from iOS 2+)
+    private func resolveVoiceUnits() -> String {
+        if let units = voiceUnits?.lowercased(), units == "metric" || units == "imperial" {
+            return units
+        }
+        let localeIdentifier = language ?? Locale.current.identifier
+        let locale = Locale(identifier: localeIdentifier)
+        // regionCode is available iOS 2+ (unlike .region?.identifier which is iOS 16+)
+        let regionCode = locale.regionCode ?? ""
+        let imperialCountries: Set<String> = ["US", "GB", "LR", "MM"]
+        return imperialCountries.contains(regionCode) ? "imperial" : "metric"
     }
 
-    // Build NavigationRouteOptions with the same flags Android sets explicitly:
-    // bannerInstructions / steps / roundaboutExits / annotations(maxspeed,...)
-    // These are the *default* behavior of NavigationRouteOptions on iOS (the
-    // iOS Directions API client always requests steps + banner + voice
-    // instructions for navigation profiles), but we still set distanceUnit /
-    // locale explicitly for parity with the Android voiceUnits fix.
-    var options = NavigationRouteOptions(waypoints: waypoints)
+    // MARK: - Route fetching
+    private func fetchRoutes() {
+        guard coordinates.count >= 2, let mapboxNavigation = mapboxNavigation else { return }
 
-    if let langTag = language {
-      options.locale = Locale(identifier: langTag)
-    }
+        let waypoints = coordinates.map { coord -> Waypoint in
+            let lat = coord["latitude"] ?? 0.0
+            let lon = coord["longitude"] ?? 0.0
+            return Waypoint(coordinate: CLLocationCoordinate2D(latitude: lat, longitude: lon))
+        }
 
-    let unit = resolveVoiceUnits()
-    options.distanceUnit = (unit == "imperial") ? .mile : .kilometer
-
-    if let profile = navigationProfile {
-      switch profile {
-      case "driving-traffic": options.profileIdentifier = .automobileAvoidingTraffic
-      case "driving": options.profileIdentifier = .automobile
-      case "walking": options.profileIdentifier = .walking
-      case "cycling": options.profileIdentifier = .cycling
-      default: break
-      }
-    } else {
-      options.profileIdentifier = .automobileAvoidingTraffic
-    }
+        var options = NavigationRouteOptions(waypoints: waypoints)
 
-    routeRequestTask?.cancel()
-    routeRequestTask = Task { [weak self] in
-      guard let self = self else { return }
-      let request = mapboxNavigation.routingProvider().calculateRoutes(options: options)
-      switch await request.result {
-      case .failure(let error):
-        self.onRoutesFailed(["message": error.localizedDescription])
-
-      case .success(let navigationRoutes):
-        self.currentNavigationRoutes = navigationRoutes
-        let mainRoute = navigationRoutes.mainRoute.route
-
-        self.onRoutesReady([
-          "routeCount": navigationRoutes.alternativeRoutes.count + 1,
-          "distanceMeters": mainRoute.distance,
-          "durationSeconds": mainRoute.expectedTravelTime
-        ])
+        if let langTag = language {
+            options.locale = Locale(identifier: langTag)
+        }
+        let unit = resolveVoiceUnits()
+        options.distanceUnit = (unit == "imperial") ? .mile : .kilometer
+
+        if let profile = navigationProfile {
+            switch profile {
+            case "driving-traffic": options.profileIdentifier = .automobileAvoidingTraffic
+            case "driving":         options.profileIdentifier = .automobile
+            case "walking":         options.profileIdentifier = .walking
+            case "cycling":         options.profileIdentifier = .cycling
+            default: break
+            }
+        } else {
+            options.profileIdentifier = .automobileAvoidingTraffic
+        }
 
-        self.presentNavigationViewController(with: navigationRoutes)
-      }
-    }
-  }
-
-  // MARK: - Present drop-in NavigationViewController
-  //
-  // This single official component replaces ALL of the manual UI wiring we
-  // had to do on Android (maneuver banner + lane guidance + speed limit +
-  // trip progress + voice instructions + recenter/overview camera). Mapbox
-  // builds and manages it internally.
-
-  private func presentNavigationViewController(with navigationRoutes: NavigationRoutes) {
-    guard let provider = mapboxNavigationProvider, let mapboxNavigation = mapboxNavigation else { return }
-
-    // Tear down any previous session before starting a new one.
-    tearDownNavigationViewController()
-
-    let navigationOptions = NavigationOptions(
-      mapboxNavigation: mapboxNavigation,
-      voiceController: provider.routeVoiceController,
-      eventsManager: provider.eventsManager()
-    )
-
-    let vc = NavigationViewController(
-      navigationRoutes: navigationRoutes,
-      navigationOptions: navigationOptions
-    )
-    vc.delegate = self
-
-    // Day/night parity with Android's getAutoStyle()/checkAndSwitchDayNight().
-    isNightMode = !isDaytime()
-    if let styleManager = vc.styleManager {
-      styleManager.styles = [NavigationDayStyle(), NavigationNightStyle()]
-      // Force the initial style to match the current time of day; the
-      // StyleManager will continue to auto-switch based on day/night and
-      // tunnel detection from then on (matches our Android sunrise/sunset
-      // logic but uses the SDK's own — more complete — solar calculation).
+        routeRequestTask?.cancel()
+        routeRequestTask = Task { [weak self] in
+            guard let self = self else { return }
+            let request = mapboxNavigation.routingProvider().calculateRoutes(options: options)
+            switch await request.result {
+            case .failure(let error):
+                self.onRoutesFailed(["message": error.localizedDescription])
+            case .success(let navigationRoutes):
+                self.currentNavigationRoutes = navigationRoutes
+                let mainRoute = navigationRoutes.mainRoute.route
+                self.onRoutesReady([
+                    "routeCount": navigationRoutes.alternativeRoutes.count + 1,
+                    "distanceMeters": mainRoute.distance,
+                    "durationSeconds": mainRoute.expectedTravelTime
+                ])
+                await MainActor.run {
+                    self.presentNavigationViewController(with: navigationRoutes)
+                }
+            }
+        }
     }
 
-    // Show traversed-route fade, matching common navigation app behavior.
-    vc.routeLineTracksTraversal = true
+    // MARK: - Present NavigationViewController
+    private func presentNavigationViewController(with navigationRoutes: NavigationRoutes) {
+        guard let provider = mapboxNavigationProvider,
+              let mapboxNavigation = mapboxNavigation else { return }
+
+        tearDownNavigationViewController()
+
+        // FIX: In Navigation SDK v3, NavigationDayStyle / NavigationNightStyle
+        // no longer exist. The SDK applies its own default day/night styles
+        // automatically when no custom styles are passed. Omitting the styles
+        // param gives us the standard Mapbox navigation appearance.
+        let navigationOptions = NavigationOptions(
+            mapboxNavigation: mapboxNavigation,
+            voiceController: provider.routeVoiceController,
+            eventsManager: provider.eventsManager()
+        )
+
+        let vc = NavigationViewController(
+            navigationRoutes: navigationRoutes,
+            navigationOptions: navigationOptions
+        )
+        vc.delegate = self
+        vc.routeLineTracksTraversal = true
+
+        // Mute: FIX — routeVoiceController is non-optional in v3, no ? needed
+        if mute {
+            provider.routeVoiceController.speechSynthesizer.muted = true
+        }
+
+        // Tap banner → emit full steps list
+        attachManeuverBannerTapHandler(to: vc)
+
+        addSubview(vc.view)
+        vc.view.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            vc.view.topAnchor.constraint(equalTo: topAnchor),
+            vc.view.bottomAnchor.constraint(equalTo: bottomAnchor),
+            vc.view.leadingAnchor.constraint(equalTo: leadingAnchor),
+            vc.view.trailingAnchor.constraint(equalTo: trailingAnchor)
+        ])
+
+        if let parentVC = findParentViewController() {
+            parentVC.addChild(vc)
+            vc.didMove(toParent: parentVC)
+        }
 
-    // Mute parity with Android's resolveVoiceUnits/SpeechVolume approach.
-    if mute {
-      provider.routeVoiceController?.speechSynthesizer.muted = true
+        self.navigationViewController = vc
     }
 
-    // Tap-to-open full steps list: the SDK doesn't expose a direct "banner
-    // tapped" callback, so we attach a tap gesture to the top banner
-    // container once it's in the view hierarchy.
-    attachManeuverBannerTapHandler(to: vc)
-
-    addSubview(vc.view)
-    vc.view.translatesAutoresizingMaskIntoConstraints = false
-    NSLayoutConstraint.activate([
-      vc.view.topAnchor.constraint(equalTo: topAnchor),
-      vc.view.bottomAnchor.constraint(equalTo: bottomAnchor),
-      vc.view.leadingAnchor.constraint(equalTo: leadingAnchor),
-      vc.view.trailingAnchor.constraint(equalTo: trailingAnchor)
-    ])
-
-    if let parentVC = self.findParentViewController() {
-      parentVC.addChild(vc)
-      vc.didMove(toParent: parentVC)
+    private func attachManeuverBannerTapHandler(to vc: NavigationViewController) {
+        let tap = UITapGestureRecognizer(target: self, action: #selector(handleManeuverBannerTap))
+        vc.navigationView.topBannerContainerView.addGestureRecognizer(tap)
+        vc.navigationView.topBannerContainerView.isUserInteractionEnabled = true
     }
 
-    self.navigationViewController = vc
-  }
-
-  private func attachManeuverBannerTapHandler(to vc: NavigationViewController) {
-    // The top banner container is `vc.navigationView.topBannerContainerView`
-    // (per public API on NavigationView). We attach a tap recognizer that,
-    // when fired, extracts the full ordered list of upcoming steps from
-    // `currentNavigationRoutes` — exact parity with Android's
-    // emitFullRouteSteps(), including lane guidance per step.
-    let tap = UITapGestureRecognizer(target: self, action: #selector(handleManeuverBannerTap))
-    vc.navigationView.topBannerContainerView.addGestureRecognizer(tap)
-    vc.navigationView.topBannerContainerView.isUserInteractionEnabled = true
-  }
-
-  @objc private func handleManeuverBannerTap() {
-    emitFullRouteSteps()
-  }
-
-  // MARK: - Full route steps list (parity with Android emitFullRouteSteps())
-
-  private func emitFullRouteSteps() {
-    guard let navigationRoutes = currentNavigationRoutes else {
-      onManeuverBannerPressed(["steps": []])
-      return
+    @objc private func handleManeuverBannerTap() {
+        emitFullRouteSteps()
     }
 
-    let route = navigationRoutes.mainRoute.route
-    var stepsPayload: [[String: Any]] = []
-
-    for leg in route.legs {
-      for step in leg.steps {
-        // Lane guidance: present on step.intersections[].approachLanes /
-        // .usableApproachLanes when available — mirrors Android's read of
-        // BannerInstructions.sub().components() of type "lane".
-        var laneData: [[String: Any]] = []
-        if let intersections = step.intersections {
-          for intersection in intersections {
-            guard let lanes = intersection.approachLanes,
-                  let usable = intersection.usableApproachLanes else { continue }
-            for (index, lane) in lanes.enumerated() {
-              laneData.append([
-                "active": usable.contains(index),
-                "directions": lane.indications.map { String(describing: $0) }
-              ])
+    // MARK: - Full route steps list
+    // FIX: removed lane guidance extraction via intersection.approachLanes /
+    // intersection.indications — those properties are internal in v3 and cause
+    // 'inaccessible due to internal protection level' build errors.
+    // The drop-in NavigationViewController already renders lane guidance natively
+    // in its top banner, so no custom extraction is needed.
+    private func emitFullRouteSteps() {
+        guard let navigationRoutes = currentNavigationRoutes else {
+            onManeuverBannerPressed(["steps": []])
+            return
+        }
+
+        let route = navigationRoutes.mainRoute.route
+        var stepsPayload: [[String: Any]] = []
+
+        for leg in route.legs {
+            for step in leg.steps {
+                stepsPayload.append([
+                    "instruction": step.instructions,
+                    "distanceMeters": step.distance,
+                    "durationSeconds": step.expectedTravelTime,
+                    "maneuverType": String(describing: step.maneuverType),
+                    "maneuverModifier": step.maneuverDirection.map { String(describing: $0) } ?? "",
+                    "roadName": step.names?.first ?? "",
+                    "laneInstructions": [] // lane data surfaced natively in the banner
+                ])
             }
-          }
         }
 
-        stepsPayload.append([
-          "instruction": step.instructions,
-          "distanceMeters": step.distance,
-          "durationSeconds": step.expectedTravelTime,
-          "maneuverType": String(describing: step.maneuverType),
-          "maneuverModifier": step.maneuverDirection.map { String(describing: $0) } ?? "",
-          "roadName": step.names?.first ?? "",
-          "laneInstructions": laneData
-        ])
-      }
+        onManeuverBannerPressed(["steps": stepsPayload])
     }
 
-    onManeuverBannerPressed(["steps": stepsPayload])
-  }
-
-  // MARK: - Cancel / teardown (parity with Android cancelNavigation())
-
-  private func tearDownNavigationViewController() {
-    guard let vc = navigationViewController else { return }
-    vc.willMove(toParent: nil)
-    vc.view.removeFromSuperview()
-    vc.removeFromParent()
-    navigationViewController = nil
-    currentNavigationRoutes = nil
-  }
+    // MARK: - Teardown
+    private func tearDownNavigationViewController() {
+        guard let vc = navigationViewController else { return }
+        vc.willMove(toParent: nil)
+        vc.view.removeFromSuperview()
+        vc.removeFromParent()
+        navigationViewController = nil
+        currentNavigationRoutes = nil
+    }
 
-  private func cancelNavigation() {
-    tearDownNavigationViewController()
-    onNavigationCancelled([:])
-  }
+    private func cancelNavigation() {
+        tearDownNavigationViewController()
+        onNavigationCancelled([:])
+    }
 
-  // MARK: - Helpers
+    private func findParentViewController() -> UIViewController? {
+        var responder: UIResponder? = self
+        while let r = responder {
+            if let vc = r as? UIViewController { return vc }
+            responder = r.next
+        }
+        return nil
+    }
 
-  private func findParentViewController() -> UIViewController? {
-    var responder: UIResponder? = self
-    while let r = responder {
-      if let vc = r as? UIViewController { return vc }
-      responder = r.next
+    // MARK: - Prop setters
+    func setCoordinates(_ coords: [[String: Double]]) {
+        coordinates = coords
+        if coords.count >= 2 { fetchRoutes() }
+    }
+    func setWaypointIndices(_ indices: [Int]?) { waypointIndices = indices }
+    func setLanguage(_ lang: String?) { language = lang }
+    func setVoiceUnits(_ units: String?) { voiceUnits = units }
+    func setNavigationProfile(_ profile: String?) { navigationProfile = profile }
+    func setExcludeTypes(_ types: [String]?) { excludeTypes = types }
+    func setMapStyle(_ style: String?) { mapStyle = style }
+    func setMute(_ shouldMute: Bool) {
+        mute = shouldMute
+        // FIX: routeVoiceController is non-optional in v3 — no ? needed
+        mapboxNavigationProvider?.routeVoiceController.speechSynthesizer.muted = shouldMute
+    }
+    func setMaxHeight(_ height: Double?) { maxHeight = height }
+    func setMaxWidth(_ width: Double?) { maxWidth = width }
+    func setUseMapMatching(_ use: Bool) { useMapMatching = use }
+    func setCustomRasterTileUrl(_ url: String?) { customRasterTileUrl = url }
+    func setCustomRasterAboveLayerId(_ layerId: String?) { customRasterAboveLayerId = layerId }
+
+    // MARK: - Lifecycle
+    public override func removeFromSuperview() {
+        routeRequestTask?.cancel()
+        tearDownNavigationViewController()
+        super.removeFromSuperview()
     }
-    return nil
-  }
-
-  // MARK: - Prop setters (parity with Android setters)
-
-  func setCoordinates(_ coords: [[String: Double]]) {
-    coordinates = coords
-    if coords.count >= 2 { fetchRoutes() }
-  }
-  func setWaypointIndices(_ indices: [Int]?) { waypointIndices = indices }
-  func setLanguage(_ lang: String?) { language = lang }
-  func setVoiceUnits(_ units: String?) { voiceUnits = units }
-  func setNavigationProfile(_ profile: String?) { navigationProfile = profile }
-  func setExcludeTypes(_ types: [String]?) { excludeTypes = types }
-  func setMapStyle(_ style: String?) { mapStyle = style }
-  func setMute(_ shouldMute: Bool) {
-    mute = shouldMute
-    mapboxNavigationProvider?.routeVoiceController?.speechSynthesizer.muted = shouldMute
-  }
-  func setMaxHeight(_ height: Double?) { maxHeight = height }
-  func setMaxWidth(_ width: Double?) { maxWidth = width }
-  func setUseMapMatching(_ use: Bool) { useMapMatching = use }
-  func setCustomRasterTileUrl(_ url: String?) { customRasterTileUrl = url }
-  func setCustomRasterAboveLayerId(_ layerId: String?) { customRasterAboveLayerId = layerId }
-
-  // MARK: - Lifecycle
-
-  public override func removeFromSuperview() {
-    routeRequestTask?.cancel()
-    tearDownNavigationViewController()
-    super.removeFromSuperview()
-  }
 }
 
 // MARK: - NavigationViewControllerDelegate
-//
-// Parity with Android's RouteProgressObserver / RoutesObserver / onArrival.
-
 extension ExpoMapboxNavigationView: NavigationViewControllerDelegate {
 
-  public func navigationViewController(
-    _ navigationViewController: NavigationViewController,
-    didUpdate progress: RouteProgress,
-    with location: CLLocation,
-    rawLocation: CLLocation
-  ) {
-    onRouteProgressChanged([
-      "distanceRemaining": progress.distanceRemaining,
-      "durationRemaining": progress.durationRemaining,
-      "distanceTraveled": progress.distanceTraveled,
-      "fractionTraveled": progress.fractionTraveled,
-      "currentStepDistanceRemaining": progress.currentLegProgress.currentStepProgress.distanceRemaining
-    ])
-  }
-
-  public func navigationViewController(
-    _ navigationViewController: NavigationViewController,
-    didArriveAt waypoint: Waypoint
-  ) -> Bool {
-    onArrival([:])
-    return true
-  }
-
-  public func navigationViewControllerDidDismiss(
-    _ navigationViewController: NavigationViewController,
-    byCanceling canceled: Bool
-  ) {
-    if canceled {
-      cancelNavigation()
-    } else {
-      onNavigationFinished([:])
-      tearDownNavigationViewController()
+    public func navigationViewController(
+        _ navigationViewController: NavigationViewController,
+        didUpdate progress: RouteProgress,
+        with location: CLLocation,
+        rawLocation: CLLocation
+    ) {
+        onRouteProgressChanged([
+            "distanceRemaining": progress.distanceRemaining,
+            "durationRemaining": progress.durationRemaining,
+            "distanceTraveled": progress.distanceTraveled,
+            "fractionTraveled": progress.fractionTraveled,
+            "currentStepDistanceRemaining":
+                progress.currentLegProgress.currentStepProgress.distanceRemaining
+        ])
+    }
+
+    public func navigationViewController(
+        _ navigationViewController: NavigationViewController,
+        didArriveAt waypoint: Waypoint
+    ) -> Bool {
+        onArrival([:])
+        return true
+    }
+
+    public func navigationViewControllerDidDismiss(
+        _ navigationViewController: NavigationViewController,
+        byCanceling canceled: Bool
+    ) {
+        if canceled {
+            cancelNavigation()
+        } else {
+            onNavigationFinished([:])
+            tearDownNavigationViewController()
+        }
     }
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "Expo module for Mapbox Navigation SDK with 16KB page size support, NDK27, and Mapbox Maps v11.11.0+",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -9,7 +9,7 @@
     "clean": "rm -rf build",
     "lint": "tsc --noEmit",
     "test": "echo \"Tests require a full Expo project with EAS Build. See README.\"",
-    "prepublishOnly": ""
+    "prepublishOnly": "npm run build"
   },
   "keywords": [
     "expo",

package/plugin/src/index.js

@@ -1,4 +1,4 @@
-const { withAppBuildGradle, withProjectBuildGradle, withAndroidManifest, withInfoPlist, withDangerousMod } = require('@expo/config-plugins');
+const { withAppBuildGradle, withProjectBuildGradle, withAndroidManifest, withInfoPlist, withDangerousMod, withXcodeProject } = require('@expo/config-plugins');
 const fs = require('fs');
 const path = require('path');
 
@@ -232,6 +232,54 @@ configurations.all {
     },
   ]);
 
+  // ── iOS: Add Mapbox Navigation SPM to Xcode project main target ───────────
+  //
+  // WHY NOT spm_dependency() IN THE PODSPEC:
+  // Using spm_dependency() in ExpoMapboxNavigation.podspec causes
+  // "43029 duplicate symbols" linker errors (React Native GitHub #47344,
+  // Expo GitHub #37813). The framework ends up linked in both the Pod target
+  // AND the main app target, so the linker sees every symbol twice.
+  //
+  // THE CORRECT APPROACH:
+  // Add MapboxNavigation as a Swift Package directly to the Xcode project's
+  // main target via withXcodeProject. This ensures only ONE copy of each
+  // framework is linked in the final binary — exactly the same technique
+  // used by rnmapbox/maps itself for MapboxMaps.
+  config = withXcodeProject(config, (mod) => {
+    const xcodeProject = mod.modResults;
+    const MAPBOX_NAV_REPO = 'https://github.com/mapbox/mapbox-navigation-ios.git';
+    const MAPBOX_NAV_VERSION = '3.25.0';
+
+    // Check if already added to avoid duplicates on repeated prebuild
+    const existingPackages = xcodeProject.pbxXCRemoteSwiftPackageReferenceSection
+      ? Object.values(xcodeProject.pbxXCRemoteSwiftPackageReferenceSection())
+      : [];
+    const alreadyAdded = existingPackages.some(
+      (pkg) => pkg && pkg.repositoryURL && pkg.repositoryURL.includes('mapbox-navigation-ios')
+    );
+
+    if (!alreadyAdded) {
+      // Add the SPM package reference to the project
+      const packageRef = xcodeProject.addSwiftPackage(
+        MAPBOX_NAV_REPO,
+        {
+          repositoryURL: MAPBOX_NAV_REPO,
+          requirement: {
+            kind: 'upToNextMajorVersion',
+            minimumVersion: MAPBOX_NAV_VERSION,
+          },
+        },
+        [
+          // Products from MapboxNavigation SPM package that our Swift files import
+          { product: 'MapboxNavigationCore' },
+          { product: 'MapboxNavigationUIKit' },
+        ]
+      );
+    }
+
+    return mod;
+  });
+
   return config;
 };
 

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Jun 30 22:43:09 CEST 2026
-gradle.version=8.9