fix: address CodeRabbit follow-up comments

Author: piotr-graczyk-dev

example/App.tsx

@@ -231,6 +231,7 @@ type ScenarioDockProps = {
   expanded: boolean;
   mapTypeLabel: MapType;
   providerLabel: string;
+  canCycleProvider: boolean;
   onToggleExpanded: () => void;
   onSelect: (index: number) => void;
   onAnimateCamera: () => void;
@@ -245,6 +246,7 @@ const ScenarioDock = memo(function ScenarioDock({
   expanded,
   mapTypeLabel,
   providerLabel,
+  canCycleProvider,
   onToggleExpanded,
   onSelect,
   onAnimateCamera,
@@ -313,10 +315,12 @@ const ScenarioDock = memo(function ScenarioDock({
                 {MAP_TYPE_LABELS[mapTypeLabel]}
               </Text>
             </ScalePressable>
-            <ScalePressable onPress={onCycleProvider} style={styles.actionButton}>
-              <Text style={styles.actionButtonIcon}>⌁</Text>
-              <Text style={styles.actionButtonText}>{providerLabel}</Text>
-            </ScalePressable>
+            {canCycleProvider ? (
+              <ScalePressable onPress={onCycleProvider} style={styles.actionButton}>
+                <Text style={styles.actionButtonIcon}>⌁</Text>
+                <Text style={styles.actionButtonText}>{providerLabel}</Text>
+              </ScalePressable>
+            ) : null}
           </View>
         </Animated.View>
       ) : null}
@@ -648,6 +652,7 @@ export default function App() {
         expanded={dockExpanded}
         mapTypeLabel={MAP_TYPES[mapTypeIndex]}
         providerLabel={PROVIDER_LABELS[provider]}
+        canCycleProvider={SUPPORTED_MAP_PROVIDERS.length > 1}
         onToggleExpanded={toggleDockExpanded}
         onSelect={selectScenario}
         onAnimateCamera={handleAnimateCamera}

package/ios/AppleMapProviderAdapter.swift

@@ -5,6 +5,8 @@ import UIKit
 final class AppleMapProviderAdapter: MapProviderAdapter {
   private let mapViewDelegate = HybridMapViewDelegate()
   private var isProgrammaticUpdate = false
+  private var pendingProgrammaticUpdateIDs: [Int] = []
+  private var nextProgrammaticUpdateID = 0
   private var isMapReady = false
   private var hasDeliveredMapReady = false
   private var liveClusterTimer: Timer?
@@ -210,34 +212,47 @@ final class AppleMapProviderAdapter: MapProviderAdapter {
     }
 
     let edgePadding = padding?.toUIEdgeInsets() ?? .zero
-    isProgrammaticUpdate = true
+    let shouldAnimate = animated ?? true
+    let updateID = beginProgrammaticUpdate()
     view.setVisibleMapRect(
       mapRect,
       edgePadding: edgePadding,
-      animated: animated ?? true
+      animated: shouldAnimate
+    )
+    scheduleProgrammaticUpdateFallback(
+      for: updateID,
+      delay: shouldAnimate ? 1.0 : 0
     )
-    isProgrammaticUpdate = false
   }
 
   func applyRegion(_ region: Region, animated: Bool = false) {
-    isProgrammaticUpdate = true
+    let updateID = beginProgrammaticUpdate()
     view.setRegion(region.toMKCoordinateRegion(), animated: animated)
-    isProgrammaticUpdate = false
+    scheduleProgrammaticUpdateFallback(
+      for: updateID,
+      delay: animated ? 1.0 : 0
+    )
   }
 
   func updateMapCamera(_ camera: Camera, animated: Bool, duration: Double = 0) {
-    isProgrammaticUpdate = true
+    let updateID = beginProgrammaticUpdate()
     let mapCamera = camera.toMKMapCamera()
 
     if animated {
-      UIView.animate(withDuration: duration) {
-        self.view.camera = mapCamera
-      }
+      UIView.animate(
+        withDuration: duration,
+        animations: {
+          self.view.camera = mapCamera
+        },
+        completion: { [weak self] _ in
+          self?.endProgrammaticUpdate(updateID)
+        }
+      )
+      scheduleProgrammaticUpdateFallback(for: updateID, delay: duration + 0.1)
     } else {
       view.camera = mapCamera
+      scheduleProgrammaticUpdateFallback(for: updateID, delay: 0)
     }
-
-    isProgrammaticUpdate = false
   }
 
   // Derived from MKCoordinateRegion (center + span). May differ from Android
@@ -254,6 +269,45 @@ final class AppleMapProviderAdapter: MapProviderAdapter {
     view.setRegion(view.regionThatFits(region), animated: true)
   }
 
+  private func beginProgrammaticUpdate() -> Int {
+    nextProgrammaticUpdateID += 1
+    let updateID = nextProgrammaticUpdateID
+    pendingProgrammaticUpdateIDs.append(updateID)
+    isProgrammaticUpdate = true
+    return updateID
+  }
+
+  private func endProgrammaticUpdate(_ updateID: Int? = nil) {
+    if let updateID {
+      guard let index = pendingProgrammaticUpdateIDs.firstIndex(of: updateID) else {
+        return
+      }
+      pendingProgrammaticUpdateIDs.remove(at: index)
+    } else if !pendingProgrammaticUpdateIDs.isEmpty {
+      pendingProgrammaticUpdateIDs.removeFirst()
+    }
+
+    isProgrammaticUpdate = !pendingProgrammaticUpdateIDs.isEmpty
+  }
+
+  func endProgrammaticRegionChangeIfNeeded() {
+    guard !pendingProgrammaticUpdateIDs.isEmpty else {
+      return
+    }
+
+    endProgrammaticUpdate()
+  }
+
+  private func scheduleProgrammaticUpdateFallback(for updateID: Int, delay: TimeInterval) {
+    DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
+      guard let self else {
+        return
+      }
+
+      self.endProgrammaticUpdate(updateID)
+    }
+  }
+
   func startLiveClustering() {
     guard liveClusterTimer == nil else {
       return
@@ -340,6 +394,7 @@ final class AppleMapProviderAdapter: MapProviderAdapter {
     liveClusterTimer?.invalidate()
     liveClusterTimer = nil
     isProgrammaticUpdate = false
+    pendingProgrammaticUpdateIDs.removeAll()
     isMapReady = false
     hasDeliveredMapReady = false
     onRegionChange = nil

package/ios/HybridMapViewDelegate.swift

@@ -74,6 +74,7 @@ final class HybridMapViewDelegate: NSObject, MKMapViewDelegate, UIGestureRecogni
   func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) {
     parent?.stopLiveClustering()
     parent?.notifyRegionChange(complete: true)
+    parent?.endProgrammaticRegionChangeIfNeeded()
   }
 
   func mapViewDidFinishLoadingMap(_ mapView: MKMapView) {

package/scripts/patch-nitrogen-generated.mjs

@@ -7,11 +7,17 @@ const packageDir = join(scriptDir, '..');
 
 function replaceOnce(filePath, from, to) {
   const source = readFileSync(filePath, 'utf8');
-  if (!source.includes(from)) {
-    if (source.includes(to)) {
-      return;
-    }
-    throw new Error(`Expected generated code was not found in ${filePath}`);
+  const fromCount = source.split(from).length - 1;
+  const toCount = source.split(to).length - 1;
+
+  if (fromCount === 0 && toCount === 1) {
+    return;
+  }
+
+  if (fromCount !== 1) {
+    throw new Error(
+      `Expected exactly one patch target in ${filePath}, found ${fromCount}`,
+    );
   }
 
   writeFileSync(filePath, source.replace(from, to));