react-native-maps 1.24.8 → 1.24.10

package/android/src/main/RCTThirdPartyComponentsProvider.mm

@@ -16,8 +16,6 @@
 + (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
 {
   return @{
-		@"RNMapsGoogleMapView": NSClassFromString(@"RNMapsGoogleMapView"), // react-native-maps
-		@"RNMapsGooglePolygon": NSClassFromString(@"RNMapsGooglePolygonView"), // react-native-maps
 		@"RNMapsGoogleMapView": NSClassFromString(@"RNMapsGoogleMapView"), // react-native-maps
 		@"RNMapsGooglePolygon": NSClassFromString(@"RNMapsGooglePolygonView"), // react-native-maps
 		@"RNMapsMapView": NSClassFromString(@"RNMapsMapView"), // react-native-maps

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

@@ -37,7 +37,7 @@ public class RNMapsCircleManagerDelegate<T extends View, U extends BaseViewManag
         mViewManager.setStrokeColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "strokeWidth":
-        mViewManager.setStrokeWidth(view, value == null ? 0f : ((Double) value).floatValue());
+        mViewManager.setStrokeWidth(view, value == null ? 1f : ((Double) value).floatValue());
         break;
       case "tappable":
         mViewManager.setTappable(view, value == null ? false : (boolean) value);

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

@@ -33,6 +33,9 @@ public class RNMapsGooglePolygonManagerDelegate<T extends View, U extends BaseVi
       case "strokeColor":
         mViewManager.setStrokeColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
+      case "strokeWidth":
+        mViewManager.setStrokeWidth(view, value == null ? 1f : ((Double) value).floatValue());
+        break;
       case "geodesic":
         mViewManager.setGeodesic(view, value == null ? false : (boolean) value);
         break;

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

@@ -17,6 +17,7 @@ public interface RNMapsGooglePolygonManagerInterface<T extends View> {
   void setCoordinates(T view, @Nullable ReadableArray value);
   void setFillColor(T view, @Nullable Integer value);
   void setStrokeColor(T view, @Nullable Integer value);
+  void setStrokeWidth(T view, float value);
   void setGeodesic(T view, boolean value);
   void setHoles(T view, @Nullable ReadableArray value);
   void setTappable(T view, boolean value);

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

@@ -40,6 +40,9 @@ public class RNMapsMarkerManagerDelegate<T extends View, U extends BaseViewManag
       case "displayPriority":
         mViewManager.setDisplayPriority(view, (String) value);
         break;
+      case "centerOffset":
+        mViewManager.setCenterOffset(view, (ReadableMap) value);
+        break;
       case "coordinate":
         mViewManager.setCoordinate(view, (ReadableMap) value);
         break;
@@ -52,6 +55,9 @@ public class RNMapsMarkerManagerDelegate<T extends View, U extends BaseViewManag
       case "title":
         mViewManager.setTitle(view, value == null ? null : (String) value);
         break;
+      case "tracksViewChanges":
+        mViewManager.setTracksViewChanges(view, value == null ? true : (boolean) value);
+        break;
       case "identifier":
         mViewManager.setIdentifier(view, value == null ? null : (String) value);
         break;

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

@@ -19,10 +19,12 @@ public interface RNMapsMarkerManagerInterface<T extends View> {
   void setImage(T view, @Nullable ReadableMap value);
   void setCalloutOffset(T view, @Nullable ReadableMap value);
   void setDisplayPriority(T view, @Nullable String value);
+  void setCenterOffset(T view, @Nullable ReadableMap value);
   void setCoordinate(T view, @Nullable ReadableMap value);
   void setDescription(T view, @Nullable String value);
   void setDraggable(T view, boolean value);
   void setTitle(T view, @Nullable String value);
+  void setTracksViewChanges(T view, boolean value);
   void setIdentifier(T view, @Nullable String value);
   void setIsPreselected(T view, boolean value);
   void setOpacity(T view, double value);

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

@@ -46,7 +46,7 @@ public class RNMapsPolylineManagerDelegate<T extends View, U extends BaseViewMan
         mViewManager.setStrokeColors(view, (ReadableArray) value);
         break;
       case "strokeWidth":
-        mViewManager.setStrokeWidth(view, value == null ? 0f : ((Double) value).floatValue());
+        mViewManager.setStrokeWidth(view, value == null ? 1f : ((Double) value).floatValue());
         break;
       case "tappable":
         mViewManager.setTappable(view, value == null ? false : (boolean) value);

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

@@ -158,6 +158,10 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     }
 
+    @Override
+    public void setCenterOffset(MapMarker view, @Nullable ReadableMap value) {
+    }
+
     @Override
     public void setCoordinate(MapMarker view, @Nullable ReadableMap value) {
         view.setCoordinate(value);
@@ -182,6 +186,11 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
         view.setUpdated(true);
     }
 
+    @Override
+    public void setTracksViewChanges(MapMarker view, boolean value) {
+        view.setTracksViewChanges(value);
+    }
+
     @Override
     public void setIdentifier(MapMarker view, @Nullable String value) {
         view.setIdentifier(value);

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

@@ -2,7 +2,7 @@ package com.rnmaps.fabric;
 
 
 import androidx.annotation.Nullable;
-
+import android.util.DisplayMetrics;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.module.annotations.ReactModule;
@@ -72,6 +72,13 @@ public class PolygonManager extends ViewGroupManager<MapPolygon> implements RNMa
         view.setStrokeColor(value);
     }
 
+    @Override
+    public void setStrokeWidth(MapPolygon view, float value) {
+        DisplayMetrics metrics = view.getContext().getResources().getDisplayMetrics();
+        float widthInScreenPx = metrics.density * value; // done for parity with iOS
+        view.setStrokeWidth(widthInScreenPx);
+    }
+
     @Override
     public void setGeodesic(MapPolygon view, boolean value) {
         view.setGeodesic(value);
@@ -86,4 +93,4 @@ public class PolygonManager extends ViewGroupManager<MapPolygon> implements RNMa
     public void setTappable(MapPolygon view, boolean value) {
             view.setTappable(value);
     }
-}
+}

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.cpp

@@ -32,7 +32,7 @@ RNMapsCircleProps::RNMapsCircleProps(
     fillColor(convertRawProp(context, rawProps, "fillColor", sourceProps.fillColor, {})),
     radius(convertRawProp(context, rawProps, "radius", sourceProps.radius, {0.0})),
     strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
-    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {0.0})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
       {}
 RNMapsGoogleMapViewProps::RNMapsGoogleMapViewProps(
@@ -83,6 +83,7 @@ RNMapsGooglePolygonProps::RNMapsGooglePolygonProps(
     coordinates(convertRawProp(context, rawProps, "coordinates", sourceProps.coordinates, {})),
     fillColor(convertRawProp(context, rawProps, "fillColor", sourceProps.fillColor, {})),
     strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     geodesic(convertRawProp(context, rawProps, "geodesic", sourceProps.geodesic, {false})),
     holes(convertRawProp(context, rawProps, "holes", sourceProps.holes, {})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
@@ -153,10 +154,12 @@ RNMapsMarkerProps::RNMapsMarkerProps(
     image(convertRawProp(context, rawProps, "image", sourceProps.image, {})),
     calloutOffset(convertRawProp(context, rawProps, "calloutOffset", sourceProps.calloutOffset, {})),
     displayPriority(convertRawProp(context, rawProps, "displayPriority", sourceProps.displayPriority, {RNMapsMarkerDisplayPriority::Required})),
+    centerOffset(convertRawProp(context, rawProps, "centerOffset", sourceProps.centerOffset, {})),
     coordinate(convertRawProp(context, rawProps, "coordinate", sourceProps.coordinate, {})),
     description(convertRawProp(context, rawProps, "description", sourceProps.description, {})),
     draggable(convertRawProp(context, rawProps, "draggable", sourceProps.draggable, {false})),
     title(convertRawProp(context, rawProps, "title", sourceProps.title, {})),
+    tracksViewChanges(convertRawProp(context, rawProps, "tracksViewChanges", sourceProps.tracksViewChanges, {true})),
     identifier(convertRawProp(context, rawProps, "identifier", sourceProps.identifier, {})),
     isPreselected(convertRawProp(context, rawProps, "isPreselected", sourceProps.isPreselected, {false})),
     opacity(convertRawProp(context, rawProps, "opacity", sourceProps.opacity, {1.0})),
@@ -188,7 +191,7 @@ RNMapsPolylineProps::RNMapsPolylineProps(
     lineJoin(convertRawProp(context, rawProps, "lineJoin", sourceProps.lineJoin, {RNMapsPolylineLineJoin::Miter})),
     strokeColor(convertRawProp(context, rawProps, "strokeColor", sourceProps.strokeColor, {})),
     strokeColors(convertRawProp(context, rawProps, "strokeColors", sourceProps.strokeColors, {})),
-    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {0.0})),
+    strokeWidth(convertRawProp(context, rawProps, "strokeWidth", sourceProps.strokeWidth, {1.0})),
     tappable(convertRawProp(context, rawProps, "tappable", sourceProps.tappable, {false}))
       {}
 RNMapsUrlTileProps::RNMapsUrlTileProps(

package/android/src/main/jni/react/renderer/components/RNMapsSpecs/Props.h

@@ -61,7 +61,7 @@ class RNMapsCircleProps final : public ViewProps {
   SharedColor fillColor{};
   double radius{0.0};
   SharedColor strokeColor{};
-  Float strokeWidth{0.0};
+  Float strokeWidth{1.0};
   bool tappable{false};
 };
 
@@ -478,6 +478,7 @@ class RNMapsGooglePolygonProps final : public ViewProps {
   std::vector<RNMapsGooglePolygonCoordinatesStruct> coordinates{};
   SharedColor fillColor{};
   SharedColor strokeColor{};
+  Float strokeWidth{1.0};
   bool geodesic{false};
   std::vector<std::vector<RNMapsGooglePolygonHolesStruct>> holes{};
   bool tappable{false};
@@ -1048,6 +1049,28 @@ static inline std::string toString(const RNMapsMarkerCalloutOffsetStruct &value)
   return "[Object RNMapsMarkerCalloutOffsetStruct]";
 }
 
+struct RNMapsMarkerCenterOffsetStruct {
+  double x{0.0};
+  double y{0.0};
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, RNMapsMarkerCenterOffsetStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_x = map.find("x");
+  if (tmp_x != map.end()) {
+    fromRawValue(context, tmp_x->second, result.x);
+  }
+  auto tmp_y = map.find("y");
+  if (tmp_y != map.end()) {
+    fromRawValue(context, tmp_y->second, result.y);
+  }
+}
+
+static inline std::string toString(const RNMapsMarkerCenterOffsetStruct &value) {
+  return "[Object RNMapsMarkerCenterOffsetStruct]";
+}
+
 struct RNMapsMarkerCoordinateStruct {
   double latitude{0.0};
   double longitude{0.0};
@@ -1081,10 +1104,12 @@ class RNMapsMarkerProps final : public ViewProps {
   ImageSource image{};
   RNMapsMarkerCalloutOffsetStruct calloutOffset{};
   RNMapsMarkerDisplayPriority displayPriority{RNMapsMarkerDisplayPriority::Required};
+  RNMapsMarkerCenterOffsetStruct centerOffset{};
   RNMapsMarkerCoordinateStruct coordinate{};
   std::string description{};
   bool draggable{false};
   std::string title{};
+  bool tracksViewChanges{true};
   std::string identifier{};
   bool isPreselected{false};
   double opacity{1.0};
@@ -1252,7 +1277,7 @@ class RNMapsPolylineProps final : public ViewProps {
   RNMapsPolylineLineJoin lineJoin{RNMapsPolylineLineJoin::Miter};
   SharedColor strokeColor{};
   std::vector<SharedColor> strokeColors{};
-  Float strokeWidth{0.0};
+  Float strokeWidth{1.0};
   bool tappable{false};
 };
 

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.24.8",
+  "version": "1.24.10",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/src/specs/NativeComponentMarker.ts

@@ -187,6 +187,16 @@ export interface MarkerFabricNativeProps extends ViewProps {
    */
   title?: string;
 
+  /**
+   * Sets whether this marker should track view changes.
+   * It's recommended to turn it off whenever it's possible to improve custom marker performance.
+   *
+   * @default true
+   * @platform iOS: Google Maps only
+   * @platform Android: Supported
+   */
+  tracksViewChanges?: WithDefault<boolean, true>;
+
   /**
    * A string that can be used to identify this marker.
    *