react-native-maps 1.3.2-beta.1 → 1.3.2-beta.2

package/android/src/main/java/com/airbnb/android/react/maps/AirMapView.java

@@ -89,7 +89,9 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   private boolean moveOnMarkerPress = true;
   private boolean cacheEnabled = false;
   private ReadableMap initialRegion;
+  private ReadableMap initialCamera;
   private ReadableMap region;
+  private ReadableMap camera;
   private String customMapStyleString;
   private boolean initialRegionSet = false;
   private boolean initialCameraSet = false;
@@ -467,8 +469,11 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   }
 
   public void setInitialCamera(ReadableMap initialCamera) {
-    if (!initialCameraSet && initialCamera != null) {
-      setCamera(initialCamera);
+    this.initialCamera = initialCamera;
+    // Theoretically onMapReady might be called before setInitialCamera
+    // In that case, trigger moveToCamera manually
+    if (!initialCameraSet && map != null) {
+      moveToCamera(initialCamera);
       initialCameraSet = true;
     }
   }
@@ -477,8 +482,13 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
     if(initialRegion != null) {
       moveToRegion(initialRegion);
       initialRegionSet = true;
-    } else {
+    } else if(initialCamera != null) {
+      moveToCamera(initialCamera);
+      initialCameraSet = true;
+    } else if(region != null) {
       moveToRegion(region);
+    } else {
+      moveToCamera(camera);
     }
     if(customMapStyleString != null) {
       map.setMapStyle(new MapStyleOptions(customMapStyleString));
@@ -517,6 +527,13 @@ public class AirMapView extends MapView implements GoogleMap.InfoWindowAdapter,
   }
 
   public void setCamera(ReadableMap camera) {
+    this.camera = camera;
+    if(camera != null && map != null) {
+      moveToCamera(camera);
+    }
+  }
+
+  public void moveToCamera(ReadableMap camera) {
     if (camera == null) return;
 
     CameraPosition.Builder builder = new CameraPosition.Builder();

package/lib/MapView.js

@@ -330,6 +330,7 @@ class MapView extends React.Component {
                 style: this.props.style,
                 region: null,
                 initialRegion: this.props.initialRegion || null,
+                initialCamera: this.props.initialCamera,
                 ref: this.map,
                 onChange: this._onChange,
                 onMapReady: this._onMapReady,

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.3.2-beta.1",
+  "version": "1.3.2-beta.2",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -52,21 +52,21 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "17.0.3",
-    "@commitlint/config-conventional": "17.0.3",
-    "@react-native-community/eslint-config": "3.0.3",
+    "@commitlint/cli": "17.1.2",
+    "@commitlint/config-conventional": "17.1.0",
+    "@react-native-community/eslint-config": "3.1.0",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
-    "@types/react-native": "0.69.3",
-    "babel-jest": "^27.3.1",
-    "eslint": "^7.32.0",
+    "@types/react-native": "0.70.3",
+    "babel-jest": "29.0.3",
+    "eslint": "8.23.1",
     "husky": "8.0.1",
-    "jest": "^27.3.1",
+    "jest": "29.0.3",
     "prettier": "2.7.1",
-    "react": "18.0.0",
-    "react-native": "0.69.2",
-    "semantic-release": "19.0.3",
-    "typescript": "4.7.4"
+    "react": "18.1.0",
+    "react-native": "0.70.1",
+    "semantic-release": "19.0.5",
+    "typescript": "4.8.3"
   },
   "dependencies": {
     "@types/geojson": "^7946.0.8"