@rnmapbox/maps 10.2.7 → 10.2.8

package/ios/RNMBX/RNMBXRasterArraySourceComponentView.mm

@@ -0,0 +1,168 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXRasterArraySourceComponentView.h"
+#import "RNMBXFabricHelpers.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;
+
+#if RNMBX_11
+
+@interface RNMBXRasterArraySourceComponentView () <RCTRNMBXRasterArraySourceViewProtocol>
+@end
+
+@implementation RNMBXRasterArraySourceComponentView {
+    RNMBXRasterArraySource *_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 RNMBXRasterArraySourceProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXRasterArraySource alloc] init];
+  self.contentView = _view;
+}
+
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  [self prepareView];
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]]) {
+        [_view insertReactSubviewInternal:((RCTViewComponentView *)childComponentView).contentView at:index];
+    } else {
+        RCTLogError(@"Tried to add view that is not RCTViewComponentView: %@", childComponentView);
+    }
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]]) {
+        [_view removeReactSubviewInternal:((RCTViewComponentView *)childComponentView).contentView];
+    } else {
+        RCTLogError(@"Tried to remove view that is not RCTViewComponentView: %@", childComponentView);
+    }
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXRasterArraySourceComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXRasterArraySourceProps &>(*props);
+    id idx = RNMBXConvertFollyDynamicToId(newProps.id);
+    if (idx != nil) {
+        _view.id = idx;
+    }
+    id existing = RNMBXConvertFollyDynamicToId(newProps.existing);
+    if (existing != nil) {
+        _view.existing = existing;
+    }
+    id url = RNMBXConvertFollyDynamicToId(newProps.url);
+    if (url != nil) {
+        _view.url = url;
+    }
+    id tileUrlTemplates = RNMBXConvertFollyDynamicToId(newProps.tileUrlTemplates);
+    if (tileUrlTemplates != nil) {
+        _view.tileUrlTemplates = tileUrlTemplates;
+    }
+    id minZoomLevel = RNMBXConvertFollyDynamicToId(newProps.minZoomLevel);
+    if (minZoomLevel != nil) {
+        _view.minZoomLevel = minZoomLevel;
+    }
+    id maxZoomLevel = RNMBXConvertFollyDynamicToId(newProps.maxZoomLevel);
+    if (maxZoomLevel != nil) {
+        _view.maxZoomLevel = maxZoomLevel;
+    }
+    id tileSize = RNMBXConvertFollyDynamicToId(newProps.tileSize);
+    if (tileSize != nil) {
+        _view.tileSize = tileSize;
+    }
+    id sourceBounds = RNMBXConvertFollyDynamicToId(newProps.sourceBounds);
+    if (sourceBounds != nil) {
+       _view.sourceBounds = sourceBounds;
+    }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXRasterArraySourceCls(void)
+{
+  return RNMBXRasterArraySourceComponentView.class;
+}
+
+#else // !RNMBX_11
+
+// RasterArraySource is only available in Mapbox v11+
+// Provide a stub implementation for v10 builds
+
+@interface RNMBXRasterArraySourceComponentView () <RCTRNMBXRasterArraySourceViewProtocol>
+@end
+
+@implementation RNMBXRasterArraySourceComponentView
+
++ (void)load
+{
+  [super load];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXRasterArraySourceProps>();
+    _props = defaultProps;
+  }
+  return self;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXRasterArraySourceComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXRasterArraySourceCls(void)
+{
+  return RNMBXRasterArraySourceComponentView.class;
+}
+
+#endif // RNMBX_11
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterArraySourceViewManager.swift

@@ -0,0 +1,16 @@
+import Foundation
+import MapboxMaps
+
+#if RNMBX_11
+@objc(RNMBXRasterArraySourceViewManager)
+class RNMBXRasterArraySourceViewManager : RCTViewManager {
+  @objc
+  override static func requiresMainQueueSetup() -> Bool {
+    return false
+  }
+
+  override func view() -> UIView! {
+    return RNMBXRasterArraySource()
+  }
+}
+#endif

package/ios/RNMBX/RNMBXRasterParticleLayer.swift

@@ -0,0 +1,100 @@
+#if RNMBX_11
+@_spi(Experimental) import MapboxMaps
+
+@objc(RNMBXRasterParticleLayer)
+public class RNMBXRasterParticleLayer: RNMBXLayer {
+  typealias LayerType = RasterParticleLayer
+
+  override func makeLayer(style: Style) throws -> Layer {
+    var layer = LayerType(id: self.id!, source: sourceID!)
+    layer.source = sourceID
+    return layer
+  }
+
+// @{codepart-replace-start(LayerPropsCommon.codepart-swift.ejs,{layerType:"RasterParticle"})}
+  func setCommonOptions(_ layer: inout RasterParticleLayer) -> Bool {
+    var changed = false
+
+    #if RNMBX_11
+    if let sourceLayerID = sourceLayerID {
+      layer.sourceLayer = sourceLayerID
+      changed = true
+    }
+
+    if let sourceID = sourceID {
+      if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
+        layer.source = sourceID
+        changed = true
+      }
+    }
+
+    if let filter = filter, filter.count > 0 {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        layer.filter = decodedExpression
+        changed = true
+      } catch {
+        Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
+      }
+    }
+    #endif
+
+    return changed
+  }
+
+  override func setOptions(_ layer: inout Layer) {
+    super.setOptions(&layer)
+    if var actualLayer = layer as? LayerType {
+      if self.setCommonOptions(&actualLayer) {
+        layer = actualLayer
+      }
+    } else {
+      Logger.log(level: .error, message: "Expected layer type to be RasterParticle but was \(type(of: layer))")
+    }
+  }
+
+  override func apply(style : Style) throws {
+    try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout RasterParticleLayer) in
+      if self.styleLayer != nil {
+        self.setOptions(&self.styleLayer!)
+      }
+      if let styleLayer = self.styleLayer as? LayerType {
+        layer = styleLayer
+      }
+    }
+  }
+// @{codepart-replace-end}
+
+  override func addStyles() {
+    if let style : Style = self.style,
+       let reactStyle = reactStyle {
+      let styler =  RNMBXStyle(style: self.style!)
+      styler.bridge = self.bridge
+
+      if var styleLayer = self.styleLayer as? LayerType {
+        styler.rasterParticleLayer(
+          layer: &styleLayer,
+          reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
+          applyUpdater:{ (updater) in logged("RNMBXRasterParticleLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
+          isValid: { return self.isAddedToMap() }
+        )
+        self.styleLayer = styleLayer
+      } else {
+        fatalError("[xxx] layer is not raster particle layer?!!! \(optional: self.styleLayer)")
+      }
+    }
+  }
+
+  func isAddedToMap() -> Bool {
+    return true
+  }
+
+  override func layerType() -> Layer.Type {
+    return LayerType.self
+  }
+}
+#endif

package/ios/RNMBX/RNMBXRasterParticleLayerComponentView.h

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

package/ios/RNMBX/RNMBXRasterParticleLayerComponentView.mm

@@ -0,0 +1,121 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXRasterParticleLayerComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTBridge+Private.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;
+
+#if RNMBX_11
+
+@interface RNMBXRasterParticleLayerComponentView () <RCTRNMBXRasterParticleLayerViewProtocol>
+@end
+
+@implementation RNMBXRasterParticleLayerComponentView {
+    RNMBXRasterParticleLayer *_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 RNMBXRasterParticleLayerProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXRasterParticleLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXRasterParticleLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXRasterParticleLayerProps &>(*props);
+  RNMBXSetCommonLayerProps(newProps, _view);
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXRasterParticleLayerCls(void)
+{
+  return RNMBXRasterParticleLayerComponentView.class;
+}
+
+#else // !RNMBX_11
+
+// RasterParticleLayer is only available in Mapbox v11+
+// Provide a stub implementation for v10 builds
+
+@interface RNMBXRasterParticleLayerComponentView () <RCTRNMBXRasterParticleLayerViewProtocol>
+@end
+
+@implementation RNMBXRasterParticleLayerComponentView
+
++ (void)load
+{
+  [super load];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXRasterParticleLayerProps>();
+    _props = defaultProps;
+  }
+  return self;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXRasterParticleLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXRasterParticleLayerCls(void)
+{
+  return RNMBXRasterParticleLayerComponentView.class;
+}
+
+#endif // RNMBX_11
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterParticleLayerViewManager.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+#if RNMBX_11
+@objc(RNMBXRasterParticleLayerViewManager)
+class RNMBXRasterParticleLayerViewManager: RCTViewManager {
+  @objc
+  override static func requiresMainQueueSetup() -> Bool {
+    return false
+  }
+
+  override func view() -> UIView! {
+    let layer = RNMBXRasterParticleLayer()
+    layer.bridge = self.bridge
+    return layer
+  }
+}
+#endif

package/ios/RNMBX/RNMBXShapeSource.swift

@@ -55,15 +55,16 @@ public class RNMBXShapeSource : RNMBXSource {
     }
   }
   
-  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)
   }
   
-  public override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+  public override func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
     if (reason == .ViewRemoval) {
       shapeAnimator?.unsubscribe(consumer: self)
     }
-    return super.removeFromMap(map, reason: reason)
+    return super.removeFromMap(map, mapView:mapView, reason: reason)
   }
 
   @objc public var cluster : NSNumber?

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

package/ios/RNMBX/RNMBXShapeSourceModule.mm

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

package/ios/RNMBX/RNMBXSource.swift

@@ -3,7 +3,7 @@
 @objc
 public class RNMBXSource : RNMBXInteractiveElement {
   var layers: [RNMBXSourceConsumer] = []
-  var components: [RNMBXMapComponent] = []
+  var components: [RNMBXMapComponentProtocol] = []  // Use base protocol to store both types
 
   var source : Source? = nil
 
@@ -38,34 +38,50 @@ public class RNMBXSource : RNMBXInteractiveElement {
     
     @objc public func insertReactSubviewInternal(_ subview: UIView!, at atIndex: Int) {
         if let layer = subview as? RNMBXSourceConsumer {
-          if let map = map {
-            layer.addToMap(map, style: map.mapboxMap.style)
+          if let map = map, let mapView = mapView {
+            layer.addToMap(map, style: mapView.mapboxMap.style)
           }
           layers.append(layer)
-        } else if let component = subview as? RNMBXMapComponent {
-          if let map = map {
-            component.addToMap(map, style: map.mapboxMap.style)
+        }
+        // Check for more specific protocol first (RNMBXMapAndMapViewComponent is a subtype of RNMBXMapComponent)
+        else if let mapAndMapViewComponent = subview as? RNMBXMapAndMapViewComponent {
+          if let map = map, let mapView = mapView {
+            mapAndMapViewComponent.addToMap(map, mapView: mapView, style: mapView.mapboxMap.style)
+          }
+          components.append(mapAndMapViewComponent)
+        }
+        else if let component = subview as? RNMBXMapComponent {
+          if let map = map, let mapView = mapView {
+            component.addToMap(map, style: mapView.mapboxMap.style)
           }
           components.append(component)
         }
     }
-  
+
   @objc public override func removeReactSubview(_ subview: UIView!) {
     removeReactSubviewInternal(subview)
     super.removeReactSubview(subview)
   }
-    
+
     @objc public func removeReactSubviewInternal(_ subview: UIView!) {
         if let layer : RNMBXSourceConsumer = subview as? RNMBXSourceConsumer {
-          if let map = map {
-            layer.removeFromMap(map, style: map.mapboxMap.style)
+          if let map = map, let mapView = mapView {
+            layer.removeFromMap(map, style: mapView.mapboxMap.style)
           }
           layers.removeAll { $0 as AnyObject === layer }
-        } else if let component = subview as? RNMBXMapComponent {
+        }
+        // Check for more specific protocol first (RNMBXMapAndMapViewComponent is a subtype of RNMBXMapComponent)
+        else if let mapAndMapViewComponent = subview as? RNMBXMapAndMapViewComponent {
+          if let map = map, let mapView = mapView {
+            mapAndMapViewComponent.removeFromMap(map, mapView: mapView, reason: .ViewRemoval)
+          }
+          components.removeAll { $0 as AnyObject === mapAndMapViewComponent }
+        }
+        else if let component = subview as? RNMBXMapComponent {
           if let map = map {
             component.removeFromMap(map, reason: .ViewRemoval)
           }
-          layers.removeAll { $0 as AnyObject === component }
+          components.removeAll { $0 as AnyObject === component }
         }
     }
 
@@ -75,9 +91,9 @@ public class RNMBXSource : RNMBXInteractiveElement {
   }
   
   // MARK: - RNMBXInteractiveElement
-  
-  public override func addToMap(_ map: RNMBXMapView, style: Style) {
-    self.map = map
+
+  public override func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
+    super.addToMap(map, mapView: mapView, style: style)
 
     if style.sourceExists(withId: self.id) {
       if (!existing) {
@@ -101,22 +117,36 @@ public class RNMBXSource : RNMBXInteractiveElement {
     }
 
     for layer in self.layers {
-      layer.addToMap(map, style: map.mapboxMap.style)
+      layer.addToMap(map, style: style)
     }
     for component in self.components {
-      component.addToMap(map, style: map.mapboxMap.style)
+      // Check for more specific protocol first
+      if let mapAndMapViewComponent = component as? RNMBXMapAndMapViewComponent {
+        mapAndMapViewComponent.addToMap(map, mapView: mapView, style: style)
+      } else if let mapComponent = component as? RNMBXMapComponent {
+        mapComponent.addToMap(map, style: style)
+      }
     }
   }
 
-  public override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    self.map = nil
+  public override func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
+    super.removeFromMap(map, mapView: mapView, reason: reason)
 
     for layer in self.layers {
-      layer.removeFromMap(map, style: map.mapboxMap.style)
+      layer.removeFromMap(map, style: mapView.mapboxMap.style)
+    }
+
+    for component in self.components {
+      // Check for more specific protocol first
+      if let mapAndMapViewComponent = component as? RNMBXMapAndMapViewComponent {
+        mapAndMapViewComponent.removeFromMap(map, mapView: mapView, reason: reason)
+      } else if let mapComponent = component as? RNMBXMapComponent {
+        mapComponent.removeFromMap(map, reason: reason)
+      }
     }
 
     if self.ownsSource {
-      let style = map.mapboxMap.style
+      let style = mapView.mapboxMap.style
       logged("StyleSource.removeFromMap", info: { "id: \(optional: self.id)"}) {
         try style.removeSource(withId: id)
       }