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

package/src/specs/NativeMapViewModule.ts

@@ -0,0 +1,54 @@
+/* eslint-disable @typescript-eslint/ban-types */
+import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
+import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  takeSnap: (viewRef: Int32 | null, writeToDisk: boolean) => Promise<Object>;
+  queryTerrainElevation: (
+    viewRef: Int32 | null,
+    coordinates: ReadonlyArray<number>,
+  ) => Promise<Object>;
+  setSourceVisibility: (
+    viewRef: Int32 | null,
+    visible: boolean,
+    sourceId: string,
+    sourceLayerId: string,
+  ) => Promise<Object>;
+  getCenter: (viewRef: Int32 | null) => Promise<Object>;
+  getCoordinateFromView: (
+    viewRef: Int32 | null,
+    atPoint: ReadonlyArray<number>,
+  ) => Promise<Object>;
+  getPointInView: (
+    viewRef: Int32 | null,
+    atCoordinate: ReadonlyArray<number>,
+  ) => Promise<Object>;
+  getZoom: (viewRef: Int32 | null) => Promise<Object>;
+  getVisibleBounds: (viewRef: Int32 | null) => Promise<Object>;
+  queryRenderedFeaturesAtPoint: (
+    viewRef: Int32 | null,
+    atPoint: ReadonlyArray<number>,
+    withFilter: ReadonlyArray<Object>,
+    withLayerIDs: ReadonlyArray<string>,
+  ) => Promise<Object>;
+  queryRenderedFeaturesInRect: (
+    viewRef: Int32 | null,
+    withBBox: ReadonlyArray<number>,
+    withFilter: ReadonlyArray<Object>,
+    withLayerIDs: ReadonlyArray<string>,
+  ) => Promise<Object>;
+  setHandledMapChangedEvents: (
+    viewRef: Int32 | null,
+    events: ReadonlyArray<string>,
+  ) => Promise<Object>;
+  clearData: (viewRef: Int32 | null) => Promise<Object>;
+  querySourceFeatures: (
+    viewRef: Int32 | null,
+    sourceId: string,
+    withFilter: ReadonlyArray<Object>,
+    withSourceLayerIDs: ReadonlyArray<string>,
+  ) => Promise<Object>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('MBXMapViewModule');

package/src/specs/codegenUtils.ts

@@ -0,0 +1,4 @@
+// codegen will generate folly::dynamic in place of this type, but it's not exported by RN
+// since codegen doesn't really follow imports, this way we can trick it into generating the correct type
+// while keeping typescript happy
+export type UnsafeMixed = any;

package/ios/RCTMGL-v10/RCTMGLMapViewManager.m

@@ -1,107 +0,0 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTViewManager.h>
-
-@interface RCT_EXTERN_REMAP_MODULE(RCTMGLMapView, RCTMGLMapViewManager, RCTViewManager)
-
-RCT_EXPORT_VIEW_PROPERTY(onCameraChanged, RCTDirectEventBlock)
-
-RCT_REMAP_VIEW_PROPERTY(attributionEnabled, reactAttributionEnabled, BOOL)
-RCT_REMAP_VIEW_PROPERTY(attributionPosition, reactAttributionPosition, NSDictionary)
-
-RCT_REMAP_VIEW_PROPERTY(logoEnabled, reactLogoEnabled, BOOL)
-RCT_REMAP_VIEW_PROPERTY(logoPosition, reactLogoPosition, NSDictionary)
-
-RCT_REMAP_VIEW_PROPERTY(compassEnabled, reactCompassEnabled, BOOL)
-RCT_REMAP_VIEW_PROPERTY(compassFadeWhenNorth, reactCompassFadeWhenNorth, BOOL)
-RCT_REMAP_VIEW_PROPERTY(compassPosition, reactCompassPosition, NSDictionary)
-RCT_REMAP_VIEW_PROPERTY(compassViewPosition, reactCompassViewPosition, NSInteger)
-RCT_REMAP_VIEW_PROPERTY(compassViewMargins, reactCompassViewMargins, CGPoint)
-RCT_REMAP_VIEW_PROPERTY(compassImage, reactCompassImage, NSString)
-
-RCT_REMAP_VIEW_PROPERTY(scaleBarEnabled, reactScaleBarEnabled, BOOL)
-RCT_REMAP_VIEW_PROPERTY(scaleBarPosition, reactScaleBarPosition, NSDictionary)
-
-RCT_REMAP_VIEW_PROPERTY(zoomEnabled, reactZoomEnabled, BOOL)
-RCT_REMAP_VIEW_PROPERTY(scrollEnabled, reactScrollEnabled, BOOL)
-RCT_REMAP_VIEW_PROPERTY(rotateEnabled, reactRotateEnabled, BOOL)
-RCT_REMAP_VIEW_PROPERTY(pitchEnabled, reactPitchEnabled, BOOL)
-
-RCT_REMAP_VIEW_PROPERTY(projection, reactProjection, NSString)
-RCT_REMAP_VIEW_PROPERTY(localizeLabels, reactLocalizeLabels, NSDictionary)
-
-RCT_REMAP_VIEW_PROPERTY(styleURL, reactStyleURL, NSString)
-RCT_REMAP_VIEW_PROPERTY(onPress, reactOnPress, RCTBubblingEventBlock)
-RCT_REMAP_VIEW_PROPERTY(onLongPress, reactOnLongPress, RCTBubblingEventBlock)
-RCT_REMAP_VIEW_PROPERTY(onMapChange, reactOnMapChange, RCTBubblingEventBlock)
-
-RCT_EXTERN_METHOD(takeSnap:(nonnull NSNumber*)reactTag
-                  writeToDisk:(BOOL)writeToDisk
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(queryTerrainElevation:(nonnull NSNumber*)reactTag
-                  coordinates: (nonnull NSArray<NSNumber>*)coordinates
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(setSourceVisibility:(nonnull NSNumber *)reactTag
-                  visible:(BOOL)visible
-                  sourceId:(nonnull NSString*)sourceId
-                  sourceLayerId:(nullable NSString*)sourceLayerId
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(getCenter:(nonnull NSNumber*)reactTag
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(getCoordinateFromView:(nonnull NSNumber*)reactTag
-                  atPoint:(CGPoint)point
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(getPointInView:(nonnull NSNumber*)reactTag
-                  atCoordinate:(NSArray<NSNumber*>*)coordinate
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(getZoom:(nonnull NSNumber*)reactTag
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(getVisibleBounds:(nonnull NSNumber*)reactTag
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(queryRenderedFeaturesAtPoint:(nonnull NSNumber*)reactTag
-                  atPoint:(NSArray<NSNumber*>*)point
-                  withFilter:(NSArray*)filter
-                  withLayerIDs:(NSArray<NSString*>*)layerIDs
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(queryRenderedFeaturesInRect:(nonnull NSNumber*)reactTag
-                  withBBox:(NSArray<NSNumber*>*)bbox
-                  withFilter:(NSArray*)filter
-                  withLayerIDs:(NSArray<NSString*>*)layerIDs
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(querySourceFeatures:(nonnull NSNumber*)reactTag
-                  withSourceId:(NSString*)sourceId
-                  withFilter:(NSArray)filter
-                  withSourceLayerIds:(NSArray<NSString*>*)sourceLayerIds
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(setHandledMapChangedEvents:(nonnull NSNumber*)reactTag
-                  events:(NSArray<NSString*>*)events
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(clearData: (nonnull NSNumber*)reactTag
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject
-                  )
-
-@end

package/ios/RCTMGL-v10/RCTMGLMapViewManager.swift

@@ -1,285 +0,0 @@
-import MapboxMaps
-
-@objc(RCTMGLMapViewManager)
-class RCTMGLMapViewManager: RCTViewManager {
-    @objc
-    override static func requiresMainQueueSetup() -> Bool {
-        return true
-    }
-  
-    func defaultFrame() -> CGRect {
-        return UIScreen.main.bounds
-    }
-  
-    override func view() -> UIView! {
-        let result = RCTMGLMapView(frame: self.defaultFrame(), eventDispatcher: self.bridge.eventDispatcher())
-        return result
-    }
-}
-
-// MARK: helpers
-
-extension RCTMGLMapViewManager {
-    func withMapView(
-        _ reactTag: NSNumber,
-        name: String,
-        rejecter: @escaping RCTPromiseRejectBlock,
-        fn: @escaping (_: RCTMGLMapView) -> Void) -> Void
-    {
-      self.bridge.uiManager.addUIBlock { (manager, viewRegistry) in
-        let view = viewRegistry![reactTag]
-
-        guard let view = view, let view = view as? RCTMGLMapView else {
-          RCTMGLLogError("Invalid react tag, could not find RCTMGLMapView");
-          rejecter(name, "Unknown find reactTag: \(reactTag)", nil)
-          return;
-        }
-        
-        fn(view)
-      }
-    }
-
-    func withMapboxMap(
-        _ reactTag: NSNumber,
-        name: String,
-        rejecter: @escaping RCTPromiseRejectBlock,
-        fn: @escaping (_: MapboxMap) -> Void) -> Void
-    {
-      withMapView(reactTag, name: name, rejecter: rejecter) { view in
-        guard let mapboxMap = view.mapboxMap else {
-          RCTMGLLogError("MapboxMap is not yet available");
-          rejecter(name, "Map not loaded yet", nil)
-          return;
-        }
-        
-        fn(mapboxMap)
-      }
-    }
-}
-
-// MARK: - react methods
-
-extension RCTMGLMapViewManager {
-    @objc
-    func takeSnap(_ reactTag: NSNumber,
-                  writeToDisk: Bool,
-                  resolver: @escaping RCTPromiseResolveBlock,
-                  rejecter: @escaping RCTPromiseRejectBlock
-    ) -> Void {
-      withMapView(reactTag, name:"takeSnap", rejecter: rejecter) { view in
-        let uri = view.takeSnap(writeToDisk: writeToDisk)
-        resolver(["uri": uri.absoluteString])
-      }
-    }
-  
-    @objc
-    func queryTerrainElevation(_ reactTag: NSNumber,
-                               coordinates: [NSNumber],
-                               resolver: @escaping RCTPromiseResolveBlock,
-                               rejecter: @escaping RCTPromiseRejectBlock
-    ) -> Void {
-      withMapView(reactTag, name:"queryTerrainElevation", rejecter: rejecter) { view in
-        let result = view.queryTerrainElevation(coordinates: coordinates)
-        if let result = result {
-          resolver(["data": NSNumber(value: result)])
-        } else {
-          resolver(nil)
-        }
-      }
-    }
-  
-  @objc
-  func setSourceVisibility(_ reactTag: NSNumber,
-                      visible: Bool,
-                      sourceId: String,
-                      sourceLayerId: String?,
-                      resolver: @escaping RCTPromiseResolveBlock,
-                      rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-    withMapView(reactTag, name:"setSourceVisibility", rejecter: rejecter) { view in
-      view.setSourceVisibility(visible, sourceId: sourceId, sourceLayerId:sourceLayerId)
-      resolver(nil)
-    }
-  }
-
-  @objc
-  func getCenter(_ reactTag: NSNumber,
-                 resolver: @escaping RCTPromiseResolveBlock,
-                 rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-    withMapboxMap(reactTag, name:"getCenter", rejecter: rejecter) { mapboxMap in
-      resolver(["center": [
-        mapboxMap.cameraState.center.longitude,
-        mapboxMap.cameraState.center.latitude
-      ]])
-    }
-  }
-
-  @objc
-  func getCoordinateFromView(
-    _ reactTag: NSNumber,
-    atPoint point: CGPoint,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) {
-      withMapboxMap(reactTag, name:"getCoordinateFromView", rejecter: rejecter) { mapboxMap in
-        let coordinates = mapboxMap.coordinate(for: point)
-        resolver(["coordinateFromView": [coordinates.longitude, coordinates.latitude]])
-      }
-  }
-
-  @objc
-  func getPointInView(
-    _ reactTag: NSNumber,
-    atCoordinate coordinate: [NSNumber],
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) {
-      withMapboxMap(reactTag, name:"getPointInView", rejecter: rejecter) { mapboxMap in
-        let coordinate = CLLocationCoordinate2DMake(coordinate[1].doubleValue, coordinate[0].doubleValue)
-        let point = mapboxMap.point(for: coordinate)
-        resolver(["pointInView": [(point.x), (point.y)]])
-      }
-  }
-
-  @objc
-  func setHandledMapChangedEvents(
-    _ reactTag: NSNumber,
-    events: [String],
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) {
-    withMapView(reactTag, name:"setHandledMapChangedEvents", rejecter: rejecter) { mapView in
-      mapView.handleMapChangedEvents = Set(events.compactMap {
-        RCTMGLEvent.EventType(rawValue: $0)
-      })
-      resolver(nil);
-    }
-  }
-
-  @objc
-  func getZoom(
-    _ reactTag: NSNumber,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) {
-      withMapboxMap(reactTag, name:"getZoom", rejecter: rejecter) { mapboxMap in
-        resolver(["zoom": mapboxMap.cameraState.zoom])
-      }
-  }
-
-  @objc
-  func getVisibleBounds(
-    _ reactTag: NSNumber,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) {
-      withMapView(reactTag, name:"getVisibleBounds", rejecter: rejecter) { mapView in
-        resolver(["visibleBounds":  mapView.mapboxMap.coordinateBounds(for: mapView.bounds).toArray()])
-      }
-  }
-}
-
-// MARK: - queryRenderedFeatures
-
-extension RCTMGLMapViewManager {
-  @objc
-  func queryRenderedFeaturesAtPoint(
-    _ reactTag: NSNumber,
-    atPoint point: [NSNumber],
-    withFilter filter: [Any]?,
-    withLayerIDs layerIDs: [String]?,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-      withMapboxMap(reactTag, name:"queryRenderedFeaturesAtPoint", rejecter: rejecter) { mapboxMap in
-        let point = CGPoint(x: CGFloat(point[0].floatValue), y: CGFloat(point[1].floatValue))
-
-        logged("queryRenderedFeaturesAtPoint.option", rejecter: rejecter) {
-          let options = try RenderedQueryOptions(layerIds: (layerIDs ?? []).isEmpty ? nil : layerIDs, filter: filter?.asExpression())
-          
-          mapboxMap.queryRenderedFeatures(with: point, options: options) { result in
-            switch result {
-            case .success(let features):
-              resolver([
-                "data": ["type": "FeatureCollection", "features": features.compactMap { queriedFeature in
-                  logged("queryRenderedFeaturesAtPoint.feature.toJSON") { try queriedFeature.feature.toJSON() }
-                }]
-              ])
-            case .failure(let error):
-              rejecter("queryRenderedFeaturesAtPoint","failed to query features", error)
-            }
-          }
-        }
-      }
-  }
-
-  @objc
-  func queryRenderedFeaturesInRect(
-    _ reactTag: NSNumber,
-    withBBox bbox: [NSNumber],
-    withFilter filter: [Any]?,
-    withLayerIDs layerIDs: [String]?,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-      withMapView(reactTag, name:"queryRenderedFeaturesInRect", rejecter: rejecter) { mapView in
-        let top = bbox.isEmpty ? 0.0 : CGFloat(bbox[0].floatValue)
-        let right = bbox.isEmpty ? 0.0 : CGFloat(bbox[1].floatValue)
-        let bottom = bbox.isEmpty ? 0.0 : CGFloat(bbox[2].floatValue)
-        let left = bbox.isEmpty ? 0.0 : CGFloat(bbox[3].floatValue)
-        let rect = bbox.isEmpty ? CGRect(x: 0.0, y: 0.0, width: mapView.bounds.size.width, height: mapView.bounds.size.height) : CGRect(x: [left,right].min()!, y: [top,bottom].min()!, width: abs(right-left), height: abs(bottom-top))
-        logged("queryRenderedFeaturesInRect.option", rejecter: rejecter) {
-          let options = try RenderedQueryOptions(layerIds: layerIDs?.isEmpty ?? true ? nil : layerIDs, filter: filter?.asExpression())
-          mapView.mapboxMap.queryRenderedFeatures(with: rect, options: options) { result in
-            switch result {
-            case .success(let features):
-              resolver([
-                "data": ["type": "FeatureCollection", "features": features.compactMap { queriedFeature in
-                  logged("queryRenderedFeaturesInRect.queriedfeature.map") { try queriedFeature.feature.toJSON() }
-                }]
-              ])
-            case .failure(let error):
-              rejecter("queryRenderedFeaturesInRect","failed to query features", error)
-            }
-          }
-        }
-      }
-   }
-
-  @objc
-  func querySourceFeatures(
-    _ reactTag: NSNumber,
-    withSourceId sourceId: String,
-    withFilter filter: [Any]?,
-    withSourceLayerIds sourceLayerIds: [String]?,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-      withMapView(reactTag, name:"querySourceFeatures", rejecter: rejecter) { mapView in
-        let sourceLayerIds = sourceLayerIds?.isEmpty ?? true ? nil : sourceLayerIds
-        logged("querySourceFeatures.option", rejecter: rejecter) {
-          let options = SourceQueryOptions(sourceLayerIds: sourceLayerIds, filter: filter ?? Exp(arguments: []))
-          mapView.mapboxMap.querySourceFeatures(for: sourceId, options: options) { result in
-            switch result {
-            case .success(let features):
-              resolver([
-                "data": ["type": "FeatureCollection", "features": features.compactMap { queriedFeature in
-                  logged("querySourceFeatures.queriedfeature.map") { try queriedFeature.feature.toJSON() }
-                }] as [String : Any]
-              ])
-            case .failure(let error):
-              rejecter("querySourceFeatures", "failed to query source features: \(error.localizedDescription)", error)
-            }
-          }
-        }
-      }
-    }
-
-  @objc
-  func clearData(
-    _ reactTag: NSNumber,
-    resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock
-  ) {
-    withMapView(reactTag, name:"clearDataPath", rejecter: rejecter) { mapView in
-      mapView.mapboxMap.clearData { error in
-        if let error = error {
-          rejecter("clearData","failed to clearData: \(error.localizedDescription)", error)
-        } else {
-          resolver(nil)
-        }
-      }
-    }
-  }
-}