feat: add onInfoWindowPress

feat: add onInfoWindowClose
feat: add onInfoWindowLongPress
feat: add onMyLocationPress
feat: add onMyLocationButtonPress

Author: pinpong

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) {

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

example/src/components/MapWrapper.tsx

@@ -96,6 +96,9 @@ export default function MapWrapper(props: Props) {
         }}
         initialProps={props.initialProps ?? initialProps}
         uiSettings={props.uiSettings ?? uiSettings}
+        myLocationEnabled={props.myLocationEnabled ?? true}
+        trafficEnabled={props.trafficEnabled ?? false}
+        indoorEnabled={props.indoorEnabled ?? false}
         style={[styles.map, props.style]}
         userInterfaceStyle={
           props.userInterfaceStyle ?? (theme.dark ? 'dark' : 'light')
@@ -190,6 +193,33 @@ export default function MapWrapper(props: Props) {
               console.log('Indoor level activated', level),
           }
         )}
+        onInfoWindowPress={callback(
+          props.onInfoWindowPress ?? {
+            f: (id?: string) => console.log('InfoWindow press:', id),
+          }
+        )}
+        onInfoWindowClose={callback(
+          props.onInfoWindowClose ?? {
+            f: (id?: string) => console.log('InfoWindow close:', id),
+          }
+        )}
+        onInfoWindowLongPress={callback(
+          props.onInfoWindowLongPress ?? {
+            f: (id?: string) => console.log('InfoWindow long press:', id),
+          }
+        )}
+        onMyLocationPress={callback(
+          props.onMyLocationPress ?? {
+            f: (location: RNLocation) =>
+              console.log('MyLocation press:', location),
+          }
+        )}
+        onMyLocationButtonPress={callback(
+          props.onMyLocationButtonPress ?? {
+            f: (pressed: boolean) =>
+              console.log('MyLocation button press', pressed),
+          }
+        )}
         onCameraChangeStart={callback(
           props.onCameraChangeStart ?? {
             f: (r: RNRegion, cam: RNCamera, g: boolean) =>

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
+  }
 }

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 }
   }

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,