react-native-google-maps-plus 1.7.0-dev.9 → 1.8.0-dev.1

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(const RNRegion& /* region */, const RNCamera& /* camera */)>>> {
+    onMapLoaded([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* 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(const RNRegion& /* region */, const RNCamera& /* camera */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMapLoaded);
+        return CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* 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());
       }
@@ -295,72 +295,72 @@ namespace margelo::nitro::rngooglemapsplus::views {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onPoiPress: ") + exc.what());
       }
     }()),
-    onMarkerPress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+    onMarkerPress([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onMarkerPress", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onMarkerPress;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMarkerPress);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMarkerPress);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMarkerPress: ") + exc.what());
       }
     }()),
-    onPolylinePress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+    onPolylinePress([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onPolylinePress", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onPolylinePress;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onPolylinePress);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onPolylinePress);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onPolylinePress: ") + exc.what());
       }
     }()),
-    onPolygonPress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+    onPolygonPress([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onPolygonPress", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onPolygonPress;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onPolygonPress);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onPolygonPress);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onPolygonPress: ") + exc.what());
       }
     }()),
-    onCirclePress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+    onCirclePress([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onCirclePress", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onCirclePress;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onCirclePress);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onCirclePress);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onCirclePress: ") + exc.what());
       }
     }()),
-    onMarkerDragStart([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>> {
+    onMarkerDragStart([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onMarkerDragStart", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onMarkerDragStart;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMarkerDragStart);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMarkerDragStart);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMarkerDragStart: ") + exc.what());
       }
     }()),
-    onMarkerDrag([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>> {
+    onMarkerDrag([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onMarkerDrag", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onMarkerDrag;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMarkerDrag);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMarkerDrag);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMarkerDrag: ") + exc.what());
       }
     }()),
-    onMarkerDragEnd([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>> {
+    onMarkerDragEnd([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onMarkerDragEnd", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onMarkerDragEnd;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMarkerDragEnd);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMarkerDragEnd);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMarkerDragEnd: ") + exc.what());
       }
@@ -385,32 +385,32 @@ namespace margelo::nitro::rngooglemapsplus::views {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onIndoorLevelActivated: ") + exc.what());
       }
     }()),
-    onInfoWindowPress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+    onInfoWindowPress([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onInfoWindowPress", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onInfoWindowPress;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowPress);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowPress);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onInfoWindowPress: ") + exc.what());
       }
     }()),
-    onInfoWindowClose([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+    onInfoWindowClose([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onInfoWindowClose", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onInfoWindowClose;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowClose);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowClose);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onInfoWindowClose: ") + exc.what());
       }
     }()),
-    onInfoWindowLongPress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+    onInfoWindowLongPress([&]() -> CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onInfoWindowLongPress", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onInfoWindowLongPress;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowLongPress);
+        return CachedProp<std::optional<std::function<void(const std::string& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowLongPress);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onInfoWindowLongPress: ") + exc.what());
       }
@@ -435,32 +435,32 @@ namespace margelo::nitro::rngooglemapsplus::views {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMyLocationButtonPress: ") + exc.what());
       }
     }()),
-    onCameraChangeStart([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> {
+    onCameraChangeStart([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onCameraChangeStart", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onCameraChangeStart;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onCameraChangeStart);
+        return CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onCameraChangeStart);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onCameraChangeStart: ") + exc.what());
       }
     }()),
-    onCameraChange([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> {
+    onCameraChange([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onCameraChange", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onCameraChange;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onCameraChange);
+        return CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onCameraChange);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onCameraChange: ") + exc.what());
       }
     }()),
-    onCameraChangeComplete([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> {
+    onCameraChangeComplete([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onCameraChangeComplete", nullptr, nullptr);
         if (rawValue == nullptr) return sourceProps.onCameraChangeComplete;
         const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onCameraChangeComplete);
+        return CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onCameraChangeComplete);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onCameraChangeComplete: ") + exc.what());
       }

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

@@ -36,7 +36,7 @@
 #include "RNMapErrorCode.hpp"
 #include <functional>
 #include "RNRegion.hpp"
-#include "RNCamera.hpp"
+#include "RNCameraChange.hpp"
 #include "RNLocation.hpp"
 #include "RNLocationErrorCode.hpp"
 #include "RNLatLng.hpp"
@@ -87,29 +87,29 @@ 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(const RNRegion& /* region */, const RNCamera& /* camera */)>>> onMapLoaded;
+    CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* 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;
     CachedProp<std::optional<std::function<void(const RNLatLng& /* coordinate */)>>> onMapLongPress;
     CachedProp<std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>>> onPoiPress;
-    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;
-    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onCirclePress;
-    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>> onMarkerDragStart;
-    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>> onMarkerDrag;
-    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>> onMarkerDragEnd;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> onMarkerPress;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> onPolylinePress;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> onPolygonPress;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> onCirclePress;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>> onMarkerDragStart;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>> onMarkerDrag;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>> onMarkerDragEnd;
     CachedProp<std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>> onIndoorBuildingFocused;
     CachedProp<std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>> onIndoorLevelActivated;
-    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onInfoWindowPress;
-    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onInfoWindowClose;
-    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onInfoWindowLongPress;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> onInfoWindowPress;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> onInfoWindowClose;
+    CachedProp<std::optional<std::function<void(const std::string& /* id */)>>> onInfoWindowLongPress;
     CachedProp<std::optional<std::function<void(const RNLocation& /* location */)>>> onMyLocationPress;
     CachedProp<std::optional<std::function<void(bool /* pressed */)>>> onMyLocationButtonPress;
-    CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> onCameraChangeStart;
-    CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> onCameraChange;
-    CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> onCameraChangeComplete;
+    CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>> onCameraChangeStart;
+    CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>> onCameraChange;
+    CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>> onCameraChangeComplete;
     CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridRNGoogleMapsPlusViewSpec>& /* ref */)>>> hybridRef;
 
   private:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.9",
+  "version": "1.8.0-dev.1",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",

package/src/RNGoogleMapsPlusView.nitro.ts

@@ -5,6 +5,7 @@ import type {
 } from 'react-native-nitro-modules';
 import type {
   RNCamera,
+  RNCameraChange,
   RNLatLng,
   RNMapPadding,
   RNPolygon,
@@ -53,44 +54,48 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
   locationConfig?: RNLocationConfig;
   onMapError?: (error: RNMapErrorCode) => void;
   onMapReady?: (ready: boolean) => void;
-  onMapLoaded?: (region: RNRegion, camera: RNCamera) => void;
+  onMapLoaded?: (region: RNRegion, camera: RNCameraChange) => void;
   onLocationUpdate?: (location: RNLocation) => void;
   onLocationError?: (error: RNLocationErrorCode) => void;
   onMapPress?: (coordinate: RNLatLng) => void;
   onMapLongPress?: (coordinate: RNLatLng) => void;
   onPoiPress?: (placeId: string, name: string, coordinate: RNLatLng) => void;
-  onMarkerPress?: (id?: string | undefined) => void;
-  onPolylinePress?: (id?: string | undefined) => void;
-  onPolygonPress?: (id?: string | undefined) => void;
-  onCirclePress?: (id?: string | undefined) => void;
-  onMarkerDragStart?: (id: string | undefined, location: RNLatLng) => void;
-  onMarkerDrag?: (id: string | undefined, location: RNLatLng) => void;
-  onMarkerDragEnd?: (id: string | undefined, location: RNLatLng) => void;
+  onMarkerPress?: (id: string) => void;
+  onPolylinePress?: (id: string) => void;
+  onPolygonPress?: (id: string) => void;
+  onCirclePress?: (id: string) => void;
+  onMarkerDragStart?: (id: string, location: RNLatLng) => void;
+  onMarkerDrag?: (id: string, location: RNLatLng) => void;
+  onMarkerDragEnd?: (id: string, location: RNLatLng) => void;
   onIndoorBuildingFocused?: (indoorBuilding: RNIndoorBuilding) => void;
   onIndoorLevelActivated?: (indoorLevel: RNIndoorLevel) => void;
-  onInfoWindowPress?: (id?: string) => void;
-  onInfoWindowClose?: (id?: string) => void;
-  onInfoWindowLongPress?: (id?: string) => void;
+  onInfoWindowPress?: (id: string) => void;
+  onInfoWindowClose?: (id: string) => void;
+  onInfoWindowLongPress?: (id: string) => void;
   onMyLocationPress?: (location: RNLocation) => void;
   onMyLocationButtonPress?: (pressed: boolean) => void;
   onCameraChangeStart?: (
     region: RNRegion,
-    camera: RNCamera,
+    camera: RNCameraChange,
     isGesture: boolean
   ) => void;
   onCameraChange?: (
     region: RNRegion,
-    camera: RNCamera,
+    camera: RNCameraChange,
     isGesture: boolean
   ) => void;
   onCameraChangeComplete?: (
     region: RNRegion,
-    camera: RNCamera,
+    camera: RNCameraChange,
     isGesture: boolean
   ) => void;
 }
 
 export interface RNGoogleMapsPlusViewMethods extends HybridViewMethods {
+  showMarkerInfoWindow(id: string): void;
+
+  hideMarkerInfoWindow(id: string): void;
+
   setCamera(camera: RNCamera, animated?: boolean, durationMs?: number): void;
 
   setCameraToCoordinates(

package/src/types.ts

@@ -7,6 +7,7 @@ export type RNInitialProps = {
   mapId?: string;
   liteMode?: boolean;
   camera?: RNCamera;
+  backgroundColor?: string;
 };
 
 export type RNMapUiSettings = {
@@ -129,6 +130,13 @@ export interface RNMapStyleElement {
   stylers: RNMapStyler[];
 }
 
+export type RNCameraChange = {
+  center: RNLatLng;
+  zoom: number;
+  bearing: number;
+  tilt: number;
+};
+
 export type RNCamera = {
   center?: RNLatLng;
   zoom?: number;
@@ -162,7 +170,6 @@ export type RNMarker = {
   zIndex?: number;
   coordinate: RNLatLng;
   anchor?: RNPosition;
-  showInfoWindow?: boolean;
   title?: string;
   snippet?: string;
   opacity?: number;
@@ -171,6 +178,7 @@ export type RNMarker = {
   rotation?: number;
   infoWindowAnchor?: RNPosition;
   iconSvg?: RNMarkerSvg;
+  infoWindowIconSvg?: RNMarkerSvg;
 };
 
 export type RNMarkerSvg = {

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

@@ -1,83 +0,0 @@
-///
-/// JFunc_void_RNRegion_RNCamera_bool.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, isGesture: Boolean) -> Unit`.
-   * This can be passed around between C++ and Java/Kotlin.
-   */
-  struct JFunc_void_RNRegion_RNCamera_bool: public jni::JavaClass<JFunc_void_RNRegion_RNCamera_bool> {
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_bool;";
-
-  public:
-    /**
-     * Invokes the function this `JFunc_void_RNRegion_RNCamera_bool` instance holds through JNI.
-     */
-    void invoke(const RNRegion& region, const RNCamera& camera, bool isGesture) const {
-      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNRegion> /* region */, jni::alias_ref<JRNCamera> /* camera */, jboolean /* isGesture */)>("invoke");
-      method(self(), JRNRegion::fromCpp(region), JRNCamera::fromCpp(camera), isGesture);
-    }
-  };
-
-  /**
-   * An implementation of Func_void_RNRegion_RNCamera_bool that is backed by a C++ implementation (using `std::function<...>`)
-   */
-  struct JFunc_void_RNRegion_RNCamera_bool_cxx final: public jni::HybridClass<JFunc_void_RNRegion_RNCamera_bool_cxx, JFunc_void_RNRegion_RNCamera_bool> {
-  public:
-    static jni::local_ref<JFunc_void_RNRegion_RNCamera_bool::javaobject> fromCpp(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>& func) {
-      return JFunc_void_RNRegion_RNCamera_bool_cxx::newObjectCxxArgs(func);
-    }
-
-  public:
-    /**
-     * Invokes the C++ `std::function<...>` this `JFunc_void_RNRegion_RNCamera_bool_cxx` instance holds.
-     */
-    void invoke_cxx(jni::alias_ref<JRNRegion> region, jni::alias_ref<JRNCamera> camera, jboolean isGesture) {
-      _func(region->toCpp(), camera->toCpp(), static_cast<bool>(isGesture));
-    }
-
-  public:
-    [[nodiscard]]
-    inline const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>& getFunction() const {
-      return _func;
-    }
-
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_bool_cxx;";
-    static void registerNatives() {
-      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNRegion_RNCamera_bool_cxx::invoke_cxx)});
-    }
-
-  private:
-    explicit JFunc_void_RNRegion_RNCamera_bool_cxx(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>& func): _func(func) { }
-
-  private:
-    friend HybridBase;
-    std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)> _func;
-  };
-
-} // namespace margelo::nitro::rngooglemapsplus

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

@@ -1,76 +0,0 @@
-///
-/// JFunc_void_std__optional_std__string_.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 <string>
-#include <optional>
-#include <functional>
-
-namespace margelo::nitro::rngooglemapsplus {
-
-  using namespace facebook;
-
-  /**
-   * Represents the Java/Kotlin callback `(id: String?) -> Unit`.
-   * This can be passed around between C++ and Java/Kotlin.
-   */
-  struct JFunc_void_std__optional_std__string_: public jni::JavaClass<JFunc_void_std__optional_std__string_> {
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__optional_std__string_;";
-
-  public:
-    /**
-     * Invokes the function this `JFunc_void_std__optional_std__string_` instance holds through JNI.
-     */
-    void invoke(const std::optional<std::string>& id) const {
-      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* id */)>("invoke");
-      method(self(), id.has_value() ? jni::make_jstring(id.value()) : nullptr);
-    }
-  };
-
-  /**
-   * An implementation of Func_void_std__optional_std__string_ that is backed by a C++ implementation (using `std::function<...>`)
-   */
-  struct JFunc_void_std__optional_std__string__cxx final: public jni::HybridClass<JFunc_void_std__optional_std__string__cxx, JFunc_void_std__optional_std__string_> {
-  public:
-    static jni::local_ref<JFunc_void_std__optional_std__string_::javaobject> fromCpp(const std::function<void(const std::optional<std::string>& /* id */)>& func) {
-      return JFunc_void_std__optional_std__string__cxx::newObjectCxxArgs(func);
-    }
-
-  public:
-    /**
-     * Invokes the C++ `std::function<...>` this `JFunc_void_std__optional_std__string__cxx` instance holds.
-     */
-    void invoke_cxx(jni::alias_ref<jni::JString> id) {
-      _func(id != nullptr ? std::make_optional(id->toStdString()) : std::nullopt);
-    }
-
-  public:
-    [[nodiscard]]
-    inline const std::function<void(const std::optional<std::string>& /* id */)>& getFunction() const {
-      return _func;
-    }
-
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__optional_std__string__cxx;";
-    static void registerNatives() {
-      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__optional_std__string__cxx::invoke_cxx)});
-    }
-
-  private:
-    explicit JFunc_void_std__optional_std__string__cxx(const std::function<void(const std::optional<std::string>& /* id */)>& func): _func(func) { }
-
-  private:
-    friend HybridBase;
-    std::function<void(const std::optional<std::string>& /* id */)> _func;
-  };
-
-} // namespace margelo::nitro::rngooglemapsplus

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

@@ -1,78 +0,0 @@
-///
-/// JFunc_void_std__optional_std__string__RNLatLng.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 <string>
-#include <optional>
-#include "RNLatLng.hpp"
-#include <functional>
-#include "JRNLatLng.hpp"
-
-namespace margelo::nitro::rngooglemapsplus {
-
-  using namespace facebook;
-
-  /**
-   * Represents the Java/Kotlin callback `(id: String?, location: RNLatLng) -> Unit`.
-   * This can be passed around between C++ and Java/Kotlin.
-   */
-  struct JFunc_void_std__optional_std__string__RNLatLng: public jni::JavaClass<JFunc_void_std__optional_std__string__RNLatLng> {
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__optional_std__string__RNLatLng;";
-
-  public:
-    /**
-     * Invokes the function this `JFunc_void_std__optional_std__string__RNLatLng` instance holds through JNI.
-     */
-    void invoke(const std::optional<std::string>& id, const RNLatLng& location) const {
-      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* id */, jni::alias_ref<JRNLatLng> /* location */)>("invoke");
-      method(self(), id.has_value() ? jni::make_jstring(id.value()) : nullptr, JRNLatLng::fromCpp(location));
-    }
-  };
-
-  /**
-   * An implementation of Func_void_std__optional_std__string__RNLatLng that is backed by a C++ implementation (using `std::function<...>`)
-   */
-  struct JFunc_void_std__optional_std__string__RNLatLng_cxx final: public jni::HybridClass<JFunc_void_std__optional_std__string__RNLatLng_cxx, JFunc_void_std__optional_std__string__RNLatLng> {
-  public:
-    static jni::local_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject> fromCpp(const std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>& func) {
-      return JFunc_void_std__optional_std__string__RNLatLng_cxx::newObjectCxxArgs(func);
-    }
-
-  public:
-    /**
-     * Invokes the C++ `std::function<...>` this `JFunc_void_std__optional_std__string__RNLatLng_cxx` instance holds.
-     */
-    void invoke_cxx(jni::alias_ref<jni::JString> id, jni::alias_ref<JRNLatLng> location) {
-      _func(id != nullptr ? std::make_optional(id->toStdString()) : std::nullopt, location->toCpp());
-    }
-
-  public:
-    [[nodiscard]]
-    inline const std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>& getFunction() const {
-      return _func;
-    }
-
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__optional_std__string__RNLatLng_cxx;";
-    static void registerNatives() {
-      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__optional_std__string__RNLatLng_cxx::invoke_cxx)});
-    }
-
-  private:
-    explicit JFunc_void_std__optional_std__string__RNLatLng_cxx(const std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>& func): _func(func) { }
-
-  private:
-    friend HybridBase;
-    std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)> _func;
-  };
-
-} // namespace margelo::nitro::rngooglemapsplus