@rnmapbox/maps 10.0.15-rc.0 → 10.1.0-beta.2

package/ios/RCTMGL-v10/RCTMGLLocationModuleV11.swift

@@ -0,0 +1,32 @@
+#if RNMBX_11
+import MapboxMaps
+
+let RCT_MAPBOX_USER_LOCATION_UPDATE = "MapboxUserLocationUpdate";
+
+@objc(RCTMGLLocationModule)
+class RCTMGLLocationModule: RCTEventEmitter {
+  
+  static weak var shared : RCTMGLLocationModule? = nil
+  
+  override init() {
+    super.init()
+    RCTMGLLocationModule.shared = self
+  }
+  
+  @objc
+  override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+  
+  @objc override func supportedEvents() -> [String]
+  {
+    return [RCT_MAPBOX_USER_LOCATION_UPDATE];
+  }
+
+  var locationProvider : LocationProvider & HeadingProvider {
+    get {
+      fatalError("RCTMGLLocationModule.locationProvider not implemented")
+    }
+  }
+}
+#endif

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -14,6 +14,56 @@ class FeatureEntry {
   }
 }
 
+
+#if RNMBX_11
+extension QueriedRenderedFeature {
+  var feature : Feature { return queriedFeature.feature }
+}
+#else
+typealias QueriedRenderedFeature = QueriedFeature
+#endif
+
+#if RNMBX_11
+public struct MapEventType<Payload> {
+    var method: (_ map: MapboxMap) -> Signal<Payload>
+
+    init(_ method: @escaping (MapboxMap) -> Signal<Payload>) {
+        self.method = method
+    }
+
+    /// The style has been fully loaded, and the map has rendered all visible tiles.
+  public static var mapLoaded: MapEventType<MapLoaded> { .init( \.onMapLoaded ) }
+    /// An error that has occurred while loading the Map.
+    public static var mapLoadingError: MapEventType<MapLoadingError> { .init(\.onMapLoadingError) }
+    /// The requested style has been fully loaded.
+    public static var styleLoaded: MapEventType<StyleLoaded> { .init(\.onStyleLoaded) }
+    /// The requested style data has been loaded.
+    public static var styleDataLoaded: MapEventType<StyleDataLoaded> { .init(\.onStyleDataLoaded) }
+    /// The camera has changed.
+    public static var cameraChanged: MapEventType<CameraChanged> { .init(\.onCameraChanged) }
+    /// The map has entered the idle state.
+    public static var mapIdle: MapEventType<MapIdle> { .init(\.onMapIdle) }
+    /// The source has been added.
+    public static var sourceAdded: MapEventType<SourceAdded> { .init(\.onSourceAdded) }
+    /// The source has been removed.
+    public static var sourceRemoved: MapEventType<SourceRemoved> { .init(\.onSourceRemoved) }
+    /// A source data has been loaded.
+    public static var sourceDataLoaded: MapEventType<SourceDataLoaded> { .init(\.onSourceDataLoaded) }
+    /// A style has a missing image.
+    public static var styleImageMissing: MapEventType<StyleImageMissing> { .init(\.onStyleImageMissing) }
+    /// An image added to the style is no longer needed and can be removed.
+    public static var styleImageRemoveUnused: MapEventType<StyleImageRemoveUnused> { .init(\.onStyleImageRemoveUnused) }
+    /// The map started rendering a frame.
+    public static var renderFrameStarted: MapEventType<RenderFrameStarted> { .init(\.onRenderFrameStarted) }
+    /// The map finished rendering a frame.
+    public static var renderFrameFinished: MapEventType<RenderFrameFinished> { .init(\.onRenderFrameFinished) }
+    /// Resource requiest as been made.
+    public static var resourceRequest: MapEventType<ResourceRequest> { .init(\.onResourceRequest) }
+}
+
+typealias MapLoadingErrorPayload = MapLoadingError
+#endif
+
 class RCTMGLCameraChanged : RCTMGLEvent, RCTEvent {
   init(type: EventType, payload: [String:Any?]?, reactTag: NSNumber) {
     super.init(type: type, payload: payload)
@@ -47,7 +97,7 @@ class RCTMGLCameraChanged : RCTMGLEvent, RCTEvent {
   }
 }
 
-@objc(RCTMGLMapView)
+@objc(MBXMapView)
 open class RCTMGLMapView : MapView {
   var tapDelegate: IgnoreRCTMGLMakerViewGestureDelegate? = nil
 
@@ -83,6 +133,10 @@ open class RCTMGLMapView : MapView {
 
   var layerWaiters : [String:[(String) -> Void]] = [:]
   
+  #if RNMBX_11
+  var cancelables = Set<AnyCancelable>()
+  #endif
+  
   lazy var pointAnnotationManager : PointAnnotationManager = {
     let result = PointAnnotationManager(annotations: annotations, mapView: mapView)
     self._removeMapboxLongPressGestureRecognizer()
@@ -153,9 +207,14 @@ open class RCTMGLMapView : MapView {
   }
 
   public required init(frame:CGRect, eventDispatcher: RCTEventDispatcherProtocol) {
+    #if RNMBX_11
+    self.eventDispatcher = eventDispatcher
+    super.init(frame: frame, mapInitOptions: MapInitOptions())
+    #else
     let resourceOptions = ResourceOptions(accessToken: MGLModule.accessToken!)
     self.eventDispatcher = eventDispatcher
     super.init(frame: frame, mapInitOptions: MapInitOptions(resourceOptions: resourceOptions))
+    #endif
 
     self.mapView.gestures.delegate = self
 
@@ -193,14 +252,14 @@ open class RCTMGLMapView : MapView {
   
   // MARK: - React Native properties
 
-  @objc func setReactProjection(_ value: String?) {
+  @objc public func setReactProjection(_ value: String?) {
     if let value = value {
       let projection = StyleProjection(name: value == "globe" ? .globe : .mercator)
       try! self.mapboxMap.style.setProjection(projection)
     }
   }
 
-  @objc func setReactLocalizeLabels(_ value: NSDictionary?) {
+  @objc public func setReactLocalizeLabels(_ value: NSDictionary?) {
     onMapStyleLoaded { _ in
       if let value = value {
         logged("RCTMGLMapVIew.setReactLocalizeLabels") {
@@ -214,34 +273,34 @@ open class RCTMGLMapView : MapView {
   }
   
   
-  @objc func setReactAttributionEnabled(_ value: Bool) {
+  @objc public func setReactAttributionEnabled(_ value: Bool) {
     mapView.ornaments.options.attributionButton.visibility = value ? .visible : .hidden
   }
   
-  @objc func setReactAttributionPosition(_ position: [String: NSNumber]) {
+  @objc public func setReactAttributionPosition(_ position: [String: NSNumber]) {
     if let ornamentOptions = self.getOrnamentOptionsFromPosition(position) {
       mapView.ornaments.options.attributionButton.position = ornamentOptions.position
       mapView.ornaments.options.attributionButton.margins = ornamentOptions.margins
     }
   }
   
-  @objc func setReactLogoEnabled(_ value: Bool) {
+  @objc public func setReactLogoEnabled(_ value: Bool) {
     mapView.ornaments.options.logo.visibility = value ? .visible : .hidden
   }
   
-  @objc func setReactLogoPosition(_ position: [String: NSNumber]) {
+  @objc public func setReactLogoPosition(_ position: [String: NSNumber]) {
     if let ornamentOptions = self.getOrnamentOptionsFromPosition(position) {
       mapView.ornaments.options.logo.position = ornamentOptions.position
       mapView.ornaments.options.logo.margins = ornamentOptions.margins
     }
   }
   
-  @objc func setReactCompassEnabled(_ value: Bool) {
+  @objc public func setReactCompassEnabled(_ value: Bool) {
     compassEnabled = value
     refreshCompassVisibility()
   }
   
-  @objc func setReactCompassFadeWhenNorth(_ value: Bool) {
+  @objc public func setReactCompassFadeWhenNorth(_ value: Bool) {
     compassFadeWhenNorth = value
     refreshCompassVisibility()
   }
@@ -256,7 +315,7 @@ open class RCTMGLMapView : MapView {
     refreshCompassImage()
   }
   
-  @objc func setReactCompassPosition(_ position: [String: NSNumber]) {
+  @objc public func setReactCompassPosition(_ position: [String: NSNumber]) {
     if let ornamentOptions = self.getOrnamentOptionsFromPosition(position) {
       mapView.ornaments.options.compass.position = ornamentOptions.position
       mapView.ornaments.options.compass.margins = ornamentOptions.margins
@@ -286,15 +345,15 @@ open class RCTMGLMapView : MapView {
     }
   }
   
-  @objc func setReactCompassViewPosition(_ position: NSInteger) {
+  @objc public func setReactCompassViewPosition(_ position: NSInteger) {
     mapView.ornaments.options.compass.position = toOrnamentPositon(Int(truncating: NSNumber(value: position)))
   }
   
-  @objc func setReactCompassViewMargins(_ margins: CGPoint) {
+  @objc public func setReactCompassViewMargins(_ margins: CGPoint) {
     mapView.ornaments.options.compass.margins = margins;
   }
 
-  @objc func setReactCompassImage(_ image: String) {
+  @objc public func setReactCompassImage(_ image: String) {
     compassImage = image.isEmpty ? nil : image
     refreshCompassImage()
   }
@@ -312,33 +371,33 @@ open class RCTMGLMapView : MapView {
     }
   }
 
-  @objc func setReactScaleBarEnabled(_ value: Bool) {
+  @objc public func setReactScaleBarEnabled(_ value: Bool) {
     self.mapView.ornaments.options.scaleBar.visibility = value ? .visible : .hidden
   }
   
-  @objc func setReactScaleBarPosition(_ position: [String: NSNumber]) {
+  @objc public func setReactScaleBarPosition(_ position: [String: NSNumber]) {
     if let ornamentOptions = self.getOrnamentOptionsFromPosition(position) {
       mapView.ornaments.options.scaleBar.position = ornamentOptions.position
       mapView.ornaments.options.scaleBar.margins = ornamentOptions.margins
     }
   }
 
-  @objc func setReactZoomEnabled(_ value: Bool) {
+  @objc public func setReactZoomEnabled(_ value: Bool) {
     self.mapView.gestures.options.quickZoomEnabled = value
     self.mapView.gestures.options.doubleTapToZoomInEnabled = value
     self.mapView.gestures.options.pinchZoomEnabled = value
   }
 
-  @objc func setReactScrollEnabled(_ value: Bool) {
+  @objc public func setReactScrollEnabled(_ value: Bool) {
     self.mapView.gestures.options.panEnabled = value
     self.mapView.gestures.options.pinchPanEnabled = value
   }
 
-  @objc func setReactRotateEnabled(_ value: Bool) {
+  @objc public func setReactRotateEnabled(_ value: Bool) {
     self.mapView.gestures.options.rotateEnabled = value
   }
 
-  @objc func setReactPitchEnabled(_ value: Bool) {
+  @objc public func setReactPitchEnabled(_ value: Bool) {
     self.mapView.gestures.options.pitchEnabled = value
   }
 
@@ -368,7 +427,7 @@ open class RCTMGLMapView : MapView {
       addFeaturesToMap(style: style)
   }
   
-  @objc func setReactStyleURL(_ value: String?) {
+  @objc public func setReactStyleURL(_ value: String?) {
     var initialLoad = !self.styleLoaded
     if !initialLoad { refreshComponentsBeforeStyleChange() }
     self.styleLoaded = false
@@ -426,6 +485,25 @@ open class RCTMGLMapView : MapView {
 // MARK: - event handlers
 
 extension RCTMGLMapView {
+  #if RNMBX_11
+  private func onEvery<T>(event: MapEventType<T>, handler: @escaping (RCTMGLMapView, T) -> Void) {
+    let signal = event.method(self.mapView.mapboxMap)
+    signal.observe { [weak self] (mapEvent) in
+      guard let self = self else { return }
+
+      handler(self, mapEvent)
+    }.store(in: &cancelables)
+  }
+  
+  private func onNext<T>(event: MapEventType<T>, handler: @escaping (RCTMGLMapView, T) -> Void) {
+    let signal = event.method(self.mapView.mapboxMap)
+    signal.observeNext { [weak self] (mapEvent) in
+      guard let self = self else { return }
+
+      handler(self, mapEvent)
+    }.store(in: &cancelables)
+  }
+  #else
   private func onEvery<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RCTMGLMapView, MapEvent<Payload>) -> Void) {
     let eventListener = self.mapView.mapboxMap.onEvery(event: event) { [weak self](mapEvent) in
       guard let self = self else { return }
@@ -445,8 +523,9 @@ extension RCTMGLMapView {
       handler(self, mapEvent)
     }
   }
+  #endif
 
-  @objc func setReactOnMapChange(_ value: @escaping RCTBubblingEventBlock) {
+  @objc public func setReactOnMapChange(_ value: @escaping RCTBubblingEventBlock) {
     self.reactOnMapChange = value
 
     self.onEvery(event: .cameraChanged, handler: { (self, cameraEvent) in
@@ -538,8 +617,13 @@ extension RCTMGLMapView {
   public func setupEvents() {
     self.onEvery(event: .mapLoadingError, handler: { (self, event) in
       let eventPayload : MapLoadingErrorPayload = event.payload
+      #if RNMBX_11
+      let error = eventPayload
+      #else
+      let error = eventPayload.error
+      #endif
       var payload : [String:String] = [
-        "error": eventPayload.error.errorDescription ?? eventPayload.error.localizedDescription
+        "error": error.errorDescription ?? error.localizedDescription
       ]
       if let tileId = eventPayload.tileId {
         payload["tileId"] = "x:\(tileId.x) y:\(tileId.y) z:\(tileId.z)"
@@ -550,7 +634,7 @@ extension RCTMGLMapView {
       let rctmglEvent = RCTMGLEvent(type: .mapLoadingError, payload: payload);
       self.fireEvent(event: rctmglEvent, callback: self.reactOnMapChange)
 
-      if let message = eventPayload.error.errorDescription {
+      if let message = error.errorDescription {
         Logger.log(level: .error, message: "MapLoad error \(message)")
       } else {
         Logger.log(level: .error, message: "MapLoad error \(event)")
@@ -664,7 +748,7 @@ class IgnoreRCTMGLMakerViewGestureDelegate : NSObject, UIGestureRecognizerDelega
 
 extension RCTMGLMapView {
   
-  @objc func setReactOnPress(_ value: @escaping RCTBubblingEventBlock) {
+  @objc public func setReactOnPress(_ value: @escaping RCTBubblingEventBlock) {
     self.reactOnPress = value
 
     let singleTapGestureRecognizer = self.mapView.gestures.singleTapGestureRecognizer
@@ -676,7 +760,7 @@ extension RCTMGLMapView {
     singleTapGestureRecognizer.delegate = tapDelegate
   }
 
-  @objc func setReactOnLongPress(_ value: @escaping RCTBubblingEventBlock) {
+  @objc public func setReactOnLongPress(_ value: @escaping RCTBubblingEventBlock) {
     self.reactOnLongPress = value
 
     let longPressGestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(doHandleLongPress(_:)))
@@ -692,7 +776,7 @@ extension RCTMGLMapView: GestureManagerDelegate {
     return sources.filter { $0.isTouchable() }
   }
 
-  private func doHandleTapInSources(sources: [RCTMGLInteractiveElement], tapPoint: CGPoint, hits: [String: [QueriedFeature]], touchedSources: [RCTMGLInteractiveElement], callback: @escaping (_ hits: [String: [QueriedFeature]], _ touchedSources: [RCTMGLInteractiveElement]) -> Void) {
+  private func doHandleTapInSources(sources: [RCTMGLInteractiveElement], tapPoint: CGPoint, hits: [String: [QueriedRenderedFeature]], touchedSources: [RCTMGLInteractiveElement], callback: @escaping (_ hits: [String: [QueriedRenderedFeature]], _ touchedSources: [RCTMGLInteractiveElement]) -> Void) {
     DispatchQueue.main.async {
       if let source = sources.first {
         let hitbox = source.hitbox;
@@ -864,7 +948,7 @@ extension RCTMGLMapView: GestureManagerDelegate {
 
 extension RCTMGLMapView
 {
-  @objc func takeSnap(
+  @objc public func takeSnap(
     writeToDisk:Bool) -> URL
   {
     UIGraphicsBeginImageContextWithOptions(self.bounds.size, true, 0);
@@ -905,6 +989,9 @@ extension RCTMGLMapView {
       let layer = logged("setSourceVisibility.layer", info: { "\(layerInfo.id)" }) {
         try style.layer(withId: layerInfo.id)
       }
+      #if RNMBX_11
+      // RNMBX_11_TODO
+      #else
       if let layer = layer {
         if layer.source == sourceId {
           var good = true
@@ -922,6 +1009,7 @@ extension RCTMGLMapView {
           }
         }
       }
+      #endif
     }
   }
 }

package/ios/RCTMGL-v10/RCTMGLNativeUserLocation.swift

@@ -18,7 +18,11 @@ class RCTMGLNativeUserLocation : UIView, RCTMGLMapComponent {
   func _applySettings(_ map: RCTMGLMapView) {
     map.location.options.puckType = .puck2D(.makeDefault(showBearing: iosShowsUserHeadingIndicator))
     if (iosShowsUserHeadingIndicator) {
+      #if RNMBX_11
+      map.location.options.puckBearing = .heading
+      #else
       map.location.options.puckBearingSource = .heading
+      #endif
       map.location.options.puckBearingEnabled = true
     } else {
       map.location.options.puckBearingEnabled = false

package/ios/RCTMGL-v10/RCTMGLOfflineModule.swift

@@ -33,11 +33,19 @@ class RCTMGLOfflineModule: RCTEventEmitter {
   }
   
   lazy var offlineManager : OfflineManager = {
+    #if RNMBX_11
+    return OfflineManager()
+    #else
     return OfflineManager(resourceOptions: .init(accessToken: MGLModule.accessToken!))
+    #endif
   }()
   
   lazy var offlineRegionManager: OfflineRegionManager = {
+    #if RNMBX_11
+    return OfflineRegionManager()
+    #else
     return OfflineRegionManager(resourceOptions: .init(accessToken: MGLModule.accessToken!))
+    #endif
   }()
 
   lazy var tileStore : TileStore = {
@@ -350,11 +358,20 @@ class RCTMGLOfflineModule: RCTEventEmitter {
     
     let stylePackLoadOptions = StylePackLoadOptions(glyphsRasterizationMode: .ideographsRasterizedLocally, metadata: pack.metadata)
     
+    #if RNMBX_11
     let descriptorOptions = TilesetDescriptorOptions(
       styleURI: styleURI,
       zoomRange: zoomRange,
+      tilesets: [], // RNMBX_11_TODO
       stylePackOptions: stylePackLoadOptions
     )
+    #else
+    let descriptorOptions = TilesetDescriptorOptions(
+      styleURI: styleURI,
+      zoomRange: zoomRange,
+      stylePackOptions: stylePackLoadOptions
+    )
+    #endif
     let tilesetDescriptor = self.offlineManager.createTilesetDescriptor(for: descriptorOptions)
     
     let loadOptions = TileRegionLoadOptions(

package/ios/RCTMGL-v10/RCTMGLRasterDemSource.swift

@@ -30,7 +30,11 @@ class RCTMGLRasterDemSource : RCTMGLSource {
 
   override func makeSource() -> Source
   {
+    #if RNMBX_11 // RNMBX_11_TODO
+    var result = SourceType(id: "raster-dem-source-id-todo")
+    #else
     var result = SourceType()
+    #endif
     if let url = url {
       result.url = url
     } else if let tileUrlTemplates = tileUrlTemplates {

package/ios/RCTMGL-v10/RCTMGLRasterLayer.swift

@@ -6,7 +6,11 @@ class RCTMGLRasterLayer: RCTMGLLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     // let source : ImageSource = try self.sourceWithSourceID(in: style)
+    #if RNMBX_11
+    var layer = LayerType(id: self.id!, source: sourceID!)
+    #else
     var layer = LayerType(id: self.id!)
+    #endif
     layer.source = sourceID
     return layer
   }

package/ios/RCTMGL-v10/RCTMGLRasterSource.swift

@@ -18,7 +18,11 @@ class RCTMGLRasterSource : RCTMGLSource {
 
   override func makeSource() -> Source
   {
+    #if RNMBX_11
+    var result = RasterSource(id: self.id)
+    #else
     var result = RasterSource()
+    #endif
     if let url = url {
       result.url = url
     } else {

package/ios/RCTMGL-v10/RCTMGLShapeSource.swift

@@ -65,7 +65,11 @@ class RCTMGLShapeSource : RCTMGLSource {
 
   override func makeSource() -> Source
   {
+    #if RNMBX_11
+    var result =  GeoJSONSource(id: id)
+    #else
     var result =  GeoJSONSource()
+    #endif
 
     if let shape = shape {
       do {
@@ -211,8 +215,14 @@ extension RCTMGLShapeSource
       return .featureCollection(featureCollection)
     case .geometry(let geometry):
       return .geometry(geometry)
+    #if RNMBX_11
+    case .string(_):
+      // RNMBX_11_TODO
+      throw RCTMGLError.parseError("url as shape is not supported when updating a ShapeSource")
+    #else
     case .url(_):
       throw RCTMGLError.parseError("url as shape is not supported when updating a ShapeSource")
+      #endif
     }
   }
 
@@ -243,6 +253,58 @@ extension RCTMGLShapeSource
   }
 }
 
+#if !RNMBX_11
+class DummyCancellable : Cancelable {
+  func cancel() {}
+}
+
+#if false
+extension MapboxMap {
+  @discardableResult
+  public func getGeoJsonClusterExpansionZoom(forSourceId sourceId: String,
+                                             feature: Feature,
+                                             completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
+    self.queryFeatureExtension(for: sourceId,
+                               feature: feature,
+                               extension: "supercluster",
+                               extensionField: "expansion-zoom",
+                               args: nil,
+                               completion: completion)
+    return DummyCancellable()
+  }
+  @discardableResult
+  public func getGeoJsonClusterChildren(forSourceId sourceId: String,
+                                        feature: Feature,
+                                        completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
+    self.queryFeatureExtension(for: sourceId,
+                                   feature: feature,
+                                   extension: "supercluster",
+                                   extensionField: "children",
+                                   args: nil,
+                                   completion: completion)
+    return DummyCancellable()
+  }
+
+  @discardableResult
+  public func getGeoJsonClusterLeaves(forSourceId sourceId: String,
+                                      feature: Feature,
+                                      limit: UInt64 = 10,
+                                      offset: UInt64 = 0,
+                                      completion: @escaping (Result<FeatureExtensionValue, Error>) -> Void) -> Cancelable {
+      self.queryFeatureExtension(for: sourceId,
+                                   feature: /*MapboxCommon.Feature(*/feature/*)*/,
+                                   extension: "supercluster",
+                                   extensionField: "leaves",
+                                   args: ["limit": limit, "offset": offset],
+                                   completion: completion)
+    return DummyCancellable()
+  }
+  
+  
+}
+#endif
+#endif
+
 // MARK: - getClusterExpansionZoom/getClusterLeaves
 
 extension RCTMGLShapeSource
@@ -261,7 +323,7 @@ extension RCTMGLShapeSource
     }) {
       let cluster : Feature = try parse(featureJSON);
 
-      mapView.mapboxMap.queryFeatureExtension(for: self.id, feature: cluster, extension: "supercluster", extensionField: "expansion-zoom") { result in
+      mapView.mapboxMap.getGeoJsonClusterExpansionZoom(forSourceId: self.id, feature: cluster) { result in
         switch result {
         case .success(let features):
           guard let value = features.value as? NSNumber else {
@@ -291,7 +353,7 @@ extension RCTMGLShapeSource
       completion(.failure(error!))
     }) {
       let cluster : Feature = try parse(featureJSON);
-      mapView.mapboxMap.queryFeatureExtension(for: self.id, feature: cluster,  extension: "supercluster", extensionField: "leaves", args: ["limit": UInt64(number),"offset": UInt64(offset)]) {
+      mapView.mapboxMap.getGeoJsonClusterLeaves(forSourceId: self.id, feature: cluster, limit: UInt64(number), offset: UInt64(offset)) {
         result in
         switch result {
         case .success(let features):
@@ -313,7 +375,7 @@ extension RCTMGLShapeSource
       completion(.failure(error!))
     }) {
       let cluster : Feature = try parse(featureJSON);
-      mapView.mapboxMap.queryFeatureExtension(for: self.id, feature: cluster, extension: "supercluster", extensionField: "children") {
+      mapView.mapboxMap.getGeoJsonClusterChildren(forSourceId: self.id, feature: cluster) {
         result in
         switch result {
         case .success(let features):

package/ios/RCTMGL-v10/RCTMGLSource.swift

@@ -83,7 +83,11 @@ class RCTMGLSource : RCTMGLInteractiveElement {
       self.ownsSource = true
       self.source = source
       logged("SyleSource.addToMap", info: {"id: \(optional: self.id)"}) {
+        #if RNMBX_11
+        try style.addSource(source)
+        #else
         try style.addSource(source, id: self.id)
+        #endif
       }
     }