react-native-maps 1.24.1 → 1.24.3

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:
 

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

@@ -132,6 +132,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private int cameraMoveReason = 0;
     private MapMarker selectedMarker;
 
+    private LifecycleOwner currentLifecycleOwner;
+    private boolean isLifecycleObserverAttached = false;
+
     private static final String[] PERMISSIONS = new String[]{
             "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
 
@@ -250,10 +253,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
                    GoogleMapOptions googleMapOptions) {
         super(context, googleMapOptions);
         this.context = context;
-        Activity activity = context.getCurrentActivity();
-        if (activity instanceof LifecycleOwner) {
-            ((LifecycleOwner) activity).getLifecycle().addObserver(this);
-        }
         super.getMapAsync(this);
 
         final MapView view = this;
@@ -309,6 +308,38 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
     }
 
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        attachLifecycleObserver();
+    }
+
+    // Override onDetachedFromWindow to detach lifecycle observer
+    @Override
+    protected void onDetachedFromWindow() {
+        detachLifecycleObserver();
+        super.onDetachedFromWindow();
+    }
+
+    // Method to attach lifecycle observer
+    private void attachLifecycleObserver() {
+        Activity activity = context.getCurrentActivity();
+        if (activity instanceof LifecycleOwner && !isLifecycleObserverAttached) {
+            currentLifecycleOwner = (LifecycleOwner) activity;
+            currentLifecycleOwner.getLifecycle().addObserver(this);
+            isLifecycleObserverAttached = true;
+        }
+    }
+
+    // Method to detach lifecycle observer
+    private void detachLifecycleObserver() {
+        if (currentLifecycleOwner != null && isLifecycleObserverAttached) {
+            currentLifecycleOwner.getLifecycle().removeObserver(this);
+            isLifecycleObserverAttached = false;
+            currentLifecycleOwner = null;
+        }
+    }
+
     public double[][] getMarkersFrames(boolean onlyVisible) {
 
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
@@ -689,10 +720,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         }
         destroyed = true;
 
-        Activity activity = context.getCurrentActivity();
-        if (activity instanceof LifecycleOwner) {
-            ((LifecycleOwner) activity).getLifecycle().removeObserver(this);
-        }
+        // Detach lifecycle observer before destroying
+        detachLifecycleObserver();
+
         if (!paused) {
             onPause();
             paused = true;

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

package/src/MapMarker.tsx

@@ -481,13 +481,29 @@ export class MapMarker extends React.Component<MapMarkerProps> {
       );
     }
 
-    let icon;
-    if (this.props.icon && this.fabricMarker) {
-      icon = fixImageProp(this.props.icon);
-    }
-    let image;
-    if (this.props.image && this.fabricMarker) {
-      image = fixImageProp(this.props.image);
+    let icon: any = this.props.icon;
+    let image: any = this.props.image;
+
+    if (this.fabricMarker) {
+      if (this.props.image) {
+        image = fixImageProp(this.props.image);
+      }
+      if (this.props.icon) {
+        icon = fixImageProp(this.props.icon);
+      }
+    } else {
+      if (this.props.image) {
+        image = fixImageProp(this.props.image);
+        if (image.uri) {
+          image = image.uri;
+        }
+      }
+      if (this.props.icon) {
+        icon = fixImageProp(this.props.icon);
+        if (icon.uri) {
+          icon = icon.uri;
+        }
+      }
     }
 
     const AIRMapMarker = this.getNativeComponent();

package/src/MapOverlay.tsx

@@ -32,7 +32,7 @@ export type MapOverlayProps = ViewProps & {
   bearing?: number;
 
   /**
-   * The coordinates for the image (left-top corner, right-bottom corner). ie.```[[lat, long], [lat, long]]```
+   * The coordinates for the image (right-top corner, left-bottom corner). ie.```[[lat, long], [lat, long]]```
    *
    * @platform iOS: Supported
    * @platform Android: Supported