@rnmapbox/maps 10.3.0 → 10.3.1

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/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
 {

package/ios/RNMBX/RNMBXImageQueue.swift

@@ -67,7 +67,15 @@ class RNMBXImageQueueOperation : Operation {
     
     DispatchQueue.global(qos: .default).async {
       if let weakSelf = weakSelf {
-        let loader : RCTImageLoaderProtocol = weakSelf.bridge!.module(forName: "ImageLoader", lazilyLoadIfNecessary: true) as! RCTImageLoaderProtocol
+        guard let bridge = weakSelf.bridge else {
+          Logger.log(level: .error, message: "RNMBXImageQueue: bridge is nil, cannot load image")
+          if let completionHandler = weakSelf.completionHandler {
+            completionHandler(NSError(domain: "RNMBXImageQueue", code: 1, userInfo: [NSLocalizedDescriptionKey: "bridge is nil"]), nil)
+          }
+          _ = weakSelf.setState(state:.Finished, except:.Finished)
+          return
+        }
+        let loader : RCTImageLoaderProtocol = bridge.module(forName: "ImageLoader", lazilyLoadIfNecessary: true) as! RCTImageLoaderProtocol
         
         let cancellationBlock = loader.loadImage(with: weakSelf.urlRequest, size: .zero, scale: CGFloat(weakSelf.scale), clipped: true, resizeMode: .stretch, progressBlock: { _,_  in }, partialLoad: { _ in }) { error, image in
           if let completionHandler = weakSelf.completionHandler {

package/ios/RNMBX/RNMBXImages.swift

@@ -130,6 +130,10 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
     }
     
     if missingImages.count > 0 {
+      guard let bridge = bridge else {
+        Logger.log(level: .error, message: "RNMBXImages: bridge is nil, cannot fetch images. Use nativeAssetImages instead.")
+        return
+      }
       RNMBXUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true) { name, image in
         self.loadedImages.insert(name)
         self.imageManager?.resolve(name: name, image: image)

package/ios/RNMBX/RNMBXImagesComponentView.mm

@@ -5,6 +5,7 @@
 #include "RNMBXImageComponentView.h"
 
 #import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -42,7 +43,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
     _view = [[RNMBXImages alloc] init];
-    _view.bridge = [RCTBridge currentBridge];
+    _view.bridge = [RNMBXBridgeManager currentBridge];
 
       // capture weak self reference to prevent retain cycle
       __weak __typeof__(self) weakSelf = self;

package/ios/RNMBX/RNMBXLightComponentView.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 = [[RNMBXLight alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXLineLayerComponentView.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 =  [[RNMBXLineLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXModelLayerComponentView.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 =  [[RNMBXModelLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
+  _view.bridge = [RNMBXBridgeManager currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXRain.swift

@@ -0,0 +1,92 @@
+@_spi(Experimental) import MapboxMaps
+
+@objc(RNMBXRain)
+public class RNMBXRain : RNMBXSingletonLayer, RNMBXMapComponent, RNMBXSourceConsumer {
+  var rain : Rain? = nil
+
+  func makeRain() -> Rain {
+    return Rain()
+  }
+
+  public func addToMap(_ map: RNMBXMapView, style: Style) {
+    self.map = map
+    self.style = style
+
+    warnIfMeasureLightUnavailable(style: style)
+
+    let rain = self.makeRain()
+    self.rain = rain
+    addStylesAndUpdate()
+  }
+
+  private func warnIfMeasureLightUnavailable(style: Style) {
+    let hasLights = !style.allLightIdentifiers.isEmpty
+    if hasLights { return }
+
+    let affectedProps = ["color", "opacity", "vignetteColor"]
+    let missingProps = affectedProps.filter { reactStyle?[$0] == nil }
+    if missingProps.isEmpty { return }
+
+    Logger.log(level: .warn, message: "RNMBXRain: The current style has no 3D lights, so " +
+      "measure-light(\"brightness\") expressions used in default rain " +
+      "\(missingProps.joined(separator: ", ")) will fail. Use a Standard style or set " +
+      "explicit values for: \(missingProps.joined(separator: ", "))")
+  }
+
+  public func removeFromMap(_ map: RNMBXMapView, reason _: RemovalReason) -> Bool {
+    self.map = nil
+
+    guard let mapboxMap = map.mapboxMap else {
+      return false
+    }
+
+    let style = mapboxMap.style
+    removeFromMap(map, style: style)
+    return true
+  }
+
+  public func waitForStyleLoad() -> Bool {
+    return true
+  }
+
+  func removeFromMap(_ map: RNMBXMapView, style: Style) {
+    logged("RNMBXRain.removeFromMap") {
+      try style.removeRain()
+    }
+  }
+
+  override func addStylesAndUpdate() {
+    guard rain != nil else {
+      return
+    }
+
+    super.addStylesAndUpdate()
+  }
+
+  override func addStyles() {
+    if let style : Style = self.style,
+       let reactStyle = self.reactStyle {
+      let styler = RNMBXStyle(style: style)
+      styler.bridge = self.bridge
+
+      if var rain = rain {
+        styler.rainLayer(
+          layer: &rain,
+          reactStyle: reactStyle,
+          oldReactStyle: oldReactStyle,
+          applyUpdater: { (updater) in fatalError("Rain: TODO - implement apply updater")},
+          isValid: { fatalError("Rain: TODO - no isValid") }
+        )
+        self.rain = rain
+      } else {
+        fatalError("[xxx] rain is nil \(optional: self.rain)")
+      }
+    }
+  }
+
+  override func apply(style : Style) throws {
+    if let rain = rain {
+      try style.setRain(rain)
+    }
+  }
+}

package/ios/RNMBX/RNMBXRainComponentView.h

@@ -0,0 +1,14 @@
+#ifdef __cplusplus
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMBXRainComponentView : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END
+#endif // __cplusplus