react-native-google-maps-plus 1.7.0-dev.4 → 1.7.0-dev.5

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

@@ -2,6 +2,7 @@ package com.rngooglemapsplus
 
 import android.annotation.SuppressLint
 import android.graphics.Bitmap
+import android.location.Location
 import android.util.Base64
 import android.util.Size
 import android.widget.FrameLayout
@@ -67,6 +68,11 @@ class GoogleMapsViewImpl(
   GoogleMap.OnCircleClickListener,
   GoogleMap.OnMarkerDragListener,
   GoogleMap.OnIndoorStateChangeListener,
+  GoogleMap.OnInfoWindowClickListener,
+  GoogleMap.OnInfoWindowCloseListener,
+  GoogleMap.OnInfoWindowLongClickListener,
+  GoogleMap.OnMyLocationClickListener,
+  GoogleMap.OnMyLocationButtonClickListener,
   LifecycleEventListener {
   private var initialized = false
   private var destroyed = false
@@ -135,6 +141,11 @@ class GoogleMapsViewImpl(
         googleMap?.setOnMapLongClickListener(this@GoogleMapsViewImpl)
         googleMap?.setOnPoiClickListener(this@GoogleMapsViewImpl)
         googleMap?.setOnMarkerDragListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnInfoWindowClickListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnInfoWindowCloseListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnInfoWindowLongClickListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnMyLocationClickListener(this@GoogleMapsViewImpl)
+        googleMap?.setOnMyLocationButtonClickListener(this@GoogleMapsViewImpl)
         onMapLoaded?.invoke(true)
       }
       applyProps()
@@ -406,6 +417,11 @@ class GoogleMapsViewImpl(
   var onMarkerDragEnd: ((String?, RNLatLng) -> Unit)? = null
   var onIndoorBuildingFocused: ((RNIndoorBuilding) -> Unit)? = null
   var onIndoorLevelActivated: ((RNIndoorLevel) -> Unit)? = null
+  var onInfoWindowPress: ((String?) -> Unit)? = null
+  var onInfoWindowClose: ((String?) -> Unit)? = null
+  var onInfoWindowLongPress: ((String?) -> Unit)? = null
+  var onMyLocationPress: ((RNLocation) -> Unit)? = null
+  var onMyLocationButtonPress: ((Boolean) -> Unit)? = null
   var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
   var onCameraChange: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
   var onCameraChangeComplete: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
@@ -936,6 +952,11 @@ class GoogleMapsViewImpl(
         setOnMapLongClickListener(null)
         setOnPoiClickListener(null)
         setOnMarkerDragListener(null)
+        setOnInfoWindowClickListener(null)
+        setOnInfoWindowCloseListener(null)
+        setOnInfoWindowLongClickListener(null)
+        setOnMyLocationClickListener(null)
+        setOnMyLocationButtonClickListener(null)
       }
       googleMap = null
       mapView?.apply {
@@ -993,7 +1014,7 @@ class GoogleMapsViewImpl(
   override fun onMarkerClick(marker: Marker): Boolean {
     marker.showInfoWindow()
     onMarkerPress?.invoke(marker.tag?.toString())
-    return true
+    return false
   }
 
   override fun onPolylineClick(polyline: Polyline) {
@@ -1059,6 +1080,27 @@ class GoogleMapsViewImpl(
   override fun onPoiClick(poi: PointOfInterest) {
     onPoiPress?.invoke(poi.placeId, poi.name, poi.latLng.toRnLatLng())
   }
+
+  override fun onInfoWindowClick(marker: Marker) {
+    onInfoWindowPress?.invoke(marker.tag?.toString())
+  }
+
+  override fun onInfoWindowClose(marker: Marker) {
+    onInfoWindowClose?.invoke(marker.tag?.toString())
+  }
+
+  override fun onInfoWindowLongClick(marker: Marker) {
+    onInfoWindowLongPress?.invoke(marker.tag?.toString())
+  }
+
+  override fun onMyLocationClick(location: Location) {
+    onMyLocationPress?.invoke(location.toRnLocation())
+  }
+
+  override fun onMyLocationButtonClick(): Boolean {
+    onMyLocationButtonPress?.invoke(true)
+    return false
+  }
 }
 
 private inline fun onUi(crossinline block: () -> Unit) {

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

@@ -371,6 +371,31 @@ class RNGoogleMapsPlusView(
       view.onIndoorLevelActivated = cb
     }
 
+  override var onInfoWindowPress: ((String?) -> Unit)? = null
+    set(cb) {
+      view.onInfoWindowPress = cb
+    }
+
+  override var onInfoWindowClose: ((String?) -> Unit)? = null
+    set(cb) {
+      view.onInfoWindowClose = cb
+    }
+
+  override var onInfoWindowLongPress: ((String?) -> Unit)? = null
+    set(cb) {
+      view.onInfoWindowLongPress = cb
+    }
+
+  override var onMyLocationPress: ((RNLocation) -> Unit)? = null
+    set(cb) {
+      view.onMyLocationPress = cb
+    }
+
+  override var onMyLocationButtonPress: ((Boolean) -> Unit)? = null
+    set(cb) {
+      view.onMyLocationButtonPress = cb
+    }
+
   override var onCameraChangeStart: ((RNRegion, RNCamera, Boolean) -> Unit)? = null
     set(cb) {
       view.onCameraChangeStart = cb

package/ios/GoogleMapViewImpl.swift

@@ -277,6 +277,11 @@ GMSIndoorDisplayDelegate {
   var onMarkerDragEnd: ((String?, RNLatLng) -> Void)?
   var onIndoorBuildingFocused: ((RNIndoorBuilding) -> Void)?
   var onIndoorLevelActivated: ((RNIndoorLevel) -> Void)?
+  var onInfoWindowPress: ((String?) -> Void)?
+  var onInfoWindowClose: ((String?) -> Void)?
+  var onInfoWindowLongPress: ((String?) -> Void)?
+  var onMyLocationPress: ((RNLocation) -> Void)?
+  var onMyLocationButtonPress: ((Bool) -> Void)?
   var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)?
   var onCameraChange: ((RNRegion, RNCamera, Bool) -> Void)?
   var onCameraChangeComplete: ((RNRegion, RNCamera, Bool) -> Void)?
@@ -782,7 +787,7 @@ GMSIndoorDisplayDelegate {
       mapView.selectedMarker = marker
       self.onMarkerPress?(marker.userData as? String, )
     }
-    return true
+    return false
   }
 
   func mapView(_ mapView: GMSMapView, didTap overlay: GMSOverlay) {
@@ -855,4 +860,43 @@ GMSIndoorDisplayDelegate {
       )
     }
   }
+
+  func mapView(_ mapView: GMSMapView, didTapInfoWindowOf marker: GMSMarker) {
+    onMain {
+      self.onInfoWindowPress?(marker.userData as? String)
+    }
+  }
+
+  func mapView(_ mapView: GMSMapView, didCloseInfoWindowOf marker: GMSMarker) {
+    onMain {
+      self.onInfoWindowClose?(marker.userData as? String)
+    }
+  }
+
+  func mapView(
+    _ mapView: GMSMapView,
+    didLongPressInfoWindowOf marker: GMSMarker
+  ) {
+    onMain {
+      self.onInfoWindowLongPress?(marker.userData as? String)
+    }
+  }
+
+  func mapView(
+    _ mapView: GMSMapView,
+    didTapMyLocation location: CLLocationCoordinate2D
+  ) {
+    onMain {
+      self.mapView?.myLocation.map {
+        self.onMyLocationPress?($0.toRnLocation())
+      }
+    }
+  }
+
+  func didTapMyLocationButton(for mapView: GMSMapView) -> Bool {
+    onMain {
+      self.onMyLocationButtonPress?(true)
+    }
+    return false
+  }
 }

package/ios/RNGoogleMapsPlusView.swift

@@ -385,6 +385,26 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     didSet { impl.onIndoorLevelActivated = onIndoorLevelActivated }
   }
   @MainActor
+  var onInfoWindowPress: ((String?) -> Void)?{
+    didSet { impl.onInfoWindowPress = onInfoWindowPress }
+  }
+  @MainActor
+  var onInfoWindowClose: ((String?) -> Void)?{
+    didSet { impl.onInfoWindowClose = onInfoWindowClose }
+  }
+  @MainActor
+  var onInfoWindowLongPress: ((String?) -> Void)?{
+    didSet { impl.onInfoWindowLongPress = onInfoWindowLongPress }
+  }
+  @MainActor
+  var onMyLocationPress: ((RNLocation) -> Void)?{
+    didSet { impl.onMyLocationPress = onMyLocationPress }
+  }
+  @MainActor
+  var onMyLocationButtonPress: ((Bool) -> Void)? {
+    didSet { impl.onMyLocationButtonPress = onMyLocationButtonPress }
+  }
+  @MainActor
   var onCameraChangeStart: ((RNRegion, RNCamera, Bool) -> Void)? {
     didSet { impl.onCameraChangeStart = onCameraChangeStart }
   }

package/lib/nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json

@@ -40,6 +40,11 @@
     "onMarkerDragEnd": true,
     "onIndoorBuildingFocused": true,
     "onIndoorLevelActivated": true,
+    "onInfoWindowPress": true,
+    "onInfoWindowClose": true,
+    "onInfoWindowLongPress": true,
+    "onMyLocationPress": true,
+    "onMyLocationButtonPress": true,
     "onCameraChangeStart": true,
     "onCameraChange": true,
     "onCameraChangeComplete": true,

package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts

@@ -37,6 +37,11 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
     onMarkerDragEnd?: (id: string | undefined, location: RNLatLng) => void;
     onIndoorBuildingFocused?: (indoorBuilding: RNIndoorBuilding) => void;
     onIndoorLevelActivated?: (indoorLevel: RNIndoorLevel) => void;
+    onInfoWindowPress?: (id?: string) => void;
+    onInfoWindowClose?: (id?: string) => void;
+    onInfoWindowLongPress?: (id?: string) => void;
+    onMyLocationPress?: (location: RNLocation) => void;
+    onMyLocationButtonPress?: (pressed: boolean) => void;
     onCameraChangeStart?: (region: RNRegion, camera: RNCamera, isGesture: boolean) => void;
     onCameraChange?: (region: RNRegion, camera: RNCamera, isGesture: boolean) => void;
     onCameraChangeComplete?: (region: RNRegion, camera: RNCamera, isGesture: boolean) => void;

package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}

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

@@ -834,6 +834,101 @@ namespace margelo::nitro::rngooglemapsplus {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNIndoorLevel::javaobject> /* onIndoorLevelActivated */)>("setOnIndoorLevelActivated_cxx");
     method(_javaPart, onIndoorLevelActivated.has_value() ? JFunc_void_RNIndoorLevel_cxx::fromCpp(onIndoorLevelActivated.value()) : nullptr);
   }
+  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnInfoWindowPress_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](std::optional<std::string> id) -> void {
+          return __resultRef->invoke(id);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onInfoWindowPress */)>("setOnInfoWindowPress_cxx");
+    method(_javaPart, onInfoWindowPress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onInfoWindowPress.value()) : nullptr);
+  }
+  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowClose() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnInfoWindowClose_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](std::optional<std::string> id) -> void {
+          return __resultRef->invoke(id);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowClose(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowClose) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onInfoWindowClose */)>("setOnInfoWindowClose_cxx");
+    method(_javaPart, onInfoWindowClose.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onInfoWindowClose.value()) : nullptr);
+  }
+  std::optional<std::function<void(const std::optional<std::string>& /* id */)>> JHybridRNGoogleMapsPlusViewSpec::getOnInfoWindowLongPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_std__optional_std__string_::javaobject>()>("getOnInfoWindowLongPress_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const std::optional<std::string>& /* id */)> {
+      if (__result->isInstanceOf(JFunc_void_std__optional_std__string__cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_std__optional_std__string__cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](std::optional<std::string> id) -> void {
+          return __resultRef->invoke(id);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnInfoWindowLongPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowLongPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_std__string_::javaobject> /* onInfoWindowLongPress */)>("setOnInfoWindowLongPress_cxx");
+    method(_javaPart, onInfoWindowLongPress.has_value() ? JFunc_void_std__optional_std__string__cxx::fromCpp(onInfoWindowLongPress.value()) : nullptr);
+  }
+  std::optional<std::function<void(const RNLocation& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMyLocationPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNLocation::javaobject>()>("getOnMyLocationPress_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNLocation& /* location */)> {
+      if (__result->isInstanceOf(JFunc_void_RNLocation_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_RNLocation_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](RNLocation location) -> void {
+          return __resultRef->invoke(location);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNLocation::javaobject> /* onMyLocationPress */)>("setOnMyLocationPress_cxx");
+    method(_javaPart, onMyLocationPress.has_value() ? JFunc_void_RNLocation_cxx::fromCpp(onMyLocationPress.value()) : nullptr);
+  }
+  std::optional<std::function<void(bool /* pressed */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMyLocationButtonPress() {
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_bool::javaobject>()>("getOnMyLocationButtonPress_cxx");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(bool /* pressed */)> {
+      if (__result->isInstanceOf(JFunc_void_bool_cxx::javaClassStatic())) [[likely]] {
+        auto downcast = jni::static_ref_cast<JFunc_void_bool_cxx::javaobject>(__result);
+        return downcast->cthis()->getFunction();
+      } else {
+        auto __resultRef = jni::make_global(__result);
+        return [__resultRef](bool pressed) -> void {
+          return __resultRef->invoke(pressed);
+        };
+      }
+    }()) : std::nullopt;
+  }
+  void JHybridRNGoogleMapsPlusViewSpec::setOnMyLocationButtonPress(const std::optional<std::function<void(bool /* pressed */)>>& onMyLocationButtonPress) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* onMyLocationButtonPress */)>("setOnMyLocationButtonPress_cxx");
+    method(_javaPart, onMyLocationButtonPress.has_value() ? JFunc_void_bool_cxx::fromCpp(onMyLocationButtonPress.value()) : nullptr);
+  }
   std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCameraChangeStart() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNRegion_RNCamera_bool::javaobject>()>("getOnCameraChangeStart_cxx");
     auto __result = method(_javaPart);

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

@@ -121,6 +121,16 @@ namespace margelo::nitro::rngooglemapsplus {
     void setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>& onIndoorBuildingFocused) override;
     std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> getOnIndoorLevelActivated() override;
     void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowPress() override;
+    void setOnInfoWindowPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowPress) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowClose() override;
+    void setOnInfoWindowClose(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowClose) override;
+    std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowLongPress() override;
+    void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowLongPress) override;
+    std::optional<std::function<void(const RNLocation& /* location */)>> getOnMyLocationPress() override;
+    void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) override;
+    std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() override;
+    void setOnMyLocationButtonPress(const std::optional<std::function<void(bool /* pressed */)>>& onMyLocationButtonPress) override;
     std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() override;
     void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) override;
     std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChange() override;

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

@@ -180,6 +180,26 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     view->setOnIndoorLevelActivated(props.onIndoorLevelActivated.value);
     // TODO: Set isDirty = false
   }
+  if (props.onInfoWindowPress.isDirty) {
+    view->setOnInfoWindowPress(props.onInfoWindowPress.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onInfoWindowClose.isDirty) {
+    view->setOnInfoWindowClose(props.onInfoWindowClose.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onInfoWindowLongPress.isDirty) {
+    view->setOnInfoWindowLongPress(props.onInfoWindowLongPress.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onMyLocationPress.isDirty) {
+    view->setOnMyLocationPress(props.onMyLocationPress.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onMyLocationButtonPress.isDirty) {
+    view->setOnMyLocationButtonPress(props.onMyLocationButtonPress.value);
+    // TODO: Set isDirty = false
+  }
   if (props.onCameraChangeStart.isDirty) {
     view->setOnCameraChangeStart(props.onCameraChangeStart.value);
     // TODO: Set isDirty = false

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

@@ -390,6 +390,76 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onIndoorLevelActivated = value?.let { it }
     }
   
+  abstract var onInfoWindowPress: ((id: String?) -> Unit)?
+  
+  private var onInfoWindowPress_cxx: Func_void_std__optional_std__string_?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onInfoWindowPress?.let { Func_void_std__optional_std__string__java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onInfoWindowPress = value?.let { it }
+    }
+  
+  abstract var onInfoWindowClose: ((id: String?) -> Unit)?
+  
+  private var onInfoWindowClose_cxx: Func_void_std__optional_std__string_?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onInfoWindowClose?.let { Func_void_std__optional_std__string__java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onInfoWindowClose = value?.let { it }
+    }
+  
+  abstract var onInfoWindowLongPress: ((id: String?) -> Unit)?
+  
+  private var onInfoWindowLongPress_cxx: Func_void_std__optional_std__string_?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onInfoWindowLongPress?.let { Func_void_std__optional_std__string__java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onInfoWindowLongPress = value?.let { it }
+    }
+  
+  abstract var onMyLocationPress: ((location: RNLocation) -> Unit)?
+  
+  private var onMyLocationPress_cxx: Func_void_RNLocation?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onMyLocationPress?.let { Func_void_RNLocation_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onMyLocationPress = value?.let { it }
+    }
+  
+  abstract var onMyLocationButtonPress: ((pressed: Boolean) -> Unit)?
+  
+  private var onMyLocationButtonPress_cxx: Func_void_bool?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onMyLocationButtonPress?.let { Func_void_bool_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onMyLocationButtonPress = value?.let { it }
+    }
+  
   abstract var onCameraChangeStart: ((region: RNRegion, camera: RNCamera, isGesture: Boolean) -> Unit)?
   
   private var onCameraChangeStart_cxx: Func_void_RNRegion_RNCamera_bool?

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

@@ -1278,6 +1278,21 @@ namespace margelo::nitro::rngooglemapsplus::bridge::swift {
     return *optional;
   }
   
+  // pragma MARK: std::optional<std::function<void(bool /* pressed */)>>
+  /**
+   * Specialized version of `std::optional<std::function<void(bool / * pressed * /)>>`.
+   */
+  using std__optional_std__function_void_bool____pressed______ = std::optional<std::function<void(bool /* pressed */)>>;
+  inline std::optional<std::function<void(bool /* pressed */)>> create_std__optional_std__function_void_bool____pressed______(const std::function<void(bool /* pressed */)>& value) noexcept {
+    return std::optional<std::function<void(bool /* pressed */)>>(value);
+  }
+  inline bool has_value_std__optional_std__function_void_bool____pressed______(const std::optional<std::function<void(bool /* pressed */)>>& optional) noexcept {
+    return optional.has_value();
+  }
+  inline std::function<void(bool /* pressed */)> get_std__optional_std__function_void_bool____pressed______(const std::optional<std::function<void(bool /* pressed */)>>& optional) noexcept {
+    return *optional;
+  }
+  
   // pragma MARK: std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>
   /**
    * Specialized version of `std::function<void(const RNRegion&, const RNCamera&, bool)>`.

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

@@ -437,6 +437,41 @@ 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 {
+      auto __result = _swiftPart.getOnInfoWindowPress();
+      return __result;
+    }
+    inline void setOnInfoWindowPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowPress) noexcept override {
+      _swiftPart.setOnInfoWindowPress(onInfoWindowPress);
+    }
+    inline std::optional<std::function<void(const std::optional<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 {
+      _swiftPart.setOnInfoWindowClose(onInfoWindowClose);
+    }
+    inline std::optional<std::function<void(const std::optional<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 {
+      _swiftPart.setOnInfoWindowLongPress(onInfoWindowLongPress);
+    }
+    inline std::optional<std::function<void(const RNLocation& /* location */)>> getOnMyLocationPress() noexcept override {
+      auto __result = _swiftPart.getOnMyLocationPress();
+      return __result;
+    }
+    inline void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) noexcept override {
+      _swiftPart.setOnMyLocationPress(onMyLocationPress);
+    }
+    inline std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() noexcept override {
+      auto __result = _swiftPart.getOnMyLocationButtonPress();
+      return __result;
+    }
+    inline void setOnMyLocationButtonPress(const std::optional<std::function<void(bool /* pressed */)>>& onMyLocationButtonPress) noexcept override {
+      _swiftPart.setOnMyLocationButtonPress(onMyLocationButtonPress);
+    }
     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

@@ -266,6 +266,31 @@ using namespace margelo::nitro::rngooglemapsplus::views;
     swiftPart.setOnIndoorLevelActivated(newViewProps.onIndoorLevelActivated.value);
     newViewProps.onIndoorLevelActivated.isDirty = false;
   }
+  // onInfoWindowPress: optional
+  if (newViewProps.onInfoWindowPress.isDirty) {
+    swiftPart.setOnInfoWindowPress(newViewProps.onInfoWindowPress.value);
+    newViewProps.onInfoWindowPress.isDirty = false;
+  }
+  // onInfoWindowClose: optional
+  if (newViewProps.onInfoWindowClose.isDirty) {
+    swiftPart.setOnInfoWindowClose(newViewProps.onInfoWindowClose.value);
+    newViewProps.onInfoWindowClose.isDirty = false;
+  }
+  // onInfoWindowLongPress: optional
+  if (newViewProps.onInfoWindowLongPress.isDirty) {
+    swiftPart.setOnInfoWindowLongPress(newViewProps.onInfoWindowLongPress.value);
+    newViewProps.onInfoWindowLongPress.isDirty = false;
+  }
+  // onMyLocationPress: optional
+  if (newViewProps.onMyLocationPress.isDirty) {
+    swiftPart.setOnMyLocationPress(newViewProps.onMyLocationPress.value);
+    newViewProps.onMyLocationPress.isDirty = false;
+  }
+  // onMyLocationButtonPress: optional
+  if (newViewProps.onMyLocationButtonPress.isDirty) {
+    swiftPart.setOnMyLocationButtonPress(newViewProps.onMyLocationButtonPress.value);
+    newViewProps.onMyLocationButtonPress.isDirty = false;
+  }
   // onCameraChangeStart: optional
   if (newViewProps.onCameraChangeStart.isDirty) {
     swiftPart.setOnCameraChangeStart(newViewProps.onCameraChangeStart.value);

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

@@ -47,6 +47,11 @@ public protocol HybridRNGoogleMapsPlusViewSpec_protocol: HybridObject, HybridVie
   var onMarkerDragEnd: ((_ id: String?, _ location: RNLatLng) -> Void)? { get set }
   var onIndoorBuildingFocused: ((_ indoorBuilding: RNIndoorBuilding) -> Void)? { get set }
   var onIndoorLevelActivated: ((_ indoorLevel: RNIndoorLevel) -> Void)? { get set }
+  var onInfoWindowPress: ((_ id: String?) -> Void)? { get set }
+  var onInfoWindowClose: ((_ id: String?) -> Void)? { get set }
+  var onInfoWindowLongPress: ((_ id: String?) -> Void)? { get set }
+  var onMyLocationPress: ((_ location: RNLocation) -> Void)? { get set }
+  var onMyLocationButtonPress: ((_ pressed: Bool) -> 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

@@ -1141,6 +1141,184 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
     }
   }
   
+  public final var onInfoWindowPress: bridge.std__optional_std__function_void_const_std__optional_std__string______id______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id______ in
+        if let __unwrappedValue = self.__implementation.onInfoWindowPress {
+          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()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onInfoWindowPress = { () -> ((_ 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 onInfoWindowClose: bridge.std__optional_std__function_void_const_std__optional_std__string______id______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id______ in
+        if let __unwrappedValue = self.__implementation.onInfoWindowClose {
+          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()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onInfoWindowClose = { () -> ((_ 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 onInfoWindowLongPress: bridge.std__optional_std__function_void_const_std__optional_std__string______id______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_const_std__optional_std__string______id______ in
+        if let __unwrappedValue = self.__implementation.onInfoWindowLongPress {
+          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()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onInfoWindowLongPress = { () -> ((_ 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 onMyLocationPress: bridge.std__optional_std__function_void_const_RNLocation_____location______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_const_RNLocation_____location______ in
+        if let __unwrappedValue = self.__implementation.onMyLocationPress {
+          return bridge.create_std__optional_std__function_void_const_RNLocation_____location______({ () -> bridge.Func_void_RNLocation in
+            let __closureWrapper = Func_void_RNLocation(__unwrappedValue)
+            return bridge.create_Func_void_RNLocation(__closureWrapper.toUnsafe())
+          }())
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onMyLocationPress = { () -> ((_ location: RNLocation) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_const_RNLocation_____location______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_const_RNLocation_____location______(newValue)
+          return { () -> (RNLocation) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_RNLocation(__unwrapped)
+            return { (__location: RNLocation) -> Void in
+              __wrappedFunction.call(__location)
+            }
+          }()
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
+  public final var onMyLocationButtonPress: bridge.std__optional_std__function_void_bool____pressed______ {
+    @inline(__always)
+    get {
+      return { () -> bridge.std__optional_std__function_void_bool____pressed______ in
+        if let __unwrappedValue = self.__implementation.onMyLocationButtonPress {
+          return bridge.create_std__optional_std__function_void_bool____pressed______({ () -> bridge.Func_void_bool in
+            let __closureWrapper = Func_void_bool(__unwrappedValue)
+            return bridge.create_Func_void_bool(__closureWrapper.toUnsafe())
+          }())
+        } else {
+          return .init()
+        }
+      }()
+    }
+    @inline(__always)
+    set {
+      self.__implementation.onMyLocationButtonPress = { () -> ((_ pressed: Bool) -> Void)? in
+        if bridge.has_value_std__optional_std__function_void_bool____pressed______(newValue) {
+          let __unwrapped = bridge.get_std__optional_std__function_void_bool____pressed______(newValue)
+          return { () -> (Bool) -> Void in
+            let __wrappedFunction = bridge.wrap_Func_void_bool(__unwrapped)
+            return { (__pressed: Bool) -> Void in
+              __wrappedFunction.call(__pressed)
+            }
+          }()
+        } else {
+          return nil
+        }
+      }()
+    }
+  }
+  
   public final var onCameraChangeStart: bridge.std__optional_std__function_void_const_RNRegion_____region_____const_RNCamera_____camera_____bool____isGesture______ {
     @inline(__always)
     get {

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

@@ -86,6 +86,16 @@ namespace margelo::nitro::rngooglemapsplus {
       prototype.registerHybridSetter("onIndoorBuildingFocused", &HybridRNGoogleMapsPlusViewSpec::setOnIndoorBuildingFocused);
       prototype.registerHybridGetter("onIndoorLevelActivated", &HybridRNGoogleMapsPlusViewSpec::getOnIndoorLevelActivated);
       prototype.registerHybridSetter("onIndoorLevelActivated", &HybridRNGoogleMapsPlusViewSpec::setOnIndoorLevelActivated);
+      prototype.registerHybridGetter("onInfoWindowPress", &HybridRNGoogleMapsPlusViewSpec::getOnInfoWindowPress);
+      prototype.registerHybridSetter("onInfoWindowPress", &HybridRNGoogleMapsPlusViewSpec::setOnInfoWindowPress);
+      prototype.registerHybridGetter("onInfoWindowClose", &HybridRNGoogleMapsPlusViewSpec::getOnInfoWindowClose);
+      prototype.registerHybridSetter("onInfoWindowClose", &HybridRNGoogleMapsPlusViewSpec::setOnInfoWindowClose);
+      prototype.registerHybridGetter("onInfoWindowLongPress", &HybridRNGoogleMapsPlusViewSpec::getOnInfoWindowLongPress);
+      prototype.registerHybridSetter("onInfoWindowLongPress", &HybridRNGoogleMapsPlusViewSpec::setOnInfoWindowLongPress);
+      prototype.registerHybridGetter("onMyLocationPress", &HybridRNGoogleMapsPlusViewSpec::getOnMyLocationPress);
+      prototype.registerHybridSetter("onMyLocationPress", &HybridRNGoogleMapsPlusViewSpec::setOnMyLocationPress);
+      prototype.registerHybridGetter("onMyLocationButtonPress", &HybridRNGoogleMapsPlusViewSpec::getOnMyLocationButtonPress);
+      prototype.registerHybridSetter("onMyLocationButtonPress", &HybridRNGoogleMapsPlusViewSpec::setOnMyLocationButtonPress);
       prototype.registerHybridGetter("onCameraChangeStart", &HybridRNGoogleMapsPlusViewSpec::getOnCameraChangeStart);
       prototype.registerHybridSetter("onCameraChangeStart", &HybridRNGoogleMapsPlusViewSpec::setOnCameraChangeStart);
       prototype.registerHybridGetter("onCameraChange", &HybridRNGoogleMapsPlusViewSpec::getOnCameraChange);

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

@@ -194,6 +194,16 @@ namespace margelo::nitro::rngooglemapsplus {
       virtual void setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>& onIndoorBuildingFocused) = 0;
       virtual std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> getOnIndoorLevelActivated() = 0;
       virtual void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) = 0;
+      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowPress() = 0;
+      virtual void setOnInfoWindowPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowPress) = 0;
+      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowClose() = 0;
+      virtual void setOnInfoWindowClose(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowClose) = 0;
+      virtual std::optional<std::function<void(const std::optional<std::string>& /* id */)>> getOnInfoWindowLongPress() = 0;
+      virtual void setOnInfoWindowLongPress(const std::optional<std::function<void(const std::optional<std::string>& /* id */)>>& onInfoWindowLongPress) = 0;
+      virtual std::optional<std::function<void(const RNLocation& /* location */)>> getOnMyLocationPress() = 0;
+      virtual void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) = 0;
+      virtual std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() = 0;
+      virtual void setOnMyLocationButtonPress(const std::optional<std::function<void(bool /* pressed */)>>& onMyLocationButtonPress) = 0;
       virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() = 0;
       virtual void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) = 0;
       virtual std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>> getOnCameraChange() = 0;

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

@@ -385,6 +385,56 @@ namespace margelo::nitro::rngooglemapsplus::views {
         throw std::runtime_error(std::string("RNGoogleMapsPlusView.onIndoorLevelActivated: ") + exc.what());
       }
     }()),
+    onInfoWindowPress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("onInfoWindowPress", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.onInfoWindowPress;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowPress);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("RNGoogleMapsPlusView.onInfoWindowPress: ") + exc.what());
+      }
+    }()),
+    onInfoWindowClose([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("onInfoWindowClose", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.onInfoWindowClose;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowClose);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("RNGoogleMapsPlusView.onInfoWindowClose: ") + exc.what());
+      }
+    }()),
+    onInfoWindowLongPress([&]() -> CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("onInfoWindowLongPress", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.onInfoWindowLongPress;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onInfoWindowLongPress);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("RNGoogleMapsPlusView.onInfoWindowLongPress: ") + exc.what());
+      }
+    }()),
+    onMyLocationPress([&]() -> CachedProp<std::optional<std::function<void(const RNLocation& /* location */)>>> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("onMyLocationPress", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.onMyLocationPress;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<std::optional<std::function<void(const RNLocation& /* location */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMyLocationPress);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMyLocationPress: ") + exc.what());
+      }
+    }()),
+    onMyLocationButtonPress([&]() -> CachedProp<std::optional<std::function<void(bool /* pressed */)>>> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("onMyLocationButtonPress", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.onMyLocationButtonPress;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<std::optional<std::function<void(bool /* pressed */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.onMyLocationButtonPress);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("RNGoogleMapsPlusView.onMyLocationButtonPress: ") + exc.what());
+      }
+    }()),
     onCameraChangeStart([&]() -> CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("onCameraChangeStart", nullptr, nullptr);
@@ -464,6 +514,11 @@ namespace margelo::nitro::rngooglemapsplus::views {
     onMarkerDragEnd(other.onMarkerDragEnd),
     onIndoorBuildingFocused(other.onIndoorBuildingFocused),
     onIndoorLevelActivated(other.onIndoorLevelActivated),
+    onInfoWindowPress(other.onInfoWindowPress),
+    onInfoWindowClose(other.onInfoWindowClose),
+    onInfoWindowLongPress(other.onInfoWindowLongPress),
+    onMyLocationPress(other.onMyLocationPress),
+    onMyLocationButtonPress(other.onMyLocationButtonPress),
     onCameraChangeStart(other.onCameraChangeStart),
     onCameraChange(other.onCameraChange),
     onCameraChangeComplete(other.onCameraChangeComplete),
@@ -507,6 +562,11 @@ namespace margelo::nitro::rngooglemapsplus::views {
       case hashString("onMarkerDragEnd"): return true;
       case hashString("onIndoorBuildingFocused"): return true;
       case hashString("onIndoorLevelActivated"): return true;
+      case hashString("onInfoWindowPress"): return true;
+      case hashString("onInfoWindowClose"): return true;
+      case hashString("onInfoWindowLongPress"): return true;
+      case hashString("onMyLocationPress"): return true;
+      case hashString("onMyLocationButtonPress"): return true;
       case hashString("onCameraChangeStart"): return true;
       case hashString("onCameraChange"): return true;
       case hashString("onCameraChangeComplete"): return true;

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

@@ -102,6 +102,11 @@ namespace margelo::nitro::rngooglemapsplus::views {
     CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */, const RNLatLng& /* location */)>>> onMarkerDragEnd;
     CachedProp<std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>> onIndoorBuildingFocused;
     CachedProp<std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>> onIndoorLevelActivated;
+    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onInfoWindowPress;
+    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onInfoWindowClose;
+    CachedProp<std::optional<std::function<void(const std::optional<std::string>& /* id */)>>> onInfoWindowLongPress;
+    CachedProp<std::optional<std::function<void(const RNLocation& /* location */)>>> onMyLocationPress;
+    CachedProp<std::optional<std::function<void(bool /* pressed */)>>> onMyLocationButtonPress;
     CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> onCameraChangeStart;
     CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> onCameraChange;
     CachedProp<std::optional<std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>>> onCameraChangeComplete;

package/nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json

@@ -40,6 +40,11 @@
     "onMarkerDragEnd": true,
     "onIndoorBuildingFocused": true,
     "onIndoorLevelActivated": true,
+    "onInfoWindowPress": true,
+    "onInfoWindowClose": true,
+    "onInfoWindowLongPress": true,
+    "onMyLocationPress": true,
+    "onMyLocationButtonPress": true,
     "onCameraChangeStart": true,
     "onCameraChange": true,
     "onCameraChangeComplete": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.4",
+  "version": "1.7.0-dev.5",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",

package/src/RNGoogleMapsPlusView.nitro.ts

@@ -68,6 +68,11 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
   onMarkerDragEnd?: (id: string | undefined, location: RNLatLng) => void;
   onIndoorBuildingFocused?: (indoorBuilding: RNIndoorBuilding) => void;
   onIndoorLevelActivated?: (indoorLevel: RNIndoorLevel) => void;
+  onInfoWindowPress?: (id?: string) => void;
+  onInfoWindowClose?: (id?: string) => void;
+  onInfoWindowLongPress?: (id?: string) => void;
+  onMyLocationPress?: (location: RNLocation) => void;
+  onMyLocationButtonPress?: (pressed: boolean) => void;
   onCameraChangeStart?: (
     region: RNRegion,
     camera: RNCamera,