@rnmapbox/maps 10.3.0-rc.0 → 10.3.1

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/atmosphere/RNMBXAtmosphereManager.kt

@@ -2,6 +2,7 @@ package com.rnmapbox.rnmbx.components.styles.atmosphere
 
 import com.facebook.react.bridge.Dynamic
 import com.facebook.react.uimanager.ThemedReactContext
+import com.rnmapbox.rnmbx.utils.extensions.asMapOrNull
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
@@ -30,7 +31,7 @@ class RNMBXAtmosphereManager : ViewGroupManager<RNMBXAtmosphere>(), RNMBXAtmosph
 
     @ReactProp(name = "reactStyle")
     override fun setReactStyle(atmosphere: RNMBXAtmosphere, reactStyle: Dynamic) {
-        atmosphere.setReactStyle(reactStyle.asMap())
+        atmosphere.setReactStyle(reactStyle.asMapOrNull())
     }
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/light/RNMBXLightManager.kt

@@ -2,6 +2,7 @@ package com.rnmapbox.rnmbx.components.styles.light
 
 import com.facebook.react.bridge.Dynamic
 import com.facebook.react.uimanager.ThemedReactContext
+import com.rnmapbox.rnmbx.utils.extensions.asMapOrNull
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXLightManagerInterface
@@ -18,7 +19,7 @@ class RNMBXLightManager : ViewGroupManager<RNMBXLight>(),
 
     @ReactProp(name = "reactStyle")
     override fun setReactStyle(light: RNMBXLight, reactStyle: Dynamic) {
-        light.setReactStyle(reactStyle.asMap())
+        light.setReactStyle(reactStyle.asMapOrNull())
     }
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/rain/RNMBXRain.kt

@@ -0,0 +1,83 @@
+package com.rnmapbox.rnmbx.components.styles.rain
+
+import android.content.Context
+import com.facebook.react.bridge.ReadableMap
+import com.mapbox.maps.MapboxMap
+import com.mapbox.maps.extension.style.precipitations.generated.Rain
+import com.mapbox.maps.extension.style.precipitations.generated.removeRain
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXRain(context: Context?) : AbstractSourceConsumer(context) {
+    override var iD: String? = null
+    protected var mRain: Rain? = null
+
+    // beginregion RNMBXLayer
+    @JvmField
+    protected var mMap: MapboxMap? = null
+
+    @JvmField
+    protected var mReactStyle: ReadableMap? = null
+
+    fun setReactStyle(reactStyle: ReadableMap?) {
+        mReactStyle = reactStyle
+        if (mRain != null) {
+            addStyles()
+        }
+    }
+    // endregion RNMBXLayer
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+        mMap = mapView.getMapboxMap()
+        mapView.savedStyle?.let { warnIfMeasureLightUnavailable(it) }
+        val rain = makeRain()
+        mRain = rain
+        addStyles()
+        mapView.savedStyle?.let { rain.bindTo(it) }
+    }
+
+    private fun warnIfMeasureLightUnavailable(style: com.mapbox.maps.Style) {
+        val hasLights = style.getStyleLights().isNotEmpty()
+        if (hasLights) return
+
+        val affectedProps = listOf("color", "opacity", "vignetteColor")
+        val missingProps = affectedProps.filter { mReactStyle?.hasKey(it) != true }
+        if (missingProps.isEmpty()) return
+
+        Logger.w(
+            "RNMBXRain",
+            "The current style has no 3D lights, so measure-light(\"brightness\") " +
+                "expressions used in default rain ${missingProps.joinToString(", ")} will fail. " +
+                "Use a Standard style or set explicit values for: ${missingProps.joinToString(", ")}"
+        )
+    }
+
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
+        mapView.savedStyle?.let { it.removeRain() }
+        mRain = null
+        mMap = null
+        return super.removeFromMap(mapView, reason)
+    }
+
+    fun makeRain(): Rain {
+        return Rain()
+    }
+
+    fun addStyles() {
+        mRain?.also {
+            RNMBXStyleFactory.setRainLayerStyle(
+                it, RNMBXStyle(
+                    context, mReactStyle,
+                    mMap!!
+                )
+            )
+        } ?: run {
+            Logger.e("RNMBXRain", "mRain is null")
+        }
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/rain/RNMBXRainManager.kt

@@ -0,0 +1,40 @@
+package com.rnmapbox.rnmbx.components.styles.rain
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.rnmapbox.rnmbx.utils.extensions.asMapOrNull
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRainManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXRainManagerInterface
+
+class RNMBXRainManager : ViewGroupManager<RNMBXRain>(), RNMBXRainManagerInterface<RNMBXRain> {
+
+    private val mDelegate: ViewManagerDelegate<RNMBXRain>
+
+    init {
+        mDelegate = RNMBXRainManagerDelegate(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXRain> {
+        return mDelegate
+    }
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXRain {
+        return RNMBXRain(reactContext)
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(rain: RNMBXRain, reactStyle: Dynamic) {
+        rain.setReactStyle(reactStyle.asMapOrNull())
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXRain"
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/snow/RNMBXSnow.kt

@@ -0,0 +1,66 @@
+package com.rnmapbox.rnmbx.components.styles.snow
+
+import android.content.Context
+import com.facebook.react.bridge.ReadableMap
+import com.mapbox.maps.MapboxMap
+import com.mapbox.maps.extension.style.precipitations.generated.Snow
+import com.mapbox.maps.extension.style.precipitations.generated.removeSnow
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXSnow(context: Context?) : AbstractSourceConsumer(context) {
+    override var iD: String? = null
+    protected var mSnow: Snow? = null
+
+    // beginregion RNMBXLayer
+    @JvmField
+    protected var mMap: MapboxMap? = null
+
+    @JvmField
+    protected var mReactStyle: ReadableMap? = null
+
+    fun setReactStyle(reactStyle: ReadableMap?) {
+        mReactStyle = reactStyle
+        if (mSnow != null) {
+            addStyles()
+        }
+    }
+    // endregion RNMBXLayer
+
+    override fun addToMap(mapView: RNMBXMapView) {
+        super.addToMap(mapView)
+        mMap = mapView.getMapboxMap()
+        val snow = makeSnow()
+        mSnow = snow
+        addStyles()
+        mapView.savedStyle?.let { snow.bindTo(it) }
+    }
+
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
+        mapView.savedStyle?.let { it.removeSnow() }
+        mSnow = null
+        mMap = null
+        return super.removeFromMap(mapView, reason)
+    }
+
+    fun makeSnow(): Snow {
+        return Snow()
+    }
+
+    fun addStyles() {
+        mSnow?.also {
+            RNMBXStyleFactory.setSnowLayerStyle(
+                it, RNMBXStyle(
+                    context, mReactStyle,
+                    mMap!!
+                )
+            )
+        } ?: run {
+            Logger.e("RNMBXSnow", "mSnow is null")
+        }
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/snow/RNMBXSnowManager.kt

@@ -0,0 +1,40 @@
+package com.rnmapbox.rnmbx.components.styles.snow
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.rnmapbox.rnmbx.utils.extensions.asMapOrNull
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXSnowManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXSnowManagerInterface
+
+class RNMBXSnowManager : ViewGroupManager<RNMBXSnow>(), RNMBXSnowManagerInterface<RNMBXSnow> {
+
+    private val mDelegate: ViewManagerDelegate<RNMBXSnow>
+
+    init {
+        mDelegate = RNMBXSnowManagerDelegate(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXSnow> {
+        return mDelegate
+    }
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXSnow {
+        return RNMBXSnow(reactContext)
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(snow: RNMBXSnow, reactStyle: Dynamic) {
+        snow.setReactStyle(reactStyle.asMapOrNull())
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXSnow"
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXSource.kt

@@ -6,22 +6,18 @@ import com.mapbox.maps.extension.style.sources.addSource
 import com.rnmapbox.rnmbx.components.AbstractMapFeature
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.mapbox.maps.MapboxMap
-import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
 import com.facebook.react.bridge.ReadableMap
-import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource
-import android.graphics.PointF
 import android.view.View
 import com.facebook.react.common.MapBuilder
 import com.mapbox.geojson.Feature
+import com.mapbox.maps.ScreenCoordinate
 import com.mapbox.maps.Style
 import com.mapbox.maps.extension.style.StyleContract
 import com.mapbox.maps.extension.style.sources.Source
 import com.rnmapbox.rnmbx.components.RemovalReason
-import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource.OnPressEvent
 import com.rnmapbox.rnmbx.utils.LatLng
 import com.rnmapbox.rnmbx.utils.Logger
 import java.lang.ClassCastException
-import java.util.ArrayList
 import java.util.HashMap
 
 data class FeatureInfo(val feature: AbstractMapFeature?, var added: Boolean) {
@@ -221,7 +217,7 @@ abstract class RNMBXSource<T : Source?>(context: Context?) : AbstractMapFeature(
 
 
     abstract fun makeSource(): T
-    class OnPressEvent(var features: List<Feature>, var latLng: LatLng, var screenPoint: PointF)
+    class OnPressEvent(var features: List<Feature>, var latLng: LatLng, var screenPoint: ScreenCoordinate)
 
     abstract fun onPress(event: OnPressEvent?)
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/terrain/RNMBXTerrainManager.kt

@@ -2,6 +2,7 @@ package com.rnmapbox.rnmbx.components.styles.terrain
 
 import com.facebook.react.bridge.Dynamic
 import com.facebook.react.uimanager.ThemedReactContext
+import com.rnmapbox.rnmbx.utils.extensions.asMapOrNull
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXTerrainManagerInterface
@@ -23,7 +24,7 @@ class RNMBXTerrainManager : ViewGroupManager<RNMBXTerrain>(),
 
     @ReactProp(name = "reactStyle")
     override fun setReactStyle(terrain: RNMBXTerrain, reactStyle: Dynamic) {
-        terrain.setReactStyle(reactStyle.asMap())
+        terrain.setReactStyle(reactStyle.asMapOrNull())
     }
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/events/FeatureClickEvent.java

@@ -1,16 +1,15 @@
 package com.rnmapbox.rnmbx.events;
 
-import android.graphics.PointF;
 import android.view.View;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.mapbox.geojson.Feature;
+import com.mapbox.maps.ScreenCoordinate;
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource;
 import com.rnmapbox.rnmbx.events.constants.EventKeys;
 import com.rnmapbox.rnmbx.events.constants.EventTypes;
-import com.rnmapbox.rnmbx.utils.ConvertUtils;
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils;
 import com.rnmapbox.rnmbx.utils.LatLng;
 
@@ -24,9 +23,9 @@ public class FeatureClickEvent extends AbstractEvent {
     private String mEventKey;
     private List<Feature> mFeatures;
     private LatLng mLatLng;
-    private PointF mPoint;
+    private ScreenCoordinate mPoint;
 
-    public FeatureClickEvent(View view, String eventKey, String eventType, List<Feature> features, LatLng latLng, PointF point) {
+    public FeatureClickEvent(View view, String eventKey, String eventType, List<Feature> features, LatLng latLng, ScreenCoordinate point) {
         super(view, eventType);
         mFeatures = features;
         mEventKey = eventKey;
@@ -55,8 +54,8 @@ public class FeatureClickEvent extends AbstractEvent {
         map.putMap("coordinates", coordinates);
 
         WritableMap point = Arguments.createMap();
-        point.putDouble("x", mPoint.x);
-        point.putDouble("y", mPoint.y);
+        point.putDouble("x", mPoint.getX());
+        point.putDouble("y", mPoint.getY());
         map.putMap("point", point);
 
         return map;

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXModule.kt

@@ -114,6 +114,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
         val locationModuleCallbackNames: MutableMap<String, String> = HashMap()
         locationModuleCallbackNames["Update"] = RNMBXLocationModule.LOCATION_UPDATE
         return MapBuilder.builder<String, Any>()
+            // Deprecated: means v10 or later, always true. Will be removed in next major version.
             .put("MapboxV10", true)
             .put("StyleURL", styleURLS)
             .put("EventTypes", eventTypes)

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ConvertUtils.kt

@@ -1,7 +1,5 @@
 package com.rnmapbox.rnmbx.utils
 
-import android.graphics.PointF
-import android.graphics.RectF
 import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.NoSuchKeyException
@@ -172,34 +170,6 @@ object ConvertUtils {
         return list
     }
 
-    fun toPointF(array: ReadableArray?): PointF {
-        val pointF = PointF()
-
-        if (array == null) {
-            return pointF
-        }
-
-        pointF.set(array.getDouble(0).toFloat(), array.getDouble(1).toFloat())
-        return pointF
-    }
-
-    // returns null if array is null
-    fun toRectF(array: ReadableArray?): RectF? {
-        val rectF = RectF()
-
-        if (array == null || array.size() == 0) {
-            return null
-        }
-
-        rectF.set(
-            array.getDouble(3).toFloat(),
-            array.getDouble(0).toFloat(),
-            array.getDouble(1).toFloat(),
-            array.getDouble(2).toFloat()
-        )
-        return rectF
-    }
-
     fun getDouble(key: String, map: ReadableMap, defaultValue: Double): Double {
         var value = defaultValue
 

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/Dynamic.kt

@@ -107,4 +107,6 @@ fun Dynamic.asStringOrNull(): String? {
     } else {
         asString()
     }
-}
+}
+
+fun Dynamic.asMapOrNull(): ReadableMap? = if (isNull) null else asMap()

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableArray.kt

@@ -1,17 +1,15 @@
 package com.rnmapbox.rnmbx.utils.extensions
 
-import android.graphics.RectF
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableType
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.mapbox.geojson.Point
+import com.mapbox.maps.ScreenBox
 import com.mapbox.maps.ScreenCoordinate
-import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.Logger
-import org.json.JSONArray
-import java.lang.Float.max
-import java.lang.Float.min
+import kotlin.math.max
+import kotlin.math.min
 
 fun ReadableArray.toCoordinate() : Point {
     if (this.size() != 2) {
@@ -25,20 +23,24 @@ fun ReadableArray.toCoordinate() : Point {
 
 fun ReadableArray.toScreenCoordinate() : ScreenCoordinate {
     if (this.size() != 2) {
-        Logger.e("ReadableArray.toCoordinate","Cannot convert $this to point, 2 coordinates are required")
+        Logger.e("ReadableArray.toScreenCoordinate","Cannot convert $this to point, 2 coordinates are required")
     }
     return ScreenCoordinate(getDouble(0), getDouble(1))
 }
 
-fun ReadableArray.toRectF() : RectF? {
-    if (size() != 4) {
-        return null;
+fun ReadableArray.toScreenBox() : ScreenBox {
+    if (this.size() != 4) {
+        Logger.e("ReadableArray.toScreenBox","Cannot convert $this to box, 4 coordinates are required")
     }
-    return RectF(
-        min(getDouble(3).toFloat(), getDouble(1).toFloat()),
-        min(getDouble(0).toFloat(), getDouble(2).toFloat()),
-        max(getDouble(3).toFloat(), getDouble(1).toFloat()),
-        max(getDouble(0).toFloat(), getDouble(2).toFloat())
+
+    val top = getDouble(0)
+    val left = getDouble(1)
+    val bottom = getDouble(2)
+    val right = getDouble(3)
+
+    return ScreenBox(
+        ScreenCoordinate(min(left, right), min(top, bottom)),
+        ScreenCoordinate(max(left, right), max(top, bottom))
     )
 }
 

package/ios/RNMBX/RNMBXAtmosphereComponentView.mm

@@ -3,6 +3,7 @@
 #import "RNMBXFabricHelpers.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -40,7 +41,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
     _view =  [[RNMBXAtmosphere alloc] init];
-    _view.bridge = [RCTBridge currentBridge];
+    _view.bridge = [RNMBXBridgeManager currentBridge];
 
     self.contentView = _view;
 }

package/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm

@@ -3,6 +3,7 @@
 #import "RNMBXFabricHelpers.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -40,7 +41,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXBackgroundLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXBridgeManager.h

@@ -0,0 +1,8 @@
+#import <React/RCTBridge.h>
+
+@interface RNMBXBridgeManager : NSObject
+
++ (void)setBridge:(RCTBridge *)bridge;
++ (RCTBridge *)currentBridge;
+
+@end

package/ios/RNMBX/RNMBXBridgeManager.m

@@ -0,0 +1,16 @@
+#import "RNMBXBridgeManager.h"
+#import <React/RCTBridge+Private.h>
+
+static __weak RCTBridge *_rnmbxBridge = nil;
+
+@implementation RNMBXBridgeManager
+
++ (void)setBridge:(RCTBridge *)bridge {
+    _rnmbxBridge = bridge;
+}
+
++ (RCTBridge *)currentBridge {
+    return [RCTBridge currentBridge] ?: _rnmbxBridge;
+}
+
+@end

package/ios/RNMBX/RNMBXCircleLayerComponentView.mm

@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXCircleLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm

@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXFillExtrusionLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
  self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXFillLayerComponentView.mm

@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXFillLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm

@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXHeatmapLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 #pragma mark - RCTComponentViewProtocol

package/ios/RNMBX/RNMBXHillshadeLayerComponentView.mm

@@ -5,6 +5,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
 
 #import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
 #import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
@@ -40,7 +41,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXHillshadeLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXImageModule.h

@@ -14,3 +14,4 @@
 @end
 
 #endif
+

package/ios/RNMBX/RNMBXImageModule.mm

@@ -4,15 +4,28 @@
 
 #import "RNMBXImageModule.h"
 #import "RNMBXImageComponentView.h"
+#import "RNMBXBridgeManager.h"
 
 #import "rnmapbox_maps-Swift.pre.h"
 
-@implementation RNMBXImageModule
+@implementation RNMBXImageModule {
+    id _bridgeBacking;
+}
 
 RCT_EXPORT_MODULE();
 
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
-@synthesize bridge = _bridge;
+
+- (void)setBridge:(RCTBridge *)bridge {
+    _bridgeBacking = bridge;
+    if (bridge != nil) {
+        [RNMBXBridgeManager setBridge:bridge];
+    }
+}
+
+- (RCTBridge *)bridge {
+    return _bridgeBacking;
+}
 
 - (dispatch_queue_t)methodQueue
 {