react-native-maps 1.26.6 → 1.26.7

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

@@ -1137,10 +1137,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
             // Remove from a view group if already present, prevent "specified child
             // already had a parent" error.
-            ViewGroup annotationParent = (ViewGroup) annotation.getParent();
-            if (annotationParent != null) {
-                annotationParent.removeView(annotation);
-            }
+            safeRemoveFromParent(annotation);
 
             // Ensure attacherGroup is not null before using it
             if (attacherGroup == null) {
@@ -1225,7 +1222,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         if (feature instanceof MapMarker) {
             markerMap.remove(feature.getFeature());
             feature.removeFromMap(markerCollection);
-            attacherGroup.removeView(feature);
+            safeRemoveFeatureFromAttacherGroup(feature);
         } else if (feature instanceof MapHeatmap) {
             heatmapMap.remove(feature.getFeature());
             feature.removeFromMap(map);
@@ -1563,12 +1560,12 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         switch (action) {
             case (MotionEvent.ACTION_DOWN):
-                this.getParent().requestDisallowInterceptTouchEvent(
+                safeRequestDisallowInterceptTouchEvent(
                         map != null && map.getUiSettings().isScrollGesturesEnabled());
                 break;
             case (MotionEvent.ACTION_UP):
                 // Clear this regardless, since isScrollGesturesEnabled() may have been updated
-                this.getParent().requestDisallowInterceptTouchEvent(false);
+                safeRequestDisallowInterceptTouchEvent(false);
                 break;
         }
         super.dispatchTouchEvent(ev);
@@ -1656,14 +1653,14 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
     private void removeCacheImageView() {
         if (this.cacheImageView != null) {
-            ((ViewGroup) this.cacheImageView.getParent()).removeView(this.cacheImageView);
+            safeRemoveFromParent(this.cacheImageView);
             this.cacheImageView = null;
         }
     }
 
     private void removeMapLoadingProgressBar() {
         if (this.mapLoadingProgressBar != null) {
-            ((ViewGroup) this.mapLoadingProgressBar.getParent()).removeView(this.mapLoadingProgressBar);
+            safeRemoveFromParent(this.mapLoadingProgressBar);
             this.mapLoadingProgressBar = null;
         }
     }
@@ -1671,7 +1668,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private void removeMapLoadingLayoutView() {
         this.removeMapLoadingProgressBar();
         if (this.mapLoadingLayout != null) {
-            ((ViewGroup) this.mapLoadingLayout.getParent()).removeView(this.mapLoadingLayout);
+            safeRemoveFromParent(this.mapLoadingLayout);
             this.mapLoadingLayout = null;
         }
     }
@@ -1911,4 +1908,52 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         }
     };
 
+    /**
+     * Safely removes a view from its parent ViewGroup.
+     * Prevents NullPointerException during component lifecycle operations.
+     * 
+     * @param view The view to remove from its parent
+     * @return true if the view was successfully removed, false otherwise
+     */
+    private boolean safeRemoveFromParent(View view) {
+        if (view != null) {
+            ViewGroup parent = (ViewGroup) view.getParent();
+            if (parent != null) {
+                parent.removeView(view);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Safely requests touch event handling from parent ViewGroup.
+     * Prevents NullPointerException during touch event dispatching.
+     * 
+     * @param disallowIntercept Whether to disallow parent touch interception
+     * @return true if the request was successfully made, false otherwise
+     */
+    private boolean safeRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+        ViewGroup parent = (ViewGroup) this.getParent();
+        if (parent != null) {
+            parent.requestDisallowInterceptTouchEvent(disallowIntercept);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Safely removes a MapFeature from the attacherGroup.
+     * Prevents NullPointerException during feature removal operations.
+     * 
+     * @param feature The MapFeature to remove from attacherGroup
+     * @return true if the feature was successfully removed, false otherwise
+     */
+    private boolean safeRemoveFeatureFromAttacherGroup(MapFeature feature) {
+        if (attacherGroup != null && feature != null) {
+            attacherGroup.removeView(feature);
+            return true;
+        }
+        return 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.26.6",
+  "version": "1.26.7",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",