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

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_std__optional_std__string__RNLatLng.kt → Func_void_std__string_RNLatLng.kt}

@@ -1,5 +1,5 @@
 ///
-/// Func_void_std__optional_std__string__RNLatLng.kt
+/// Func_void_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
@@ -15,25 +15,25 @@ import dalvik.annotation.optimization.FastNative
 
 
 /**
- * Represents the JavaScript callback `(id: optional, location: struct) => void`.
+ * Represents the JavaScript callback `(id: string, 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 {
+fun interface Func_void_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
+  override fun invoke(id: String, location: RNLatLng): Unit
 }
 
 /**
- * Represents the JavaScript callback `(id: optional, location: struct) => void`.
+ * Represents the JavaScript callback `(id: string, location: struct) => 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__optional_std__string__RNLatLng: (String?, RNLatLng)
   "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
   "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
 )
-class Func_void_std__optional_std__string__RNLatLng_cxx: Func_void_std__optional_std__string__RNLatLng {
+class Func_void_std__string_RNLatLng_cxx: Func_void_std__string_RNLatLng {
   @DoNotStrip
   @Keep
   private val mHybridData: HybridData
@@ -57,25 +57,25 @@ class Func_void_std__optional_std__string__RNLatLng_cxx: Func_void_std__optional
 
   @DoNotStrip
   @Keep
-  override fun invoke(id: String?, location: RNLatLng): Unit
+  override fun invoke(id: String, location: RNLatLng): Unit
     = invoke_cxx(id,location)
 
   @FastNative
-  private external fun invoke_cxx(id: String?, location: RNLatLng): Unit
+  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`.
+ * Represents the JavaScript callback `(id: string, 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 {
+class Func_void_std__string_RNLatLng_java(private val function: (String, RNLatLng) -> Unit): Func_void_std__string_RNLatLng {
   @DoNotStrip
   @Keep
-  override fun invoke(id: String?, location: RNLatLng): Unit {
+  override fun invoke(id: String, location: RNLatLng): Unit {
     return this.function(id, location)
   }
 }

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

@@ -264,13 +264,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onPoiPress = value?.let { it }
     }
   
-  abstract var onMarkerPress: ((id: String?) -> Unit)?
+  abstract var onMarkerPress: ((id: String) -> Unit)?
   
-  private var onMarkerPress_cxx: Func_void_std__optional_std__string_?
+  private var onMarkerPress_cxx: Func_void_std__string?
     @Keep
     @DoNotStrip
     get() {
-      return onMarkerPress?.let { Func_void_std__optional_std__string__java(it) }
+      return onMarkerPress?.let { Func_void_std__string_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -278,13 +278,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__optional_std__string_?
+  private var onPolylinePress_cxx: Func_void_std__string?
     @Keep
     @DoNotStrip
     get() {
-      return onPolylinePress?.let { Func_void_std__optional_std__string__java(it) }
+      return onPolylinePress?.let { Func_void_std__string_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -292,13 +292,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__optional_std__string_?
+  private var onPolygonPress_cxx: Func_void_std__string?
     @Keep
     @DoNotStrip
     get() {
-      return onPolygonPress?.let { Func_void_std__optional_std__string__java(it) }
+      return onPolygonPress?.let { Func_void_std__string_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -306,13 +306,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__optional_std__string_?
+  private var onCirclePress_cxx: Func_void_std__string?
     @Keep
     @DoNotStrip
     get() {
-      return onCirclePress?.let { Func_void_std__optional_std__string__java(it) }
+      return onCirclePress?.let { Func_void_std__string_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -320,13 +320,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onCirclePress = value?.let { it }
     }
   
-  abstract var onMarkerDragStart: ((id: String?, location: RNLatLng) -> Unit)?
+  abstract var onMarkerDragStart: ((id: String, location: RNLatLng) -> Unit)?
   
-  private var onMarkerDragStart_cxx: Func_void_std__optional_std__string__RNLatLng?
+  private var onMarkerDragStart_cxx: Func_void_std__string_RNLatLng?
     @Keep
     @DoNotStrip
     get() {
-      return onMarkerDragStart?.let { Func_void_std__optional_std__string__RNLatLng_java(it) }
+      return onMarkerDragStart?.let { Func_void_std__string_RNLatLng_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -334,13 +334,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onMarkerDragStart = value?.let { it }
     }
   
-  abstract var onMarkerDrag: ((id: String?, location: RNLatLng) -> Unit)?
+  abstract var onMarkerDrag: ((id: String, location: RNLatLng) -> Unit)?
   
-  private var onMarkerDrag_cxx: Func_void_std__optional_std__string__RNLatLng?
+  private var onMarkerDrag_cxx: Func_void_std__string_RNLatLng?
     @Keep
     @DoNotStrip
     get() {
-      return onMarkerDrag?.let { Func_void_std__optional_std__string__RNLatLng_java(it) }
+      return onMarkerDrag?.let { Func_void_std__string_RNLatLng_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -348,13 +348,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onMarkerDrag = value?.let { it }
     }
   
-  abstract var onMarkerDragEnd: ((id: String?, location: RNLatLng) -> Unit)?
+  abstract var onMarkerDragEnd: ((id: String, location: RNLatLng) -> Unit)?
   
-  private var onMarkerDragEnd_cxx: Func_void_std__optional_std__string__RNLatLng?
+  private var onMarkerDragEnd_cxx: Func_void_std__string_RNLatLng?
     @Keep
     @DoNotStrip
     get() {
-      return onMarkerDragEnd?.let { Func_void_std__optional_std__string__RNLatLng_java(it) }
+      return onMarkerDragEnd?.let { Func_void_std__string_RNLatLng_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -390,13 +390,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onIndoorLevelActivated = value?.let { it }
     }
   
-  abstract var onInfoWindowPress: ((id: String?) -> Unit)?
+  abstract var onInfoWindowPress: ((id: String) -> Unit)?
   
-  private var onInfoWindowPress_cxx: Func_void_std__optional_std__string_?
+  private var onInfoWindowPress_cxx: Func_void_std__string?
     @Keep
     @DoNotStrip
     get() {
-      return onInfoWindowPress?.let { Func_void_std__optional_std__string__java(it) }
+      return onInfoWindowPress?.let { Func_void_std__string_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -404,13 +404,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onInfoWindowPress = value?.let { it }
     }
   
-  abstract var onInfoWindowClose: ((id: String?) -> Unit)?
+  abstract var onInfoWindowClose: ((id: String) -> Unit)?
   
-  private var onInfoWindowClose_cxx: Func_void_std__optional_std__string_?
+  private var onInfoWindowClose_cxx: Func_void_std__string?
     @Keep
     @DoNotStrip
     get() {
-      return onInfoWindowClose?.let { Func_void_std__optional_std__string__java(it) }
+      return onInfoWindowClose?.let { Func_void_std__string_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -418,13 +418,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onInfoWindowClose = value?.let { it }
     }
   
-  abstract var onInfoWindowLongPress: ((id: String?) -> Unit)?
+  abstract var onInfoWindowLongPress: ((id: String) -> Unit)?
   
-  private var onInfoWindowLongPress_cxx: Func_void_std__optional_std__string_?
+  private var onInfoWindowLongPress_cxx: Func_void_std__string?
     @Keep
     @DoNotStrip
     get() {
-      return onInfoWindowLongPress?.let { Func_void_std__optional_std__string__java(it) }
+      return onInfoWindowLongPress?.let { Func_void_std__string_java(it) }
     }
     @Keep
     @DoNotStrip
@@ -503,6 +503,14 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
     }
 
   // Methods
+  @DoNotStrip
+  @Keep
+  abstract fun showMarkerInfoWindow(id: String): Unit
+  
+  @DoNotStrip
+  @Keep
+  abstract fun hideMarkerInfoWindow(id: String): Unit
+  
   @DoNotStrip
   @Keep
   abstract fun setCamera(camera: RNCamera, animated: Boolean?, durationMs: Double?): Unit

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

@@ -26,7 +26,10 @@ data class RNInitialProps(
   val liteMode: Boolean?,
   @DoNotStrip
   @Keep
-  val camera: RNCamera?
+  val camera: RNCamera?,
+  @DoNotStrip
+  @Keep
+  val backgroundColor: String?
 ) {
   private companion object {
     /**
@@ -36,8 +39,8 @@ data class RNInitialProps(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(mapId: String?, liteMode: Boolean?, camera: RNCamera?): RNInitialProps {
-      return RNInitialProps(mapId, liteMode, camera)
+    private fun fromCpp(mapId: String?, liteMode: Boolean?, camera: RNCamera?, backgroundColor: String?): RNInitialProps {
+      return RNInitialProps(mapId, liteMode, camera, backgroundColor)
     }
   }
 }

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

@@ -32,9 +32,6 @@ data class RNMarker(
   val anchor: RNPosition?,
   @DoNotStrip
   @Keep
-  val showInfoWindow: Boolean?,
-  @DoNotStrip
-  @Keep
   val title: String?,
   @DoNotStrip
   @Keep
@@ -56,7 +53,10 @@ data class RNMarker(
   val infoWindowAnchor: RNPosition?,
   @DoNotStrip
   @Keep
-  val iconSvg: RNMarkerSvg?
+  val iconSvg: RNMarkerSvg?,
+  @DoNotStrip
+  @Keep
+  val infoWindowIconSvg: RNMarkerSvg?
 ) {
   private companion object {
     /**
@@ -66,8 +66,8 @@ data class RNMarker(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, showInfoWindow: Boolean?, title: String?, snippet: String?, opacity: Double?, flat: Boolean?, draggable: Boolean?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?): RNMarker {
-      return RNMarker(id, zIndex, coordinate, anchor, showInfoWindow, title, snippet, opacity, flat, draggable, rotation, infoWindowAnchor, iconSvg)
+    private fun fromCpp(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, title: String?, snippet: String?, opacity: Double?, flat: Boolean?, draggable: Boolean?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?): RNMarker {
+      return RNMarker(id, zIndex, coordinate, anchor, title, snippet, opacity, flat, draggable, rotation, infoWindowAnchor, iconSvg, infoWindowIconSvg)
     }
   }
 }

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

@@ -102,18 +102,18 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     };
   }
   
-  // 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* NON_NULL 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 {
+  // pragma MARK: std::function<void(const std::string& /* id */)>
+  Func_void_std__string create_Func_void_std__string(void* NON_NULL swiftClosureWrapper) noexcept {
+    auto swiftClosure = RNGoogleMapsPlus::Func_void_std__string::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const 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* NON_NULL 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 {
+  // pragma MARK: std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>
+  Func_void_std__string_RNLatLng create_Func_void_std__string_RNLatLng(void* NON_NULL swiftClosureWrapper) noexcept {
+    auto swiftClosure = RNGoogleMapsPlus::Func_void_std__string_RNLatLng::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const std::string& id, const RNLatLng& location) mutable -> void {
       swiftClosure.call(id, location);
     };
   }
@@ -142,6 +142,14 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     };
   }
   
+  // pragma MARK: std::function<void(const std::optional<std::string>& /* result */)>
+  Func_void_std__optional_std__string_ create_Func_void_std__optional_std__string_(void* NON_NULL swiftClosureWrapper) noexcept {
+    auto swiftClosure = RNGoogleMapsPlus::Func_void_std__optional_std__string_::fromUnsafe(swiftClosureWrapper);
+    return [swiftClosure = std::move(swiftClosure)](const std::optional<std::string>& result) mutable -> void {
+      swiftClosure.call(result);
+    };
+  }
+  
   // pragma MARK: std::shared_ptr<HybridRNGoogleMapsPlusViewSpec>
   std::shared_ptr<HybridRNGoogleMapsPlusViewSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
     RNGoogleMapsPlus::HybridRNGoogleMapsPlusViewSpec_cxx swiftPart = RNGoogleMapsPlus::HybridRNGoogleMapsPlusViewSpec_cxx::fromUnsafe(swiftUnsafePointer);

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

@@ -1141,77 +1141,77 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     return *optional;
   }
   
-  // pragma MARK: std::function<void(const std::optional<std::string>& /* id */)>
+  // pragma MARK: std::function<void(const std::string& /* id */)>
   /**
-   * Specialized version of `std::function<void(const std::optional<std::string>&)>`.
+   * Specialized version of `std::function<void(const std::string&)>`.
    */
-  using Func_void_std__optional_std__string_ = std::function<void(const std::optional<std::string>& /* id */)>;
+  using Func_void_std__string = std::function<void(const std::string& /* id */)>;
   /**
-   * Wrapper class for a `std::function<void(const std::optional<std::string>& / * id * /)>`, this can be used from Swift.
+   * Wrapper class for a `std::function<void(const std::string& / * id * /)>`, this can be used from Swift.
    */
-  class Func_void_std__optional_std__string__Wrapper final {
+  class Func_void_std__string_Wrapper final {
   public:
-    explicit Func_void_std__optional_std__string__Wrapper(std::function<void(const std::optional<std::string>& /* id */)>&& func): _function(std::make_unique<std::function<void(const std::optional<std::string>& /* id */)>>(std::move(func))) {}
-    inline void call(std::optional<std::string> id) const noexcept {
+    explicit Func_void_std__string_Wrapper(std::function<void(const std::string& /* id */)>&& func): _function(std::make_unique<std::function<void(const std::string& /* id */)>>(std::move(func))) {}
+    inline void call(std::string id) const noexcept {
       _function->operator()(id);
     }
   private:
-    std::unique_ptr<std::function<void(const std::optional<std::string>& /* id */)>> _function;
+    std::unique_ptr<std::function<void(const std::string& /* id */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_std__optional_std__string_ create_Func_void_std__optional_std__string_(void* NON_NULL swiftClosureWrapper) noexcept;
-  inline Func_void_std__optional_std__string__Wrapper wrap_Func_void_std__optional_std__string_(Func_void_std__optional_std__string_ value) noexcept {
-    return Func_void_std__optional_std__string__Wrapper(std::move(value));
+  Func_void_std__string create_Func_void_std__string(void* NON_NULL swiftClosureWrapper) noexcept;
+  inline Func_void_std__string_Wrapper wrap_Func_void_std__string(Func_void_std__string value) noexcept {
+    return Func_void_std__string_Wrapper(std::move(value));
   }
   
-  // pragma MARK: std::optional<std::function<void(const std::optional<std::string>& /* id */)>>
+  // pragma MARK: std::optional<std::function<void(const std::string& /* id */)>>
   /**
-   * Specialized version of `std::optional<std::function<void(const std::optional<std::string>& / * id * /)>>`.
+   * Specialized version of `std::optional<std::function<void(const std::string& / * id * /)>>`.
    */
-  using std__optional_std__function_void_const_std__optional_std__string______id______ = std::optional<std::function<void(const std::optional<std::string>& /* id */)>>;
-  inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> create_std__optional_std__function_void_const_std__optional_std__string______id______(const std::function<void(const std::optional<std::string>& /* id */)>& value) noexcept {
-    return std::optional<std::function<void(const std::optional<std::string>& /* id */)>>(value);
+  using std__optional_std__function_void_const_std__string_____id______ = std::optional<std::function<void(const std::string& /* id */)>>;
+  inline std::optional<std::function<void(const std::string& /* id */)>> create_std__optional_std__function_void_const_std__string_____id______(const std::function<void(const std::string& /* id */)>& value) noexcept {
+    return std::optional<std::function<void(const std::string& /* id */)>>(value);
   }
-  inline bool has_value_std__optional_std__function_void_const_std__optional_std__string______id______(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& optional) noexcept {
+  inline bool has_value_std__optional_std__function_void_const_std__string_____id______(const std::optional<std::function<void(const std::string& /* id */)>>& optional) noexcept {
     return optional.has_value();
   }
-  inline std::function<void(const std::optional<std::string>& /* id */)> get_std__optional_std__function_void_const_std__optional_std__string______id______(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& optional) noexcept {
+  inline std::function<void(const std::string& /* id */)> get_std__optional_std__function_void_const_std__string_____id______(const std::optional<std::function<void(const std::string& /* id */)>>& optional) noexcept {
     return *optional;
   }
   
-  // pragma MARK: std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>
+  // pragma MARK: std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>
   /**
-   * Specialized version of `std::function<void(const std::optional<std::string>&, const RNLatLng&)>`.
+   * Specialized version of `std::function<void(const std::string&, const RNLatLng&)>`.
    */
-  using Func_void_std__optional_std__string__RNLatLng = std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>;
+  using Func_void_std__string_RNLatLng = std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>;
   /**
-   * Wrapper class for a `std::function<void(const std::optional<std::string>& / * id * /, const RNLatLng& / * location * /)>`, this can be used from Swift.
+   * Wrapper class for a `std::function<void(const std::string& / * id * /, const RNLatLng& / * location * /)>`, this can be used from Swift.
    */
-  class Func_void_std__optional_std__string__RNLatLng_Wrapper final {
+  class Func_void_std__string_RNLatLng_Wrapper final {
   public:
-    explicit Func_void_std__optional_std__string__RNLatLng_Wrapper(std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>&& func): _function(std::make_unique<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>(std::move(func))) {}
-    inline void call(std::optional<std::string> id, RNLatLng location) const noexcept {
+    explicit Func_void_std__string_RNLatLng_Wrapper(std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>&& func): _function(std::make_unique<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>(std::move(func))) {}
+    inline void call(std::string id, RNLatLng location) const noexcept {
       _function->operator()(id, location);
     }
   private:
-    std::unique_ptr<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> _function;
+    std::unique_ptr<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_std__optional_std__string__RNLatLng create_Func_void_std__optional_std__string__RNLatLng(void* NON_NULL swiftClosureWrapper) noexcept;
-  inline Func_void_std__optional_std__string__RNLatLng_Wrapper wrap_Func_void_std__optional_std__string__RNLatLng(Func_void_std__optional_std__string__RNLatLng value) noexcept {
-    return Func_void_std__optional_std__string__RNLatLng_Wrapper(std::move(value));
+  Func_void_std__string_RNLatLng create_Func_void_std__string_RNLatLng(void* NON_NULL swiftClosureWrapper) noexcept;
+  inline Func_void_std__string_RNLatLng_Wrapper wrap_Func_void_std__string_RNLatLng(Func_void_std__string_RNLatLng value) noexcept {
+    return Func_void_std__string_RNLatLng_Wrapper(std::move(value));
   }
   
-  // pragma MARK: std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>
+  // pragma MARK: std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>
   /**
-   * Specialized version of `std::optional<std::function<void(const std::optional<std::string>& / * id * /, const RNLatLng& / * location * /)>>`.
+   * Specialized version of `std::optional<std::function<void(const std::string& / * id * /, const RNLatLng& / * location * /)>>`.
    */
-  using std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______ = std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>;
-  inline std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> create_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(const std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>& value) noexcept {
-    return std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>(value);
+  using std__optional_std__function_void_const_std__string_____id_____const_RNLatLng_____location______ = std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>;
+  inline std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> create_std__optional_std__function_void_const_std__string_____id_____const_RNLatLng_____location______(const std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>& value) noexcept {
+    return std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>(value);
   }
-  inline bool has_value_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& optional) noexcept {
+  inline bool has_value_std__optional_std__function_void_const_std__string_____id_____const_RNLatLng_____location______(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& optional) noexcept {
     return optional.has_value();
   }
-  inline std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)> get_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& optional) noexcept {
+  inline std::function<void(const std::string& /* id */, const RNLatLng& /* location */)> get_std__optional_std__function_void_const_std__string_____id_____const_RNLatLng_____location______(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& optional) noexcept {
     return *optional;
   }
   
@@ -1379,6 +1379,28 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     return PromiseHolder<std::optional<std::string>>(std::move(promise));
   }
   
+  // pragma MARK: std::function<void(const std::optional<std::string>& /* result */)>
+  /**
+   * Specialized version of `std::function<void(const std::optional<std::string>&)>`.
+   */
+  using Func_void_std__optional_std__string_ = std::function<void(const std::optional<std::string>& /* result */)>;
+  /**
+   * Wrapper class for a `std::function<void(const std::optional<std::string>& / * result * /)>`, this can be used from Swift.
+   */
+  class Func_void_std__optional_std__string__Wrapper final {
+  public:
+    explicit Func_void_std__optional_std__string__Wrapper(std::function<void(const std::optional<std::string>& /* result */)>&& func): _function(std::make_unique<std::function<void(const std::optional<std::string>& /* result */)>>(std::move(func))) {}
+    inline void call(std::optional<std::string> result) const noexcept {
+      _function->operator()(result);
+    }
+  private:
+    std::unique_ptr<std::function<void(const std::optional<std::string>& /* result */)>> _function;
+  } SWIFT_NONCOPYABLE;
+  Func_void_std__optional_std__string_ create_Func_void_std__optional_std__string_(void* NON_NULL swiftClosureWrapper) noexcept;
+  inline Func_void_std__optional_std__string__Wrapper wrap_Func_void_std__optional_std__string_(Func_void_std__optional_std__string_ value) noexcept {
+    return Func_void_std__optional_std__string__Wrapper(std::move(value));
+  }
+  
   // pragma MARK: std::optional<RNSize>
   /**
    * Specialized version of `std::optional<RNSize>`.

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

@@ -374,53 +374,53 @@ namespace margelo::nitro::rngooglemapsplus {
     inline void setOnPoiPress(const std::optional<std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>>& onPoiPress) noexcept override {
       _swiftPart.setOnPoiPress(onPoiPress);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnMarkerPress() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */)>> getOnMarkerPress() noexcept override {
       auto __result = _swiftPart.getOnMarkerPress();
       return __result;
     }
-    inline void setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) noexcept override {
+    inline void setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) noexcept override {
       _swiftPart.setOnMarkerPress(onMarkerPress);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolylinePress() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */)>> getOnPolylinePress() noexcept override {
       auto __result = _swiftPart.getOnPolylinePress();
       return __result;
     }
-    inline void setOnPolylinePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolylinePress) noexcept override {
+    inline void setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) noexcept override {
       _swiftPart.setOnPolylinePress(onPolylinePress);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolygonPress() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */)>> getOnPolygonPress() noexcept override {
       auto __result = _swiftPart.getOnPolygonPress();
       return __result;
     }
-    inline void setOnPolygonPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolygonPress) noexcept override {
+    inline void setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) noexcept override {
       _swiftPart.setOnPolygonPress(onPolygonPress);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnCirclePress() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */)>> getOnCirclePress() noexcept override {
       auto __result = _swiftPart.getOnCirclePress();
       return __result;
     }
-    inline void setOnCirclePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onCirclePress) noexcept override {
+    inline void setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) noexcept override {
       _swiftPart.setOnCirclePress(onCirclePress);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragStart() noexcept override {
       auto __result = _swiftPart.getOnMarkerDragStart();
       return __result;
     }
-    inline void setOnMarkerDragStart(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) noexcept override {
+    inline void setOnMarkerDragStart(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragStart) noexcept override {
       _swiftPart.setOnMarkerDragStart(onMarkerDragStart);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDrag() noexcept override {
       auto __result = _swiftPart.getOnMarkerDrag();
       return __result;
     }
-    inline void setOnMarkerDrag(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) noexcept override {
+    inline void setOnMarkerDrag(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) noexcept override {
       _swiftPart.setOnMarkerDrag(onMarkerDrag);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() noexcept override {
       auto __result = _swiftPart.getOnMarkerDragEnd();
       return __result;
     }
-    inline void setOnMarkerDragEnd(const std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) noexcept override {
+    inline void setOnMarkerDragEnd(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) noexcept override {
       _swiftPart.setOnMarkerDragEnd(onMarkerDragEnd);
     }
     inline std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> getOnIndoorBuildingFocused() noexcept override {
@@ -437,25 +437,25 @@ namespace margelo::nitro::rngooglemapsplus {
     inline void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) noexcept override {
       _swiftPart.setOnIndoorLevelActivated(onIndoorLevelActivated);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowPress() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowPress() noexcept override {
       auto __result = _swiftPart.getOnInfoWindowPress();
       return __result;
     }
-    inline void setOnInfoWindowPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowPress) noexcept override {
+    inline void setOnInfoWindowPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowPress) noexcept override {
       _swiftPart.setOnInfoWindowPress(onInfoWindowPress);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowClose() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowClose() noexcept override {
       auto __result = _swiftPart.getOnInfoWindowClose();
       return __result;
     }
-    inline void setOnInfoWindowClose(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowClose) noexcept override {
+    inline void setOnInfoWindowClose(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowClose) noexcept override {
       _swiftPart.setOnInfoWindowClose(onInfoWindowClose);
     }
-    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowLongPress() noexcept override {
+    inline std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowLongPress() noexcept override {
       auto __result = _swiftPart.getOnInfoWindowLongPress();
       return __result;
     }
-    inline void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowLongPress) noexcept override {
+    inline void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowLongPress) noexcept override {
       _swiftPart.setOnInfoWindowLongPress(onInfoWindowLongPress);
     }
     inline std::optional<std::function<void(const RNLocation& /* location */)>> getOnMyLocationPress() noexcept override {
@@ -496,6 +496,18 @@ namespace margelo::nitro::rngooglemapsplus {
 
   public:
     // Methods
+    inline void showMarkerInfoWindow(const std::string& id) override {
+      auto __result = _swiftPart.showMarkerInfoWindow(id);
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
+    inline void hideMarkerInfoWindow(const std::string& id) override {
+      auto __result = _swiftPart.hideMarkerInfoWindow(id);
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
     inline void setCamera(const RNCamera& camera, std::optional<bool> animated, std::optional<double> durationMs) override {
       auto __result = _swiftPart.setCamera(std::forward<decltype(camera)>(camera), animated, durationMs);
       if (__result.hasError()) [[unlikely]] {