From 6b177a49c853197afa28302de3f047c46f778afc Mon Sep 17 00:00:00 2001
From: pinpong <o.nitzschke@gmail.com>
Date: Fri, 10 Oct 2025 09:26:42 +0700
Subject: [PATCH] feat: add more supported marker props

---
 .../rngooglemapsplus/GoogleMapsViewImpl.kt    |  1 +
 .../com/rngooglemapsplus/MapMarkerBuilder.kt  | 14 +++++++++++--
 example/src/utils/mapGenerators.ts            | 21 ++++++++++++-------
 ios/GoogleMapViewImpl.swift                   |  1 +
 ios/MapMarkerBuilder.swift                    | 12 +++++++++--
 src/types.ts                                  |  6 ++++++
 6 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt b/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt
index 5a0486d..c8d479c 100644
--- a/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt
+++ b/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt
@@ -954,6 +954,7 @@ class GoogleMapsViewImpl(
   }
 
   override fun onMarkerClick(marker: Marker): Boolean {
+    marker.showInfoWindow()
     onMarkerPress?.invoke(marker.tag?.toString() ?: "unknown")
     return true
   }
diff --git a/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt b/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt
index abd0d86..74278de 100644
--- a/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt
+++ b/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt
@@ -41,8 +41,13 @@ class MapMarkerBuilder(
   ): MarkerOptions =
     MarkerOptions().apply {
       position(LatLng(m.coordinate.latitude, m.coordinate.longitude))
-      anchor((m.anchor?.x ?: 0.5).toFloat(), (m.anchor?.y ?: 0.5).toFloat())
       icon(icon)
+      m.title?.let { title(it) }
+      m.snippet?.let { snippet(it) }
+      m.opacity?.let { alpha(it.toFloat()) }
+      m.flat?.let { flat(it) }
+      m.draggable?.let { draggable(it) }
+      anchor((m.anchor?.x ?: 0.5).toFloat(), (m.anchor?.y ?: 0.5).toFloat())
       m.zIndex?.let { zIndex(it.toFloat()) }
     }
 
@@ -56,17 +61,22 @@ class MapMarkerBuilder(
         next.coordinate.latitude,
         next.coordinate.longitude,
       )
-    marker.zIndex = next.zIndex?.toFloat() ?: 0f
 
     if (!prev.markerStyleEquals(next)) {
       buildIconAsync(marker.id, next) { icon ->
         marker.setIcon(icon)
       }
     }
+    marker.title = next.title
+    marker.snippet = next.snippet
+    marker.alpha = next.opacity?.toFloat() ?: 0f
+    marker.isFlat = next.flat ?: false
+    marker.isDraggable = next.draggable ?: false
     marker.setAnchor(
       (next.anchor?.x ?: 0.5).toFloat(),
       (next.anchor?.y ?: 0.5).toFloat(),
     )
+    marker.zIndex = next.zIndex?.toFloat() ?: 0f
   }
 
   fun buildIconAsync(
diff --git a/example/src/utils/mapGenerators.ts b/example/src/utils/mapGenerators.ts
index f83e01b..03e5172 100644
--- a/example/src/utils/mapGenerators.ts
+++ b/example/src/utils/mapGenerators.ts
@@ -106,17 +106,22 @@ export const makeHeatmap = (id: number): RNHeatmap => ({
   opacity: 1,
 });
 
-export const makeMarker = (id: number): RNMarker => ({
-  id: id.toString(),
-  zIndex: id,
-  coordinate: randomCoordinates(37.7749, -122.4194, 0.2),
-  anchor: { x: 0.5, y: 1.0 },
-  iconSvg:
-    id % 2 === 0
+export function makeMarker(id: number): RNMarker {
+  const customIcon = id % 2 === 0;
+  return {
+    id: id.toString(),
+    zIndex: id,
+    coordinate: randomCoordinates(37.7749, -122.4194, 0.2),
+    anchor: customIcon ? { x: 0.5, y: 1.0 } : undefined,
+    title: `Marker title ${id}`,
+    snippet: `Marker snippet ${id}`,
+    draggable: customIcon,
+    iconSvg: customIcon
       ? {
           width: (64 / 100) * 50,
           height: (88 / 100) * 50,
           svgString: makeSvgIcon(64, 88),
         }
       : undefined,
-});
+  };
+}
diff --git a/ios/GoogleMapViewImpl.swift b/ios/GoogleMapViewImpl.swift
index a800ebe..46401e8 100644
--- a/ios/GoogleMapViewImpl.swift
+++ b/ios/GoogleMapViewImpl.swift
@@ -722,6 +722,7 @@ final class GoogleMapsViewImpl: UIView, GMSMapViewDelegate {
   }
 
   func mapView(_ mapView: GMSMapView, didTap marker: GMSMarker) -> Bool {
+    mapView.selectedMarker = marker
     let id = (marker.userData as? String) ?? "unknown"
     onMarkerPress?(id)
     return true
diff --git a/ios/MapMarkerBuilder.swift b/ios/MapMarkerBuilder.swift
index 98e2fe6..8e803bf 100644
--- a/ios/MapMarkerBuilder.swift
+++ b/ios/MapMarkerBuilder.swift
@@ -21,6 +21,11 @@ final class MapMarkerBuilder {
     marker.userData = m.id
     marker.tracksViewChanges = true
     marker.icon = icon
+    m.title.map { marker.title = $0 }
+    m.snippet.map { marker.snippet = $0 }
+    m.opacity.map { marker.iconView?.alpha = CGFloat($0) }
+    m.flat.map { marker.isFlat = $0 }
+    m.draggable.map { marker.isDraggable = $0 }
     marker.groundAnchor = CGPoint(
       x: m.anchor?.x ?? 0.5,
       y: m.anchor?.y ?? 0.5
@@ -42,13 +47,16 @@ final class MapMarkerBuilder {
       longitude: next.coordinate.longitude
     )
 
+    m.title = next.title
+    m.snippet = next.snippet
+    m.iconView?.alpha = CGFloat(next.opacity ?? 0)
+    m.isFlat = next.flat ?? false
+    m.isDraggable = next.draggable ?? false
     m.zIndex = Int32(next.zIndex ?? 0)
-
     m.groundAnchor = CGPoint(
       x: next.anchor?.x ?? 0.5,
       y: next.anchor?.y ?? 0.5
     )
-
     if !prev.markerStyleEquals(next) {
       buildIconAsync(next.id, next) { img in
         m.tracksViewChanges = true
diff --git a/src/types.ts b/src/types.ts
index fedb7b8..7fdf3ec 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -136,6 +136,12 @@ export type RNMarker = {
   zIndex?: number;
   coordinate: RNLatLng;
   anchor?: RNPosition;
+  showInfoWindow?: boolean;
+  title?: string;
+  snippet?: string;
+  opacity?: number;
+  flat?: boolean;
+  draggable?: boolean;
   iconSvg?: RNMarkerSvg;
 };