react-native-google-maps-plus 1.3.0-dev.5 → 1.3.0-dev.7

package/android/build.gradle

@@ -28,7 +28,7 @@ apply from: "./fix-prefab.gradle"
 if (rootProject.name != "rngooglemapsplus.example") {
     apply plugin: "com.facebook.react"
 } else {
-    println("\u001B[33m⚠️  Skipping React Native Gradle plugin in library (example build detected)\u001B[0m")
+    println("\u001B[33mSkipping React Native Gradle plugin in library (example build detected)\u001B[0m")
 }
 
 def getExtOrIntegerDefault(name) {

package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt

@@ -68,7 +68,7 @@ class MapMarkerBuilder(
     }
     marker.title = next.title
     marker.snippet = next.snippet
-    marker.alpha = next.opacity?.toFloat() ?: 0f
+    marker.alpha = next.opacity?.toFloat() ?: 1f
     marker.isFlat = next.flat ?: false
     marker.isDraggable = next.draggable ?: false
     marker.rotation = next.rotation?.toFloat() ?: 0f

package/android/src/main/java/com/rngooglemapsplus/extensions/RNMarkerExtension.kt

@@ -7,6 +7,14 @@ fun RNMarker.markerEquals(b: RNMarker): Boolean =
     zIndex == b.zIndex &&
     coordinate == b.coordinate &&
     anchor == b.anchor &&
+    showInfoWindow == b.showInfoWindow &&
+    title == b.title &&
+    snippet == b.snippet &&
+    opacity == b.opacity &&
+    flat == b.flat &&
+    draggable == b.draggable &&
+    rotation == b.rotation &&
+    infoWindowAnchor == b.infoWindowAnchor &&
     markerStyleEquals(b)
 
 fun RNMarker.markerStyleEquals(b: RNMarker): Boolean = iconSvg == b.iconSvg

package/android/src/main/java/com/rngooglemapsplus/extensions/RNPolygonExtension.kt

@@ -8,6 +8,8 @@ fun RNPolygon.polygonEquals(b: RNPolygon): Boolean {
   if (strokeWidth != b.strokeWidth) return false
   if (fillColor != b.fillColor) return false
   if (strokeColor != b.strokeColor) return false
+  if (geodesic != b.geodesic) return false
+  if (!holes.contentEquals(b.holes)) return false
   val ac = coordinates
   val bc = b.coordinates
   if (ac.size != bc.size) return false

package/android/src/main/java/com/rngooglemapsplus/extensions/RNPolylineExtension.kt

@@ -8,6 +8,7 @@ fun RNPolyline.polylineEquals(b: RNPolyline): Boolean {
   if ((width ?: 0.0) != (b.width ?: 0.0)) return false
   if (lineCap != b.lineCap) return false
   if (lineJoin != b.lineJoin) return false
+  if (geodesic != b.geodesic) return false
   if (color != b.color) return false
   val ac = coordinates
   val bc = b.coordinates

package/ios/MapMarkerBuilder.swift

@@ -47,7 +47,8 @@ final class MapMarkerBuilder {
     m.position = next.coordinate.toCLLocationCoordinate2D()
     m.title = next.title
     m.snippet = next.snippet
-    m.iconView?.alpha = CGFloat(next.opacity ?? 0)
+    m.opacity = Float(next.opacity ?? 1)
+    m.iconView?.alpha = CGFloat(next.opacity ?? 1)
     m.isFlat = next.flat ?? false
     m.isDraggable = next.draggable ?? false
     m.rotation = next.rotation ?? 0

package/ios/extensions/RNMarker+Extension.swift

@@ -6,6 +6,11 @@ extension RNMarker {
       && coordinate.latitude == b.coordinate.latitude
       && coordinate.longitude == b.coordinate.longitude
       && anchor?.x == b.anchor?.x && anchor?.y == b.anchor?.y
+      && showInfoWindow == b.showInfoWindow && title == b.title
+      && snippet == b.snippet && opacity == b.opacity && flat == b.flat
+      && draggable == b.draggable && rotation == b.rotation
+      && infoWindowAnchor?.x == b.infoWindowAnchor?.x
+      && infoWindowAnchor?.y == b.infoWindowAnchor?.y
       && markerStyleEquals(b)
   }
 

package/ios/extensions/RNPolygon+Extension.swift.swift

@@ -7,7 +7,9 @@ extension RNPolygon {
           strokeWidth == b.strokeWidth,
           fillColor == b.fillColor,
           strokeColor == b.strokeColor,
-          coordinates.count == b.coordinates.count
+          geodesic == b.geodesic,
+          coordinates.count == b.coordinates.count,
+          holes?.count == b.holes?.count
     else { return false }
 
     for i in 0..<coordinates.count {
@@ -17,6 +19,19 @@ extension RNPolygon {
       }
     }
 
+    for i in 0..<(holes?.count ?? 0) {
+      let ha = holes![i]
+      let hb = b.holes![i]
+      if ha.coordinates.count != hb.coordinates.count { return false }
+
+      for j in 0..<ha.coordinates.count {
+        if ha.coordinates[j].latitude != hb.coordinates[j].latitude
+          || ha.coordinates[j].longitude != hb.coordinates[j].longitude {
+          return false
+        }
+      }
+    }
+
     return true
   }
 }

package/ios/extensions/RNPolyline+Extension.swift.swift

@@ -7,6 +7,7 @@ extension RNPolyline {
           lineCap == b.lineCap,
           lineJoin == b.lineJoin,
           color == b.color,
+          geodesic == b.geodesic,
           coordinates.count == b.coordinates.count
     else { return false }
 

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

@@ -17,7 +17,7 @@ import com.rngooglemapsplus.*
 /**
  * Represents the React Native `ViewManager` for the "RNGoogleMapsPlusView" Nitro HybridView.
  */
-class HybridRNGoogleMapsPlusViewManager: SimpleViewManager<View>() {
+open class HybridRNGoogleMapsPlusViewManager: SimpleViewManager<View>() {
   private val views = hashMapOf<View, RNGoogleMapsPlusView>()
 
   override fun getName(): String {

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

@@ -15,7 +15,7 @@
 namespace margelo::nitro::rngooglemapsplus::bridge::swift {
 
   // pragma MARK: std::function<void(const RNLocationPermissionResult& /* result */)>
-  Func_void_RNLocationPermissionResult create_Func_void_RNLocationPermissionResult(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_RNLocationPermissionResult create_Func_void_RNLocationPermissionResult(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNLocationPermissionResult::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const RNLocationPermissionResult& result) mutable -> void {
       swiftClosure.call(result);
@@ -23,7 +23,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::function<void(const std::exception_ptr& /* error */)>
-  Func_void_std__exception_ptr create_Func_void_std__exception_ptr(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_std__exception_ptr create_Func_void_std__exception_ptr(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_std__exception_ptr::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const std::exception_ptr& error) mutable -> void {
       swiftClosure.call(error);
@@ -31,11 +31,11 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::shared_ptr<HybridRNGoogleMapsPlusModuleSpec>
-  std::shared_ptr<HybridRNGoogleMapsPlusModuleSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(void* _Nonnull swiftUnsafePointer) noexcept {
+  std::shared_ptr<HybridRNGoogleMapsPlusModuleSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
     RNGoogleMapsPlus::HybridRNGoogleMapsPlusModuleSpec_cxx swiftPart = RNGoogleMapsPlus::HybridRNGoogleMapsPlusModuleSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rngooglemapsplus::HybridRNGoogleMapsPlusModuleSpecSwift>(swiftPart);
   }
-  void* _Nonnull get_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_ cppType) noexcept {
+  void* NON_NULL get_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_ cppType) {
     std::shared_ptr<margelo::nitro::rngooglemapsplus::HybridRNGoogleMapsPlusModuleSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::rngooglemapsplus::HybridRNGoogleMapsPlusModuleSpecSwift>(cppType);
     #ifdef NITRO_DEBUG
     if (swiftWrapper == nullptr) [[unlikely]] {
@@ -47,7 +47,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::function<void(RNMapErrorCode /* error */)>
-  Func_void_RNMapErrorCode create_Func_void_RNMapErrorCode(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_RNMapErrorCode create_Func_void_RNMapErrorCode(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNMapErrorCode::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](RNMapErrorCode error) mutable -> void {
       swiftClosure.call(static_cast<int>(error));
@@ -55,7 +55,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::function<void(bool /* ready */)>
-  Func_void_bool create_Func_void_bool(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_bool::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](bool ready) mutable -> void {
       swiftClosure.call(ready);
@@ -63,7 +63,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::function<void(const RNLocation& /* location */)>
-  Func_void_RNLocation create_Func_void_RNLocation(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_RNLocation create_Func_void_RNLocation(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNLocation::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const RNLocation& location) mutable -> void {
       swiftClosure.call(location);
@@ -71,7 +71,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::function<void(RNLocationErrorCode /* error */)>
-  Func_void_RNLocationErrorCode create_Func_void_RNLocationErrorCode(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_RNLocationErrorCode create_Func_void_RNLocationErrorCode(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNLocationErrorCode::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](RNLocationErrorCode error) mutable -> void {
       swiftClosure.call(static_cast<int>(error));
@@ -79,7 +79,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::function<void(const RNLatLng& /* coordinate */)>
-  Func_void_RNLatLng create_Func_void_RNLatLng(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_RNLatLng create_Func_void_RNLatLng(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNLatLng::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const RNLatLng& coordinate) mutable -> void {
       swiftClosure.call(coordinate);
@@ -87,7 +87,7 @@ 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* _Nonnull swiftClosureWrapper) noexcept {
+  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 {
       swiftClosure.call(id);
@@ -95,7 +95,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // 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 {
+  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 {
       swiftClosure.call(id, location);
@@ -103,7 +103,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>
-  Func_void_RNIndoorBuilding create_Func_void_RNIndoorBuilding(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_RNIndoorBuilding create_Func_void_RNIndoorBuilding(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNIndoorBuilding::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const RNIndoorBuilding& indoorBuilding) mutable -> void {
       swiftClosure.call(indoorBuilding);
@@ -111,7 +111,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::function<void(const RNIndoorLevel& /* indoorLevel */)>
-  Func_void_RNIndoorLevel create_Func_void_RNIndoorLevel(void* _Nonnull swiftClosureWrapper) noexcept {
+  Func_void_RNIndoorLevel create_Func_void_RNIndoorLevel(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNIndoorLevel::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const RNIndoorLevel& indoorLevel) mutable -> void {
       swiftClosure.call(indoorLevel);
@@ -119,7 +119,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // 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 {
+  Func_void_RNRegion_RNCamera_bool create_Func_void_RNRegion_RNCamera_bool(void* NON_NULL swiftClosureWrapper) noexcept {
     auto swiftClosure = RNGoogleMapsPlus::Func_void_RNRegion_RNCamera_bool::fromUnsafe(swiftClosureWrapper);
     return [swiftClosure = std::move(swiftClosure)](const RNRegion& region, const RNCamera& camera, bool isGesture) mutable -> void {
       swiftClosure.call(region, camera, isGesture);
@@ -127,11 +127,11 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   }
   
   // pragma MARK: std::shared_ptr<HybridRNGoogleMapsPlusViewSpec>
-  std::shared_ptr<HybridRNGoogleMapsPlusViewSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(void* _Nonnull swiftUnsafePointer) noexcept {
+  std::shared_ptr<HybridRNGoogleMapsPlusViewSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
     RNGoogleMapsPlus::HybridRNGoogleMapsPlusViewSpec_cxx swiftPart = RNGoogleMapsPlus::HybridRNGoogleMapsPlusViewSpec_cxx::fromUnsafe(swiftUnsafePointer);
     return std::make_shared<margelo::nitro::rngooglemapsplus::HybridRNGoogleMapsPlusViewSpecSwift>(swiftPart);
   }
-  void* _Nonnull get_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_ cppType) noexcept {
+  void* NON_NULL get_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_ cppType) {
     std::shared_ptr<margelo::nitro::rngooglemapsplus::HybridRNGoogleMapsPlusViewSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::rngooglemapsplus::HybridRNGoogleMapsPlusViewSpecSwift>(cppType);
     #ifdef NITRO_DEBUG
     if (swiftWrapper == nullptr) [[unlikely]] {

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

@@ -133,6 +133,7 @@ namespace RNGoogleMapsPlus { class HybridRNGoogleMapsPlusViewSpec_cxx; }
 #include "RNRegion.hpp"
 #include "RNSize.hpp"
 #include "RNUserInterfaceStyle.hpp"
+#include <NitroModules/FastVectorCopy.hpp>
 #include <NitroModules/Promise.hpp>
 #include <NitroModules/PromiseHolder.hpp>
 #include <NitroModules/Result.hpp>
@@ -208,7 +209,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(const RNLocationPermissionResult& /* result */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_RNLocationPermissionResult create_Func_void_RNLocationPermissionResult(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_RNLocationPermissionResult create_Func_void_RNLocationPermissionResult(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_RNLocationPermissionResult_Wrapper wrap_Func_void_RNLocationPermissionResult(Func_void_RNLocationPermissionResult value) noexcept {
     return Func_void_RNLocationPermissionResult_Wrapper(std::move(value));
   }
@@ -230,7 +231,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(const std::exception_ptr& /* error */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_std__exception_ptr create_Func_void_std__exception_ptr(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_std__exception_ptr create_Func_void_std__exception_ptr(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_std__exception_ptr_Wrapper wrap_Func_void_std__exception_ptr(Func_void_std__exception_ptr value) noexcept {
     return Func_void_std__exception_ptr_Wrapper(std::move(value));
   }
@@ -240,8 +241,8 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
    * Specialized version of `std::shared_ptr<HybridRNGoogleMapsPlusModuleSpec>`.
    */
   using std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_ = std::shared_ptr<HybridRNGoogleMapsPlusModuleSpec>;
-  std::shared_ptr<HybridRNGoogleMapsPlusModuleSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(void* _Nonnull swiftUnsafePointer) noexcept;
-  void* _Nonnull get_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_ cppType) noexcept;
+  std::shared_ptr<HybridRNGoogleMapsPlusModuleSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(void* NON_NULL swiftUnsafePointer) noexcept;
+  void* NON_NULL get_std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_(std__shared_ptr_HybridRNGoogleMapsPlusModuleSpec_ cppType);
   
   // pragma MARK: std::weak_ptr<HybridRNGoogleMapsPlusModuleSpec>
   using std__weak_ptr_HybridRNGoogleMapsPlusModuleSpec_ = std::weak_ptr<HybridRNGoogleMapsPlusModuleSpec>;
@@ -667,10 +668,11 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
    * Specialized version of `std::vector<double>`.
    */
   using std__vector_double_ = std::vector<double>;
-  inline std::vector<double> create_std__vector_double_(size_t size) noexcept {
-    std::vector<double> vector;
-    vector.reserve(size);
-    return vector;
+  inline std::vector<double> copy_std__vector_double_(const double* CONTIGUOUS_MEMORY NON_NULL data, size_t size) noexcept {
+    return margelo::nitro::FastVectorCopy<double>(data, size);
+  }
+  inline const double* CONTIGUOUS_MEMORY NON_NULL get_data_std__vector_double_(const std::vector<double>& vector) noexcept {
+    return vector.data();
   }
   
   // pragma MARK: std::optional<RNHeatmapGradient>
@@ -832,7 +834,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(RNMapErrorCode /* error */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_RNMapErrorCode create_Func_void_RNMapErrorCode(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_RNMapErrorCode create_Func_void_RNMapErrorCode(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_RNMapErrorCode_Wrapper wrap_Func_void_RNMapErrorCode(Func_void_RNMapErrorCode value) noexcept {
     return Func_void_RNMapErrorCode_Wrapper(std::move(value));
   }
@@ -869,7 +871,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(bool /* ready */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_bool create_Func_void_bool(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_bool_Wrapper wrap_Func_void_bool(Func_void_bool value) noexcept {
     return Func_void_bool_Wrapper(std::move(value));
   }
@@ -906,7 +908,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(const RNLocation& /* location */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_RNLocation create_Func_void_RNLocation(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_RNLocation create_Func_void_RNLocation(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_RNLocation_Wrapper wrap_Func_void_RNLocation(Func_void_RNLocation value) noexcept {
     return Func_void_RNLocation_Wrapper(std::move(value));
   }
@@ -943,7 +945,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(RNLocationErrorCode /* error */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_RNLocationErrorCode create_Func_void_RNLocationErrorCode(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_RNLocationErrorCode create_Func_void_RNLocationErrorCode(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_RNLocationErrorCode_Wrapper wrap_Func_void_RNLocationErrorCode(Func_void_RNLocationErrorCode value) noexcept {
     return Func_void_RNLocationErrorCode_Wrapper(std::move(value));
   }
@@ -980,7 +982,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(const RNLatLng& /* coordinate */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_RNLatLng create_Func_void_RNLatLng(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_RNLatLng create_Func_void_RNLatLng(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_RNLatLng_Wrapper wrap_Func_void_RNLatLng(Func_void_RNLatLng value) noexcept {
     return Func_void_RNLatLng_Wrapper(std::move(value));
   }
@@ -1017,7 +1019,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(const std::optional<std::string>& /* id */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_std__optional_std__string_ create_Func_void_std__optional_std__string_(void* _Nonnull swiftClosureWrapper) noexcept;
+  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));
   }
@@ -1054,7 +1056,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   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;
+  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));
   }
@@ -1102,7 +1104,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_RNIndoorBuilding create_Func_void_RNIndoorBuilding(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_RNIndoorBuilding create_Func_void_RNIndoorBuilding(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_RNIndoorBuilding_Wrapper wrap_Func_void_RNIndoorBuilding(Func_void_RNIndoorBuilding value) noexcept {
     return Func_void_RNIndoorBuilding_Wrapper(std::move(value));
   }
@@ -1139,7 +1141,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_RNIndoorLevel create_Func_void_RNIndoorLevel(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_RNIndoorLevel create_Func_void_RNIndoorLevel(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_RNIndoorLevel_Wrapper wrap_Func_void_RNIndoorLevel(Func_void_RNIndoorLevel value) noexcept {
     return Func_void_RNIndoorLevel_Wrapper(std::move(value));
   }
@@ -1176,7 +1178,7 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
   private:
     std::unique_ptr<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> _function;
   } SWIFT_NONCOPYABLE;
-  Func_void_RNRegion_RNCamera_bool create_Func_void_RNRegion_RNCamera_bool(void* _Nonnull swiftClosureWrapper) noexcept;
+  Func_void_RNRegion_RNCamera_bool create_Func_void_RNRegion_RNCamera_bool(void* NON_NULL swiftClosureWrapper) noexcept;
   inline Func_void_RNRegion_RNCamera_bool_Wrapper wrap_Func_void_RNRegion_RNCamera_bool(Func_void_RNRegion_RNCamera_bool value) noexcept {
     return Func_void_RNRegion_RNCamera_bool_Wrapper(std::move(value));
   }
@@ -1243,8 +1245,8 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
    * Specialized version of `std::shared_ptr<HybridRNGoogleMapsPlusViewSpec>`.
    */
   using std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_ = std::shared_ptr<HybridRNGoogleMapsPlusViewSpec>;
-  std::shared_ptr<HybridRNGoogleMapsPlusViewSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(void* _Nonnull swiftUnsafePointer) noexcept;
-  void* _Nonnull get_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_ cppType) noexcept;
+  std::shared_ptr<HybridRNGoogleMapsPlusViewSpec> create_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(void* NON_NULL swiftUnsafePointer) noexcept;
+  void* NON_NULL get_std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_(std__shared_ptr_HybridRNGoogleMapsPlusViewSpec_ cppType);
   
   // pragma MARK: std::weak_ptr<HybridRNGoogleMapsPlusViewSpec>
   using std__weak_ptr_HybridRNGoogleMapsPlusViewSpec_ = std::weak_ptr<HybridRNGoogleMapsPlusViewSpec>;

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

@@ -425,7 +425,7 @@ namespace margelo::nitro::rngooglemapsplus {
   public:
     // Methods
     inline void setCamera(const RNCamera& camera, std::optional<bool> animated, std::optional<double> durationMs) override {
-      auto __result = _swiftPart.setCamera(camera, animated, durationMs);
+      auto __result = _swiftPart.setCamera(std::forward<decltype(camera)>(camera), animated, durationMs);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
@@ -443,13 +443,13 @@ namespace margelo::nitro::rngooglemapsplus {
       }
     }
     inline void animateToBounds(const RNLatLngBounds& bounds, std::optional<double> padding, std::optional<double> durationMs, std::optional<bool> lockBounds) override {
-      auto __result = _swiftPart.animateToBounds(bounds, padding, durationMs, lockBounds);
+      auto __result = _swiftPart.animateToBounds(std::forward<decltype(bounds)>(bounds), padding, durationMs, lockBounds);
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }
     }
     inline std::shared_ptr<Promise<std::optional<std::string>>> snapshot(const RNSnapshotOptions& options) override {
-      auto __result = _swiftPart.snapshot(options);
+      auto __result = _swiftPart.snapshot(std::forward<decltype(options)>(options));
       if (__result.hasError()) [[unlikely]] {
         std::rethrow_exception(__result.error());
       }

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

@@ -119,14 +119,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.initialProps = { () -> RNInitialProps? in
-        if bridge.has_value_std__optional_RNInitialProps_(newValue) {
-          let __unwrapped = bridge.get_std__optional_RNInitialProps_(newValue)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      self.__implementation.initialProps = newValue.value
     }
   }
   
@@ -143,14 +136,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.uiSettings = { () -> RNMapUiSettings? in
-        if bridge.has_value_std__optional_RNMapUiSettings_(newValue) {
-          let __unwrapped = bridge.get_std__optional_RNMapUiSettings_(newValue)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      self.__implementation.uiSettings = newValue.value
     }
   }
   
@@ -276,14 +262,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.mapZoomConfig = { () -> RNMapZoomConfig? in
-        if bridge.has_value_std__optional_RNMapZoomConfig_(newValue) {
-          let __unwrapped = bridge.get_std__optional_RNMapZoomConfig_(newValue)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      self.__implementation.mapZoomConfig = newValue.value
     }
   }
   
@@ -300,14 +279,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.mapPadding = { () -> RNMapPadding? in
-        if bridge.has_value_std__optional_RNMapPadding_(newValue) {
-          let __unwrapped = bridge.get_std__optional_RNMapPadding_(newValue)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      self.__implementation.mapPadding = newValue.value
     }
   }
   
@@ -521,14 +493,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.locationConfig = { () -> RNLocationConfig? in
-        if bridge.has_value_std__optional_RNLocationConfig_(newValue) {
-          let __unwrapped = bridge.get_std__optional_RNLocationConfig_(newValue)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      self.__implementation.locationConfig = newValue.value
     }
   }
   
@@ -1133,14 +1098,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
   @inline(__always)
   public final func setCameraToCoordinates(coordinates: bridge.std__vector_RNLatLng_, padding: bridge.std__optional_RNMapPadding_, animated: bridge.std__optional_bool_, durationMs: bridge.std__optional_double_) -> bridge.Result_void_ {
     do {
-      try self.__implementation.setCameraToCoordinates(coordinates: coordinates.map({ __item in __item }), padding: { () -> RNMapPadding? in
-        if bridge.has_value_std__optional_RNMapPadding_(padding) {
-          let __unwrapped = bridge.get_std__optional_RNMapPadding_(padding)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }(), animated: animated.value, durationMs: durationMs.value)
+      try self.__implementation.setCameraToCoordinates(coordinates: coordinates.map({ __item in __item }), padding: padding.value, animated: animated.value, durationMs: durationMs.value)
       return bridge.create_Result_void_()
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()
@@ -1151,14 +1109,7 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
   @inline(__always)
   public final func setCameraBounds(bounds: bridge.std__optional_RNLatLngBounds_) -> bridge.Result_void_ {
     do {
-      try self.__implementation.setCameraBounds(bounds: { () -> RNLatLngBounds? in
-        if bridge.has_value_std__optional_RNLatLngBounds_(bounds) {
-          let __unwrapped = bridge.get_std__optional_RNLatLngBounds_(bounds)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }())
+      try self.__implementation.setCameraBounds(bounds: bounds.value)
       return bridge.create_Result_void_()
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()

package/nitrogen/generated/ios/swift/RNCamera.swift

@@ -49,14 +49,7 @@ public extension RNCamera {
   var center: RNLatLng? {
     @inline(__always)
     get {
-      return { () -> RNLatLng? in
-        if bridge.has_value_std__optional_RNLatLng_(self.__center) {
-          let __unwrapped = bridge.get_std__optional_RNLatLng_(self.__center)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__center.value
     }
     @inline(__always)
     set {

package/nitrogen/generated/ios/swift/RNHeatmap.swift

@@ -157,14 +157,7 @@ public extension RNHeatmap {
   var gradient: RNHeatmapGradient? {
     @inline(__always)
     get {
-      return { () -> RNHeatmapGradient? in
-        if bridge.has_value_std__optional_RNHeatmapGradient_(self.__gradient) {
-          let __unwrapped = bridge.get_std__optional_RNHeatmapGradient_(self.__gradient)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__gradient.value
     }
     @inline(__always)
     set {

package/nitrogen/generated/ios/swift/RNHeatmapGradient.swift

@@ -25,13 +25,9 @@ public extension RNHeatmapGradient {
         __vector.push_back(std.string(__item))
       }
       return __vector
-    }(), { () -> bridge.std__vector_double_ in
-      var __vector = bridge.create_std__vector_double_(startPoints.count)
-      for __item in startPoints {
-        __vector.push_back(__item)
-      }
-      return __vector
-    }(), colorMapSize)
+    }(), startPoints.withUnsafeBufferPointer { __pointer -> bridge.std__vector_double_ in
+      return bridge.copy_std__vector_double_(__pointer.baseAddress!, startPoints.count)
+    }, colorMapSize)
   }
 
   var colors: [String] {
@@ -54,17 +50,17 @@ public extension RNHeatmapGradient {
   var startPoints: [Double] {
     @inline(__always)
     get {
-      return self.__startPoints.map({ __item in __item })
+      return { () -> [Double] in
+        let __data = bridge.get_data_std__vector_double_(self.__startPoints)
+        let __size = self.__startPoints.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }()
     }
     @inline(__always)
     set {
-      self.__startPoints = { () -> bridge.std__vector_double_ in
-        var __vector = bridge.create_std__vector_double_(newValue.count)
-        for __item in newValue {
-          __vector.push_back(__item)
-        }
-        return __vector
-      }()
+      self.__startPoints = newValue.withUnsafeBufferPointer { __pointer -> bridge.std__vector_double_ in
+        return bridge.copy_std__vector_double_(__pointer.baseAddress!, newValue.count)
+      }
     }
   }
   

package/nitrogen/generated/ios/swift/RNInitialProps.swift

@@ -84,14 +84,7 @@ public extension RNInitialProps {
   var camera: RNCamera? {
     @inline(__always)
     get {
-      return { () -> RNCamera? in
-        if bridge.has_value_std__optional_RNCamera_(self.__camera) {
-          let __unwrapped = bridge.get_std__optional_RNCamera_(self.__camera)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__camera.value
     }
     @inline(__always)
     set {