react-native-google-maps-plus 1.6.1 → 1.7.0-dev.1

package/android/build.gradle

@@ -44,6 +44,8 @@ android {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
+    consumerProguardFiles "proguard-rules.pro"
+
     externalNativeBuild {
       cmake {
         cppFlags "-frtti -fexceptions -Wall -fstack-protector-all"

package/android/proguard-rules.pro

@@ -0,0 +1,29 @@
+-keep class com.google.android.gms.** { *; }
+-keep interface com.google.android.gms.** { *; }
+-dontwarn com.google.android.gms.**
+-dontnote com.google.android.gms.**
+
+-keep class * implements android.os.Parcelable { *; }
+
+-keepclassmembers class **$Companion {
+    public *;
+}
+
+-keep class com.google.maps.android.** { *; }
+-keep interface com.google.maps.android.** { *; }
+-dontwarn com.google.maps.android.**
+
+-keep @androidx.annotation.Keep class * { *; }
+-keepclassmembers class * {
+    @androidx.annotation.Keep *;
+}
+
+-keep class com.caverock.androidsvg.** { *; }
+-dontwarn com.caverock.androidsvg.**
+
+-keepclassmembers class com.caverock.androidsvg.** {
+    public *;
+    protected *;
+}
+
+-keep class com.rngooglemapsplus.** { *; }

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -58,6 +58,7 @@ class GoogleMapsViewImpl(
   GoogleMap.OnCameraMoveListener,
   GoogleMap.OnCameraIdleListener,
   GoogleMap.OnMapClickListener,
+  GoogleMap.OnMapLongClickListener,
   GoogleMap.OnMarkerClickListener,
   GoogleMap.OnPolylineClickListener,
   GoogleMap.OnPolygonClickListener,
@@ -66,7 +67,6 @@ class GoogleMapsViewImpl(
   GoogleMap.OnIndoorStateChangeListener,
   LifecycleEventListener {
   private var initialized = false
-  private var mapReady = false
   private var destroyed = false
   private var googleMap: GoogleMap? = null
   private var mapView: MapView? = null
@@ -128,11 +128,12 @@ class GoogleMapsViewImpl(
         googleMap?.setOnPolygonClickListener(this@GoogleMapsViewImpl)
         googleMap?.setOnCircleClickListener(this@GoogleMapsViewImpl)
         googleMap?.setOnMapClickListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnMapLongClickListener(this@GoogleMapsViewImpl)
         googleMap?.setOnMarkerDragListener(this@GoogleMapsViewImpl)
+        onMapLoaded?.invoke(true)
       }
       applyProps()
       initLocationCallbacks()
-      mapReady = true
       onMapReady?.invoke(true)
     }
   }
@@ -250,6 +251,9 @@ class GoogleMapsViewImpl(
     }
   }
 
+  val currentCamera: CameraPosition?
+    get() = googleMap?.cameraPosition
+
   var initialProps: RNInitialProps? = null
 
   var uiSettings: RNMapUiSettings? = null
@@ -375,9 +379,11 @@ class GoogleMapsViewImpl(
 
   var onMapError: ((RNMapErrorCode) -> Unit)? = null
   var onMapReady: ((Boolean) -> Unit)? = null
+  var onMapLoaded: ((Boolean) -> Unit)? = null
   var onLocationUpdate: ((RNLocation) -> Unit)? = null
   var onLocationError: ((RNLocationErrorCode) -> Unit)? = null
   var onMapPress: ((RNLatLng) -> Unit)? = null
+  var onMapLongPress: ((RNLatLng) -> Unit)? = null
   var onMarkerPress: ((String?) -> Unit)? = null
   var onPolylinePress: ((String?) -> Unit)? = null
   var onPolygonPress: ((String?) -> Unit)? = null
@@ -871,6 +877,7 @@ class GoogleMapsViewImpl(
         setOnPolygonClickListener(null)
         setOnCircleClickListener(null)
         setOnMapClickListener(null)
+        setOnMapLongClickListener(null)
         setOnMarkerDragListener(null)
       }
       googleMap = null
@@ -950,6 +957,12 @@ class GoogleMapsViewImpl(
     )
   }
 
+  override fun onMapLongClick(coordinates: LatLng) {
+    onMapLongPress?.invoke(
+      coordinates.toRnLatLng(),
+    )
+  }
+
   override fun onMarkerDragStart(marker: Marker) {
     onMarkerDragStart?.invoke(
       marker.tag?.toString(),

package/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt

@@ -57,6 +57,8 @@ class LocationHandler(
     this.interval = interval ?: INTERVAL_DEFAULT
     this.minUpdateInterval = minUpdateInterval ?: MIN_UPDATE_INTERVAL
     buildLocationRequest(this.priority, this.interval, this.minUpdateInterval)
+    stop()
+    start()
   }
 
   fun showLocationDialog() {

package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt

@@ -2,9 +2,11 @@ package com.rngooglemapsplus
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
+import android.util.Base64
 import android.util.LruCache
 import androidx.core.graphics.createBitmap
 import com.caverock.androidsvg.SVG
+import com.caverock.androidsvg.SVGExternalFileResolver
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
@@ -20,6 +22,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.net.URLDecoder
 import kotlin.coroutines.coroutineContext
 
 class MapMarkerBuilder(
@@ -35,6 +38,42 @@ class MapMarkerBuilder(
 
   private val jobsById = mutableMapOf<String, Job>()
 
+  init {
+    SVG.registerExternalFileResolver(
+      object : SVGExternalFileResolver() {
+        override fun resolveImage(filename: String?): Bitmap? {
+          if (filename.isNullOrBlank()) return null
+
+          return runCatching {
+            when {
+              filename.startsWith("data:image/svg+xml") -> {
+                val svgContent =
+                  if ("base64," in filename) {
+                    val base64 = filename.substringAfter("base64,")
+                    String(Base64.decode(base64, Base64.DEFAULT), Charsets.UTF_8)
+                  } else {
+                    URLDecoder.decode(filename.substringAfter(","), "UTF-8")
+                  }
+
+                val svg = SVG.getFromString(svgContent)
+                val width = (svg.documentWidth.takeIf { it > 0 } ?: 128f).toInt()
+                val height = (svg.documentHeight.takeIf { it > 0 } ?: 128f).toInt()
+
+                createBitmap(width, height).apply {
+                  Canvas(this).also(svg::renderToCanvas)
+                }
+              }
+
+              else -> null
+            }
+          }.getOrNull()
+        }
+
+        override fun isFormatSupported(mimeType: String?): Boolean = mimeType?.startsWith("image/") == true
+      },
+    )
+  }
+
   fun build(
     m: RNMarker,
     icon: BitmapDescriptor?,

package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

@@ -45,7 +45,7 @@ class RNGoogleMapsPlusView(
         GoogleMapOptions().apply {
           initialProps?.mapId?.let { mapId(it) }
           initialProps?.liteMode?.let { liteMode(it) }
-          initialProps?.camera?.let { camera(it.toCameraPosition()) }
+          initialProps?.camera?.let { camera(it.toCameraPosition(current = null)) }
         }
       view.initMapView(options)
     }
@@ -281,6 +281,11 @@ class RNGoogleMapsPlusView(
       view.onMapReady = cb
     }
 
+  override var onMapLoaded: ((Boolean) -> Unit)? = null
+    set(cb) {
+      view.onMapLoaded = cb
+    }
+
   override var onLocationUpdate: ((RNLocation) -> Unit)? = null
     set(cb) {
       view.onLocationUpdate = cb
@@ -296,6 +301,11 @@ class RNGoogleMapsPlusView(
       view.onMapPress = cb
     }
 
+  override var onMapLongPress: ((RNLatLng) -> Unit)? = null
+    set(cb) {
+      view.onMapLongPress = cb
+    }
+
   override var onMarkerPress: ((String?) -> Unit)? = null
     set(cb) {
       view.onMarkerPress = cb
@@ -361,7 +371,14 @@ class RNGoogleMapsPlusView(
     animated: Boolean?,
     durationMs: Double?,
   ) {
-    view.setCamera(camera.toCameraPosition(), animated == true, durationMs?.toInt() ?: 3000)
+    onUi {
+      val current = view.currentCamera
+      view.setCamera(
+        camera.toCameraPosition(current),
+        animated == true,
+        durationMs?.toInt() ?: 3000,
+      )
+    }
   }
 
   override fun setCameraToCoordinates(

package/android/src/main/java/com/rngooglemapsplus/extensions/LocationExtension.kt

@@ -19,40 +19,44 @@ fun Location.toRnLocation(): RNLocation =
         provider = provider,
         elapsedRealtimeNanos = elapsedRealtimeNanos.toDouble(),
         bearingAccuracyDegrees =
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            bearingAccuracyDegrees.toDouble()
-          } else {
-            null
+          when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ->
+              bearingAccuracyDegrees.toDouble()
+
+            else -> null
           },
         speedAccuracyMetersPerSecond =
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            speedAccuracyMetersPerSecond.toDouble()
-          } else {
-            null
+          when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ->
+              speedAccuracyMetersPerSecond.toDouble()
+
+            else -> null
           },
         verticalAccuracyMeters =
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            verticalAccuracyMeters.toDouble()
-          } else {
-            null
+          when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ->
+              verticalAccuracyMeters.toDouble()
+
+            else -> null
           },
         mslAltitudeMeters =
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            mslAltitudeMeters
-          } else {
-            null
+          when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE ->
+              mslAltitudeMeters
+
+            else -> null
           },
         mslAltitudeAccuracyMeters =
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            mslAltitudeAccuracyMeters.toDouble()
-          } else {
-            null
+          when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE ->
+              mslAltitudeAccuracyMeters.toDouble()
+
+            else -> null
           },
         isMock =
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            isMock
-          } else {
-            isFromMockProvider
+          when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> isMock
+            else -> isFromMockProvider
           },
       ),
     ios = null,

package/android/src/main/java/com/rngooglemapsplus/extensions/RNCameraExtension.kt

@@ -1,18 +1,14 @@
 package com.rngooglemapsplus.extensions
 
 import com.google.android.gms.maps.model.CameraPosition
+import com.google.android.gms.maps.model.LatLng
 import com.rngooglemapsplus.RNCamera
 
-fun RNCamera.toCameraPosition(): CameraPosition {
-  val builder = CameraPosition.builder()
-
-  center?.let {
-    builder.target(it.toLatLng())
-  }
-
-  zoom?.let { builder.zoom(it.toFloat()) }
-  bearing?.let { builder.bearing(it.toFloat()) }
-  tilt?.let { builder.tilt(it.toFloat()) }
-
-  return builder.build()
-}
+fun RNCamera.toCameraPosition(current: CameraPosition?) =
+  CameraPosition
+    .builder()
+    .target(center?.toLatLng() ?: current?.target ?: LatLng(0.0, 0.0))
+    .zoom(zoom?.toFloat() ?: current?.zoom ?: 0f)
+    .bearing(bearing?.toFloat() ?: current?.bearing ?: 0f)
+    .tilt(tilt?.toFloat() ?: current?.tilt ?: 0f)
+    .build()

package/ios/GoogleMapViewImpl.swift

@@ -10,7 +10,7 @@ GMSIndoorDisplayDelegate {
   private let markerBuilder: MapMarkerBuilder
   private var mapView: GMSMapView?
   private var initialized = false
-  private var mapReady = false
+  private var loaded = false
   private var deInitialized = false
 
   private var pendingMarkers: [(id: String, marker: GMSMarker)] = []
@@ -75,7 +75,6 @@ GMSIndoorDisplayDelegate {
     applyProps()
     initLocationCallbacks()
     onMapReady?(true)
-    mapReady = true
   }
 
   @MainActor
@@ -255,9 +254,11 @@ GMSIndoorDisplayDelegate {
 
   var onMapError: ((RNMapErrorCode) -> Void)?
   var onMapReady: ((Bool) -> Void)?
+  var onMapLoaded: ((Bool) -> Void)?
   var onLocationUpdate: ((RNLocation) -> Void)?
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)?
   var onMapPress: ((RNLatLng) -> Void)?
+  var onMapLongPress: ((RNLatLng) -> Void)?
   var onMarkerPress: ((String?) -> Void)?
   var onPolylinePress: ((String?) -> Void)?
   var onPolygonPress: ((String?) -> Void)?
@@ -278,7 +279,7 @@ GMSIndoorDisplayDelegate {
         disableActions: false,
         duration: durationMs / 1000.0
       ) {
-        mapView?.animate(to: camera)
+        self.mapView?.animate(to: camera)
       }
     } else {
       let update = GMSCameraUpdate.setCamera(camera)
@@ -318,7 +319,7 @@ GMSIndoorDisplayDelegate {
         disableActions: false,
         duration: durationMs / 1000.0
       ) {
-        mapView?.animate(with: update)
+        self.mapView?.animate(with: update)
       }
     } else {
       mapView?.moveCamera(update)
@@ -655,6 +656,12 @@ GMSIndoorDisplayDelegate {
     deinitInternal()
   }
 
+  func mapViewDidFinishTileRendering(_ mapView: GMSMapView) {
+    guard !loaded else { return }
+    loaded = true
+    onMapLoaded?(true)
+  }
+
   func mapView(_ mapView: GMSMapView, willMove gesture: Bool) {
     onMain {
       self.cameraMoveReasonIsGesture = gesture
@@ -713,6 +720,17 @@ GMSIndoorDisplayDelegate {
     }
   }
 
+  func mapView(
+    _ mapView: GMSMapView,
+    didLongPressAt coordinate: CLLocationCoordinate2D
+  ) {
+    onMain {
+      self.onMapLongPress?(
+        coordinate.toRNLatLng(),
+      )
+    }
+  }
+
   func mapView(_ mapView: GMSMapView, didTap marker: GMSMarker) -> Bool {
     onMain {
       mapView.selectedMarker = marker

package/ios/MapHelper.swift

@@ -1,22 +1,24 @@
 import QuartzCore
 
-@inline(__always)
+@MainActor @inline(__always)
 func withCATransaction(
   disableActions: Bool = true,
   duration: CFTimeInterval? = nil,
   timingFunction: CAMediaTimingFunction? = nil,
   completion: (() -> Void)? = nil,
-  _ body: () -> Void
+  _ body: @escaping @MainActor () -> Void
 ) {
-  CATransaction.begin()
+  onMain {
+    CATransaction.begin()
 
-  CATransaction.setDisableActions(disableActions)
-  duration.map { CATransaction.setAnimationDuration($0) }
-  timingFunction.map { CATransaction.setAnimationTimingFunction($0) }
-  completion.map { CATransaction.setCompletionBlock($0) }
+    CATransaction.setDisableActions(disableActions)
+    duration.map { CATransaction.setAnimationDuration($0) }
+    timingFunction.map { CATransaction.setAnimationTimingFunction($0) }
+    completion.map { CATransaction.setCompletionBlock($0) }
 
-  body()
-  CATransaction.commit()
+    body()
+    CATransaction.commit()
+  }
 }
 
 @MainActor @inline(__always)

package/ios/RNGoogleMapsPlusView.swift

@@ -132,19 +132,19 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       withCATransaction(disableActions: true) {
 
         removed.forEach {
-          impl.removeMarker(id: $0)
-          markerBuilder.cancelIconTask($0)
+          self.impl.removeMarker(id: $0)
+          self.markerBuilder.cancelIconTask($0)
         }
 
         for (id, next) in nextById {
           if let prev = prevById[id] {
             if !prev.markerEquals(next) {
-              impl.updateMarker(id: id) { m in
+              self.impl.updateMarker(id: id) { m in
                 self.markerBuilder.update(prev, next, m)
               }
             }
           } else {
-            markerBuilder.buildIconAsync(next.id, next) { icon in
+            self.markerBuilder.buildIconAsync(next.id, next) { icon in
               let marker = self.markerBuilder.build(next, icon: icon)
               self.impl.addMarker(id: id, marker: marker)
             }
@@ -302,6 +302,10 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onMapReady = onMapReady }
   }
   @MainActor
+  var onMapLoaded: ((Bool) -> Void)? {
+    didSet { impl.onMapLoaded = onMapLoaded }
+  }
+  @MainActor
   var onLocationUpdate: ((RNLocation) -> Void)? {
     didSet { impl.onLocationUpdate = onLocationUpdate }
   }
@@ -314,6 +318,10 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onMapPress = onMapPress }
   }
   @MainActor
+  var onMapLongPress: ((RNLatLng) -> Void)? {
+    didSet { impl.onMapLongPress = onMapLongPress }
+  }
+  @MainActor
   var onMarkerPress: ((String?) -> Void)? {
     didSet { impl.onMarkerPress = onMarkerPress }
   }

package/ios/extensions/RNCamera+Extension.swift

@@ -4,8 +4,8 @@ import GoogleMaps
 extension RNCamera {
   func toGMSCameraPosition(current: GMSCameraPosition?) -> GMSCameraPosition {
     let center = CLLocationCoordinate2D(
-      latitude: center?.latitude ?? current?.target.latitude ?? 0,
-      longitude: center?.longitude ?? current?.target.longitude ?? 0
+      latitude: center?.latitude ?? current?.target.latitude ?? 0.0,
+      longitude: center?.longitude ?? current?.target.longitude ?? 0.0
     )
 
     let zoom = Float(zoom ?? Double(current?.zoom ?? 0))

package/lib/nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json

@@ -24,9 +24,11 @@
     "locationConfig": true,
     "onMapError": true,
     "onMapReady": true,
+    "onMapLoaded": true,
     "onLocationUpdate": true,
     "onLocationError": true,
     "onMapPress": true,
+    "onMapLongPress": true,
     "onMarkerPress": true,
     "onPolylinePress": true,
     "onPolygonPress": true,

package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts

@@ -21,9 +21,11 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
     locationConfig?: RNLocationConfig;
     onMapError?: (error: RNMapErrorCode) => void;
     onMapReady?: (ready: boolean) => void;
+    onMapLoaded?: (loaded: boolean) => void;
     onLocationUpdate?: (location: RNLocation) => void;
     onLocationError?: (error: RNLocationErrorCode) => void;
     onMapPress?: (coordinate: RNLatLng) => void;
+    onMapLongPress?: (coordinate: RNLatLng) => void;
     onMarkerPress?: (id?: string | undefined) => void;
     onPolylinePress?: (id?: string | undefined) => void;
     onPolygonPress?: (id?: string | undefined) => void;

package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}

package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp

@@ -518,6 +518,25 @@ namespace margelo::nitro::rngooglemapsplus {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* onMapReady */)>("setOnMapReady_cxx");
     method(_javaPart, onMapReady.has_value() ? JFunc_void_bool_cxx::fromCpp(onMapReady.value()) : nullptr);
   }
+  std::optional<std::function<void(bool /* loaded */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMapLoaded() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_bool::javaobject>()>("getOnMapLoaded_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(bool /* loaded */)> {
+      if (__result->isInstanceOf(JFunc_void_bool_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_bool_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](bool loaded) -> void {
+          return __resultRef->invoke(loaded);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMapLoaded(const std::optional<std::function<void(bool /* loaded */)>>& onMapLoaded) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* onMapLoaded */)>("setOnMapLoaded_cxx");
+    method(_javaPart, onMapLoaded.has_value() ? JFunc_void_bool_cxx::fromCpp(onMapLoaded.value()) : nullptr);
+  }
   std::optional<std::function<void(const RNLocation& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnLocationUpdate() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNLocation::javaobject>()>("getOnLocationUpdate_cxx");
     auto __result = method(_javaPart);
@@ -575,6 +594,25 @@ namespace margelo::nitro::rngooglemapsplus {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNLatLng::javaobject> /* onMapPress */)>("setOnMapPress_cxx");
     method(_javaPart, onMapPress.has_value() ? JFunc_void_RNLatLng_cxx::fromCpp(onMapPress.value()) : nullptr);
   }
+  std::optional<std::function<void(const RNLatLng& /* coordinate */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMapLongPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNLatLng::javaobject>()>("getOnMapLongPress_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNLatLng& /* coordinate */)> {
+      if (__result->isInstanceOf(JFunc_void_RNLatLng_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_RNLatLng_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](RNLatLng coordinate) -> void {
+          return __resultRef->invoke(coordinate);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMapLongPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapLongPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNLatLng::javaobject> /* onMapLongPress */)>("setOnMapLongPress_cxx");
+    method(_javaPart, onMapLongPress.has_value() ? JFunc_void_RNLatLng_cxx::fromCpp(onMapLongPress.value()) : nullptr);
+  }
   std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerPress() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnMarkerPress_cxx");
     auto __result = method(_javaPart);

package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.hpp

@@ -89,12 +89,16 @@ namespace margelo::nitro::rngooglemapsplus {
     void setOnMapError(const std::optional<std::function<void(RNMapErrorCode /* error */)>>& onMapError) override;
     std::optional<std::function<void(bool /* ready */)>> getOnMapReady() override;
     void setOnMapReady(const std::optional<std::function<void(bool /* ready */)>>& onMapReady) override;
+    std::optional<std::function<void(bool /* loaded */)>> getOnMapLoaded() override;
+    void setOnMapLoaded(const std::optional<std::function<void(bool /* loaded */)>>& onMapLoaded) override;
     std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() override;
     void setOnLocationUpdate(const std::optional<std::function<void(const RNLocation& /* location */)>>& onLocationUpdate) override;
     std::optional<std::function<void(RNLocationErrorCode /* error */)>> getOnLocationError() override;
     void setOnLocationError(const std::optional<std::function<void(RNLocationErrorCode /* error */)>>& onLocationError) override;
     std::optional<std::function<void(const RNLatLng& /* coordinate */)>> getOnMapPress() override;
     void setOnMapPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapPress) override;
+    std::optional<std::function<void(const RNLatLng& /* coordinate */)>> getOnMapLongPress() override;
+    void setOnMapLongPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapLongPress) override;
     std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnMarkerPress() override;
     void setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) override;
     std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolylinePress() override;

package/nitrogen/generated/android/c++/views/JHybridRNGoogleMapsPlusViewStateUpdater.cpp

@@ -116,6 +116,10 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     view->setOnMapReady(props.onMapReady.value);
     // TODO: Set isDirty = false
   }
+  if (props.onMapLoaded.isDirty) {
+    view->setOnMapLoaded(props.onMapLoaded.value);
+    // TODO: Set isDirty = false
+  }
   if (props.onLocationUpdate.isDirty) {
     view->setOnLocationUpdate(props.onLocationUpdate.value);
     // TODO: Set isDirty = false
@@ -128,6 +132,10 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     view->setOnMapPress(props.onMapPress.value);
     // TODO: Set isDirty = false
   }
+  if (props.onMapLongPress.isDirty) {
+    view->setOnMapLongPress(props.onMapLongPress.value);
+    // TODO: Set isDirty = false
+  }
   if (props.onMarkerPress.isDirty) {
     view->setOnMarkerPress(props.onMarkerPress.value);
     // TODO: Set isDirty = false

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt

@@ -174,6 +174,20 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onMapReady = value?.let { it }
     }
   
+  abstract var onMapLoaded: ((loaded: Boolean) -> Unit)?
+  
+  private var onMapLoaded_cxx: Func_void_bool?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onMapLoaded?.let { Func_void_bool_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onMapLoaded = value?.let { it }
+    }
+  
   abstract var onLocationUpdate: ((location: RNLocation) -> Unit)?
   
   private var onLocationUpdate_cxx: Func_void_RNLocation?
@@ -216,6 +230,20 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onMapPress = value?.let { it }
     }
   
+  abstract var onMapLongPress: ((coordinate: RNLatLng) -> Unit)?
+  
+  private var onMapLongPress_cxx: Func_void_RNLatLng?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onMapLongPress?.let { Func_void_RNLatLng_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onMapLongPress = value?.let { it }
+    }
+  
   abstract var onMarkerPress: ((id: String?) -> Unit)?
   
   private var onMarkerPress_cxx: Func_void_std__optional_std__string_?

package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Bridge.hpp

@@ -897,6 +897,21 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     return *optional;
   }
   
+  // pragma MARK: std::optional<std::function<void(bool /* loaded */)>>
+  /**
+   * Specialized version of `std::optional<std::function<void(bool / * loaded * /)>>`.
+   */
+  using std__optional_std__function_void_bool____loaded______ = std::optional<std::function<void(bool /* loaded */)>>;
+  inline std::optional<std::function<void(bool /* loaded */)>> create_std__optional_std__function_void_bool____loaded______(const std::function<void(bool /* loaded */)>& value) noexcept {
+    return std::optional<std::function<void(bool /* loaded */)>>(value);
+  }
+  inline bool has_value_std__optional_std__function_void_bool____loaded______(const std::optional<std::function<void(bool /* loaded */)>>& optional) noexcept {
+    return optional.has_value();
+  }
+  inline std::function<void(bool /* loaded */)> get_std__optional_std__function_void_bool____loaded______(const std::optional<std::function<void(bool /* loaded */)>>& optional) noexcept {
+    return *optional;
+  }
+  
   // pragma MARK: std::optional<RNLocationAndroid>
   /**
    * Specialized version of `std::optional<RNLocationAndroid>`.

package/nitrogen/generated/ios/c++/HybridRNGoogleMapsPlusViewSpecSwift.hpp

@@ -322,6 +322,13 @@ namespace margelo::nitro::rngooglemapsplus {
     inline void setOnMapReady(const std::optional<std::function<void(bool /* ready */)>>& onMapReady) noexcept override {
       _swiftPart.setOnMapReady(onMapReady);
     }
+    inline std::optional<std::function<void(bool /* loaded */)>> getOnMapLoaded() noexcept override {
+      auto __result = _swiftPart.getOnMapLoaded();
+      return __result;
+    }
+    inline void setOnMapLoaded(const std::optional<std::function<void(bool /* loaded */)>>& onMapLoaded) noexcept override {
+      _swiftPart.setOnMapLoaded(onMapLoaded);
+    }
     inline std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() noexcept override {
       auto __result = _swiftPart.getOnLocationUpdate();
       return __result;
@@ -343,6 +350,13 @@ namespace margelo::nitro::rngooglemapsplus {
     inline void setOnMapPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapPress) noexcept override {
       _swiftPart.setOnMapPress(onMapPress);
     }
+    inline std::optional<std::function<void(const RNLatLng& /* coordinate */)>> getOnMapLongPress() noexcept override {
+      auto __result = _swiftPart.getOnMapLongPress();
+      return __result;
+    }
+    inline void setOnMapLongPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapLongPress) noexcept override {
+      _swiftPart.setOnMapLongPress(onMapLongPress);
+    }
     inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnMarkerPress() noexcept override {
       auto __result = _swiftPart.getOnMarkerPress();
       return __result;

package/nitrogen/generated/ios/c++/views/HybridRNGoogleMapsPlusViewComponent.mm

@@ -186,6 +186,11 @@ using namespace margelo::nitro::rngooglemapsplus::views;
     swiftPart.setOnMapReady(newViewProps.onMapReady.value);
     newViewProps.onMapReady.isDirty = false;
   }
+  // onMapLoaded: optional
+  if (newViewProps.onMapLoaded.isDirty) {
+    swiftPart.setOnMapLoaded(newViewProps.onMapLoaded.value);
+    newViewProps.onMapLoaded.isDirty = false;
+  }
   // onLocationUpdate: optional
   if (newViewProps.onLocationUpdate.isDirty) {
     swiftPart.setOnLocationUpdate(newViewProps.onLocationUpdate.value);
@@ -201,6 +206,11 @@ using namespace margelo::nitro::rngooglemapsplus::views;
     swiftPart.setOnMapPress(newViewProps.onMapPress.value);
     newViewProps.onMapPress.isDirty = false;
   }
+  // onMapLongPress: optional
+  if (newViewProps.onMapLongPress.isDirty) {
+    swiftPart.setOnMapLongPress(newViewProps.onMapLongPress.value);
+    newViewProps.onMapLongPress.isDirty = false;
+  }
   // onMarkerPress: optional
   if (newViewProps.onMarkerPress.isDirty) {
     swiftPart.setOnMarkerPress(newViewProps.onMarkerPress.value);

package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec.swift

@@ -31,9 +31,11 @@ public protocol HybridRNGoogleMapsPlusViewSpec_protocol: HybridObject, HybridVie
   var locationConfig: RNLocationConfig? { get set }
   var onMapError: ((_ error: RNMapErrorCode) -> Void)? { get set }
   var onMapReady: ((_ ready: Bool) -> Void)? { get set }
+  var onMapLoaded: ((_ loaded: Bool) -> Void)? { get set }
   var onLocationUpdate: ((_ location: RNLocation) -> Void)? { get set }
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)? { get set }
   var onMapPress: ((_ coordinate: RNLatLng) -> Void)? { get set }
+  var onMapLongPress: ((_ coordinate: RNLatLng) -> Void)? { get set }
   var onMarkerPress: ((_ id: String?) -> Void)? { get set }
   var onPolylinePress: ((_ id: String?) -> Void)? { get set }
   var onPolygonPress: ((_ id: String?) -> Void)? { get set }

package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec_cxx.swift

@@ -589,6 +589,38 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
+  public final var onMapLoaded: bridge.std__optional_std__function_void_bool____loaded______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_bool____loaded______ in
+        if let __unwrappedValue = self.__implementation.onMapLoaded {
+          return bridge.create_std__optional_std__function_void_bool____loaded______({ () -> bridge.Func_void_bool in
+            let __closureWrapper = Func_void_bool(__unwrappedValue)
+            return bridge.create_Func_void_bool(__closureWrapper.toUnsafe())
+          }())
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onMapLoaded = { () -> ((_ loaded: Bool) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_bool____loaded______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_bool____loaded______(newValue)
+          return { () -> (Bool) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_bool(__unwrapped)
+            return { (__loaded: Bool) -> Void in
+              __wrappedFunction.call(__loaded)
+            }
+          }()
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
   public final var onLocationUpdate: bridge.std__optional_std__function_void_const_RNLocation_____location______ {
     @inline(__always)
     get {
@@ -685,6 +717,38 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
+  public final var onMapLongPress: bridge.std__optional_std__function_void_const_RNLatLng_____coordinate______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_const_RNLatLng_____coordinate______ in
+        if let __unwrappedValue = self.__implementation.onMapLongPress {
+          return bridge.create_std__optional_std__function_void_const_RNLatLng_____coordinate______({ () -> bridge.Func_void_RNLatLng in
+            let __closureWrapper = Func_void_RNLatLng(__unwrappedValue)
+            return bridge.create_Func_void_RNLatLng(__closureWrapper.toUnsafe())
+          }())
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onMapLongPress = { () -> ((_ coordinate: RNLatLng) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_RNLatLng_____coordinate______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNLatLng_____coordinate______(newValue)
+          return { () -> (RNLatLng) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_RNLatLng(__unwrapped)
+            return { (__coordinate: RNLatLng) -> Void in
+              __wrappedFunction.call(__coordinate)
+            }
+          }()
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
   public final var onMarkerPress: bridge.std__optional_std__function_void_const_std__optional_std__string______id______ {
     @inline(__always)
     get {

package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.cpp

@@ -54,12 +54,16 @@ namespace margelo::nitro::rngooglemapsplus {
       prototype.registerHybridSetter("onMapError", &HybridRNGoogleMapsPlusViewSpec::setOnMapError);
       prototype.registerHybridGetter("onMapReady", &HybridRNGoogleMapsPlusViewSpec::getOnMapReady);
       prototype.registerHybridSetter("onMapReady", &HybridRNGoogleMapsPlusViewSpec::setOnMapReady);
+      prototype.registerHybridGetter("onMapLoaded", &HybridRNGoogleMapsPlusViewSpec::getOnMapLoaded);
+      prototype.registerHybridSetter("onMapLoaded", &HybridRNGoogleMapsPlusViewSpec::setOnMapLoaded);
       prototype.registerHybridGetter("onLocationUpdate", &HybridRNGoogleMapsPlusViewSpec::getOnLocationUpdate);
       prototype.registerHybridSetter("onLocationUpdate", &HybridRNGoogleMapsPlusViewSpec::setOnLocationUpdate);
       prototype.registerHybridGetter("onLocationError", &HybridRNGoogleMapsPlusViewSpec::getOnLocationError);
       prototype.registerHybridSetter("onLocationError", &HybridRNGoogleMapsPlusViewSpec::setOnLocationError);
       prototype.registerHybridGetter("onMapPress", &HybridRNGoogleMapsPlusViewSpec::getOnMapPress);
       prototype.registerHybridSetter("onMapPress", &HybridRNGoogleMapsPlusViewSpec::setOnMapPress);
+      prototype.registerHybridGetter("onMapLongPress", &HybridRNGoogleMapsPlusViewSpec::getOnMapLongPress);
+      prototype.registerHybridSetter("onMapLongPress", &HybridRNGoogleMapsPlusViewSpec::setOnMapLongPress);
       prototype.registerHybridGetter("onMarkerPress", &HybridRNGoogleMapsPlusViewSpec::getOnMarkerPress);
       prototype.registerHybridSetter("onMarkerPress", &HybridRNGoogleMapsPlusViewSpec::setOnMarkerPress);
       prototype.registerHybridGetter("onPolylinePress", &HybridRNGoogleMapsPlusViewSpec::getOnPolylinePress);

package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.hpp

@@ -159,12 +159,16 @@ namespace margelo::nitro::rngooglemapsplus {
       virtual void setOnMapError(const std::optional<std::function<void(RNMapErrorCode /* error */)>>& onMapError) = 0;
       virtual std::optional<std::function<void(bool /* ready */)>> getOnMapReady() = 0;
       virtual void setOnMapReady(const std::optional<std::function<void(bool /* ready */)>>& onMapReady) = 0;
+      virtual std::optional<std::function<void(bool /* loaded */)>> getOnMapLoaded() = 0;
+      virtual void setOnMapLoaded(const std::optional<std::function<void(bool /* loaded */)>>& onMapLoaded) = 0;
       virtual std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() = 0;
       virtual void setOnLocationUpdate(const std::optional<std::function<void(const RNLocation& /* location */)>>& onLocationUpdate) = 0;
       virtual std::optional<std::function<void(RNLocationErrorCode /* error */)>> getOnLocationError() = 0;
       virtual void setOnLocationError(const std::optional<std::function<void(RNLocationErrorCode /* error */)>>& onLocationError) = 0;
       virtual std::optional<std::function<void(const RNLatLng& /* coordinate */)>> getOnMapPress() = 0;
       virtual void setOnMapPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapPress) = 0;
+      virtual std::optional<std::function<void(const RNLatLng& /* coordinate */)>> getOnMapLongPress() = 0;
+      virtual void setOnMapLongPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapLongPress) = 0;
       virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnMarkerPress() = 0;
       virtual void setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) = 0;
       virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolylinePress() = 0;

package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.cpp

@@ -225,6 +225,16 @@ namespace margelo::nitro::rngooglemapsplus::views {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMapReady: ") + exc.what());
       }
     }()),
+    onMapLoaded([&]() -> CachedProp<std::optional<std::function<void(bool /* loaded */)>>> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("onMapLoaded", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.onMapLoaded;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<std::optional<std::function<void(bool /* loaded */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMapLoaded);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMapLoaded: ") + exc.what());
+      }
+    }()),
     onLocationUpdate([&]() -> CachedProp<std::optional<std::function<void(const RNLocation& /* location */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onLocationUpdate", nullptr, nullptr);
@@ -255,6 +265,16 @@ namespace margelo::nitro::rngooglemapsplus::views {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMapPress: ") + exc.what());
       }
     }()),
+    onMapLongPress([&]() -> CachedProp<std::optional<std::function<void(const RNLatLng& /* coordinate */)>>> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("onMapLongPress", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.onMapLongPress;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<std::optional<std::function<void(const RNLatLng& /* coordinate */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMapLongPress);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMapLongPress: ") + exc.what());
+      }
+    }()),
     onMarkerPress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onMarkerPress", nullptr, nullptr);
@@ -408,9 +428,11 @@ namespace margelo::nitro::rngooglemapsplus::views {
     locationConfig(other.locationConfig),
     onMapError(other.onMapError),
     onMapReady(other.onMapReady),
+    onMapLoaded(other.onMapLoaded),
     onLocationUpdate(other.onLocationUpdate),
     onLocationError(other.onLocationError),
     onMapPress(other.onMapPress),
+    onMapLongPress(other.onMapLongPress),
     onMarkerPress(other.onMarkerPress),
     onPolylinePress(other.onPolylinePress),
     onPolygonPress(other.onPolygonPress),
@@ -447,9 +469,11 @@ namespace margelo::nitro::rngooglemapsplus::views {
       case hashString("locationConfig"): return true;
       case hashString("onMapError"): return true;
       case hashString("onMapReady"): return true;
+      case hashString("onMapLoaded"): return true;
       case hashString("onLocationUpdate"): return true;
       case hashString("onLocationError"): return true;
       case hashString("onMapPress"): return true;
+      case hashString("onMapLongPress"): return true;
       case hashString("onMarkerPress"): return true;
       case hashString("onPolylinePress"): return true;
       case hashString("onPolygonPress"): return true;

package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.hpp

@@ -85,9 +85,11 @@ namespace margelo::nitro::rngooglemapsplus::views {
     CachedProp<std::optional<RNLocationConfig>> locationConfig;
     CachedProp<std::optional<std::function<void(RNMapErrorCode /* error */)>>> onMapError;
     CachedProp<std::optional<std::function<void(bool /* ready */)>>> onMapReady;
+    CachedProp<std::optional<std::function<void(bool /* loaded */)>>> onMapLoaded;
     CachedProp<std::optional<std::function<void(const RNLocation& /* location */)>>> onLocationUpdate;
     CachedProp<std::optional<std::function<void(RNLocationErrorCode /* error */)>>> onLocationError;
     CachedProp<std::optional<std::function<void(const RNLatLng& /* coordinate */)>>> onMapPress;
+    CachedProp<std::optional<std::function<void(const RNLatLng& /* coordinate */)>>> onMapLongPress;
     CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onMarkerPress;
     CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onPolylinePress;
     CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onPolygonPress;

package/nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json

@@ -24,9 +24,11 @@
     "locationConfig": true,
     "onMapError": true,
     "onMapReady": true,
+    "onMapLoaded": true,
     "onLocationUpdate": true,
     "onLocationError": true,
     "onMapPress": true,
+    "onMapLongPress": true,
     "onMarkerPress": true,
     "onPolylinePress": true,
     "onPolygonPress": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.6.1",
+  "version": "1.7.0-dev.1",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
@@ -52,6 +52,7 @@
     "android/fix-prefab.gradle",
     "android/gradle.properties",
     "android/CMakeLists.txt",
+    "android/proguard-rules.pro",
     "android/src",
     "ios/**/*.h",
     "ios/**/*.m",
@@ -88,8 +89,8 @@
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "13.1.1",
     "@types/jest": "30.0.0",
-    "@types/react": "19.2.2",
-    "clang-format-node": "2.0.2",
+    "@types/react": "19.1.1",
+    "clang-format-node": "2.0.3",
     "conventional-changelog-conventionalcommits": "9.1.0",
     "del-cli": "7.0.0",
     "eslint": "9.38.0",
@@ -100,7 +101,7 @@
     "lefthook": "2.0.0",
     "nitrogen": "0.30.2",
     "prettier": "3.6.2",
-    "react": "19.2.0",
+    "react": "19.1.1",
     "react-native": "0.82.1",
     "react-native-builder-bob": "0.40.13",
     "react-native-nitro-modules": "0.30.2",

package/src/RNGoogleMapsPlusView.nitro.ts

@@ -51,9 +51,11 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
   locationConfig?: RNLocationConfig;
   onMapError?: (error: RNMapErrorCode) => void;
   onMapReady?: (ready: boolean) => void;
+  onMapLoaded?: (loaded: boolean) => void;
   onLocationUpdate?: (location: RNLocation) => void;
   onLocationError?: (error: RNLocationErrorCode) => void;
   onMapPress?: (coordinate: RNLatLng) => void;
+  onMapLongPress?: (coordinate: RNLatLng) => void;
   onMarkerPress?: (id?: string | undefined) => void;
   onPolylinePress?: (id?: string | undefined) => void;
   onPolygonPress?: (id?: string | undefined) => void;