react-native-google-maps-plus 1.7.0-dev.7 → 1.7.0-dev.8

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

@@ -76,6 +76,7 @@ class GoogleMapsViewImpl(
   GoogleMap.OnMyLocationButtonClickListener,
   LifecycleEventListener {
   private var initialized = false
+  private var loaded = false
   private var destroyed = false
   private var googleMap: GoogleMap? = null
   private var mapView: MapView? = null
@@ -141,7 +142,11 @@ class GoogleMapsViewImpl(
           googleMap?.setOnInfoWindowLongClickListener(this@GoogleMapsViewImpl)
           googleMap?.setOnMyLocationClickListener(this@GoogleMapsViewImpl)
           googleMap?.setOnMyLocationButtonClickListener(this@GoogleMapsViewImpl)
-          onMapLoaded?.invoke(true)
+          loaded = true
+          onMapLoaded?.invoke(
+            map.projection.visibleRegion.toRnRegion(),
+            map.cameraPosition.toRnCamera(),
+          )
         }
         applyProps()
         initLocationCallbacks()
@@ -151,6 +156,7 @@ class GoogleMapsViewImpl(
 
   override fun onCameraMoveStarted(reason: Int) =
     onUi {
+      if (!loaded) return@onUi
       cameraMoveReason = reason
       val visibleRegion = googleMap?.projection?.visibleRegion ?: return@onUi
       val cameraPosition = googleMap?.cameraPosition ?: return@onUi
@@ -163,6 +169,7 @@ class GoogleMapsViewImpl(
 
   override fun onCameraMove() =
     onUi {
+      if (!loaded) return@onUi
       val visibleRegion = googleMap?.projection?.visibleRegion ?: return@onUi
       val cameraPosition = googleMap?.cameraPosition ?: return@onUi
       val gesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
@@ -175,6 +182,7 @@ class GoogleMapsViewImpl(
 
   override fun onCameraIdle() =
     onUi {
+      if (!loaded) return@onUi
       val visibleRegion = googleMap?.projection?.visibleRegion ?: return@onUi
       val cameraPosition = googleMap?.cameraPosition ?: return@onUi
       val gesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason
@@ -354,7 +362,7 @@ class GoogleMapsViewImpl(
 
   var onMapError: ((RNMapErrorCode) -> Unit)? = null
   var onMapReady: ((Boolean) -> Unit)? = null
-  var onMapLoaded: ((Boolean) -> Unit)? = null
+  var onMapLoaded: ((RNRegion, RNCamera) -> Unit)? = null
   var onLocationUpdate: ((RNLocation) -> Unit)? = null
   var onLocationError: ((RNLocationErrorCode) -> Unit)? = null
   var onMapPress: ((RNLatLng) -> Unit)? = null
@@ -694,7 +702,10 @@ class GoogleMapsViewImpl(
 
   fun removeHeatmap(id: String) =
     onUi {
-      heatmapsById.remove(id)?.remove()
+      heatmapsById.remove(id)?.let { heatMap ->
+        heatMap.clearTileCache()
+        heatMap.remove()
+      }
     }
 
   fun clearHeatmaps() =
@@ -764,7 +775,10 @@ class GoogleMapsViewImpl(
 
   fun removeUrlTileOverlay(id: String) =
     onUi {
-      urlTileOverlaysById.remove(id)?.remove()
+      urlTileOverlaysById.remove(id)?.let { urlTileOverlay ->
+        urlTileOverlay.clearTileCache()
+        urlTileOverlay.remove()
+      }
     }
 
   fun clearUrlTileOverlays() =

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

@@ -19,7 +19,7 @@ class MapHeatmapBuilder {
           heatmap.gradient?.let {
             val colors = it.colors.map { c -> c.toColor() }.toIntArray()
             val startPoints = it.startPoints.map { p -> p.toFloat() }.toFloatArray()
-            gradient(Gradient(colors, startPoints))
+            gradient(Gradient(colors, startPoints, it.colorMapSize.toInt()))
           }
         }.build()
 

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

@@ -295,7 +295,7 @@ class RNGoogleMapsPlusView(
       view.onMapReady = cb
     }
 
-  override var onMapLoaded: ((Boolean) -> Unit)? = null
+  override var onMapLoaded: ((RNRegion, RNCamera) -> Unit)? = null
     set(cb) {
       view.onMapLoaded = cb
     }

package/ios/GoogleMapViewImpl.swift

@@ -261,7 +261,7 @@ GMSIndoorDisplayDelegate {
 
   var onMapError: ((RNMapErrorCode) -> Void)?
   var onMapReady: ((Bool) -> Void)?
-  var onMapLoaded: ((Bool) -> Void)?
+  var onMapLoaded: ((RNRegion, RNCamera) -> Void)?
   var onLocationUpdate: ((RNLocation) -> Void)?
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)?
   var onMapPress: ((RNLatLng) -> Void)?
@@ -703,10 +703,14 @@ GMSIndoorDisplayDelegate {
   func mapViewDidFinishTileRendering(_ mapView: GMSMapView) {
     guard !loaded else { return }
     loaded = true
-    onMapLoaded?(true)
+    let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
+    let camera = mapView.camera.toRNCamera()
+
+    self.onMapLoaded?(visibleRegion, camera)
   }
 
   func mapView(_ mapView: GMSMapView, willMove gesture: Bool) {
+    if !loaded { return }
     onMain {
       self.cameraMoveReasonIsGesture = gesture
 
@@ -718,6 +722,7 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, didChange position: GMSCameraPosition) {
+    if !loaded { return }
     onMain {
       let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()
@@ -728,6 +733,7 @@ GMSIndoorDisplayDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, idleAt position: GMSCameraPosition) {
+    if !loaded { return }
     onMain {
       let visibleRegion = mapView.projection.visibleRegion().toRNRegion()
       let camera = mapView.camera.toRNCamera()

package/ios/MapHeatmapBuilder.swift

@@ -19,7 +19,7 @@ final class MapHeatmapBuilder {
       heatmap.gradient = GMUGradient(
         colors: colors,
         startPoints: startPoints,
-        colorMapSize: 256
+        colorMapSize: UInt(g.colorMapSize)
       )
     }
 

package/ios/RNGoogleMapsPlusView.swift

@@ -325,7 +325,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onMapReady = onMapReady }
   }
   @MainActor
-  var onMapLoaded: ((Bool) -> Void)? {
+  var onMapLoaded: ((RNRegion, RNCamera) -> Void)? {
     didSet { impl.onMapLoaded = onMapLoaded }
   }
   @MainActor
@@ -385,19 +385,19 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onIndoorLevelActivated = onIndoorLevelActivated }
   }
   @MainActor
-  var onInfoWindowPress: ((String?) -> Void)?{
+  var onInfoWindowPress: ((String?) -> Void)? {
     didSet { impl.onInfoWindowPress = onInfoWindowPress }
   }
   @MainActor
-  var onInfoWindowClose: ((String?) -> Void)?{
+  var onInfoWindowClose: ((String?) -> Void)? {
     didSet { impl.onInfoWindowClose = onInfoWindowClose }
   }
   @MainActor
-  var onInfoWindowLongPress: ((String?) -> Void)?{
+  var onInfoWindowLongPress: ((String?) -> Void)? {
     didSet { impl.onInfoWindowLongPress = onInfoWindowLongPress }
   }
   @MainActor
-  var onMyLocationPress: ((RNLocation) -> Void)?{
+  var onMyLocationPress: ((RNLocation) -> Void)? {
     didSet { impl.onMyLocationPress = onMyLocationPress }
   }
   @MainActor

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

@@ -22,7 +22,7 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
     locationConfig?: RNLocationConfig;
     onMapError?: (error: RNMapErrorCode) => void;
     onMapReady?: (ready: boolean) => void;
-    onMapLoaded?: (loaded: boolean) => void;
+    onMapLoaded?: (region: RNRegion, camera: RNCamera) => void;
     onLocationUpdate?: (location: RNLocation) => void;
     onLocationError?: (error: RNLocationErrorCode) => void;
     onMapPress?: (coordinate: RNLatLng) => 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/RNGoogleMapsPlusOnLoad.cpp

@@ -19,6 +19,7 @@
 #include "JHybridRNGoogleMapsPlusViewSpec.hpp"
 #include "JFunc_void_RNMapErrorCode.hpp"
 #include "JFunc_void_bool.hpp"
+#include "JFunc_void_RNRegion_RNCamera.hpp"
 #include "JFunc_void_RNLocation.hpp"
 #include "JFunc_void_RNLocationErrorCode.hpp"
 #include "JFunc_void_RNLatLng.hpp"
@@ -44,6 +45,7 @@ int initialize(JavaVM* vm) {
     margelo::nitro::rngooglemapsplus::JHybridRNGoogleMapsPlusViewSpec::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_RNMapErrorCode_cxx::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_bool_cxx::registerNatives();
+    margelo::nitro::rngooglemapsplus::JFunc_void_RNRegion_RNCamera_cxx::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_RNLocation_cxx::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_RNLocationErrorCode_cxx::registerNatives();
     margelo::nitro::rngooglemapsplus::JFunc_void_RNLatLng_cxx::registerNatives();

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

@@ -0,0 +1,83 @@
+///
+/// JFunc_void_RNRegion_RNCamera.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <functional>
+
+#include "RNRegion.hpp"
+#include "RNCamera.hpp"
+#include <functional>
+#include "JRNRegion.hpp"
+#include "RNLatLng.hpp"
+#include "JRNLatLng.hpp"
+#include "RNLatLngBounds.hpp"
+#include "JRNLatLngBounds.hpp"
+#include "JRNCamera.hpp"
+#include <optional>
+
+namespace margelo::nitro::rngooglemapsplus {
+
+  using namespace facebook;
+
+  /**
+   * Represents the Java/Kotlin callback `(region: RNRegion, camera: RNCamera) -> Unit`.
+   * This can be passed around between C++ and Java/Kotlin.
+   */
+  struct JFunc_void_RNRegion_RNCamera: public jni::JavaClass<JFunc_void_RNRegion_RNCamera> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera;";
+
+  public:
+    /**
+     * Invokes the function this `JFunc_void_RNRegion_RNCamera` instance holds through JNI.
+     */
+    void invoke(const RNRegion& region, const RNCamera& camera) const {
+      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNRegion> /* region */, jni::alias_ref<JRNCamera> /* camera */)>("invoke");
+      method(self(), JRNRegion::fromCpp(region), JRNCamera::fromCpp(camera));
+    }
+  };
+
+  /**
+   * An implementation of Func_void_RNRegion_RNCamera that is backed by a C++ implementation (using `std::function<...>`)
+   */
+  struct JFunc_void_RNRegion_RNCamera_cxx final: public jni::HybridClass<JFunc_void_RNRegion_RNCamera_cxx, JFunc_void_RNRegion_RNCamera> {
+  public:
+    static jni::local_ref<JFunc_void_RNRegion_RNCamera::javaobject> fromCpp(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>& func) {
+      return JFunc_void_RNRegion_RNCamera_cxx::newObjectCxxArgs(func);
+    }
+
+  public:
+    /**
+     * Invokes the C++ `std::function<...>` this `JFunc_void_RNRegion_RNCamera_cxx` instance holds.
+     */
+    void invoke_cxx(jni::alias_ref<JRNRegion> region, jni::alias_ref<JRNCamera> camera) {
+      _func(region->toCpp(), camera->toCpp());
+    }
+
+  public:
+    [[nodiscard]]
+    inline const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>& getFunction() const {
+      return _func;
+    }
+
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_cxx;";
+    static void registerNatives() {
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNRegion_RNCamera_cxx::invoke_cxx)});
+    }
+
+  private:
+    explicit JFunc_void_RNRegion_RNCamera_cxx(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>& func): _func(func) { }
+
+  private:
+    friend HybridBase;
+    std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)> _func;
+  };
+
+} // namespace margelo::nitro::rngooglemapsplus

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

@@ -63,6 +63,10 @@ namespace margelo::nitro::rngooglemapsplus { struct RNIOSLocationConfig; }
 namespace margelo::nitro::rngooglemapsplus { enum class RNIOSLocationAccuracy; }
 // Forward declaration of `RNMapErrorCode` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { enum class RNMapErrorCode; }
+// Forward declaration of `RNRegion` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
+// Forward declaration of `RNLatLngBounds` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 // Forward declaration of `RNLocation` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLocation; }
 // Forward declaration of `RNLocationAndroid` to properly resolve imports.
@@ -75,10 +79,6 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNLocationErrorCode; }
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorBuilding; }
 // Forward declaration of `RNIndoorLevel` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorLevel; }
-// Forward declaration of `RNRegion` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
-// Forward declaration of `RNLatLngBounds` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 // Forward declaration of `RNLocationPermissionResult` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLocationPermissionResult; }
 // Forward declaration of `RNAndroidLocationPermissionResult` to properly resolve imports.
@@ -156,6 +156,11 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
 #include "JFunc_void_RNMapErrorCode.hpp"
 #include "JRNMapErrorCode.hpp"
 #include "JFunc_void_bool.hpp"
+#include "RNRegion.hpp"
+#include "JFunc_void_RNRegion_RNCamera.hpp"
+#include "JRNRegion.hpp"
+#include "RNLatLngBounds.hpp"
+#include "JRNLatLngBounds.hpp"
 #include "RNLocation.hpp"
 #include "JFunc_void_RNLocation.hpp"
 #include "JRNLocation.hpp"
@@ -176,11 +181,7 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
 #include "RNIndoorLevel.hpp"
 #include "JRNIndoorLevel.hpp"
 #include "JFunc_void_RNIndoorLevel.hpp"
-#include "RNRegion.hpp"
 #include "JFunc_void_RNRegion_RNCamera_bool.hpp"
-#include "JRNRegion.hpp"
-#include "RNLatLngBounds.hpp"
-#include "JRNLatLngBounds.hpp"
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/JPromise.hpp>
 #include "RNLocationPermissionResult.hpp"
@@ -549,24 +550,24 @@ 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");
+  std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMapLoaded() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNRegion_RNCamera::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 __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)> {
+      if (__result->isInstanceOf(JFunc_void_RNRegion_RNCamera_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_RNRegion_RNCamera_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](bool loaded) -> void {
-          return __resultRef->invoke(loaded);
+        return [__resultRef](RNRegion region, RNCamera camera) -> void {
+          return __resultRef->invoke(region,camera);
         };
       }
     }()) : 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);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& onMapLoaded) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNRegion_RNCamera::javaobject> /* onMapLoaded */)>("setOnMapLoaded_cxx");
+    method(_javaPart, onMapLoaded.has_value() ? JFunc_void_RNRegion_RNCamera_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");

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

@@ -91,8 +91,8 @@ 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 RNRegion& /* region */, const RNCamera& /* camera */)>> getOnMapLoaded() override;
+    void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& 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;

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

@@ -0,0 +1,81 @@
+///
+/// Func_void_RNRegion_RNCamera.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+package com.rngooglemapsplus
+
+import androidx.annotation.Keep
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.*
+import dalvik.annotation.optimization.FastNative
+
+
+/**
+ * Represents the JavaScript callback `(region: struct, camera: struct) => void`.
+ * This can be either implemented in C++ (in which case it might be a callback coming from JS),
+ * or in Kotlin/Java (in which case it is a native callback).
+ */
+@DoNotStrip
+@Keep
+@Suppress("ClassName", "RedundantUnitReturnType")
+fun interface Func_void_RNRegion_RNCamera: (RNRegion, RNCamera) -> Unit {
+  /**
+   * Call the given JS callback.
+   * @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
+   */
+  @DoNotStrip
+  @Keep
+  override fun invoke(region: RNRegion, camera: RNCamera): Unit
+}
+
+/**
+ * Represents the JavaScript callback `(region: struct, camera: struct) => void`.
+ * This is implemented in C++, via a `std::function<...>`.
+ * The callback might be coming from JS.
+ */
+@DoNotStrip
+@Keep
+@Suppress(
+  "KotlinJniMissingFunction", "unused",
+  "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
+  "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
+)
+class Func_void_RNRegion_RNCamera_cxx: Func_void_RNRegion_RNCamera {
+  @DoNotStrip
+  @Keep
+  private val mHybridData: HybridData
+
+  @DoNotStrip
+  @Keep
+  private constructor(hybridData: HybridData) {
+    mHybridData = hybridData
+  }
+
+  @DoNotStrip
+  @Keep
+  override fun invoke(region: RNRegion, camera: RNCamera): Unit
+    = invoke_cxx(region,camera)
+
+  @FastNative
+  private external fun invoke_cxx(region: RNRegion, camera: RNCamera): Unit
+}
+
+/**
+ * Represents the JavaScript callback `(region: struct, camera: struct) => void`.
+ * This is implemented in Java/Kotlin, via a `(RNRegion, RNCamera) -> Unit`.
+ * The callback is always coming from native.
+ */
+@DoNotStrip
+@Keep
+@Suppress("ClassName", "RedundantUnitReturnType", "unused")
+class Func_void_RNRegion_RNCamera_java(private val function: (RNRegion, RNCamera) -> Unit): Func_void_RNRegion_RNCamera {
+  @DoNotStrip
+  @Keep
+  override fun invoke(region: RNRegion, camera: RNCamera): Unit {
+    return this.function(region, camera)
+  }
+}

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

@@ -180,13 +180,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onMapReady = value?.let { it }
     }
   
-  abstract var onMapLoaded: ((loaded: Boolean) -> Unit)?
+  abstract var onMapLoaded: ((region: RNRegion, camera: RNCamera) -> Unit)?
   
-  private var onMapLoaded_cxx: Func_void_bool?
+  private var onMapLoaded_cxx: Func_void_RNRegion_RNCamera?
     @Keep
     @DoNotStrip
     get() {
-      return onMapLoaded?.let { Func_void_bool_java(it) }
+      return onMapLoaded?.let { Func_void_RNRegion_RNCamera_java(it) }
     }
     @Keep
     @DoNotStrip

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

@@ -62,6 +62,14 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     };
   }
   
+  // pragma MARK: std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>
+  Func_void_RNRegion_RNCamera create_Func_void_RNRegion_RNCamera(void* NON_NULL swiftClosureWrapper) noexcept {
+    auto swiftClosure = RNGoogleMapsPlus::Func_void_RNRegion_RNCamera::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const RNRegion& region, const RNCamera& camera) mutable -> void {
+      swiftClosure.call(region, camera);
+    };
+  }
+  
   // pragma MARK: std::function<void(const RNLocation& /* location */)>
   Func_void_RNLocation create_Func_void_RNLocation(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNLocation::fromUnsafe(swiftClosureWrapper);

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

@@ -926,18 +926,40 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     return *optional;
   }
   
-  // pragma MARK: std::optional<std::function<void(bool /* loaded */)>>
+  // pragma MARK: std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>
   /**
-   * Specialized version of `std::optional<std::function<void(bool / * loaded * /)>>`.
+   * Specialized version of `std::function<void(const RNRegion&, const RNCamera&)>`.
    */
-  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);
+  using Func_void_RNRegion_RNCamera = std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>;
+  /**
+   * Wrapper class for a `std::function<void(const RNRegion& / * region * /, const RNCamera& / * camera * /)>`, this can be used from Swift.
+   */
+  class Func_void_RNRegion_RNCamera_Wrapper final {
+  public:
+    explicit Func_void_RNRegion_RNCamera_Wrapper(std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>&& func): _function(std::make_unique<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>(std::move(func))) {}
+    inline void call(RNRegion region, RNCamera camera) const noexcept {
+      _function->operator()(region, camera);
+    }
+  private:
+    std::unique_ptr<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>> _function;
+  } SWIFT_NONCOPYABLE;
+  Func_void_RNRegion_RNCamera create_Func_void_RNRegion_RNCamera(void* NON_NULL swiftClosureWrapper) noexcept;
+  inline Func_void_RNRegion_RNCamera_Wrapper wrap_Func_void_RNRegion_RNCamera(Func_void_RNRegion_RNCamera value) noexcept {
+    return Func_void_RNRegion_RNCamera_Wrapper(std::move(value));
+  }
+  
+  // pragma MARK: std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>
+  /**
+   * Specialized version of `std::optional<std::function<void(const RNRegion& / * region * /, const RNCamera& / * camera * /)>>`.
+   */
+  using std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______ = std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>;
+  inline std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>> create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>& value) noexcept {
+    return std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>(value);
   }
-  inline bool has_value_std__optional_std__function_void_bool____loaded______(const std::optional<std::function<void(bool /* loaded */)>>& optional) noexcept {
+  inline bool has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& 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 {
+  inline std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)> get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& optional) noexcept {
     return *optional;
   }
   

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

@@ -68,6 +68,10 @@ namespace margelo::nitro::rngooglemapsplus { struct RNIOSLocationConfig; }
 namespace margelo::nitro::rngooglemapsplus { enum class RNIOSLocationAccuracy; }
 // Forward declaration of `RNMapErrorCode` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { enum class RNMapErrorCode; }
+// Forward declaration of `RNRegion` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
+// Forward declaration of `RNLatLngBounds` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 // Forward declaration of `RNLocation` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLocation; }
 // Forward declaration of `RNLocationAndroid` to properly resolve imports.
@@ -80,10 +84,6 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNLocationErrorCode; }
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorBuilding; }
 // Forward declaration of `RNIndoorLevel` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorLevel; }
-// Forward declaration of `RNRegion` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
-// Forward declaration of `RNLatLngBounds` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 // Forward declaration of `RNSnapshotOptions` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNSnapshotOptions; }
 // Forward declaration of `RNSize` to properly resolve imports.
@@ -131,14 +131,14 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNIOSPermissionResult; }
 #include "RNIOSLocationAccuracy.hpp"
 #include "RNMapErrorCode.hpp"
 #include <functional>
+#include "RNRegion.hpp"
+#include "RNLatLngBounds.hpp"
 #include "RNLocation.hpp"
 #include "RNLocationAndroid.hpp"
 #include "RNLocationIOS.hpp"
 #include "RNLocationErrorCode.hpp"
 #include "RNIndoorBuilding.hpp"
 #include "RNIndoorLevel.hpp"
-#include "RNRegion.hpp"
-#include "RNLatLngBounds.hpp"
 #include <NitroModules/Promise.hpp>
 #include "RNSnapshotOptions.hpp"
 #include "RNSize.hpp"
@@ -332,11 +332,11 @@ 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 {
+    inline std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>> getOnMapLoaded() noexcept override {
       auto __result = _swiftPart.getOnMapLoaded();
       return __result;
     }
-    inline void setOnMapLoaded(const std::optional<std::function<void(bool /* loaded */)>>& onMapLoaded) noexcept override {
+    inline void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& onMapLoaded) noexcept override {
       _swiftPart.setOnMapLoaded(onMapLoaded);
     }
     inline std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() noexcept override {

package/nitrogen/generated/ios/swift/Func_void_RNRegion_RNCamera.swift

@@ -0,0 +1,47 @@
+///
+/// Func_void_RNRegion_RNCamera.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+import NitroModules
+
+
+/**
+ * Wraps a Swift `(_ region: RNRegion, _ camera: RNCamera) -> Void` as a class.
+ * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.
+ */
+public final class Func_void_RNRegion_RNCamera {
+  public typealias bridge = margelo.nitro.rngooglemapsplus.bridge.swift
+
+  private let closure: (_ region: RNRegion, _ camera: RNCamera) -> Void
+
+  public init(_ closure: @escaping (_ region: RNRegion, _ camera: RNCamera) -> Void) {
+    self.closure = closure
+  }
+
+  @inline(__always)
+  public func call(region: RNRegion, camera: RNCamera) -> Void {
+    self.closure(region, camera)
+  }
+
+  /**
+   * Casts this instance to a retained unsafe raw pointer.
+   * This acquires one additional strong reference on the object!
+   */
+  @inline(__always)
+  public func toUnsafe() -> UnsafeMutableRawPointer {
+    return Unmanaged.passRetained(self).toOpaque()
+  }
+
+  /**
+   * Casts an unsafe pointer to a `Func_void_RNRegion_RNCamera`.
+   * The pointer has to be a retained opaque `Unmanaged<Func_void_RNRegion_RNCamera>`.
+   * This removes one strong reference from the object!
+   */
+  @inline(__always)
+  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_RNRegion_RNCamera {
+    return Unmanaged<Func_void_RNRegion_RNCamera>.fromOpaque(pointer).takeRetainedValue()
+  }
+}

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

@@ -32,7 +32,7 @@ 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 onMapLoaded: ((_ region: RNRegion, _ camera: RNCamera) -> Void)? { get set }
   var onLocationUpdate: ((_ location: RNLocation) -> Void)? { get set }
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)? { get set }
   var onMapPress: ((_ coordinate: RNLatLng) -> Void)? { get set }

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

@@ -619,14 +619,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onMapLoaded: bridge.std__optional_std__function_void_bool____loaded______ {
+  public final var onMapLoaded: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_bool____loaded______ in
+      return { () -> bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______ 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())
+          return bridge.create_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______({ () -> bridge.Func_void_RNRegion_RNCamera in
+            let __closureWrapper = Func_void_RNRegion_RNCamera(__unwrappedValue)
+            return bridge.create_Func_void_RNRegion_RNCamera(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -635,13 +635,13 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @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)
+      self.__implementation.onMapLoaded = { () -> ((_ region: RNRegion, _ camera: RNCamera) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera______(newValue)
+          return { () -> (RNRegion, RNCamera) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_RNRegion_RNCamera(__unwrapped)
+            return { (__region: RNRegion, __camera: RNCamera) -> Void in
+              __wrappedFunction.call(__region, __camera)
             }
           }()
         } else {

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

@@ -43,6 +43,10 @@ namespace margelo::nitro::rngooglemapsplus { struct RNUrlTileOverlay; }
 namespace margelo::nitro::rngooglemapsplus { struct RNLocationConfig; }
 // Forward declaration of `RNMapErrorCode` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { enum class RNMapErrorCode; }
+// Forward declaration of `RNRegion` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
+// Forward declaration of `RNCamera` to properly resolve imports.
+namespace margelo::nitro::rngooglemapsplus { struct RNCamera; }
 // Forward declaration of `RNLocation` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLocation; }
 // Forward declaration of `RNLocationErrorCode` to properly resolve imports.
@@ -53,10 +57,6 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLatLng; }
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorBuilding; }
 // Forward declaration of `RNIndoorLevel` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNIndoorLevel; }
-// Forward declaration of `RNRegion` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
-// Forward declaration of `RNCamera` to properly resolve imports.
-namespace margelo::nitro::rngooglemapsplus { struct RNCamera; }
 // Forward declaration of `RNLatLngBounds` to properly resolve imports.
 namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
 // Forward declaration of `RNSnapshotOptions` to properly resolve imports.
@@ -83,13 +83,13 @@ namespace margelo::nitro::rngooglemapsplus { struct RNLocationPermissionResult;
 #include "RNLocationConfig.hpp"
 #include "RNMapErrorCode.hpp"
 #include <functional>
+#include "RNRegion.hpp"
+#include "RNCamera.hpp"
 #include "RNLocation.hpp"
 #include "RNLocationErrorCode.hpp"
 #include "RNLatLng.hpp"
 #include "RNIndoorBuilding.hpp"
 #include "RNIndoorLevel.hpp"
-#include "RNRegion.hpp"
-#include "RNCamera.hpp"
 #include "RNLatLngBounds.hpp"
 #include <NitroModules/Promise.hpp>
 #include "RNSnapshotOptions.hpp"
@@ -164,8 +164,8 @@ 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 RNRegion& /* region */, const RNCamera& /* camera */)>> getOnMapLoaded() = 0;
+      virtual void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>& 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;

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

@@ -235,12 +235,12 @@ namespace margelo::nitro::rngooglemapsplus::views {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMapReady: ") + exc.what());
       }
     }()),
-    onMapLoaded([&]() -> CachedProp<std::optional<std::function<void(bool /* loaded */)>>> {
+    onMapLoaded([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>> {
       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);
+        return CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>>>::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());
       }

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

@@ -35,13 +35,13 @@
 #include "RNLocationConfig.hpp"
 #include "RNMapErrorCode.hpp"
 #include <functional>
+#include "RNRegion.hpp"
+#include "RNCamera.hpp"
 #include "RNLocation.hpp"
 #include "RNLocationErrorCode.hpp"
 #include "RNLatLng.hpp"
 #include "RNIndoorBuilding.hpp"
 #include "RNIndoorLevel.hpp"
-#include "RNRegion.hpp"
-#include "RNCamera.hpp"
 #include <memory>
 #include "HybridRNGoogleMapsPlusViewSpec.hpp"
 
@@ -87,7 +87,7 @@ 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 RNRegion& /* region */, const RNCamera& /* camera */)>>> 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.7",
+  "version": "1.7.0-dev.8",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
@@ -8,7 +8,9 @@
   "source": "src/index",
   "react-native": "src/index",
   "scripts": {
-    "typecheck": "tsc --noEmit",
+    "typecheck:lib": "tsc --noEmit -p tsconfig.json",
+    "typecheck:example": "tsc --noEmit -p example/tsconfig.json",
+    "typecheck": "yarn typecheck:lib && yarn typecheck:example",
     "lint": "yarn lint:js && yarn lint:android && yarn lint:ios",
     "lint:js": "eslint . --max-warnings 0 && yarn prettier --check .",
     "lint:android": "cd android && ktlint -F ./**/*.kt*",

package/src/RNGoogleMapsPlusView.nitro.ts

@@ -53,7 +53,7 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
   locationConfig?: RNLocationConfig;
   onMapError?: (error: RNMapErrorCode) => void;
   onMapReady?: (ready: boolean) => void;
-  onMapLoaded?: (loaded: boolean) => void;
+  onMapLoaded?: (region: RNRegion, camera: RNCamera) => void;
   onLocationUpdate?: (location: RNLocation) => void;
   onLocationError?: (error: RNLocationErrorCode) => void;
   onMapPress?: (coordinate: RNLatLng) => void;