react-native-maps 1.26.0 → 1.26.2

package/README.md

@@ -16,22 +16,24 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 
 ## React Native Compatibility
 
-### Important Notes:
-
-- **Fabric is now supported**:  
-  Fabric is now supported for the latest version of the library, **latest version is strongly recommended** because many regressions appeared after the release of v1.22.0 if you don't have Fabric (New Arch) enabled, please use v1.21.0 or earlier
-
 ### Version Requirements:
 
-#### Fabric Only
+## Compatibility
+
+### Fabric (New Architecture)
 
-- **Version `1.22.0` and below**: Requires **React Native `>= 0.76`**.
+| Version          | React Native Requirement |
+| ---------------- | ------------------------ |
+| 1.26.1+          | >= 0.81.1                |
+| 1.26.0 and below | >= 0.76                  |
 
-#### Old Arch
+### Old Architecture
 
-- **Version `1.21.1` and below**: Requires **React Native `>= 0.74`**.
-- **Version `1.14.0` and above**: Requires **React Native `>= 0.74`**.
-- **Versions below `1.14.0`**: Require **React Native `>= 0.64.3`**.
+| 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                |
 
 ## Component API
 

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsCalloutManagerInterface.java

@@ -10,8 +10,9 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsCalloutManagerInterface<T extends View> {
+public interface RNMapsCalloutManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setAlphaHitTest(T view, boolean value);
   void setTooltip(T view, boolean value);
 }

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsCircleManagerInterface.java

@@ -12,8 +12,9 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsCircleManagerInterface<T extends View> {
+public interface RNMapsCircleManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setCenter(T view, @Nullable ReadableMap value);
   void setFillColor(T view, @Nullable Integer value);
   void setRadius(T view, double value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsGooglePolygonManagerInterface.java

@@ -12,8 +12,9 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsGooglePolygonManagerInterface<T extends View> {
+public interface RNMapsGooglePolygonManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setCoordinates(T view, @Nullable ReadableArray value);
   void setFillColor(T view, @Nullable Integer value);
   void setStrokeColor(T view, @Nullable Integer value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsMapViewManagerDelegate.java

@@ -187,7 +187,7 @@ public class RNMapsMapViewManagerDelegate<T extends View, U extends BaseViewMana
   }
 
   @Override
-  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
+  public void receiveCommand(T view, String commandName, ReadableArray args) {
     switch (commandName) {
       case "animateToRegion":
         mViewManager.animateToRegion(view, args.getString(0), args.getInt(1));

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsMapViewManagerInterface.java

@@ -13,8 +13,9 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsMapViewManagerInterface<T extends View> {
+public interface RNMapsMapViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setCacheEnabled(T view, boolean value);
   void setCamera(T view, @Nullable ReadableMap value);
   void setCompassOffset(T view, @Nullable ReadableMap value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsMarkerManagerDelegate.java

@@ -85,7 +85,7 @@ public class RNMapsMarkerManagerDelegate<T extends View, U extends BaseViewManag
   }
 
   @Override
-  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
+  public void receiveCommand(T view, String commandName, ReadableArray args) {
     switch (commandName) {
       case "animateToCoordinates":
         mViewManager.animateToCoordinates(view, args.getDouble(0), args.getDouble(1), args.getInt(2));

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsMarkerManagerInterface.java

@@ -12,8 +12,9 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsMarkerManagerInterface<T extends View> {
+public interface RNMapsMarkerManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setAnchor(T view, @Nullable ReadableMap value);
   void setCalloutAnchor(T view, @Nullable ReadableMap value);
   void setImage(T view, @Nullable ReadableMap value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsOverlayManagerInterface.java

@@ -12,8 +12,9 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsOverlayManagerInterface<T extends View> {
+public interface RNMapsOverlayManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setBearing(T view, float value);
   void setBounds(T view, @Nullable ReadableMap value);
   void setImage(T view, @Nullable ReadableMap value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsPolylineManagerInterface.java

@@ -12,8 +12,9 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsPolylineManagerInterface<T extends View> {
+public interface RNMapsPolylineManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setCoordinates(T view, @Nullable ReadableArray value);
   void setGeodesic(T view, boolean value);
   void setLineCap(T view, @Nullable String value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsUrlTileManagerInterface.java

@@ -11,8 +11,9 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsUrlTileManagerInterface<T extends View> {
+public interface RNMapsUrlTileManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setDoubleTileSize(T view, boolean value);
   void setFlipY(T view, boolean value);
   void setMaximumNativeZ(T view, int value);

package/android/src/main/java/com/facebook/react/viewmanagers/RNMapsWMSTileManagerInterface.java

@@ -11,8 +11,9 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMapsWMSTileManagerInterface<T extends View> {
+public interface RNMapsWMSTileManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setMaximumNativeZ(T view, int value);
   void setMaximumZ(T view, int value);
   void setMinimumZ(T view, int value);

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;
+            }
         }
     }
 

package/android/src/main/jni/CMakeLists.txt

@@ -25,12 +25,4 @@ target_link_libraries(
   reactnative
 )
 
-target_compile_options(
-  react_codegen_RNMapsSpecs
-  PRIVATE
-  -DLOG_TAG=\"ReactNative\"
-  -fexceptions
-  -frtti
-  -std=c++20
-  -Wall
-)
+target_compile_reactnative_options(react_codegen_RNMapsSpecs PRIVATE)