npm - @rnmapbox/maps - Versions diffs - 10.2.10 → 10.3.0-beta.0 - Mend

@rnmapbox/maps 10.2.10 → 10.3.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (337) hide show

package/ios/RNMBX/RNMBXMapViewModule.mm CHANGED Viewed

@@ -3,9 +3,7 @@
 #import <React/RCTUIManagerUtils.h>
 #import "RNMBXMapViewModule.h"
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXMapViewComponentView.h"
-#endif // RCT_NEW_ARCH_ENABLED
 #import "rnmapbox_maps-Swift.pre.h"
 #import "RNMBXViewResolver.h"
@@ -14,9 +12,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
@@ -41,20 +37,20 @@ RCT_EXPORT_MODULE();
 RCT_EXPORT_METHOD(takeSnap:(nonnull NSNumber*)viewRef writeToDisk:(BOOL)writeToDisk resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager takeSnap:view writeToDisk:writeToDisk resolver:resolve];
+        [view takeSnapWithWriteToDisk:writeToDisk resolver:resolve];
     } reject:reject methodName:@"takeSnap"];
 }
 RCT_EXPORT_METHOD(clearData:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager clearData:view resolver:resolve rejecter:reject];
+        [view clearDataWithResolver:resolve rejecter:reject];
     } reject:reject methodName:@"clearData"];
 }
 RCT_EXPORT_METHOD(getCenter:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager getCenter:view resolver:resolve rejecter:reject];
+        [view getCenterWithResolver:resolve rejecter:reject];
     } reject:reject methodName:@"getCenter"];
 }
@@ -64,97 +60,94 @@ RCT_EXPORT_METHOD(getCoordinateFromView:(nonnull NSNumber*)viewRef atPoint:(NSAr
         NSNumber* a = [atPoint objectAtIndex:0];
         NSNumber* b = [atPoint objectAtIndex:1];
-        [RNMBXMapViewManager getCoordinateFromView:view atPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject];
+        [view getCoordinateFromViewWithAtPoint:CGPointMake(a.floatValue, b.floatValue) resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getCoordinateFromView"];
 }
 RCT_EXPORT_METHOD(getPointInView:(nonnull NSNumber*)viewRef atCoordinate:(NSArray *)atCoordinate resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager getPointInView:view atCoordinate:atCoordinate resolver:resolve rejecter:reject];
+        [view getPointInViewWithAtCoordinate:atCoordinate resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getPointInView"];
 }
 RCT_EXPORT_METHOD(getVisibleBounds:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager getVisibleBounds:view resolver:resolve rejecter:reject];
+        [view getVisibleBoundsWithResolver:resolve rejecter:reject];
     } reject:reject methodName:@"getVisibleBounds"];
 }
 RCT_EXPORT_METHOD(getZoom:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager getZoom:view resolver:resolve rejecter:reject];
+        [view getZoomWithResolver:resolve rejecter:reject];
     } reject:reject methodName:@"getZoom"];
 }
 RCT_EXPORT_METHOD(queryRenderedFeaturesAtPoint:(nonnull NSNumber*)viewRef atPoint:(nonnull NSArray *)atPoint withFilter:(NSArray *)withFilter withLayerIDs:(NSArray *)withLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager queryRenderedFeaturesAtPoint:view atPoint:atPoint withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject];
+        [view queryRenderedFeaturesAtPointWithAtPoint:atPoint withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject];
     } reject:reject methodName:@"queryRenderedFeaturesAtPoint"];
 }
 RCT_EXPORT_METHOD(queryRenderedFeaturesInRect:(nonnull NSNumber*)viewRef withBBox:(NSArray *)withBBox withFilter:(NSArray *)withFilter withLayerIDs:(NSArray *)withLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager queryRenderedFeaturesInRect:view withBBox:withBBox withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject];
+        [view queryRenderedFeaturesInRectWithBBox:withBBox withFilter:withFilter withLayerIDs:withLayerIDs resolver:resolve rejecter:reject];
     } reject:reject methodName:@"queryRenderedFeaturesInRect"];
 }
 RCT_EXPORT_METHOD(queryTerrainElevation:(nonnull NSNumber*)viewRef coordinates:(NSArray *)coordinates resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager queryTerrainElevation:view coordinates:coordinates resolver:resolve rejecter:reject];
+        [view queryTerrainElevationWithCoordinates:coordinates resolver:resolve rejecter:reject];
     } reject:reject methodName:@"queryTerrainElevation"];
 }
 RCT_EXPORT_METHOD(setHandledMapChangedEvents:(nonnull NSNumber*)viewRef events:(NSArray *)events resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager setHandledMapChangedEvents:view events:events resolver:resolve rejecter:reject];
+        [view setHandledMapChangedEventsWithEvents:events resolver:resolve rejecter:reject];
     } reject:reject methodName:@"setHandledMapChangedEvents"];
 }
 RCT_EXPORT_METHOD(setSourceVisibility:(nonnull NSNumber*)viewRef visible:(BOOL)visible sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager setSourceVisibility:view visible:visible sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
+        [view setSourceVisibilityWithVisible:visible sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
     } reject:reject methodName:@"setSourceVisibility"];
 }
 RCT_EXPORT_METHOD(setFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId state:(nonnull NSDictionary<NSString*,id> *)state sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager setFeatureState:view featureId:featureId state:state sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
+        [view setFeatureStateWithFeatureId:featureId state:state sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
     } reject:reject methodName:@"setFeatureState"];
 }
 RCT_EXPORT_METHOD(getFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId sourceId:(nonnull NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager getFeatureState:view featureId:featureId sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
+        [view getFeatureStateWithFeatureId:featureId sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getFeatureState"];
 }
 RCT_EXPORT_METHOD(removeFeatureState:(nonnull NSNumber*)viewRef featureId:(nonnull NSString *)featureId stateKey:(NSString*)stateKey sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager removeFeatureState:view featureId:featureId stateKey:stateKey sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
+        [view removeFeatureStateWithFeatureId:featureId stateKey:stateKey sourceId:sourceId sourceLayerId:sourceLayerId resolver:resolve rejecter:reject];
     } reject:reject methodName:@"removeFeatureState"];
 }
 RCT_EXPORT_METHOD(querySourceFeatures:(nonnull NSNumber*)viewRef sourceId:(NSString*)sourceId withFilter:(NSArray<id>*)withFilter withSourceLayerIDs:(NSArray<NSString*>*)withSourceLayerIDs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager querySourceFeatures:view withSourceId:sourceId withFilter:withFilter withSourceLayerIds:withSourceLayerIDs resolver:resolve rejecter:reject];
+        [view querySourceFeaturesWithSourceId:sourceId withFilter:withFilter withSourceLayerIds:withSourceLayerIDs resolver:resolve rejecter:reject];
     } 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:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
     return std::make_shared<facebook::react::NativeMapViewModuleSpecJSI>(params);
 }
-#endif // RCT_NEW_ARCH_ENABLED
 @end

package/ios/RNMBX/RNMBXMarkerView.swift CHANGED Viewed

@@ -227,10 +227,8 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
       offsetY: offset.dy,
       selected: isSelected
     )
-    #if RNMBX_11
     options.allowOverlapWithPuck = allowOverlapWithPuck
     options.ignoreCameraPadding = true
-    #endif
     return options
   }

package/ios/RNMBX/RNMBXMarkerViewComponentView.h CHANGED Viewed

@@ -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/RNMBXMarkerViewComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXMarkerViewComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -126,4 +125,3 @@ Class<RCTComponentViewProtocol> RNMBXMarkerViewCls(void)
   return RNMBXMarkerViewComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXMarkerViewContentComponentView.h CHANGED Viewed

@@ -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/RNMBXMarkerViewContentComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXMarkerViewContentComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -51,4 +50,3 @@ Class<RCTComponentViewProtocol> RNMBXMarkerViewContentCls(void)
   return RNMBXMarkerViewContentComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModelLayer.swift CHANGED Viewed

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

package/ios/RNMBX/RNMBXModelLayerComponentView.h CHANGED Viewed

@@ -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/RNMBXModelLayerComponentView.mm CHANGED Viewed

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

package/ios/RNMBX/RNMBXModels.swift CHANGED Viewed

@@ -49,9 +49,7 @@ open class RNMBXModels : UIView, RNMBXMapComponent {
   public func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     modelIdToUrl.forEach { (id, _) in
-      #if RNMBX_11
       try? map._mapView?.mapboxMap.removeStyleModel(modelId: id)
-      #endif
     }
     return true
   }

package/ios/RNMBX/RNMBXModelsComponentView.h CHANGED Viewed

@@ -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/RNMBXModelsComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXModelsComponentView.h"
@@ -70,4 +69,3 @@ Class<RCTComponentViewProtocol> RNMBXModelsCls(void)
   return RNMBXModelsComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXModule.swift CHANGED Viewed

@@ -13,15 +13,9 @@ class RNMBXModule : NSObject {
   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
     }
   }
@@ -133,9 +127,8 @@ class RNMBXModule : NSObject {
   @objc func clearData(_ resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.main.async {
-      #if RNMBX_11
       MapboxMap.clearData { error in
         if let error = error {
           rejecter("error", error.localizedDescription, error)
@@ -143,15 +136,6 @@ class RNMBXModule : NSObject {
           resolver(nil)
         }
       }
-      #else
-      MapboxMap.clearData(for: ResourceOptions(accessToken: RNMBXModule.accessToken ?? "")) { error in
-        if let error = error {
-          rejecter("error", error.localizedDescription, error)
-        } else {
-          resolver(nil)
-        }
-      }
-      #endif
     }
   }
 }

package/ios/RNMBX/RNMBXNativeUserLocationComponentView.h CHANGED Viewed

@@ -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/RNMBXNativeUserLocationComponentView.mm CHANGED Viewed

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

package/ios/RNMBX/RNMBXPointAnnotationComponentView.h CHANGED Viewed

@@ -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/RNMBXPointAnnotationComponentView.mm CHANGED Viewed

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

package/ios/RNMBX/RNMBXPointAnnotationModule.h CHANGED Viewed

@@ -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 RNMBXPointAnnotationModule : NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXPointAnnotationModuleSpec, RNMBXViewResolverDelegate>
+@interface RNMBXPointAnnotationModule : NSObject <NativeRNMBXPointAnnotationModuleSpec, RNMBXViewResolverDelegate>
+@end
 #else
-<RCTBridgeModule, RNMBXViewResolverDelegate>
-#endif
+@interface RNMBXPointAnnotationModule : NSObject
 @end
+#endif

package/ios/RNMBX/RNMBXPointAnnotationModule.mm CHANGED Viewed

@@ -3,9 +3,7 @@
 #import <React/RCTUIManagerUtils.h>
 #import "RNMBXPointAnnotationModule.h"
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXPointAnnotationComponentView.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
@@ -46,13 +42,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::NativeRNMBXPointAnnotationModuleSpecJSI>(params);
 }
-#endif // RCT_NEW_ARCH_ENABLED
 @end

package/ios/RNMBX/RNMBXRasterArraySource.swift CHANGED Viewed

@@ -1,4 +1,3 @@
-#if RNMBX_11
 @_spi(Experimental) import MapboxMaps
 @objc
@@ -44,4 +43,3 @@ public class RNMBXRasterArraySource : RNMBXSource {
   }
 }
-#endif

package/ios/RNMBX/RNMBXRasterArraySourceComponentView.h CHANGED Viewed

@@ -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/RNMBXRasterArraySourceComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXRasterArraySourceComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -16,8 +15,6 @@ using namespace facebook::react;
 @interface RNMBXRasterArraySourceComponentView () <RCTRNMBXRasterArraySourceViewProtocol>
 @end
-#if RNMBX_11
 @implementation RNMBXRasterArraySourceComponentView {
     RNMBXRasterArraySource *_view;
 }
@@ -117,45 +114,9 @@ using namespace facebook::react;
 @end
-#else // !RNMBX_11
-// RasterArraySource is only available in Mapbox v11+
-// Provide a stub implementation for v10 builds
-@implementation RNMBXRasterArraySourceComponentView
-+ (void)load
-{
-  [super load];
-}
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNMBXRasterArraySourceProps>();
-    _props = defaultProps;
-  }
-  return self;
-}
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return concreteComponentDescriptorProvider<RNMBXRasterArraySourceComponentDescriptor>();
-}
-- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
-{
-  [super updateProps:props oldProps:oldProps];
-}
-@end
-#endif // RNMBX_11
 Class<RCTComponentViewProtocol> RNMBXRasterArraySourceCls(void)
 {
   return RNMBXRasterArraySourceComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterDemSource.swift CHANGED Viewed

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

package/ios/RNMBX/RNMBXRasterDemSourceComponentView.h CHANGED Viewed

@@ -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/RNMBXRasterDemSourceComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXRasterDemSourceComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -116,4 +115,3 @@ Class<RCTComponentViewProtocol> RNMBXRasterDemSourceCls(void)
   return RNMBXRasterDemSourceComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXRasterLayer.swift CHANGED Viewed

@@ -6,11 +6,7 @@ public class RNMBXRasterLayer: RNMBXLayer {
   override func makeLayer(style: Style) throws -> Layer {
     // let source : ImageSource = try self.sourceWithSourceID(in: style)
-    #if RNMBX_11
     var layer = LayerType(id: self.id!, source: sourceID!)
-    #else
-    var layer = LayerType(id: self.id!)
-    #endif
     layer.source = sourceID
     return layer
   }
@@ -19,7 +15,6 @@ public class RNMBXRasterLayer: RNMBXLayer {
   func setCommonOptions(_ layer: inout RasterLayer) -> Bool {
     var changed = false
-    #if RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
       changed = true
@@ -42,7 +37,6 @@ public class RNMBXRasterLayer: RNMBXLayer {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    #endif
     return changed
   }

package/ios/RNMBX/RNMBXRasterLayerComponentView.h CHANGED Viewed

@@ -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/RNMBXRasterLayerComponentView.mm CHANGED Viewed

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

package/ios/RNMBX/RNMBXRasterParticleLayer.swift CHANGED Viewed

@@ -1,4 +1,3 @@
-#if RNMBX_11
 @_spi(Experimental) import MapboxMaps
 @objc(RNMBXRasterParticleLayer)
@@ -15,7 +14,6 @@ public class RNMBXRasterParticleLayer: RNMBXLayer {
   func setCommonOptions(_ layer: inout RasterParticleLayer) -> Bool {
     var changed = false
-    #if RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
       changed = true
@@ -38,7 +36,6 @@ public class RNMBXRasterParticleLayer: RNMBXLayer {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    #endif
     return changed
   }
@@ -97,4 +94,3 @@ public class RNMBXRasterParticleLayer: RNMBXLayer {
     return LayerType.self
   }
 }
-#endif

package/ios/RNMBX/RNMBXRasterParticleLayerComponentView.h CHANGED Viewed

@@ -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