@rnmapbox/maps 10.2.7 → 10.2.9

package/ios/RNMBX/RNMBXCameraGestureObserverComponentView.mm

@@ -0,0 +1,119 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RNMBXCameraGestureObserverComponentView.h"
+#import "RNMBXFabricHelpers.h"
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTBridge+Private.h>
+
+#import <react/renderer/components/rnmapbox_maps_specs/ComponentDescriptors.h>
+#import <react/renderer/components/rnmapbox_maps_specs/EventEmitters.h>
+#import <react/renderer/components/rnmapbox_maps_specs/Props.h>
+#import <react/renderer/components/rnmapbox_maps_specs/RCTComponentViewHelpers.h>
+
+#import "RNMBXFabricPropConvert.h"
+
+using namespace facebook::react;
+
+@interface RNMBXCameraGestureObserverComponentView () <RCTRNMBXCameraGestureObserverViewProtocol>
+@end
+
+@implementation RNMBXCameraGestureObserverComponentView {
+    RNMBXCameraGestureObserver *_view;
+}
+
++ (void)load
+{
+  [super load];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMBXCameraGestureObserverProps>();
+    _props = defaultProps;
+    [self prepareView];
+  }
+
+  return self;
+}
+
+- (void)prepareView
+{
+  _view = [[RNMBXCameraGestureObserver alloc] init];
+  self.contentView = _view;
+}
+
+- (void)setHasOnMapSteady:(BOOL)hasOnMapSteady {
+  if (hasOnMapSteady) {
+    #if DEBUG
+    NSLog(@"[RNMBXCameraGestureObserver] setHasOnMapSteady=YES");
+    #endif
+    __weak __typeof__(self) weakSelf = self;
+    [_view setOnMapSteady:^(NSString* reason, NSNumber* _Nullable idleDurationMs, NSString* _Nullable lastGestureType, NSNumber* timestamp){
+      __typeof__(self) strongSelf = weakSelf;
+      if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
+        using EventEmitterT = facebook::react::RNMBXCameraGestureObserverEventEmitter;
+        EventEmitterT::OnMapSteadyReason reasonEnum = EventEmitterT::OnMapSteadyReason::Steady;
+        if ([reason isEqualToString:@"timeout"]) {
+          reasonEnum = EventEmitterT::OnMapSteadyReason::Timeout;
+        } else {
+          reasonEnum = EventEmitterT::OnMapSteadyReason::Steady;
+        }
+
+        double ts = [timestamp doubleValue];
+        double idle = idleDurationMs != nil ? [idleDurationMs doubleValue] : 0.0;
+        std::string lastGesture = lastGestureType != nil ? std::string([lastGestureType UTF8String]) : std::string("");
+        #if DEBUG
+        NSLog(@"[RNMBXCameraGestureObserver] emitting onMapSteady reason=%s idle=%.2f lastGesture=%s ts=%.0f",
+              EventEmitterT::toString(reasonEnum), idle, lastGesture.c_str(), ts);
+        #endif
+        std::dynamic_pointer_cast<const EventEmitterT>(strongSelf->_eventEmitter)->onMapSteady({reasonEnum, idle, lastGesture, ts});
+      }
+    }];
+  } else {
+    #if DEBUG
+    NSLog(@"[RNMBXCameraGestureObserver] setHasOnMapSteady=NO");
+    #endif
+    [_view setHasOnMapSteady:NO];
+  }
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMBXCameraGestureObserverComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
+{
+  const auto &oldViewProps = static_cast<const RNMBXCameraGestureObserverProps &>(*oldProps);
+  const auto &newViewProps = static_cast<const RNMBXCameraGestureObserverProps &>(*props);
+
+  RNMBX_OPTIONAL_PROP_NSNumber(quietPeriodMs);
+  RNMBX_OPTIONAL_PROP_NSNumber(maxIntervalMs);
+  RNMBX_OPTIONAL_PROP_BOOL(hasOnMapSteady);
+
+  if (!oldProps.get() || oldViewProps.hasOnMapSteady != newViewProps.hasOnMapSteady) {
+    [self setHasOnMapSteady:newViewProps.hasOnMapSteady.asBool()];
+  }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  [self prepareView];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMBXCameraGestureObserverCls(void)
+{
+  return RNMBXCameraGestureObserverComponentView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCameraModule.h

@@ -1,5 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import "RNMBXViewResolver.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "rnmapbox_maps_specs.h"
@@ -9,9 +10,9 @@
 
 @interface RNMBXCameraModule : NSObject
 #ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXCameraModuleSpec>
+<NativeRNMBXCameraModuleSpec, RNMBXViewResolverDelegate>
 #else
-<RCTBridgeModule>
+<RCTBridgeModule, RNMBXViewResolverDelegate>
 #endif
 
 @end

package/ios/RNMBX/RNMBXCameraModule.mm

@@ -36,22 +36,14 @@ RCT_EXPORT_MODULE();
 
 - (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
-#ifdef RCT_NEW_ARCH_ENABLED
-    [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
-    RNMBXCameraComponentView *componentView = [self.viewRegistry_DEPRECATED viewForReactTag:viewRef];
-        RNMBXCamera *view = componentView.contentView;
-        
-#else
-    [self.bridge.uiManager
-     addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        RNMBXCamera *view = [uiManager viewForReactTag:viewRef];
-#endif // RCT_NEW_ARCH_ENABLED
-        if (view != nil) {
-           block(view);
-        } else {
-            reject(methodName, [NSString stringWithFormat:@"Unknown reactTag: %@", viewRef], nil);
-        }
-    }];
+    [RNMBXViewResolver withViewRef:viewRef
+                          delegate:self
+                     expectedClass:[RNMBXCamera class]
+                             block:^(UIView *view) {
+                                 block((RNMBXCamera *)view);
+                             }
+                            reject:reject
+                        methodName:methodName];
 }
 
 RCT_EXPORT_METHOD(updateCameraStop:(nonnull NSNumber *)viewRef

package/ios/RNMBX/RNMBXCustomLocationProvider.swift

@@ -3,15 +3,15 @@ import MapboxMaps
 let TAG = "RNMBXCustomLocationProvider"
 
 @objc
-public class RNMBXCustomLocationProvider: UIView, RNMBXMapComponent {
+public class RNMBXCustomLocationProvider: UIView, RNMBXMapAndMapViewComponent {
   var map: RNMBXMapView? = nil
-  
+
   let changes : PropertyChanges<RNMBXCustomLocationProvider> = PropertyChanges()
-  
+
   enum Property: String {
     case coordinate
     case heading
-    
+
     func apply(locationProvider: RNMBXCustomLocationProvider) {
       switch self {
         case .coordinate: locationProvider.applyCoordinate()
@@ -19,61 +19,55 @@ public class RNMBXCustomLocationProvider: UIView, RNMBXMapComponent {
       }
     }
   }
-  
+
   @objc
   public var coordinate: [Double] = [] {
     didSet { changed(.coordinate) }
   }
-    
+
   @objc
   public var heading: NSNumber = 0.0 {
     didSet { changed(.heading) }
   }
-  
+
   func changed(_ property: Property) {
     changes.add(name: property.rawValue, update: property.apply)
   }
-  
+
   @objc
   override public func didSetProps(_ props: [String]) {
     if customLocationProvider != nil {
       changes.apply(self)
     }
   }
-  
+
   var customLocationProvider: CustomLocationProvider? = nil
   #if RNMBX_11
   #else
   var defaultLocationProvider: LocationProvider?
   #endif
 
-  public func addToMap(_ map: RNMBXMapView, style: Style) {
+  public func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
     self.map = map
-    if let mapView = map.mapView {
-      installCustomeLocationProviderIfNeeded(mapView: mapView)
-      changes.apply(self)
-    }
+    installCustomeLocationProviderIfNeeded(mapView: mapView)
+    changes.apply(self)
   }
-  
+
   private func applyCoordinate() {
     updateCoordinate(latitude: coordinate[1], longitude: coordinate[0])
   }
-  
+
   private func applyHeading() {
     updateHeading(heading: heading.doubleValue)
   }
-  
-  public func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    if let mapView = map.mapView {
-      removeCustomLocationProvider(mapView: mapView)
-    }
+
+  public func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
+    removeCustomLocationProvider(mapView: mapView)
     self.map = nil
     return true
   }
 
-  public func waitForStyleLoad() -> Bool {
-    false
-  }
+  // Uses default implementation from RNMBXMapComponentProtocol extension (returns false)
 }
 
 #if RNMBX_11
@@ -83,6 +77,10 @@ extension RNMBXCustomLocationProvider {
     if (customLocationProvider == nil) {
       let customLocationProvider = CustomLocationProvider()
       self.customLocationProvider = customLocationProvider
+      applyHeading()
+      if (!coordinate.isEmpty) {
+        applyCoordinate()
+      }
       
       if let locationModule = RNMBXLocationModule.shared {
         locationModule.locationProvider = customLocationProvider

package/ios/RNMBX/RNMBXImageModule.h

@@ -1,5 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import "RNMBXViewResolver.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "rnmapbox_maps_specs.h"
@@ -9,9 +10,9 @@
 
 @interface RNMBXImageModule : NSObject
 #ifdef RCT_NEW_ARCH_ENABLED
-<NativeRNMBXImageModuleSpec>
+<NativeRNMBXImageModuleSpec, RNMBXViewResolverDelegate>
 #else
-<RCTBridgeModule>
+<RCTBridgeModule, RNMBXViewResolverDelegate>
 #endif
 
 @end

package/ios/RNMBX/RNMBXImageModule.mm

@@ -27,22 +27,14 @@ RCT_EXPORT_MODULE();
 
 - (void)withImage:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXImage *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
-#ifdef RCT_NEW_ARCH_ENABLED
-    [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
-        RNMBXImageComponentView *componentView = [self.viewRegistry_DEPRECATED viewForReactTag:viewRef];
-        RNMBXImage *view = componentView.contentView;
-
-#else
-    [self.bridge.uiManager
-     addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        RNMBXImage *view = [uiManager viewForReactTag:viewRef];
-#endif // RCT_NEW_ARCH_ENABLED
-        if (view != nil) {
-           block(view);
-        } else {
-            reject(methodName, [NSString stringWithFormat:@"Unknown reactTag: %@", viewRef], nil);
-        }
-    }];
+    [RNMBXViewResolver withViewRef:viewRef
+                          delegate:self
+                     expectedClass:[RNMBXImage class]
+                             block:^(UIView *view) {
+                                 block((RNMBXImage *)view);
+                             }
+                            reject:reject
+                        methodName:methodName];
 }
 
 

package/ios/RNMBX/RNMBXImages.swift

@@ -74,11 +74,8 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   }
   
   // MARK: - RNMBXMapComponent
+  // Uses default implementation from RNMBXMapComponentProtocol extension (returns false)
 
-  public func waitForStyleLoad() -> Bool {
-    return false
-  }
-  
   public func addToMap(_ map: RNMBXMapView, style: Style) {
     self.style = style
     imageManager = map.imageManager

package/ios/RNMBX/RNMBXInteractiveElement.swift

@@ -1,38 +1,43 @@
 import MapboxMaps
 
 @objc
-public class RNMBXInteractiveElement : UIView, RNMBXMapComponent {
+public class RNMBXInteractiveElement : UIView, RNMBXMapAndMapViewComponent {
   weak var map : RNMBXMapView? = nil
+  weak var mapView : MapView? = nil
 
   static let hitboxDefault = 44.0
 
   @objc public var draggable: Bool = false
-  
+
   @objc public var hasPressListener: Bool = false
-  
+
   @objc public var hitbox : [String:NSNumber] = [
     "width": NSNumber(value: hitboxDefault),
     "height": NSNumber(value: hitboxDefault)
   ]
-  
+
   @objc public var id: String! = nil {
     willSet {
       if id != nil && newValue != id {
         Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is not supported")
-        if let map = map { removeFromMap(map, reason: .ComponentChange) }
+        if let map = map, let mapView = mapView {
+          removeFromMap(map, mapView: mapView, reason: .ComponentChange)
+        }
       }
     }
     didSet {
       if oldValue != nil && oldValue != id {
-        if let map = map { addToMap(map, style: map.mapboxMap.style) }
+        if let map = map, let mapView = mapView {
+          addToMap(map, mapView: mapView, style: mapView.mapboxMap.style)
+        }
       }
     }
   }
-  
+
   @objc public var onDragStart: RCTBubblingEventBlock? = nil
-  
+
   @objc public var onPress: RCTBubblingEventBlock? = nil
-  
+
   func getLayerIDs() -> [String] {
     return []
   }
@@ -40,24 +45,26 @@ public class RNMBXInteractiveElement : UIView, RNMBXMapComponent {
   func isDraggable() -> Bool {
     return draggable
   }
-  
+
   func isTouchable() -> Bool {
     return hasPressListener
   }
-  
-  // MARK: - RNMBXMapComponent
-  public func addToMap(_ map: RNMBXMapView, style: Style) {
+
+  // MARK: - RNMBXMapAndMapViewComponent
+  public func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
     if (self.id == nil) {
       Logger.log(level: .error, message: "id is required on \(self) but not specified")
     }
     self.map = map
+    self.mapView = mapView
   }
 
-  public func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+  public func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
     self.map = nil
+    self.mapView = nil
     return true
   }
-  
+
   public func waitForStyleLoad() -> Bool {
     return true
   }

package/ios/RNMBX/RNMBXMapView.swift

@@ -60,11 +60,11 @@ public class RNMBXMapViewFactory {
 }
 
 class FeatureEntry {
-  let feature: RNMBXMapComponent
+  let feature: AnyObject  // Can be RNMBXMapComponent or RNMBXMapAndMapViewComponent
   let view: UIView
   var addedToMap: Bool = false
 
-  init(feature:RNMBXMapComponent, view: UIView, addedToMap: Bool = false) {
+  init(feature: AnyObject, view: UIView, addedToMap: Bool = false) {
     self.feature = feature
     self.view = view
     self.addedToMap = addedToMap
@@ -155,7 +155,33 @@ class RNMBXCameraChanged : RNMBXEvent, RCTEvent {
 
 @objc(RNMBXMapView)
 open class RNMBXMapView: UIView, RCTInvalidating {
-  
+
+  // Backward compatibility single-delegate property; internally we maintain a weak set.
+  public weak var rnmbxGestures: GestureManagerDelegate? {
+    didSet {
+      if let old = oldValue { _gestureDelegates.remove(old as AnyObject) }
+      if let d = rnmbxGestures { _gestureDelegates.add(d as AnyObject) }
+      #if DEBUG
+      print("[RNMBXMapView] rnmbxGestures didSet; delegates=\(_gestureDelegates.allObjects.count)")
+      #endif
+    }
+  }
+  private var _gestureDelegates: NSHashTable<AnyObject> = NSHashTable.weakObjects()
+
+  public func addGestureDelegate(_ delegate: GestureManagerDelegate) {
+    _gestureDelegates.add(delegate as AnyObject)
+    #if DEBUG
+    print("[RNMBXMapView] addGestureDelegate; delegates=\(_gestureDelegates.allObjects.count)")
+    #endif
+  }
+
+  public func removeGestureDelegate(_ delegate: GestureManagerDelegate) {
+    _gestureDelegates.remove(delegate as AnyObject)
+    #if DEBUG
+    print("[RNMBXMapView] removeGestureDelegate; delegates=\(_gestureDelegates.allObjects.count)")
+    #endif
+  }
+
   public func invalidate() {
     self.removeAllFeaturesFromMap(reason: .ViewRemoval)
 
@@ -163,14 +189,14 @@ open class RNMBXMapView: UIView, RCTInvalidating {
     cancelables.forEach { $0.cancel() }
     cancelables.removeAll()
 #endif
-    
+
     _mapView.gestures.delegate = nil
     _mapView.removeFromSuperview()
     _mapView = nil
-    
+
     self.removeFromSuperview()
   }
-  
+
   var imageManager: ImageManager = ImageManager()
 
   var tapDelegate: IgnoreRNMBXMakerViewGestureDelegate? = nil
@@ -269,7 +295,27 @@ open class RNMBXMapView: UIView, RCTInvalidating {
 
   @objc public func addToMap(_ subview: UIView) {
     withMapView { mapView in
-      if let mapComponent = subview as? RNMBXMapComponent {
+      // Check for RNMBXMapAndMapViewComponent first (requires MapView)
+      if let mapAndMapViewComponent = subview as? RNMBXMapAndMapViewComponent {
+        let style = mapView.mapboxMap.style
+        var addToMap = false
+        if mapAndMapViewComponent.waitForStyleLoad() {
+          if (self.styleLoadWaiters.hasInited()) {
+            addToMap = true
+          }
+        } else {
+          addToMap = true
+        }
+
+        let entry = FeatureEntry(feature: mapAndMapViewComponent, view: subview, addedToMap: false)
+        if (addToMap) {
+          mapAndMapViewComponent.addToMap(self, mapView: mapView, style: style)
+          entry.addedToMap = true
+        }
+        self.features.append(entry)
+      }
+      // Fallback to RNMBXMapComponent (doesn't require MapView)
+      else if let mapComponent = subview as? RNMBXMapComponent {
         let style = mapView.mapboxMap.style
         var addToMap = false
         if mapComponent.waitForStyleLoad() {
@@ -296,7 +342,26 @@ open class RNMBXMapView: UIView, RCTInvalidating {
   }
 
   @objc public func removeFromMap(_ subview: UIView) {
-    if let mapComponent = subview as? RNMBXMapComponent {
+    // Check for RNMBXMapAndMapViewComponent first (requires MapView)
+    if let mapAndMapViewComponent = subview as? RNMBXMapAndMapViewComponent {
+      var entryIndex = features.firstIndex { $0.view == subview }
+      if let entryIndex = entryIndex {
+        var entry = features[entryIndex]
+        if (entry.addedToMap) {
+          // mapView should always be non-nil here if our invariants hold
+          guard let mapView = _mapView else {
+            Logger.error("RNMBXMapView.removeFromMap: CRITICAL - mapView is nil for component that requires it: \(type(of: subview))")
+            features.remove(at: entryIndex)
+            return
+          }
+          mapAndMapViewComponent.removeFromMap(self, mapView: mapView, reason: .OnDestroy)
+          entry.addedToMap = false
+        }
+        features.remove(at: entryIndex)
+      }
+    }
+    // Fallback to RNMBXMapComponent (doesn't require MapView)
+    else if let mapComponent = subview as? RNMBXMapComponent {
       var entryIndex = features.firstIndex { $0.view == subview }
       if let entryIndex = entryIndex {
         var entry = features[entryIndex]
@@ -842,16 +907,39 @@ open class RNMBXMapView: UIView, RCTInvalidating {
   private func removeAllFeaturesFromMap(reason: RemovalReason) {
     features.forEach { entry in
       if (entry.addedToMap) {
-        entry.feature.removeFromMap(self, reason: reason)
+        // Handle RNMBXMapAndMapViewComponent
+        if let mapAndMapViewComponent = entry.feature as? RNMBXMapAndMapViewComponent {
+          guard let mapView = _mapView else {
+            Logger.error("RNMBXMapView.removeAllFeaturesFromMap: mapView is nil")
+            return
+          }
+          mapAndMapViewComponent.removeFromMap(self, mapView: mapView, reason: reason)
+        }
+        // Handle RNMBXMapComponent
+        else if let mapComponent = entry.feature as? RNMBXMapComponent {
+          mapComponent.removeFromMap(self, reason: reason)
+        }
         entry.addedToMap = false
       }
     }
   }
 
   private func addFeaturesToMap(style: Style) {
+    guard let mapView = _mapView else {
+      Logger.error("RNMBXMapView.addFeaturesToMap: mapView is nil")
+      return
+    }
+
     features.forEach { entry in
       if (!entry.addedToMap) {
-        entry.feature.addToMap(self, style: style)
+        // Handle RNMBXMapAndMapViewComponent
+        if let mapAndMapViewComponent = entry.feature as? RNMBXMapAndMapViewComponent {
+          mapAndMapViewComponent.addToMap(self, mapView: mapView, style: style)
+        }
+        // Handle RNMBXMapComponent
+        else if let mapComponent = entry.feature as? RNMBXMapComponent {
+          mapComponent.addToMap(self, style: style)
+        }
         entry.addedToMap = true
       }
     }
@@ -1407,17 +1495,35 @@ extension RNMBXMapView: GestureManagerDelegate {
   }
 
   public func gestureManager(_ gestureManager: GestureManager, didBegin gestureType: GestureType) {
+    #if DEBUG
+    print("[RNMBXMapView] gesture didBegin type=\(gestureType) delegates=\(_gestureDelegates.allObjects.count)")
+    #endif
+    for case let d as GestureManagerDelegate in _gestureDelegates.allObjects {
+      d.gestureManager(gestureManager, didBegin: gestureType)
+    }
     isGestureActive = true
   }
 
   public func gestureManager(_ gestureManager: GestureManager, didEnd gestureType: GestureType, willAnimate: Bool) {
+    #if DEBUG
+    print("[RNMBXMapView] gesture didEnd type=\(gestureType) willAnimate=\(willAnimate) delegates=\(_gestureDelegates.allObjects.count)")
+    #endif
+    for case let d as GestureManagerDelegate in _gestureDelegates.allObjects {
+      d.gestureManager(gestureManager, didEnd: gestureType, willAnimate: willAnimate)
+    }
     if !willAnimate {
-      isGestureActive = false;
+      isGestureActive = false
     }
   }
 
   public func gestureManager(_ gestureManager: GestureManager, didEndAnimatingFor gestureType: GestureType) {
-    isGestureActive = false;
+    #if DEBUG
+    print("[RNMBXMapView] gesture didEndAnimatingFor type=\(gestureType) delegates=\(_gestureDelegates.allObjects.count)")
+    #endif
+    for case let d as GestureManagerDelegate in _gestureDelegates.allObjects {
+      d.gestureManager(gestureManager, didEndAnimatingFor: gestureType)
+    }
+    isGestureActive = false
   }
 }
 

package/ios/RNMBX/RNMBXNativeUserLocation.swift

@@ -1,7 +1,7 @@
 import MapboxMaps
 
 @objc
-public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
+public class RNMBXNativeUserLocation: UIView, RNMBXMapAndMapViewComponent {
   weak var map : RNMBXMapView! = nil
   var imageManager: ImageManager? = nil
   
@@ -200,19 +200,19 @@ public class RNMBXNativeUserLocation: UIView, RNMBXMapComponent {
     }
   }
 
-  public func addToMap(_ map: RNMBXMapView, style: Style) {
+  public func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
     self.map = map
- 
+
     _fetchImages(map)
     _apply()
   }
 
-  public func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    if let location = map.mapView.location {
+  public func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
+    if  let location = mapView.location {
       location.options.puckType = nil
       location.options.puckType = .none
     } else {
-      Logger.error("RNMBXNativeUserLocation.removeFromMap: location is nil")
+      Logger.error("[RNMBXNativeUserLocation] removeFromMap, location is null")
     }
     removeSubscriptions()
     self.map = nil