@lugg/maps 1.1.5 → 1.1.6

package/ios/core/AppleMapProvider.mm

@@ -533,6 +533,17 @@ MKMapType LuggMKMapTypeFromMapType(LuggMapViewMapType mapType) {
   _edgeInsetsDisplayLink = nil;
 }
 
+// An inset animation re-centers the map on every frame, which stops a camera
+// animation. A camera command moves the map anyway, so it takes the final
+// insets without the re-center.
+- (void)finishEdgeInsetsAnimation {
+  if (!_edgeInsetsDisplayLink)
+    return;
+  [self stopEdgeInsetsAnimation];
+  _mapView.layoutMargins = _edgeInsetsTo;
+  _edgeInsetsCurrent = _edgeInsetsTo;
+}
+
 - (CLLocationDistance)cameraDistanceForZoomLevel:(double)zoomLevel {
   return 128000000.0 / pow(2, zoomLevel);
 }
@@ -1785,6 +1796,7 @@ MKMapType LuggMKMapTypeFromMapType(LuggMapViewMapType mapType) {
   if (!_mapView)
     return;
 
+  [self finishEdgeInsetsAnimation];
   double targetZoom = zoom > 0 ? zoom : _mapView.zoomLevel;
 
   if (duration < 0) {
@@ -1837,6 +1849,7 @@ MKMapType LuggMKMapTypeFromMapType(LuggMapViewMapType mapType) {
   UIEdgeInsets insets = UIEdgeInsetsMake(edgeInsetsTop, edgeInsetsLeft,
                                          edgeInsetsBottom, edgeInsetsRight);
 
+  [self finishEdgeInsetsAnimation];
   if (duration < 0) {
     [_mapView setVisibleMapRect:mapRect edgePadding:insets animated:YES];
   } else if (duration > 0) {

package/ios/core/GoogleMapProvider.mm

@@ -1176,18 +1176,26 @@ LuggInterfaceStyleFromTheme(facebook::react::LuggMapViewTheme theme) {
 
   UIEdgeInsets insets = UIEdgeInsetsMake(edgeInsetsTop, edgeInsetsLeft,
                                          edgeInsetsBottom, edgeInsetsRight);
-  GMSCameraUpdate *cameraUpdate = [GMSCameraUpdate fitBounds:bounds
-                                              withEdgeInsets:insets];
+
+  // An inset animation may still be moving the padding toward _edgeInsets.
+  // Fit against the padding it ends at: the camera target stays centered in
+  // the padding while the animation finishes.
+  UIEdgeInsets padding = _mapView.padding;
+  _mapView.padding = _edgeInsets;
+  GMSCameraPosition *camera = [_mapView cameraForBounds:bounds insets:insets];
+  _mapView.padding = padding;
+  if (!camera)
+    return;
 
   if (duration < 0) {
-    [_mapView animateWithCameraUpdate:cameraUpdate];
+    [_mapView animateToCameraPosition:camera];
   } else if (duration > 0) {
     [CATransaction begin];
     [CATransaction setAnimationDuration:duration / 1000.0];
-    [_mapView animateWithCameraUpdate:cameraUpdate];
+    [_mapView animateToCameraPosition:camera];
     [CATransaction commit];
   } else {
-    [_mapView moveCamera:cameraUpdate];
+    [_mapView setCamera:camera];
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lugg/maps",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Universal maps for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",