react-native-google-maps-plus 1.0.2 → 1.0.3-dev.1

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

@@ -0,0 +1,68 @@
+///
+/// JRNMapType.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include "RNMapType.hpp"
+
+namespace margelo::nitro::rngooglemapsplus {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ enum "RNMapType" and the the Kotlin enum "RNMapType".
+   */
+  struct JRNMapType final: public jni::JavaClass<JRNMapType> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/RNMapType;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based enum to the C++ enum RNMapType.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    RNMapType toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldOrdinal = clazz->getField<int>("value");
+      int ordinal = this->getFieldValue(fieldOrdinal);
+      return static_cast<RNMapType>(ordinal);
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based enum with the given C++ enum's value.
+     */
+    [[maybe_unused]]
+    static jni::alias_ref<JRNMapType> fromCpp(RNMapType value) {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldNONE = clazz->getStaticField<JRNMapType>("NONE");
+      static const auto fieldNORMAL = clazz->getStaticField<JRNMapType>("NORMAL");
+      static const auto fieldHYBRID = clazz->getStaticField<JRNMapType>("HYBRID");
+      static const auto fieldSATELLITE = clazz->getStaticField<JRNMapType>("SATELLITE");
+      static const auto fieldTERRAIN = clazz->getStaticField<JRNMapType>("TERRAIN");
+      
+      switch (value) {
+        case RNMapType::NONE:
+          return clazz->getStaticFieldValue(fieldNONE);
+        case RNMapType::NORMAL:
+          return clazz->getStaticFieldValue(fieldNORMAL);
+        case RNMapType::HYBRID:
+          return clazz->getStaticFieldValue(fieldHYBRID);
+        case RNMapType::SATELLITE:
+          return clazz->getStaticFieldValue(fieldSATELLITE);
+        case RNMapType::TERRAIN:
+          return clazz->getStaticFieldValue(fieldTERRAIN);
+        default:
+          std::string stringValue = std::to_string(static_cast<int>(value));
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
+      }
+    }
+  };
+
+} // namespace margelo::nitro::rngooglemapsplus

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

@@ -38,8 +38,8 @@ namespace margelo::nitro::rngooglemapsplus {
       static const auto clazz = javaClassStatic();
       static const auto fieldId = clazz->getField<jni::JString>("id");
       jni::local_ref<jni::JString> id = this->getFieldValue(fieldId);
-      static const auto fieldZIndex = clazz->getField<double>("zIndex");
-      double zIndex = this->getFieldValue(fieldZIndex);
+      static const auto fieldZIndex = clazz->getField<jni::JDouble>("zIndex");
+      jni::local_ref<jni::JDouble> zIndex = this->getFieldValue(fieldZIndex);
       static const auto fieldCoordinate = clazz->getField<JRNLatLng>("coordinate");
       jni::local_ref<JRNLatLng> coordinate = this->getFieldValue(fieldCoordinate);
       static const auto fieldAnchor = clazz->getField<JRNPosition>("anchor");
@@ -52,7 +52,7 @@ namespace margelo::nitro::rngooglemapsplus {
       jni::local_ref<jni::JString> iconSvg = this->getFieldValue(fieldIconSvg);
       return RNMarker(
         id->toStdString(),
-        zIndex,
+        zIndex != nullptr ? std::make_optional(zIndex->value()) : std::nullopt,
         coordinate->toCpp(),
         anchor != nullptr ? std::make_optional(anchor->toCpp()) : std::nullopt,
         width,
@@ -69,7 +69,7 @@ namespace margelo::nitro::rngooglemapsplus {
     static jni::local_ref<JRNMarker::javaobject> fromCpp(const RNMarker& value) {
       return newInstance(
         jni::make_jstring(value.id),
-        value.zIndex,
+        value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
         JRNLatLng::fromCpp(value.coordinate),
         value.anchor.has_value() ? JRNPosition::fromCpp(value.anchor.value()) : nullptr,
         value.width,

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

@@ -37,8 +37,10 @@ namespace margelo::nitro::rngooglemapsplus {
       static const auto clazz = javaClassStatic();
       static const auto fieldId = clazz->getField<jni::JString>("id");
       jni::local_ref<jni::JString> id = this->getFieldValue(fieldId);
-      static const auto fieldZIndex = clazz->getField<double>("zIndex");
-      double zIndex = this->getFieldValue(fieldZIndex);
+      static const auto fieldZIndex = clazz->getField<jni::JDouble>("zIndex");
+      jni::local_ref<jni::JDouble> zIndex = this->getFieldValue(fieldZIndex);
+      static const auto fieldPressable = clazz->getField<jni::JBoolean>("pressable");
+      jni::local_ref<jni::JBoolean> pressable = this->getFieldValue(fieldPressable);
       static const auto fieldCoordinates = clazz->getField<jni::JArrayClass<JRNLatLng>>("coordinates");
       jni::local_ref<jni::JArrayClass<JRNLatLng>> coordinates = this->getFieldValue(fieldCoordinates);
       static const auto fieldFillColor = clazz->getField<jni::JString>("fillColor");
@@ -49,7 +51,8 @@ namespace margelo::nitro::rngooglemapsplus {
       jni::local_ref<jni::JDouble> strokeWidth = this->getFieldValue(fieldStrokeWidth);
       return RNPolygon(
         id->toStdString(),
-        zIndex,
+        zIndex != nullptr ? std::make_optional(zIndex->value()) : std::nullopt,
+        pressable != nullptr ? std::make_optional(static_cast<bool>(pressable->value())) : std::nullopt,
         [&]() {
           size_t __size = coordinates->size();
           std::vector<RNLatLng> __vector;
@@ -74,7 +77,8 @@ namespace margelo::nitro::rngooglemapsplus {
     static jni::local_ref<JRNPolygon::javaobject> fromCpp(const RNPolygon& value) {
       return newInstance(
         jni::make_jstring(value.id),
-        value.zIndex,
+        value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
+        value.pressable.has_value() ? jni::JBoolean::valueOf(value.pressable.value()) : nullptr,
         [&]() {
           size_t __size = value.coordinates.size();
           jni::local_ref<jni::JArrayClass<JRNLatLng>> __array = jni::JArrayClass<JRNLatLng>::newArray(__size);

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

@@ -41,8 +41,10 @@ namespace margelo::nitro::rngooglemapsplus {
       static const auto clazz = javaClassStatic();
       static const auto fieldId = clazz->getField<jni::JString>("id");
       jni::local_ref<jni::JString> id = this->getFieldValue(fieldId);
-      static const auto fieldZIndex = clazz->getField<double>("zIndex");
-      double zIndex = this->getFieldValue(fieldZIndex);
+      static const auto fieldZIndex = clazz->getField<jni::JDouble>("zIndex");
+      jni::local_ref<jni::JDouble> zIndex = this->getFieldValue(fieldZIndex);
+      static const auto fieldPressable = clazz->getField<jni::JBoolean>("pressable");
+      jni::local_ref<jni::JBoolean> pressable = this->getFieldValue(fieldPressable);
       static const auto fieldCoordinates = clazz->getField<jni::JArrayClass<JRNLatLng>>("coordinates");
       jni::local_ref<jni::JArrayClass<JRNLatLng>> coordinates = this->getFieldValue(fieldCoordinates);
       static const auto fieldLineCap = clazz->getField<JRNLineCapType>("lineCap");
@@ -55,7 +57,8 @@ namespace margelo::nitro::rngooglemapsplus {
       jni::local_ref<jni::JDouble> width = this->getFieldValue(fieldWidth);
       return RNPolyline(
         id->toStdString(),
-        zIndex,
+        zIndex != nullptr ? std::make_optional(zIndex->value()) : std::nullopt,
+        pressable != nullptr ? std::make_optional(static_cast<bool>(pressable->value())) : std::nullopt,
         [&]() {
           size_t __size = coordinates->size();
           std::vector<RNLatLng> __vector;
@@ -81,7 +84,8 @@ namespace margelo::nitro::rngooglemapsplus {
     static jni::local_ref<JRNPolyline::javaobject> fromCpp(const RNPolyline& value) {
       return newInstance(
         jni::make_jstring(value.id),
-        value.zIndex,
+        value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
+        value.pressable.has_value() ? jni::JBoolean::valueOf(value.pressable.value()) : nullptr,
         [&]() {
           size_t __size = value.coordinates.size();
           jni::local_ref<jni::JArrayClass<JRNLatLng>> __array = jni::JArrayClass<JRNLatLng>::newArray(__size);

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

@@ -36,6 +36,10 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     throw std::runtime_error("HybridRNGoogleMapsPlusViewState's data doesn't contain any props!");
   }
   const HybridRNGoogleMapsPlusViewProps& props = maybeProps.value();
+  if (props.initialProps.isDirty) {
+    view->setInitialProps(props.initialProps.value);
+    // TODO: Set isDirty = false
+  }
   if (props.buildingEnabled.isDirty) {
     view->setBuildingEnabled(props.buildingEnabled.value);
     // TODO: Set isDirty = false
@@ -48,10 +52,6 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     view->setCustomMapStyle(props.customMapStyle.value);
     // TODO: Set isDirty = false
   }
-  if (props.initialCamera.isDirty) {
-    view->setInitialCamera(props.initialCamera.value);
-    // TODO: Set isDirty = false
-  }
   if (props.userInterfaceStyle.isDirty) {
     view->setUserInterfaceStyle(props.userInterfaceStyle.value);
     // TODO: Set isDirty = false
@@ -68,6 +68,10 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     view->setMapPadding(props.mapPadding.value);
     // TODO: Set isDirty = false
   }
+  if (props.mapType.isDirty) {
+    view->setMapType(props.mapType.value);
+    // TODO: Set isDirty = false
+  }
   if (props.markers.isDirty) {
     view->setMarkers(props.markers.value);
     // TODO: Set isDirty = false
@@ -80,6 +84,10 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     view->setPolylines(props.polylines.value);
     // TODO: Set isDirty = false
   }
+  if (props.circles.isDirty) {
+    view->setCircles(props.circles.value);
+    // TODO: Set isDirty = false
+  }
   if (props.onMapError.isDirty) {
     view->setOnMapError(props.onMapError.value);
     // TODO: Set isDirty = false
@@ -104,6 +112,18 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     view->setOnMarkerPress(props.onMarkerPress.value);
     // TODO: Set isDirty = false
   }
+  if (props.onPolylinePress.isDirty) {
+    view->setOnPolylinePress(props.onPolylinePress.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onPolygonPress.isDirty) {
+    view->setOnPolygonPress(props.onPolygonPress.value);
+    // TODO: Set isDirty = false
+  }
+  if (props.onCirclePress.isDirty) {
+    view->setOnCirclePress(props.onCirclePress.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

@@ -42,67 +42,79 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var buildingEnabled: Boolean
+  abstract var initialProps: RNInitialProps?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var trafficEnabled: Boolean
+  abstract var buildingEnabled: Boolean?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var customMapStyle: String
+  abstract var trafficEnabled: Boolean?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var initialCamera: RNCamera
+  abstract var customMapStyle: String?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var userInterfaceStyle: RNUserInterfaceStyle
+  abstract var userInterfaceStyle: RNUserInterfaceStyle?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var minZoomLevel: Double
+  abstract var minZoomLevel: Double?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var maxZoomLevel: Double
+  abstract var maxZoomLevel: Double?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var mapPadding: RNMapPadding
+  abstract var mapPadding: RNMapPadding?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var markers: Array<RNMarker>
+  abstract var mapType: RNMapType?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var polygons: Array<RNPolygon>
+  abstract var markers: Array<RNMarker>?
   
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
   @set:Keep
-  abstract var polylines: Array<RNPolyline>
+  abstract var polygons: Array<RNPolygon>?
+  
+  @get:DoNotStrip
+  @get:Keep
+  @set:DoNotStrip
+  @set:Keep
+  abstract var polylines: Array<RNPolyline>?
+  
+  @get:DoNotStrip
+  @get:Keep
+  @set:DoNotStrip
+  @set:Keep
+  abstract var circles: Array<RNCircle>?
   
   abstract var onMapError: ((error: RNMapErrorCode) -> Unit)?
   
@@ -188,6 +200,48 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
       onMarkerPress = value?.let { it }
     }
   
+  abstract var onPolylinePress: ((id: String) -> Unit)?
+  
+  private var onPolylinePress_cxx: Func_void_std__string?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onPolylinePress?.let { Func_void_std__string_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onPolylinePress = value?.let { it }
+    }
+  
+  abstract var onPolygonPress: ((id: String) -> Unit)?
+  
+  private var onPolygonPress_cxx: Func_void_std__string?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onPolygonPress?.let { Func_void_std__string_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onPolygonPress = value?.let { it }
+    }
+  
+  abstract var onCirclePress: ((id: String) -> Unit)?
+  
+  private var onCirclePress_cxx: Func_void_std__string?
+    @Keep
+    @DoNotStrip
+    get() {
+      return onCirclePress?.let { Func_void_std__string_java(it) }
+    }
+    @Keep
+    @DoNotStrip
+    set(value) {
+      onCirclePress = value?.let { it }
+    }
+  
   abstract var onCameraChangeStart: ((region: RNRegion, camera: RNCamera, isGesture: Boolean) -> Unit)?
   
   private var onCameraChangeStart_cxx: Func_void_RNRegion_RNCamera_bool?

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

@@ -0,0 +1,50 @@
+///
+/// RNCircle.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+package com.rngooglemapsplus
+
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.*
+
+
+/**
+ * Represents the JavaScript object/struct "RNCircle".
+ */
+@DoNotStrip
+@Keep
+data class RNCircle
+  @DoNotStrip
+  @Keep
+  constructor(
+    @DoNotStrip
+    @Keep
+    val id: String,
+    @DoNotStrip
+    @Keep
+    val pressable: Boolean?,
+    @DoNotStrip
+    @Keep
+    val zIndex: Double?,
+    @DoNotStrip
+    @Keep
+    val center: RNLatLng,
+    @DoNotStrip
+    @Keep
+    val radius: Double?,
+    @DoNotStrip
+    @Keep
+    val strokeWidth: Double?,
+    @DoNotStrip
+    @Keep
+    val strokeColor: String?,
+    @DoNotStrip
+    @Keep
+    val fillColor: String?
+  ) {
+  /* main constructor */
+}

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

@@ -0,0 +1,35 @@
+///
+/// RNInitialProps.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+package com.rngooglemapsplus
+
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.*
+
+
+/**
+ * Represents the JavaScript object/struct "RNInitialProps".
+ */
+@DoNotStrip
+@Keep
+data class RNInitialProps
+  @DoNotStrip
+  @Keep
+  constructor(
+    @DoNotStrip
+    @Keep
+    val mapId: String?,
+    @DoNotStrip
+    @Keep
+    val liteMode: Boolean?,
+    @DoNotStrip
+    @Keep
+    val initialCamera: RNCamera?
+  ) {
+  /* main constructor */
+}

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

@@ -0,0 +1,24 @@
+///
+/// RNMapType.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+package com.rngooglemapsplus
+
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
+
+/**
+ * Represents the JavaScript enum/union "RNMapType".
+ */
+@DoNotStrip
+@Keep
+enum class RNMapType(@DoNotStrip @Keep val value: Int) {
+  NONE(0),
+  NORMAL(1),
+  HYBRID(2),
+  SATELLITE(3),
+  TERRAIN(4);
+}

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

@@ -26,7 +26,7 @@ data class RNMarker
     val id: String,
     @DoNotStrip
     @Keep
-    val zIndex: Double,
+    val zIndex: Double?,
     @DoNotStrip
     @Keep
     val coordinate: RNLatLng,

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

@@ -26,7 +26,10 @@ data class RNPolygon
     val id: String,
     @DoNotStrip
     @Keep
-    val zIndex: Double,
+    val zIndex: Double?,
+    @DoNotStrip
+    @Keep
+    val pressable: Boolean?,
     @DoNotStrip
     @Keep
     val coordinates: Array<RNLatLng>,

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

@@ -26,7 +26,10 @@ data class RNPolyline
     val id: String,
     @DoNotStrip
     @Keep
-    val zIndex: Double,
+    val zIndex: Double?,
+    @DoNotStrip
+    @Keep
+    val pressable: Boolean?,
     @DoNotStrip
     @Keep
     val coordinates: Array<RNLatLng>,

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

@@ -36,7 +36,13 @@ class HybridRNGoogleMapsPlusViewManager: SimpleViewManager<View>() {
     views.remove(view)
   }
 
-  override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
+  
+  /// added by nitrogen-patch.js
+  override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
+    return null
+  }
+
+override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
     val hybridView = views[view] ?: throw Error("Couldn't find view $view in local views table!")
 
     // 1. Update each prop individually