@rnmapbox/maps 10.1.0-beta.18 → 10.1.0-beta.19

package/ios/RNMBX/RNMBXLocationModule.swift

@@ -457,14 +457,9 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
 
   static weak var shared : RNMBXLocationModule? = nil
 
-  var locationProviderRNMBX : LocationProviderRNMBX
   var hasListener = false
   
-  var locationProvider : LocationProvider {
-    get {
-      return locationProviderRNMBX
-    }
-  }
+  var locationProvider : LocationProvider
   
   var locationEventThrottle : (
     waitBetweenEvents: Double?,
@@ -475,9 +470,11 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   )
 
   override init() {
-    locationProviderRNMBX = LocationProviderRNMBX()
+    locationProvider = LocationProviderRNMBX()
     super.init()
-    locationProviderRNMBX.delegate = self
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.delegate = self
+    }
     RNMBXLocationModule.shared = self
   }
   
@@ -497,12 +494,20 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
-    if minDisplacement >= 0.0 { locationProviderRNMBX.setDistanceFilter(minDisplacement) }
-    locationProviderRNMBX.start()
+    if minDisplacement >= 0.0 {
+      if let locationProvider = locationProvider as? LocationProviderRNMBX {
+        locationProvider.setDistanceFilter(minDisplacement)
+      }
+    }
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.start()
+    }
   }
   
   @objc func stop() {
-    locationProviderRNMBX.stop()
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.stop()
+    }
   }
   
   @objc func getLastKnownLocation() -> RNMBXLocation? {
@@ -510,15 +515,21 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   }
   
   @objc func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
-    locationProviderRNMBX.setDistanceFilter(minDisplacement)
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.setDistanceFilter(minDisplacement)
+    }
   }
   
   @objc func setRequestsAlwaysUse(_ requestsAlwaysUse: Bool) {
-    locationProviderRNMBX.setRequestsAlwaysUse(requestsAlwaysUse);
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.setRequestsAlwaysUse(requestsAlwaysUse)
+    }
   }
 
   @objc func simulateHeading(_ changesPerSecond: NSNumber, increment: NSNumber) {
-    locationProviderRNMBX.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
+    }
   }
 
   @objc

package/ios/RNMBX/RNMBXLocationModuleV11.swift

@@ -133,10 +133,9 @@ extension RNMBXAppleLocationProviderProxy {
 class RNMBXLocationModule: RCTEventEmitter {
   static weak var shared : RNMBXLocationModule? = nil
   
-  // var _locationProvider : RNMBXAppleLocationProviderProxy = RNMBXAppleLocationProviderProxy(provider: AppleLocationProvider())
-  var _locationProvider : AppleLocationProvider = AppleLocationProvider()
-  var locationUpdateObserver : AnyCancelable? = nil
-  var locationHeadingObserver : AnyCancelable? = nil
+  var _locationProvider : LocationProvider & HeadingProvider = AppleLocationProvider()
+  var locationUpdateObserver : Cancelable? = nil
+  var locationHeadingObserver : Cancelable? = nil
   
   var actLocation : RNMBXLocation = RNMBXLocation()
   
@@ -164,12 +163,10 @@ class RNMBXLocationModule: RCTEventEmitter {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
-    var newOptions = _locationProvider.options
-    newOptions.distanceFilter = minDisplacement
-    if minDisplacement >= 0.0 { _locationProvider.options = newOptions }
+    setMinDisplacement(minDisplacement)
     
     locationUpdateObserver?.cancel()
-    locationUpdateObserver = _locationProvider.onLocationUpdate.observe { location in
+    locationUpdateObserver = observeLocationUpdates(_locationProvider) { location in
       guard self.hasListener else { return }
   
       self.actLocation.location = location.last
@@ -178,7 +175,7 @@ class RNMBXLocationModule: RCTEventEmitter {
       }
     }
     locationHeadingObserver?.cancel()
-    locationHeadingObserver = _locationProvider.onHeadingUpdate.observe { heading in
+    locationHeadingObserver = observeHeadingUpdates(_locationProvider) { heading in
       guard self.hasListener else { return }
 
       self.actLocation.heading = heading
@@ -188,6 +185,64 @@ class RNMBXLocationModule: RCTEventEmitter {
     }
   }
   
+  class _LocationObserver : Cancelable, LocationObserver  {
+    weak var locationProvider: LocationProvider?
+    var callback: (([Location]) -> Void)?
+    
+    init(_ locationProvider: LocationProvider) {
+      self.locationProvider = locationProvider
+    }
+
+    func onLocationUpdateReceived(for locations: [Location]) {
+      callback?(locations)
+    }
+  
+    func cancel() {
+      locationProvider?.removeLocationObserver(for: self)
+      locationProvider = nil
+    }
+    
+    deinit {
+      self.cancel()
+    }
+  }
+  
+  class _HeadingObserver: Cancelable, HeadingObserver {
+    var headingProvider: HeadingProvider?
+    var callback: ((Heading) -> Void)?
+
+    init(_ headingProvider: HeadingProvider) {
+      self.headingProvider = headingProvider
+    }
+    
+    func onHeadingUpdate(_ heading: MapboxMaps.Heading) {
+      callback?(heading)
+    }
+    
+    func cancel() {
+      headingProvider?.remove(headingObserver: self)
+      headingProvider = nil
+    }
+    
+    deinit {
+      self.cancel()
+    }
+  }
+  
+  func observeLocationUpdates(_ locationProvider: LocationProvider, callback: @escaping ([Location]) -> Void) -> Cancelable {
+    let observer = _LocationObserver(locationProvider)
+    observer.callback = callback
+    locationProvider.addLocationObserver(for: observer)
+    return observer
+  }
+  
+  func observeHeadingUpdates(_ headingProvider: HeadingProvider, callback: @escaping (Heading) -> Void) -> Cancelable {
+    let observer = _HeadingObserver(headingProvider)
+    observer.callback = callback
+    headingProvider.add(headingObserver: observer)
+    return observer
+  }
+  
   @objc func stop() {
     locationUpdateObserver?.cancel()
     locationUpdateObserver = nil
@@ -199,14 +254,17 @@ class RNMBXLocationModule: RCTEventEmitter {
   @objc func getLastKnownLocation() -> RNMBXLocation? {
     let last = RNMBXLocation()
     last.heading = _locationProvider.latestHeading
-    last.location = _locationProvider.latestLocation
+    last.location = _locationProvider.getLastObservedLocation()
     return last
   }
   
-  @objc func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
-    var newOptions = _locationProvider.options
-    newOptions.distanceFilter = minDisplacement
-    _locationProvider.options = newOptions
+  @objc
+  func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
+    if let appleLocationProvider = _locationProvider as? AppleLocationProvider {
+      var newOptions = appleLocationProvider.options
+      newOptions.distanceFilter = minDisplacement
+      if minDisplacement >= 0.0 { appleLocationProvider.options = newOptions }
+    }
   }
   
   @objc
@@ -236,7 +294,16 @@ class RNMBXLocationModule: RCTEventEmitter {
     get {
       return _locationProvider
     }
+    set(value) {
+      _locationProvider = value
+    }
   }
+  
+  func overrideLocationProvider(newProvider: LocationProvider & HeadingProvider) {
+    _locationProvider = newProvider
+  }
+  
+  
 }
 
 class EventThrottler {

package/ios/RNMBX/RNMBXLogging.swift

@@ -115,6 +115,14 @@ func logged<T>(_ msg: String, info: (() -> String)? = nil, errorResult: (Error)
   }
 }
 
+@objc(RNMBXLogger)
+public class RNMBXLogger : NSObject {
+  @objc
+  static public func error(_ message: String) {
+    Logger.error(message)
+  }
+}
+
 @objc(RNMBXLogging)
 class RNMBXLogging: RCTEventEmitter {
   static var shared : RNMBXLogging? = nil

package/ios/RNMBX/RNMBXMapView.swift

@@ -14,7 +14,6 @@ class FeatureEntry {
   }
 }
 
-
 #if RNMBX_11
 extension QueriedRenderedFeature {
   var feature : Feature { return queriedFeature.feature }
@@ -99,6 +98,8 @@ class RNMBXCameraChanged : RNMBXEvent, RCTEvent {
 
 @objc(RNMBXMapView)
 open class RNMBXMapView: UIView {
+  var imageManager: ImageManager = ImageManager()
+
   var tapDelegate: IgnoreRNMBXMakerViewGestureDelegate? = nil
   
   var eventDispatcher: RCTEventDispatcherProtocol
@@ -164,7 +165,7 @@ open class RNMBXMapView: UIView {
   var mapboxMap: MapboxMap! {
     get { _mapView.mapboxMap }
   }
-  
+
   @objc public func addToMap(_ subview: UIView) {
     withMapView {
       if let mapComponent = subview as? RNMBXMapComponent {
@@ -575,7 +576,7 @@ open class RNMBXMapView: UIView {
       mapView.ornaments.options.scaleBar.margins = margins
     }
   }
-  
+
   @objc override public func didSetProps(_ props: [String]) {
     if (_mapView == nil) {
       createMapView()

package/ios/RNMBX/RNMBXMapViewComponentView.mm

@@ -223,6 +223,8 @@ using namespace facebook::react;
     }
 
   [super updateProps:props oldProps:oldProps];
+
+  [_view didSetProps:@[]];
 }
 
 - (void)prepareForRecycle

package/ios/RNMBX/RNMBXMapViewManager.swift

@@ -246,5 +246,4 @@ extension RNMBXMapViewManager {
           }
         }
     }
-
 }

package/ios/RNMBX/RNMBXMapViewModule.mm

@@ -139,7 +139,6 @@ RCT_EXPORT_METHOD(querySourceFeatures:(nonnull NSNumber*)viewRef sourceId:(NSStr
     } 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:

package/ios/RNMBX/RNMBXMarkerView.swift

@@ -22,7 +22,6 @@ class RNMBXMarkerViewParentViewAnnotation : UIView {
     if actSize.width != size.width || actSize.height != size.height {
       let dx = ((size.width/2.0) - newOffset.dx) - ((actSize.width/2.0) - oldOffset.dx)
       let dy = ((size.height/2.0) + newOffset.dy) - ((actSize.height/2.0) + oldOffset.dy)
-      print(" => size=\(size) actSize=\(actSize) newOffset=\(newOffset) oldOffset=\(oldOffset)  dx=\(dx) dy=\(dy)")
       var frame = self.frame
       frame = frame.offsetBy(dx: -dx, dy: -dy)
       frame.size = size

package/ios/RNMBX/RNMBXNativeUserLocation.swift

@@ -1,8 +1,9 @@
 import MapboxMaps
 
 @objc
-public class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
+public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
   weak var map : RNMBXMapView! = nil
+  var imageManager: ImageManager? = nil
   
   let locationLayerId = "location-layer"
 
@@ -10,39 +11,193 @@ public class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
 
   @objc
   public var iosShowsUserHeadingIndicator : Bool = false {
-    didSet {
-      if let map = self.map { _applySettings(map) }
+    didSet { _apply() }
+  }
+  
+  enum PuckImagePart: String {
+    case top
+    case bearing
+    case shadow
+  }
+  
+  var imageNames: [PuckImagePart: String] = [:]
+  var subscriptions: [PuckImagePart: ImageManager.Subscription] = [:]
+  var images: [PuckImagePart: UIImage] = [:]
+  
+  @objc
+  public var topImage : String? = nil {
+    didSet { imageNameUpdated(.top, topImage) }
+  }
+
+  @objc
+  public var bearingImage : String? = nil {
+    didSet { imageNameUpdated(.bearing, bearingImage) }
+  }
+    
+  @objc
+  public var shadowImage : String? = nil {
+    didSet { imageNameUpdated(.shadow, shadowImage) }
+  }
+    
+  @objc
+  public var scale : Any? = nil
+  
+  @objc
+  public var visible: Bool = false
+  
+  var _puckBearing: PuckBearing? = nil
+  
+  @objc
+  public var puckBearing: String? {
+    get {
+      switch (_puckBearing) {
+      case .heading:
+        return "heading"
+      case .course:
+        return "course"
+      case nil:
+        return nil
+      }
+    }
+    set(value) {
+      switch(value) {
+      case "heading":
+        _puckBearing = .heading
+      case "coures":
+        _puckBearing = .course
+      case nil:
+        _puckBearing = nil
+      default:
+        Logger.error("RNMBXNativeUserLocation puckBearing is uncrecognized: \(value)")
+        _puckBearing = nil
+      }
+    }
+  }
+  
+  @objc
+  public var puckBearingEnabled: Bool = false
+
+  @objc
+  override public func didSetProps(_ props: [String]) {
+    _apply()
+  }
+
+  func imageNameUpdated(_ image: PuckImagePart, _ name: String?) {
+    imageNames[image] = name
+    if let subscription = subscriptions[image] {
+      subscription.cancel()
+      subscriptions.removeValue(forKey: image)
+    }
+    
+    guard let name = name else {
+      imageUpdated(image, nil)
+      return
+    }
+    
+    if let imageManager = imageManager {
+      subscribe(imageManager, image, name)
     }
   }
   
-  func _applySettings(_ map: RNMBXMapView) {
-    let location = map.mapView.location!
-    location.options.puckType = .puck2D(.makeDefault(showBearing: iosShowsUserHeadingIndicator))
-    if (iosShowsUserHeadingIndicator) {
-       #if RNMBX_11
-      location.options.puckBearing = .heading
-      #else
-      location.options.puckBearingSource = .heading
-      #endif
-      location.options.puckBearingEnabled = true
+  func imageUpdated(_ image: PuckImagePart, _ uiImage: UIImage?) {
+    if let uiImage = uiImage {
+      images[image] = uiImage
     } else {
-      location.options.puckBearingEnabled = false
+      images.removeValue(forKey: image)
+    }
+    _apply()
+  }
+
+  func toDoubleValue(value: Any?, name: String) -> Value<Double>? {
+    if value == nil {
+      return nil
+    }
+    switch value {
+    case let value as NSNumber:
+      return .constant(value.doubleValue)
+    case let value as Int:
+      return .constant(Double(value))
+    case let value as Double:
+      return .constant(value)
+    case let value as Array<Any>:
+      do {
+        let data = try JSONSerialization.data(withJSONObject: value, options: .prettyPrinted)
+        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
+        return Value.expression(decodedExpression)
+      } catch {
+        Logger.error("toDoubleValue: \(name): unable to parse as expression \(value) with type: \(type(of:value))")
+        return Value.constant(0.0)
+      }
+    default:
+      Logger.error("toDoubleValue: \(name): has unknown type: \(type(of:value)) \(value) ")
+      return .constant(1.0)
+    }
+  }
+  
+  func _apply() {
+    guard let map = self.map else {
+      return
+    }
+    guard let mapView = map.mapView else {
+      Logger.error("RNMBXNativeUserLocation mapView was nil")
+      return
+    }
+    _apply(mapView)
+  }
+
+  func _apply(_ mapView: MapView) {
+    guard let location = mapView.location else {
+      Logger.error("RNMBXNativeUserLocation location was nil")
+      return
+    }
+
+    if (visible) {
+      if images.isEmpty {
+        location.options.puckType = .puck2D(.makeDefault(showBearing: puckBearingEnabled))
+      } else {
+        location.options.puckType = .puck2D(
+          Puck2DConfiguration(
+            topImage: self.images[.top],
+            bearingImage: self.images[.bearing],
+            shadowImage: self.images[.shadow],
+            scale: toDoubleValue(value: scale, name: "scale")
+          )
+        )
+      }
+    } else {
+      let emptyImage = UIGraphicsImageRenderer(size: CGSize(width: 1, height: 1)).image { _ in }
+      location.options.puckType = .puck2D(
+        Puck2DConfiguration(
+          topImage: emptyImage,
+          bearingImage: emptyImage,
+          shadowImage: emptyImage,
+          scale: Value.constant(1.0)
+        )
+      )
+    }
+
+
+    location.options.puckBearingEnabled = puckBearingEnabled
+    if let puckBearing = _puckBearing {
+      location.options.puckBearing = puckBearing
     }
   }
 
   func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map
-    _applySettings(map)
+ 
+    _fetchImages(map)
+    _apply()
   }
 
   func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    let location = map.mapView.location!
-    location.options.puckType = nil
-    guard let mapboxMap = map.mapboxMap else {
-      return true
+    if let location = map.mapView.location {
+      location.options.puckType = nil
+      location.options.puckType = .none
+    } else {
+      Logger.error("RNMBXNativeUserLocation.removeFromMap: location is nil")
     }
-    let style = mapboxMap.style
-    location.options.puckType = .none
+    removeSubscriptions()
     self.map = nil
 
     return true
@@ -52,3 +207,44 @@ public class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
     return true
   }
 }
+
+// MARK: fetch images and subscribe on updates
+
+extension RNMBXNativeUserLocation {
+  func subscribe(_ imageManager: ImageManager, _ image: PuckImagePart, _ name: String) {
+    if let subscription = subscriptions[image] {
+      subscription.cancel()
+      subscriptions[image] = nil
+      Logger.error("RNMBXNativeUserLocation.subscribe: there is already a subscription for image: \(image)")
+    }
+
+    subscriptions[image] = imageManager.subscribe(name: name) { name, uiImage in
+      self.imageUpdated(image, uiImage)
+    }
+  }
+
+  func removeSubscriptions() {
+    self.subscriptions.forEach { (part,subscription) in
+      subscription.cancel()
+    }
+    self.subscriptions.removeAll()
+  }
+
+  func _fetchImages(_ map: RNMBXMapView) {
+    if let style = map.mapView?.mapboxMap?.style {
+      imageNames.forEach { (part, name) in
+        if style.imageExists(withId: name), let image = style.image(withId: name) {
+          images[part] = image
+        }
+      }
+    }
+
+    let imageManager = map.imageManager
+    removeSubscriptions()
+    self.imageManager = imageManager
+    imageNames.forEach { (part,name) in
+      subscribe(imageManager, part, name)
+    }
+  }
+
+}

package/ios/RNMBX/RNMBXNativeUserLocationComponentView.mm

@@ -2,6 +2,7 @@
 
 #import "RNMBXNativeUserLocationComponentView.h"
 #import "RNMBXFabricHelpers.h"
+#import "RNMBXFabricPropConvert.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
@@ -53,13 +54,20 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
-    id iosShowsUserHeadingIndicator = RNMBXConvertFollyDynamicToId(newProps.iosShowsUserHeadingIndicator);
-    if (iosShowsUserHeadingIndicator != nil) {
-        _view.iosShowsUserHeadingIndicator = iosShowsUserHeadingIndicator;
-    }
-    
+  const auto &oldViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*oldProps);
+  const auto &newViewProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
+
+  RNMBX_OPTIONAL_RPOP_NSString(puckBearing)
+  RNMBX_OPTIONAL_RPOP_BOOL(puckBearingEnabled)
+  RNMBX_OPTIONAL_RPOP_NSString(bearingImage)
+  RNMBX_OPTIONAL_RPOP_NSString(shadowImage)
+  RNMBX_OPTIONAL_RPOP_NSString(topImage)
+  RNMBX_OPTIONAL_RPOP_ExpressionDouble(scale)
+  RNMBX_RPOP_BOOL(visible)
+
   [super updateProps:props oldProps:oldProps];
+
+  [_view didSetProps:@[]];
 }
 
 @end

package/ios/RNMBX/RNMBXNativeUserLocationViewManager.m

@@ -4,6 +4,13 @@
 @interface RCT_EXTERN_REMAP_MODULE(RNMBXNativeUserLocation, RNMBXNativeUserLocationViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(iosShowsUserHeadingIndicator, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(topImage, NSString);
+RCT_EXPORT_VIEW_PROPERTY(bearingImage, NSString);
+RCT_EXPORT_VIEW_PROPERTY(shadowImage, NSString);
+RCT_EXPORT_VIEW_PROPERTY(scale, NSArray);
+RCT_EXPORT_VIEW_PROPERTY(visible, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(puckBearing, NSString);
+RCT_EXPORT_VIEW_PROPERTY(puckBearingEnabled, BOOL);
 
 @end
 

package/ios/RNMBX/RNMBXPointAnnotationModule.mm

@@ -25,7 +25,7 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-- (void)withPointAnnotation:(NSNumber*)viewRef block:(void (^)(RNMBXPointAnnotation *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
+- (void)withPointAnnotation:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXPointAnnotation *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
 #ifdef RCT_NEW_ARCH_ENABLED
     [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
@@ -46,7 +46,7 @@ RCT_EXPORT_MODULE();
 }
 
 
-RCT_EXPORT_METHOD(refresh:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(refresh:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [self withPointAnnotation:viewRef block:^(RNMBXPointAnnotation *view) {
         [view refresh];

package/ios/RNMBX/RNMBXUtils.swift

@@ -8,9 +8,8 @@ class RNMBXUtils {
     RNMBXImageQueue.sharedInstance.addImage(url, scale: scale, bridge: bridge, handler: callback)
   }
   
-  static func fetchImages(_ bridge: RCTBridge, style: Style, objects: [String:Any], forceUpdate: Bool, loaded: @escaping (_ name:String) -> Void, callback: @escaping ()->Void) {
+  static func fetchImages(_ bridge: RCTBridge, style: Style, objects: [String:Any], forceUpdate: Bool, loaded: @escaping (String, UIImage) -> Void) {
     guard !objects.isEmpty else {
-      callback()
       return
     }
     
@@ -19,9 +18,6 @@ class RNMBXUtils {
     
     let imageLoadedBlock = { () in
       imagesToLoad = imagesToLoad - 1;
-      if imagesToLoad == 0 {
-        callback()
-      }
     }
     
     for imageName in imageNames {
@@ -55,8 +51,7 @@ class RNMBXUtils {
                 if let image = image {
                   logged("RNMBXUtils.fetchImage-\(imageName)") {
                     try style.addImage(image, id: imageName, sdf:sdf, stretchX: stretchX, stretchY: stretchY, content: content)
-                    loaded(imageName)
-                    imageLoadedBlock()
+                    loaded(imageName, image)
                   }
                 }
               }