@rnmapbox/maps 10.2.10 → 10.3.0-beta.1

package/ios/RNMBX/RNMBXCustomLocationProvider.swift

@@ -42,10 +42,6 @@ public class RNMBXCustomLocationProvider: UIView, RNMBXMapAndMapViewComponent {
   }
 
   var customLocationProvider: CustomLocationProvider? = nil
-  #if RNMBX_11
-  #else
-  var defaultLocationProvider: LocationProvider?
-  #endif
 
   public func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
     self.map = map
@@ -70,7 +66,6 @@ public class RNMBXCustomLocationProvider: UIView, RNMBXMapAndMapViewComponent {
   // Uses default implementation from RNMBXMapComponentProtocol extension (returns false)
 }
 
-#if RNMBX_11
 // MARK: V11 location provider
 extension RNMBXCustomLocationProvider {
   func installCustomeLocationProviderIfNeeded(mapView: MapView) {
@@ -81,19 +76,16 @@ extension RNMBXCustomLocationProvider {
       if (!coordinate.isEmpty) {
         applyCoordinate()
       }
-      
+
       if let locationModule = RNMBXLocationModule.shared {
         locationModule.locationProvider = customLocationProvider
         locationModule.override(for: mapView.location)
-        //locationModule.locationProvider = customLocationProvider
-        // mapView.location.overrideLocationProvider(with: customLocationProvider!)
       }
-      
-      // customHeadingProvider = CustomHeadingProvider()
+
       mapView.location.override(locationProvider: customLocationProvider, headingProvider: customLocationProvider)
     }
   }
-  
+
   func removeCustomLocationProvider(mapView: MapView) {
     mapView.location.override(provider: AppleLocationProvider())
     if let locationModule = RNMBXLocationModule.shared {
@@ -101,62 +93,16 @@ extension RNMBXCustomLocationProvider {
     }
     customLocationProvider = nil
   }
-  
-  func updateCoordinate(latitude: Double, longitude: Double) {
-    customLocationProvider?.setLocation(latitude: NSNumber(floatLiteral: latitude), longitude: NSNumber(floatLiteral: longitude))
-  }
-  
-  func updateHeading(heading: Double) {
-    customLocationProvider?.setHeading(heading: NSNumber(floatLiteral: heading))
-  }
-}
-#else
-// MARK: V10 location provider
-extension RNMBXCustomLocationProvider {
-  func installCustomeLocationProviderIfNeeded(mapView: MapView) {
-    if (customLocationProvider == nil) {
-      if (defaultLocationProvider == nil) {
-        defaultLocationProvider = mapView.location.locationProvider
-      }
-      let customLocationProvider = CustomLocationProvider()
-      self.customLocationProvider = customLocationProvider
-      if let locationModule = RNMBXLocationModule.shared {
-        locationModule.locationProvider = customLocationProvider
-        locationModule.override(for: mapView.location)
-      } else {
-        Logger.error(TAG, "RNMBXLocationModule.shared is nil")
-        mapView.location.overrideLocationProvider(with: customLocationProvider)
-      }
-      
-    }
-  }
-  
-  func removeCustomLocationProvider(mapView: MapView) {
-    if let locationModule = RNMBXLocationModule.shared {
-      locationModule.resetLocationProvider()
-      locationModule.override(for: mapView.location)
-    } else if let provider = defaultLocationProvider {
-      mapView.location.overrideLocationProvider(with: provider)
-    }
-    customLocationProvider = nil
-  }
-  
-  func updareCoordinate(latitude: Double, longitude: Double) {
-    customLocationProvider?.setLocation(latitude: NSNumber(floatLiteral: latitude), longitude: NSNumber(floatLiteral: longitude))
-  }
-  
+
   func updateCoordinate(latitude: Double, longitude: Double) {
     customLocationProvider?.setLocation(latitude: NSNumber(floatLiteral: latitude), longitude: NSNumber(floatLiteral: longitude))
   }
-  
+
   func updateHeading(heading: Double) {
     customLocationProvider?.setHeading(heading: NSNumber(floatLiteral: heading))
   }
 }
-#endif
-
 
-#if RNMBX_11
 class CustomLocationProvider: LocationProvider & HeadingProvider {
   // MARK: LocationProvider
   private var observers: NSHashTable<AnyObject> = .weakObjects()
@@ -182,7 +128,7 @@ class CustomLocationProvider: LocationProvider & HeadingProvider {
       (observer as? LocationObserver)?.onLocationUpdateReceived(for: [self.location!])
     }
   }
-  
+
   // MARK: HeadingProvider
   var latestHeading: Heading?
   private let headingObservers: NSHashTable<AnyObject> = .weakObjects()
@@ -194,7 +140,7 @@ class CustomLocationProvider: LocationProvider & HeadingProvider {
   func remove(headingObserver: HeadingObserver) {
     headingObservers.remove(headingObserver)
   }
-    
+
   func setHeading(heading: NSNumber) {
     let latestHeading = Heading(direction: CLLocationDirection(truncating: heading), accuracy: CLLocationDirection(truncating: 1))
     self.latestHeading = latestHeading
@@ -203,80 +149,3 @@ class CustomLocationProvider: LocationProvider & HeadingProvider {
     }
   }
 }
-#else
-final public class CustomHeading: CLHeading {
-    private var _magneticHeading: CLLocationDirection = 0
-    
-    public override var trueHeading: CLLocationDirection {
-        get { -1 }
-    }
-    
-    public override var magneticHeading: CLLocationDirection {
-        get { _magneticHeading }
-        set { _magneticHeading = newValue }
-    }
-}
-
-class CustomLocationProvider: LocationProvider {
-    var locationProviderOptions: MapboxMaps.LocationOptions = .init()
-    
-    var authorizationStatus: CLAuthorizationStatus = .authorizedAlways
-    
-    var accuracyAuthorization: CLAccuracyAuthorization = .fullAccuracy
-    
-    var heading: CLHeading?
-    var location: CLLocation?
-    var updateLocation = false
-    var updateHeading = false
-    
-    var locationProviderDelegate: MapboxMaps.LocationProviderDelegate?
-    
-    func setDelegate(_ delegate: MapboxMaps.LocationProviderDelegate) {
-        locationProviderDelegate = delegate
-    }
-    
-    func setLocation(latitude: NSNumber, longitude: NSNumber) {
-        let lat = CLLocationDegrees(truncating: latitude)
-        let lon = CLLocationDegrees(truncating: longitude)
-        self.location = CLLocation(latitude: lat, longitude: lon)
-        if (updateLocation) {
-          locationProviderDelegate?.locationProvider(self, didUpdateLocations: [self.location!])
-        }
-    }
-    
-    func setHeading(heading: NSNumber) {
-        let latestHeading = CustomHeading()
-        latestHeading.magneticHeading = CLLocationDirection(truncating: heading)
-        self.heading = latestHeading
-        if (self.updateHeading) {
-          locationProviderDelegate?.locationProvider(self, didUpdateHeading: self.heading!)
-        }
-    }
-    
-    func requestAlwaysAuthorization() { }
-    
-    func requestWhenInUseAuthorization() { }
-    
-    func requestTemporaryFullAccuracyAuthorization(withPurposeKey purposeKey: String) { }
-    
-    func startUpdatingLocation() {
-        self.updateLocation = true
-    }
-    
-    func stopUpdatingLocation() {
-        self.updateLocation = false
-    }
-    
-    var headingOrientation: CLDeviceOrientation = .unknown
-    
-    func startUpdatingHeading() {
-        self.updateHeading = true
-    }
-    
-    func stopUpdatingHeading() {
-        self.updateHeading = false
-    }
-    
-    func dismissHeadingCalibrationDisplay() { }
-}
-#endif

package/ios/RNMBX/RNMBXCustomLocationProviderComponentView.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/RNMBXCustomLocationProviderComponentView.mm

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

package/ios/RNMBX/RNMBXFabricPropConvert.mm

@@ -1,5 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTBridge+Private.h>
@@ -156,5 +154,3 @@ NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn,
 NSArray<NSNumber*> * RNMBXPropConvert_Optional_NumberArray(const folly::dynamic &dyn, NSString* propertyName) {
   return RNMBXPropConvert_ID(dyn);
 }
-
-#endif

package/ios/RNMBX/RNMBXFillExtrusionLayer.swift

@@ -6,11 +6,7 @@ public class RNMBXFillExtrusionLayer: 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
@@ -24,7 +20,6 @@ public class RNMBXFillExtrusionLayer: RNMBXVectorLayer {
   func setCommonOptions(_ layer: inout FillExtrusionLayer) -> Bool {
     var changed = false
 
-    #if RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
       changed = true
@@ -47,7 +42,6 @@ public class RNMBXFillExtrusionLayer: RNMBXVectorLayer {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    #endif
 
     return changed
   }

package/ios/RNMBX/RNMBXFillExtrusionLayerComponentView.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/RNMBXFillExtrusionLayerComponentView.mm

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

package/ios/RNMBX/RNMBXFillLayer.swift

@@ -6,14 +6,10 @@ public class RNMBXFillLayer: RNMBXVectorLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     let _ : VectorSource = try self.layerWithSourceID(in: style)
-    #if RNMBX_11
     var layer: Layer = FillLayer(id: self.id!, source: sourceID!)
-    #else
-    var layer: Layer = FillLayer(id: self.id!)
-    #endif
-    
+
     setOptions(&layer)
-    
+
     return layer
   }
 
@@ -25,7 +21,6 @@ public class RNMBXFillLayer: RNMBXVectorLayer {
   func setCommonOptions(_ layer: inout FillLayer) -> Bool {
     var changed = false
 
-    #if RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
       changed = true
@@ -48,7 +43,6 @@ public class RNMBXFillLayer: RNMBXVectorLayer {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    #endif
 
     return changed
   }

package/ios/RNMBX/RNMBXFillLayerComponentView.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/RNMBXFillLayerComponentView.mm

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

package/ios/RNMBX/RNMBXHeatmapLayer.swift

@@ -6,13 +6,9 @@ public class RNMBXHeatmapLayer: RNMBXVectorLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     let _ : VectorSource = try self.layerWithSourceID(in: style)
-    #if RNMBX_11
     var layer: Layer = LayerType(id: self.id!, source: self.sourceID!)
-    #else
-    var layer: Layer = LayerType(id: self.id!)
-    #endif
     setOptions(&layer)
-    
+
     return layer
   }
 

package/ios/RNMBX/RNMBXHeatmapLayerComponentView.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/RNMBXHeatmapLayerComponentView.mm

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

package/ios/RNMBX/RNMBXHillshadeLayer.swift

@@ -0,0 +1,96 @@
+import MapboxMaps
+
+@objc(RNMBXHillshadeLayer)
+public class RNMBXHillshadeLayer: RNMBXLayer {
+  typealias LayerType = HillshadeLayer
+
+  override func makeLayer(style: Style) throws -> Layer {
+    var layer = LayerType(id: self.id!, source: sourceID!)
+    layer.source = sourceID
+    return layer
+  }
+
+// @{codepart-replace-start(LayerPropsCommon.codepart-swift.ejs,{layerType:"Hillshade"})}
+  func setCommonOptions(_ layer: inout HillshadeLayer) -> Bool {
+    var changed = false
+
+    if let sourceLayerID = sourceLayerID {
+      layer.sourceLayer = sourceLayerID
+      changed = true
+    }
+
+    if let sourceID = sourceID {
+      if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
+        layer.source = sourceID
+        changed = true
+      }
+    }
+
+    if let filter = filter, filter.count > 0 {
+      do {
+        let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        layer.filter = decodedExpression
+        changed = true
+      } catch {
+        Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
+      }
+    }
+
+    return changed
+  }
+
+  override func setOptions(_ layer: inout Layer) {
+    super.setOptions(&layer)
+    if var actualLayer = layer as? LayerType {
+      if self.setCommonOptions(&actualLayer) {
+        layer = actualLayer
+      }
+    } else {
+      Logger.log(level: .error, message: "Expected layer type to be Hillshade but was \(type(of: layer))")
+    }
+  }
+
+  override func apply(style : Style) throws {
+    try style.updateLayer(withId: id, type: LayerType.self) { (layer : inout HillshadeLayer) in
+      if self.styleLayer != nil {
+        self.setOptions(&self.styleLayer!)
+      }
+      if let styleLayer = self.styleLayer as? LayerType {
+        layer = styleLayer
+      }
+    }
+  }
+// @{codepart-replace-end}
+
+  override func addStyles() {
+    if let style : Style = self.style,
+       let reactStyle = reactStyle {
+      let styler =  RNMBXStyle(style: self.style!)
+      styler.bridge = self.bridge
+
+      if var styleLayer = self.styleLayer as? LayerType {
+        styler.hillshadeLayer(
+          layer: &styleLayer,
+          reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
+          applyUpdater:{ (updater) in logged("RNMBXHillshadeLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
+          isValid: { return self.isAddedToMap() }
+        )
+        self.styleLayer = styleLayer
+      } else {
+        fatalError("[xxx] layer is not hillshade layer?!!! \(optional: self.styleLayer)")
+      }
+    }
+  }
+
+  func isAddedToMap() -> Bool {
+    return true
+  }
+
+  override func layerType() -> Layer.Type {
+    return LayerType.self
+  }
+}

package/ios/RNMBX/RNMBXHillshadeLayerComponentView.h

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

package/ios/RNMBX/RNMBXHillshadeLayerComponentView.mm

@@ -0,0 +1,73 @@
+
+#import "RNMBXHillshadeLayerComponentView.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 RNMBXHillshadeLayerComponentView () <RCTRNMBXHillshadeLayerViewProtocol>
+@end
+
+@implementation RNMBXHillshadeLayerComponentView {
+    RNMBXHillshadeLayer *_view;
+}
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXHillshadeLayerProps>();
+    _props = defaultProps;
+      [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view =  [[RNMBXHillshadeLayer alloc] init];
+  _view.bridge = [RCTBridge currentBridge];
+  self.contentView = _view;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXHillshadeLayerComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &newProps = static_cast<const RNMBXHillshadeLayerProps &>(*props);
+  RNMBXSetCommonLayerProps(newProps, _view);
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+    [super prepareForRecycle];
+    [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXHillshadeLayerCls(void)
+{
+  return RNMBXHillshadeLayerComponentView.class;
+}

package/ios/RNMBX/RNMBXImageComponentView.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/RNMBXImageComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXImageComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -102,4 +101,3 @@ Class<RCTComponentViewProtocol> RNMBXImageCls(void)
   return RNMBXImageComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXImageModule.h

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

package/ios/RNMBX/RNMBXImageModule.mm

@@ -3,9 +3,7 @@
 #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"
 
@@ -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
@@ -47,13 +43,10 @@ RCT_EXPORT_METHOD(refresh:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveB
 }
 
 
-// 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/RNMBXImageSource.swift

@@ -35,11 +35,7 @@ public class RNMBXImageSource : RNMBXSource {
 
   override func makeSource() -> Source
   {
-    #if RNMBX_11
     var result = ImageSource(id: self.id)
-    #else
-    var result = ImageSource()
-    #endif
     if let url = url {
       result.url = url
     }

package/ios/RNMBX/RNMBXImageSourceComponentView.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