@jacques_gordon/expo-mapbox-navigation 2.1.6 → 2.2.0

package/ExpoMapboxNavigation.podspec

@@ -10,30 +10,46 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platforms      = { :ios => '14.0' }
-  s.swift_version  = '5.7'
+
+  # ── 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.swift_version  = '5.9'
   s.source         = { git: package['repository']['url'], tag: "v#{s.version}" }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
 
-  # ── iOS: Mapbox Navigation bundled as xcframework ──────────────────────────
-  # The Navigation SDK v3 for iOS does not support CocoaPods natively.
-  # xcframeworks are bundled directly. See README for how to rebuild them.
-  # ────────────────────────────────────────────────────────────────────────────
-  s.vendored_frameworks = 'ios/MapboxNavigationUIKit.xcframework',
-                          'ios/MapboxNavigationCore.xcframework',
-                          'ios/MapboxDirections.xcframework'
-
-  # Mapbox Maps SDK (via CocoaPods — available as of Maps SDK 11.x)
-  s.dependency 'MapboxMaps', '>= 11.11.0'
+  # ── iOS: Mapbox Navigation SDK v3 via Swift Package Manager ─────────────────
+  #
+  # 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.
+  #
+  # 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,m,mm}'
+  s.source_files = 'ios/**/*.{swift,h,m,mm}'
 
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
-    # 16 KB page alignment for iOS (Apple Silicon + future-proof)
-    'OTHER_LDFLAGS' => '-Wl,-dead_strip_dylibs',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+    'SWIFT_COMPILATION_MODE' => 'wholemodule',
+    'IPHONEOS_DEPLOYMENT_TARGET' => '15.1'
   }
 end

package/README.md

@@ -12,6 +12,7 @@ Expo module for Mapbox Navigation SDK — forked from [`@badatgil/expo-mapbox-na
 | ✅ **16 KB page size** | `jniLibs.useLegacyPackaging = false` + `ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON` — required for Google Play compliance from 2025 onwards. |
 | ✅ **Expo SDK 53+** | Compatible with Expo SDK ≥ 53 and React Native 0.79+. |
 | ✅ **Maps v11.11.0** | Minimum Mapbox Maps Android SDK enforced to 11.11.0 (config plugin validates this). |
+| ✅ **iOS support** | Full native iOS implementation (`NavigationViewController` drop-in UI) via Swift Package Manager — feature parity with Android (lane guidance, speed limit, voice instructions, day/night, steps list). |
 
 ---
 
@@ -46,6 +47,7 @@ Follow the [full @rnmapbox/maps installation guide](https://rnmapbox.github.io/d
     "@jacques_gordon/expo-mapbox-navigation",
     {
       "accessToken": "pk.your_public_token",
+      "downloadsToken": "sk.your_secret_token",
       "mapboxMapsVersion": "11.11.0"
     }
   ]
@@ -54,6 +56,14 @@ Follow the [full @rnmapbox/maps installation guide](https://rnmapbox.github.io/d
 
 > ⚠️ `mapboxMapsVersion` must match the version set in `@rnmapbox/maps`. Minimum: `11.11.0`.
 
+> ⚠️ `downloadsToken` is **required** — it's a secret Mapbox token (starts with `sk.`) with the **Downloads:Read** scope. On iOS it's used to authenticate Swift Package Manager when it fetches the Mapbox Navigation SDK from Mapbox's private package registry (via a generated `.netrc` entry). This is the same token already used for `RNMapboxMapsDownloadToken` above — you can reuse it.
+
+### iOS architecture
+
+iOS uses the **official Mapbox Navigation SDK v3 drop-in UI** (`NavigationViewController`), installed via **Swift Package Manager** — not prebuilt `.xcframework` binaries. This is the only officially supported distribution method for the Navigation SDK v3 on iOS; CocoaPods doesn't host it directly, so this package bridges it in automatically through CocoaPods' `spm_dependency()` mechanism when you run `pod install` / `expo prebuild`.
+
+Because `NavigationViewController` is a complete drop-in experience, lane guidance, speed limit display, voice instructions, and the recenter/overview camera button all come built-in from Mapbox — no extra wiring needed, unlike the more manual Android implementation.
+
 ### iOS: enable static frameworks
 
 ```json
@@ -156,6 +166,12 @@ More info: [Android 16 KB page size guide](https://developer.android.com/guide/p
 
 ## Changelog
 
+### 2.2.0
+- **iOS support added.** Full native implementation using Mapbox Navigation SDK v3 (`NavigationViewController` drop-in UI) via Swift Package Manager.
+- Fixed: previous versions referenced non-existent `.xcframework` files in the podspec, causing `Unimplemented component: ViewManagerAdapter_ExpoMapboxNavigation` crashes on iOS — no native module was ever actually registered.
+- New required `downloadsToken` config plugin option (secret Mapbox token, used to authenticate Swift Package Manager).
+- iOS feature parity with Android: lane guidance, speed limit, voice instructions (with working mute), day/night auto-switching, and the `onManeuverBannerPressed` full-steps-list event.
+
 ### 2.0.1
 - Fix #43: `CameraAnimationsUtils.calculateCameraAnimationHint` NoSuchMethodError on Android
 - Fix #31: Add `voiceUnits` prop for metric/imperial voice instructions

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

@@ -303,11 +303,20 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         ))
 
         // ── ManeuverView — top ─────────────────────────────────────────────────
-        // FIX: apply custom style with autoSizeTextType so long street names
-        // (e.g. "Wulmersumsesteenweg") shrink to fit instead of being clipped.
-        val mv = MapboxManeuverView(
-            android.view.ContextThemeWrapper(context, R.style.MapboxCustomManeuverViewStyle)
-        )
+        // NOTE: a previous attempt to customize the primary maneuver text
+        // appearance (auto-sizing for long street names) used a fictional
+        // "primaryManeuverTextAppearance" attribute that doesn't exist in the
+        // SDK, which broke AAPT resource linking in host apps. A follow-up
+        // attempt to call updatePrimaryManeuverTextAppearance() was also
+        // dropped: in Navigation SDK v3 the UI components were restructured
+        // around a ComponentInstaller/ManeuverConfig system and that method's
+        // availability/signature could not be confirmed for v3 with
+        // certainty. To avoid risking another build-breaking regression on
+        // an unverified API, MapboxManeuverView is used with its default
+        // text appearance for now. Long street name truncation can be
+        // revisited via the officially supported ComponentInstaller config
+        // API in a future, carefully tested release.
+        val mv = MapboxManeuverView(context)
         root.addView(mv as View, FrameLayout.LayoutParams(
             FrameLayout.LayoutParams.MATCH_PARENT,
             FrameLayout.LayoutParams.WRAP_CONTENT

package/app.plugin.js

@@ -8,6 +8,7 @@ const MAPBOX_MAPS_MIN_VERSION = '11.11.0';
 const withMapboxNavigation = (config, options = {}) => {
   const {
     accessToken,
+    downloadsToken,
     mapboxMapsVersion = MAPBOX_MAPS_MIN_VERSION,
     androidColorOverrides = {},
   } = options;
@@ -20,6 +21,21 @@ const withMapboxNavigation = (config, options = {}) => {
     );
   }
 
+  // downloadsToken (a secret sk.* token with the Downloads:Read scope) is
+  // required on iOS to authenticate Swift Package Manager's fetch of the
+  // Mapbox Navigation SDK package — without it, `pod install`/`expo
+  // prebuild` will fail to resolve the SPM dependency declared in
+  // ExpoMapboxNavigation.podspec.
+  if (!downloadsToken) {
+    throw new Error(
+      '[@jacques_gordon/expo-mapbox-navigation] `downloadsToken` is required for iOS builds.\n' +
+      'This must be a SECRET Mapbox token (starts with "sk.") with the "Downloads:Read" scope,\n' +
+      'used to authenticate Swift Package Manager when fetching the Mapbox Navigation SDK.\n' +
+      'Add it to your app.json plugins array:\n' +
+      '  ["@jacques_gordon/expo-mapbox-navigation", { "accessToken": "pk.xxx", "downloadsToken": "sk.xxx" }]'
+    );
+  }
+
   const [major, minor] = mapboxMapsVersion.split('.').map(Number);
   if (major < 11 || (major === 11 && minor < 11)) {
     throw new Error(
@@ -189,6 +205,33 @@ configurations.all {
     return mod;
   });
 
+  // ── iOS: .netrc for SPM authentication ───────────────────────────────────
+  // Swift Package Manager (used by ExpoMapboxNavigation.podspec's
+  // spm_dependency() to fetch the Mapbox Navigation SDK) authenticates
+  // against api.mapbox.com using a machine entry in the user's ~/.netrc
+  // file — this is Mapbox's documented mechanism for private SPM package
+  // access, identical in spirit to the MAPBOX_DOWNLOADS_TOKEN gradle
+  // property used on Android.
+  config = withDangerousMod(config, [
+    'ios',
+    (mod) => {
+      const homeDir = require('os').homedir();
+      const netrcPath = path.join(homeDir, '.netrc');
+      const netrcEntry = `machine api.mapbox.com\nlogin mapbox\npassword ${downloadsToken}\n`;
+
+      let existingContent = '';
+      if (fs.existsSync(netrcPath)) {
+        existingContent = fs.readFileSync(netrcPath, 'utf8');
+      }
+
+      if (!existingContent.includes('machine api.mapbox.com')) {
+        fs.writeFileSync(netrcPath, existingContent + netrcEntry, { mode: 0o600 });
+      }
+
+      return mod;
+    },
+  ]);
+
   return config;
 };
 

package/ios/ExpoMapboxNavigationModule.swift

@@ -0,0 +1,60 @@
+import ExpoModulesCore
+
+public class ExpoMapboxNavigationModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExpoMapboxNavigation")
+
+    View(ExpoMapboxNavigationView.self) {
+      // Events must exactly mirror the Android module's Events() list.
+      Events(
+        "onRouteProgressChanged",
+        "onRoutesReady",
+        "onNavigationFinished",
+        "onNavigationCancelled",
+        "onRoutesFailed",
+        "onArrival",
+        "onManeuverBannerPressed"
+      )
+
+      Prop("coordinates") { (view: ExpoMapboxNavigationView, coordinates: [[String: Double]]) in
+        view.setCoordinates(coordinates)
+      }
+      Prop("waypointIndices") { (view: ExpoMapboxNavigationView, indices: [Int]?) in
+        view.setWaypointIndices(indices)
+      }
+      Prop("language") { (view: ExpoMapboxNavigationView, language: String?) in
+        view.setLanguage(language)
+      }
+      Prop("voiceUnits") { (view: ExpoMapboxNavigationView, units: String?) in
+        view.setVoiceUnits(units)
+      }
+      Prop("navigationProfile") { (view: ExpoMapboxNavigationView, profile: String?) in
+        view.setNavigationProfile(profile)
+      }
+      Prop("excludeTypes") { (view: ExpoMapboxNavigationView, types: [String]?) in
+        view.setExcludeTypes(types)
+      }
+      Prop("mapStyle") { (view: ExpoMapboxNavigationView, style: String?) in
+        view.setMapStyle(style)
+      }
+      Prop("mute") { (view: ExpoMapboxNavigationView, mute: Bool) in
+        view.setMute(mute)
+      }
+      Prop("maxHeight") { (view: ExpoMapboxNavigationView, height: Double?) in
+        view.setMaxHeight(height)
+      }
+      Prop("maxWidth") { (view: ExpoMapboxNavigationView, width: Double?) in
+        view.setMaxWidth(width)
+      }
+      Prop("useMapMatching") { (view: ExpoMapboxNavigationView, use: Bool) in
+        view.setUseMapMatching(use)
+      }
+      Prop("customRasterTileUrl") { (view: ExpoMapboxNavigationView, url: String?) in
+        view.setCustomRasterTileUrl(url)
+      }
+      Prop("customRasterAboveLayerId") { (view: ExpoMapboxNavigationView, layerId: String?) in
+        view.setCustomRasterAboveLayerId(layerId)
+      }
+    }
+  }
+}

package/ios/ExpoMapboxNavigationView.swift

@@ -0,0 +1,394 @@
+import ExpoModulesCore
+import UIKit
+import CoreLocation
+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
+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
+    }
+    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))
+    }
+
+    // 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)
+
+    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
+    }
+
+    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
+        ])
+
+        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).
+    }
+
+    // Show traversed-route fade, matching common navigation app behavior.
+    vc.routeLineTracksTraversal = true
+
+    // Mute parity with Android's resolveVoiceUnits/SpeechVolume approach.
+    if mute {
+      provider.routeVoiceController?.speechSynthesizer.muted = true
+    }
+
+    // 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)
+    }
+
+    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
+    }
+
+    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) }
+              ])
+            }
+          }
+        }
+
+        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])
+  }
+
+  // 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
+  }
+
+  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
+  }
+
+  // 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()
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.1.6",
+  "version": "2.2.0",
   "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",

package/plugin/src/index.js

@@ -8,6 +8,7 @@ const MAPBOX_MAPS_MIN_VERSION = '11.11.0';
 const withMapboxNavigation = (config, options = {}) => {
   const {
     accessToken,
+    downloadsToken,
     mapboxMapsVersion = MAPBOX_MAPS_MIN_VERSION,
     androidColorOverrides = {},
   } = options;
@@ -20,6 +21,21 @@ const withMapboxNavigation = (config, options = {}) => {
     );
   }
 
+  // downloadsToken (a secret sk.* token with the Downloads:Read scope) is
+  // required on iOS to authenticate Swift Package Manager's fetch of the
+  // Mapbox Navigation SDK package — without it, `pod install`/`expo
+  // prebuild` will fail to resolve the SPM dependency declared in
+  // ExpoMapboxNavigation.podspec.
+  if (!downloadsToken) {
+    throw new Error(
+      '[@jacques_gordon/expo-mapbox-navigation] `downloadsToken` is required for iOS builds.\n' +
+      'This must be a SECRET Mapbox token (starts with "sk.") with the "Downloads:Read" scope,\n' +
+      'used to authenticate Swift Package Manager when fetching the Mapbox Navigation SDK.\n' +
+      'Add it to your app.json plugins array:\n' +
+      '  ["@jacques_gordon/expo-mapbox-navigation", { "accessToken": "pk.xxx", "downloadsToken": "sk.xxx" }]'
+    );
+  }
+
   const [major, minor] = mapboxMapsVersion.split('.').map(Number);
   if (major < 11 || (major === 11 && minor < 11)) {
     throw new Error(
@@ -189,6 +205,33 @@ configurations.all {
     return mod;
   });
 
+  // ── iOS: .netrc for SPM authentication ───────────────────────────────────
+  // Swift Package Manager (used by ExpoMapboxNavigation.podspec's
+  // spm_dependency() to fetch the Mapbox Navigation SDK) authenticates
+  // against api.mapbox.com using a machine entry in the user's ~/.netrc
+  // file — this is Mapbox's documented mechanism for private SPM package
+  // access, identical in spirit to the MAPBOX_DOWNLOADS_TOKEN gradle
+  // property used on Android.
+  config = withDangerousMod(config, [
+    'ios',
+    (mod) => {
+      const homeDir = require('os').homedir();
+      const netrcPath = path.join(homeDir, '.netrc');
+      const netrcEntry = `machine api.mapbox.com\nlogin mapbox\npassword ${downloadsToken}\n`;
+
+      let existingContent = '';
+      if (fs.existsSync(netrcPath)) {
+        existingContent = fs.readFileSync(netrcPath, 'utf8');
+      }
+
+      if (!existingContent.includes('machine api.mapbox.com')) {
+        fs.writeFileSync(netrcPath, existingContent + netrcEntry, { mode: 0o600 });
+      }
+
+      return mod;
+    },
+  ]);
+
   return config;
 };
 

package/android/src/main/res/values/styles.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-        FIX: Street/road name text was being cut off on the instruction banner
-        (e.g. "Wulmersumsesteenwe" instead of "Wulmersumsesteenweg") on
-        narrower or smaller-DPI screens.
-
-        Root cause: MapboxPrimaryManeuver (the road name text view inside
-        MapboxManeuverView) uses a fixed text size by default with no
-        auto-shrink behavior, so long street names get clipped by ellipsis
-        instead of adapting to the available banner width.
-
-        Fix: define a custom text appearance with Android's built-in
-        autoSizeTextType="uniform", which lets the system shrink the text
-        size step-by-step (within autoSizeMinTextSize..autoSizeMaxTextSize)
-        until the full string fits the view width — exactly like Waze/Google
-        Maps adapt their instruction banner text across different phone
-        screen sizes.
-    -->
-    <style name="MapboxCustomManeuverTextStyle" parent="MapboxStylePrimaryManeuver">
-        <item name="android:autoSizeTextType">uniform</item>
-        <item name="android:autoSizeMinTextSize">16sp</item>
-        <item name="android:autoSizeMaxTextSize">28sp</item>
-        <item name="android:autoSizeStepGranularity">1sp</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <!--
-        Custom MapboxManeuverView style that:
-          1. Applies the auto-sizing primary maneuver text style above.
-          2. Keeps default backgrounds/colors (day mode handled by Nav SDK
-             style switching already implemented in ExpoMapboxNavigationView).
-    -->
-    <style name="MapboxCustomManeuverViewStyle" parent="MapboxStyleManeuverView">
-        <item name="primaryManeuverTextAppearance">@style/MapboxCustomManeuverTextStyle</item>
-    </style>
-
-</resources>