react-native-google-maps-plus 1.2.0-dev.1 → 1.3.0-dev.1

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

@@ -137,7 +137,8 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNIOSPermissionResult; }
 #include "JFunc_void_RNLocationErrorCode.hpp"
 #include "JRNLocationErrorCode.hpp"
 #include "JFunc_void_RNLatLng.hpp"
-#include "JFunc_void_std__string.hpp"
+#include "JFunc_void_std__optional_std__string_.hpp"
+#include "JFunc_void_std__optional_std__string__RNLatLng.hpp"
 #include "RNRegion.hpp"
 #include "JFunc_void_RNRegion_RNCamera_bool.hpp"
 #include "JRNRegion.hpp"
@@ -532,81 +533,138 @@ namespace margelo::nitro::rngooglemapsplus {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNLatLng::javaobject> /* onMapPress */)>("setOnMapPress_cxx");
     method(_javaPart, onMapPress.has_value() ? JFunc_void_RNLatLng_cxx::fromCpp(onMapPress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerPress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnMarkerPress_cxx");
+  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnMarkerPress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
+        return [__resultRef](std::optional<std::string> id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onMarkerPress */)>("setOnMarkerPress_cxx");
-    method(_javaPart, onMarkerPress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onMarkerPress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onMarkerPress */)>("setOnMarkerPress_cxx");
+    method(_javaPart, onMarkerPress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onMarkerPress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnPolylinePress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnPolylinePress_cxx");
+  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnPolylinePress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnPolylinePress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
+        return [__resultRef](std::optional<std::string> id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onPolylinePress */)>("setOnPolylinePress_cxx");
-    method(_javaPart, onPolylinePress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onPolylinePress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnPolylinePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolylinePress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onPolylinePress */)>("setOnPolylinePress_cxx");
+    method(_javaPart, onPolylinePress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onPolylinePress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnPolygonPress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnPolygonPress_cxx");
+  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnPolygonPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnPolygonPress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
+        return [__resultRef](std::optional<std::string> id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onPolygonPress */)>("setOnPolygonPress_cxx");
-    method(_javaPart, onPolygonPress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onPolygonPress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnPolygonPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolygonPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onPolygonPress */)>("setOnPolygonPress_cxx");
+    method(_javaPart, onPolygonPress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onPolygonPress.value()) : nullptr);
   }
-  std::optional<std::function<void(const std::string& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCirclePress() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__string::javaobject>()>("getOnCirclePress_cxx");
+  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCirclePress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnCirclePress_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::string& /* id */)> {
-      if (__result->isInstanceOf(JFunc_void_std__string_cxx::javaClassStatic())) [[likely]] {
-        auto downcast = jni::static_ref_cast<JFunc_void_std__string_cxx::javaobject>(__result);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
+        return [__resultRef](std::optional<std::string> id) -> void {
           return __resultRef->invoke(id);
         };
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onCirclePress */)>("setOnCirclePress_cxx");
-    method(_javaPart, onCirclePress.has_value() ? JFunc_void_std__string_cxx::fromCpp(onCirclePress.value()) : nullptr);
+  void JHybridRNGoogleMapsPlusViewSpec::setOnCirclePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onCirclePress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onCirclePress */)>("setOnCirclePress_cxx");
+    method(_javaPart, onCirclePress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onCirclePress.value()) : nullptr);
+  }
+  std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDragStart() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject>()>("getOnMarkerDragStart_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__RNLatLng_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__RNLatLng_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](std::optional<std::string> id, RNLatLng location) -> void {
+          return __resultRef->invoke(id,location);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDragStart(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject> /* onMarkerDragStart */)>("setOnMarkerDragStart_cxx");
+    method(_javaPart, onMarkerDragStart.has_value() ? JFunc_void_std__optional_std__string__RNLatLng_cxx::fromCpp(onMarkerDragStart.value()) : nullptr);
+  }
+  std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDrag() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject>()>("getOnMarkerDrag_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__RNLatLng_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__RNLatLng_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](std::optional<std::string> id, RNLatLng location) -> void {
+          return __resultRef->invoke(id,location);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDrag(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject> /* onMarkerDrag */)>("setOnMarkerDrag_cxx");
+    method(_javaPart, onMarkerDrag.has_value() ? JFunc_void_std__optional_std__string__RNLatLng_cxx::fromCpp(onMarkerDrag.value()) : nullptr);
+  }
+  std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMarkerDragEnd() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject>()>("getOnMarkerDragEnd_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__RNLatLng_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__RNLatLng_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](std::optional<std::string> id, RNLatLng location) -> void {
+          return __resultRef->invoke(id,location);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMarkerDragEnd(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string__RNLatLng::javaobject> /* onMarkerDragEnd */)>("setOnMarkerDragEnd_cxx");
+    method(_javaPart, onMarkerDragEnd.has_value() ? JFunc_void_std__optional_std__string__RNLatLng_cxx::fromCpp(onMarkerDragEnd.value()) : nullptr);
   }
   std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCameraChangeStart() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNRegion_RNCamera_bool::javaobject>()>("getOnCameraChangeStart_cxx");

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

@@ -95,14 +95,20 @@ namespace margelo::nitro::rngooglemapsplus {
     void setOnLocationError(const std::optional<std::function<void(RNLocationErrorCode /* error */)>>& onLocationError) override;
     std::optional<std::function<void(const RNLatLng& /* coordinate */)>> getOnMapPress() override;
     void setOnMapPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapPress) override;
-    std::optional<std::function<void(const std::string& /* id */)>> getOnMarkerPress() override;
-    void setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) override;
-    std::optional<std::function<void(const std::string& /* id */)>> getOnPolylinePress() override;
-    void setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) override;
-    std::optional<std::function<void(const std::string& /* id */)>> getOnPolygonPress() override;
-    void setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) override;
-    std::optional<std::function<void(const std::string& /* id */)>> getOnCirclePress() override;
-    void setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnMarkerPress() override;
+    void setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolylinePress() override;
+    void setOnPolylinePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolylinePress) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolygonPress() override;
+    void setOnPolygonPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolygonPress) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnCirclePress() override;
+    void setOnCirclePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onCirclePress) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() override;
+    void setOnMarkerDragStart(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() override;
+    void setOnMarkerDrag(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() override;
+    void setOnMarkerDragEnd(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) override;
     std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() override;
     void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) override;
     std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChange() override;

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

@@ -46,6 +46,18 @@ namespace margelo::nitro::rngooglemapsplus {
       jni::local_ref<JRNLatLng> coordinate = this->getFieldValue(fieldCoordinate);
       static const auto fieldAnchor = clazz->getField<JRNPosition>("anchor");
       jni::local_ref<JRNPosition> anchor = this->getFieldValue(fieldAnchor);
+      static const auto fieldShowInfoWindow = clazz->getField<jni::JBoolean>("showInfoWindow");
+      jni::local_ref<jni::JBoolean> showInfoWindow = this->getFieldValue(fieldShowInfoWindow);
+      static const auto fieldTitle = clazz->getField<jni::JString>("title");
+      jni::local_ref<jni::JString> title = this->getFieldValue(fieldTitle);
+      static const auto fieldSnippet = clazz->getField<jni::JString>("snippet");
+      jni::local_ref<jni::JString> snippet = this->getFieldValue(fieldSnippet);
+      static const auto fieldOpacity = clazz->getField<jni::JDouble>("opacity");
+      jni::local_ref<jni::JDouble> opacity = this->getFieldValue(fieldOpacity);
+      static const auto fieldFlat = clazz->getField<jni::JBoolean>("flat");
+      jni::local_ref<jni::JBoolean> flat = this->getFieldValue(fieldFlat);
+      static const auto fieldDraggable = clazz->getField<jni::JBoolean>("draggable");
+      jni::local_ref<jni::JBoolean> draggable = this->getFieldValue(fieldDraggable);
       static const auto fieldIconSvg = clazz->getField<JRNMarkerSvg>("iconSvg");
       jni::local_ref<JRNMarkerSvg> iconSvg = this->getFieldValue(fieldIconSvg);
       return RNMarker(
@@ -53,6 +65,12 @@ namespace margelo::nitro::rngooglemapsplus {
         zIndex != nullptr ? std::make_optional(zIndex->value()) : std::nullopt,
         coordinate->toCpp(),
         anchor != nullptr ? std::make_optional(anchor->toCpp()) : std::nullopt,
+        showInfoWindow != nullptr ? std::make_optional(static_cast<bool>(showInfoWindow->value())) : std::nullopt,
+        title != nullptr ? std::make_optional(title->toStdString()) : std::nullopt,
+        snippet != nullptr ? std::make_optional(snippet->toStdString()) : std::nullopt,
+        opacity != nullptr ? std::make_optional(opacity->value()) : std::nullopt,
+        flat != nullptr ? std::make_optional(static_cast<bool>(flat->value())) : std::nullopt,
+        draggable != nullptr ? std::make_optional(static_cast<bool>(draggable->value())) : std::nullopt,
         iconSvg != nullptr ? std::make_optional(iconSvg->toCpp()) : std::nullopt
       );
     }
@@ -68,6 +86,12 @@ namespace margelo::nitro::rngooglemapsplus {
         value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
         JRNLatLng::fromCpp(value.coordinate),
         value.anchor.has_value() ? JRNPosition::fromCpp(value.anchor.value()) : nullptr,
+        value.showInfoWindow.has_value() ? jni::JBoolean::valueOf(value.showInfoWindow.value()) : nullptr,
+        value.title.has_value() ? jni::make_jstring(value.title.value()) : nullptr,
+        value.snippet.has_value() ? jni::make_jstring(value.snippet.value()) : nullptr,
+        value.opacity.has_value() ? jni::JDouble::valueOf(value.opacity.value()) : nullptr,
+        value.flat.has_value() ? jni::JBoolean::valueOf(value.flat.value()) : nullptr,
+        value.draggable.has_value() ? jni::JBoolean::valueOf(value.draggable.value()) : nullptr,
         value.iconSvg.has_value() ? JRNMarkerSvg::fromCpp(value.iconSvg.value()) : nullptr
       );
     }

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

@@ -144,6 +144,18 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     view->setOnCirclePress(props.onCirclePress.value);
     // TODO: Set isDirty = false
   }
+  if (props.onMarkerDragStart.isDirty) {
+    view->setOnMarkerDragStart(props.onMarkerDragStart.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onMarkerDrag.isDirty) {
+    view->setOnMarkerDrag(props.onMarkerDrag.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onMarkerDragEnd.isDirty) {
+    view->setOnMarkerDragEnd(props.onMarkerDragEnd.value);
+    // TODO: Set isDirty = false
+  }
   if (props.onCameraChangeStart.isDirty) {
     view->setOnCameraChangeStart(props.onCameraChangeStart.value);
     // TODO: Set isDirty = false

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_std__string.kt → Func_void_std__optional_std__string_.kt}

@@ -1,5 +1,5 @@
 ///
-/// Func_void_std__string.kt
+/// Func_void_std__optional_std__string_.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
@@ -15,25 +15,25 @@ import dalvik.annotation.optimization.FastNative
 
 
 /**
- * Represents the JavaScript callback `(id: string) => void`.
+ * Represents the JavaScript callback `(id: optional) => 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_std__string: (String) -> Unit {
+fun interface Func_void_std__optional_std__string_: (String?) -> 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(id: String): Unit
+  override fun invoke(id: String?): Unit
 }
 
 /**
- * Represents the JavaScript callback `(id: string) => void`.
+ * Represents the JavaScript callback `(id: optional) => void`.
  * This is implemented in C++, via a `std::function<...>`.
  * The callback might be coming from JS.
  */
@@ -44,7 +44,7 @@ fun interface Func_void_std__string: (String) -> Unit {
   "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
   "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
 )
-class Func_void_std__string_cxx: Func_void_std__string {
+class Func_void_std__optional_std__string__cxx: Func_void_std__optional_std__string_ {
   @DoNotStrip
   @Keep
   private val mHybridData: HybridData
@@ -57,25 +57,25 @@ class Func_void_std__string_cxx: Func_void_std__string {
 
   @DoNotStrip
   @Keep
-  override fun invoke(id: String): Unit
+  override fun invoke(id: String?): Unit
     = invoke_cxx(id)
 
   @FastNative
-  private external fun invoke_cxx(id: String): Unit
+  private external fun invoke_cxx(id: String?): Unit
 }
 
 /**
- * Represents the JavaScript callback `(id: string) => void`.
- * This is implemented in Java/Kotlin, via a `(String) -> Unit`.
+ * Represents the JavaScript callback `(id: optional) => void`.
+ * This is implemented in Java/Kotlin, via a `(String?) -> Unit`.
  * The callback is always coming from native.
  */
 @DoNotStrip
 @Keep
 @Suppress("ClassName", "RedundantUnitReturnType", "unused")
-class Func_void_std__string_java(private val function: (String) -> Unit): Func_void_std__string {
+class Func_void_std__optional_std__string__java(private val function: (String?) -> Unit): Func_void_std__optional_std__string_ {
   @DoNotStrip
   @Keep
-  override fun invoke(id: String): Unit {
+  override fun invoke(id: String?): Unit {
     return this.function(id)
   }
 }

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

@@ -0,0 +1,81 @@
+///
+/// Func_void_std__optional_std__string__RNLatLng.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 `(id: optional, location: 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_std__optional_std__string__RNLatLng: (String?, RNLatLng) -> 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(id: String?, location: RNLatLng): Unit
+}
+
+/**
+ * Represents the JavaScript callback `(id: optional, location: 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_std__optional_std__string__RNLatLng_cxx: Func_void_std__optional_std__string__RNLatLng {
+  @DoNotStrip
+  @Keep
+  private val mHybridData: HybridData
+
+  @DoNotStrip
+  @Keep
+  private constructor(hybridData: HybridData) {
+    mHybridData = hybridData
+  }
+
+  @DoNotStrip
+  @Keep
+  override fun invoke(id: String?, location: RNLatLng): Unit
+    = invoke_cxx(id,location)
+
+  @FastNative
+  private external fun invoke_cxx(id: String?, location: RNLatLng): Unit
+}
+
+/**
+ * Represents the JavaScript callback `(id: optional, location: struct) => void`.
+ * This is implemented in Java/Kotlin, via a `(String?, RNLatLng) -> Unit`.
+ * The callback is always coming from native.
+ */
+@DoNotStrip
+@Keep
+@Suppress("ClassName", "RedundantUnitReturnType", "unused")
+class Func_void_std__optional_std__string__RNLatLng_java(private val function: (String?, RNLatLng) -> Unit): Func_void_std__optional_std__string__RNLatLng {
+  @DoNotStrip
+  @Keep
+  override fun invoke(id: String?, location: RNLatLng): Unit {
+    return this.function(id, location)
+  }
+}

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

@@ -216,13 +216,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onMapPress = value?.let { it }
     }
   
-  abstract var onMarkerPress: ((id: String) -> Unit)?
+  abstract var onMarkerPress: ((id: String?) -> Unit)?
   
-  private var onMarkerPress_cxx: Func_void_std__string?
+  private var onMarkerPress_cxx: Func_void_std__optional_std__string_?
     @Keep
     @DoNotStrip
     get() {
-      return onMarkerPress?.let { Func_void_std__string_java(it) }
+      return onMarkerPress?.let { Func_void_std__optional_std__string__java(it) }
     }
     @Keep
     @DoNotStrip
@@ -230,13 +230,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onMarkerPress = value?.let { it }
     }
   
-  abstract var onPolylinePress: ((id: String) -> Unit)?
+  abstract var onPolylinePress: ((id: String?) -> Unit)?
   
-  private var onPolylinePress_cxx: Func_void_std__string?
+  private var onPolylinePress_cxx: Func_void_std__optional_std__string_?
     @Keep
     @DoNotStrip
     get() {
-      return onPolylinePress?.let { Func_void_std__string_java(it) }
+      return onPolylinePress?.let { Func_void_std__optional_std__string__java(it) }
     }
     @Keep
     @DoNotStrip
@@ -244,13 +244,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onPolylinePress = value?.let { it }
     }
   
-  abstract var onPolygonPress: ((id: String) -> Unit)?
+  abstract var onPolygonPress: ((id: String?) -> Unit)?
   
-  private var onPolygonPress_cxx: Func_void_std__string?
+  private var onPolygonPress_cxx: Func_void_std__optional_std__string_?
     @Keep
     @DoNotStrip
     get() {
-      return onPolygonPress?.let { Func_void_std__string_java(it) }
+      return onPolygonPress?.let { Func_void_std__optional_std__string__java(it) }
     }
     @Keep
     @DoNotStrip
@@ -258,13 +258,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onPolygonPress = value?.let { it }
     }
   
-  abstract var onCirclePress: ((id: String) -> Unit)?
+  abstract var onCirclePress: ((id: String?) -> Unit)?
   
-  private var onCirclePress_cxx: Func_void_std__string?
+  private var onCirclePress_cxx: Func_void_std__optional_std__string_?
     @Keep
     @DoNotStrip
     get() {
-      return onCirclePress?.let { Func_void_std__string_java(it) }
+      return onCirclePress?.let { Func_void_std__optional_std__string__java(it) }
     }
     @Keep
     @DoNotStrip
@@ -272,6 +272,48 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onCirclePress = value?.let { it }
     }
   
+  abstract var onMarkerDragStart: ((id: String?, location: RNLatLng) -> Unit)?
+  
+  private var onMarkerDragStart_cxx: Func_void_std__optional_std__string__RNLatLng?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onMarkerDragStart?.let { Func_void_std__optional_std__string__RNLatLng_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onMarkerDragStart = value?.let { it }
+    }
+  
+  abstract var onMarkerDrag: ((id: String?, location: RNLatLng) -> Unit)?
+  
+  private var onMarkerDrag_cxx: Func_void_std__optional_std__string__RNLatLng?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onMarkerDrag?.let { Func_void_std__optional_std__string__RNLatLng_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onMarkerDrag = value?.let { it }
+    }
+  
+  abstract var onMarkerDragEnd: ((id: String?, location: RNLatLng) -> Unit)?
+  
+  private var onMarkerDragEnd_cxx: Func_void_std__optional_std__string__RNLatLng?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onMarkerDragEnd?.let { Func_void_std__optional_std__string__RNLatLng_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onMarkerDragEnd = value?.let { it }
+    }
+  
   abstract var onCameraChangeStart: ((region: RNRegion, camera: RNCamera, isGesture: Boolean) -> Unit)?
   
   private var onCameraChangeStart_cxx: Func_void_RNRegion_RNCamera_bool?

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

@@ -35,6 +35,24 @@ data class RNMarker
     val anchor: RNPosition?,
     @DoNotStrip
     @Keep
+    val showInfoWindow: Boolean?,
+    @DoNotStrip
+    @Keep
+    val title: String?,
+    @DoNotStrip
+    @Keep
+    val snippet: String?,
+    @DoNotStrip
+    @Keep
+    val opacity: Double?,
+    @DoNotStrip
+    @Keep
+    val flat: Boolean?,
+    @DoNotStrip
+    @Keep
+    val draggable: Boolean?,
+    @DoNotStrip
+    @Keep
     val iconSvg: RNMarkerSvg?
   ) {
   /* main constructor */

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

@@ -86,14 +86,22 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     };
   }
   
-  // pragma MARK: std::function<void(const std::string& /* id */)>
-  Func_void_std__string create_Func_void_std__string(void* _Nonnull swiftClosureWrapper) noexcept {
-    auto swiftClosure = RNGoogleMapsPlus::Func_void_std__string::fromUnsafe(swiftClosureWrapper);
-    return [swiftClosure = std::move(swiftClosure)](const std::string& id) mutable -> void {
+  // pragma MARK: std::function<void(const std::optional<std::string>& /* id */)>
+  Func_void_std__optional_std__string_ create_Func_void_std__optional_std__string_(void* _Nonnull swiftClosureWrapper) noexcept {
+    auto swiftClosure = RNGoogleMapsPlus::Func_void_std__optional_std__string_::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const std::optional<std::string>& id) mutable -> void {
       swiftClosure.call(id);
     };
   }
   
+  // pragma MARK: std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>
+  Func_void_std__optional_std__string__RNLatLng create_Func_void_std__optional_std__string__RNLatLng(void* _Nonnull swiftClosureWrapper) noexcept {
+    auto swiftClosure = RNGoogleMapsPlus::Func_void_std__optional_std__string__RNLatLng::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const std::optional<std::string>& id, const RNLatLng& location) mutable -> void {
+      swiftClosure.call(id, location);
+    };
+  }
+  
   // pragma MARK: std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>
   Func_void_RNRegion_RNCamera_bool create_Func_void_RNRegion_RNCamera_bool(void* _Nonnull swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNRegion_RNCamera_bool::fromUnsafe(swiftClosureWrapper);