react-native-maps 1.25.0-alpha.7 → 1.25.0

package/README.md

@@ -19,7 +19,7 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 ### Important Notes:
 
 - **Fabric is now supported**:  
-  Fabric is now supported for the latest version of the library, if you don't have Fabric (New Arch) enabled, please use v1.21.0 or earlier
+  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:
 
@@ -29,7 +29,7 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 
 #### Old Arch
 
-- **Version `1.21.0` and below**: Requires **React Native `>= 0.74`**.
+- **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`**.
 
@@ -214,57 +214,6 @@ For Android: add the following line in your AndroidManifest.xml
 
 For IOS: configure [App Transport Security](https://developer.apple.com/library/content/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html#//apple_ref/doc/uid/TP40009251-SW33) in your app
 
-## React Native Configuration for Fabric / New Architecture
-
-This library doesn't support the new arch yet due to issues with inserting subviews / interoplayer. we're working on it.
-
-### Configuration Steps
-
-1. **Open your configuration file**: Locate the `react-native-config` file in your project directory.
-
-2. **Add the following configuration**: Include the `unstable_reactLegacyComponentNames` array for both Android and iOS platforms as shown below:
-
-```javascript
-module.exports = {
-  project: {
-    android: {
-      unstable_reactLegacyComponentNames: [
-        'AIRMap',
-        'AIRMapCallout',
-        'AIRMapCalloutSubview',
-        'AIRMapCircle',
-        'AIRMapHeatmap',
-        'AIRMapLocalTile',
-        'AIRMapMarker',
-        'AIRMapOverlay',
-        'AIRMapPolygon',
-        'AIRMapPolyline',
-        'AIRMapUrlTile',
-        'AIRMapWMSTile',
-      ],
-    },
-    ios: {
-      unstable_reactLegacyComponentNames: [
-        'AIRMap',
-        'AIRMapCallout',
-        'AIRMapCalloutSubview',
-        'AIRMapCircle',
-        'AIRMapHeatmap',
-        'AIRMapLocalTile',
-        'AIRMapMarker',
-        'AIRMapOverlay',
-        'AIRMapPolygon',
-        'AIRMapPolyline',
-        'AIRMapUrlTile',
-        'AIRMapWMSTile',
-      ],
-    },
-  },
-};
-```
-
-checkout the example project to see it in action.
-
 #### Tile Overlay using local tiles
 
 Tiles can be stored locally within device using xyz tiling scheme and displayed as tile overlay as well. This is usefull especially for offline map usage when tiles are available for selected map region within device storage.

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/MapViewManager.java

@@ -618,6 +618,6 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
     @Override
     public void onDropViewInstance(MapView view) {
         super.onDropViewInstance(view);
-        view.onDestroy();
+        view.doDestroy();
     }
 }

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

@@ -134,6 +134,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
         double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
         double y = map != null && map.hasKey("y") ? map.getDouble("y") : 1.0;
         view.setAnchor(x, y);
+        view.setUpdated(true);
     }
 
     @Override
@@ -143,7 +144,12 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void setImage(MapMarker view, @Nullable ReadableMap value) {
-        view.setImage(value.getString("uri"));
+        if (value != null && value.hasKey("uri")) {
+            view.setImage(value.getString("uri"));
+        } else {
+            view.setImage(null);
+        }
+        view.setUpdated(true);
     }
 
     @Override
@@ -156,29 +162,43 @@ 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);
+        view.setUpdated(true);
     }
 
     @Override
     public void setDescription(MapMarker view, @Nullable String value) {
         view.setSnippet(value);
+        view.setUpdated(true);
     }
 
     @Override
     public void setDraggable(MapMarker view, boolean value) {
         view.setDraggable(value);
+        view.setUpdated(true);
     }
 
     @Override
     public void setTitle(MapMarker view, @Nullable String value) {
         view.setTitle(value);
+        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);
+        view.setUpdated(true);
     }
 
     @Override
@@ -189,6 +209,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
     @Override
     public void setOpacity(MapMarker view, double value) {
         view.setOpacity((float) value);
+        view.setUpdated(true);
     }
 
     @Override
@@ -197,6 +218,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
         Color.colorToHSV(value, hsv);
         // NOTE: android only supports a hue
         view.setMarkerHue(hsv[0]);
+        view.setUpdated(true);
     }
 
     @Override
@@ -221,18 +243,20 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void setCoordinates(MapMarker view, double latitude, double longitude) {
-            view.setCoordinate(new LatLng(latitude, longitude));
+        view.setCoordinate(new LatLng(latitude, longitude));
+        view.setUpdated(true);
     }
 
     @Override
     public void showCallout(MapMarker view) {
         ((Marker) view.getFeature()).showInfoWindow();
-
+        view.setUpdated(true);
     }
 
     @Override
     public void hideCallout(MapMarker view) {
         ((Marker) view.getFeature()).hideInfoWindow();
+        view.setUpdated(true);
     }
 
     @Override
@@ -242,8 +266,9 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void redraw(MapMarker view) {
-
+        view.redraw();
     }
+    
     @Override
     public void addView(MapMarker parent, View child, int index) {
         // if an <Callout /> component is a child, then it is a callout view, NOT part of the
@@ -252,7 +277,18 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
             parent.setCalloutView((MapCallout) child);
         } else {
             super.addView(parent, child, index);
+            if (index == 0) {
+                child.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        int newWidth = right - left;
+                        int newHeight = bottom - top;
+                        MapMarker marker = (MapMarker) v.getParent();
+                        marker.update(newWidth, newHeight);
+                    }
+                });
+            }
             parent.update(true);
         }
     }
-}
+}

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/java/com/rnmaps/fabric/event/OnRegionChangeEvent.java

@@ -18,10 +18,9 @@ public class OnRegionChangeEvent extends Event<OnRegionChangeEvent> {
     super(surfaceId, viewId);
     this.payload = payload;
   }
-  public static WritableMap payLoadFor(LatLngBounds bounds, boolean continuous, boolean isGesture){
+  public static WritableMap payLoadFor(LatLngBounds bounds, boolean isGesture) {
 
     WritableMap event = new WritableNativeMap();
-    event.putBoolean("continuous", continuous);
     WritableMap region = new WritableNativeMap();
     LatLng center = bounds.getCenter();
     region.putDouble("latitude", center.latitude);

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

@@ -14,6 +14,9 @@ import android.animation.ObjectAnimator;
 import android.util.Property;
 import android.animation.TypeEvaluator;
 
+import android.os.Handler;
+import android.os.Looper;
+
 import androidx.annotation.Nullable;
 
 import com.facebook.common.references.CloseableReference;
@@ -89,6 +92,8 @@ public class MapMarker extends MapFeature {
     private float calloutAnchorY;
     private boolean calloutAnchorIsSet;
 
+    private int updated = 0;
+
     private boolean tracksViewChanges = true;
     private boolean tracksViewChangesActive = false;
 
@@ -313,11 +318,15 @@ public class MapMarker extends MapFeature {
     }
 
     public boolean updateCustomForTracking() {
-        if (!tracksViewChangesActive)
+        if (!tracksViewChangesActive || updated == 0) {
+            tracksViewChangesActive = false;
             return false;
+        }
 
         updateMarkerIcon();
-
+        if (updated > 0){
+            updated--;
+        }
         return true;
     }
 
@@ -455,6 +464,14 @@ public class MapMarker extends MapFeature {
                 updateTracksViewChanges();
                 update(true);
             }
+        } else {
+            // custom subview
+            if (!(getChildAt(0) instanceof MapCallout)) {
+                if (updated == 0) {
+                    updated = 1;
+                    updateTracksViewChanges();
+                }
+            }
         }
     }
 
@@ -539,15 +556,27 @@ public class MapMarker extends MapFeature {
         } else {
             marker.setInfoWindowAnchor(0.5f, 0);
         }
+        updated +=1;
     }
 
     public void update(int width, int height) {
         this.width = width;
         this.height = height;
-
+        updated +=1;
+        updateTracksViewChanges();
+        clearDrawableCache();
         update(true);
     }
 
+    public void redraw() {
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                updateMarkerIcon();
+            }
+        });
+    }
+
     private Bitmap mLastBitmapCreated = null;
 
     private void clearDrawableCache() {
@@ -663,6 +692,14 @@ public class MapMarker extends MapFeature {
         this.imageLoadedListener = imageLoadedListener;
     }
 
+    public void setUpdated(boolean updated) {
+        if (updated) {
+            this.updated += 1;
+        } else {
+            this.updated = 0;
+        }
+    }
+
     @FunctionalInterface
     public interface EventCreator<T extends Event> {
         T create(int surfaceId, int viewId, WritableMap payload);
@@ -703,4 +740,10 @@ public class MapMarker extends MapFeature {
         );
     }
 
+  @Override
+  protected void onLayout(boolean changed, int l, int t, int r, int b) {
+    super.onLayout(changed, l, t, r, b);
+    this.height = b-t;
+    this.width = r-l;
+  }
 }

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

@@ -41,6 +41,8 @@ public class MapPolyline extends MapFeature {
     private ReadableArray patternValues;
     private List<PatternItem> pattern;
 
+    private List<StyleSpan> spans;
+
     public MapPolyline(Context context) {
         super(context);
     }
@@ -76,8 +78,10 @@ public class MapPolyline extends MapFeature {
             }
             spans.add(new StyleSpan(stroke));
         }
-
+        this.spans = spans;
+        if (polyline != null){
         polyline.setSpans(spans);
+        }
     }
 
     public void setWidth(float width) {
@@ -178,6 +182,9 @@ public class MapPolyline extends MapFeature {
         PolylineManager.Collection polylineCollection = (PolylineManager.Collection) collection;
         polyline = polylineCollection.addPolyline(getPolylineOptions());
         polyline.setClickable(this.tappable);
+        if (spans != null){
+            polyline.setSpans(spans);
+        }
     }
 
     @Override