@rnmapbox/maps 10.2.7 → 10.2.9

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraGestureObserverManagerDelegate.java

@@ -0,0 +1,39 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMBXCameraGestureObserverManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXCameraGestureObserverManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXCameraGestureObserverManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "quietPeriodMs":
+        mViewManager.setQuietPeriodMs(view, new DynamicFromObject(value));
+        break;
+      case "maxIntervalMs":
+        mViewManager.setMaxIntervalMs(view, new DynamicFromObject(value));
+        break;
+      case "hasOnMapSteady":
+        mViewManager.setHasOnMapSteady(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraGestureObserverManagerInterface.java

@@ -0,0 +1,18 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+public interface RNMBXCameraGestureObserverManagerInterface<T extends View> {
+  void setQuietPeriodMs(T view, Dynamic value);
+  void setMaxIntervalMs(T view, Dynamic value);
+  void setHasOnMapSteady(T view, Dynamic value);
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterArraySourceManagerDelegate.java

@@ -0,0 +1,54 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMBXRasterArraySourceManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXRasterArraySourceManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXRasterArraySourceManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
+      case "existing":
+        mViewManager.setExisting(view, new DynamicFromObject(value));
+        break;
+      case "url":
+        mViewManager.setUrl(view, new DynamicFromObject(value));
+        break;
+      case "tileUrlTemplates":
+        mViewManager.setTileUrlTemplates(view, new DynamicFromObject(value));
+        break;
+      case "minZoomLevel":
+        mViewManager.setMinZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "maxZoomLevel":
+        mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "tileSize":
+        mViewManager.setTileSize(view, new DynamicFromObject(value));
+        break;
+      case "sourceBounds":
+        mViewManager.setSourceBounds(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterArraySourceManagerInterface.java

@@ -0,0 +1,23 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+public interface RNMBXRasterArraySourceManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
+  void setExisting(T view, Dynamic value);
+  void setUrl(T view, Dynamic value);
+  void setTileUrlTemplates(T view, Dynamic value);
+  void setMinZoomLevel(T view, Dynamic value);
+  void setMaxZoomLevel(T view, Dynamic value);
+  void setTileSize(T view, Dynamic value);
+  void setSourceBounds(T view, Dynamic value);
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterParticleLayerManagerDelegate.java

@@ -0,0 +1,66 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.LayoutShadowNode;
+
+public class RNMBXRasterParticleLayerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXRasterParticleLayerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXRasterParticleLayerManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "sourceID":
+        mViewManager.setSourceID(view, new DynamicFromObject(value));
+        break;
+      case "existing":
+        mViewManager.setExisting(view, new DynamicFromObject(value));
+        break;
+      case "filter":
+        mViewManager.setFilter(view, new DynamicFromObject(value));
+        break;
+      case "aboveLayerID":
+        mViewManager.setAboveLayerID(view, new DynamicFromObject(value));
+        break;
+      case "belowLayerID":
+        mViewManager.setBelowLayerID(view, new DynamicFromObject(value));
+        break;
+      case "layerIndex":
+        mViewManager.setLayerIndex(view, new DynamicFromObject(value));
+        break;
+      case "maxZoomLevel":
+        mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "minZoomLevel":
+        mViewManager.setMinZoomLevel(view, new DynamicFromObject(value));
+        break;
+      case "sourceLayerID":
+        mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
+        break;
+      case "slot":
+        mViewManager.setSlot(view, new DynamicFromObject(value));
+        break;
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterParticleLayerManagerInterface.java

@@ -0,0 +1,27 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+public interface RNMBXRasterParticleLayerManagerInterface<T extends View> {
+  void setSourceID(T view, Dynamic value);
+  void setExisting(T view, Dynamic value);
+  void setFilter(T view, Dynamic value);
+  void setAboveLayerID(T view, Dynamic value);
+  void setBelowLayerID(T view, Dynamic value);
+  void setLayerIndex(T view, Dynamic value);
+  void setMaxZoomLevel(T view, Dynamic value);
+  void setMinZoomLevel(T view, Dynamic value);
+  void setSourceLayerID(T view, Dynamic value);
+  void setSlot(T view, Dynamic value);
+  void setId(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
+}

package/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m

@@ -14,6 +14,8 @@ RCT_EXTERN_METHOD(pausePackDownload:(NSString *)name
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(setTileCountLimit:(nonnull NSNumber *)limit)
+
 RCT_EXTERN_METHOD(getPackStatus:(NSString *)name
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)

package/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.swift

@@ -363,6 +363,11 @@ func getRegionByName(name: String, offlineRegions: [OfflineRegion]) -> OfflineRe
     }
   }
 
+  @objc
+  func setTileCountLimit(_ limit: NSNumber) {
+    self.offlineRegionManager.setOfflineMapboxTileCountLimitForLimit(limit.uint64Value)
+  }
+
   @objc
   func resetDatabase(_ resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock)

package/ios/RNMBX/RNMBXCamera.swift

@@ -15,11 +15,46 @@ public enum RemovalReason {
     case ViewRemoval, StyleChange, OnDestroy, ComponentChange, Reorder
 }
 
-public protocol RNMBXMapComponent: AnyObject {
+/// Base protocol for all map components
+public protocol RNMBXMapComponentProtocol: AnyObject {
+  func waitForStyleLoad() -> Bool
+}
+
+/// Default implementation: most components don't need to wait for style load
+extension RNMBXMapComponentProtocol {
+  public func waitForStyleLoad() -> Bool {
+    return false
+  }
+}
+
+/// Protocol for components that can work without direct MapView access
+public protocol RNMBXMapComponent: RNMBXMapComponentProtocol {
   func addToMap(_ map: RNMBXMapView, style: Style)
   func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool
-  
-  func waitForStyleLoad() -> Bool
+}
+
+/// Protocol for components that require a valid MapView instance for both add and remove operations.
+/// Use this protocol when your component needs to interact with the native MapView directly.
+/// The MapView parameter is guaranteed to be non-nil when these methods are called.
+///
+/// This protocol inherits from RNMBXMapComponent to ensure compatibility with existing code,
+/// but provides default implementations of the base protocol methods that throw errors,
+/// forcing implementers to use the mapView-aware versions.
+public protocol RNMBXMapAndMapViewComponent: RNMBXMapComponent {
+  func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style)
+  func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool
+}
+
+/// Default implementations for RNMBXMapAndMapViewComponent that prevent accidental use of base protocol methods
+extension RNMBXMapAndMapViewComponent {
+  public func addToMap(_ map: RNMBXMapView, style: Style) {
+    Logger.error("CRITICAL: addToMap(_:style:) called on RNMBXMapAndMapViewComponent. Use addToMap(_:mapView:style:) instead. Component: \(type(of: self))")
+  }
+
+  public func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    Logger.error("CRITICAL: removeFromMap(_:reason:) called on RNMBXMapAndMapViewComponent. Use removeFromMap(_:mapView:reason:) instead. Component: \(type(of: self))")
+    return false
+  }
 }
 
 enum CameraMode: Int {
@@ -85,7 +120,7 @@ class CameraUpdateQueue {
 open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
   private weak var _map: RNMBXMapView! = nil
   private var _mapCallbacks: [(RNMBXMapView) -> Void] = []
-  
+
   weak var map : RNMBXMapView? {
     return _map;
   }
@@ -103,11 +138,7 @@ open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
       _mapCallbacks.append(callback)
     }
   }
-  
-  public func waitForStyleLoad() -> Bool {
-    return false
-  }
-  
+
   public func addToMap(_ map: RNMBXMapView, style: Style) {
     _mapCallbacks.forEach { callback in
         callback(map)
@@ -115,7 +146,7 @@ open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
     _mapCallbacks = []
     _map = map
   }
-  
+
   public func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     _mapCallbacks = []
     _map = nil
@@ -123,8 +154,48 @@ open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
   }
 }
 
+/// Base class for components that require MapView to be non-nil
+open class RNMBXMapAndMapViewComponentBase : UIView, RNMBXMapAndMapViewComponent {
+  private weak var _map: RNMBXMapView! = nil
+  private var _mapCallbacks: [(RNMBXMapView) -> Void] = []
+
+  weak var map : RNMBXMapView? {
+    return _map;
+  }
+
+  func withMapView(_ callback: @escaping (_ mapView: MapView) -> Void) {
+    withRNMBXMapView { mapView in
+      callback(mapView.mapView)
+    }
+  }
+
+  func withRNMBXMapView(_ callback: @escaping (_ map: RNMBXMapView) -> Void) {
+    if let map = _map {
+      callback(map)
+    } else {
+      _mapCallbacks.append(callback)
+    }
+  }
+
+  // Uses default implementation from RNMBXMapComponentProtocol extension
+
+  public func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
+    _mapCallbacks.forEach { callback in
+        callback(map)
+    }
+    _mapCallbacks = []
+    _map = map
+  }
+
+  public func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
+    _mapCallbacks = []
+    _map = nil
+    return true
+  }
+}
+
 @objc(RNMBXCamera)
-open class RNMBXCamera : RNMBXMapComponentBase {
+open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
   var cameraAnimator: BasicCameraAnimator?
   let cameraUpdateQueue = CameraUpdateQueue()
   
@@ -519,18 +590,18 @@ open class RNMBXCamera : RNMBXMapComponentBase {
     _updateCamera()
   }
   
-  public override func addToMap(_ map: RNMBXMapView, style: Style) {
-    super.addToMap(map, style: style)
+  public override func addToMap(_ map: RNMBXMapView, mapView: MapView, style: Style) {
+    super.addToMap(map, mapView: mapView, style: style)
     map.reactCamera = self
   }
-  
-  public override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+
+  public override func removeFromMap(_ map: RNMBXMapView, mapView: MapView, reason: RemovalReason) -> Bool {
     if (reason == .StyleChange) {
       return false
     }
 
-    map.mapView.viewport.removeStatusObserver(self)
-    return super.removeFromMap(map, reason:reason)
+    mapView.viewport.removeStatusObserver(self)
+    return super.removeFromMap(map, mapView: mapView, reason: reason)
   }
 
   @objc public func moveBy(x: Double, y: Double, animationMode: NSNumber?, animationDuration: NSNumber?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {

package/ios/RNMBX/RNMBXCameraGestureObserver.swift

@@ -0,0 +1,218 @@
+import MapboxMaps
+
+@objc(RNMBXCameraGestureObserver)
+public class RNMBXCameraGestureObserver: RNMBXMapComponentBase, GestureManagerDelegate {
+  // MARK: Props from Fabric
+  @objc public var quietPeriodMs: NSNumber? = nil
+  @objc public var maxIntervalMs: NSNumber? = nil
+
+  // Event callback set from the ComponentView when JS subscribes
+  @objc public var onMapSteady: ((_ reason: String, _ idleDurationMs: NSNumber?, _ lastGestureType: String?, _ timestamp: NSNumber) -> Void)? = nil
+
+  private var hasOnMapSteady: Bool = false
+
+  @objc public func setHasOnMapSteady(_ hasOnMapSteady: Bool) {
+    self.hasOnMapSteady = hasOnMapSteady
+  }
+
+  // MARK: Internal state
+  private var activeAnimations: Int = 0
+  private var isGestureActive: Bool = false
+  private var lastGestureType: String? = nil
+  // Time when the last transition (gesture without follow-up anim or camera animation) ended
+  private var lastTransitionEndedAtMs: Double? = nil
+  private var quietTimer: DispatchSourceTimer? = nil
+  private var timeoutTimer: DispatchSourceTimer? = nil
+  private var emittedForCurrentActivity: Bool = false
+
+  #if RNMBX_11
+  private var _cancelables = Set<AnyCancelable>()
+  #endif
+
+  private var quietMs: Double { (quietPeriodMs?.doubleValue) ?? 200.0 }
+  private var maxMs: Double? { maxIntervalMs?.doubleValue }
+
+  private func nowMs() -> Double { Date().timeIntervalSince1970 * 1000.0 }
+  private func timestamp() -> NSNumber { NSNumber(value: nowMs()) }
+
+  private var canEmitSteady: Bool {
+    activeAnimations == 0 && !isGestureActive && lastTransitionEndedAtMs != nil
+  }
+
+  private func normalizeGestureType(_ gestureType: MapboxMaps.GestureType) -> String {
+    switch gestureType {
+    case .pan: return "pan"
+    case .pinch: return "pinch"
+    #if RNMBX_11
+    case .rotation: return "rotate"
+    #endif
+    case .pitch: return "pitch"
+    default: return "\(gestureType)"
+    }
+  }
+
+  private func debugLog(_ message: String) {
+    #if DEBUG
+    print("[RNMBXCameraGestureObserver] \(message); activeAnimations=\(activeAnimations) isGestureActive=\(isGestureActive) lastTransitionEnd=\(lastTransitionEndedAtMs ?? -1)")
+    #endif
+  }
+
+  private func scheduleTimer(
+    _ timer: inout DispatchSourceTimer?,
+    delay: Double,
+    handler: @escaping @convention(block) () -> Void
+  ) {
+    timer?.cancel()
+    guard delay > 0 else {
+      timer = nil
+      return
+    }
+    let newTimer = DispatchSource.makeTimerSource(queue: .main)
+    newTimer.schedule(deadline: .now() + .milliseconds(Int(delay)))
+    newTimer.setEventHandler(handler: handler)
+    newTimer.resume()
+    timer = newTimer
+  }
+
+  private func cancelQuietTimer() {
+    quietTimer?.cancel()
+    quietTimer = nil
+  }
+
+  private func cancelTimeoutTimer() {
+    timeoutTimer?.cancel()
+    timeoutTimer = nil
+  }
+
+  private func scheduleQuietCheck() {
+    let delay = quietMs
+    guard delay > 0 else {
+      cancelQuietTimer()
+      maybeEmitSteady()
+      return
+    }
+    debugLog("scheduleQuietCheck in \(Int(delay))ms")
+    scheduleTimer(&quietTimer, delay: delay) { [weak self] in
+      self?.debugLog("quiet timer fired")
+      self?.maybeEmitSteady()
+    }
+  }
+
+  private func scheduleTimeout() {
+    guard let delay = maxMs else { return }
+    scheduleTimer(&timeoutTimer, delay: delay) { [weak self] in
+      self?.emitTimeout()
+    }
+  }
+
+  private func markActivity(gestureType: String? = nil) {
+    if let gestureType = gestureType { lastGestureType = gestureType }
+    emittedForCurrentActivity = false
+    scheduleQuietCheck()
+    scheduleTimeout()
+  }
+
+  private func maybeEmitSteady() {
+    guard canEmitSteady else { return }
+    guard let lastEnd = lastTransitionEndedAtMs else { return }
+    let sinceEnd = nowMs() - lastEnd
+    guard sinceEnd >= quietMs else { return }
+    emitSteady(idleDurationMs: sinceEnd)
+  }
+
+  private func emitSteady(idleDurationMs: Double) {
+    if emittedForCurrentActivity { return }
+    cancelQuietTimer()
+    cancelTimeoutTimer()
+    let idleNs = NSNumber(value: idleDurationMs)
+    let gesture = lastGestureType
+    debugLog("EMIT steady idleDurationMs=\(idleDurationMs) lastGestureType=\(gesture ?? "nil")")
+    onMapSteady?("steady", idleNs, gesture, timestamp())
+    lastGestureType = nil
+    emittedForCurrentActivity = true
+  }
+
+  private func emitTimeout() {
+    cancelQuietTimer()
+    debugLog("EMIT timeout lastGestureType=\(lastGestureType ?? "nil")")
+    onMapSteady?("timeout", nil, lastGestureType, timestamp())
+    scheduleTimeout()
+  }
+
+  // MARK: RNMBXMapComponent
+  public override func addToMap(_ map: RNMBXMapView, style: Style) {
+    super.addToMap(map, style: style)
+
+    guard hasOnMapSteady else { return }
+
+    #if RNMBX_11
+    let camera = map.mapView.camera!
+
+    // Camera animator lifecycle
+    _cancelables.insert(camera.onCameraAnimatorStarted.observe { [weak self] _ in
+      guard let self = self else { return }
+      self.activeAnimations += 1
+      self.lastTransitionEndedAtMs = nil
+      self.markActivity()
+      self.debugLog("camera animator started")
+    })
+    let handleAnimatorEnd: (CameraAnimator) -> Void = { [weak self] _ in
+      guard let self = self else { return }
+      self.activeAnimations -= 1
+      #if DEBUG
+      if self.activeAnimations < 0 {
+        print("[RNMBXCameraGestureObserver] WARNING: activeAnimations went negative, resetting to 0")
+        self.activeAnimations = 0
+      }
+      #endif
+      self.lastTransitionEndedAtMs = self.nowMs()
+      self.scheduleQuietCheck()
+      self.debugLog("camera animator ended")
+    }
+    _cancelables.insert(camera.onCameraAnimatorFinished.observe(handleAnimatorEnd))
+    _cancelables.insert(camera.onCameraAnimatorCancelled.observe(handleAnimatorEnd))
+
+    // Subscribe to gestures as a secondary observer (multicast from RNMBXMapView)
+    map.addGestureDelegate(self)
+    debugLog("addToMap and subscribed to gestures")
+    #endif
+  }
+
+  public override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
+    #if RNMBX_11
+    _cancelables.forEach { $0.cancel() }
+    _cancelables.removeAll()
+    #endif
+    map.removeGestureDelegate(self)
+    debugLog("removeFromMap and unsubscribed from gestures")
+    cancelQuietTimer()
+    cancelTimeoutTimer()
+    return super.removeFromMap(map, reason: reason)
+  }
+
+  // MARK: GestureManagerDelegate
+  public func gestureManager(_ gestureManager: MapboxMaps.GestureManager, didBegin gestureType: MapboxMaps.GestureType) {
+    isGestureActive = true
+    lastGestureType = normalizeGestureType(gestureType)
+    lastTransitionEndedAtMs = nil
+    markActivity(gestureType: lastGestureType)
+    debugLog("gesture didBegin type=\(lastGestureType ?? "")")
+  }
+
+  public func gestureManager(_ gestureManager: MapboxMaps.GestureManager, didEnd gestureType: MapboxMaps.GestureType, willAnimate: Bool) {
+    lastGestureType = normalizeGestureType(gestureType)
+    if !willAnimate {
+      isGestureActive = false
+      lastTransitionEndedAtMs = nowMs()
+    }
+    markActivity(gestureType: lastGestureType)
+    debugLog("gesture didEnd type=\(lastGestureType ?? "") willAnimate=\(willAnimate) -> isGestureActive=\(isGestureActive)")
+  }
+
+  public func gestureManager(_ gestureManager: MapboxMaps.GestureManager, didEndAnimatingFor gestureType: MapboxMaps.GestureType) {
+    isGestureActive = false
+    lastTransitionEndedAtMs = nowMs()
+    scheduleQuietCheck()
+    debugLog("gesture didEndAnimatingFor type=\(gestureType)")
+  }
+}

package/ios/RNMBX/RNMBXCameraGestureObserverComponentView.h

@@ -0,0 +1,15 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMBXCameraGestureObserverComponentView : RCTViewComponentView
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // RCT_NEW_ARCH_ENABLED