@maplibre/maplibre-react-native 11.3.4 → 11.3.6

package/android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNMapView.kt

@@ -280,7 +280,7 @@ open class MLRNMapView(
     }
 
     fun removeFeature(childPosition: Int) {
-        val child = children()[childPosition]
+        val child = children().getOrNull(childPosition) ?: return
 
         when (child) {
             is MapChild.FeatureChild -> {
@@ -313,7 +313,7 @@ open class MLRNMapView(
 
     val featureCount: Int get() = children().size
 
-    fun getFeatureAt(i: Int): MapChild = children()[i]
+    fun getFeatureAt(i: Int): MapChild? = children().getOrNull(i)
 
     @Synchronized
     fun dispose() {

package/android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNMapViewManager.kt

@@ -60,7 +60,7 @@ open class MLRNMapViewManager(
     override fun getChildAt(
         parent: MLRNMapView,
         index: Int,
-    ): View? = parent.getFeatureAt(index).toView()
+    ): View? = parent.getFeatureAt(index)?.toView()
 
     override fun removeViewAt(
         parent: MLRNMapView,

package/ios/components/images/MLRNImageQueueOperation.m

@@ -49,6 +49,10 @@ typedef NS_ENUM(NSInteger, MLRNImageQueueOperationState) {
   }
 }
 
+- (BOOL)isAsynchronous {
+  return YES;
+}
+
 - (void)setCancellationBlock:(dispatch_block_t)block {
   _cancellationBlock = block;
 }
@@ -100,12 +104,22 @@ typedef NS_ENUM(NSInteger, MLRNImageQueueOperationState) {
   if (self.state == IOState_CancelledDoNotExecute) {
     return;
   }
-  __weak MLRNImageQueueOperation *weakSelf = self;
+
+  MLRNImageQueueOperationState prevState = [self setState:IOState_Executing only:IOState_Initial];
+  if (prevState != IOState_Initial) {
+    return;
+  }
+
+  MLRNImageQueueOperation *strongSelf = self;
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    [weakSelf
-        setCancellationBlock:[weakSelf.imageLoader loadImageWithURLRequest:weakSelf.urlRequest
+    if (strongSelf.isCancelled) {
+      return;
+    }
+
+    [strongSelf
+        setCancellationBlock:[strongSelf.imageLoader loadImageWithURLRequest:strongSelf.urlRequest
                                  size:CGSizeZero
-                                 scale:weakSelf.scale
+                                 scale:strongSelf.scale
                                  clipped:YES
                                  resizeMode:RCTResizeModeStretch
                                  progressBlock:^(int64_t progress, int64_t total) {
@@ -115,16 +129,17 @@ typedef NS_ENUM(NSInteger, MLRNImageQueueOperationState) {
                                    // No-op
                                  }
                                  completionBlock:^void(NSError *error, UIImage *image) {
-                                   if (image && weakSelf.sdf) {
+                                   if (image && strongSelf.sdf) {
                                      image = [image
                                          imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
                                    }
-                                   weakSelf.completionHandler(error, image);
-                                   [weakSelf setState:IOState_Finished except:IOState_Finished];
+                                   if (strongSelf.completionHandler) {
+                                     strongSelf.completionHandler(error, image);
+                                   }
+                                   [strongSelf setState:IOState_Finished only:IOState_Executing];
                                  }]];
-    if ([weakSelf setState:IOState_Executing
-                      only:IOState_Initial] == IOState_CancelledDoNotExecute) {
-      [weakSelf callCancellationBlock];
+    if (strongSelf.isCancelled) {
+      [strongSelf callCancellationBlock];
     }
   });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "React Native library for creating maps with MapLibre Native for Android & iOS",
-  "version": "11.3.4",
+  "version": "11.3.6",
   "publishConfig": {
     "access": "public",
     "provenance": true