react-native-maps 1.10.3 → 1.11.0

package/android/build.gradle

@@ -19,6 +19,10 @@ buildscript {
 
 apply plugin: 'com.android.library'
 
+def isNewArchitectureEnabled() {
+  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
 android {
   def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
   if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
@@ -30,6 +34,8 @@ android {
   defaultConfig {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet('targetSdkVersion', 34)
+
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
 }
 

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

@@ -450,8 +450,10 @@ public class MapManager extends ViewGroupManager<MapView> {
   }
 
   void pushEvent(ThemedReactContext context, View view, String name, WritableMap data) {
-    context.getJSModule(RCTEventEmitter.class)
-        .receiveEvent(view.getId(), name, data);
+    context
+      .getReactApplicationContext()
+      .getJSModule(RCTEventEmitter.class)
+      .receiveEvent(view.getId(), name, data);
   }
 
   @Override

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

@@ -30,7 +30,9 @@ import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
@@ -208,7 +210,14 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       }
     });
 
-    eventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
+    int uiManagerType = UIManagerType.DEFAULT;
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      uiManagerType = UIManagerType.FABRIC;
+    }
+
+    eventDispatcher = UIManagerHelper
+      .getUIManager(reactContext, uiManagerType)
+      .getEventDispatcher();
 
     // Set up a parent view for triggering visibility in subviews that depend on it.
     // Mainly ReactImageView depends on Fresco which depends on onVisibilityChanged() event
@@ -771,6 +780,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);
     } else if (feature instanceof MapHeatmap) {
       heatmapMap.remove(feature.getFeature());
       feature.removeFromMap(map);

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.10.3",
+  "version": "1.11.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",