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

package/ios/RNMBX/RNMBXInteractiveElement.swift

@@ -1,21 +1,21 @@
 import MapboxMaps
 
 @objc
-class RNMBXInteractiveElement : UIView, RNMBXMapComponent {
+public class RNMBXInteractiveElement : UIView, RNMBXMapComponent {
   weak var map : RNMBXMapView? = nil
 
   static let hitboxDefault = 44.0
 
-  @objc var draggable: Bool = false
+  @objc public var draggable: Bool = false
   
-  @objc var hasPressListener: Bool = false
+  @objc public var hasPressListener: Bool = false
   
-  @objc var hitbox : [String:NSNumber] = [
+  @objc public var hitbox : [String:NSNumber] = [
     "width": NSNumber(value: hitboxDefault),
     "height": NSNumber(value: hitboxDefault)
   ]
   
-  @objc var id: String! = nil {
+  @objc public var id: String! = nil {
     willSet {
       if id != nil && newValue != id {
         Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is supported")
@@ -29,9 +29,9 @@ class RNMBXInteractiveElement : UIView, RNMBXMapComponent {
     }
   }
   
-  @objc var onDragStart: RCTBubblingEventBlock? = nil
+  @objc public var onDragStart: RCTBubblingEventBlock? = nil
   
-  @objc var onPress: RCTBubblingEventBlock? = nil
+  @objc public var onPress: RCTBubblingEventBlock? = nil
   
   func getLayerIDs() -> [String] {
     return []

package/ios/RNMBX/RNMBXLayer.swift

@@ -15,7 +15,7 @@ func styleLayerExists(_ style: Style, id: String) -> Bool {
 
 @objc(RNMBXLayer)
 public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
-  weak var bridge : RCTBridge? = nil
+  @objc public weak var bridge : RCTBridge? = nil
 
   var waitingForID: String? = nil
 

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

package/ios/RNMBX/RNMBXMapFeatureView.h

@@ -0,0 +1,7 @@
+#import <UIKit/UIKit.h>
+
+@protocol RNMBXMapFeatureView
+
+@property (strong, nonatomic) UIView* mapFeature;
+
+@end

package/ios/RNMBX/RNMBXRasterDemSource.swift

@@ -1,23 +1,23 @@
 import MapboxMaps
 
 @objc
-class RNMBXRasterDemSource : RNMBXSource {
+public class RNMBXRasterDemSource : RNMBXSource {
   typealias SourceType = RasterDemSource
   
   @objc
-  var url: String? = nil
+    public var url: String? = nil
   
   @objc
-  var tileUrlTemplates: [String]? = nil
+    public var tileUrlTemplates: [String]? = nil
   
   @objc
-  var tileSize : NSNumber? = nil
+    public var tileSize : NSNumber? = nil
   
   @objc
-  var maxZoomLevel : NSNumber? = nil
+    public var maxZoomLevel : NSNumber? = nil
   
   @objc
-  var minZoomLevel : NSNumber? = nil
+    public var minZoomLevel : NSNumber? = nil
 
   @objc
   static func requiresMainQueueSetup() -> Bool {

package/ios/RNMBX/RNMBXRasterDemSourceComponentView.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 RNMBXRasterDemSourceComponentView : RCTViewComponentView <RNMBXMapFeatureView>
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterDemSourceComponentView.mm

@@ -0,0 +1,116 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXRasterDemSourceComponentView.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 RNMBXRasterDemSourceComponentView () <RCTRNMBXRasterDemSourceViewProtocol>
+@end
+
+@implementation RNMBXRasterDemSourceComponentView {
+    RNMBXRasterDemSource *_view;
+}
+
+@synthesize mapFeature;
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXRasterDemSourceProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXRasterDemSource alloc] init];
+  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<RNMBXRasterDemSourceComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = *std::static_pointer_cast<const RNMBXRasterDemSourceProps>(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;
+    }
+    
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXRasterDemSourceCls(void)
+{
+  return RNMBXRasterDemSourceComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/{RNMBXRasterDemSourceManager.m → RNMBXRasterDemSourceViewManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RNMBXRasterDemSourceManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXRasterDemSource, RNMBXRasterDemSourceViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)
@@ -11,11 +11,5 @@ RCT_EXPORT_VIEW_PROPERTY(bounds, NSArray)
 RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(tileSize, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(attribution, NSString)
-RCT_EXPORT_VIEW_PROPERTY(encoding, NSString)
-RCT_EXPORT_VIEW_PROPERTY(volatile, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(prefetchZoomDelta, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(minimumTileUpdateInterval, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(maxOverscaleFactorForParentTiles, NSNumber)
 
 @end

package/ios/RNMBX/{RNMBXRasterDemSourceManager.swift → RNMBXRasterDemSourceViewManager.swift}

@@ -1,5 +1,5 @@
-@objc(RNMBXRasterDemSourceManager)
-class RNMBXRasterDemSourceManager: RCTViewManager {
+@objc(RNMBXRasterDemSourceViewManager)
+class RNMBXRasterDemSourceViewManager: RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true

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

package/ios/RNMBX/RNMBXRasterSource.swift

@@ -1,20 +1,20 @@
 import MapboxMaps
 
 @objc
-class RNMBXRasterSource : RNMBXSource {
+public class RNMBXRasterSource : RNMBXSource {
   typealias SourceType = RasterSource
 
-  @objc var url: String? = nil
+  @objc public var url: String? = nil
   
-  @objc var tileUrlTemplates: [String]? = nil
+  @objc public var tileUrlTemplates: [String]? = nil
   
-  @objc var minZoomLevel: NSNumber?
-  @objc var maxZoomLevel: NSNumber?
-  @objc var tileSize: NSNumber?
+  @objc public var minZoomLevel: NSNumber?
+  @objc public var maxZoomLevel: NSNumber?
+  @objc public var tileSize: NSNumber?
   
-  @objc var tms: Bool = false
+  @objc public var tms: Bool = false
   
-  @objc var attribution: String?
+  @objc public var attribution: String?
 
   override func makeSource() -> Source
   {

package/ios/RNMBX/RNMBXRasterSourceComponentView.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 RNMBXRasterSourceComponentView : RCTViewComponentView <RNMBXMapFeatureView>
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterSourceComponentView.mm

@@ -0,0 +1,124 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXRasterSourceComponentView.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 RNMBXRasterSourceComponentView () <RCTRNMBXRasterSourceViewProtocol>
+@end
+
+@implementation RNMBXRasterSourceComponentView {
+    RNMBXRasterSource *_view;
+}
+
+@synthesize mapFeature;
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXRasterSourceProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXRasterSource alloc] init];
+  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<RNMBXRasterSourceComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = *std::static_pointer_cast<const RNMBXRasterSourceProps>(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 tms = RNMBXConvertFollyDynamicToId(newProps.tms);
+    if (tms != nil) {
+        _view.tms = tms;
+    }
+    id attribution = RNMBXConvertFollyDynamicToId(newProps.attribution);
+    if (attribution != nil) {
+        _view.attribution = attribution;
+    }
+    
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXRasterSourceCls(void)
+{
+  return RNMBXRasterSourceComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/{RNMBXRasterSourceManager.m → RNMBXRasterSourceViewManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RNMBXRasterSourceManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXRasterSource, RNMBXRasterSourceViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)

package/ios/RNMBX/{RNMBXRasterSourceManager.swift → RNMBXRasterSourceViewManager.swift}

@@ -1,8 +1,8 @@
 import Foundation
 import MapboxMaps
 
-@objc(RNMBXRasterSourceManager)
-class RNMBXRasterSourceManager : RCTViewManager {
+@objc(RNMBXRasterSourceViewManager)
+class RNMBXRasterSourceViewManager : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true

package/ios/RNMBX/RNMBXShapeSource.swift

@@ -2,8 +2,8 @@ import MapboxMaps
 import Turf
 
 @objc
-class RNMBXShapeSource : RNMBXSource {
-  @objc var url : String? {
+public class RNMBXShapeSource : RNMBXSource {
+  @objc public var url : String? {
     didSet {
       parseJSON(url) { [weak self] result in
         guard let self = self else { return }
@@ -23,7 +23,7 @@ class RNMBXShapeSource : RNMBXSource {
     }
   }
 
-  @objc var shape : String? {
+  @objc public var shape : String? {
     didSet {
       logged("RNMBXShapeSource.updateShape") {
         let obj : GeoJSONObject = try parse(shape)
@@ -37,9 +37,9 @@ class RNMBXShapeSource : RNMBXSource {
     }
   }
 
-  @objc var cluster : NSNumber?
-  @objc var clusterRadius : NSNumber?
-  @objc var clusterMaxZoomLevel : NSNumber? {
+  @objc public var cluster : NSNumber?
+  @objc public var clusterRadius : NSNumber?
+  @objc public var clusterMaxZoomLevel : NSNumber? {
     didSet {
       logged("RNMBXShapeSource.clusterMaxZoomLevel") {
         if let number = clusterMaxZoomLevel?.doubleValue {
@@ -52,12 +52,12 @@ class RNMBXShapeSource : RNMBXSource {
       }
     }
   }
-  @objc var clusterProperties : [String: [Any]]?;
+  @objc public var clusterProperties : [String: [Any]]?;
 
-  @objc var maxZoomLevel : NSNumber?
-  @objc var buffer : NSNumber?
-  @objc var tolerance : NSNumber?
-  @objc var lineMetrics : NSNumber?
+  @objc public var maxZoomLevel : NSNumber?
+  @objc public var buffer : NSNumber?
+  @objc public var tolerance : NSNumber?
+  @objc public var lineMetrics : NSNumber?
 
   override func sourceType() -> Source.Type {
     return GeoJSONSource.self

package/ios/RNMBX/RNMBXShapeSourceComponentView.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 RNMBXShapeSourceComponentView : RCTViewComponentView <RNMBXMapFeatureView>
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED