@rnmapbox/maps 10.1.0 → 10.1.2

package/ios/RNMBX/RNMBXMapViewComponentView.mm

@@ -11,6 +11,8 @@
 #import <react/renderer/components/rnmapbox_maps_specs/Props.h>
 #import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
 
+#import "RNMBXFabricPropConvert.h"
+
 using namespace facebook::react;
 
 @interface RNMBXMapViewComponentView () <RCTRNMBXMapViewViewProtocol>
@@ -125,104 +127,110 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = static_cast<const RNMBXMapViewProps &>(*props);
-    id attributionEnabled = RNMBXConvertFollyDynamicToId(newProps.attributionEnabled);
+    const auto &oldViewProps = static_cast<const RNMBXMapViewProps &>(*oldProps);
+    const auto &newViewProps = static_cast<const RNMBXMapViewProps &>(*props);
+  
+    id attributionEnabled = RNMBXConvertFollyDynamicToId(newViewProps.attributionEnabled);
     if (attributionEnabled != nil) {
         _view.reactAttributionEnabled = attributionEnabled;
     }
 
-    id attributionPosition = RNMBXConvertFollyDynamicToId(newProps.attributionPosition);
+    id attributionPosition = RNMBXConvertFollyDynamicToId(newViewProps.attributionPosition);
     if (attributionPosition != nil) {
         _view.reactAttributionPosition = attributionPosition;
     }
 
-    id logoEnabled = RNMBXConvertFollyDynamicToId(newProps.logoEnabled);
+    id logoEnabled = RNMBXConvertFollyDynamicToId(newViewProps.logoEnabled);
     if (logoEnabled != nil) {
         _view.reactLogoEnabled = logoEnabled;
     }
 
-    id logoPosition = RNMBXConvertFollyDynamicToId(newProps.logoPosition);
+    id logoPosition = RNMBXConvertFollyDynamicToId(newViewProps.logoPosition);
     if (logoPosition != nil) {
         _view.reactLogoPosition = logoPosition;
     }
 
-    id compassEnabled = RNMBXConvertFollyDynamicToId(newProps.compassEnabled);
+    id compassEnabled = RNMBXConvertFollyDynamicToId(newViewProps.compassEnabled);
     if (compassEnabled != nil) {
         _view.reactCompassEnabled = compassEnabled;
     }
 
-    id compassFadeWhenNorth = RNMBXConvertFollyDynamicToId(newProps.compassFadeWhenNorth);
+    id compassFadeWhenNorth = RNMBXConvertFollyDynamicToId(newViewProps.compassFadeWhenNorth);
     if (compassFadeWhenNorth != nil) {
         _view.reactCompassFadeWhenNorth = compassFadeWhenNorth;
     }
 
-    id compassPosition = RNMBXConvertFollyDynamicToId(newProps.compassPosition);
+    id compassPosition = RNMBXConvertFollyDynamicToId(newViewProps.compassPosition);
     if (compassPosition != nil) {
         _view.reactCompassPosition = compassPosition;
     }
 
-    id compassViewPosition = RNMBXConvertFollyDynamicToId(newProps.compassViewPosition);
+    id compassViewPosition = RNMBXConvertFollyDynamicToId(newViewProps.compassViewPosition);
     if (compassViewPosition != nil) {
         _view.reactCompassViewPosition = [(NSNumber *)compassViewPosition doubleValue];
     }
 
-    NSDictionary<NSString *, NSNumber *> *compassViewMargins = RNMBXConvertFollyDynamicToId(newProps.compassViewMargins);
+    NSDictionary<NSString *, NSNumber *> *compassViewMargins = RNMBXConvertFollyDynamicToId(newViewProps.compassViewMargins);
     if (compassViewMargins != nil) {
         CGPoint margins = CGPointMake([compassViewMargins[@"x"] doubleValue], [compassViewMargins[@"y"] doubleValue]);
         _view.reactCompassViewMargins = margins;
     }
 
-    id compassImage = RNMBXConvertFollyDynamicToId(newProps.compassImage);
+    id compassImage = RNMBXConvertFollyDynamicToId(newViewProps.compassImage);
     if (compassImage != nil) {
         _view.reactCompassImage = compassImage;
     }
 
-    id scaleBarEnabled = RNMBXConvertFollyDynamicToId(newProps.scaleBarEnabled);
+    id scaleBarEnabled = RNMBXConvertFollyDynamicToId(newViewProps.scaleBarEnabled);
     if (scaleBarEnabled != nil) {
         _view.reactScaleBarEnabled = scaleBarEnabled;
     }
 
-    id scaleBarPosition = RNMBXConvertFollyDynamicToId(newProps.scaleBarPosition);
+    id scaleBarPosition = RNMBXConvertFollyDynamicToId(newViewProps.scaleBarPosition);
     if (scaleBarPosition != nil) {
         _view.reactScaleBarPosition = scaleBarPosition;
     }
 
-    id zoomEnabled = RNMBXConvertFollyDynamicToId(newProps.zoomEnabled);
+    id zoomEnabled = RNMBXConvertFollyDynamicToId(newViewProps.zoomEnabled);
     if (zoomEnabled != nil) {
         _view.reactZoomEnabled = zoomEnabled;
     }
 
-    id scrollEnabled = RNMBXConvertFollyDynamicToId(newProps.scrollEnabled);
+    id scrollEnabled = RNMBXConvertFollyDynamicToId(newViewProps.scrollEnabled);
     if (scrollEnabled != nil) {
         _view.reactScrollEnabled = scrollEnabled;
     }
 
-    id rotateEnabled = RNMBXConvertFollyDynamicToId(newProps.rotateEnabled);
+    id rotateEnabled = RNMBXConvertFollyDynamicToId(newViewProps.rotateEnabled);
     if (rotateEnabled != nil) {
         _view.reactRotateEnabled = rotateEnabled;
     }
 
-    id pitchEnabled = RNMBXConvertFollyDynamicToId(newProps.pitchEnabled);
+    id pitchEnabled = RNMBXConvertFollyDynamicToId(newViewProps.pitchEnabled);
     if (pitchEnabled != nil) {
         _view.reactPitchEnabled = pitchEnabled;
     }
 
-    id projection = RNMBXConvertFollyDynamicToId(newProps.projection);
+    id projection = RNMBXConvertFollyDynamicToId(newViewProps.projection);
     if (projection != nil) {
         _view.reactProjection = projection;
     }
 
-    id localizeLabels = RNMBXConvertFollyDynamicToId(newProps.localizeLabels);
+    id localizeLabels = RNMBXConvertFollyDynamicToId(newViewProps.localizeLabels);
     if (localizeLabels != nil) {
         _view.reactLocalizeLabels = localizeLabels;
     }
+  
+    RNMBX_OPTIONAL_PROP_BOOL(deselectAnnotationOnTap);
 
-    id styleURL = RNMBXConvertFollyDynamicToId(newProps.styleURL);
+    id styleURL = RNMBXConvertFollyDynamicToId(newViewProps.styleURL);
     if (styleURL != nil) {
         _view.reactStyleURL = styleURL;
     }
 
   [super updateProps:props oldProps:oldProps];
+
+  [_view didSetProps:@[]];
 }
 
 - (void)prepareForRecycle

package/ios/RNMBX/RNMBXMapViewManager.m

@@ -25,6 +25,7 @@ RCT_REMAP_VIEW_PROPERTY(zoomEnabled, reactZoomEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(scrollEnabled, reactScrollEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(rotateEnabled, reactRotateEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(pitchEnabled, reactPitchEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(deselectAnnotationOnTap, BOOL)
 
 RCT_REMAP_VIEW_PROPERTY(projection, reactProjection, NSString)
 RCT_REMAP_VIEW_PROPERTY(localizeLabels, reactLocalizeLabels, NSDictionary)

package/ios/RNMBX/RNMBXMapViewManager.swift

@@ -246,5 +246,4 @@ extension RNMBXMapViewManager {
           }
         }
     }
-
 }

package/ios/RNMBX/RNMBXMapViewModule.mm

@@ -139,7 +139,6 @@ RCT_EXPORT_METHOD(querySourceFeatures:(nonnull NSNumber*)viewRef sourceId:(NSStr
     } reject:reject methodName:@"querySourceFeatures"];
 }
 
-
 // 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:

package/ios/RNMBX/RNMBXMarkerView.swift

@@ -22,7 +22,6 @@ class RNMBXMarkerViewParentViewAnnotation : UIView {
     if actSize.width != size.width || actSize.height != size.height {
       let dx = ((size.width/2.0) - newOffset.dx) - ((actSize.width/2.0) - oldOffset.dx)
       let dy = ((size.height/2.0) + newOffset.dy) - ((actSize.height/2.0) + oldOffset.dy)
-      print(" => size=\(size) actSize=\(actSize) newOffset=\(newOffset) oldOffset=\(oldOffset)  dx=\(dx) dy=\(dy)")
       var frame = self.frame
       frame = frame.offsetBy(dx: -dx, dy: -dy)
       frame.size = size
@@ -61,6 +60,12 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
     }
   }
   
+  @objc public var allowOverlapWithPuck: Bool = false {
+    didSet {
+      update()
+    }
+  }
+  
   @objc public var isSelected: Bool = false {
     didSet {
       update()
@@ -70,7 +75,7 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
   // MARK: - Derived variables
   
   var annotationManager: ViewAnnotationManager? {
-    self.map?.viewAnnotations
+    self.map?.mapView?.viewAnnotations
   }
 
   var point: Point? {
@@ -228,7 +233,7 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
     let size = self.bounds.size
     let offset = calcOffset(size: size)
   
-    let options = ViewAnnotationOptions(
+    var options = ViewAnnotationOptions(
       geometry: geometry,
       width: size.width,
       height: size.height,
@@ -237,6 +242,9 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
       offsetY: offset.dy,
       selected: isSelected
     )
+    #if RNMBX_11
+    options.allowOverlapWithPuck = allowOverlapWithPuck
+    #endif
     return options
   }
   

package/ios/RNMBX/RNMBXMarkerViewComponentView.mm

@@ -84,6 +84,10 @@ using namespace facebook::react;
     if (allowOverlap != nil) {
         _view.allowOverlap = allowOverlap;
     }
+    id allowOverlapWithPuck = RNMBXConvertFollyDynamicToId(newProps.allowOverlapWithPuck);
+    if (allowOverlapWithPuck != nil) {
+        _view.allowOverlapWithPuck = allowOverlapWithPuck;
+    }
     id isSelected = RNMBXConvertFollyDynamicToId(newProps.isSelected);
     if (isSelected != nil) {
         _view.isSelected = isSelected;
@@ -109,6 +113,7 @@ using namespace facebook::react;
         layoutMetrics.borderWidth,
         layoutMetrics.displayType,
         layoutMetrics.layoutDirection,
+        layoutMetrics.wasLeftAndRightSwapped,
         layoutMetrics.pointScaleFactor,
         layoutMetrics.overflowInset
     };

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

package/ios/RNMBX/RNMBXMarkerViewContentComponentView.mm

@@ -0,0 +1,55 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXMarkerViewContentComponentView.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 RNMBXMarkerViewContentComponentView () <RCTRNMBXMarkerViewContentViewProtocol>
+@end
+
+@implementation RNMBXMarkerViewContentComponentView {
+  RNMBXMarkerView *_view;
+  CGRect _frame;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXMarkerViewProps>();
+    _props = defaultProps;
+    _frame = frame;
+    [self prepareView];
+  }
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXMarkerView alloc] initWithFrame:_frame];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXMarkerViewContentComponentDescriptor>();
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXMarkerViewContentCls(void)
+{
+  return RNMBXMarkerViewContentComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXMarkerViewContentManager.m

@@ -0,0 +1,6 @@
+#import "React/RCTBridgeModule.h"
+#import <React/RCTViewManager.h>
+#import <Foundation/Foundation.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXMarkerViewContent, RNMBXMarkerViewContentManager, RCTViewManager)
+@end

package/ios/RNMBX/RNMBXMarkerViewContentManager.swift

@@ -0,0 +1,14 @@
+import Foundation
+import MapboxMaps
+
+@objc(RNMBXMarkerViewContentManager)
+class RNMBXMarkerViewContentManager : RCTViewManager {
+  @objc
+  override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+  
+  override func view() -> UIView! {
+    return UIView()
+  }
+}

package/ios/RNMBX/RNMBXMarkerViewManager.m

@@ -7,6 +7,7 @@
 RCT_EXPORT_VIEW_PROPERTY(coordinate, NSString)
 RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(allowOverlap, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(allowOverlapWithPuck, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(isSelected, BOOL)
 
 @end

package/ios/RNMBX/RNMBXModelLayer.swift

@@ -0,0 +1,59 @@
+@_spi(Experimental) import MapboxMaps
+
+@objc(RNMBXModelLayer)
+public class RNMBXModelLayer: RNMBXVectorLayer {
+  typealias LayerType = ModelLayer
+
+  override func makeLayer(style: Style) throws -> Layer {
+    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    #if RNMBX_11
+    var layer = LayerType(id: self.id!, source: sourceID!)
+    #else
+    var layer = LayerType(id: self.id!)
+    #endif
+    layer.sourceLayer = self.sourceLayerID
+    layer.source = sourceID
+    return layer
+  }
+
+  override func layerType() -> Layer.Type {
+    return LayerType.self
+  }
+
+  override func apply(style : Style) throws {
+    try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout ModelLayer) in
+      if self.styleLayer != nil {
+        self.setOptions(&self.styleLayer!)
+      }
+      if let styleLayer = self.styleLayer as? ModelLayer {
+        layer = styleLayer
+      }
+    }
+  }
+  
+  override func addStyles() {
+    if let style : Style = self.style {
+      let styler =  RNMBXStyle(style: self.style!)
+      styler.bridge = self.bridge
+      
+      if var styleLayer = self.styleLayer as? LayerType,
+         let reactStyle = reactStyle {
+        styler.modelLayer(
+          layer: &styleLayer,
+          reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
+          applyUpdater: { (updater) in logged("RNMBXModelLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
+          isValid: {
+            return self.isAddedToMap()
+          })
+        self.styleLayer = styleLayer
+      }
+    }
+  }
+  
+  func isAddedToMap() -> Bool {
+    return true
+  }
+}

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

package/ios/RNMBX/RNMBXModelLayerComponentView.mm

@@ -0,0 +1,70 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXModelLayerComponentView.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;
+
+@interface RNMBXModelLayerComponentView () <RCTRNMBXModelLayerViewProtocol>
+@end
+
+@implementation RNMBXModelLayerComponentView {
+    RNMBXModelLayer *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXModelLayerProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXModelLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXModelLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXModelLayerProps &>(*props);
+  RNMBXSetCommonLayerProps(newProps, _view);
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXModelLayerCls(void)
+{
+  return RNMBXModelLayerComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelLayerViewManager.m

@@ -0,0 +1,12 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXModelLayer, RNMBXModelLayerViewManager, RCTViewManager)
+
+// circle layer props
+RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)
+
+// standard layer props
+#include "CommonLayerProperties.H"
+
+@end

package/ios/RNMBX/RNMBXModelLayerViewManager.swift

@@ -0,0 +1,13 @@
+@objc(RNMBXModelLayerViewManager)
+class RNMBXModelLayerViewManager: RCTViewManager {
+    @objc
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+  
+    override func view() -> UIView! {
+      let layer = RNMBXModelLayer()
+      layer.bridge = self.bridge
+      return layer
+    }
+}

package/ios/RNMBX/RNMBXModels.swift

@@ -0,0 +1,63 @@
+@_spi(Experimental) import MapboxMaps
+
+@objc(RNMBXModels)
+open class RNMBXModels : UIView, RNMBXMapComponent {
+  var modelIdToUrl: [String: String] = [:]
+  
+  @objc(models)
+  public var models: NSDictionary {
+    set {
+      var newModels: [String: String] = [:]
+      newValue.forEach { (key, value) in
+        if let value = value as? NSDictionary, let key = key as? String {
+          if let uri = value["uri"] as? String {
+            newModels[key] = uri
+          } else if let url = value["url"] as? String {
+            newModels[key] = url
+          } else {
+            Logger.log(level: .error, message: "Unexpected value for model key: \(key) \(value) - no uri or url found")
+          }
+        }
+      }
+      self.modelIdToUrl = newModels
+    }
+    get {
+      Logger.error("RNMBXModels.models.getter not implemented")
+      return NSDictionary()
+    }
+  }
+  
+  func setModels(_ models: NSDictionary) {
+
+  }
+  
+  func addToMap(_ map: RNMBXMapView, style: Style) {
+    modelIdToUrl.forEach { (id, uri) in
+      logged("Models.addStyleModel") {
+        if let link = URL(string: uri), let scheme = link.scheme, let host = link.host,
+            let port = link.port {
+
+          // https://github.com/mapbox/mapbox-maps-ios/issues/2067
+          let uriWithoutQuery = "\(scheme)://\(host):\(port)\(link.path)"
+
+          try style.addStyleModel(modelId: id, modelUri: uriWithoutQuery)
+        } else {
+          try style.addStyleModel(modelId: id, modelUri: uri)
+        }
+      }
+    }
+  }
+  
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    modelIdToUrl.forEach { (id, _) in
+      #if RNMBX_11
+      try? map._mapView?.mapboxMap.removeStyleModel(modelId: id)
+      #endif
+    }
+    return true
+  }
+  
+  func waitForStyleLoad() -> Bool {
+    true
+  }
+}

package/ios/RNMBX/RNMBXModelsComponentView.h

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

package/ios/RNMBX/RNMBXModelsComponentView.mm

@@ -0,0 +1,67 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXModelsComponentView.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>
+
+#import "rnmapbox_maps-Swift.pre.h"
+
+#import "RCTFollyConvert.h"
+#import "RNMBXFabricPropConvert.h"
+
+
+// TODO: use generated RNMBXModelsEventEmitter, but need 0.73+ for dynamic support
+using namespace facebook::react;
+
+@implementation RNMBXModelsComponentView {
+    RNMBXModels *_view;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXModelsProps>();
+    _props = defaultProps;
+    _view = [[RNMBXModels alloc] init];
+    [self prepareView];
+    
+    self.contentView = _view;
+  }
+  
+  return self;
+}
+
+- (void)prepareView
+{
+}
+
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXModelsComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &oldViewProps = static_cast<const RNMBXModelsProps &>(*oldProps);
+  const auto &newViewProps = static_cast<const RNMBXModelsProps &>(*props);
+
+  RNMBX_OPTIONAL_PROP_NSDictionary(models);
+  [super updateProps:props oldProps:oldProps];
+}
+@end
+
+Class<RCTComponentViewProtocol> RNMBXModelsCls(void)
+{
+  return RNMBXModelsComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelsManager.mm

@@ -0,0 +1,9 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXModels, RNMBXModelsManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(models, NSDictionary)
+
+@end
+