@rnmapbox/maps 10.2.7 → 10.2.8

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayerManager.kt

@@ -0,0 +1,85 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRasterParticleLayerManagerInterface
+
+class RNMBXRasterParticleLayerManager : ViewGroupManager<RNMBXRasterParticleLayer>(),
+    RNMBXRasterParticleLayerManagerInterface<RNMBXRasterParticleLayer> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXRasterParticleLayer {
+        return RNMBXRasterParticleLayer(reactContext)
+    }
+
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXRasterParticleLayer"})}
+    @ReactProp(name = "id")
+    override fun setId(layer: RNMBXRasterParticleLayer, id: Dynamic) {
+        layer.iD = id.asString()
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(layer: RNMBXRasterParticleLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
+    }
+
+    @ReactProp(name = "sourceID")
+    override fun setSourceID(layer: RNMBXRasterParticleLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    override fun setAboveLayerID(layer: RNMBXRasterParticleLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
+    }
+
+    @ReactProp(name = "belowLayerID")
+    override fun setBelowLayerID(layer: RNMBXRasterParticleLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
+    }
+
+    @ReactProp(name = "layerIndex")
+    override fun setLayerIndex(layer: RNMBXRasterParticleLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    override fun setMinZoomLevel(layer: RNMBXRasterParticleLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    override fun setMaxZoomLevel(layer: RNMBXRasterParticleLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(layer: RNMBXRasterParticleLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXRasterParticleLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: RNMBXRasterParticleLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXRasterParticleLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
+    companion object {
+        const val REACT_CLASS = "RNMBXRasterParticleLayer"
+        const val isImplemented = true
+    }
+}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySource.kt

@@ -0,0 +1,41 @@
+package com.rnmapbox.rnmbx.components.styles.sources
+
+import android.content.Context
+import com.mapbox.maps.extension.style.sources.generated.RasterArraySource
+
+class RNMBXRasterArraySource(context: Context?) : RNMBXTileSource<RasterArraySource?>(context) {
+    private var mTileSize: Int? = null
+    override fun makeSource(): RasterArraySource {
+        val id = iD!!
+        val configurationUrl = uRL
+        val tileSize = if (mTileSize == null) DEFAULT_TILE_SIZE else mTileSize!!
+        return if (configurationUrl != null) {
+            RasterArraySource.Builder(id).url(configurationUrl).tileSize(tileSize.toLong()).build()
+        } else RasterArraySource.Builder(id).tileSet(buildTileset())
+            .tileSize(tileSize.toLong()).build()
+    }
+
+    fun setTileSize(tileSize: Int) {
+        mTileSize = tileSize
+    }
+
+    override fun hasPressListener(): Boolean {
+        return false
+    }
+
+    override fun onPress(feature: OnPressEvent?) {
+        // ignore, cannot query raster array layers
+    }
+
+    override fun hasNoDataSoRefersToExisting(): Boolean {
+        return uRL == null
+    }
+
+    companion object {
+        const val DEFAULT_TILE_SIZE = 512
+    }
+
+    fun setSourceBounds(value: Array<Double>) {
+        bounds = value
+    }
+}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySourceManager.kt

@@ -0,0 +1,76 @@
+package com.rnmapbox.rnmbx.components.styles.sources
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRasterArraySourceManagerInterface
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.eventMapOf
+import javax.annotation.Nonnull
+import com.facebook.react.bridge.ReadableType
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXRasterArraySourceManager(reactApplicationContext: ReactApplicationContext) :
+    RNMBXTileSourceManager<RNMBXRasterArraySource>(reactApplicationContext),
+    RNMBXRasterArraySourceManagerInterface<RNMBXRasterArraySource> {
+    @Nonnull
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    @Nonnull
+    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXRasterArraySource {
+        return RNMBXRasterArraySource(reactContext)
+    }
+
+    @ReactProp(name = "tileSize")
+    override fun setTileSize(source: RNMBXRasterArraySource, tileSize: Dynamic) {
+        source.setTileSize(tileSize.asInt())
+    }
+
+    override fun customEvents(): Map<String, String>? {
+        return eventMapOf(
+            EventKeys.MAP_ANDROID_CALLBACK to "onAndroidCallback"
+        )
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXRasterArraySource"
+        const val isImplemented = true
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(source: RNMBXRasterArraySource, value: Dynamic) {
+        source.mExisting = value.asBoolean()
+    }
+
+    @ReactProp(name = "sourceBounds")
+    override fun setSourceBounds(source: RNMBXRasterArraySource, value: Dynamic) {
+        val array = value.asArray()
+        if (value.type != ReadableType.Array || array == null || array.size() != 4) {
+           Logger.e(REACT_CLASS, "source bounds must be an array with left, bottom, top, and right values")
+           return
+        }
+        val bboxArray = Array(4) { i -> array.getDouble(i) }
+
+        if(!this.validateBbox(bboxArray)){
+            Logger.e(REACT_CLASS, "source bounds contain invalid bbox")
+            return
+        }
+
+        source.setSourceBounds(bboxArray)
+    }
+
+    private fun validateBbox(bbox: Array<Double>): Boolean {
+        if (bbox.size != 4) return false
+
+        val (swLng, swLat, neLng, neLat) = bbox
+
+        val isLngValid = swLng in -180.0..180.0 && neLng in -180.0..180.0
+        val isLatValid = swLat in -90.0..90.0 && neLat in -90.0..90.0
+        val isSouthWestOfNorthEast = swLng < neLng && swLat < neLat
+
+        return isLngValid && isLatValid && isSouthWestOfNorthEast
+    }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterArraySourceManagerDelegate.java

@@ -0,0 +1,54 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMBXRasterArraySourceManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXRasterArraySourceManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXRasterArraySourceManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
+      case "existing":
+        mViewManager.setExisting(view, new DynamicFromObject(value));
+        break;
+      case "url":
+        mViewManager.setUrl(view, new DynamicFromObject(value));
+        break;
+      case "tileUrlTemplates":
+        mViewManager.setTileUrlTemplates(view, new DynamicFromObject(value));
+        break;
+      case "minZoomLevel":
+        mViewManager.setMinZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "maxZoomLevel":
+        mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "tileSize":
+        mViewManager.setTileSize(view, new DynamicFromObject(value));
+        break;
+      case "sourceBounds":
+        mViewManager.setSourceBounds(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterArraySourceManagerInterface.java

@@ -0,0 +1,23 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+public interface RNMBXRasterArraySourceManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
+  void setExisting(T view, Dynamic value);
+  void setUrl(T view, Dynamic value);
+  void setTileUrlTemplates(T view, Dynamic value);
+  void setMinZoomLevel(T view, Dynamic value);
+  void setMaxZoomLevel(T view, Dynamic value);
+  void setTileSize(T view, Dynamic value);
+  void setSourceBounds(T view, Dynamic value);
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterParticleLayerManagerDelegate.java

@@ -0,0 +1,66 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMBXRasterParticleLayerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXRasterParticleLayerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXRasterParticleLayerManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "sourceID":
+        mViewManager.setSourceID(view, new DynamicFromObject(value));
+        break;
+      case "existing":
+        mViewManager.setExisting(view, new DynamicFromObject(value));
+        break;
+      case "filter":
+        mViewManager.setFilter(view, new DynamicFromObject(value));
+        break;
+      case "aboveLayerID":
+        mViewManager.setAboveLayerID(view, new DynamicFromObject(value));
+        break;
+      case "belowLayerID":
+        mViewManager.setBelowLayerID(view, new DynamicFromObject(value));
+        break;
+      case "layerIndex":
+        mViewManager.setLayerIndex(view, new DynamicFromObject(value));
+        break;
+      case "maxZoomLevel":
+        mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "minZoomLevel":
+        mViewManager.setMinZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "sourceLayerID":
+        mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
+        break;
+      case "slot":
+        mViewManager.setSlot(view, new DynamicFromObject(value));
+        break;
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterParticleLayerManagerInterface.java

@@ -0,0 +1,27 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+public interface RNMBXRasterParticleLayerManagerInterface<T extends View> {
+  void setSourceID(T view, Dynamic value);
+  void setExisting(T view, Dynamic value);
+  void setFilter(T view, Dynamic value);
+  void setAboveLayerID(T view, Dynamic value);
+  void setBelowLayerID(T view, Dynamic value);
+  void setLayerIndex(T view, Dynamic value);
+  void setMaxZoomLevel(T view, Dynamic value);
+  void setMinZoomLevel(T view, Dynamic value);
+  void setSourceLayerID(T view, Dynamic value);
+  void setSlot(T view, Dynamic value);
+  void setId(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
+}

package/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m

@@ -14,6 +14,8 @@ RCT_EXTERN_METHOD(pausePackDownload:(NSString *)name
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(setTileCountLimit:(nonnull NSNumber *)limit)
+
 RCT_EXTERN_METHOD(getPackStatus:(NSString *)name
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)

package/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.swift

@@ -363,6 +363,11 @@ func getRegionByName(name: String, offlineRegions: [OfflineRegion]) -> OfflineRe
     }
   }
 
+  @objc
+  func setTileCountLimit(_ limit: NSNumber) {
+    self.offlineRegionManager.setOfflineMapboxTileCountLimitForLimit(limit.uint64Value)
+  }
+
   @objc
   func resetDatabase(_ resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock)

package/ios/RNMBX/RNMBXCamera.swift

@@ -15,11 +15,46 @@ public enum RemovalReason {
     case ViewRemoval, StyleChange, OnDestroy, ComponentChange, Reorder
 }
 
-public protocol RNMBXMapComponent: AnyObject {
+/// Base protocol for all map components
+public protocol RNMBXMapComponentProtocol: AnyObject {
+  func waitForStyleLoad() -> Bool
+}
+
+/// Default implementation: most components don't need to wait for style load
+extension RNMBXMapComponentProtocol {
+  public func waitForStyleLoad() -> Bool {
+    return false
+  }
+}
+
+/// Protocol for components that can work without direct MapView access
+public protocol RNMBXMapComponent: RNMBXMapComponentProtocol {
   func addToMap(_ map: RNMBXMapView, style: Style)
   func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool
-  
-  func waitForStyleLoad() -> Bool
+}
+
+/// Protocol for components that require a valid MapView instance for both add and remove operations.
+/// Use this protocol when your component needs to interact with the native MapView directly.
+/// The MapView parameter is guaranteed to be non-nil when these methods are called.
+///
+/// This protocol inherits from RNMBXMapComponent to ensure compatibility with existing code,
+/// but provides default implementations of the base protocol methods that throw errors,
+/// forcing implementers to use the mapView-aware versions.
+public protocol RNMBXMapAndMapViewComponent: RNMBXMapComponent {
+  func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style)
+  func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool
+}
+
+/// Default implementations for RNMBXMapAndMapViewComponent that prevent accidental use of base protocol methods
+extension RNMBXMapAndMapViewComponent {
+  public func addToMap(_ map: RNMBXMapView, style: Style) {
+    Logger.error("CRITICAL: addToMap(_:style:) called on RNMBXMapAndMapViewComponent. Use addToMap(_:mapView:style:) instead. Component: \(type(of: self))")
+  }
+
+  public func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    Logger.error("CRITICAL: removeFromMap(_:reason:) called on RNMBXMapAndMapViewComponent. Use removeFromMap(_:mapView:reason:) instead. Component: \(type(of: self))")
+    return false
+  }
 }
 
 enum CameraMode: Int {
@@ -85,7 +120,7 @@ class CameraUpdateQueue {
 open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
   private weak var _map: RNMBXMapView! = nil
   private var _mapCallbacks: [(RNMBXMapView) -> Void] = []
-  
+
   weak var map : RNMBXMapView? {
     return _map;
   }
@@ -103,11 +138,7 @@ open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
       _mapCallbacks.append(callback)
     }
   }
-  
-  public func waitForStyleLoad() -> Bool {
-    return false
-  }
-  
+
   public func addToMap(_ map: RNMBXMapView, style: Style) {
     _mapCallbacks.forEach { callback in
         callback(map)
@@ -115,7 +146,7 @@ open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
     _mapCallbacks = []
     _map = map
   }
-  
+
   public func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     _mapCallbacks = []
     _map = nil
@@ -123,8 +154,48 @@ open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
   }
 }
 
+/// Base class for components that require MapView to be non-nil
+open class RNMBXMapAndMapViewComponentBase : UIView, RNMBXMapAndMapViewComponent {
+  private weak var _map: RNMBXMapView! = nil
+  private var _mapCallbacks: [(RNMBXMapView) -> Void] = []
+
+  weak var map : RNMBXMapView? {
+    return _map;
+  }
+
+  func withMapView(_ callback: @escaping (_ mapView: MapView) -> Void) {
+    withRNMBXMapView { mapView in
+      callback(mapView.mapView)
+    }
+  }
+
+  func withRNMBXMapView(_ callback: @escaping (_ map: RNMBXMapView) -> Void) {
+    if let map = _map {
+      callback(map)
+    } else {
+      _mapCallbacks.append(callback)
+    }
+  }
+
+  // Uses default implementation from RNMBXMapComponentProtocol extension
+
+  public func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
+    _mapCallbacks.forEach { callback in
+        callback(map)
+    }
+    _mapCallbacks = []
+    _map = map
+  }
+
+  public func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
+    _mapCallbacks = []
+    _map = nil
+    return true
+  }
+}
+
 @objc(RNMBXCamera)
-open class RNMBXCamera : RNMBXMapComponentBase {
+open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
   var cameraAnimator: BasicCameraAnimator?
   let cameraUpdateQueue = CameraUpdateQueue()
   
@@ -519,18 +590,18 @@ open class RNMBXCamera : RNMBXMapComponentBase {
     _updateCamera()
   }
   
-  public override func addToMap(_ map: RNMBXMapView, style: Style) {
-    super.addToMap(map, style: style)
+  public override func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
+    super.addToMap(map, mapView: mapView, style: style)
     map.reactCamera = self
   }
-  
-  public override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+
+  public override func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
     if (reason == .StyleChange) {
       return false
     }
 
-    map.mapView.viewport.removeStatusObserver(self)
-    return super.removeFromMap(map, reason:reason)
+    mapView.viewport.removeStatusObserver(self)
+    return super.removeFromMap(map, mapView: mapView, reason: reason)
   }
 
   @objc public func moveBy(x: Double, y: Double, animationMode: NSNumber?, animationDuration: NSNumber?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {

package/ios/RNMBX/RNMBXCameraModule.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 RNMBXCameraModule : NSObject
 #ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXCameraModuleSpec>
+<NativeRNMBXCameraModuleSpec, RNMBXViewResolverDelegate>
 #else
-<RCTBridgeModule>
+<RCTBridgeModule, RNMBXViewResolverDelegate>
 #endif
 
 @end

package/ios/RNMBX/RNMBXCameraModule.mm

@@ -36,22 +36,14 @@ RCT_EXPORT_MODULE();
 
 - (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
-#ifdef RCT_NEW_ARCH_ENABLED
-    [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
-    RNMBXCameraComponentView *componentView = [self.viewRegistry_DEPRECATED viewForReactTag:viewRef];
-        RNMBXCamera *view = componentView.contentView;
-        
-#else
-    [self.bridge.uiManager
-     addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        RNMBXCamera *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:[RNMBXCamera class]
+                             block:^(UIView *view) {
+                                 block((RNMBXCamera *)view);
+                             }
+                            reject:reject
+                        methodName:methodName];
 }
 
 RCT_EXPORT_METHOD(updateCameraStop:(nonnull NSNumber *)viewRef