@rnmapbox/maps 10.3.0-rc.0 → 10.3.1

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/RNMBXMapViewModule.mm

@@ -60,7 +60,7 @@ RCT_EXPORT_METHOD(getCoordinateFromView:(nonnull NSNumber*)viewRef atPoint:(NSAr
         NSNumber* a = [atPoint objectAtIndex:0];
         NSNumber* b = [atPoint objectAtIndex:1];
 
-        [view getCoordinateFromViewWithAtPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject];
+        [view getCoordinateFromViewWithAtPoint:CGPointMake(a.doubleValue, b.doubleValue) resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getCoordinateFromView"];
 }
 

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/RNMBXModule.swift

@@ -23,6 +23,7 @@ class RNMBXModule : NSObject {
   @objc
   func constantsToExport() -> [AnyHashable: Any]! {
     return [
+      // Deprecated: means v10 or later, always true. Will be removed in next major version.
       "MapboxV10":true,
       "StyleURL":
         [

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

package/ios/RNMBX/RNMBXRainComponentView.mm

@@ -0,0 +1,80 @@
+
+#import "RNMBXRainComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@interface RNMBXRainComponentView () <RCTRNMBXRainViewProtocol>
+@end
+
+@implementation RNMBXRainComponentView {
+    RNMBXRain *_view;
+}
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        static const auto defaultProps = std::make_shared<const RNMBXRainProps>();
+        _props = defaultProps;
+        [self prepareView];
+    }
+
+    return self;
+}
+
+- (void)prepareView
+{
+    _view =  [[RNMBXRain alloc] init];
+    _view.bridge = [RNMBXBridgeManager currentBridge];
+
+    self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXRainComponentDescriptor>();
+}
+
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXRainProps &>(*props);
+    id reactStyle = RNMBXConvertFollyDynamicToId(newProps.reactStyle);
+    if (reactStyle != nil) {
+        _view.reactStyle = reactStyle;
+    }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXRainCls(void)
+{
+  return RNMBXRainComponentView.class;
+}

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

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

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

package/ios/RNMBX/RNMBXSnow.swift

@@ -0,0 +1,76 @@
+@_spi(Experimental) import MapboxMaps
+
+@objc(RNMBXSnow)
+public class RNMBXSnow : RNMBXSingletonLayer, RNMBXMapComponent, RNMBXSourceConsumer {
+  var snow : Snow? = nil
+
+  func makeSnow() -> Snow {
+    return Snow()
+  }
+
+  public func addToMap(_ map: RNMBXMapView, style: Style) {
+    self.map = map
+    self.style = style
+
+    let snow = self.makeSnow()
+    self.snow = snow
+    addStylesAndUpdate()
+  }
+
+  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("RNMBXSnow.removeFromMap") {
+      try style.removeSnow()
+    }
+  }
+
+  override func addStylesAndUpdate() {
+    guard snow != 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 snow = snow {
+        styler.snowLayer(
+          layer: &snow,
+          reactStyle: reactStyle,
+          oldReactStyle: oldReactStyle,
+          applyUpdater: { (updater) in fatalError("Snow: TODO - implement apply updater")},
+          isValid: { fatalError("Snow: TODO - no isValid") }
+        )
+        self.snow = snow
+      } else {
+        fatalError("[xxx] snow is nil \(optional: self.snow)")
+      }
+    }
+  }
+
+  override func apply(style : Style) throws {
+    if let snow = snow {
+      try style.setSnow(snow)
+    }
+  }
+}

package/ios/RNMBX/RNMBXSnowComponentView.h

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

package/ios/RNMBX/RNMBXSnowComponentView.mm

@@ -0,0 +1,80 @@
+
+#import "RNMBXSnowComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTBridge+Private.h>
+#import "RNMBXBridgeManager.h"
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@interface RNMBXSnowComponentView () <RCTRNMBXSnowViewProtocol>
+@end
+
+@implementation RNMBXSnowComponentView {
+    RNMBXSnow *_view;
+}
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        static const auto defaultProps = std::make_shared<const RNMBXSnowProps>();
+        _props = defaultProps;
+        [self prepareView];
+    }
+
+    return self;
+}
+
+- (void)prepareView
+{
+    _view =  [[RNMBXSnow alloc] init];
+    _view.bridge = [RNMBXBridgeManager currentBridge];
+
+    self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXSnowComponentDescriptor>();
+}
+
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXSnowProps &>(*props);
+    id reactStyle = RNMBXConvertFollyDynamicToId(newProps.reactStyle);
+    if (reactStyle != nil) {
+        _view.reactStyle = reactStyle;
+    }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXSnowCls(void)
+{
+  return RNMBXSnowComponentView.class;
+}