react-native-maps 1.26.1 → 1.26.3

package/README.md

@@ -29,11 +29,10 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 
 ### Old Architecture
 
-| Version          | React Native Requirement |
-| ---------------- | ------------------------ |
-| 1.21.1 and below | >= 0.74                  |
-| 1.14.0 - 1.21.1  | >= 0.74                  |
-| < 1.14.0         | >= 0.64.3                |
+| Version         | React Native Requirement |
+| --------------- | ------------------------ |
+| 1.14.0 - 1.20.1 | >= 0.74                  |
+| < 1.14.0        | >= 0.64.3                |
 
 ## Component API
 

package/android/src/main/java/com/rnmaps/fabric/NativeAirMapsModule.java

@@ -57,6 +57,10 @@ public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
             @Override
             public void run() {
                 MapView view = (MapView) uiManager.resolveView((int) tag);
+                if (view == null || view.map == null) {
+                    promise.reject("E_MAP_CAMERA", "Cannot get camera position because map view is null");
+                    return;
+                }
                 CameraPosition position = view.map.getCameraPosition();
                 WritableMap map = Arguments.createMap();
                 WritableMap center = Arguments.createMap();
@@ -77,6 +81,10 @@ public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
         UIManager uiManager = UIManagerHelper.getUIManagerForReactTag(getReactApplicationContext(), (int) tag);
         getReactApplicationContext().runOnUiQueueThread(() -> {
             MapView view = (MapView) uiManager.resolveView((int) tag);
+            if (view == null) {
+                promise.reject("E_MAP_MARKERS", "Cannot get markers frames because map view is null");
+                return;
+            }
             double[][] boundaries = view.getMarkersFrames(onlyVisible);
             if (boundaries != null) {
                 WritableMap coordinates = new WritableNativeMap();
@@ -103,7 +111,15 @@ public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
         UIManager uiManager = UIManagerHelper.getUIManagerForReactTag(getReactApplicationContext(), (int) tag);
         getReactApplicationContext().runOnUiQueueThread(() -> {
             MapView view = (MapView) uiManager.resolveView((int) tag);
+            if (view == null) {
+                promise.reject("E_MAP_BOUNDARIES", "Cannot get map boundaries because map view is null");
+                return;
+            }
             double[][] boundaries = view.getMapBoundaries();
+            if (boundaries == null) {
+                promise.reject("E_MAP_BOUNDARIES", "Map boundaries are null");
+                return;
+            }
             WritableMap coordinates = new WritableNativeMap();
             WritableMap northEastHash = new WritableNativeMap();
             WritableMap southWestHash = new WritableNativeMap();
@@ -147,6 +163,10 @@ public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
                     @Override
                     public void run() {
                         MapView view = (MapView) uiManager.resolveView((int) tag);
+                        if (view == null || view.map == null) {
+                            promise.reject("E_SNAPSHOT", "Cannot take snapshot because map view or map is null");
+                            return;
+                        }
                         view.map.snapshot(snapshot -> {
 
                             // Convert image to requested width/height if necessary

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -91,6 +91,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     public GoogleMap map;
     private Bundle savedMapState;
     private Map<Integer, MapFeature> savedFeatures = new HashMap<>();
+    private boolean shouldRestorePadding = false;
 
     private MarkerManager markerManager;
     private MarkerManager.Collection markerCollection;
@@ -342,6 +343,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         super.onStop();
         savedFeatures = new HashMap<>(features);
         savedFeatures.keySet().forEach(this::removeFeatureAt);
+        shouldRestorePadding = true;
         removeView(attacherGroup);
         attacherGroup = null;
         detachLifecycleObserver();
@@ -781,12 +783,12 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
 
     private void applyBridgedProps() {
-        if (initialRegion != null) {
+        if (initialRegion != null && !initialRegionSet) {
             moveToRegion(initialRegion);
             initialRegionSet = true;
         } else if (region != null) {
             moveToRegion(region);
-        } else if (initialCamera != null) {
+        } else if (initialCamera != null && !initialCameraSet) {
             moveToCamera(initialCamera);
             initialCameraSet = true;
         } else if (camera != null) {
@@ -796,12 +798,18 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             map.setMapStyle(new MapStyleOptions(customMapStyleString));
         }
         this.setPoiClickEnabled(poiClickEnabled);
-        if (setPaddingDeferred &&
-                (baseLeftMapPadding != 0 ||
-                        baseTopMapPadding != 0 ||
-                        baseRightMapPadding != 0 ||
-                        baseBottomMapPadding != 0)) {
-            applyBaseMapPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
+        if (baseLeftMapPadding != 0 ||
+                baseTopMapPadding != 0 ||
+                baseRightMapPadding != 0 ||
+                baseBottomMapPadding != 0) {
+            if (setPaddingDeferred) {
+                applyBaseMapPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
+            } else if (shouldRestorePadding) {
+                CameraUpdate cu = CameraUpdateFactory.newCameraPosition(map.getCameraPosition());
+                map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
+                map.moveCamera(cu);
+                shouldRestorePadding = false;
+            }
         }
     }
 
@@ -1134,6 +1142,10 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
                 annotationParent.removeView(annotation);
             }
 
+            // Ensure attacherGroup is not null before using it
+            if (attacherGroup == null) {
+                prepareAttacherView();
+            }
             // Add to the parent group
             attacherGroup.addView(annotation);
 

package/package.json

@@ -5,7 +5,7 @@
   "main": "src/index.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.26.1",
+  "version": "1.26.3",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",