@rnmapbox/maps 10.0.15 → 10.1.0-beta.4

package/android/src/main/mapbox-v11-compat/v11/com/mapbox/rctmgl/v11compat/Snapshot.kt

@@ -0,0 +1,22 @@
+package com.mapbox.rctmgl.v11compat.snapshot;
+
+import android.graphics.Bitmap
+import com.mapbox.maps.Image
+import com.mapbox.maps.MapSnapshotOptions
+import com.mapbox.maps.Snapshotter
+import com.mapbox.maps.toMapboxImage as _toMapboxImage
+
+fun MapSnapshotOptions.Builder.accessToken(accessToken: String?) {
+  // blank on v11
+}
+
+
+fun Snapshotter.startV11(callback: (Bitmap?, String?)-> Unit) {
+    this.start(null, callback)
+}
+
+// toMapboxImage
+
+fun Bitmap.toMapboxImage(): Image {
+    return this._toMapboxImage()
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/MBXAndroidTextureMapViewManagerDelegate.java

@@ -0,0 +1,89 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* This file should be updated after modifying `MBXAndroidTextureMapViewNativeComponent.ts`.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class MBXAndroidTextureMapViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MBXAndroidTextureMapViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public MBXAndroidTextureMapViewManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "attributionEnabled":
+        mViewManager.setAttributionEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "attributionPosition":
+        mViewManager.setAttributionPosition(view, new DynamicFromObject(value));
+        break;
+      case "logoEnabled":
+        mViewManager.setLogoEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "logoPosition":
+        mViewManager.setLogoPosition(view, new DynamicFromObject(value));
+        break;
+      case "compassEnabled":
+        mViewManager.setCompassEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "compassFadeWhenNorth":
+        mViewManager.setCompassFadeWhenNorth(view, value == null ? false : (boolean) value);
+        break;
+      case "compassPosition":
+        mViewManager.setCompassPosition(view, new DynamicFromObject(value));
+        break;
+      case "compassViewPosition":
+        mViewManager.setCompassViewPosition(view, value == null ? 0 : ((Double) value).intValue());
+        break;
+      case "compassViewMargins":
+        mViewManager.setCompassViewMargins(view, (ReadableMap) value);
+        break;
+      case "compassImage":
+        mViewManager.setCompassImage(view, value == null ? null : (String) value);
+        break;
+      case "scaleBarEnabled":
+        mViewManager.setScaleBarEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "scaleBarPosition":
+        mViewManager.setScaleBarPosition(view, new DynamicFromObject(value));
+        break;
+      case "zoomEnabled":
+        mViewManager.setZoomEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "scrollEnabled":
+        mViewManager.setScrollEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "rotateEnabled":
+        mViewManager.setRotateEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "pitchEnabled":
+        mViewManager.setPitchEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "requestDisallowInterceptTouchEvent":
+        mViewManager.setRequestDisallowInterceptTouchEvent(view, value == null ? false : (boolean) value);
+        break;
+      case "projection":
+        mViewManager.setProjection(view, (String) value);
+        break;
+      case "localizeLabels":
+        mViewManager.setLocalizeLabels(view, (ReadableMap) value);
+        break;
+      case "styleURL":
+        mViewManager.setStyleURL(view, value == null ? null : (String) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/MBXAndroidTextureMapViewManagerInterface.java

@@ -0,0 +1,37 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* This file should be updated after modifying `MBXAndroidTextureMapViewNativeComponent.ts`.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.bridge.ReadableMap;
+
+public interface MBXAndroidTextureMapViewManagerInterface<T extends View> {
+  void setAttributionEnabled(T view, boolean value);
+  void setAttributionPosition(T view, Dynamic value);
+  void setLogoEnabled(T view, boolean value);
+  void setLogoPosition(T view, Dynamic value);
+  void setCompassEnabled(T view, boolean value);
+  void setCompassFadeWhenNorth(T view, boolean value);
+  void setCompassPosition(T view, Dynamic value);
+  void setCompassViewPosition(T view, int value);
+  void setCompassViewMargins(T view, @Nullable ReadableMap value);
+  void setCompassImage(T view, @Nullable String value);
+  void setScaleBarEnabled(T view, boolean value);
+  void setScaleBarPosition(T view, Dynamic value);
+  void setZoomEnabled(T view, boolean value);
+  void setScrollEnabled(T view, boolean value);
+  void setRotateEnabled(T view, boolean value);
+  void setPitchEnabled(T view, boolean value);
+  void setRequestDisallowInterceptTouchEvent(T view, boolean value);
+  void setProjection(T view, @Nullable String value);
+  void setLocalizeLabels(T view, @Nullable ReadableMap value);
+  void setStyleURL(T view, @Nullable String value);
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/MBXMapViewManagerDelegate.java

@@ -0,0 +1,89 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* This file should be updated after modifying `MBXMapViewNativeComponent.ts`.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class MBXMapViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MBXMapViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public MBXMapViewManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "attributionEnabled":
+        mViewManager.setAttributionEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "attributionPosition":
+        mViewManager.setAttributionPosition(view, new DynamicFromObject(value));
+        break;
+      case "logoEnabled":
+        mViewManager.setLogoEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "logoPosition":
+        mViewManager.setLogoPosition(view, new DynamicFromObject(value));
+        break;
+      case "compassEnabled":
+        mViewManager.setCompassEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "compassFadeWhenNorth":
+        mViewManager.setCompassFadeWhenNorth(view, value == null ? false : (boolean) value);
+        break;
+      case "compassPosition":
+        mViewManager.setCompassPosition(view, new DynamicFromObject(value));
+        break;
+      case "compassViewPosition":
+        mViewManager.setCompassViewPosition(view, value == null ? 0 : ((Double) value).intValue());
+        break;
+      case "compassViewMargins":
+        mViewManager.setCompassViewMargins(view, (ReadableMap) value);
+        break;
+      case "compassImage":
+        mViewManager.setCompassImage(view, value == null ? null : (String) value);
+        break;
+      case "scaleBarEnabled":
+        mViewManager.setScaleBarEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "scaleBarPosition":
+        mViewManager.setScaleBarPosition(view, new DynamicFromObject(value));
+        break;
+      case "zoomEnabled":
+        mViewManager.setZoomEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "scrollEnabled":
+        mViewManager.setScrollEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "rotateEnabled":
+        mViewManager.setRotateEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "pitchEnabled":
+        mViewManager.setPitchEnabled(view, value == null ? false : (boolean) value);
+        break;
+      case "requestDisallowInterceptTouchEvent":
+        mViewManager.setRequestDisallowInterceptTouchEvent(view, value == null ? false : (boolean) value);
+        break;
+      case "projection":
+        mViewManager.setProjection(view, (String) value);
+        break;
+      case "localizeLabels":
+        mViewManager.setLocalizeLabels(view, (ReadableMap) value);
+        break;
+      case "styleURL":
+        mViewManager.setStyleURL(view, value == null ? null : (String) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/MBXMapViewManagerInterface.java

@@ -0,0 +1,37 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* This file should be updated after modifying `MBXMapViewNativeComponent.ts`.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.bridge.ReadableMap;
+
+public interface MBXMapViewManagerInterface<T extends View> {
+  void setAttributionEnabled(T view, boolean value);
+  void setAttributionPosition(T view, Dynamic value);
+  void setLogoEnabled(T view, boolean value);
+  void setLogoPosition(T view, Dynamic value);
+  void setCompassEnabled(T view, boolean value);
+  void setCompassFadeWhenNorth(T view, boolean value);
+  void setCompassPosition(T view, Dynamic value);
+  void setCompassViewPosition(T view, int value);
+  void setCompassViewMargins(T view, @Nullable ReadableMap value);
+  void setCompassImage(T view, @Nullable String value);
+  void setScaleBarEnabled(T view, boolean value);
+  void setScaleBarPosition(T view, Dynamic value);
+  void setZoomEnabled(T view, boolean value);
+  void setScrollEnabled(T view, boolean value);
+  void setRotateEnabled(T view, boolean value);
+  void setPitchEnabled(T view, boolean value);
+  void setRequestDisallowInterceptTouchEvent(T view, boolean value);
+  void setProjection(T view, @Nullable String value);
+  void setLocalizeLabels(T view, @Nullable ReadableMap value);
+  void setStyleURL(T view, @Nullable String value);
+}

package/android/src/main/old-arch/com/mapbox/rctmgl/NativeMapViewModuleSpec.java

@@ -0,0 +1,88 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+* This file should be updated after modifying `NativeMapViewModule.ts`.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.mapbox.rctmgl;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public abstract class NativeMapViewModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public static final String NAME = "MBXMapViewModule";
+
+  public NativeMapViewModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void takeSnap(@Nullable Double viewRef, boolean writeToDisk, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void queryTerrainElevation(@Nullable Double viewRef, ReadableArray coordinates, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setSourceVisibility(@Nullable Double viewRef, boolean visible, String sourceId, String sourceLayerId, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getCenter(@Nullable Double viewRef, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getCoordinateFromView(@Nullable Double viewRef, ReadableArray atPoint, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getPointInView(@Nullable Double viewRef, ReadableArray atCoordinate, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getZoom(@Nullable Double viewRef, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getVisibleBounds(@Nullable Double viewRef, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void queryRenderedFeaturesAtPoint(@Nullable Double viewRef, ReadableArray atPoint, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void queryRenderedFeaturesInRect(@Nullable Double viewRef, ReadableArray withBBox, ReadableArray withFilter, ReadableArray withLayerIDs, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setHandledMapChangedEvents(@Nullable Double viewRef, ReadableArray events, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void clearData(@Nullable Double viewRef, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void querySourceFeatures(@Nullable Double viewRef, String sourceId, ReadableArray withFilter, ReadableArray withSourceLayerIDs, Promise promise);
+}

package/ios/RCTMGL-v10/CustomHttpHeaders.swift

@@ -10,11 +10,20 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
   var customHeaders : [String:String] = [:]
 
   func install() {
+    #if RNMBX_11
+    HttpServiceFactory.setHttpServiceInterceptorForInterceptor(self)
+    #else
     HttpServiceFactory.getInstance().setInterceptorForInterceptor(self)
+    #endif
   }
 
   func reset() {
+    #if RNMBX_11
+    HttpServiceFactory.setHttpServiceInterceptorForInterceptor(nil)
+    #else
     HttpServiceFactory.getInstance().setInterceptorForInterceptor(nil)
+
+    #endif
   }
 
   // MARK: - HttpServiceInterceptorInterface
@@ -36,4 +45,13 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
   func onResponse(for response: HttpResponse) -> HttpResponse {
     return response
   }
+  
+  #if RNMBX_11
+  func onUpload(forUpload upload: UploadOptions) -> UploadOptions {
+    customHeaders.forEach {(key,value) in
+      upload.headers[key] = value
+    }
+    return upload
+  }
+  #endif
 }

package/ios/RCTMGL-v10/MBXMapViewComponentView.h

@@ -0,0 +1,18 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MBXMapViewComponentView : RCTViewComponentView
+
+- (void)dispatchCameraChangedEvent:(NSDictionary*)event;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RCTMGL-v10/MBXMapViewComponentView.mm

@@ -0,0 +1,203 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "MBXMapViewComponentView.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>
+// needed for compilation for some reason
+#import <CoreFoundation/CoreFoundation.h>
+#import <CoreLocation/CoreLocation.h>
+
+@interface MapView : UIView
+@end
+
+#import <rnmapbox_maps-Swift.h>
+
+using namespace facebook::react;
+
+@interface MBXMapViewComponentView () <RCTMBXMapViewViewProtocol>
+@end
+
+@interface MBXMapViewEventDispatcher : NSObject<RCTEventDispatcherProtocol>
+@end
+
+@implementation MBXMapViewEventDispatcher {
+    MBXMapViewComponentView* _componentView;
+}
+
+- (instancetype)initWithComponentView:(MBXMapViewComponentView*)componentView {
+    if (self = [super init]) {
+        _componentView = componentView;
+    }
+
+    return self;
+}
+
+- (void)sendEvent:(id<RCTEvent>)event {
+    NSDictionary* payload = [event arguments][2];
+    [_componentView dispatchCameraChangedEvent:payload];
+}
+
+@end
+
+@implementation MBXMapViewComponentView {
+    MBXMapView *_view;
+    MBXMapViewEventDispatcher *_eventDispatcher;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const MBXMapViewProps>();
+    _props = defaultProps;
+    _eventDispatcher = [[MBXMapViewEventDispatcher alloc] initWithComponentView:self];
+      _view =  [[MBXMapView alloc] initWithFrame:frame eventDispatcher:_eventDispatcher];
+      
+      // just need to pass something, it won't really be used on fabric, but it's used to create events (it won't impact sending them)
+      _view.reactTag = @-1;
+      
+      // capture weak self reference to prevent retain cycle
+      __weak __typeof__(self) weakSelf = self;
+      
+      [_view setReactOnPress:^(NSDictionary* event) {
+          __typeof__(self) strongSelf = weakSelf;
+
+          if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+              const auto [type, json] = [MBXMapViewComponentView stringifyEventData:event];
+              std::dynamic_pointer_cast<const facebook::react::MBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onPress({type, json});
+            }
+      }];
+
+      [_view setReactOnLongPress:^(NSDictionary* event) {
+          __typeof__(self) strongSelf = weakSelf;
+
+          if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+              const auto [type, json] = [MBXMapViewComponentView stringifyEventData:event];
+              std::dynamic_pointer_cast<const facebook::react::MBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onLongPress({type, json});
+            }
+      }];
+
+      [_view setReactOnMapChange:^(NSDictionary* event) {
+          __typeof__(self) strongSelf = weakSelf;
+
+          if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+              const auto [type, json] = [MBXMapViewComponentView stringifyEventData:event];
+              std::dynamic_pointer_cast<const facebook::react::MBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onMapChange({type, json});
+            }
+      }];
+
+    self.contentView = _view;
+  }
+
+  return self;
+}
+
+- (void)dispatchCameraChangedEvent:(NSDictionary*)event {
+    const auto [type, json] = [MBXMapViewComponentView stringifyEventData:event];
+    std::dynamic_pointer_cast<const facebook::react::MBXMapViewEventEmitter>(self->_eventEmitter)->onCameraChanged({type, json});
+}
+
++ (std::tuple<std::string, std::string>)stringifyEventData:(NSDictionary*)event {
+    std::string type = [event valueForKey:@"type"] == nil ? "" : std::string([[event valueForKey:@"type"] UTF8String]);
+    std::string json = "{}";
+
+    NSError *error;
+    NSData *jsonData = nil;
+
+    if ([event valueForKey:@"payload"] != nil) {
+        jsonData = [NSJSONSerialization dataWithJSONObject:[event valueForKey:@"payload"]
+                                                           options:0
+                                                             error:&error];
+    }
+
+    if (jsonData) {
+        json = std::string([[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding] UTF8String]);
+    }
+
+    return {type, json};
+}
+
+- (NSDictionary*)convertPositionToDictionary:(const folly::dynamic*)position {
+    NSMutableDictionary<NSString*, NSNumber*>* result = [[NSMutableDictionary alloc] init];
+
+    if (!position->isNull()) {
+        for (auto& pair : position->items()) {
+            NSString* key = [NSString stringWithUTF8String:pair.first.getString().c_str()];
+            NSNumber* value = [[NSNumber alloc] initWithInt:pair.second.getDouble()];
+            [result setValue:value forKey:key];
+        }
+    }
+
+    return result;
+}
+
+- (NSDictionary*)convertLocalizeLabels:(const MBXMapViewLocalizeLabelsStruct*)labels {
+    NSMutableDictionary* result = [[NSMutableDictionary alloc] init];
+    NSMutableArray* ids = [[NSMutableArray alloc] init];
+
+    [result setValue:[NSString stringWithUTF8String:labels->locale.c_str()] forKey:@"locale"];
+
+    for (auto& layerId : labels->layerIds) {
+        NSString* value = [NSString stringWithUTF8String:layerId.c_str()];
+        [ids addObject:value];
+    }
+
+    [result setValue:ids forKey:@"layerIds"];
+
+    return result;
+}
+
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<MBXMapViewComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = *std::static_pointer_cast<const MBXMapViewProps>(props);
+    [_view setReactAttributionEnabled:newProps.attributionEnabled];
+    [_view setReactAttributionPosition:[self convertPositionToDictionary:&newProps.attributionPosition]];
+
+    [_view setReactLogoEnabled:newProps.logoEnabled];
+    [_view setReactLogoPosition:[self convertPositionToDictionary:&newProps.logoPosition]];
+
+    [_view setReactCompassEnabled:newProps.compassEnabled];
+    [_view setReactCompassFadeWhenNorth:newProps.compassFadeWhenNorth];
+    [_view setReactCompassPosition:[self convertPositionToDictionary:&newProps.compassPosition]];
+    [_view setReactCompassViewPosition:newProps.compassViewPosition];
+    [_view setReactCompassViewMargins:CGPointMake(newProps.compassViewMargins.x, newProps.compassViewMargins.y)];
+    [_view setReactCompassImage:[NSString stringWithUTF8String:newProps.compassImage.c_str()]];
+
+    [_view setReactScaleBarEnabled:newProps.scaleBarEnabled];
+    [_view setReactScaleBarPosition:[self convertPositionToDictionary:&newProps.scaleBarPosition]];
+
+    [_view setReactZoomEnabled:newProps.zoomEnabled];
+    [_view setReactScrollEnabled:newProps.scrollEnabled];
+    [_view setReactRotateEnabled:newProps.rotateEnabled];
+    [_view setReactPitchEnabled:newProps.pitchEnabled];
+
+    [_view setReactProjection:newProps.projection == MBXMapViewProjection::Mercator ? @"mercator" : @"globe"];
+    [_view setReactStyleURL:[NSString stringWithUTF8String:newProps.styleURL.c_str()]];
+
+    if (!newProps.localizeLabels.locale.empty()) {
+        [_view setReactLocalizeLabels:[self convertLocalizeLabels:&newProps.localizeLabels]];
+    }
+  [super updateProps:props oldProps:oldProps];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> MBXMapViewCls(void)
+{
+  return MBXMapViewComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RCTMGL-v10/MBXMapViewManager.m

@@ -0,0 +1,37 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_REMAP_MODULE(MBXMapView, MBXMapViewManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(onCameraChanged, RCTDirectEventBlock)
+
+RCT_REMAP_VIEW_PROPERTY(attributionEnabled, reactAttributionEnabled, BOOL)
+RCT_REMAP_VIEW_PROPERTY(attributionPosition, reactAttributionPosition, NSDictionary)
+
+RCT_REMAP_VIEW_PROPERTY(logoEnabled, reactLogoEnabled, BOOL)
+RCT_REMAP_VIEW_PROPERTY(logoPosition, reactLogoPosition, NSDictionary)
+
+RCT_REMAP_VIEW_PROPERTY(compassEnabled, reactCompassEnabled, BOOL)
+RCT_REMAP_VIEW_PROPERTY(compassFadeWhenNorth, reactCompassFadeWhenNorth, BOOL)
+RCT_REMAP_VIEW_PROPERTY(compassPosition, reactCompassPosition, NSDictionary)
+RCT_REMAP_VIEW_PROPERTY(compassViewPosition, reactCompassViewPosition, NSInteger)
+RCT_REMAP_VIEW_PROPERTY(compassViewMargins, reactCompassViewMargins, CGPoint)
+RCT_REMAP_VIEW_PROPERTY(compassImage, reactCompassImage, NSString)
+
+RCT_REMAP_VIEW_PROPERTY(scaleBarEnabled, reactScaleBarEnabled, BOOL)
+RCT_REMAP_VIEW_PROPERTY(scaleBarPosition, reactScaleBarPosition, NSDictionary)
+
+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_REMAP_VIEW_PROPERTY(projection, reactProjection, NSString)
+RCT_REMAP_VIEW_PROPERTY(localizeLabels, reactLocalizeLabels, NSDictionary)
+
+RCT_REMAP_VIEW_PROPERTY(styleURL, reactStyleURL, NSString)
+RCT_REMAP_VIEW_PROPERTY(onPress, reactOnPress, RCTBubblingEventBlock)
+RCT_REMAP_VIEW_PROPERTY(onLongPress, reactOnLongPress, RCTBubblingEventBlock)
+RCT_REMAP_VIEW_PROPERTY(onMapChange, reactOnMapChange, RCTBubblingEventBlock)
+
+@end