@rnmapbox/maps 10.2.10 → 10.3.0-beta.0

package/ios/RNMBX/RNMBXStyleImport.swift

@@ -36,13 +36,9 @@ open class RNMBXStyleImport: UIView, RNMBXMapComponent {
 
   func apply(mapView: MapView) {
     if let config = config, let id = id {
-      #if RNMBX_11
-        logged("RNMBXStyleImport.setStyleImportConfigProperties id=\(id)") {
-          try mapView.mapboxMap.setStyleImportConfigProperties(for: id, configs: config)
-        }
-      #else
-        Logger.error("RNMBXStyleImport.setStyleImportConfigProperties is only implemented on v11")
-      #endif
+      logged("RNMBXStyleImport.setStyleImportConfigProperties id=\(id)") {
+        try mapView.mapboxMap.setStyleImportConfigProperties(for: id, configs: config)
+      }
     }
   }
 

package/ios/RNMBX/RNMBXStyleImportComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -13,5 +13,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXStyleImportComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXStyleImportComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -83,4 +82,3 @@ Class<RCTComponentViewProtocol> RNMBXStyleImportCls(void) {
   return RNMBXStyleImportComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXStyleValue.swift

@@ -203,7 +203,6 @@ class RNMBXStyleValue {
     }
   }
 
-  #if RNMBX_11
   func mglStyleValueNumberRaw() -> Value<Double> {
     guard let value = value as? Dictionary<String,Any> else {
       Logger.log(level: .error, message: "Invalid value for number: \(value) retuning 0.0")
@@ -224,28 +223,6 @@ class RNMBXStyleValue {
     }
     return .constant(1.0)
   }
-  #else
-  func mglStyleValueNumberRaw() -> Double {
-    guard let value = value as? Dictionary<String,Any> else {
-      Logger.log(level: .error, message: "Invalid value for number: \(value) retuning 0.0")
-      return 0.0
-    }
-
-    let valueObj = RNMBXStyleValue.convert(value["stylevalue"] as! [String:Any])
-
-    if let num = valueObj as? NSNumber {
-      return num.doubleValue
-    } else if let num = valueObj as? Double {
-      return num
-    } else if let num = valueObj as? Int {
-      return Double(num)
-    } else {
-      Logger.log(level: .error, message: "Invalid value for number: \(value) retuning 0.0")
-      return 0.0
-    }
-    return 1.0
-  }
-  #endif
 
   func uicolor(_ rgbValue: Int) -> UIColor {
       return UIColor(
@@ -280,7 +257,6 @@ class RNMBXStyleValue {
     return decodedExpression
   }
 
-  #if RNMBX_11
   func mglStyleValueColorRaw() -> Value<StyleColor> {
     guard let value = value as? Dictionary<String,Any> else {
       Logger.log(level: .error, message: "Invalid value for color: \(value) retuning red")
@@ -296,23 +272,6 @@ class RNMBXStyleValue {
       return .constant(StyleColor(UIColor.red))
     }
   }
-  #else
-  func mglStyleValueColorRaw() -> StyleColor {
-    guard let value = value as? Dictionary<String,Any> else {
-      Logger.log(level: .error, message: "Invalid value for color: \(value) retuning red")
-      return StyleColor(UIColor.red)
-    }
-    let valueObj = RNMBXStyleValue.convert(value["stylevalue"] as! [String:Any])
-
-    if let num = valueObj as? Int {
-      let uicolor = uicolor(num)
-      return StyleColor(uicolor)
-    } else {
-      Logger.log(level: .error, message: "Unexpeted value for color: \(valueObj), retuning red")
-      return StyleColor(UIColor.red)
-    }
-  }
-  #endif
 
   func mglStyleValueBoolean() -> Value<Bool> {
     guard let value = value as? Dictionary<String,Any> else {
@@ -478,16 +437,10 @@ class RNMBXStyleValue {
     return Value.constant([])
   }
 
-  #if RNMBX_11
   func mglStyleValueAnchorRaw() -> Value<Anchor> {
     // RNMBX_11 TODO Support expressions
     return .constant(mglStyleEnum())
   }
-  #else
-  func mglStyleValueAnchorRaw() -> Anchor {
-    return mglStyleEnum()
-  }
-  #endif
 
   func shouldAddImage() -> Bool {
     if let uri = getImageURI() {
@@ -580,7 +533,6 @@ class RNMBXStyleValue {
     }
   }
 
-  #if RNMBX_11
   func mglStyleValueArrayClipLayerTypes() -> Value<[ClipLayerTypes]> {
     guard let value = value as? Dictionary<String,Any> else {
       Logger.log(level: .error, message: "Invalid value for array of ClipLayerTypes: \(value)")
@@ -605,9 +557,7 @@ class RNMBXStyleValue {
       }
     }
   }
-  #endif
 
-  #if RNMBX_11
   func getSphericalPosition() -> Value<[Double]> {
     if let array = styleObject as? [NSNumber] {
       var result = array.map { $0.doubleValue }
@@ -617,17 +567,6 @@ class RNMBXStyleValue {
     Logger.log(level: .error, message: "Expected array of numbers as position received: \(optional: styleObject)")
     return .constant([])
   }
-  #else
-  func getSphericalPosition() -> [Double] {
-    if let array = styleObject as? [NSNumber] {
-      var result = array.map { $0.doubleValue }
-      result[0] = deg2rad(result[0])
-      return result
-    }
-    Logger.log(level: .error, message: "Expected array of numbers as position received: \(optional: styleObject)")
-    return []
-  }
-  #endif
 
   func mglStyleValueFormatted() -> Value<String> {
     if let value = value as? Dictionary<String,Any> {

package/ios/RNMBX/RNMBXSymbolLayer.swift

@@ -7,11 +7,7 @@ public class RNMBXSymbolLayer: RNMBXVectorLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     let _ : 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
@@ -25,7 +21,6 @@ public class RNMBXSymbolLayer: RNMBXVectorLayer {
   func setCommonOptions(_ layer: inout SymbolLayer) -> Bool {
     var changed = false
 
-    #if RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
       changed = true
@@ -48,7 +43,6 @@ public class RNMBXSymbolLayer: RNMBXVectorLayer {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    #endif
 
     return changed
   }

package/ios/RNMBX/RNMBXSymbolLayerComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXSymbolLayerComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXSymbolLayerComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -73,4 +72,3 @@ Class<RCTComponentViewProtocol> RNMBXSymbolLayerCls(void)
   return RNMBXSymbolLayerComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXTerrainComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXTerrainComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXTerrainComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -81,4 +80,3 @@ Class<RCTComponentViewProtocol> RNMBXTerrainCls(void)
   return RNMBXTerrainComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXVectorSource.swift

@@ -15,11 +15,7 @@ public class RNMBXVectorSource : RNMBXTileSource {
 
   override func makeSource() -> Source
   {
-    #if RNMBX_11
     var result = VectorSource(id: self.id)
-    #else
-    var result = VectorSource()
-    #endif
     if let url = url {
       result.url = url
     } else {

package/ios/RNMBX/RNMBXVectorSourceComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXVectorSourceComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXVectorSourceComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -141,4 +140,3 @@ Class<RCTComponentViewProtocol> RNMBXVectorSourceCls(void)
   return RNMBXVectorSourceComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXViewport.swift

@@ -1,10 +1,5 @@
 @_spi(Experimental) import MapboxMaps
 
-#if RNMBX_11
-#else
-typealias ViewportManager = Viewport
-#endif
-
 @objc(RNMBXViewport)
 open class RNMBXViewport : UIView, RNMBXMapAndMapViewComponent, ViewportStatusObserver {
   var mapView: MapView? = nil
@@ -131,7 +126,7 @@ open class RNMBXViewport : UIView, RNMBXMapAndMapViewComponent, ViewportStatusOb
     }
   }
   
-  func getState() -> [String:Any] {
+  @objc public func getState() -> [String:Any] {
     guard let mapView = mapView else {
       Logger.log(level:.error, message: "mapView is null in RNMBXViewport.getState")
       return [:]
@@ -139,7 +134,7 @@ open class RNMBXViewport : UIView, RNMBXMapAndMapViewComponent, ViewportStatusOb
     return statusToMap(mapView.viewport.status)
   }
   
-  func idle() {
+  @objc public func idle() {
     guard let mapView = mapView else {
       Logger.log(level:.error, message: "mapView is null in RNMBXViewport.idle")
       return
@@ -302,7 +297,7 @@ open class RNMBXViewport : UIView, RNMBXMapAndMapViewComponent, ViewportStatusOb
     }
   }
   
-  func transitionTo(
+  @objc public func transitionTo(
     state: [String: Any],
     transition: [String: Any],
     resolve: @escaping (NSNumber) -> Void

package/ios/RNMBX/RNMBXViewportComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -13,5 +13,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXViewportComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXViewportComponentView.h"
 
@@ -123,4 +122,3 @@ Class<RCTComponentViewProtocol> RNMBXViewportCls(void)
   return RNMBXViewportComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXViewportModule.h

@@ -2,18 +2,15 @@
 #import <UIKit/UIKit.h>
 #import "RNMBXViewResolver.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 #import "rnmapbox_maps_specs.h"
-#else
-#import <React/RCTBridge.h>
-#endif
 
-@interface RNMBXViewportModule : NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXViewportModuleSpec, RNMBXViewResolverDelegate>
+@interface RNMBXViewportModule : NSObject <NativeRNMBXViewportModuleSpec, RNMBXViewResolverDelegate>
+@end
+
 #else
-<RCTBridgeModule, RNMBXViewResolverDelegate>
-#endif
 
+@interface RNMBXViewportModule : NSObject
 @end
 
+#endif

package/ios/RNMBX/RNMBXViewportModule.mm

@@ -3,9 +3,7 @@
 #import <React/RCTUIManagerUtils.h>
 
 #import "RNMBXViewportModule.h"
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXViewportComponentView.h"
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import "rnmapbox_maps-Swift.pre.h"
 
@@ -13,9 +11,7 @@
 
 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
@@ -25,14 +21,11 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-// 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::NativeRNMBXViewportModuleSpecJSI>(params);
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)withViewport:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXViewport *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
@@ -51,7 +44,7 @@ RCT_EXPORT_METHOD(getState:(nonnull NSNumber *)viewRef
                    reject:(RCTPromiseRejectBlock)reject)
 {
     [self withViewport:viewRef block:^(RNMBXViewport *view) {
-        [RNMBXViewportManager getState:view resolve:resolve reject:reject];
+        resolve([view getState]);
     } reject:reject methodName:@"getState"];
 }
      
@@ -60,7 +53,8 @@ RCT_EXPORT_METHOD(idle:(nonnull NSNumber *)viewRef
                     reject:(RCTPromiseRejectBlock)reject)
 {
    [self withViewport:viewRef block:^(RNMBXViewport *view) {
-       [RNMBXViewportManager idle:view resolve:resolve reject:reject];
+       [view idle];
+       resolve(nil);
    } reject:reject methodName:@"idle"];
 }
 
@@ -71,9 +65,8 @@ RCT_EXPORT_METHOD(transitionTo:(nonnull NSNumber *)viewRef
                   reject:(RCTPromiseRejectBlock)reject)
 {
   [self withViewport:viewRef block:^(RNMBXViewport *view) {
-      [RNMBXViewportManager transitionTo:view state:state transition:transition
-        resolve:resolve reject:reject];
-  } reject:reject methodName:@"idle"];
+    [view transitionToState:state transition:transition resolve:resolve];
+  } reject:reject methodName:@"transitionTo"];
 }
 
 @end

package/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm

@@ -7,27 +7,16 @@
 
 #import "rnmapbox_maps-Swift.pre.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "rnmapbox_maps_specs.h"
-#else
-#import <React/RCTBridge.h>
-#endif
 
-@interface RNMBXChangeLineOffsetsShapeAnimatorModule: NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec>
-#else
-<RCTBridgeModule>
-#endif
+@interface RNMBXChangeLineOffsetsShapeAnimatorModule: NSObject <NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec>
 @end
 
 @implementation RNMBXChangeLineOffsetsShapeAnimatorModule
 
 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 {
@@ -52,13 +41,10 @@ RCT_EXPORT_METHOD(setEndOffset:(nonnull NSNumber*)tag offset: (nonnull NSNumber*
   [ChangeLineOffsetsShapeAnimator setEndOffsetWithTag:tag offset:offset durationMs:durationMs resolve:resolve reject:reject];
 }
 
-// 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::NativeRNMBXShapeSourceModuleSpecJSI>(params);
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 @end

package/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm

@@ -7,27 +7,16 @@
 
 #import "rnmapbox_maps-Swift.pre.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "rnmapbox_maps_specs.h"
-#else
-#import <React/RCTBridge.h>
-#endif
-
-@interface RNMBXMovePointShapeAnimatorModule: NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXMovePointShapeAnimatorModuleSpec>
-#else
-<RCTBridgeModule>
-#endif
+
+@interface RNMBXMovePointShapeAnimatorModule: NSObject <NativeRNMBXMovePointShapeAnimatorModuleSpec>
 @end
 
 @implementation RNMBXMovePointShapeAnimatorModule
 
 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 {
@@ -44,13 +33,10 @@ RCT_EXPORT_METHOD(moveTo:(nonnull NSNumber*)tag coordinate: (nonnull NSArray*)co
   [MovePointShapeAnimator moveToTag:tag coordinate:coordinate durationMs:durationMs resolve:resolve reject:reject];
 }
 
-// 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::NativeRNMBXPointAnnotationModuleSpecJSI>(params);
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 @end

package/ios/RNMBX/Utils/RNMBXFollyConvert.h

@@ -1,5 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #if __has_include(<react/utils/FollyConvert.h>)
   // static libs / header maps (no use_frameworks!)
   #import <react/utils/FollyConvert.h>
@@ -11,5 +9,3 @@
 #else
   #error "FollyConvert.h not found. Ensure React-utils & RCT-Folly pods are installed."
 #endif
-
-#endif

package/ios/RNMBX/Utils/RNMBXViewResolver.h

@@ -1,7 +1,7 @@
 //
 //  RNMBXViewResolver.h
 //
-//  A utility class for resolving React Native views across both old and new architecture
+//  A utility class for resolving React Native views.
 //  This eliminates code duplication found in multiple RNMBX modules.
 //
 
@@ -14,9 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol RNMBXViewResolverDelegate <NSObject>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 @property (nonatomic, weak, nullable) RCTViewRegistry *viewRegistry_DEPRECATED;
-#endif
 @property (nonatomic, weak, nullable) RCTBridge *bridge;
 
 @end

package/ios/RNMBX/Utils/RNMBXViewResolver.mm

@@ -1,7 +1,7 @@
 //
 //  RNMBXViewResolver.mm
 //
-//  Implementation of cross-architecture view resolver utility
+//  Implementation of view resolver utility
 //
 
 #import "RNMBXViewResolver.h"
@@ -36,7 +36,6 @@ static const int64_t DELAY_ON_FURTHER_ATTEMPTS = 200 * NSEC_PER_MSEC; // 200ms
         return;
     }
 
-#ifdef RCT_NEW_ARCH_ENABLED
     [delegate.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
         [self resolveViewWithPolling:viewRef
                             delegate:delegate
@@ -47,18 +46,6 @@ static const int64_t DELAY_ON_FURTHER_ATTEMPTS = 200 * NSEC_PER_MSEC; // 200ms
                          attemptCount:0
                            startTime:nil];
     }];
-#else
-    [delegate.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        [self resolveViewWithPolling:viewRef
-                            delegate:delegate
-                       expectedClass:expectedClass
-                               block:block
-                              reject:reject
-                          methodName:methodName
-                         attemptCount:0
-                           startTime:nil];
-    }];
-#endif
 }
 
 + (void)resolveViewWithPolling:(NSNumber *)viewRef
@@ -121,7 +108,6 @@ static const int64_t DELAY_ON_FURTHER_ATTEMPTS = 200 * NSEC_PER_MSEC; // 200ms
 #pragma mark - Private Methods
 
 + (UIView *)resolveView:(NSNumber *)viewRef delegate:(id<RNMBXViewResolverDelegate>)delegate {
-#ifdef RCT_NEW_ARCH_ENABLED
     if (delegate.viewRegistry_DEPRECATED) {
         UIView *componentView = [delegate.viewRegistry_DEPRECATED viewForReactTag:viewRef];
         if (componentView) {
@@ -135,11 +121,6 @@ static const int64_t DELAY_ON_FURTHER_ATTEMPTS = 200 * NSEC_PER_MSEC; // 200ms
     if (delegate.bridge) {
         return [delegate.bridge.uiManager viewForReactTag:viewRef];
     }
-#else
-    if (delegate.bridge) {
-        return [delegate.bridge.uiManager viewForReactTag:viewRef];
-    }
-#endif
 
     return nil;
 }

package/ios/RNMBX/codeparts/LayerPropsCommon.codepart-swift.ejs

@@ -1,7 +1,6 @@
   func setCommonOptions(_ layer: inout <%= layerType %>Layer) -> Bool {
     var changed = false
 <% if (layerType !== 'Sky') { %>
-    #if RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
       changed = true
@@ -24,7 +23,6 @@
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    #endif
 <% } %>
     return changed
   }

package/ios/RNMBX/rnmapbox_maps-Swift.pre.h

@@ -2,7 +2,6 @@
 #import <CoreLocation/CoreLocation.h>
 
 #import <React/RCTComponent.h>
-#import <React/RCTViewManager.h>
 
 @interface MapView : UIView
 @end

package/ios/install.md

@@ -25,9 +25,6 @@ Add the following to your `ios/Podfile`:
 
 <br>
 
-You will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
-
-
 Run `pod install` to download the proper mapbox dependency.
 
 ```sh

package/lib/commonjs/plugin/build/withMapbox.d.ts

@@ -6,6 +6,9 @@ export type MapboxPlugProps = {
      */
     RNMapboxMapsImpl?: 'mapbox';
     RNMapboxMapsVersion?: string;
+    /**
+     * @deprecated Download token is no longer required by Mapbox. Do not set this.
+     */
     RNMapboxMapsDownloadToken?: string;
     RNMapboxMapsUseV11?: boolean;
 };