@rnmapbox/maps 10.1.0-beta.13 → 10.1.0-beta.14

package/ios/RNMBX/RNMBXShapeSourceComponentView.mm

@@ -0,0 +1,153 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXShapeSourceComponentView.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;
+
+@interface RNMBXShapeSourceComponentView () <RCTRNMBXShapeSourceViewProtocol>
+@end
+
+@implementation RNMBXShapeSourceComponentView {
+    RNMBXShapeSource *_view;
+}
+
+@synthesize mapFeature;
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXShapeSourceProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+    _view = [[RNMBXShapeSource alloc] init];
+      
+      
+    // capture weak self reference to prevent retain cycle
+    __weak __typeof__(self) weakSelf = self;
+
+    [_view setOnPress:^(NSDictionary* event) {
+        __typeof__(self) strongSelf = weakSelf;
+
+        if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+            const auto [type, json] = RNMBXStringifyEventData(event);
+            std::dynamic_pointer_cast<const facebook::react::RNMBXShapeSourceEventEmitter>(strongSelf->_eventEmitter)->onMapboxShapeSourcePress({type, json});
+          }
+    }];
+      
+    self.contentView = _view;
+    self.mapFeature = _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<RNMBXShapeSourceComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = *std::static_pointer_cast<const RNMBXShapeSourceProps>(props);
+    id idx = RNMBXConvertFollyDynamicToId(newProps.id);
+    if (idx != nil) {
+        _view.id = idx;
+    }
+    id existing = RNMBXConvertFollyDynamicToId(newProps.existing);
+    if (existing != nil) {
+        _view.existing = existing;
+    }
+    id shape = RNMBXConvertFollyDynamicToId(newProps.shape);
+    if (shape != nil) {
+        _view.shape = shape;
+    }
+    id cluster = RNMBXConvertFollyDynamicToId(newProps.cluster);
+    if (cluster != nil) {
+        _view.cluster = cluster;
+    }
+    id clusterRadius = RNMBXConvertFollyDynamicToId(newProps.clusterRadius);
+    if (clusterRadius != nil) {
+        _view.clusterRadius = clusterRadius;
+    }
+    id clusterMaxZoomLevel = RNMBXConvertFollyDynamicToId(newProps.clusterMaxZoomLevel);
+    if (clusterMaxZoomLevel != nil) {
+        _view.clusterMaxZoomLevel = clusterMaxZoomLevel;
+    }
+    id clusterProperties = RNMBXConvertFollyDynamicToId(newProps.clusterProperties);
+    if (clusterProperties != nil) {
+        _view.clusterProperties = clusterProperties;
+    }
+    id maxZoomLevel = RNMBXConvertFollyDynamicToId(newProps.maxZoomLevel);
+    if (maxZoomLevel != nil) {
+        _view.maxZoomLevel = maxZoomLevel;
+    }
+    id buffer = RNMBXConvertFollyDynamicToId(newProps.buffer);
+    if (buffer != nil) {
+        _view.buffer = buffer;
+    }
+    id tolerance = RNMBXConvertFollyDynamicToId(newProps.tolerance);
+    if (tolerance != nil) {
+        _view.tolerance = tolerance;
+    }
+    id lineMetrics = RNMBXConvertFollyDynamicToId(newProps.lineMetrics);
+    if (lineMetrics != nil) {
+        _view.lineMetrics = lineMetrics;
+    }
+    id hasPressListener = RNMBXConvertFollyDynamicToId(newProps.hasPressListener);
+    if (hasPressListener != nil) {
+        _view.hasPressListener = hasPressListener;
+    }
+    id hitbox = RNMBXConvertFollyDynamicToId(newProps.hitbox);
+    if (hitbox != nil) {
+        _view.hitbox = hitbox;
+    }
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXShapeSourceCls(void)
+{
+  return RNMBXShapeSourceComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXShapeSourceModule.h

@@ -0,0 +1,18 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "rnmapbox_maps_specs.h"
+#else
+#import <React/RCTBridge.h>
+#endif
+
+@interface RNMBXShapeSourceModule : NSObject
+#ifdef RCT_NEW_ARCH_ENABLED
+<NativeRNMBXShapeSourceModuleSpec>
+#else
+<RCTBridgeModule>
+#endif
+
+@end
+

package/ios/RNMBX/RNMBXShapeSourceModule.mm

@@ -0,0 +1,87 @@
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTUIManagerUtils.h>
+
+#import "RNMBXShapeSourceModule.h"
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNMBXShapeSourceComponentView.h"
+#endif // RCT_NEW_ARCH_ENABLED
+
+// needed for compilation for some reason
+#import <CoreFoundation/CoreFoundation.h>
+#import <CoreLocation/CoreLocation.h>
+
+@interface MapView : UIView
+@end
+
+#import <rnmapbox_maps-Swift.h>
+
+
+@implementation RNMBXShapeSourceModule
+
+RCT_EXPORT_MODULE();
+
+#ifdef RCT_NEW_ARCH_ENABLED
+@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
+#endif // RCT_NEW_ARCH_ENABLED
+@synthesize bridge = _bridge;
+
+- (dispatch_queue_t)methodQueue
+{
+  // It seems that due to how UIBlocks work with uiManager, we need to call the methods there
+  // for the blocks to be dispatched before the batch is completed
+  return RCTGetUIManagerQueue();
+}
+
+- (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);
+        }
+    }];
+}
+
+
+RCT_EXPORT_METHOD(getClusterChildren:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+{
+    [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) {
+        [RNMBXShapeSourceViewManager getClusterChildrenWithShapeSource:view featureJSON:featureJSON resolver:resolve rejecter:reject];
+    } reject:reject methodName:@"getClusterChildren"];
+}
+  
+RCT_EXPORT_METHOD(getClusterLeaves:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON  number:(double)number offset:(double)offset resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+{
+ [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) {
+     [RNMBXShapeSourceViewManager getClusterLeavesWithShapeSource:view featureJSON:featureJSON number:number offset:offset resolver:resolve rejecter:reject];
+ } reject:reject methodName:@"getClusterLeaves"];
+}
+     
+RCT_EXPORT_METHOD(getClusterExpansionZoom:(nonnull NSNumber *)viewRef featureJSON:(NSString *)featureJSON resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+{
+ [self withShapeSource:viewRef block:^(RNMBXShapeSource *view) {
+     [RNMBXShapeSourceViewManager getClusterExpansionZoomWithShapeSource:view featureJSON:featureJSON resolver:resolve rejecter:reject];
+ } reject:reject methodName:@"getClusterExpansionZoom"];
+}
+
+// Thanks to this guard, we won't compile this code when we build for the old architecture.
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeRNMBXShapeSourceModuleSpecJSI>(params);
+}
+#endif // RCT_NEW_ARCH_ENABLED
+
+@end

package/ios/RNMBX/RNMBXShapeSourceViewManager.m

@@ -0,0 +1,26 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface
+RCT_EXTERN_REMAP_MODULE(RNMBXShapeSource, RNMBXShapeSourceViewManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(id, NSString)
+RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(url, NSString)
+RCT_EXPORT_VIEW_PROPERTY(shape, NSString)
+
+RCT_EXPORT_VIEW_PROPERTY(cluster, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(clusterRadius, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(clusterMaxZoomLevel, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(clusterProperties, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(buffer, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(tolerance, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(lineMetrics, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray)
+RCT_EXPORT_VIEW_PROPERTY(hasPressListener, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary)
+RCT_REMAP_VIEW_PROPERTY(onMapboxShapeSourcePress, onPress, RCTBubblingEventBlock)
+
+@end

package/ios/RNMBX/{RNMBXShapeSourceManager.swift → RNMBXShapeSourceViewManager.swift}

@@ -1,48 +1,23 @@
-@objc(RNMBXShapeSourceManager)
-class RNMBXShapeSourceManager: RCTViewManager {
+@objc(RNMBXShapeSourceViewManager)
+public class RNMBXShapeSourceViewManager: RCTViewManager {
   @objc
-  override static func requiresMainQueueSetup() -> Bool {
+  override public static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
-  @objc override func view() -> UIView {
+  @objc override public func view() -> UIView {
     return RNMBXShapeSource()
   }
 }
-
-// MARK: - helpers
-
-extension RNMBXShapeSourceManager {
-  func withShapeSource(
-      _ reactTag: NSNumber,
-      name: String,
-      rejecter: @escaping RCTPromiseRejectBlock,
-      fn: @escaping (_: RNMBXShapeSource) -> Void) -> Void
-  {
-    self.bridge.uiManager.addUIBlock { (manager, viewRegistry) in
-      let view = viewRegistry![reactTag]
-
-      guard let shapeSource = view! as? RNMBXShapeSource else {
-        RNMBXLogError("Invalid react tag, could not find RNMBXShapeSource");
-        rejecter(name, "Unknown find reactTag: \(reactTag)", nil)
-        return;
-      }
-
-      fn(shapeSource)
-    }
-  }
-}
-
 // MARK: - react methods
 
-extension RNMBXShapeSourceManager {
-  @objc func getClusterExpansionZoom(
-    _ reactTag: NSNumber,
+extension RNMBXShapeSourceViewManager {
+  @objc public static func getClusterExpansionZoom(
+    shapeSource: RNMBXShapeSource,
     featureJSON: String,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void
   {
-    self.withShapeSource(reactTag, name:"getCluster   ExpansionZoom", rejecter: rejecter) { shapeSource in
       shapeSource.getClusterExpansionZoom(featureJSON) { result in
         switch result {
         case .success(let zoom):
@@ -53,19 +28,17 @@ extension RNMBXShapeSourceManager {
           rejecter(error.localizedDescription, "Error.getClusterExpansionZoom", error)
         }
       }
-    }
   }
   
-  @objc func getClusterLeaves(
-    _ reactTag: NSNumber,
+  @objc public static func getClusterLeaves(
+    shapeSource: RNMBXShapeSource,
     featureJSON: String,
     number: uint,
     offset: uint,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void
   {
-    self.withShapeSource(reactTag, name:"getClusterLeaves", rejecter: rejecter) { shapeSource in
-      shapeSource.getClusterLeaves(featureJSON, number: number, offset: offset) { result in
+    shapeSource.getClusterLeaves(featureJSON, number: number, offset: offset) { result in
         switch result {
         case .success(let features):
           logged("getClusterLeaves", rejecter: rejecter) {
@@ -77,16 +50,14 @@ extension RNMBXShapeSourceManager {
         case .failure(let error):
           rejecter(error.localizedDescription, "Error.getClusterLeaves", error)
         }
-      }
     }
   }
   
-  @objc func getClusterChildren(
-    _ reactTag: NSNumber,
+  @objc public static func getClusterChildren(
+    shapeSource: RNMBXShapeSource,
     featureJSON: String,
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void {
-      self.withShapeSource(reactTag, name:"getClusterChildren", rejecter: rejecter) { shapeSource in
       shapeSource.getClusterChildren(featureJSON) { result in
         switch result {
         case .success(let features):
@@ -101,6 +72,5 @@ extension RNMBXShapeSourceManager {
         }
       }
     }
-  }
 }
 

package/ios/RNMBX/RNMBXSkyLayerComponentView.mm

@@ -5,6 +5,7 @@
 
 #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>
@@ -34,6 +35,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXSkyLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXSource.swift

@@ -1,7 +1,7 @@
 @_spi(Experimental) import MapboxMaps
 
 @objc
-class RNMBXSource : RNMBXInteractiveElement {
+public class RNMBXSource : RNMBXInteractiveElement {
   var layers: [RNMBXSourceConsumer] = []
   var components: [RNMBXMapComponent] = []
 
@@ -9,7 +9,7 @@ class RNMBXSource : RNMBXInteractiveElement {
 
   var ownsSource : Bool = false
 
-  @objc var existing: Bool = false
+  @objc public var existing: Bool = false
   
   override func getLayerIDs() -> [String] {
     layers.compactMap {
@@ -31,37 +31,46 @@ class RNMBXSource : RNMBXInteractiveElement {
   
   // MARK: - UIView+React
 
-  @objc override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    if let layer = subview as? RNMBXSourceConsumer {
-      if let map = map {
-        layer.addToMap(map, style: map.mapboxMap.style)
-      }
-      layers.append(layer)
-    } else if let component = subview as? RNMBXMapComponent {
-      if let map = map {
-        component.addToMap(map, style: map.mapboxMap.style)
-      }
-      components.append(component)
-    }
+  @objc public override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
+    insertReactSubviewInternal(subview, at: atIndex)
     super.insertReactSubview(subview, at: atIndex)
   }
-  
-  @objc override func removeReactSubview(_ subview: UIView!) {
-    if let layer : RNMBXSourceConsumer = subview as? RNMBXSourceConsumer {
-      if let map = map {
-        layer.removeFromMap(map, style: map.mapboxMap.style)
-      }
-      layers.removeAll { $0 as AnyObject === layer }
-    } else if let component = subview as? RNMBXMapComponent {
-      if let map = map {
-        component.removeFromMap(map, reason: .ViewRemoval)
-      }
-      layers.removeAll { $0 as AnyObject === component }
+    
+    @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)
+          }
+          layers.append(layer)
+        } else if let component = subview as? RNMBXMapComponent {
+          if let map = map {
+            component.addToMap(map, style: map.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)
+          }
+          layers.removeAll { $0 as AnyObject === layer }
+        } else if let component = subview as? RNMBXMapComponent {
+          if let map = map {
+            component.removeFromMap(map, reason: .ViewRemoval)
+          }
+          layers.removeAll { $0 as AnyObject === component }
+        }
+    }
+
   
-  @objc override func didUpdateReactSubviews() {
+  @objc public override func didUpdateReactSubviews() {
     // do nothing to prevent inserting layers to UIView hierarchy
   }
   

package/ios/RNMBX/RNMBXSymbolLayerComponentView.mm

@@ -5,6 +5,7 @@
 
 #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>
@@ -34,6 +35,7 @@ using namespace facebook::react;
 - (void)prepareView
 {
   _view =  [[RNMBXSymbolLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
   self.contentView = _view;
 }
 

package/ios/RNMBX/RNMBXTileSource.swift

@@ -1,5 +1,5 @@
 @objc
-class RNMBXTileSource : RNMBXSource {
-  @objc var url: String? = nil
+public class RNMBXTileSource : RNMBXSource {
+  @objc public var url: String? = nil
   
 }

package/ios/RNMBX/RNMBXVectorSource.swift

@@ -1,13 +1,13 @@
 import MapboxMaps
 
 @objc
-class RNMBXVectorSource : RNMBXTileSource {
+public class RNMBXVectorSource : RNMBXTileSource {
   
-  @objc var attribution: String?
-  @objc var maxZoomLevel: NSNumber?
-  @objc var minZoomLevel: NSNumber?
-  @objc var tileUrlTemplates: [String] = []
-  @objc var tms: Bool = false
+  @objc public var attribution: String?
+  @objc public var maxZoomLevel: NSNumber?
+  @objc public var minZoomLevel: NSNumber?
+  @objc public var tileUrlTemplates: [String] = []
+  @objc public var tms: Bool = false
   
   override func sourceType() -> Source.Type {
     return VectorSource.self

package/ios/RNMBX/RNMBXVectorSourceComponentView.h

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