chore: mapViewImpl support

android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt

@@ -194,7 +194,7 @@ public class RNMBXMapViewFactory {
         }
 
         fun get(impl: String): Factory? {
-            val (impl, options) = impl.split(":",limit=2);
+            val (impl, options) = impl.split(":",limit=2) + null;
             return factories.get(impl);
         }
     }

android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableMap.kt

@@ -1,5 +1,6 @@
 package com.rnmapbox.rnmbx.utils.extensions
 
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.google.gson.JsonArray
@@ -83,6 +84,19 @@ fun ReadableMap.getAndLogIfNotString(key: String, tag: String = "RNMBXReadableMa
     }
 }
 
+fun ReadableMap.getAndLogIfNotArray(key: String, tag: String = "RNMBXReadableMap"): ReadableArray? {
+    return if (hasKey(key)) {
+        if (getType(key) == ReadableType.Array) {
+            getArray(key)
+        } else {
+            Logger.e("RNMBXReadableMap", "$key is exected to be a Map but was: ${getType(key)}")
+            null
+        }
+    } else {
+        null
+    }
+}
+
 fun ReadableMap.getAndLogIfNotMap(key: String, tag: String = "RNMBXReadableMap"): ReadableMap? {
     return if (hasKey(key)) {
         if (getType(key) == ReadableType.Map) {

ios/RNMBX/RNMBXLogging.swift

@@ -1,19 +1,19 @@
 import Foundation
 import MapboxMaps
 
-enum RNMBXError: Error, LocalizedError {
+public enum RNMBXError: Error, LocalizedError {
   case parseError(String)
   case failed(String)
   case paramError(String)
 
-  var errorDescription: String? {
+  public var errorDescription: String? {
     return String(describing: self)
   }
 }
 
-class Logger {
-  enum LogLevel : String, Comparable {
-    static func < (lhs: Logger.LogLevel, rhs: Logger.LogLevel) -> Bool {
+public class Logger {
+  public enum LogLevel : String, Comparable {
+    public static func < (lhs: Logger.LogLevel, rhs: Logger.LogLevel) -> Bool {
       return lhs.intValue < rhs.intValue
     }
 
@@ -56,7 +56,7 @@ class Logger {
     }
   }
 
-  static func log(level: LogLevel, message: String) {
+  public static func log(level: LogLevel, message: String) {
     sharedInstance.log(level: level, message: message)
   }
 

ios/RNMBX/RNMBXMapView.swift

@@ -2,7 +2,7 @@
 import Turf
 import MapKit
 
-public typealias RNMBXMapViewFactoryFunc = (String, UIView) -> MapView?;
+public typealias RNMBXMapViewFactoryFunc = (String, UIView) -> (MapView?)
 
 /**
  * Experimental MapView factory for advanced usecases
@@ -191,6 +191,7 @@ open class RNMBXMapView: UIView {
 
     _mapView.gestures.delegate = self
     setupEvents()
+    afterMapViewAdded()
   }
 
   func createAndAddMapViewImpl(_ impl: String, _ view: RNMBXMapView) -> MapView? {
@@ -841,6 +842,9 @@ open class RNMBXMapView: UIView {
       }
     }
   }
+
+  // MARK: - hooks for subclasses
+  open func afterMapViewAdded() {}
 }
 
 // MARK: - event handlers

ios/RNMBX/RNMBXMapViewManager.m

@@ -37,4 +37,6 @@ @interface RCT_EXTERN_REMAP_MODULE(RNMBXMapView, RNMBXMapViewManager, RCTViewMan
 RCT_REMAP_VIEW_PROPERTY(onLongPress, reactOnLongPress, RCTBubblingEventBlock)
 RCT_REMAP_VIEW_PROPERTY(onMapChange, reactOnMapChange, RCTBubblingEventBlock)
 
+RCT_EXPORT_VIEW_PROPERTY(mapViewImpl, NSString)
+
 @end

ios/RNMBX/RNMBXMapViewManager.swift

@@ -7,7 +7,7 @@ extension QueriedSourceFeature {
 #endif
 
 @objc(RNMBXMapViewManager)
-public class RNMBXMapViewManager: RCTViewManager {
+open class RNMBXMapViewManager: RCTViewManager {
     @objc
     override public static func requiresMainQueueSetup() -> Bool {
         return true
@@ -17,7 +17,7 @@ public class RNMBXMapViewManager: RCTViewManager {
         return UIScreen.main.bounds
     }
 
-    override public func view() -> UIView! {
+    override open func view() -> UIView! {
         let result = RNMBXMapView(frame: self.defaultFrame(), eventDispatcher: self.bridge.eventDispatcher())
         return result
     }

ios/RNMBX/RNMBXModule.swift

@@ -8,18 +8,23 @@ import MapboxMobileEvents
 let DEFAULT_SOURCE_ID = "composite";
 
 @objc(RNMBXModule)
+public
 class RNMBXModule : NSObject {
-  #if RNMBX_11
-  static var accessToken : String? {
+
+  public static var accessToken : String? {
     didSet {
+#if RNMBX_11
       if let token = accessToken {
         MapboxOptions.accessToken = token
       }
+#else
+      if let token = accessToken {
+        ResourceOptionsManager.default.resourceOptions.accessToken = token
+      }
+#endif
     }
   }
-  #else
-    static var accessToken : String?
-  #endif
+
 
   @objc
   func constantsToExport() -> [AnyHashable: Any]! {

src/components/MapView.tsx

@@ -438,6 +438,11 @@ type Props = ViewProps & {
    * @private Experimental support for custom MapView instances
    */
   mapViewImpl?: string;
+
+  /**
+   * @private Experimental support for custom MapView instances
+   */
+  _nativeImpl?: NativeMapViewActual;
 };
 
 type CallbablePropKeys =
@@ -1155,11 +1160,15 @@ class MapView extends NativeBridgeComponent(
 
     let mapView = null;
     if (this.state.isReady) {
-      mapView = (
-        <RNMBXMapView {...props} {...callbacks}>
-          {this.props.children}
-        </RNMBXMapView>
-      );
+      if (props._nativeImpl) {
+        mapView = <props._nativeImpl {...props} {...callbacks} />;
+      } else {
+        mapView = (
+          <RNMBXMapView {...props} {...callbacks}>
+            {this.props.children}
+          </RNMBXMapView>
+        );
+      }
     }
 
     return (