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

package/ios/RNMBX/RNMBXFabricHelpers.h

@@ -2,14 +2,7 @@
 #import <folly/dynamic.h>
 #import <react/renderer/components/rnmapbox_maps_specs/Props.h>
 
-// needed for compilation for some reason
-#import <CoreFoundation/CoreFoundation.h>
-#import <CoreLocation/CoreLocation.h>
-
-@interface MapView : UIView
-@end
-
-#import <rnmapbox_maps-Swift.h>
+#import "rnmapbox_maps-Swift.pre.h"
 
 // copied from RCTFollyConvert
 static id RNMBXConvertFollyDynamicToId(const folly::dynamic &dyn)

package/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXFillExtrusionLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXFillExtrusionLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
 

package/ios/RNMBX/RNMBXFillLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXFillLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXFillLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
   [super updateProps:props oldProps:oldProps];

package/ios/RNMBX/RNMBXHeatmapLayerComponentView.mm

@@ -47,7 +47,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXHeatmapLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXHeatmapLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
 

package/ios/RNMBX/RNMBXImage.swift

@@ -1,38 +1,38 @@
 import MapboxMaps
 
-class RNMBXImage : UIView {
+public class RNMBXImage : UIView {
   @objc
-  var name: String = "" {
+  public var name: String = "" {
     didSet {
       _addImageToStyle()
     }
   }
 
-  var image: UIImage? = nil
+  @objc public var image: UIImage? = nil
   
   @objc
-  var sdf: Bool = false {
+    public var sdf: Bool = false {
     didSet {
       _addImageToStyle()
     }
   }
 
   @objc
-  var stretchX: [[NSNumber]] = [] {
+    public var stretchX: [[NSNumber]] = [] {
     didSet {
       _addImageToStyle()
     }
   }
 
   @objc
-  var stretchY: [[NSNumber]] = [] {
+    public var stretchY: [[NSNumber]] = [] {
     didSet {
       _addImageToStyle()
     }
   }
 
   @objc
-  var content: [NSNumber]? = nil {
+    public var content: [NSNumber]? = nil {
     didSet {
       _addImageToStyle()
     }
@@ -43,28 +43,36 @@ class RNMBXImage : UIView {
       DispatchQueue.main.async { self.setImage() }
     }
   }
-  weak var bridge : RCTBridge! = nil
   
-  var reactSubviews : [UIView] = []
+ var reactSubviews : [UIView] = []
   
   // MARK: - subview management
   
-  @objc open override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    reactSubviews.insert(subview, at: atIndex)
-    if reactSubviews.count > 1 {
-      Logger.log(level: .error, message: "Image supports max 1 subview")
-    }
-    if image == nil {
-      DispatchQueue.main.asyncAfter(deadline: .now() + .microseconds(10)) {
-        self.setImage()
+    public override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
+      insertReactSubviewInternal(subview, at: atIndex)
+  }
+    
+    @objc public func insertReactSubviewInternal(_ subview: UIView!, at atIndex: Int) {
+        reactSubviews.insert(subview, at: atIndex)
+      if reactSubviews.count > 1 {
+        Logger.log(level: .error, message: "Image supports max 1 subview")
+      }
+      if image == nil {
+        DispatchQueue.main.asyncAfter(deadline: .now() + .microseconds(10)) {
+          self.setImage()
+        }
       }
     }
-  }
 
-  @objc
-  open override func removeReactSubview(_ subview: UIView!) {
-    reactSubviews.removeAll(where: { $0 == subview })
+  
+  public override func removeReactSubview(_ subview: UIView!) {
+      removeReactSubviewInternal(subview)
   }
+    
+    @objc
+    open func removeReactSubviewInternal(_ subview: UIView!) {
+        reactSubviews.removeAll(where: { $0 == subview })
+    }
   
   // MARK: - view shnapshot
   
@@ -79,7 +87,7 @@ class RNMBXImage : UIView {
     _addImageToStyle()
   }
   
-  func setImage() {
+  @objc public func setImage() {
     if let image = _createViewSnapshot() {
       changeImage(image, name: name)
     }

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

package/ios/RNMBX/RNMBXImageComponentView.mm

@@ -0,0 +1,100 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXImageComponentView.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 RNMBXImageComponentView () <RCTRNMBXImageViewProtocol>
+@end
+
+@implementation RNMBXImageComponentView {
+    RNMBXImage *_view;
+}
+
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXImageProps>();
+    _props = defaultProps;
+      [self prepareView];
+    }
+
+    return self;
+  }
+
+- (void)prepareView
+{
+  _view =  [[RNMBXImage alloc] init];
+  self.contentView = _view;
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]] && ((RCTViewComponentView *)childComponentView).contentView != nil) {
+        [_view insertReactSubviewInternal:((RCTViewComponentView *)childComponentView).contentView at:index];
+    } else {
+        [_view insertReactSubviewInternal:childComponentView at:index];
+    }
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]] && ((RCTViewComponentView *)childComponentView).contentView != nil) {
+        [_view removeReactSubviewInternal:((RCTViewComponentView *)childComponentView).contentView];
+    } else {
+        [_view removeReactSubviewInternal:childComponentView];
+    }
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXImageComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXImageProps &>(*props);
+    id stretchX = RNMBXConvertFollyDynamicToId(newProps.stretchX);
+    if (stretchX != nil) {
+        _view.stretchX = stretchX;
+    }
+    id stretchY = RNMBXConvertFollyDynamicToId(newProps.stretchY);
+    if (stretchY != nil) {
+        _view.stretchY = stretchY;
+    }
+    id content = RNMBXConvertFollyDynamicToId(newProps.content);
+    if (content != nil) {
+        _view.content = content;
+    }
+    id sdf = RNMBXConvertFollyDynamicToId(newProps.sdf);
+    if (sdf != nil) {
+        _view.sdf = sdf;
+    }
+    id name = RNMBXConvertFollyDynamicToId(newProps.name);
+    if (name != nil) {
+        _view.name = name;
+    }
+    
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXImageCls(void)
+{
+  return RNMBXImageComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXImageManager.swift

@@ -8,7 +8,6 @@ class RNMBXImageManager : RCTViewManager {
 
   override func view() -> UIView! {
     let layer = RNMBXImage()
-    layer.bridge = self.bridge
     return layer
   }
 }

package/ios/RNMBX/RNMBXImageModule.h

@@ -0,0 +1,17 @@
+#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 RNMBXImageModule : NSObject
+#ifdef RCT_NEW_ARCH_ENABLED
+<NativeRNMBXImageModuleSpec>
+#else
+<RCTBridgeModule>
+#endif
+
+@end

package/ios/RNMBX/RNMBXImageModule.mm

@@ -0,0 +1,67 @@
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTUIManagerUtils.h>
+
+#import "RNMBXImageModule.h"
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNMBXImageComponentView.h"
+#endif // RCT_NEW_ARCH_ENABLED
+
+#import "rnmapbox_maps-Swift.pre.h"
+
+@implementation RNMBXImageModule
+
+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)withImage:(NSNumber*)viewRef block:(void (^)(RNMBXImage *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
+{
+#ifdef RCT_NEW_ARCH_ENABLED
+    [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
+        RNMBXImageComponentView *componentView = [self.viewRegistry_DEPRECATED viewForReactTag:viewRef];
+        RNMBXImage *view = componentView.contentView;
+
+#else
+    [self.bridge.uiManager
+     addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        RNMBXImage *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(refresh:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+{
+    [self withImage:viewRef block:^(RNMBXImage *view) {
+        // TODO: implement refresh on iOS
+//        [view refresh];
+    } reject:reject methodName:@"refresh"];
+}
+
+
+// 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::NativeRNMBXImageModuleSpecJSI>(params);
+}
+#endif // RCT_NEW_ARCH_ENABLED
+
+@end

package/ios/RNMBX/RNMBXImageSourceComponentView.mm

@@ -70,7 +70,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXImageSourceProps>(props);
+  const auto &newProps = static_cast<const RNMBXImageSourceProps &>(*props);
     id idx = RNMBXConvertFollyDynamicToId(newProps.id);
     if (idx != nil) {
         _view.id = idx;

package/ios/RNMBX/RNMBXImages.swift

@@ -16,17 +16,17 @@ func hasImage(style: Style, name: String) -> Bool {
 typealias StyleImageMissingPayload = StyleImageMissing
 #endif
 
-class RNMBXImages : UIView, RNMBXMapComponent {
+open class RNMBXImages : UIView, RNMBXMapComponent {
   
-  weak var bridge : RCTBridge! = nil
+  @objc public weak var bridge : RCTBridge! = nil
   
   weak var style: Style? = nil
 
   @objc
-  var onImageMissing: RCTBubblingEventBlock? = nil
+  public var onImageMissing: RCTBubblingEventBlock? = nil
   
   @objc
-  var images : [String:Any] = [:] {
+  public var images : [String:Any] = [:] {
     didSet {
       updateImages(images: images, oldImages: oldValue)
     }
@@ -37,7 +37,7 @@ class RNMBXImages : UIView, RNMBXMapComponent {
   var imageViews: [RNMBXImage] = []
 
   @objc
-  var nativeImages: [Any] = [] {
+  public var nativeImages: [Any] = [] {
     didSet {
       nativeImageInfos = nativeImages.compactMap { decodeImage($0) }
     }
@@ -118,7 +118,7 @@ class RNMBXImages : UIView, RNMBXMapComponent {
         } else {
           if !hasImage(style: style, name: name) {
             logged("RNMBXImages.addImagePlaceholder") {
-              try? style.addImage(placeholderImage, id: name, stretchX: [], stretchY: [])
+              try style.addImage(placeholderImage, id: name, stretchX: [], stretchY: [])
               missingImages[name] = images[name]
             }
           }
@@ -137,7 +137,7 @@ class RNMBXImages : UIView, RNMBXMapComponent {
     }
   }
   
-  public func addMissingImageToStyle(style: Style, imageName: String) -> Bool {
+  internal func addMissingImageToStyle(style: Style, imageName: String) -> Bool {
     if let nativeImage = nativeImageInfos.first(where: { $0.name == imageName }) {
       addNativeImages(style: style, nativeImages: [nativeImage])
       return true
@@ -150,7 +150,7 @@ class RNMBXImages : UIView, RNMBXMapComponent {
     return false
   }
   
-  public func sendImageMissingEvent(imageName: String, payload: StyleImageMissingPayload) {
+  internal func sendImageMissingEvent(imageName: String, payload: StyleImageMissingPayload) {
     let payload = ["imageKey":imageName]
     let event = RNMBXEvent(type: .imageMissing, payload: payload)
     if let onImageMissing = onImageMissing {
@@ -243,7 +243,7 @@ class RNMBXImages : UIView, RNMBXMapComponent {
   func addNativeImages(style: Style, nativeImages: [NativeImageInfo]) {
     for imageInfo in nativeImages {
       let imageName = imageInfo.name
-      if !hasImage(style: style, name: imageInfo.name) {
+      if  !hasImage(style: style, name: imageName) {
         if let image = UIImage(named: imageName) {
           logged("RNMBXImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,

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

package/ios/RNMBX/RNMBXImagesComponentView.mm

@@ -0,0 +1,91 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXImagesComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTBridge+Private.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 RNMBXImagesComponentView () <RCTRNMBXImagesViewProtocol>
+@end
+
+@implementation RNMBXImagesComponentView {
+    RNMBXImages *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXImagesProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+    _view = [[RNMBXImages alloc] init];
+    _view.bridge = [RCTBridge currentBridge];
+
+      // capture weak self reference to prevent retain cycle
+      __weak __typeof__(self) weakSelf = self;
+      
+      [_view setOnImageMissing:^(NSDictionary* event) {
+          __typeof__(self) strongSelf = weakSelf;
+
+          if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+              std::string type = [event valueForKey:@"type"] == nil ? "" : std::string([[event valueForKey:@"type"] UTF8String]);
+              std::string imageKey =  (![[event valueForKey:@"payload"] isKindOfClass:[NSDictionary class]] || ![[[event valueForKey:@"payload"] valueForKey:@"imageKey"] isKindOfClass:[NSString class]]) ? "" : std::string([((NSDictionary *)event[@"payload"])[@"imageKey"] UTF8String]);
+              facebook::react::RNMBXImagesEventEmitter::OnImageMissingPayload payload = {.imageKey = imageKey};
+              std::dynamic_pointer_cast<const facebook::react::RNMBXImagesEventEmitter>(strongSelf->_eventEmitter)->onImageMissing({type, payload});
+            }
+      }];
+    self.contentView = _view;
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXImagesComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXImagesProps &>(*props);
+    id images = RNMBXConvertFollyDynamicToId(newProps.images);
+    if (images != nil) {
+        _view.images = images;
+    }
+    id nativeImages = RNMBXConvertFollyDynamicToId(newProps.nativeImages);
+    if (nativeImages != nil) {
+        _view.nativeImages = nativeImages;
+    }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXImagesCls(void)
+{
+  return RNMBXImagesComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/{RNMBXImagesManager.m → RNMBXImagesViewManager.m}

@@ -1,9 +1,8 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RNMBXImagesManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXImages, RNMBXImagesViewManager, RCTViewManager)
 
-RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray)
 RCT_REMAP_VIEW_PROPERTY(onImageMissing, onImageMissing, RCTBubblingEventBlock)

package/ios/RNMBX/{RNMBXImagesManager.swift → RNMBXImagesViewManager.swift}

@@ -1,6 +1,6 @@
 
-@objc(RNMBXImagesManager)
-class RNMBXImagesManager : RCTViewManager {
+@objc(RNMBXImagesViewManager)
+class RNMBXImagesViewManager : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true

package/ios/RNMBX/RNMBXLight.swift

@@ -1,15 +1,15 @@
-@_spi(Experimental) import MapboxMaps
+import MapboxMaps
 
 #if RNMBX_11
 typealias Light = FlatLight
 #endif
 
 @objc(RNMBXLight)
-class RNMBXLight: UIView, RNMBXMapComponent {
-  weak var bridge : RCTBridge! = nil
+public class RNMBXLight: UIView, RNMBXMapComponent {
+  @objc public weak var bridge : RCTBridge! = nil
   weak var map: MapboxMap! = nil
   var oldReactStyle: [String:Any]?
-  @objc var reactStyle : [String:Any]! = nil {
+  @objc public var reactStyle : [String:Any]! = nil {
     willSet {
       oldReactStyle = reactStyle
     }
@@ -21,13 +21,13 @@ class RNMBXLight: UIView, RNMBXMapComponent {
   }
   
   func apply(light: Light) {
+    let lightData = try! JSONEncoder().encode(light)
+    let lightDictionary = try! JSONSerialization.jsonObject(with: lightData)
     logged("RNMBXLight.apply") {
 #if RNMBX_11
       try self.map.setLights(light)
 #else
-      let lightData = try JSONEncoder().encode(light)
-      let lightDictionary = try JSONSerialization.jsonObject(with: lightData)
-      try self.map.style.setLight(properties: lightDictionary as! [String:Any])
+      try! self.map.style.setLight(properties: lightDictionary as! [String:Any])
 #endif
     }
   }

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