@maplibre/maplibre-react-native 11.0.0-beta.2 → 11.0.0-beta.21

package/ios/components/images/MLRNImageLoader.h

@@ -0,0 +1,27 @@
+#import <MapLibre/MapLibre.h>
+#import <React/RCTImageLoaderProtocol.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Singleton that exposes the image loader obtained from the TurboModule registry.
+ */
+@interface MLRNImageLoader : NSObject
+
++ (instancetype)sharedInstance;
+
+@property (nonatomic, strong, nullable) id<RCTImageLoaderProtocol> imageLoader;
+
++ (void)fetchImage:(NSString *)url
+             scale:(double)scale
+               sdf:(BOOL)sdf
+          callback:(RCTImageLoaderCompletionBlock)callback;
+
++ (void)fetchImages:(MLNStyle *)style
+            objects:(NSDictionary<NSString *, id> *)objects
+        forceUpdate:(BOOL)forceUpdate
+           callback:(void (^)(void))callback;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/components/images/MLRNImageLoader.m

@@ -0,0 +1,85 @@
+#import "MLRNImageLoader.h"
+#import "MLRNImageQueue.h"
+
+#import <React/RCTLog.h>
+
+@implementation MLRNImageLoader
+
++ (instancetype)sharedInstance {
+  static MLRNImageLoader *_instance = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    _instance = [[MLRNImageLoader alloc] init];
+  });
+  return _instance;
+}
+
++ (void)fetchImage:(NSString *)url
+             scale:(double)scale
+               sdf:(BOOL)sdf
+          callback:(RCTImageLoaderCompletionBlock)callback {
+  [MLRNImageQueue.sharedInstance addImage:url
+                                    scale:scale
+                                      sdf:sdf
+                              imageLoader:[MLRNImageLoader sharedInstance].imageLoader
+                        completionHandler:callback];
+}
+
++ (void)fetchImages:(MLNStyle *)style
+            objects:(NSDictionary<NSString *, id> *)objects
+        forceUpdate:(BOOL)forceUpdate
+           callback:(void (^)(void))callback {
+  if (objects == nil) {
+    callback();
+    return;
+  }
+
+  NSArray<NSString *> *imageNames = objects.allKeys;
+  if (imageNames.count == 0) {
+    callback();
+    return;
+  }
+
+  __block NSUInteger imagesLeftToLoad = imageNames.count;
+  __weak MLNStyle *weakStyle = style;
+
+  void (^imageLoadedBlock)(void) = ^{
+    imagesLeftToLoad--;
+
+    if (imagesLeftToLoad == 0) {
+      callback();
+    }
+  };
+
+  for (NSString *imageName in imageNames) {
+    UIImage *foundImage = forceUpdate ? nil : [style imageForName:imageName];
+
+    if (forceUpdate || foundImage == nil) {
+      NSDictionary *image = objects[imageName];
+      BOOL hasScale =
+          [image isKindOfClass:[NSDictionary class]] && ([image objectForKey:@"scale"] != nil);
+      BOOL hasSdf =
+          [image isKindOfClass:[NSDictionary class]] && ([image objectForKey:@"sdf"] != nil);
+      double scale = hasScale ? [[image objectForKey:@"scale"] doubleValue] : 1.0;
+      BOOL sdf = hasSdf ? [[image objectForKey:@"sdf"] boolValue] : NO;
+      [MLRNImageQueue.sharedInstance addImage:objects[imageName]
+                                        scale:scale
+                                          sdf:sdf
+                                  imageLoader:[MLRNImageLoader sharedInstance].imageLoader
+                            completionHandler:^(NSError *error, UIImage *img) {
+                              if (!img) {
+                                RCTLogWarn(@"Failed to fetch image: %@ error:%@", imageName, error);
+                              } else {
+                                dispatch_async(dispatch_get_main_queue(), ^{
+                                  [weakStyle setImage:img forName:imageName];
+                                  imageLoadedBlock();
+                                });
+                              }
+                            }];
+    } else {
+      imageLoadedBlock();
+    }
+  }
+}
+
+@end

package/ios/components/images/MLRNImageQueue.h

@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import <React/RCTImageLoader.h>
+#import <React/RCTImageLoaderProtocol.h>
 
 @interface MLRNImageQueue : NSObject
 
@@ -9,7 +9,7 @@
 - (void)addImage:(NSString *)imageURL
                 scale:(double)scale
                   sdf:(Boolean)sdf
-               bridge:(RCTBridge *)bridge
+          imageLoader:(id<RCTImageLoaderProtocol>)imageLoader
     completionHandler:(RCTImageLoaderCompletionBlock)handler;
 
 @end

package/ios/components/images/MLRNImageQueue.m

@@ -34,10 +34,10 @@
 - (void)addImage:(NSString *)imageURL
                 scale:(double)scale
                   sdf:(Boolean)sdf
-               bridge:(RCTBridge *)bridge
+          imageLoader:(id<RCTImageLoaderProtocol>)imageLoader
     completionHandler:(RCTImageLoaderCompletionBlock)handler {
   MLRNImageQueueOperation *operation = [[MLRNImageQueueOperation alloc] init];
-  operation.bridge = bridge;
+  operation.imageLoader = imageLoader;
   operation.urlRequest = [RCTConvert NSURLRequest:imageURL];
   operation.sdf = sdf;
   operation.completionHandler = handler;

package/ios/components/images/MLRNImageQueueOperation.h

@@ -1,8 +1,8 @@
-#import <React/RCTImageLoader.h>
+#import <React/RCTImageLoaderProtocol.h>
 
 @interface MLRNImageQueueOperation : NSBlockOperation
 
-@property (nonatomic, weak) RCTBridge *bridge;
+@property (nonatomic, weak) id<RCTImageLoaderProtocol> imageLoader;
 @property (nonatomic, copy) RCTImageLoaderCompletionBlock completionHandler;
 @property (nonatomic, copy) NSURLRequest *urlRequest;
 @property (nonatomic) Boolean sdf;

package/ios/components/images/MLRNImageQueueOperation.m

@@ -1,5 +1,7 @@
 #import "MLRNImageQueueOperation.h"
 
+#import <React/RCTImageLoader.h>
+
 typedef NS_ENUM(NSInteger, MLRNImageQueueOperationState) {
   IOState_Initial,
   IOState_CancelledDoNotExecute,
@@ -101,9 +103,7 @@ typedef NS_ENUM(NSInteger, MLRNImageQueueOperationState) {
   __weak MLRNImageQueueOperation *weakSelf = self;
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     [weakSelf
-        setCancellationBlock:[[weakSelf.bridge moduleForName:@"ImageLoader"
-                                       lazilyLoadIfNecessary:YES]
-                                 loadImageWithURLRequest:weakSelf.urlRequest
+        setCancellationBlock:[weakSelf.imageLoader loadImageWithURLRequest:weakSelf.urlRequest
                                  size:CGSizeZero
                                  scale:weakSelf.scale
                                  clipped:YES

package/ios/components/images/MLRNImages.h

@@ -1,4 +1,3 @@
-#import <React/RCTBridge.h>
 #import <React/RCTComponent.h>
 #import <UIKit/UIKit.h>
 
@@ -8,8 +7,6 @@
 
 @interface MLRNImages : UIView
 
-@property (nonatomic, weak) RCTBridge *bridge;
-
 @property (nonatomic, strong) MLRNMapView *_Nullable map;
 @property (nonatomic, strong, nonnull) NSMutableArray<id<RCTComponent>> *reactSubviews;
 

package/ios/components/images/MLRNImages.m

@@ -2,6 +2,7 @@
 #import <React/UIView+React.h>
 #import "MLRNEvent.h"
 #import "MLRNEventTypes.h"
+#import "MLRNImageLoader.h"
 #import "MLRNMapView.h"
 #import "MLRNUtils.h"
 
@@ -169,12 +170,11 @@ static UIImage *_placeHolderImage;
 
   if (missingImages.count > 0) {
     // forceUpdate to ensure the placeholder images are updated
-    [MLRNUtils fetchImages:_bridge
-                     style:self.map.style
-                   objects:missingImages
-               forceUpdate:true
-                  callback:^{
-                  }];
+    [MLRNImageLoader fetchImages:self.map.style
+                         objects:missingImages
+                     forceUpdate:true
+                        callback:^{
+                        }];
   }
 }
 

package/ios/components/images/MLRNImagesComponentView.mm

@@ -7,7 +7,6 @@
 
 #import "RCTFabricComponentsPlugins.h"
 
-#import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import "MLRNFollyConvert.h"
 #import "MLRNImages.h"
@@ -37,8 +36,6 @@ using namespace facebook::react;
 - (void)prepareView {
   _view = [[MLRNImages alloc] init];
 
-  _view.bridge = [RCTBridge currentBridge];
-
   // Capture weak self reference to prevent retain cycle
   __weak __typeof__(self) weakSelf = self;
 

package/ios/components/images/MLRNImagesModule.h

@@ -0,0 +1,6 @@
+#import <MapLibreReactNativeSpec/MapLibreReactNativeSpec.h>
+
+#import <React/RCTInitializing.h>
+
+@interface MLRNImagesModule : NSObject <NativeImagesModuleSpec, RCTInitializing>
+@end

package/ios/components/images/MLRNImagesModule.mm

@@ -0,0 +1,23 @@
+#import "MLRNImagesModule.h"
+#import "MLRNImageLoader.h"
+
+#import <MapLibreReactNativeSpec/MapLibreReactNativeSpec.h>
+
+@implementation MLRNImagesModule
+
+@synthesize moduleRegistry = _moduleRegistry;
+
++ (NSString *)moduleName {
+  return @"MLRNImagesModule";
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params {
+  return std::make_shared<facebook::react::NativeImagesModuleSpecJSI>(params);
+}
+
+- (void)initialize {
+  [MLRNImageLoader sharedInstance].imageLoader = [_moduleRegistry moduleForName:"ImageLoader"];
+}
+
+@end

package/ios/components/layer/MLRNLayer.h

@@ -1,4 +1,3 @@
-#import <React/RCTBridge.h>
 #import <UIKit/UIKit.h>
 
 @class MLRNMapView;
@@ -7,8 +6,6 @@
 
 @interface MLRNLayer : UIView
 
-@property (nonatomic, weak, nullable) RCTBridge *bridge;
-
 @property (nonatomic, strong, nullable) MLNStyleLayer *styleLayer;
 @property (nonatomic, strong, nullable) MLNStyle *style;
 @property (nonatomic, weak, nullable) MLRNMapView *map;

package/ios/components/layer/MLRNLayer.m

@@ -211,7 +211,6 @@
 
 - (void)addStyles {
   MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
-  style.bridge = self.bridge;
 
   BOOL (^isValid)(void) = ^{
     return [self isAddedToMap];

package/ios/components/layer/MLRNLayerComponentView.mm

@@ -8,7 +8,6 @@
 #import "RCTFabricComponentsPlugins.h"
 
 #import <MapLibre/MapLibre.h>
-#import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import "MLRNLayer.h"
 #import "MLRNPropConvert.h"
@@ -27,8 +26,6 @@ using namespace facebook::react;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const MLRNLayerProps>();
-    _props = defaultProps;
     [self prepareView];
   }
 
@@ -36,8 +33,10 @@ using namespace facebook::react;
 }
 
 - (void)prepareView {
+  static const auto defaultProps = std::make_shared<const MLRNLayerProps>();
+  _props = defaultProps;
+
   _view = [[MLRNLayer alloc] init];
-  _view.bridge = [RCTBridge currentBridge];
   self.contentView = _view;
 }
 
@@ -45,6 +44,11 @@ using namespace facebook::react;
   return _view;
 }
 
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  [self prepareView];
+}
+
 #pragma mark - RCTComponentViewProtocol
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -64,22 +68,19 @@ using namespace facebook::react;
   }
 
   if (oldViewProps.source != newViewProps.source) {
-    _view.sourceID = newViewProps.source.empty() ? nil : RCTNSStringFromString(newViewProps.source);
+    _view.sourceID = RCTNSStringFromStringNilIfEmpty(newViewProps.source);
   }
 
   if (oldViewProps.sourceLayer != newViewProps.sourceLayer) {
-    _view.sourceLayerID =
-        newViewProps.sourceLayer.empty() ? nil : RCTNSStringFromString(newViewProps.sourceLayer);
+    _view.sourceLayerID = RCTNSStringFromStringNilIfEmpty(newViewProps.sourceLayer);
   }
 
   if (oldViewProps.afterId != newViewProps.afterId) {
-    _view.aboveLayerID =
-        newViewProps.afterId.empty() ? nil : RCTNSStringFromString(newViewProps.afterId);
+    _view.aboveLayerID = RCTNSStringFromStringNilIfEmpty(newViewProps.afterId);
   }
 
   if (oldViewProps.beforeId != newViewProps.beforeId) {
-    _view.belowLayerID =
-        newViewProps.beforeId.empty() ? nil : RCTNSStringFromString(newViewProps.beforeId);
+    _view.belowLayerID = RCTNSStringFromStringNilIfEmpty(newViewProps.beforeId);
   }
 
   if (oldViewProps.layerIndex != newViewProps.layerIndex) {

package/ios/components/layer/style/MLRNStyle.h

@@ -1,7 +1,6 @@
 // DO NOT MODIFY
-// This file is auto-generated from scripts/templates/MLRNStyle.h.ejs
+// This file is auto-generated from scripts/src/templates/MLRNStyle.h.ejs
 
-#import <React/RCTBridge.h>
 #import "MLRNStyle.h"
 #import "MLRNStyleValue.h"
 
@@ -9,7 +8,6 @@
 
 @interface MLRNStyle : NSObject
 
-@property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, strong) MLNStyle *style;
 
 - (id)initWithMLNStyle:(MLNStyle *)mlnStyle;

package/ios/components/layer/style/MLRNStyle.m

@@ -1,7 +1,8 @@
 // DO NOT MODIFY
-// This file is auto-generated from scripts/templates/MLRNStyle.m.ejs
+// This file is auto-generated from scripts/src/templates/MLRNStyle.m.ejs
 
 #import "MLRNStyle.h"
+#import "MLRNImageLoader.h"
 #import "MLRNUtils.h"
 
 @implementation MLRNStyle
@@ -54,20 +55,19 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setFillPattern:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setFillPattern:layer withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"fillPatternTransition"]) {
       [self setFillPatternTransition:layer withReactStyleValue:styleValue];
@@ -139,20 +139,19 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setLinePattern:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setLinePattern:layer withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"linePatternTransition"]) {
       [self setLinePatternTransition:layer withReactStyleValue:styleValue];
@@ -204,20 +203,19 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setIconImage:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setIconImage:layer withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"iconRotate"]) {
       [self setIconRotate:layer withReactStyleValue:styleValue];
@@ -459,20 +457,20 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setFillExtrusionPattern:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setFillExtrusionPattern:layer
+                                             withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"fillExtrusionPatternTransition"]) {
       [self setFillExtrusionPatternTransition:layer withReactStyleValue:styleValue];
@@ -598,20 +596,19 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [MLRNUtils fetchImage:_bridge
-                          url:imageURI
-                        scale:[styleValue getImageScale]
-                          sdf:[styleValue getImageSdf]
-                     callback:^(NSError *error, UIImage *image) {
-                       if (image != nil) {
-                         dispatch_async(dispatch_get_main_queue(), ^{
-                           if (isValid()) {
-                             [self->_style setImage:image forName:imageURI];
-                             [self setBackgroundPattern:layer withReactStyleValue:styleValue];
-                           }
-                         });
-                       }
-                     }];
+        [MLRNImageLoader fetchImage:imageURI
+                              scale:[styleValue getImageScale]
+                                sdf:[styleValue getImageSdf]
+                           callback:^(NSError *error, UIImage *image) {
+                             if (image != nil) {
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 if (isValid()) {
+                                   [self->_style setImage:image forName:imageURI];
+                                   [self setBackgroundPattern:layer withReactStyleValue:styleValue];
+                                 }
+                               });
+                             }
+                           }];
       }
     } else if ([prop isEqualToString:@"backgroundPatternTransition"]) {
       [self setBackgroundPatternTransition:layer withReactStyleValue:styleValue];

package/ios/components/map-view/MLRNMapView.h

@@ -1,4 +1,5 @@
 #import <React/RCTComponent.h>
+#import <React/RCTInvalidating.h>
 
 #import <MapLibre/MapLibre.h>
 
@@ -57,10 +58,14 @@ typedef void (^StyleLoadedBlock)(MLNStyle *__nonnull style);
 @property (nonatomic, strong, nullable) NSDictionary<NSString *, NSNumber *> *reactCompassPosition;
 @property (nonatomic, assign) BOOL reactCompassHiddenFacingNorth;
 
+@property (nonatomic, assign) BOOL reactScaleBarEnabled;
+@property (nonatomic, strong, nullable) NSDictionary<NSString *, NSNumber *> *reactScaleBarPosition;
+
 @property (nonatomic, assign) MLNCoordinateBounds maxBounds;
 
 @property (nonatomic, assign) BOOL isUserInteraction;
 @property (nonatomic, assign) BOOL useNativeUserLocationAnnotationView;
+@property (nonatomic, assign) BOOL annotationSelected;
 
 @property (nonatomic, copy, nullable) RCTBubblingEventBlock reactOnPress;
 @property (nonatomic, copy, nullable) RCTBubblingEventBlock reactOnLongPress;