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

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

@@ -959,40 +959,77 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     return *optional;
   }
   
-  // pragma MARK: std::function<void(const std::string& /* id */)>
+  // pragma MARK: std::function<void(const std::optional<std::string>& /* id */)>
   /**
-   * Specialized version of `std::function<void(const std::string&)>`.
+   * Specialized version of `std::function<void(const std::optional<std::string>&)>`.
    */
-  using Func_void_std__string = std::function<void(const std::string& /* id */)>;
+  using Func_void_std__optional_std__string_ = std::function<void(const std::optional<std::string>& /* id */)>;
   /**
-   * Wrapper class for a `std::function<void(const std::string& / * id * /)>`, this can be used from Swift.
+   * Wrapper class for a `std::function<void(const std::optional<std::string>& / * id * /)>`, this can be used from Swift.
    */
-  class Func_void_std__string_Wrapper final {
+  class Func_void_std__optional_std__string__Wrapper final {
   public:
-    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 {
+    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 {
       _function->operator()(id);
     }
   private:
-    std::unique_ptr<std::function<void(const std::string& /* id */)>> _function;
+    std::unique_ptr<std::function<void(const std::optional<std::string>& /* id */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_std__string create_Func_void_std__string(void* _Nonnull 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));
+  Func_void_std__optional_std__string_ create_Func_void_std__optional_std__string_(void* _Nonnull 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<std::function<void(const std::string& /* id */)>>
+  // pragma MARK: std::optional<std::function<void(const std::optional<std::string>& /* id */)>>
   /**
-   * Specialized version of `std::optional<std::function<void(const std::string& / * id * /)>>`.
+   * Specialized version of `std::optional<std::function<void(const std::optional<std::string>& / * id * /)>>`.
    */
-  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);
+  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);
   }
-  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 {
+  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 {
     return optional.has_value();
   }
-  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 {
+  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 {
+    return *optional;
+  }
+  
+  // pragma MARK: std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>
+  /**
+   * Specialized version of `std::function<void(const std::optional<std::string>&, const RNLatLng&)>`.
+   */
+  using Func_void_std__optional_std__string__RNLatLng = std::function<void(const std::optional<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.
+   */
+  class Func_void_std__optional_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 {
+      _function->operator()(id, location);
+    }
+  private:
+    std::unique_ptr<std::function<void(const std::optional<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* _Nonnull 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));
+  }
+  
+  // pragma MARK: std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>
+  /**
+   * Specialized version of `std::optional<std::function<void(const std::optional<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);
+  }
+  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 {
+    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 {
     return *optional;
   }
   

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

@@ -313,34 +313,55 @@ namespace margelo::nitro::rngooglemapsplus {
     inline void setOnMapPress(const std::optional<std::function<void(const RNLatLng& /* coordinate */)>>& onMapPress) noexcept override {
       _swiftPart.setOnMapPress(onMapPress);
     }
-    inline std::optional<std::function<void(const std::string& /* id */)>> getOnMarkerPress() noexcept override {
+    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnMarkerPress() noexcept override {
       auto __result = _swiftPart.getOnMarkerPress();
       return __result;
     }
-    inline void setOnMarkerPress(const std::optional<std::function<void(const std::string& /* id */)>>& onMarkerPress) noexcept override {
+    inline void setOnMarkerPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onMarkerPress) noexcept override {
       _swiftPart.setOnMarkerPress(onMarkerPress);
     }
-    inline std::optional<std::function<void(const std::string& /* id */)>> getOnPolylinePress() noexcept override {
+    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolylinePress() noexcept override {
       auto __result = _swiftPart.getOnPolylinePress();
       return __result;
     }
-    inline void setOnPolylinePress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolylinePress) noexcept override {
+    inline void setOnPolylinePress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolylinePress) noexcept override {
       _swiftPart.setOnPolylinePress(onPolylinePress);
     }
-    inline std::optional<std::function<void(const std::string& /* id */)>> getOnPolygonPress() noexcept override {
+    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnPolygonPress() noexcept override {
       auto __result = _swiftPart.getOnPolygonPress();
       return __result;
     }
-    inline void setOnPolygonPress(const std::optional<std::function<void(const std::string& /* id */)>>& onPolygonPress) noexcept override {
+    inline void setOnPolygonPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onPolygonPress) noexcept override {
       _swiftPart.setOnPolygonPress(onPolygonPress);
     }
-    inline std::optional<std::function<void(const std::string& /* id */)>> getOnCirclePress() noexcept override {
+    inline std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnCirclePress() noexcept override {
       auto __result = _swiftPart.getOnCirclePress();
       return __result;
     }
-    inline void setOnCirclePress(const std::optional<std::function<void(const std::string& /* id */)>>& onCirclePress) noexcept override {
+    inline void setOnCirclePress(const std::optional<std::function<void(const std::optional<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 {
+      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 {
+      _swiftPart.setOnMarkerDragStart(onMarkerDragStart);
+    }
+    inline std::optional<std::function<void(const std::optional<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 {
+      _swiftPart.setOnMarkerDrag(onMarkerDrag);
+    }
+    inline std::optional<std::function<void(const std::optional<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 {
+      _swiftPart.setOnMarkerDragEnd(onMarkerDragEnd);
+    }
     inline std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() noexcept override {
       auto __result = _swiftPart.getOnCameraChangeStart();
       return __result;

package/nitrogen/generated/ios/c++/views/HybridRNGoogleMapsPlusViewComponent.mm

@@ -206,6 +206,21 @@ using namespace margelo::nitro::rngooglemapsplus::views;
     swiftPart.setOnCirclePress(newViewProps.onCirclePress.value);
     newViewProps.onCirclePress.isDirty = false;
   }
+  // onMarkerDragStart: optional
+  if (newViewProps.onMarkerDragStart.isDirty) {
+    swiftPart.setOnMarkerDragStart(newViewProps.onMarkerDragStart.value);
+    newViewProps.onMarkerDragStart.isDirty = false;
+  }
+  // onMarkerDrag: optional
+  if (newViewProps.onMarkerDrag.isDirty) {
+    swiftPart.setOnMarkerDrag(newViewProps.onMarkerDrag.value);
+    newViewProps.onMarkerDrag.isDirty = false;
+  }
+  // onMarkerDragEnd: optional
+  if (newViewProps.onMarkerDragEnd.isDirty) {
+    swiftPart.setOnMarkerDragEnd(newViewProps.onMarkerDragEnd.value);
+    newViewProps.onMarkerDragEnd.isDirty = false;
+  }
   // onCameraChangeStart: optional
   if (newViewProps.onCameraChangeStart.isDirty) {
     swiftPart.setOnCameraChangeStart(newViewProps.onCameraChangeStart.value);

package/nitrogen/generated/ios/swift/{Func_void_std__string.swift → Func_void_std__optional_std__string_.swift}

@@ -1,5 +1,5 @@
 ///
-/// Func_void_std__string.swift
+/// Func_void_std__optional_std__string_.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
@@ -9,21 +9,28 @@ import NitroModules
 
 
 /**
- * Wraps a Swift `(_ id: String) -> Void` as a class.
+ * Wraps a Swift `(_ id: String?) -> 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__string {
+public final class Func_void_std__optional_std__string_ {
   public typealias bridge = margelo.nitro.rngooglemapsplus.bridge.swift
 
-  private let closure: (_ id: String) -> Void
+  private let closure: (_ id: String?) -> Void
 
-  public init(_ closure: @escaping (_ id: String) -> Void) {
+  public init(_ closure: @escaping (_ id: String?) -> Void) {
     self.closure = closure
   }
 
   @inline(__always)
-  public func call(id: std.string) -> Void {
-    self.closure(String(id))
+  public func call(id: bridge.std__optional_std__string_) -> 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
+      }
+    }())
   }
 
   /**
@@ -36,12 +43,12 @@ public final class Func_void_std__string {
   }
 
   /**
-   * Casts an unsafe pointer to a `Func_void_std__string`.
-   * The pointer has to be a retained opaque `Unmanaged<Func_void_std__string>`.
+   * Casts an unsafe pointer to a `Func_void_std__optional_std__string_`.
+   * The pointer has to be a retained opaque `Unmanaged<Func_void_std__optional_std__string_>`.
    * This removes one strong reference from the object!
    */
   @inline(__always)
-  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_std__string {
-    return Unmanaged<Func_void_std__string>.fromOpaque(pointer).takeRetainedValue()
+  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_std__optional_std__string_ {
+    return Unmanaged<Func_void_std__optional_std__string_>.fromOpaque(pointer).takeRetainedValue()
   }
 }

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

@@ -0,0 +1,54 @@
+///
+/// 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()
+  }
+}

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

@@ -34,10 +34,13 @@ public protocol HybridRNGoogleMapsPlusViewSpec_protocol: HybridObject, HybridVie
   var onLocationUpdate: ((_ location: RNLocation) -> Void)? { get set }
   var onLocationError: ((_ error: RNLocationErrorCode) -> Void)? { get set }
   var onMapPress: ((_ coordinate: RNLatLng) -> Void)? { get set }
-  var onMarkerPress: ((_ id: String) -> Void)? { get set }
-  var onPolylinePress: ((_ id: String) -> Void)? { get set }
-  var onPolygonPress: ((_ id: String) -> Void)? { get set }
-  var onCirclePress: ((_ id: String) -> Void)? { get set }
+  var onMarkerPress: ((_ id: String?) -> Void)? { get set }
+  var onPolylinePress: ((_ id: String?) -> Void)? { get set }
+  var onPolygonPress: ((_ id: String?) -> Void)? { get set }
+  var onCirclePress: ((_ id: String?) -> Void)? { get set }
+  var onMarkerDragStart: ((_ id: String?, _ location: RNLatLng) -> Void)? { get set }
+  var onMarkerDrag: ((_ id: String?, _ location: RNLatLng) -> Void)? { get set }
+  var onMarkerDragEnd: ((_ id: String?, _ location: RNLatLng) -> Void)? { get set }
   var onCameraChangeStart: ((_ region: RNRegion, _ camera: RNCamera, _ isGesture: Bool) -> Void)? { get set }
   var onCameraChange: ((_ region: RNRegion, _ camera: RNCamera, _ isGesture: Bool) -> Void)? { get set }
   var onCameraChangeComplete: ((_ region: RNRegion, _ camera: RNCamera, _ isGesture: Bool) -> Void)? { get set }

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

@@ -692,14 +692,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onMarkerPress: bridge.std__optional_std__function_void_const_std__string_____id______ {
+  public final var onMarkerPress: bridge.std__optional_std__function_void_const_std__optional_std__string______id______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_const_std__string_____id______ in
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id______ in
         if let __unwrappedValue = self.__implementation.onMarkerPress {
-          return bridge.create_std__optional_std__function_void_const_std__string_____id______({ () -> bridge.Func_void_std__string in
-            let __closureWrapper = Func_void_std__string(__unwrappedValue)
-            return bridge.create_Func_void_std__string(__closureWrapper.toUnsafe())
+          return bridge.create_std__optional_std__function_void_const_std__optional_std__string______id______({ () -> bridge.Func_void_std__optional_std__string_ in
+            let __closureWrapper = Func_void_std__optional_std__string_(__unwrappedValue)
+            return bridge.create_Func_void_std__optional_std__string_(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -708,13 +708,19 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.onMarkerPress = { () -> ((_ id: String) -> Void)? in
-        if bridge.has_value_std__optional_std__function_void_const_std__string_____id______(newValue) {
-          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__string_____id______(newValue)
-          return { () -> (String) -> Void in
-            let __wrappedFunction = bridge.wrap_Func_void_std__string(__unwrapped)
-            return { (__id: String) -> Void in
-              __wrappedFunction.call(std.string(__id))
+      self.__implementation.onMarkerPress = { () -> ((_ id: String?) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_std__optional_std__string______id______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__optional_std__string______id______(newValue)
+          return { () -> (String?) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_std__optional_std__string_(__unwrapped)
+            return { (__id: String?) -> Void in
+              __wrappedFunction.call({ () -> bridge.std__optional_std__string_ in
+                if let __unwrappedValue = __id {
+                  return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+                } else {
+                  return .init()
+                }
+              }())
             }
           }()
         } else {
@@ -724,14 +730,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onPolylinePress: bridge.std__optional_std__function_void_const_std__string_____id______ {
+  public final var onPolylinePress: bridge.std__optional_std__function_void_const_std__optional_std__string______id______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_const_std__string_____id______ in
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id______ in
         if let __unwrappedValue = self.__implementation.onPolylinePress {
-          return bridge.create_std__optional_std__function_void_const_std__string_____id______({ () -> bridge.Func_void_std__string in
-            let __closureWrapper = Func_void_std__string(__unwrappedValue)
-            return bridge.create_Func_void_std__string(__closureWrapper.toUnsafe())
+          return bridge.create_std__optional_std__function_void_const_std__optional_std__string______id______({ () -> bridge.Func_void_std__optional_std__string_ in
+            let __closureWrapper = Func_void_std__optional_std__string_(__unwrappedValue)
+            return bridge.create_Func_void_std__optional_std__string_(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -740,13 +746,19 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.onPolylinePress = { () -> ((_ id: String) -> Void)? in
-        if bridge.has_value_std__optional_std__function_void_const_std__string_____id______(newValue) {
-          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__string_____id______(newValue)
-          return { () -> (String) -> Void in
-            let __wrappedFunction = bridge.wrap_Func_void_std__string(__unwrapped)
-            return { (__id: String) -> Void in
-              __wrappedFunction.call(std.string(__id))
+      self.__implementation.onPolylinePress = { () -> ((_ id: String?) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_std__optional_std__string______id______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__optional_std__string______id______(newValue)
+          return { () -> (String?) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_std__optional_std__string_(__unwrapped)
+            return { (__id: String?) -> Void in
+              __wrappedFunction.call({ () -> bridge.std__optional_std__string_ in
+                if let __unwrappedValue = __id {
+                  return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+                } else {
+                  return .init()
+                }
+              }())
             }
           }()
         } else {
@@ -756,14 +768,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onPolygonPress: bridge.std__optional_std__function_void_const_std__string_____id______ {
+  public final var onPolygonPress: bridge.std__optional_std__function_void_const_std__optional_std__string______id______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_const_std__string_____id______ in
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id______ in
         if let __unwrappedValue = self.__implementation.onPolygonPress {
-          return bridge.create_std__optional_std__function_void_const_std__string_____id______({ () -> bridge.Func_void_std__string in
-            let __closureWrapper = Func_void_std__string(__unwrappedValue)
-            return bridge.create_Func_void_std__string(__closureWrapper.toUnsafe())
+          return bridge.create_std__optional_std__function_void_const_std__optional_std__string______id______({ () -> bridge.Func_void_std__optional_std__string_ in
+            let __closureWrapper = Func_void_std__optional_std__string_(__unwrappedValue)
+            return bridge.create_Func_void_std__optional_std__string_(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -772,13 +784,19 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.onPolygonPress = { () -> ((_ id: String) -> Void)? in
-        if bridge.has_value_std__optional_std__function_void_const_std__string_____id______(newValue) {
-          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__string_____id______(newValue)
-          return { () -> (String) -> Void in
-            let __wrappedFunction = bridge.wrap_Func_void_std__string(__unwrapped)
-            return { (__id: String) -> Void in
-              __wrappedFunction.call(std.string(__id))
+      self.__implementation.onPolygonPress = { () -> ((_ id: String?) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_std__optional_std__string______id______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__optional_std__string______id______(newValue)
+          return { () -> (String?) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_std__optional_std__string_(__unwrapped)
+            return { (__id: String?) -> Void in
+              __wrappedFunction.call({ () -> bridge.std__optional_std__string_ in
+                if let __unwrappedValue = __id {
+                  return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+                } else {
+                  return .init()
+                }
+              }())
             }
           }()
         } else {
@@ -788,14 +806,14 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
-  public final var onCirclePress: bridge.std__optional_std__function_void_const_std__string_____id______ {
+  public final var onCirclePress: bridge.std__optional_std__function_void_const_std__optional_std__string______id______ {
     @inline(__always)
     get {
-      return { () -> bridge.std__optional_std__function_void_const_std__string_____id______ in
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id______ in
         if let __unwrappedValue = self.__implementation.onCirclePress {
-          return bridge.create_std__optional_std__function_void_const_std__string_____id______({ () -> bridge.Func_void_std__string in
-            let __closureWrapper = Func_void_std__string(__unwrappedValue)
-            return bridge.create_Func_void_std__string(__closureWrapper.toUnsafe())
+          return bridge.create_std__optional_std__function_void_const_std__optional_std__string______id______({ () -> bridge.Func_void_std__optional_std__string_ in
+            let __closureWrapper = Func_void_std__optional_std__string_(__unwrappedValue)
+            return bridge.create_Func_void_std__optional_std__string_(__closureWrapper.toUnsafe())
           }())
         } else {
           return .init()
@@ -804,13 +822,133 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.onCirclePress = { () -> ((_ id: String) -> Void)? in
-        if bridge.has_value_std__optional_std__function_void_const_std__string_____id______(newValue) {
-          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__string_____id______(newValue)
-          return { () -> (String) -> Void in
-            let __wrappedFunction = bridge.wrap_Func_void_std__string(__unwrapped)
-            return { (__id: String) -> Void in
-              __wrappedFunction.call(std.string(__id))
+      self.__implementation.onCirclePress = { () -> ((_ id: String?) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_std__optional_std__string______id______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__optional_std__string______id______(newValue)
+          return { () -> (String?) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_std__optional_std__string_(__unwrapped)
+            return { (__id: String?) -> Void in
+              __wrappedFunction.call({ () -> bridge.std__optional_std__string_ in
+                if let __unwrappedValue = __id {
+                  return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+                } else {
+                  return .init()
+                }
+              }())
+            }
+          }()
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
+  public final var onMarkerDragStart: bridge.std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______ in
+        if let __unwrappedValue = self.__implementation.onMarkerDragStart {
+          return bridge.create_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______({ () -> bridge.Func_void_std__optional_std__string__RNLatLng in
+            let __closureWrapper = Func_void_std__optional_std__string__RNLatLng(__unwrappedValue)
+            return bridge.create_Func_void_std__optional_std__string__RNLatLng(__closureWrapper.toUnsafe())
+          }())
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onMarkerDragStart = { () -> ((_ id: String?, _ location: RNLatLng) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(newValue)
+          return { () -> (String?, RNLatLng) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_std__optional_std__string__RNLatLng(__unwrapped)
+            return { (__id: String?, __location: RNLatLng) -> Void in
+              __wrappedFunction.call({ () -> bridge.std__optional_std__string_ in
+                if let __unwrappedValue = __id {
+                  return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+                } else {
+                  return .init()
+                }
+              }(), __location)
+            }
+          }()
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
+  public final var onMarkerDrag: bridge.std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______ in
+        if let __unwrappedValue = self.__implementation.onMarkerDrag {
+          return bridge.create_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______({ () -> bridge.Func_void_std__optional_std__string__RNLatLng in
+            let __closureWrapper = Func_void_std__optional_std__string__RNLatLng(__unwrappedValue)
+            return bridge.create_Func_void_std__optional_std__string__RNLatLng(__closureWrapper.toUnsafe())
+          }())
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onMarkerDrag = { () -> ((_ id: String?, _ location: RNLatLng) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(newValue)
+          return { () -> (String?, RNLatLng) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_std__optional_std__string__RNLatLng(__unwrapped)
+            return { (__id: String?, __location: RNLatLng) -> Void in
+              __wrappedFunction.call({ () -> bridge.std__optional_std__string_ in
+                if let __unwrappedValue = __id {
+                  return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+                } else {
+                  return .init()
+                }
+              }(), __location)
+            }
+          }()
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
+  public final var onMarkerDragEnd: bridge.std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______ in
+        if let __unwrappedValue = self.__implementation.onMarkerDragEnd {
+          return bridge.create_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______({ () -> bridge.Func_void_std__optional_std__string__RNLatLng in
+            let __closureWrapper = Func_void_std__optional_std__string__RNLatLng(__unwrappedValue)
+            return bridge.create_Func_void_std__optional_std__string__RNLatLng(__closureWrapper.toUnsafe())
+          }())
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onMarkerDragEnd = { () -> ((_ id: String?, _ location: RNLatLng) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_std__optional_std__string______id_____const_RNLatLng_____location______(newValue)
+          return { () -> (String?, RNLatLng) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_std__optional_std__string__RNLatLng(__unwrapped)
+            return { (__id: String?, __location: RNLatLng) -> Void in
+              __wrappedFunction.call({ () -> bridge.std__optional_std__string_ in
+                if let __unwrappedValue = __id {
+                  return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+                } else {
+                  return .init()
+                }
+              }(), __location)
             }
           }()
         } else {