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

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

@@ -176,30 +176,30 @@ namespace margelo::nitro::rngooglemapsplus {
       virtual void setOnMapLongPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapLongPress) = 0;
       virtual std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>> getOnPoiPress() = 0;
       virtual void setOnPoiPress(const std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>>& onPoiPress) = 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;
-      virtual void setOnPolylinePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolylinePress) = 0;
-      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolygonPress() = 0;
-      virtual void setOnPolygonPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolygonPress) = 0;
-      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnCirclePress() = 0;
-      virtual void setOnCirclePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onCirclePress) = 0;
-      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() = 0;
-      virtual void setOnMarkerDragStart(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) = 0;
-      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() = 0;
-      virtual void setOnMarkerDrag(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) = 0;
-      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() = 0;
-      virtual void setOnMarkerDragEnd(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */)>> getOnMarkerPress() = 0;
+      virtual void setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */)>> getOnPolylinePress() = 0;
+      virtual void setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */)>> getOnPolygonPress() = 0;
+      virtual void setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */)>> getOnCirclePress() = 0;
+      virtual void setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() = 0;
+      virtual void setOnMarkerDragStart(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() = 0;
+      virtual void setOnMarkerDrag(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() = 0;
+      virtual void setOnMarkerDragEnd(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) = 0;
       virtual std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> getOnIndoorBuildingFocused() = 0;
       virtual void setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>& onIndoorBuildingFocused) = 0;
       virtual std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> getOnIndoorLevelActivated() = 0;
       virtual void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) = 0;
-      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowPress() = 0;
-      virtual void setOnInfoWindowPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowPress) = 0;
-      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowClose() = 0;
-      virtual void setOnInfoWindowClose(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowClose) = 0;
-      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowLongPress() = 0;
-      virtual void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowLongPress) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowPress() = 0;
+      virtual void setOnInfoWindowPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowPress) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowClose() = 0;
+      virtual void setOnInfoWindowClose(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowClose) = 0;
+      virtual std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowLongPress() = 0;
+      virtual void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowLongPress) = 0;
       virtual std::optional<std::function<void(const RNLocation& /* location */)>> getOnMyLocationPress() = 0;
       virtual void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) = 0;
       virtual std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() = 0;
@@ -213,6 +213,8 @@ namespace margelo::nitro::rngooglemapsplus {
 
     public:
       // Methods
+      virtual void showMarkerInfoWindow(const std::string& id) = 0;
+      virtual void hideMarkerInfoWindow(const std::string& id) = 0;
       virtual void setCamera(const RNCamera& camera, std::optional<bool> animated, std::optional<double> durationMs) = 0;
       virtual void setCameraToCoordinates(const std::vector<RNLatLng>& coordinates, const std::optional<RNMapPadding>& padding, std::optional<bool> animated, std::optional<double> durationMs) = 0;
       virtual void setCameraBounds(const std::optional<RNLatLngBounds>& bounds) = 0;

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

@@ -45,10 +45,12 @@ namespace margelo::nitro::rngooglemapsplus {
     std::optional<bool> tiltEnabled     SWIFT_PRIVATE;
     std::optional<bool> zoomControlsEnabled     SWIFT_PRIVATE;
     std::optional<bool> zoomGesturesEnabled     SWIFT_PRIVATE;
+    std::optional<bool> consumeOnMarkerPress     SWIFT_PRIVATE;
+    std::optional<bool> consumeOnMyLocationButtonPress     SWIFT_PRIVATE;
 
   public:
     RNMapUiSettings() = default;
-    explicit RNMapUiSettings(std::optional<bool> allGesturesEnabled, std::optional<bool> compassEnabled, std::optional<bool> indoorLevelPickerEnabled, std::optional<bool> mapToolbarEnabled, std::optional<bool> myLocationButtonEnabled, std::optional<bool> rotateEnabled, std::optional<bool> scrollEnabled, std::optional<bool> scrollDuringRotateOrZoomEnabled, std::optional<bool> tiltEnabled, std::optional<bool> zoomControlsEnabled, std::optional<bool> zoomGesturesEnabled): allGesturesEnabled(allGesturesEnabled), compassEnabled(compassEnabled), indoorLevelPickerEnabled(indoorLevelPickerEnabled), mapToolbarEnabled(mapToolbarEnabled), myLocationButtonEnabled(myLocationButtonEnabled), rotateEnabled(rotateEnabled), scrollEnabled(scrollEnabled), scrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled), tiltEnabled(tiltEnabled), zoomControlsEnabled(zoomControlsEnabled), zoomGesturesEnabled(zoomGesturesEnabled) {}
+    explicit RNMapUiSettings(std::optional<bool> allGesturesEnabled, std::optional<bool> compassEnabled, std::optional<bool> indoorLevelPickerEnabled, std::optional<bool> mapToolbarEnabled, std::optional<bool> myLocationButtonEnabled, std::optional<bool> rotateEnabled, std::optional<bool> scrollEnabled, std::optional<bool> scrollDuringRotateOrZoomEnabled, std::optional<bool> tiltEnabled, std::optional<bool> zoomControlsEnabled, std::optional<bool> zoomGesturesEnabled, std::optional<bool> consumeOnMarkerPress, std::optional<bool> consumeOnMyLocationButtonPress): allGesturesEnabled(allGesturesEnabled), compassEnabled(compassEnabled), indoorLevelPickerEnabled(indoorLevelPickerEnabled), mapToolbarEnabled(mapToolbarEnabled), myLocationButtonEnabled(myLocationButtonEnabled), rotateEnabled(rotateEnabled), scrollEnabled(scrollEnabled), scrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled), tiltEnabled(tiltEnabled), zoomControlsEnabled(zoomControlsEnabled), zoomGesturesEnabled(zoomGesturesEnabled), consumeOnMarkerPress(consumeOnMarkerPress), consumeOnMyLocationButtonPress(consumeOnMyLocationButtonPress) {}
   };
 
 } // namespace margelo::nitro::rngooglemapsplus
@@ -71,7 +73,9 @@ namespace margelo::nitro {
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "scrollDuringRotateOrZoomEnabled")),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "tiltEnabled")),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomControlsEnabled")),
-        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomGesturesEnabled"))
+        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "zoomGesturesEnabled")),
+        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "consumeOnMarkerPress")),
+        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "consumeOnMyLocationButtonPress"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNMapUiSettings& arg) {
@@ -87,6 +91,8 @@ namespace margelo::nitro {
       obj.setProperty(runtime, "tiltEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.tiltEnabled));
       obj.setProperty(runtime, "zoomControlsEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.zoomControlsEnabled));
       obj.setProperty(runtime, "zoomGesturesEnabled", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.zoomGesturesEnabled));
+      obj.setProperty(runtime, "consumeOnMarkerPress", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.consumeOnMarkerPress));
+      obj.setProperty(runtime, "consumeOnMyLocationButtonPress", JSIConverter<std::optional<bool>>::toJSI(runtime, arg.consumeOnMyLocationButtonPress));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -108,6 +114,8 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "tiltEnabled"))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "zoomControlsEnabled"))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "zoomGesturesEnabled"))) return false;
+      if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "consumeOnMarkerPress"))) return false;
+      if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, "consumeOnMyLocationButtonPress"))) return false;
       return true;
     }
   };

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

@@ -56,10 +56,11 @@ namespace margelo::nitro::rngooglemapsplus {
     std::optional<double> rotation     SWIFT_PRIVATE;
     std::optional<RNPosition> infoWindowAnchor     SWIFT_PRIVATE;
     std::optional<RNMarkerSvg> iconSvg     SWIFT_PRIVATE;
+    std::optional<RNMarkerSvg> infoWindowIconSvg     SWIFT_PRIVATE;
 
   public:
     RNMarker() = default;
-    explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, std::optional<bool> showInfoWindow, std::optional<std::string> title, std::optional<std::string> snippet, std::optional<double> opacity, std::optional<bool> flat, std::optional<bool> draggable, std::optional<double> rotation, std::optional<RNPosition> infoWindowAnchor, std::optional<RNMarkerSvg> iconSvg): id(id), zIndex(zIndex), coordinate(coordinate), anchor(anchor), showInfoWindow(showInfoWindow), title(title), snippet(snippet), opacity(opacity), flat(flat), draggable(draggable), rotation(rotation), infoWindowAnchor(infoWindowAnchor), iconSvg(iconSvg) {}
+    explicit RNMarker(std::string id, std::optional<double> zIndex, RNLatLng coordinate, std::optional<RNPosition> anchor, std::optional<bool> showInfoWindow, std::optional<std::string> title, std::optional<std::string> snippet, std::optional<double> opacity, std::optional<bool> flat, std::optional<bool> draggable, std::optional<double> rotation, std::optional<RNPosition> infoWindowAnchor, std::optional<RNMarkerSvg> iconSvg, std::optional<RNMarkerSvg> infoWindowIconSvg): id(id), zIndex(zIndex), coordinate(coordinate), anchor(anchor), showInfoWindow(showInfoWindow), title(title), snippet(snippet), opacity(opacity), flat(flat), draggable(draggable), rotation(rotation), infoWindowAnchor(infoWindowAnchor), iconSvg(iconSvg), infoWindowIconSvg(infoWindowIconSvg) {}
   };
 
 } // namespace margelo::nitro::rngooglemapsplus
@@ -84,7 +85,8 @@ namespace margelo::nitro {
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, "draggable")),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, "rotation")),
         JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::fromJSI(runtime, obj.getProperty(runtime, "infoWindowAnchor")),
-        JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::fromJSI(runtime, obj.getProperty(runtime, "iconSvg"))
+        JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::fromJSI(runtime, obj.getProperty(runtime, "iconSvg")),
+        JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::fromJSI(runtime, obj.getProperty(runtime, "infoWindowIconSvg"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::rngooglemapsplus::RNMarker& arg) {
@@ -102,6 +104,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, "rotation", JSIConverter<std::optional<double>>::toJSI(runtime, arg.rotation));
       obj.setProperty(runtime, "infoWindowAnchor", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::toJSI(runtime, arg.infoWindowAnchor));
       obj.setProperty(runtime, "iconSvg", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::toJSI(runtime, arg.iconSvg));
+      obj.setProperty(runtime, "infoWindowIconSvg", JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::toJSI(runtime, arg.infoWindowIconSvg));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -125,6 +128,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, "rotation"))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNPosition>>::canConvert(runtime, obj.getProperty(runtime, "infoWindowAnchor"))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::canConvert(runtime, obj.getProperty(runtime, "iconSvg"))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::rngooglemapsplus::RNMarkerSvg>>::canConvert(runtime, obj.getProperty(runtime, "infoWindowIconSvg"))) return false;
       return true;
     }
   };

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

@@ -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());
       }

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

@@ -93,18 +93,18 @@ namespace margelo::nitro::rngooglemapsplus::views {
     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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.8",
+  "version": "1.7.0",
   "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

@@ -59,18 +59,18 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
   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?: (
@@ -91,6 +91,10 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
 }
 
 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

@@ -21,6 +21,8 @@ export type RNMapUiSettings = {
   tiltEnabled?: boolean;
   zoomControlsEnabled?: boolean;
   zoomGesturesEnabled?: boolean;
+  consumeOnMarkerPress?: boolean;
+  consumeOnMyLocationButtonPress?: boolean;
 };
 
 export type RNLatLng = {
@@ -169,6 +171,7 @@ export type RNMarker = {
   rotation?: number;
   infoWindowAnchor?: RNPosition;
   iconSvg?: RNMarkerSvg;
+  infoWindowIconSvg?: RNMarkerSvg;
 };
 
 export type RNMarkerSvg = {

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

package/nitrogen/generated/ios/swift/Func_void_std__optional_std__string__RNLatLng.swift

@@ -1,54 +0,0 @@
-///
-/// Func_void_std__optional_std__string__RNLatLng.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 `(_ id: String?, _ location: RNLatLng) -> 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_std__optional_std__string__RNLatLng {
-  public typealias bridge = margelo.nitro.rngooglemapsplus.bridge.swift
-
-  private let closure: (_ id: String?, _ location: RNLatLng) -> Void
-
-  public init(_ closure: @escaping (_ id: String?, _ location: RNLatLng) -> Void) {
-    self.closure = closure
-  }
-
-  @inline(__always)
-  public func call(id: bridge.std__optional_std__string_, location: RNLatLng) -> Void {
-    self.closure({ () -> String? in
-      if bridge.has_value_std__optional_std__string_(id) {
-        let __unwrapped = bridge.get_std__optional_std__string_(id)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }(), location)
-  }
-
-  /**
-   * 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_std__optional_std__string__RNLatLng`.
-   * The pointer has to be a retained opaque `Unmanaged<Func_void_std__optional_std__string__RNLatLng>`.
-   * This removes one strong reference from the object!
-   */
-  @inline(__always)
-  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_std__optional_std__string__RNLatLng {
-    return Unmanaged<Func_void_std__optional_std__string__RNLatLng>.fromOpaque(pointer).takeRetainedValue()
-  }
-}