feat: add consumeOnMarkerPress and consumeOnMyLocationButtonPress to RNMapUiSettings

Author: pinpong

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

@@ -876,7 +876,7 @@ class GoogleMapsViewImpl(
       marker.showInfoWindow()
       onMarkerPress?.invoke(marker.tag?.toString())
     }
-    return false
+    return uiSettings?.consumeOnMarkerPress ?: false
   }
 
   override fun onPolylineClick(polyline: Polyline) =
@@ -963,6 +963,6 @@ class GoogleMapsViewImpl(
     onUi {
       onMyLocationButtonPress?.invoke(true)
     }
-    return false
+    return uiSettings?.consumeOnMyLocationButtonPress ?: false
   }
 }

example/src/components/MapWrapper.tsx

@@ -5,8 +5,13 @@ import type {
   GoogleMapsViewRef,
   RNCamera,
   RNGoogleMapsPlusViewProps,
+  RNInitialProps,
   RNLatLng,
   RNLocation,
+  RNLocationConfig,
+  RNMapPadding,
+  RNMapUiSettings,
+  RNMapZoomConfig,
   RNRegion,
 } from 'react-native-google-maps-plus';
 import {
@@ -47,7 +52,7 @@ export default function MapWrapper(props: Props) {
   const layout = useSafeAreaInsets();
 
   const [mapLoaded, setMapLoaded] = React.useState(false);
-  const initialProps = useMemo(
+  const initialProps: RNInitialProps = useMemo(
     () => ({
       camera: {
         center: { latitude: 37.7749, longitude: -122.4194 },
@@ -57,7 +62,7 @@ export default function MapWrapper(props: Props) {
     []
   );
 
-  const uiSettings = useMemo(
+  const uiSettings: RNMapUiSettings = useMemo(
     () => ({
       allGesturesEnabled: true,
       compassEnabled: true,
@@ -70,19 +75,24 @@ export default function MapWrapper(props: Props) {
       tiltEnabled: true,
       zoomControlsEnabled: true,
       zoomGesturesEnabled: true,
+      consumeOnMarkerPress: false,
+      consumeOnMyLocationButtonPress: false,
     }),
     []
   );
 
-  const mapPadding = useMemo(() => {
+  const mapPadding: RNMapPadding = useMemo(() => {
     return props.children
       ? { top: 20, left: 20, bottom: layout.bottom + 80, right: 20 }
       : { top: 20, left: 20, bottom: layout.bottom, right: 20 };
   }, [layout.bottom, props.children]);
 
-  const mapZoomConfig = useMemo(() => ({ min: 0, max: 20 }), []);
+  const mapZoomConfig: RNMapZoomConfig = useMemo(
+    () => ({ min: 0, max: 20 }),
+    []
+  );
 
-  const locationConfig = useMemo(
+  const locationConfig: RNLocationConfig = useMemo(
     () => ({
       android: {
         priority: RNAndroidLocationPriority.PRIORITY_HIGH_ACCURACY,

example/src/components/maptConfigDialog/validator.ts

@@ -128,6 +128,8 @@ export const RNMapUiSettingsValidator = object({
   tiltEnabled: optional(boolean()),
   zoomControlsEnabled: optional(boolean()),
   zoomGesturesEnabled: optional(boolean()),
+  consumeOnMarkerPress: optional(boolean()),
+  consumeOnMyLocationButtonPress: optional(boolean()),
 });
 
 export const RNMapZoomConfigValidator = object({

example/src/screens/BasicMapScreen.tsx

@@ -35,6 +35,8 @@ export default function BasicMapScreen() {
       tiltEnabled: true,
       zoomControlsEnabled: true,
       zoomGesturesEnabled: true,
+      consumeOnMarkerPress: false,
+      consumeOnMyLocationButtonPress: false,
     },
     myLocationEnabled: true,
     buildingEnabled: undefined,

ios/GoogleMapViewImpl.swift

@@ -781,7 +781,7 @@ GMSIndoorDisplayDelegate {
       mapView.selectedMarker = marker
       self.onMarkerPress?(marker.userData as? String, )
     }
-    return false
+    return uiSettings?.consumeOnMarkerPress ?? false
   }
 
   func mapView(_ mapView: GMSMapView, didTap overlay: GMSOverlay) {
@@ -891,6 +891,6 @@ GMSIndoorDisplayDelegate {
     onMain {
       self.onMyLocationButtonPress?(true)
     }
-    return false
+    return uiSettings?.consumeOnMyLocationButtonPress ?? false
   }
 }

src/types.ts

@@ -21,6 +21,8 @@ export type RNMapUiSettings = {
   tiltEnabled?: boolean;
   zoomControlsEnabled?: boolean;
   zoomGesturesEnabled?: boolean;
+  consumeOnMarkerPress?: boolean;
+  consumeOnMyLocationButtonPress?: boolean;
 };
 
 export type RNLatLng = {