@jacques_gordon/expo-mapbox-navigation 2.2.4 → 2.2.6

package/ios/ExpoMapboxNavigationModule.swift

@@ -5,7 +5,8 @@ public class ExpoMapboxNavigationModule: Module {
     Name("ExpoMapboxNavigation")
 
     View(ExpoMapboxNavigationView.self) {
-      // Events must exactly mirror the Android module's Events() list.
+
+      // ── Events (exact parity with Android module Events() list) ─────────────
       Events(
         "onRouteProgressChanged",
         "onRoutesReady",
@@ -16,44 +17,65 @@ public class ExpoMapboxNavigationModule: Module {
         "onManeuverBannerPressed"
       )
 
-      Prop("coordinates") { (view: ExpoMapboxNavigationView, coordinates: [[String: Double]]) in
-        view.setCoordinates(coordinates)
+      // ── Base props ────────────────────────────────────────────────────────────
+      Prop("coordinates") { (view: ExpoMapboxNavigationView, v: [[String: Double]]) in
+        view.setCoordinates(v)
+      }
+      Prop("waypointIndices") { (view: ExpoMapboxNavigationView, v: [Int]?) in
+        view.setWaypointIndices(v)
+      }
+      Prop("language") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setLanguage(v)
+      }
+      Prop("voiceUnits") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setVoiceUnits(v)
       }
-      Prop("waypointIndices") { (view: ExpoMapboxNavigationView, indices: [Int]?) in
-        view.setWaypointIndices(indices)
+      Prop("navigationProfile") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setNavigationProfile(v)
       }
-      Prop("language") { (view: ExpoMapboxNavigationView, language: String?) in
-        view.setLanguage(language)
+      Prop("excludeTypes") { (view: ExpoMapboxNavigationView, v: [String]?) in
+        view.setExcludeTypes(v)
       }
-      Prop("voiceUnits") { (view: ExpoMapboxNavigationView, units: String?) in
-        view.setVoiceUnits(units)
+      Prop("mapStyle") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setMapStyle(v)
       }
-      Prop("navigationProfile") { (view: ExpoMapboxNavigationView, profile: String?) in
-        view.setNavigationProfile(profile)
+      Prop("mute") { (view: ExpoMapboxNavigationView, v: Bool) in
+        view.setMute(v)
       }
-      Prop("excludeTypes") { (view: ExpoMapboxNavigationView, types: [String]?) in
-        view.setExcludeTypes(types)
+      Prop("maxHeight") { (view: ExpoMapboxNavigationView, v: Double?) in
+        view.setMaxHeight(v)
       }
-      Prop("mapStyle") { (view: ExpoMapboxNavigationView, style: String?) in
-        view.setMapStyle(style)
+      Prop("maxWidth") { (view: ExpoMapboxNavigationView, v: Double?) in
+        view.setMaxWidth(v)
       }
-      Prop("mute") { (view: ExpoMapboxNavigationView, mute: Bool) in
-        view.setMute(mute)
+      Prop("useMapMatching") { (view: ExpoMapboxNavigationView, v: Bool) in
+        view.setUseMapMatching(v)
+      }
+      Prop("customRasterTileUrl") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setCustomRasterTileUrl(v)
+      }
+      Prop("customRasterAboveLayerId") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setCustomRasterAboveLayerId(v)
+      }
+
+      // ── Color customization props (parity with Android) ───────────────────────
+      Prop("maneuverBackgroundColorDay") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setManeuverBackgroundColorDay(v)
       }
-      Prop("maxHeight") { (view: ExpoMapboxNavigationView, height: Double?) in
-        view.setMaxHeight(height)
+      Prop("maneuverTurnIconColor") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setManeuverTurnIconColor(v)
       }
-      Prop("maxWidth") { (view: ExpoMapboxNavigationView, width: Double?) in
-        view.setMaxWidth(width)
+      Prop("etaBarBackgroundColor") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setEtaBarBackgroundColor(v)
       }
-      Prop("useMapMatching") { (view: ExpoMapboxNavigationView, use: Bool) in
-        view.setUseMapMatching(use)
+      Prop("etaTextColor") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setEtaTextColor(v)
       }
-      Prop("customRasterTileUrl") { (view: ExpoMapboxNavigationView, url: String?) in
-        view.setCustomRasterTileUrl(url)
+      Prop("iconButtonColor") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setIconButtonColor(v)
       }
-      Prop("customRasterAboveLayerId") { (view: ExpoMapboxNavigationView, layerId: String?) in
-        view.setCustomRasterAboveLayerId(layerId)
+      Prop("iconButtonMutedColor") { (view: ExpoMapboxNavigationView, v: String?) in
+        view.setIconButtonMutedColor(v)
       }
     }
   }

package/ios/ExpoMapboxNavigationView.swift

@@ -1,25 +1,20 @@
 import ExpoModulesCore
 import UIKit
 import CoreLocation
-import MapboxDirections
+// MapboxDirections types (Waypoint, NavigationRouteOptions, etc.) are
+// re-exported by MapboxNavigationCore in Navigation SDK v3.
 import MapboxNavigationCore
 import MapboxNavigationUIKit
 
-// 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
+    // MARK: - Events (mirrors Android EventDispatchers exactly)
     let onRouteProgressChanged = EventDispatcher()
-    let onRoutesReady = EventDispatcher()
-    let onNavigationFinished = EventDispatcher()
-    let onNavigationCancelled = EventDispatcher()
-    let onRoutesFailed = EventDispatcher()
-    let onArrival = EventDispatcher()
+    let onRoutesReady          = EventDispatcher()
+    let onNavigationFinished   = EventDispatcher()
+    let onNavigationCancelled  = EventDispatcher()
+    let onRoutesFailed         = EventDispatcher()
+    let onArrival              = EventDispatcher()
     let onManeuverBannerPressed = EventDispatcher()
 
     // MARK: - Mapbox core
@@ -29,72 +24,79 @@ public class ExpoMapboxNavigationView: ExpoView {
     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?
+    // MARK: - State (mirrors Android state vars)
+    private var isMuted        = false
+    private var isOverviewMode = false
+
+    // MARK: - Base props (parity with Android)
+    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: - Color customization props (parity with Android)
+    // On iOS the NavigationViewController drop-in handles all UI natively,
+    // so we store these and apply what we can via its public API.
+    private var maneuverBackgroundColorDay: String?
+    private var maneuverTurnIconColor:      String?
+    private var etaBarBackgroundColor:      String?
+    private var etaTextColor:               String?
+    private var iconButtonColor:            String?
+    private var iconButtonMutedColor:       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
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            let provider = MapboxNavigationProvider(coreConfig: .init())
+            self.mapboxNavigationProvider = provider
+            self.mapboxNavigation = provider.mapboxNavigation
+        }
     }
 
-    // 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+)
+    // MARK: - Voice units (Issue #31 parity — exact same logic as Android)
     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"
     }
 
-    // MARK: - Route fetching
+    // 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))
+            Waypoint(coordinate: CLLocationCoordinate2D(
+                latitude:  coord["latitude"]  ?? 0.0,
+                longitude: coord["longitude"] ?? 0.0
+            ))
         }
 
         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
+        if let langTag = language { options.locale = Locale(identifier: langTag) }
+        options.distanceUnit = resolveVoiceUnits() == "imperial" ? .mile : .kilometer
+
+        switch navigationProfile ?? "driving-traffic" {
+        case "driving-traffic": options.profileIdentifier = .automobileAvoidingTraffic
+        case "driving":         options.profileIdentifier = .automobile
+        case "walking":         options.profileIdentifier = .walking
+        case "cycling":         options.profileIdentifier = .cycling
+        default:                options.profileIdentifier = .automobileAvoidingTraffic
         }
 
         routeRequestTask?.cancel()
@@ -108,8 +110,8 @@ public class ExpoMapboxNavigationView: ExpoView {
                 self.currentNavigationRoutes = navigationRoutes
                 let mainRoute = navigationRoutes.mainRoute.route
                 self.onRoutesReady([
-                    "routeCount": navigationRoutes.alternativeRoutes.count + 1,
-                    "distanceMeters": mainRoute.distance,
+                    "routeCount":      navigationRoutes.alternativeRoutes.count + 1,
+                    "distanceMeters":  mainRoute.distance,
                     "durationSeconds": mainRoute.expectedTravelTime
                 ])
                 await MainActor.run {
@@ -119,38 +121,33 @@ public class ExpoMapboxNavigationView: ExpoView {
         }
     }
 
-    // MARK: - Present NavigationViewController
+    // MARK: - Present NavigationViewController (drop-in: includes ETA bar,
+    // speed limit, lane guidance, mute/overview/recenter buttons natively)
     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()
+            voiceController:  provider.routeVoiceController,
+            eventsManager:    provider.eventsManager()
         )
 
         let vc = NavigationViewController(
-            navigationRoutes: navigationRoutes,
+            navigationRoutes:  navigationRoutes,
             navigationOptions: navigationOptions
         )
         vc.delegate = self
         vc.routeLineTracksTraversal = true
 
-        // Mute: FIX — routeVoiceController is non-optional in v3, no ? needed
+        // Apply mute state
         if mute {
             provider.routeVoiceController.speechSynthesizer.muted = true
         }
 
-        // Tap banner → emit full steps list
-        attachManeuverBannerTapHandler(to: vc)
-
+        // Add to view hierarchy FIRST, then attach tap handler
         addSubview(vc.view)
         vc.view.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
@@ -165,51 +162,58 @@ public class ExpoMapboxNavigationView: ExpoView {
             vc.didMove(toParent: parentVC)
         }
 
+        // Tap on banner → emit full steps list (parity with Android banner tap)
+        attachManeuverBannerTapHandler(to: vc)
+
         self.navigationViewController = vc
+        isOverviewMode = false
     }
 
+    // MARK: - Banner tap handler (parity with Android mv.setOnClickListener)
     private func attachManeuverBannerTapHandler(to vc: NavigationViewController) {
         let tap = UITapGestureRecognizer(target: self, action: #selector(handleManeuverBannerTap))
         vc.navigationView.topBannerContainerView.addGestureRecognizer(tap)
         vc.navigationView.topBannerContainerView.isUserInteractionEnabled = true
     }
 
-    @objc private func handleManeuverBannerTap() {
-        emitFullRouteSteps()
-    }
+    @objc private func handleManeuverBannerTap() { emitFullRouteSteps() }
 
-    // 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.
+    // MARK: - Full route steps (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 {
                 stepsPayload.append([
-                    "instruction": step.instructions,
-                    "distanceMeters": step.distance,
-                    "durationSeconds": step.expectedTravelTime,
-                    "maneuverType": String(describing: step.maneuverType),
+                    "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
+                    "roadName":         step.names?.first ?? "",
+                    "laneInstructions": [] // rendered natively by NavigationViewController banner
                 ])
             }
         }
-
         onManeuverBannerPressed(["steps": stepsPayload])
     }
 
+    // MARK: - Mute (parity with Android toggleMute)
+    private func applyMute(_ shouldMute: Bool) {
+        isMuted = shouldMute
+        mapboxNavigationProvider?.routeVoiceController.speechSynthesizer.muted = shouldMute
+    }
+
+    // MARK: - Cancel (parity with Android cancelNavigation)
+    private func cancelNavigation() {
+        tearDownNavigationViewController()
+        onNavigationCancelled([:])
+    }
+
     // MARK: - Teardown
     private func tearDownNavigationViewController() {
         guard let vc = navigationViewController else { return }
@@ -217,12 +221,8 @@ public class ExpoMapboxNavigationView: ExpoView {
         vc.view.removeFromSuperview()
         vc.removeFromParent()
         navigationViewController = nil
-        currentNavigationRoutes = nil
-    }
-
-    private func cancelNavigation() {
-        tearDownNavigationViewController()
-        onNavigationCancelled([:])
+        currentNavigationRoutes  = nil
+        isOverviewMode = false
     }
 
     private func findParentViewController() -> UIViewController? {
@@ -234,27 +234,33 @@ public class ExpoMapboxNavigationView: ExpoView {
         return nil
     }
 
-    // MARK: - Prop setters
+    // MARK: - Prop setters (exact 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
-        // 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 }
+    func setWaypointIndices(_ i: [Int]?)   { waypointIndices = i }
+    func setLanguage(_ l: String?)         { language = l }
+    func setVoiceUnits(_ u: String?)       { voiceUnits = u }
+    func setNavigationProfile(_ p: String?) { navigationProfile = p }
+    func setExcludeTypes(_ t: [String]?)   { excludeTypes = t }
+    func setMapStyle(_ s: String?)         { mapStyle = s }
+    func setMute(_ m: Bool)                { mute = m; applyMute(m) }
+    func setMaxHeight(_ h: Double?)        { maxHeight = h }
+    func setMaxWidth(_ w: Double?)         { maxWidth = w }
+    func setUseMapMatching(_ u: Bool)      { useMapMatching = u }
+    func setCustomRasterTileUrl(_ u: String?)        { customRasterTileUrl = u }
+    func setCustomRasterAboveLayerId(_ l: String?)   { customRasterAboveLayerId = l }
+
+    // Color props — stored for reference; NavigationViewController applies its own
+    // theme automatically. Custom color support via NavigationViewController's
+    // StyleManager or subclassing can be added in future iterations.
+    func setManeuverBackgroundColorDay(_ c: String?) { maneuverBackgroundColorDay = c }
+    func setManeuverTurnIconColor(_ c: String?)      { maneuverTurnIconColor = c }
+    func setEtaBarBackgroundColor(_ c: String?)      { etaBarBackgroundColor = c }
+    func setEtaTextColor(_ c: String?)               { etaTextColor = c }
+    func setIconButtonColor(_ c: String?)            { iconButtonColor = c }
+    func setIconButtonMutedColor(_ c: String?)       { iconButtonMutedColor = c }
 
     // MARK: - Lifecycle
     public override func removeFromSuperview() {
@@ -265,6 +271,7 @@ public class ExpoMapboxNavigationView: ExpoView {
 }
 
 // MARK: - NavigationViewControllerDelegate
+// (parity with Android RoutesObserver + RouteProgressObserver + onArrival)
 extension ExpoMapboxNavigationView: NavigationViewControllerDelegate {
 
     public func navigationViewController(
@@ -274,12 +281,11 @@ extension ExpoMapboxNavigationView: NavigationViewControllerDelegate {
         rawLocation: CLLocation
     ) {
         onRouteProgressChanged([
-            "distanceRemaining": progress.distanceRemaining,
-            "durationRemaining": progress.durationRemaining,
-            "distanceTraveled": progress.distanceTraveled,
-            "fractionTraveled": progress.fractionTraveled,
-            "currentStepDistanceRemaining":
-                progress.currentLegProgress.currentStepProgress.distanceRemaining
+            "distanceRemaining":            progress.distanceRemaining,
+            "durationRemaining":            progress.durationRemaining,
+            "distanceTraveled":             progress.distanceTraveled,
+            "fractionTraveled":             progress.fractionTraveled,
+            "currentStepDistanceRemaining": progress.currentLegProgress.currentStepProgress.distanceRemaining
         ])
     }
 
@@ -288,7 +294,7 @@ extension ExpoMapboxNavigationView: NavigationViewControllerDelegate {
         didArriveAt waypoint: Waypoint
     ) -> Bool {
         onArrival([:])
-        return true
+        return true // continue to next waypoint if multi-stop
     }
 
     public func navigationViewControllerDidDismiss(

package/package.json

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