@rnmapbox/maps 10.1.42 → 10.1.43

package/ios/RNMBX/RNMBXMapViewManager.swift

@@ -1,230 +1,373 @@
 import MapboxMaps
 
 #if RNMBX_11
-extension QueriedSourceFeature {
-  var feature: Feature { return self.queriedFeature.feature }
-}
+  extension QueriedSourceFeature {
+    var feature: Feature { return self.queriedFeature.feature }
+  }
 #endif
 
-@objc(RNMBXMapViewManager)
-open class RNMBXMapViewManager: RCTViewManager {
+#if !RCT_NEW_ARCH_ENABLED
+
+  @objc(RNMBXMapViewManager)
+  open class RNMBXMapViewManager: RCTViewManager {
     @objc
     override public static func requiresMainQueueSetup() -> Bool {
-        return false
+      return false
     }
-  
+
     func defaultFrame() -> CGRect {
-        return UIScreen.main.bounds
+      return UIScreen.main.bounds
     }
-  
+
     override open func view() -> UIView! {
-        let result = RNMBXMapView(frame: self.defaultFrame(), eventDispatcher: self.bridge.eventDispatcher())
-        return result
+      let result = RNMBXMapView(
+        frame: self.defaultFrame(), eventDispatcher: self.bridge.eventDispatcher())
+      return result
     }
-}
+  }
+#else
+  @objc(RNMBXMapViewManager)
+  open class RNMBXMapViewManager: NSObject {
+
+  }
+#endif
 
 // MARK: - react methods
 
 extension RNMBXMapViewManager {
-    @objc public static func takeSnap(_ view: RNMBXMapView,
-                         writeToDisk: Bool,
-                         resolver: @escaping RCTPromiseResolveBlock) {
-        let uri = view.takeSnap(writeToDisk: writeToDisk)
-        resolver(["uri": uri.absoluteString])
-    }
-  
-    @objc public static func queryTerrainElevation(_ view: RNMBXMapView,
-                                  coordinates: [NSNumber],
-                                  resolver: @escaping RCTPromiseResolveBlock,
-                                  rejecter: @escaping RCTPromiseRejectBlock
-    ) -> Void {
-       let result = view.queryTerrainElevation(coordinates: coordinates)
-       if let result = result {
-         resolver(["data": NSNumber(value: result)])
-       } else {
-         resolver(nil)
-       }
-    }
-
-    @objc public static func setSourceVisibility(_ view: RNMBXMapView,
-                                      visible: Bool,
-                                      sourceId: String,
-                                      sourceLayerId: String?,
-                                      resolver: @escaping RCTPromiseResolveBlock,
-                                      rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-          view.setSourceVisibility(visible, sourceId: sourceId, sourceLayerId:sourceLayerId)
-          resolver(nil)
+  @objc public static func takeSnap(
+    _ view: RNMBXMapView,
+    writeToDisk: Bool,
+    resolver: @escaping RCTPromiseResolveBlock
+  ) {
+    let uri = view.takeSnap(writeToDisk: writeToDisk)
+    resolver(["uri": uri.absoluteString])
+  }
+
+  @objc public static func queryTerrainElevation(
+    _ view: RNMBXMapView,
+    coordinates: [NSNumber],
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    let result = view.queryTerrainElevation(coordinates: coordinates)
+    if let result = result {
+      resolver(["data": NSNumber(value: result)])
+    } else {
+      resolver(nil)
     }
-    
-    @objc public static func getCenter(_ view: RNMBXMapView, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-      view.withMapboxMap { map in
-        resolver(["center": [
-            map.cameraState.center.longitude,
-            map.cameraState.center.latitude
-        ]])
-      }
+  }
+
+  @objc public static func setSourceVisibility(
+    _ view: RNMBXMapView,
+    visible: Bool,
+    sourceId: String,
+    sourceLayerId: String?,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    view.setSourceVisibility(visible, sourceId: sourceId, sourceLayerId: sourceLayerId)
+    resolver(nil)
+  }
+
+  @objc public static func getCenter(
+    _ view: RNMBXMapView, resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    view.withMapboxMap { map in
+      resolver([
+        "center": [
+          map.cameraState.center.longitude,
+          map.cameraState.center.latitude,
+        ]
+      ])
     }
+  }
 
-    @objc public static func getCoordinateFromView(
-        _ view: RNMBXMapView,
-        atPoint point: CGPoint,
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock) {
-          view.withMapboxMap { map in
-            let coordinates = map.coordinate(for: point)
-            resolver(["coordinateFromView": [coordinates.longitude, coordinates.latitude]])
-          }
-            
-    }
-
-    @objc public static func getPointInView(
-        _ view: RNMBXMapView,
-        atCoordinate coordinate: [NSNumber],
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock) {
-          view.withMapboxMap { map in
-              let coordinate = CLLocationCoordinate2DMake(coordinate[1].doubleValue, coordinate[0].doubleValue)
-              let point = map.point(for: coordinate)
-              resolver(["pointInView": [(point.x), (point.y)]])
-          }
-      }
+  @objc public static func getCoordinateFromView(
+    _ view: RNMBXMapView,
+    atPoint point: CGPoint,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    view.withMapboxMap { map in
+      let coordinates = map.coordinate(for: point)
+      resolver(["coordinateFromView": [coordinates.longitude, coordinates.latitude]])
+    }
+
+  }
+
+  @objc public static func getPointInView(
+    _ view: RNMBXMapView,
+    atCoordinate coordinate: [NSNumber],
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    view.withMapboxMap { map in
+      let coordinate = CLLocationCoordinate2DMake(
+        coordinate[1].doubleValue, coordinate[0].doubleValue)
+      let point = map.point(for: coordinate)
+      resolver(["pointInView": [(point.x), (point.y)]])
+    }
+  }
+
+  @objc public static func setHandledMapChangedEvents(
+    _ view: RNMBXMapView,
+    events: [String],
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    view.handleMapChangedEvents = Set(
+      events.compactMap {
+        RNMBXEvent.EventType(rawValue: $0)
+      })
+    resolver(nil)
+  }
+
+  @objc public static func getZoom(
+    _ view: RNMBXMapView,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    view.withMapboxMap { map in
+      resolver(["zoom": map.cameraState.zoom])
+    }
+  }
+
+  @objc public static func getVisibleBounds(
+    _ view: RNMBXMapView,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    view.withMapboxMap { map in
+      resolver(["visibleBounds": map.coordinateBounds(for: view.bounds).toArray()])
+    }
+  }
 
-    @objc public static func setHandledMapChangedEvents(
-        _ view: RNMBXMapView,
-        events: [String],
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock) {
-          view.handleMapChangedEvents = Set(events.compactMap {
-            RNMBXEvent.EventType(rawValue: $0)
-          })
-          resolver(nil);
-      }
 
-    @objc public static func getZoom(
-        _ view: RNMBXMapView,
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock) {
-          view.withMapboxMap { map in
-              resolver(["zoom": map.cameraState.zoom])
+    @objc public static func setFeatureState(
+      _ view: RNMBXMapView,
+      featureId: String,
+      state: [String : Any],
+      sourceId: String,
+      sourceLayerId: String?,
+      resolver: @escaping RCTPromiseResolveBlock,
+      rejecter: @escaping RCTPromiseRejectBlock) {
+        view.withMapboxMap { map in
+          #if RNMBX_11
+          map.setFeatureState(
+            sourceId: sourceId,
+            sourceLayerId: sourceLayerId,
+            featureId: featureId,
+            state: state
+          ) { result in
+            switch result {
+              case .success: resolver(nil)
+              case .failure(let error): rejecter("setFeatureState", "failed to set feature state", error)
+            }
           }
+          #else
+          map.setFeatureState(
+            sourceId: sourceId,
+            sourceLayerId: sourceLayerId,
+            featureId: featureId,
+            state: state
+          )
+          resolver(nil)
+          #endif
+        }
     }
 
-    @objc public static func getVisibleBounds(
-        _ view: RNMBXMapView,
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock) {
-          view.withMapboxMap { map in
-            resolver(["visibleBounds": map.coordinateBounds(for: view.bounds).toArray()])
+    @objc public static func getFeatureState(
+      _ view: RNMBXMapView,
+      featureId: String,
+      sourceId: String,
+      sourceLayerId: String?,
+      resolver: @escaping RCTPromiseResolveBlock,
+      rejecter: @escaping RCTPromiseRejectBlock) {
+        view.withMapboxMap { map in 
+          map.getFeatureState(
+            sourceId: sourceId,
+            sourceLayerId: sourceLayerId,
+            featureId: featureId
+          ) { result in
+            switch (result) {
+              case .success(let featureState):
+                resolver(["featureState": featureState])
+              case .failure(let error):
+                rejecter("getFeatureState", "failed to get feature state", error)
+            }
           }
+        }
     }
 
+    @objc public static func removeFeatureState(
+      _ view: RNMBXMapView,
+      featureId: String,
+      stateKey: String?,
+      sourceId: String,
+      sourceLayerId: String?,
+      resolver: @escaping RCTPromiseResolveBlock,
+      rejecter: @escaping RCTPromiseRejectBlock) {
+        view.withMapboxMap { map in
+          #if RNMBX_11
+          map.removeFeatureState(
+            sourceId: sourceId,
+            sourceLayerId: sourceLayerId,
+            featureId: featureId,
+            stateKey: stateKey
+          ) { result in
+            switch result {
+              case .success: resolver(nil)
+              case .failure(let error): rejecter("removeFeatureState", "failed to remove feature state", error)
+            }
+          }
+          #else
+          map.removeFeatureState(
+            sourceId: sourceId,
+            sourceLayerId: sourceLayerId,
+            featureId: featureId,
+            stateKey: stateKey
+          )
+          resolver(nil)
+          #endif
+        }
+    }
 }
 
 // MARK: - queryRenderedFeatures
 
 extension RNMBXMapViewManager {
-    @objc public static func queryRenderedFeaturesAtPoint(
-        _ view: RNMBXMapView,
-        atPoint point: [NSNumber],
-        withFilter filter: [Any]?,
-        withLayerIDs layerIDs: [String]?,
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-          view.withMapboxMap { map 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())
-                
-                map.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 public static func queryRenderedFeaturesAtPoint(
+    _ view: RNMBXMapView,
+    atPoint point: [NSNumber],
+    withFilter filter: [Any]?,
+    withLayerIDs layerIDs: [String]?,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    view.withMapboxMap { map 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())
+
+        map.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 public static func queryRenderedFeaturesInRect(
-        _ map: RNMBXMapView,
-        withBBox bbox: [NSNumber],
-        withFilter filter: [Any]?,
-        withLayerIDs layerIDs: [String]?,
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-            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: map.bounds.size.width, height: map.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())
-              map.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 public static func queryRenderedFeaturesInRect(
+    _ map: RNMBXMapView,
+    withBBox bbox: [NSNumber],
+    withFilter filter: [Any]?,
+    withLayerIDs layerIDs: [String]?,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    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: map.bounds.size.width, height: map.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())
+      map.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 public static func querySourceFeatures(
+  @objc public static func querySourceFeatures(
     _ map: RNMBXMapView,
     withSourceId sourceId: String,
     withFilter filter: [Any]?,
     withSourceLayerIds sourceLayerIds: [String]?,
     resolver: @escaping RCTPromiseResolveBlock,
-    rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-      let sourceLayerIds = sourceLayerIds?.isEmpty ?? true ? nil : sourceLayerIds
-      logged("querySourceFeatures.option", rejecter: rejecter) {
-        let options = SourceQueryOptions(sourceLayerIds: sourceLayerIds, filter: filter ?? Exp(arguments: []))
-        map.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)
-          }
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    let sourceLayerIds = sourceLayerIds?.isEmpty ?? true ? nil : sourceLayerIds
+    logged("querySourceFeatures.option", rejecter: rejecter) {
+      let options = SourceQueryOptions(
+        sourceLayerIds: sourceLayerIds, filter: filter ?? Exp(arguments: []))
+      map.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)
         }
       }
     }
+  }
 
-    static func clearData(_ view: RNMBXMapView, completion: @escaping (Error?) -> Void) {
-      #if RNMBX_11
+  static func clearData(_ view: RNMBXMapView, completion: @escaping (Error?) -> Void) {
+    #if RNMBX_11
       MapboxMap.clearData(completion: completion)
-      #else
+    #else
       view.mapboxMap.clearData(completion: completion)
-      #endif
-    }
-  
-    @objc public static func clearData(
-        _ mapView: RNMBXMapView,
-        resolver:@escaping RCTPromiseResolveBlock,
-        rejecter:@escaping RCTPromiseRejectBlock
-    ) {
-        self.clearData(mapView) { error in
-          if let error = error {
-            rejecter("clearData","failed to clearData: \(error.localizedDescription)", error)
-          } else {
-            resolver(nil)
-          }
-        }
+    #endif
+  }
+
+  @objc public static func clearData(
+    _ mapView: RNMBXMapView,
+    resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock
+  ) {
+    self.clearData(mapView) { error in
+      if let error = error {
+        rejecter("clearData", "failed to clearData: \(error.localizedDescription)", error)
+      } else {
+        resolver(nil)
+      }
     }
+  }
 }

package/ios/RNMBX/RNMBXMapViewModule.h

@@ -1,5 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import "RNMBXViewResolver.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "rnmapbox_maps_specs.h"
@@ -9,9 +10,9 @@
 
 @interface RNMBXMapViewModule : NSObject
 #ifdef RCT_NEW_ARCH_ENABLED
-<NativeMapViewModuleSpec>
+<NativeMapViewModuleSpec, RNMBXViewResolverDelegate>
 #else
-<RCTBridgeModule>
+<RCTBridgeModule, RNMBXViewResolverDelegate>
 #endif
 
 @end

package/ios/RNMBX/RNMBXMapViewModule.mm

@@ -8,6 +8,7 @@
 #endif // RCT_NEW_ARCH_ENABLED
 
 #import "rnmapbox_maps-Swift.pre.h"
+#import "RNMBXViewResolver.h"
 
 @implementation RNMBXMapViewModule
 
@@ -27,26 +28,16 @@ RCT_EXPORT_MODULE();
 
 - (void)withMapView:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXMapView *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
-//    void (^upperBlock)(void) = ^{
-#ifdef RCT_NEW_ARCH_ENABLED
-    [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
-        RNMBXMapViewComponentView *componentView = [self.viewRegistry_DEPRECATED viewForReactTag:viewRef];
-        RNMBXMapView *view = componentView.contentView;
-        
-#else
-    [self.bridge.uiManager
-     addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        RNMBXMapView *view = [uiManager viewForReactTag:viewRef];
-#endif // RCT_NEW_ARCH_ENABLED
-        if (view != nil) {
-           block(view);
-        } else {
-            reject(methodName, [NSString stringWithFormat:@"Unknown reactTag: %@", viewRef], nil);
-        }
-    }];
+    [RNMBXViewResolver withViewRef:viewRef
+                    delegate:self
+                    expectedClass:[RNMBXMapView class]
+                    block:^(UIView *view) {
+                        block((RNMBXMapView *)view);
+                    }
+                    reject:reject
+                    methodName:methodName];
 }
 
-
 RCT_EXPORT_METHOD(takeSnap:(nonnull NSNumber*)viewRef writeToDisk:(BOOL)writeToDisk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
@@ -72,7 +63,7 @@ RCT_EXPORT_METHOD(getCoordinateFromView:(nonnull NSNumber*)viewRef atPoint:(NSAr
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
         NSNumber* a = [atPoint objectAtIndex:0];
         NSNumber* b = [atPoint objectAtIndex:1];
-        
+
         [RNMBXMapViewManager getCoordinateFromView:view atPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getCoordinateFromView"];
 }
@@ -133,6 +124,24 @@ RCT_EXPORT_METHOD(setSourceVisibility:(nonnull NSNumber*)viewRef visible:(BOOL)v
     } reject:reject methodName:@"setSourceVisibility"];
 }
 
+RCT_EXPORT_METHOD(setFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId state:(nonnull NSDictionary<NSString*,id> *)state sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager setFeatureState:view featureId:featureId state:state sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"setFeatureState"];
+}
+
+RCT_EXPORT_METHOD(getFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId sourceId:(nonnull NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager getFeatureState:view featureId:featureId sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"getFeatureState"];
+}
+
+RCT_EXPORT_METHOD(removeFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId stateKey:(NSString*)stateKey sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self withMapView:viewRef block:^(RNMBXMapView *view) {
+        [RNMBXMapViewManager removeFeatureState:view featureId:featureId stateKey:stateKey sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"removeFeatureState"];
+}
+
 RCT_EXPORT_METHOD(querySourceFeatures:(nonnull NSNumber*)viewRef sourceId:(NSString*)sourceId withFilter:(NSArray<id>*)withFilter withSourceLayerIDs:(NSArray<NSString*>*)withSourceLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
         [RNMBXMapViewManager querySourceFeatures:view withSourceId:sourceId withFilter:withFilter withSourceLayerIds:withSourceLayerIDs resolver:resolve rejecter:reject];

package/ios/RNMBX/RNMBXShapeSourceViewManager.m

@@ -1,3 +1,4 @@
+#if !RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
@@ -24,3 +25,4 @@ RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary)
 RCT_REMAP_VIEW_PROPERTY(onMapboxShapeSourcePress, onPress, RCTBubblingEventBlock)
 
 @end
+#endif