@rnmapbox/maps 10.1.44 → 10.1.45-rc.0

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt

@@ -51,6 +51,7 @@ class TileRegionPack(var name: String, var state: TileRegionPackState = TileRegi
 
         // stored in metadata for resume functionality
     var styleURI: String? = null
+    var tilesets: List<String> = emptyList()
     var bounds: Geometry? = null
     var zoomRange: ZoomRange? = null
 
@@ -79,10 +80,11 @@ class TileRegionPack(var name: String, var state: TileRegionPackState = TileRegi
         name: String,
         state: TileRegionPackState = TileRegionPackState.UNKNOWN,
         styleURI: String,
+        tilesets: List<String>,
         bounds: Geometry,
         zoomRange: ZoomRange,
         metadata: JSONObject
-    ) : this(name= name, state= state,progress= null, metadata= metadata) {
+    ) : this(name= name, state= state, progress= null, metadata= metadata) {
         val rnmeta = JSONObject()
         rnmeta.put("styleURI", styleURI)
         this.styleURI = styleURI
@@ -90,6 +92,8 @@ class TileRegionPack(var name: String, var state: TileRegionPackState = TileRegi
         this.bounds = bounds
         rnmeta.put("zoomRange", JSONArray(arrayOf(zoomRange.minZoom, zoomRange.maxZoom)))
         this.zoomRange = zoomRange
+        rnmeta.put("tilesets", JSONArray(tilesets))
+        this.tilesets = tilesets
         this.metadata.put(RNMapboxInfoMetadataKey, rnmeta);
     }
 }
@@ -143,9 +147,11 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
             val boundsFC = FeatureCollection.fromJson(boundsStr)
             val bounds = convertPointPairToBounds(boundsFC)
 
+            val tilesets = options.getArray("tilesets")?.toArrayList()?.map { it as String } ?: emptyList()
             val actPack = TileRegionPack(
                 name = id,
                 styleURI = options.getString("styleURL")!!,
+                tilesets = tilesets,
                 bounds = bounds,
                 zoomRange = ZoomRange(
                     minZoom = options.getInt("minZoom").toByte(),
@@ -280,30 +286,25 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
                 ?: return Result.failure(IllegalArgumentException("startLoading failed as there is no styleURI in pack"))
             val metadata = pack.metadata
                 ?: return Result.failure(IllegalArgumentException("startLoading failed as there is no metadata in pack"))
-
             val stylePackOptions = StylePackLoadOptions.Builder()
                 .glyphsRasterizationMode(GlyphsRasterizationMode.IDEOGRAPHS_RASTERIZED_LOCALLY)
                 .metadata(metadata.toMapboxValue())
                 .build()
-
-            val descriptorOptions = TilesetDescriptorOptions.Builder()
-                .styleURI(styleURI)
-                .minZoom(zoomRange.minZoom)
-                .maxZoom(zoomRange.maxZoom)
-                .stylePackOptions(stylePackOptions)
-                .pixelRatio(2.0f)
-                .build()
-            val tilesetDescriptor = offlineManager.createTilesetDescriptor(descriptorOptions)
-
+            val descriptors = getTilesetDescriptors(
+                offlineManager = offlineManager,
+                styleURI = styleURI,
+                minZoom = zoomRange.minZoom,
+                maxZoom = zoomRange.maxZoom,
+                stylePackOptions = stylePackOptions,
+                tilesets = pack.tilesets)
             val loadOptions = TileRegionLoadOptions.Builder()
                 .geometry(bounds)
-                .descriptors(arrayListOf(tilesetDescriptor))
+                .descriptors(descriptors)
                 .metadata(metadata.toMapboxValue())
                 .acceptExpired(true)
                 .networkRestriction(NetworkRestriction.NONE)
                 .averageBytesPerSecond(null)
                 .build()
-
             var lastProgress: TileRegionLoadProgress? = null
             val task = this.tileStore.loadTileRegion(
                 id, loadOptions,

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt

@@ -6,6 +6,10 @@ import com.mapbox.common.toValue
 import com.mapbox.maps.OfflineManager
 import com.mapbox.maps.OfflineRegionManager
 import com.mapbox.maps.ResourceOptions
+import com.mapbox.maps.StylePackLoadOptions
+import com.mapbox.maps.TilesetDescriptorOptions
+import com.mapbox.maps.TilesetDescriptorOptionsForTilesets
+import com.mapbox.common.TilesetDescriptor
 
 fun getOfflineRegionManager(getAccessToken: () -> String): OfflineRegionManager {
   return OfflineRegionManager(ResourceOptions.Builder().accessToken(getAccessToken()).build())
@@ -20,6 +24,28 @@ fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): Offli
   )
 }
 
+fun getTilesetDescriptors(offlineManager: OfflineManager, styleURI: String, minZoom: Byte, maxZoom: Byte, stylePackOptions: StylePackLoadOptions, tilesets: List<String>): ArrayList<TilesetDescriptor>{
+  val descriptorOptions = TilesetDescriptorOptions.Builder()
+    .styleURI(styleURI)
+    .minZoom(minZoom)
+    .maxZoom(maxZoom)
+    .stylePackOptions(stylePackOptions)
+    .pixelRatio(2.0f)
+    .build()
+  val descriptor = offlineManager.createTilesetDescriptor(descriptorOptions)
+  val descriptors = arrayListOf(descriptor)
+  if (tilesets.isNotEmpty()) {
+    val tilesetDescriptorOptions = TilesetDescriptorOptionsForTilesets.Builder()
+    .tilesets(tilesets)
+    .minZoom(minZoom)
+    .maxZoom(maxZoom)
+    .build()
+    val tilesetDescriptor = offlineManager.createTilesetDescriptor(tilesetDescriptorOptions)
+    descriptors.add(tilesetDescriptor)
+  }
+  return descriptors
+}
+
 fun TileStore.setAccessToken(token: String) {
   this.setOption(TileStoreOptions.MAPBOX_ACCESS_TOKEN, token.toValue());
-}
+}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt

@@ -4,13 +4,40 @@ import com.mapbox.common.MapboxOptions
 import com.mapbox.common.TileStore
 import com.mapbox.maps.OfflineManager
 import com.mapbox.maps.OfflineRegionManager
+import com.mapbox.maps.StylePackLoadOptions
+import com.mapbox.maps.TilesetDescriptorOptions
+import com.mapbox.common.TilesetDescriptor
 
 fun getOfflineRegionManager(getAccessToken: () -> String): OfflineRegionManager {
   return OfflineRegionManager()
 }
+
 fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): OfflineManager {
   return OfflineManager()
 }
+
+fun getTilesetDescriptors(offlineManager: OfflineManager, styleURI: String, minZoom: Byte, maxZoom: Byte, stylePackOptions: StylePackLoadOptions, tilesets: List<String>): ArrayList<TilesetDescriptor>{
+  val descriptorOptions = TilesetDescriptorOptions.Builder()
+    .styleURI(styleURI)
+    .minZoom(minZoom)
+    .maxZoom(maxZoom)
+    .stylePackOptions(stylePackOptions)
+    .pixelRatio(2.0f)
+    .build()
+  val descriptor = offlineManager.createTilesetDescriptor(descriptorOptions)
+  val descriptors = arrayListOf(descriptor)
+  if (tilesets.isNotEmpty()) {
+    val tilesetDescriptorOptions = TilesetDescriptorOptions.Builder().styleURI(styleURI)
+    .tilesets(tilesets)
+    .minZoom(minZoom)
+    .maxZoom(maxZoom)
+    .build()
+    val tilesetDescriptor = offlineManager.createTilesetDescriptor(tilesetDescriptorOptions)
+    descriptors.add(tilesetDescriptor)
+  }
+  return descriptors
+}
+
 fun TileStore.setAccessToken(token: String) {
   MapboxOptions.accessToken = token
-}
+}

package/ios/RNMBX/Offline/RNMBXOfflineModule.swift

@@ -11,8 +11,6 @@ extension Date {
   }
 }
 
-
-
 @objc(RNMBXOfflineModule)
 class RNMBXOfflineModule: RCTEventEmitter {
   var hasListeners = false
@@ -60,6 +58,9 @@ class RNMBXOfflineModule: RCTEventEmitter {
       self.state = state
 
       if let rnMetadata = metadata[RNMapboxInfoMetadataKey] as? [String:Any] {
+        if let tilesets = rnMetadata["tilesets"] as? [String] {
+          self.tilesets = tilesets
+        }
         if let styleURI = rnMetadata["styleURI"] as? String {
           self.styleURI = StyleURI(rawValue: styleURI)
         }
@@ -82,20 +83,22 @@ class RNMBXOfflineModule: RCTEventEmitter {
          state: State = .unknown,
          styleURI: StyleURI,
          bounds: Geometry,
+         tilesets: [String],
          zoomRange: ClosedRange<UInt8>,
          metadata: [String:Any]) {
       self.name = name
       self.progress = nil
-      self.cancelable = nil
+      self.cancelables = []
       self.state = state
-      
       self.styleURI = styleURI
       self.bounds = bounds
       self.zoomRange = zoomRange
+      self.tilesets = tilesets
       
       var metadata = metadata
       metadata[RNMapboxInfoMetadataKey] = [
         "styleURI": styleURI.rawValue,
+        "tilesets": logged("RNMBXOfflineModule.TileRegionPack: cannot encode tilesets") { try JSONSerialization.jsonObject(with: try! JSONEncoder().encode(tilesets)) },
         "bounds": logged("RNMBXOfflineModule.TileRegionPack: cannot encode bounds") { try JSONSerialization.jsonObject(with: try! JSONEncoder().encode(bounds)) },
         "zoomRange": logged("RNMBXOfflineModule.TileRegionPack: cannot encode zoomRange") { try JSONSerialization.jsonObject(with: try! JSONEncoder().encode(zoomRange))}
       ]
@@ -103,12 +106,13 @@ class RNMBXOfflineModule: RCTEventEmitter {
     }
 
     var name: String
-    var cancelable: Cancelable? = nil
+    var cancelables: [Cancelable] = []
     var progress : TileRegionLoadProgress? = nil
     var state : State = .inactive
     var metadata : [String:Any]
 
     // Stored in metadata for resume functionality:
+    var tilesets : [String] = []
     var bounds: Geometry? = nil
     var zoomRange: ClosedRange<UInt8>? = nil
     var styleURI: StyleURI? = nil
@@ -177,9 +181,11 @@ class RNMBXOfflineModule: RCTEventEmitter {
           name: id,
           styleURI: StyleURI(rawValue: options["styleURL"] as! String)!,
           bounds: bounds,
+          tilesets: options["tilesets"] as? [String] ?? [],
           zoomRange: (options["minZoom"] as! NSNumber).uint8Value...(options["maxZoom"] as! NSNumber).uint8Value,
           metadata: metadata
         )
+
         self.tileRegionPacks[id] = actPack
         self.startLoading(pack: actPack)
         
@@ -242,13 +248,8 @@ class RNMBXOfflineModule: RCTEventEmitter {
   func pausePackDownload(_ name: String, resolver: RCTPromiseResolveBlock, rejecter: RCTPromiseRejectBlock)
   {
     if let pack = tileRegionPacks[name] {
-      if let cancelable = pack.cancelable {
-        cancelable.cancel()
-        tileRegionPacks[name]?.cancelable = nil
-        resolver(nil)
-      } else {
-        rejecter("pausePackDownload", "Offline pack: \(name) already cancelled", nil)
-      }
+      pack.cancelables.forEach { $0.cancel() }
+      resolver(nil)
     } else {
       rejecter("pausePackDownload", "Unknown offline region: \(name)", nil)
     }
@@ -343,6 +344,8 @@ class RNMBXOfflineModule: RCTEventEmitter {
   func startLoading(pack: TileRegionPack) {
     let id = pack.name
     let metadata = pack.metadata
+    let taskGroup = DispatchGroup()
+
     guard let bounds = pack.bounds else {
       RNMBXLogError("RNMBXOfflineModule.startLoading failed as there are no bounds in pack")
       return
@@ -355,34 +358,65 @@ class RNMBXOfflineModule: RCTEventEmitter {
       RNMBXLogError("RNMBXOfflineModule.startLoading failed as there is no styleURI in pack")
       return
     }
+      
+    var downloadError = false
     
-    let stylePackLoadOptions = StylePackLoadOptions(glyphsRasterizationMode: .ideographsRasterizedLocally, metadata: pack.metadata)
+    let stylePackLoadOptions = StylePackLoadOptions(glyphsRasterizationMode: .ideographsRasterizedLocally, metadata: pack.metadata)!
     
     #if RNMBX_11
+    let threadedOfflineManager = OfflineManager()
+    taskGroup.enter()
+    let stylePackTask = threadedOfflineManager.loadStylePack(for: styleURI, loadOptions: stylePackLoadOptions) { progress in
+      self.tileRegionPacks[id]!.state = .active
+    } completion: { result in
+      DispatchQueue.main.async {
+        defer {
+          taskGroup.leave()
+        }
+
+        switch result {
+        case let .success(stylePack): break
+        case let .failure(error):
+          Logger.log(level: .warn,
+                     message: "RNMBXOfflineModule: startLoading: error loading style pack: " + error.localizedDescription)
+          downloadError = true
+          self.offlinePackDidReceiveError(name: id, error: error)
+        }
+      }
+    }
     let descriptorOptions = TilesetDescriptorOptions(
       styleURI: styleURI,
       zoomRange: zoomRange,
-      tilesets: [], // RNMBX_11_TODO
-      stylePackOptions: stylePackLoadOptions
+      tilesets: pack.tilesets
     )
+    let tilesetDescriptor = threadedOfflineManager.createTilesetDescriptor(for: descriptorOptions)
+    let descriptors = [tilesetDescriptor]
     #else
     let descriptorOptions = TilesetDescriptorOptions(
       styleURI: styleURI,
       zoomRange: zoomRange,
       stylePackOptions: stylePackLoadOptions
     )
+    let descriptor = self.offlineManager.createTilesetDescriptor(for: descriptorOptions)
+    let tilesetDescriptorOptions = TilesetDescriptorOptionsForTilesets(tilesets: pack.tilesets, zoomRange: zoomRange)
+    let tilesetDescriptor = self.offlineManager.createTilesetDescriptorForTilesetDescriptorOptions(tilesetDescriptorOptions)
+    var descriptors = [descriptor]
+    if (!pack.tilesets.isEmpty) {
+      descriptors.append(tilesetDescriptor)
+    }
     #endif
-    let tilesetDescriptor = self.offlineManager.createTilesetDescriptor(for: descriptorOptions)
     
     let loadOptions = TileRegionLoadOptions(
       geometry: bounds, // RNMBXFeatureUtils.geometryToGeometry(bounds),
-      descriptors: [tilesetDescriptor],
+      descriptors: descriptors,
       metadata: metadata,
       acceptExpired: true,
       networkRestriction: .none,
       averageBytesPerSecond: nil)
     
     var lastProgress : TileRegionLoadProgress? = nil
+    
+    taskGroup.enter()
     let task = self.tileStore.loadTileRegion(forId: id, loadOptions: loadOptions!, progress: {
       progress in
       lastProgress = progress
@@ -390,25 +424,39 @@ class RNMBXOfflineModule: RCTEventEmitter {
       self.tileRegionPacks[id]!.state = .active
       self.offlinePackProgressDidChange(progress: progress, metadata: metadata, state: .active)
     }) { result in
-      switch result {
-      case .success(let _):
-        DispatchQueue.main.async {
-          if let progess = lastProgress {
-            self.offlinePackProgressDidChange(progress: progess, metadata: metadata, state: .complete)
-          } else {
-            Logger.log(level: .warn,
-                       message: "RNMBXOfflineModule: startLoading: tile region completed, but got no progress information")
-          }
-          self.tileRegionPacks[id]!.state = .complete
-        }
-      case .failure(let error):
         DispatchQueue.main.async {
-          self.tileRegionPacks[id]!.state = .inactive
-          self.offlinePackDidReceiveError(name: id, error: error)
+            defer {
+                taskGroup.leave()
+            }
+            switch result {
+            case .success(let _):
+                if let progess = lastProgress {
+                    self.offlinePackProgressDidChange(progress: progess, metadata: metadata, state: .complete)
+                } else {
+                    Logger.log(level: .warn,
+                               message: "RNMBXOfflineModule: startLoading: tile region completed, but got no progress information")
+                }
+                self.tileRegionPacks[id]!.state = .complete
+            case .failure(let error):
+                Logger.log(level: .warn,
+                           message: "RNMBXOfflineModule: startLoading: error loading tile region: " + error.localizedDescription)
+                
+                self.tileRegionPacks[id]!.state = .inactive
+                self.offlinePackDidReceiveError(name: id, error: error)
+            }
         }
-      }
     }
-    self.tileRegionPacks[id]!.cancelable = task
+
+    taskGroup.notify(queue: .main) {
+      self.tileRegionPacks[id]!.cancelables = []
+      self.tileRegionPacks[id]!.state = downloadError ? .inactive : .complete
+    }
+
+    #if RNMBX_11
+    self.tileRegionPacks[id]!.cancelables = [task, stylePackTask]
+    #else
+    self.tileRegionPacks[id]!.cancelables = [task]
+    #endif
   }
   
   func convertRegionsToJSON(regions: [TileRegion], resolve: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {

package/ios/RNMBX/RNMBXEvent.swift

@@ -11,7 +11,7 @@ class RNMBXEvent : NSObject, RNMBXEventProtocol {
     func toJSON() -> [String: Any?]
     {
         if let payload = payload {
-            return ["type": type, "payload": payload];
+            return ["type": type, "payload": payload, "payloadRenamed": payload];
         } else {
             return ["type": type]
         }

package/ios/RNMBX/RNMBXImagesComponentView.mm

@@ -47,15 +47,15 @@ using namespace facebook::react;
 
       // capture weak self reference to prevent retain cycle
       __weak __typeof__(self) weakSelf = self;
-      
+
       [_view setOnImageMissing:^(NSDictionary* event) {
           __typeof__(self) strongSelf = weakSelf;
 
           if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
               std::string type = [event valueForKey:@"type"] == nil ? "" : std::string([[event valueForKey:@"type"] UTF8String]);
               std::string imageKey =  (![[event valueForKey:@"payload"] isKindOfClass:[NSDictionary class]] || ![[[event valueForKey:@"payload"] valueForKey:@"imageKey"] isKindOfClass:[NSString class]]) ? "" : std::string([((NSDictionary *)event[@"payload"])[@"imageKey"] UTF8String]);
-              facebook::react::RNMBXImagesEventEmitter::OnImageMissingPayload payload = {.imageKey = imageKey};
-              std::dynamic_pointer_cast<const facebook::react::RNMBXImagesEventEmitter>(strongSelf->_eventEmitter)->onImageMissing({type, payload});
+              facebook::react::RNMBXImagesEventEmitter::OnImageMissingPayloadRenamed payloadRenamed = {.imageKey = imageKey};
+              std::dynamic_pointer_cast<const facebook::react::RNMBXImagesEventEmitter>(strongSelf->_eventEmitter)->onImageMissing({type, payloadRenamed});
             }
       }];
     self.contentView = _view;

package/lib/commonjs/components/Images.js

@@ -80,7 +80,14 @@ class Images extends _react.default.PureComponent {
   }
   _onImageMissing(event) {
     if (this.props.onImageMissing) {
-      this.props.onImageMissing(event.nativeEvent.payload?.imageKey);
+      let {
+        payload
+      } = event.nativeEvent;
+      if (!payload) {
+        // @ts-expect-error payload renamed to avoid conflict in codegen with RN
+        payload = event.nativeEvent.payloadRenamed;
+      }
+      this.props.onImageMissing(payload?.imageKey);
     }
   }
   render() {

package/lib/commonjs/components/Images.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_RNMBXImagesNativeComponent","_ShapeSource","_Image","_jsxRuntime","e","__esModule","default","NATIVE_MODULE_NAME","exports","_isUrlOrPath","value","String","startsWith","isImageSourcePropType","Number","valueAsSource","uri","isChildAnImage","child","React","isValidElement","type","Image","Images","PureComponent","NATIVE_ASSETS_KEY","_getImages","props","images","nativeAssetImages","nativeImages","imageNames","Object","keys","imageName","ShapeSource","Array","isArray","console","error","res","RNImage","resolveAssetSource","imageEntry","image","resolvedImage","children","childrenWithWrongType","Children","toArray","find","_onImageMissing","event","onImageMissing","nativeEvent","payload","imageKey","render","hasOnImageMissing","bind","jsx","_default"],"sourceRoot":"../../../src","sources":["components/Images.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_RNMBXImagesNativeComponent","_ShapeSource","_Image","_jsxRuntime","e","__esModule","default","NATIVE_MODULE_NAME","exports","_isUrlOrPath","value","String","startsWith","isImageSourcePropType","Number","valueAsSource","uri","isChildAnImage","child","React","isValidElement","type","Image","Images","PureComponent","NATIVE_ASSETS_KEY","_getImages","props","images","nativeAssetImages","nativeImages","imageNames","Object","keys","imageName","ShapeSource","Array","isArray","console","error","res","RNImage","resolveAssetSource","imageEntry","image","resolvedImage","children","childrenWithWrongType","Children","toArray","find","_onImageMissing","event","onImageMissing","payload","nativeEvent","payloadRenamed","imageKey","render","hasOnImageMissing","bind","jsx","_default"],"sourceRoot":"../../../src","sources":["components/Images.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/modules/offline/OfflineCreatePackOptions.js

@@ -15,6 +15,7 @@ class OfflineCreatePackOptions {
     this.minZoom = options.minZoom;
     this.maxZoom = options.maxZoom;
     this.metadata = this._makeMetadata(options.metadata);
+    this.tilesets = options.tilesets;
   }
   _assert(options) {
     if (!options.styleURL) {

package/lib/commonjs/modules/offline/OfflineCreatePackOptions.js.map

@@ -1 +1 @@
-{"version":3,"names":["_geoUtils","require","_utils","OfflineCreatePackOptions","constructor","options","_assert","name","styleURL","bounds","_makeLatLngBounds","minZoom","maxZoom","metadata","_makeMetadata","Error","ne","sw","toJSONString","makeLatLngBounds","JSON","stringify","_default","exports","default"],"sourceRoot":"../../../../src","sources":["modules/offline/OfflineCreatePackOptions.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAWA,MAAME,wBAAwB,CAAC;EAQ7BC,WAAWA,CAACC,OAAqC,EAAE;IACjD,IAAI,CAACC,OAAO,CAACD,OAAO,CAAC;IAErB,IAAI,CAACE,IAAI,GAAGF,OAAO,CAACE,IAAI;IACxB,IAAI,CAACC,QAAQ,GAAGH,OAAO,CAACG,QAAQ;IAChC,IAAI,CAACC,MAAM,GAAG,IAAI,CAACC,iBAAiB,CAACL,OAAO,CAACI,MAAM,CAAC;IACpD,IAAI,CAACE,OAAO,GAAGN,OAAO,CAACM,OAAO;IAC9B,IAAI,CAACC,OAAO,GAAGP,OAAO,CAACO,OAAO;IAC9B,IAAI,CAACC,QAAQ,GAAG,IAAI,CAACC,aAAa,CAACT,OAAO,CAACQ,QAAQ,CAAC;EACtD;EAEAP,OAAOA,CAACD,OAAqC,EAAE;IAC7C,IAAI,CAACA,OAAO,CAACG,QAAQ,EAAE;MACrB,MAAM,IAAIO,KAAK,CACb,yDACF,CAAC;IACH;IAEA,IAAI,CAACV,OAAO,CAACE,IAAI,EAAE;MACjB,MAAM,IAAIQ,KAAK,CAAC,oDAAoD,CAAC;IACvE;IAEA,IAAI,CAACV,OAAO,CAACI,MAAM,EAAE;MACnB,MAAM,IAAIM,KAAK,CAAC,sDAAsD,CAAC;IACzE;EACF;EAEAL,iBAAiBA,CAACD,MAA4C,EAAU;IACtE,MAAM,CAACO,EAAE,EAAEC,EAAE,CAAC,GAAGR,MAAM;IACvB,OAAO,IAAAS,mBAAY,EAAC,IAAAC,0BAAgB,EAACH,EAAE,EAAEC,EAAE,CAAC,CAAC;EAC/C;EAEAH,aAAaA,CAACD,QAA6C,EAAE;IAC3D,OAAOO,IAAI,CAACC,SAAS,CAAC;MACpB,GAAGR,QAAQ;MACXN,IAAI,EAAE,IAAI,CAACA;IACb,CAAC,CAAC;EACJ;AACF;AAAC,IAAAe,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEcrB,wBAAwB","ignoreList":[]}
+{"version":3,"names":["_geoUtils","require","_utils","OfflineCreatePackOptions","constructor","options","_assert","name","styleURL","bounds","_makeLatLngBounds","minZoom","maxZoom","metadata","_makeMetadata","tilesets","Error","ne","sw","toJSONString","makeLatLngBounds","JSON","stringify","_default","exports","default"],"sourceRoot":"../../../../src","sources":["modules/offline/OfflineCreatePackOptions.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAYA,MAAME,wBAAwB,CAAC;EAS7BC,WAAWA,CAACC,OAAqC,EAAE;IACjD,IAAI,CAACC,OAAO,CAACD,OAAO,CAAC;IAErB,IAAI,CAACE,IAAI,GAAGF,OAAO,CAACE,IAAI;IACxB,IAAI,CAACC,QAAQ,GAAGH,OAAO,CAACG,QAAQ;IAChC,IAAI,CAACC,MAAM,GAAG,IAAI,CAACC,iBAAiB,CAACL,OAAO,CAACI,MAAM,CAAC;IACpD,IAAI,CAACE,OAAO,GAAGN,OAAO,CAACM,OAAO;IAC9B,IAAI,CAACC,OAAO,GAAGP,OAAO,CAACO,OAAO;IAC9B,IAAI,CAACC,QAAQ,GAAG,IAAI,CAACC,aAAa,CAACT,OAAO,CAACQ,QAAQ,CAAC;IACpD,IAAI,CAACE,QAAQ,GAAGV,OAAO,CAACU,QAAQ;EAClC;EAEAT,OAAOA,CAACD,OAAqC,EAAE;IAC7C,IAAI,CAACA,OAAO,CAACG,QAAQ,EAAE;MACrB,MAAM,IAAIQ,KAAK,CACb,yDACF,CAAC;IACH;IAEA,IAAI,CAACX,OAAO,CAACE,IAAI,EAAE;MACjB,MAAM,IAAIS,KAAK,CAAC,oDAAoD,CAAC;IACvE;IAEA,IAAI,CAACX,OAAO,CAACI,MAAM,EAAE;MACnB,MAAM,IAAIO,KAAK,CAAC,sDAAsD,CAAC;IACzE;EACF;EAEAN,iBAAiBA,CAACD,MAA4C,EAAU;IACtE,MAAM,CAACQ,EAAE,EAAEC,EAAE,CAAC,GAAGT,MAAM;IACvB,OAAO,IAAAU,mBAAY,EAAC,IAAAC,0BAAgB,EAACH,EAAE,EAAEC,EAAE,CAAC,CAAC;EAC/C;EAEAJ,aAAaA,CAACD,QAA6C,EAAE;IAC3D,OAAOQ,IAAI,CAACC,SAAS,CAAC;MACpB,GAAGT,QAAQ;MACXN,IAAI,EAAE,IAAI,CAACA;IACb,CAAC,CAAC;EACJ;AACF;AAAC,IAAAgB,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEctB,wBAAwB","ignoreList":[]}

package/lib/commonjs/specs/RNMBXImagesNativeComponent.ts

@@ -4,7 +4,10 @@ import type { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTyp
 
 import type { UnsafeMixed } from './codegenUtils';
 
-type OnImageMissingEventType = { type: string; payload: { imageKey: string } };
+type OnImageMissingEventType = {
+  type: string;
+  payloadRenamed: { imageKey: string };
+};
 
 export interface NativeProps extends ViewProps {
   images: UnsafeMixed<any>;

package/lib/module/components/Images.js

@@ -75,7 +75,14 @@ class Images extends React.PureComponent {
   }
   _onImageMissing(event) {
     if (this.props.onImageMissing) {
-      this.props.onImageMissing(event.nativeEvent.payload?.imageKey);
+      let {
+        payload
+      } = event.nativeEvent;
+      if (!payload) {
+        // @ts-expect-error payload renamed to avoid conflict in codegen with RN
+        payload = event.nativeEvent.payloadRenamed;
+      }
+      this.props.onImageMissing(payload?.imageKey);
     }
   }
   render() {

package/lib/module/components/Images.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Image","RNImage","RNMBXImagesNativeComponent","ShapeSource","jsx","_jsx","NATIVE_MODULE_NAME","_isUrlOrPath","value","String","startsWith","isImageSourcePropType","Number","valueAsSource","uri","isChildAnImage","child","isValidElement","type","Images","PureComponent","NATIVE_ASSETS_KEY","_getImages","props","images","nativeAssetImages","nativeImages","imageNames","Object","keys","imageName","Array","isArray","console","error","res","resolveAssetSource","imageEntry","image","resolvedImage","children","childrenWithWrongType","Children","toArray","find","_onImageMissing","event","onImageMissing","nativeEvent","payload","imageKey","render","hasOnImageMissing","bind"],"sourceRoot":"../../../src","sources":["components/Images.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","Image","RNImage","RNMBXImagesNativeComponent","ShapeSource","jsx","_jsx","NATIVE_MODULE_NAME","_isUrlOrPath","value","String","startsWith","isImageSourcePropType","Number","valueAsSource","uri","isChildAnImage","child","isValidElement","type","Images","PureComponent","NATIVE_ASSETS_KEY","_getImages","props","images","nativeAssetImages","nativeImages","imageNames","Object","keys","imageName","Array","isArray","console","error","res","resolveAssetSource","imageEntry","image","resolvedImage","children","childrenWithWrongType","Children","toArray","find","_onImageMissing","event","onImageMissing","payload","nativeEvent","payloadRenamed","imageKey","render","hasOnImageMissing","bind"],"sourceRoot":"../../../src","sources":["components/Images.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/offline/OfflineCreatePackOptions.js

@@ -11,6 +11,7 @@ class OfflineCreatePackOptions {
     this.minZoom = options.minZoom;
     this.maxZoom = options.maxZoom;
     this.metadata = this._makeMetadata(options.metadata);
+    this.tilesets = options.tilesets;
   }
   _assert(options) {
     if (!options.styleURL) {

package/lib/module/modules/offline/OfflineCreatePackOptions.js.map

@@ -1 +1 @@
-{"version":3,"names":["makeLatLngBounds","toJSONString","OfflineCreatePackOptions","constructor","options","_assert","name","styleURL","bounds","_makeLatLngBounds","minZoom","maxZoom","metadata","_makeMetadata","Error","ne","sw","JSON","stringify"],"sourceRoot":"../../../../src","sources":["modules/offline/OfflineCreatePackOptions.ts"],"mappings":";;AAAA,SAASA,gBAAgB,QAAQ,sBAAsB;AACvD,SAASC,YAAY,QAAQ,aAAa;AAW1C,MAAMC,wBAAwB,CAAC;EAQ7BC,WAAWA,CAACC,OAAqC,EAAE;IACjD,IAAI,CAACC,OAAO,CAACD,OAAO,CAAC;IAErB,IAAI,CAACE,IAAI,GAAGF,OAAO,CAACE,IAAI;IACxB,IAAI,CAACC,QAAQ,GAAGH,OAAO,CAACG,QAAQ;IAChC,IAAI,CAACC,MAAM,GAAG,IAAI,CAACC,iBAAiB,CAACL,OAAO,CAACI,MAAM,CAAC;IACpD,IAAI,CAACE,OAAO,GAAGN,OAAO,CAACM,OAAO;IAC9B,IAAI,CAACC,OAAO,GAAGP,OAAO,CAACO,OAAO;IAC9B,IAAI,CAACC,QAAQ,GAAG,IAAI,CAACC,aAAa,CAACT,OAAO,CAACQ,QAAQ,CAAC;EACtD;EAEAP,OAAOA,CAACD,OAAqC,EAAE;IAC7C,IAAI,CAACA,OAAO,CAACG,QAAQ,EAAE;MACrB,MAAM,IAAIO,KAAK,CACb,yDACF,CAAC;IACH;IAEA,IAAI,CAACV,OAAO,CAACE,IAAI,EAAE;MACjB,MAAM,IAAIQ,KAAK,CAAC,oDAAoD,CAAC;IACvE;IAEA,IAAI,CAACV,OAAO,CAACI,MAAM,EAAE;MACnB,MAAM,IAAIM,KAAK,CAAC,sDAAsD,CAAC;IACzE;EACF;EAEAL,iBAAiBA,CAACD,MAA4C,EAAU;IACtE,MAAM,CAACO,EAAE,EAAEC,EAAE,CAAC,GAAGR,MAAM;IACvB,OAAOP,YAAY,CAACD,gBAAgB,CAACe,EAAE,EAAEC,EAAE,CAAC,CAAC;EAC/C;EAEAH,aAAaA,CAACD,QAA6C,EAAE;IAC3D,OAAOK,IAAI,CAACC,SAAS,CAAC;MACpB,GAAGN,QAAQ;MACXN,IAAI,EAAE,IAAI,CAACA;IACb,CAAC,CAAC;EACJ;AACF;AAEA,eAAeJ,wBAAwB","ignoreList":[]}
+{"version":3,"names":["makeLatLngBounds","toJSONString","OfflineCreatePackOptions","constructor","options","_assert","name","styleURL","bounds","_makeLatLngBounds","minZoom","maxZoom","metadata","_makeMetadata","tilesets","Error","ne","sw","JSON","stringify"],"sourceRoot":"../../../../src","sources":["modules/offline/OfflineCreatePackOptions.ts"],"mappings":";;AAAA,SAASA,gBAAgB,QAAQ,sBAAsB;AACvD,SAASC,YAAY,QAAQ,aAAa;AAY1C,MAAMC,wBAAwB,CAAC;EAS7BC,WAAWA,CAACC,OAAqC,EAAE;IACjD,IAAI,CAACC,OAAO,CAACD,OAAO,CAAC;IAErB,IAAI,CAACE,IAAI,GAAGF,OAAO,CAACE,IAAI;IACxB,IAAI,CAACC,QAAQ,GAAGH,OAAO,CAACG,QAAQ;IAChC,IAAI,CAACC,MAAM,GAAG,IAAI,CAACC,iBAAiB,CAACL,OAAO,CAACI,MAAM,CAAC;IACpD,IAAI,CAACE,OAAO,GAAGN,OAAO,CAACM,OAAO;IAC9B,IAAI,CAACC,OAAO,GAAGP,OAAO,CAACO,OAAO;IAC9B,IAAI,CAACC,QAAQ,GAAG,IAAI,CAACC,aAAa,CAACT,OAAO,CAACQ,QAAQ,CAAC;IACpD,IAAI,CAACE,QAAQ,GAAGV,OAAO,CAACU,QAAQ;EAClC;EAEAT,OAAOA,CAACD,OAAqC,EAAE;IAC7C,IAAI,CAACA,OAAO,CAACG,QAAQ,EAAE;MACrB,MAAM,IAAIQ,KAAK,CACb,yDACF,CAAC;IACH;IAEA,IAAI,CAACX,OAAO,CAACE,IAAI,EAAE;MACjB,MAAM,IAAIS,KAAK,CAAC,oDAAoD,CAAC;IACvE;IAEA,IAAI,CAACX,OAAO,CAACI,MAAM,EAAE;MACnB,MAAM,IAAIO,KAAK,CAAC,sDAAsD,CAAC;IACzE;EACF;EAEAN,iBAAiBA,CAACD,MAA4C,EAAU;IACtE,MAAM,CAACQ,EAAE,EAAEC,EAAE,CAAC,GAAGT,MAAM;IACvB,OAAOP,YAAY,CAACD,gBAAgB,CAACgB,EAAE,EAAEC,EAAE,CAAC,CAAC;EAC/C;EAEAJ,aAAaA,CAACD,QAA6C,EAAE;IAC3D,OAAOM,IAAI,CAACC,SAAS,CAAC;MACpB,GAAGP,QAAQ;MACXN,IAAI,EAAE,IAAI,CAACA;IACb,CAAC,CAAC;EACJ;AACF;AAEA,eAAeJ,wBAAwB","ignoreList":[]}

package/lib/module/specs/RNMBXImagesNativeComponent.ts

@@ -4,7 +4,10 @@ import type { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTyp
 
 import type { UnsafeMixed } from './codegenUtils';
 
-type OnImageMissingEventType = { type: string; payload: { imageKey: string } };
+type OnImageMissingEventType = {
+  type: string;
+  payloadRenamed: { imageKey: string };
+};
 
 export interface NativeProps extends ViewProps {
   images: UnsafeMixed<any>;

package/lib/typescript/src/components/Images.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Images.d.ts","sourceRoot":"","sources":["../../../../src/components/Images.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAa,YAAY,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAK7E,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAEhD,MAAM,MAAM,SAAS,CAAC,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,IAAI;IAC/D,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAwBF,KAAK,cAAc,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAE5E,KAAK,WAAW,GACZ,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEN,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,mBAAmB,CAAC;IAC5B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAQvE,UAAU,KAAK;IACb;;;;OAIG;IACH,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;IAEvC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,WAAW,EAAE,CAAC;IAElC;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAE5C,QAAQ,CAAC,EAAE,cAAc,CAAC,OAAO,KAAK,CAAC,CAAC;CACzC;AAED;;GAEG;AACH,cAAM,MAAO,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IAC7C,MAAM,CAAC,iBAAiB,SAAY;IAEpC,UAAU;;;;;;;;;IAiEV,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC;IAM/D,MAAM;CAcP;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Images.d.ts","sourceRoot":"","sources":["../../../../src/components/Images.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAa,YAAY,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAK7E,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAEhD,MAAM,MAAM,SAAS,CAAC,WAAW,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,IAAI;IAC/D,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAwBF,KAAK,cAAc,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAE5E,KAAK,WAAW,GACZ,MAAM,GACN;IACA,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEJ,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,mBAAmB,CAAC;IAC5B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAQvE,UAAU,KAAK;IACb;;;;OAIG;IACH,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;IAEvC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,WAAW,EAAE,CAAC;IAElC;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAE5C,QAAQ,CAAC,EAAE,cAAc,CAAC,OAAO,KAAK,CAAC,CAAC;CACzC;AAED;;GAEG;AACH,cAAM,MAAO,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IAC7C,MAAM,CAAC,iBAAiB,SAAY;IAEpC,UAAU;;;;;;;;;IAgEV,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC;IAY/D,MAAM;CAcP;AAED,eAAe,MAAM,CAAC"}

package/lib/typescript/src/modules/offline/OfflineCreatePackOptions.d.ts

@@ -2,6 +2,7 @@ export type OfflineCreatePackOptionsArgs = {
     name: string;
     styleURL: string;
     bounds: [GeoJSON.Position, GeoJSON.Position];
+    tilesets?: string[];
     minZoom?: number;
     maxZoom?: number;
     metadata?: Record<string, unknown>;
@@ -9,6 +10,7 @@ export type OfflineCreatePackOptionsArgs = {
 declare class OfflineCreatePackOptions {
     readonly name: string;
     readonly styleURL: string;
+    readonly tilesets: string[] | undefined;
     readonly bounds: string;
     readonly minZoom: number | undefined;
     readonly maxZoom: number | undefined;

package/lib/typescript/src/modules/offline/OfflineCreatePackOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OfflineCreatePackOptions.d.ts","sourceRoot":"","sources":["../../../../../src/modules/offline/OfflineCreatePackOptions.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,CAAC;AAEF,cAAM,wBAAwB;IAC5B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,SAAgB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,SAAgB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEjC,OAAO,EAAE,4BAA4B;IAWjD,OAAO,CAAC,OAAO,EAAE,4BAA4B;IAgB7C,iBAAiB,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM;IAKvE,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;CAM5D;AAED,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"OfflineCreatePackOptions.d.ts","sourceRoot":"","sources":["../../../../../src/modules/offline/OfflineCreatePackOptions.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,CAAC;AAEF,cAAM,wBAAwB;IAC5B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,SAAgB,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC/C,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,SAAgB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,SAAgB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEjC,OAAO,EAAE,4BAA4B;IAYjD,OAAO,CAAC,OAAO,EAAE,4BAA4B;IAgB7C,iBAAiB,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM;IAKvE,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;CAM5D;AAED,eAAe,wBAAwB,CAAC"}

package/lib/typescript/src/specs/RNMBXImagesNativeComponent.d.ts

@@ -3,7 +3,7 @@ import type { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTyp
 import type { UnsafeMixed } from './codegenUtils';
 type OnImageMissingEventType = {
     type: string;
-    payload: {
+    payloadRenamed: {
         imageKey: string;
     };
 };

package/lib/typescript/src/specs/RNMBXImagesNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNMBXImagesNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/specs/RNMBXImagesNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAEpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,KAAK,uBAAuB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAE/E,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IACzB,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,iBAAiB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACxC,cAAc,EAAE,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;CAC7D;wBAII,aAAa,CAAC,WAAW,CAAC;AAF/B,wBAEgC"}
+{"version":3,"file":"RNMBXImagesNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/specs/RNMBXImagesNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAEpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,KAAK,uBAAuB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CACtC,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IACzB,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,iBAAiB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACxC,cAAc,EAAE,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;CAC7D;wBAII,aAAa,CAAC,WAAW,CAAC;AAF/B,wBAEgC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.44",
+  "version": "10.1.45-rc.0",
   "publishConfig": {
     "access": "public"
   },

package/rnmapbox-maps.podspec

@@ -84,7 +84,7 @@ else
 end
 
 if $RNMapboxMapsUseV11 != nil
-  warn "WARNING: $RNMapboxMapsUseV11 is deprecated just set $RNMapboxMapsVersion to '= 11.13.4"
+  warn "WARNING: $RNMapboxMapsUseV11 is deprecated just set $RNMapboxMapsVersion to '= 11.15.0"
 end
 
 if $MapboxImplVersion =~ /(~>|>=|=|>)?\S*11\./

package/src/components/Images.tsx

@@ -41,13 +41,13 @@ type TypedReactNode<T> = ReactElement<T> | Array<TypedReactNode<T>> | never;
 type NativeImage =
   | string
   | {
-      name: string;
-      sdf?: boolean;
-      stretchX?: [number, number][];
-      stretchY?: [number, number][];
-      content?: [number, number, number, number];
-      scale?: number;
-    };
+    name: string;
+    sdf?: boolean;
+    stretchX?: [number, number][];
+    stretchY?: [number, number][];
+    content?: [number, number, number, number];
+    scale?: number;
+  };
 
 export type ImageEntryData = {
   url?: string;
@@ -156,8 +156,7 @@ class Images extends React.PureComponent<Props> {
       );
       if (childrenWithWrongType) {
         console.error(
-          `Images component on accepts Image a children passed in: ${
-            (childrenWithWrongType as any).type || 'n/a'
+          `Images component on accepts Image a children passed in: ${(childrenWithWrongType as any).type || 'n/a'
           }`,
         );
       }
@@ -175,7 +174,13 @@ class Images extends React.PureComponent<Props> {
 
   _onImageMissing(event: React.SyntheticEvent<Element, RNMBEvent>) {
     if (this.props.onImageMissing) {
-      this.props.onImageMissing(event.nativeEvent.payload?.imageKey);
+      let { payload } = event.nativeEvent;
+      if (!payload) {
+        // @ts-expect-error payload renamed to avoid conflict in codegen with RN
+        payload = event.nativeEvent.payloadRenamed
+      }
+
+      this.props.onImageMissing(payload?.imageKey);
     }
   }
 

package/src/modules/offline/OfflineCreatePackOptions.ts

@@ -5,6 +5,7 @@ export type OfflineCreatePackOptionsArgs = {
   name: string;
   styleURL: string;
   bounds: [GeoJSON.Position, GeoJSON.Position];
+  tilesets?: string[];
   minZoom?: number;
   maxZoom?: number;
   metadata?: Record<string, unknown>;
@@ -13,6 +14,7 @@ export type OfflineCreatePackOptionsArgs = {
 class OfflineCreatePackOptions {
   public readonly name: string;
   public readonly styleURL: string;
+  public readonly tilesets: string[] | undefined;
   public readonly bounds: string;
   public readonly minZoom: number | undefined;
   public readonly maxZoom: number | undefined;
@@ -27,6 +29,7 @@ class OfflineCreatePackOptions {
     this.minZoom = options.minZoom;
     this.maxZoom = options.maxZoom;
     this.metadata = this._makeMetadata(options.metadata);
+    this.tilesets = options.tilesets;
   }
 
   _assert(options: OfflineCreatePackOptionsArgs) {

package/src/specs/RNMBXImagesNativeComponent.ts

@@ -4,7 +4,10 @@ import type { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTyp
 
 import type { UnsafeMixed } from './codegenUtils';
 
-type OnImageMissingEventType = { type: string; payload: { imageKey: string } };
+type OnImageMissingEventType = {
+  type: string;
+  payloadRenamed: { imageKey: string };
+};
 
 export interface NativeProps extends ViewProps {
   images: UnsafeMixed<any>;