[CP] Indoor selector iOS UI (#8776)

aleksproger · evil159 · github-actions[bot] · commit e078827c2809 · 2025-12-18T14:10:36.000Z
- UI for indoor floor selection on iOS integrated with OrnamentsManager - Changed more gesture recognizers to only intercepts gestures when Map is the top-most view as some of them already modify in that way to allow proper gesture handling in SwiftUI, but also added it for scroll related gesturez as the map was intercepting gesturs that should be hadnled bu the UI control - Add possibility to stack view inside of the same OrnamentsPosition https://github.com/user-attachments/assets/fba353e5-89dc-438d-bda9-a60b4c048eec --------- cc @mapbox/maps-ios Co-authored-by: Roman Laitarenko <roman.laitarenko@mapbox.com> GitOrigin-RevId: 5c02703b6c35f2bd346e1623ad8d3fedbea096ff
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 .DS_Store
 /build
 .build
+.create-xcframework
+artifacts
 /Packages
 xcuserdata
 node_modules
diff --git a/Sources/Examples/All Examples/Lab/IndoorExample.swift b/Sources/Examples/All Examples/Lab/IndoorExample.swift
@@ -6,6 +6,7 @@ final class IndoorExample: UIViewController, ExampleProtocol {
     private var mapView: MapView!
     // Set indoor style. Do not commit staging style URIs.
     private var styleURI: String?
+    private var cancellables = Set<AnyCancelable>()
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -23,10 +24,10 @@ final class IndoorExample: UIViewController, ExampleProtocol {
         mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         mapView.ornaments.options.scaleBar.visibility = .visible
         // EXPERIMENTAL: Not intended for usage in current stata. Subject to change or deletion.
-        // mapView.mapboxMap.indoor.selectFloor(selectedFloorId: "b937e2aa3423453ab0552d9f")
-        // mapView.mapboxMap.indoor.onIndoorUpdate { indoorState in
-        //     print(indoorState)
-        // }
+        mapView.mapboxMap.indoor.selectFloor(selectedFloorId: "b937e2aa3423453ab0552d9f")
+        mapView.mapboxMap.indoor.onIndoorUpdated.sink { indoorState in
+             print(indoorState)
+        }.store(in: &cancellables)
 
         view.addSubview(mapView)
     }
diff --git a/Sources/MapboxMaps/Foundation/CoreAliases.swift b/Sources/MapboxMaps/Foundation/CoreAliases.swift
@@ -49,3 +49,4 @@ typealias CoreFeaturesetDescriptor = MapboxCoreMaps_Private.FeaturesetDescriptor
 typealias CoreColorTheme = MapboxCoreMaps_Private.ColorTheme
 typealias CoreAsyncOperationResultCallback = MapboxCoreMaps_Private.AsyncOperationResultCallback
 typealias UIEdgeInsetsCodable = MapboxCoreMaps.UIEdgeInsetsCodable
+typealias CoreIndoorManager = MapboxCoreMaps_Private.__IndoorManager
diff --git a/Sources/MapboxMaps/Foundation/MapView.swift b/Sources/MapboxMaps/Foundation/MapView.swift
@@ -496,7 +496,8 @@ open class MapView: UIView, SizeTrackingLayerDelegate {
             logoView: LogoView(logoSize: .regular()),
             scaleBarView: MapboxScaleBarOrnamentView(),
             compassView: MapboxCompassOrnamentView(),
-            attributionButton: InfoButtonOrnament())
+            attributionButton: InfoButtonOrnament(),
+            indoorSelectorView: IndoorSelectorView(model: IndoorSelectorModel(indoorManager: mapboxMap.indoor)))
 
         // Initialize/Configure location source and location manager
         location = LocationManager(
diff --git a/Sources/MapboxMaps/Foundation/MapboxMap.swift b/Sources/MapboxMaps/Foundation/MapboxMap.swift
@@ -213,8 +213,8 @@ public final class MapboxMap: StyleManager {
     @_spi(Internal)
     public lazy var map: MapboxCoreMaps.Map = .Marshaller.toSwift(__map)
 
-    // @_spi(Experimental)
-    // public lazy var indoor: IndoorManager = .Marshaller.toSwift(__map.getIndoorManager())
+    @_spi(Experimental)
+    public lazy var indoor: IndoorManager = .Marshaller.toSwift(__map.getIndoorManager())
 
     deinit {
         __map.destroyRenderer()
diff --git a/Sources/MapboxMaps/Gestures/GestureHandlers/DoubleTapToZoomInGestureHandler.swift b/Sources/MapboxMaps/Gestures/GestureHandlers/DoubleTapToZoomInGestureHandler.swift
@@ -16,6 +16,7 @@ internal final class DoubleTapToZoomInGestureHandler: GestureHandler, FocusableG
         self.mapboxMap = mapboxMap
         self.cameraAnimationsManager = cameraAnimationsManager
         super.init(gestureRecognizer: gestureRecognizer)
+        gestureRecognizer.delegate = self
         gestureRecognizer.addTarget(self, action: #selector(handleGesture(_:)))
     }
 
@@ -38,3 +39,14 @@ internal final class DoubleTapToZoomInGestureHandler: GestureHandler, FocusableG
         }
     }
 }
+
+extension DoubleTapToZoomInGestureHandler: UIGestureRecognizerDelegate {
+    func gestureRecognizer(
+        _ gestureRecognizer: UIGestureRecognizer,
+        shouldReceive touch: UITouch
+    ) -> Bool {
+        /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments)
+        assert(self.gestureRecognizer == gestureRecognizer)
+        return gestureRecognizer.attachedToSameView(as: touch)
+    }
+}
diff --git a/Sources/MapboxMaps/Gestures/GestureHandlers/PanGestureHandler.swift b/Sources/MapboxMaps/Gestures/GestureHandlers/PanGestureHandler.swift
@@ -187,6 +187,15 @@ extension PanGestureHandler: UIGestureRecognizerDelegate {
             return false
         }
     }
+
+    func gestureRecognizer(
+        _ gestureRecognizer: UIGestureRecognizer,
+        shouldReceive touch: UITouch
+    ) -> Bool {
+        /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments).
+        assert(self.gestureRecognizer == gestureRecognizer)
+        return gestureRecognizer.attachedToSameView(as: touch)
+    }
 }
 
 private extension CGPoint {
diff --git a/Sources/MapboxMaps/Gestures/GestureHandlers/PinchGestureHandler.swift b/Sources/MapboxMaps/Gestures/GestureHandlers/PinchGestureHandler.swift
@@ -93,6 +93,15 @@ extension PinchGestureHandler: UIGestureRecognizerDelegate {
         return self.gestureRecognizer === gestureRecognizer && zoomEnabled
     }
 
+    func gestureRecognizer(
+        _ gestureRecognizer: UIGestureRecognizer,
+        shouldReceive touch: UITouch
+    ) -> Bool {
+        /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments)
+        assert(self.gestureRecognizer == gestureRecognizer)
+        return gestureRecognizer.attachedToSameView(as: touch)
+    }
+
     func gestureRecognizer(
         _ gestureRecognizer: UIGestureRecognizer,
         shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer
diff --git a/Sources/MapboxMaps/Gestures/GestureHandlers/QuickZoomGestureHandler.swift b/Sources/MapboxMaps/Gestures/GestureHandlers/QuickZoomGestureHandler.swift
@@ -14,6 +14,7 @@ internal final class QuickZoomGestureHandler: GestureHandler, FocusableGestureHa
         gestureRecognizer.minimumPressDuration = 0
         self.mapboxMap = mapboxMap
         super.init(gestureRecognizer: gestureRecognizer)
+        gestureRecognizer.delegate = self
         gestureRecognizer.addTarget(self, action: #selector(handleGesture(_:)))
     }
 
@@ -48,3 +49,14 @@ internal final class QuickZoomGestureHandler: GestureHandler, FocusableGestureHa
         }
     }
 }
+
+extension QuickZoomGestureHandler: UIGestureRecognizerDelegate {
+    func gestureRecognizer(
+        _ gestureRecognizer: UIGestureRecognizer,
+        shouldReceive touch: UITouch
+    ) -> Bool {
+        /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments)
+        assert(self.gestureRecognizer == gestureRecognizer)
+        return gestureRecognizer.attachedToSameView(as: touch)
+    }
+}
diff --git a/Sources/MapboxMaps/Gestures/GestureHandlers/RotateGestureHandler.swift b/Sources/MapboxMaps/Gestures/GestureHandlers/RotateGestureHandler.swift
@@ -100,4 +100,13 @@ extension RotateGestureHandler: UIGestureRecognizerDelegate {
         return otherGestureRecognizer is UIPinchGestureRecognizer &&
         simultaneousRotateAndPinchZoomEnabled
     }
+
+    func gestureRecognizer(
+        _ gestureRecognizer: UIGestureRecognizer,
+        shouldReceive touch: UITouch
+    ) -> Bool {
+        /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments)
+        assert(self.gestureRecognizer == gestureRecognizer)
+        return gestureRecognizer.attachedToSameView(as: touch)
+    }
 }
diff --git a/Sources/MapboxMaps/Gestures/GestureHandlers/SingleTapGestureHandler.swift b/Sources/MapboxMaps/Gestures/GestureHandlers/SingleTapGestureHandler.swift
@@ -36,23 +36,16 @@ final class SingleTapGestureHandler: GestureHandler {
 extension SingleTapGestureHandler: UIGestureRecognizerDelegate {
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
         assert(self.gestureRecognizer == gestureRecognizer)
-
         guard gestureRecognizer.attachedToSameView(as: otherGestureRecognizer) else { return true }
-
         return otherGestureRecognizer is UITapGestureRecognizer
     }
 
     func gestureRecognizer(
         _ gestureRecognizer: UIGestureRecognizer,
         shouldReceive touch: UITouch
     ) -> Bool {
+        /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments)
         assert(self.gestureRecognizer == gestureRecognizer)
-
-        /// Only handle touches that targeting the map not view annotations.
-        guard gestureRecognizer.attachedToSameView(as: touch) else {
-            return false
-        }
-
-        return true
+        return gestureRecognizer.attachedToSameView(as: touch)
     }
 }
diff --git a/Sources/MapboxMaps/Ornaments/IndoorSelectorModel.swift b/Sources/MapboxMaps/Ornaments/IndoorSelectorModel.swift
@@ -0,0 +1,57 @@
+import UIKit
+@_spi(Experimental) import MapboxCoreMaps
+
+protocol IndoorSelectorModelProtocol: AnyObject {
+    var floors: [IndoorFloor] { get }
+    var selectedFloorId: String { get }
+    var isHidden: Bool { get }
+    var onFloorsUpdated: (() -> Void)? { get set }
+    var onFloorSelected: (() -> Void)? { get set }
+    var onVisibilityChanged: (() -> Void)? { get set }
+
+    func selectFloor(_ floorId: String)
+}
+
+final class IndoorSelectorModel: IndoorSelectorModelProtocol {
+    private(set) var floors: [IndoorFloor] = []
+    private(set) var selectedFloorId: String = ""
+    private(set) var isHidden: Bool = true
+
+    private let indoorManager: IndoorManager
+    var onFloorsUpdated: (() -> Void)?
+    var onFloorSelected: (() -> Void)?
+    var onVisibilityChanged: (() -> Void)?
+
+    private var cancellables = Set<AnyCancelable>()
+
+    init(indoorManager: IndoorManager) {
+        self.indoorManager = indoorManager
+
+        indoorManager.onIndoorUpdated.sink { [weak self] state in
+            self?.onIndoorUpdated(state)
+        }.store(in: &cancellables)
+    }
+
+    func selectFloor(_ floorId: String) {
+        selectedFloorId = floorId
+        indoorManager.selectFloor(selectedFloorId: floorId)
+        onFloorSelected?()
+    }
+
+    private func onIndoorUpdated(_ state: IndoorState) {
+        if floors != state.floors {
+            floors = state.floors
+            onFloorsUpdated?()
+        }
+
+        if selectedFloorId != state.selectedFloorId {
+            selectedFloorId = state.selectedFloorId
+            onFloorSelected?()
+        }
+
+        if isHidden != state.floors.isEmpty {
+            isHidden = state.floors.isEmpty
+            onVisibilityChanged?()
+        }
+    }
+}
diff --git a/Sources/MapboxMaps/Ornaments/IndoorSelectorView+Cell.swift b/Sources/MapboxMaps/Ornaments/IndoorSelectorView+Cell.swift
@@ -0,0 +1,46 @@
+import UIKit
+
+extension IndoorSelectorView {
+    class Cell: UICollectionViewCell {
+        static let reuseIdentifier = "\(type(of: IndoorSelectorView.Cell.self))"
+
+        private let titleLabel: UILabel = {
+            let label = UILabel()
+            label.textAlignment = .center
+            label.font = Constants.titleFont
+            label.adjustsFontForContentSizeCategory = true
+            return label
+        }()
+
+        override init(frame: CGRect) {
+            super.init(frame: frame)
+            contentView.addSubview(titleLabel)
+        }
+
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+
+        override func layoutSubviews() {
+            super.layoutSubviews()
+            titleLabel.frame = bounds
+        }
+
+        func configure(title: String, isSelected: Bool) {
+            titleLabel.text = String(title.prefix(Constants.titleMaxLength))
+            contentView.backgroundColor = isSelected ? Constants.selectedBackgroundColor : Constants.unselectedBackgroundColor
+            titleLabel.textColor = isSelected ? Constants.selectedTextColor : Constants.unselectedTextColor
+        }
+    }
+}
+
+extension IndoorSelectorView.Cell {
+    enum Constants {
+        static let titleFont = UIFont.preferredFont(forTextStyle: .headline)
+        static let selectedBackgroundColor = UIColor(white: 0.30, alpha: 1.0)
+        static let unselectedBackgroundColor = UIColor.clear
+        static let selectedTextColor = UIColor.white
+        static let unselectedTextColor = UIColor.label
+        static let titleMaxLength = 3
+    }
+}
diff --git a/Sources/MapboxMaps/Ornaments/IndoorSelectorView.swift b/Sources/MapboxMaps/Ornaments/IndoorSelectorView.swift
diff --git a/Sources/MapboxMaps/Ornaments/OrnamentOptions.swift b/Sources/MapboxMaps/Ornaments/OrnamentOptions.swift
diff --git a/Sources/MapboxMaps/Ornaments/OrnamentsManager.swift b/Sources/MapboxMaps/Ornaments/OrnamentsManager.swift
diff --git a/Tests/MapboxMapsTests/Ornaments/Mocks/MockIndoorSelectorModel.swift b/Tests/MapboxMapsTests/Ornaments/Mocks/MockIndoorSelectorModel.swift
diff --git a/Tests/MapboxMapsTests/Ornaments/OrnamentManagerTests.swift b/Tests/MapboxMapsTests/Ornaments/OrnamentManagerTests.swift

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ internal final class DoubleTapToZoomInGestureHandler: GestureHandler, FocusableG`
`16`	`16`	`self.mapboxMap = mapboxMap`
`17`	`17`	`self.cameraAnimationsManager = cameraAnimationsManager`
`18`	`18`	`super.init(gestureRecognizer: gestureRecognizer)`
	`19`	`+ gestureRecognizer.delegate = self`
`19`	`20`	`gestureRecognizer.addTarget(self, action: #selector(handleGesture(_:)))`
`20`	`21`	`}`
`21`	`22`
`@@ -38,3 +39,14 @@ internal final class DoubleTapToZoomInGestureHandler: GestureHandler, FocusableG`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`}`
	`42`	`+`
	`43`	`+extension DoubleTapToZoomInGestureHandler: UIGestureRecognizerDelegate {`
	`44`	`+ func gestureRecognizer(`
	`45`	`+ _ gestureRecognizer: UIGestureRecognizer,`
	`46`	`+ shouldReceive touch: UITouch`
	`47`	`+ ) -> Bool {`
	`48`	`+ /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments)`
	`49`	`+ assert(self.gestureRecognizer == gestureRecognizer)`
	`50`	`+ return gestureRecognizer.attachedToSameView(as: touch)`
	`51`	`+ }`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,15 @@ extension PanGestureHandler: UIGestureRecognizerDelegate {`
`187`	`187`	`return false`
`188`	`188`	`}`
`189`	`189`	`}`
	`190`	`+`
	`191`	`+ func gestureRecognizer(`
	`192`	`+ _ gestureRecognizer: UIGestureRecognizer,`
	`193`	`+ shouldReceive touch: UITouch`
	`194`	`+ ) -> Bool {`
	`195`	`+ /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments).`
	`196`	`+ assert(self.gestureRecognizer == gestureRecognizer)`
	`197`	`+ return gestureRecognizer.attachedToSameView(as: touch)`
	`198`	`+ }`
`190`	`199`	`}`
`191`	`200`
`192`	`201`	`private extension CGPoint {`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ internal final class QuickZoomGestureHandler: GestureHandler, FocusableGestureHa`
`14`	`14`	`gestureRecognizer.minimumPressDuration = 0`
`15`	`15`	`self.mapboxMap = mapboxMap`
`16`	`16`	`super.init(gestureRecognizer: gestureRecognizer)`
	`17`	`+ gestureRecognizer.delegate = self`
`17`	`18`	`gestureRecognizer.addTarget(self, action: #selector(handleGesture(_:)))`
`18`	`19`	`}`
`19`	`20`
`@@ -48,3 +49,14 @@ internal final class QuickZoomGestureHandler: GestureHandler, FocusableGestureHa`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`}`
	`52`	`+`
	`53`	`+extension QuickZoomGestureHandler: UIGestureRecognizerDelegate {`
	`54`	`+ func gestureRecognizer(`
	`55`	`+ _ gestureRecognizer: UIGestureRecognizer,`
	`56`	`+ shouldReceive touch: UITouch`
	`57`	`+ ) -> Bool {`
	`58`	`+ /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments)`
	`59`	`+ assert(self.gestureRecognizer == gestureRecognizer)`
	`60`	`+ return gestureRecognizer.attachedToSameView(as: touch)`
	`61`	`+ }`
	`62`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,13 @@ extension RotateGestureHandler: UIGestureRecognizerDelegate {`
`100`	`100`	`return otherGestureRecognizer is UIPinchGestureRecognizer &&`
`101`	`101`	`simultaneousRotateAndPinchZoomEnabled`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ func gestureRecognizer(`
	`105`	`+ _ gestureRecognizer: UIGestureRecognizer,`
	`106`	`+ shouldReceive touch: UITouch`
	`107`	`+ ) -> Bool {`
	`108`	`+ /// Only handle touches that targeting the map, but any of its subviews (including view annotations and ornaments)`
	`109`	`+ assert(self.gestureRecognizer == gestureRecognizer)`
	`110`	`+ return gestureRecognizer.attachedToSameView(as: touch)`
	`111`	`+ }`
`103`	`112`	`}`