react-native-maps 1.21.0-alpha.102 → 1.21.0-alpha.104

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -646,35 +646,36 @@ public void onCreate(LifecycleOwner owner) {
 
 
     public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+        return builder.build();
+    }
+//                 , ,
+    public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
         MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
         builder.put(OnMarkerPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerPressEvent.EVENT_NAME));
         builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
-        builder.put(OnMarkerSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerSelectEvent.EVENT_NAME));
-        builder.put(OnMarkerDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDeselectEvent.EVENT_NAME));
         builder.put(OnMarkerDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragEvent.EVENT_NAME));
         builder.put(OnMarkerDragStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragStartEvent.EVENT_NAME));
         builder.put(OnMarkerDragEndEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragEndEvent.EVENT_NAME));
         builder.put(OnPoiClickEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPoiClickEvent.EVENT_NAME));
         builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnLongPressEvent.EVENT_NAME));
-        builder.put(OnRegionChangeStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeStartEvent.EVENT_NAME));
-        builder.put(OnRegionChangeCompleteEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeCompleteEvent.EVENT_NAME));
         builder.put(OnDoublePressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDoublePressEvent.EVENT_NAME));
         builder.put(OnPanDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPanDragEvent.EVENT_NAME));
+        builder.put(OnMarkerSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerSelectEvent.EVENT_NAME));
+        builder.put(OnMarkerDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDeselectEvent.EVENT_NAME));
+        builder.put(OnMapLoadedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMapLoadedEvent.EVENT_NAME));
+        builder.put(OnMarkerDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDeselectEvent.EVENT_NAME));
+        builder.put(OnMapReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMapReadyEvent.EVENT_NAME));
+        builder.put(OnUserLocationChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnUserLocationChangeEvent.EVENT_NAME));
+        builder.put(OnRegionChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeEvent.EVENT_NAME));
+        builder.put(OnRegionChangeStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeStartEvent.EVENT_NAME));
+        builder.put(OnRegionChangeCompleteEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeCompleteEvent.EVENT_NAME));
+        builder.put(OnIndoorBuildingFocusedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorBuildingFocusedEvent.EVENT_NAME));
+        builder.put(OnIndoorLevelActivatedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorLevelActivatedEvent.EVENT_NAME));
+        builder.put(OnKmlReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnKmlReadyEvent.EVENT_NAME));
         return builder.build();
     }
 
-    public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-        return MapBuilder.of(
-                OnMapLoadedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMapLoadedEvent.EVENT_NAME),
-                OnMapReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMapReadyEvent.EVENT_NAME),
-                OnUserLocationChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnUserLocationChangeEvent.EVENT_NAME),
-                OnRegionChangeEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeEvent.EVENT_NAME),
-                OnIndoorBuildingFocusedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorBuildingFocusedEvent.EVENT_NAME),
-                OnIndoorLevelActivatedEvent.EVENT_NAME, MapBuilder.of("registrationName", OnIndoorLevelActivatedEvent.EVENT_NAME),
-                OnKmlReadyEvent.EVENT_NAME, MapBuilder.of("registrationName", OnKmlReadyEvent.EVENT_NAME)
-        );
-    }
-
 
     /*
     onDestroy is final method so I can't override it.

package/ios/AirMaps.xcodeproj/project.pbxproj

@@ -26,15 +26,10 @@
 		4C99C9DE2226CF2800A8693E /* AIRWeakTimerReference.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C99C9DD2226CF2800A8693E /* AIRWeakTimerReference.m */; };
 		4C99C9E12226D8C400A8693E /* AIRWeakMapReference.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C99C9E02226D8C400A8693E /* AIRWeakMapReference.m */; };
 		4E0CFBDE2B388F2B0017E126 /* RCTComponentData+Maps.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */; };
+		4E34FA002D84E24A009CC683 /* PlaceHolderGoogleMapView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E34F9FC2D84E24A009CC683 /* PlaceHolderGoogleMapView.mm */; };
+		4E34FA012D84E24A009CC683 /* PlaceHolderPolygonView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E34F9FE2D84E24A009CC683 /* PlaceHolderPolygonView.mm */; };
 		4E430F272CF20153006E4F41 /* RNMapsMarkerManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E430F262CF20153006E4F41 /* RNMapsMarkerManager.mm */; };
 		4E430F2A2CF20305006E4F41 /* RNMapsMarker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E430F292CF20305006E4F41 /* RNMapsMarker.mm */; };
-		4E84CA362D3C4ACF00D23ADD /* EventEmitters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E84CA282D3C4ACF00D23ADD /* EventEmitters.cpp */; };
-		4E84CA372D3C4ACF00D23ADD /* RNMapsSpecsJSI-generated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E84CA342D3C4ACF00D23ADD /* RNMapsSpecsJSI-generated.cpp */; };
-		4E84CA382D3C4ACF00D23ADD /* Props.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E84CA2A2D3C4ACF00D23ADD /* Props.cpp */; };
-		4E84CA392D3C4ACF00D23ADD /* ShadowNodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E84CA2F2D3C4ACF00D23ADD /* ShadowNodes.cpp */; };
-		4E84CA3A2D3C4ACF00D23ADD /* RNMapsSpecs-generated.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E84CA2D2D3C4ACF00D23ADD /* RNMapsSpecs-generated.mm */; };
-		4E84CA3B2D3C4ACF00D23ADD /* ComponentDescriptors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E84CA262D3C4ACF00D23ADD /* ComponentDescriptors.cpp */; };
-		4E84CA3C2D3C4ACF00D23ADD /* States.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E84CA312D3C4ACF00D23ADD /* States.cpp */; };
 		53D31636202E723B00B55447 /* AIRMapOverlayManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D31635202E723B00B55447 /* AIRMapOverlayManager.m */; };
 		53D3163A202E72FC00B55447 /* AIRMapOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D31639202E72FC00B55447 /* AIRMapOverlay.m */; };
 		53D3163D202E734F00B55447 /* AIRMapOverlayRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D3163C202E734F00B55447 /* AIRMapOverlayRenderer.m */; };
@@ -126,24 +121,13 @@
 		4E0A36152BFB4E76009FCCE4 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		4E0CFBDC2B388F2B0017E126 /* RCTComponentData+Maps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTComponentData+Maps.h"; sourceTree = "<group>"; };
 		4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTComponentData+Maps.m"; sourceTree = "<group>"; };
+		4E34F9FB2D84E24A009CC683 /* PlaceHolderGoogleMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaceHolderGoogleMapView.h; sourceTree = "<group>"; };
+		4E34F9FC2D84E24A009CC683 /* PlaceHolderGoogleMapView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaceHolderGoogleMapView.mm; sourceTree = "<group>"; };
+		4E34F9FD2D84E24A009CC683 /* PlaceHolderPolygonView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaceHolderPolygonView.h; sourceTree = "<group>"; };
+		4E34F9FE2D84E24A009CC683 /* PlaceHolderPolygonView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaceHolderPolygonView.mm; sourceTree = "<group>"; };
 		4E430F262CF20153006E4F41 /* RNMapsMarkerManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNMapsMarkerManager.mm; sourceTree = "<group>"; };
 		4E430F282CF20305006E4F41 /* RNMapsMarker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNMapsMarker.h; sourceTree = "<group>"; };
 		4E430F292CF20305006E4F41 /* RNMapsMarker.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNMapsMarker.mm; sourceTree = "<group>"; };
-		4E84CA252D3C4ACF00D23ADD /* ComponentDescriptors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ComponentDescriptors.h; sourceTree = "<group>"; };
-		4E84CA262D3C4ACF00D23ADD /* ComponentDescriptors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ComponentDescriptors.cpp; sourceTree = "<group>"; };
-		4E84CA272D3C4ACF00D23ADD /* EventEmitters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EventEmitters.h; sourceTree = "<group>"; };
-		4E84CA282D3C4ACF00D23ADD /* EventEmitters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = EventEmitters.cpp; sourceTree = "<group>"; };
-		4E84CA292D3C4ACF00D23ADD /* Props.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Props.h; sourceTree = "<group>"; };
-		4E84CA2A2D3C4ACF00D23ADD /* Props.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Props.cpp; sourceTree = "<group>"; };
-		4E84CA2B2D3C4ACF00D23ADD /* RCTComponentViewHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTComponentViewHelpers.h; sourceTree = "<group>"; };
-		4E84CA2C2D3C4ACF00D23ADD /* RNMapsSpecs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNMapsSpecs.h; sourceTree = "<group>"; };
-		4E84CA2D2D3C4ACF00D23ADD /* RNMapsSpecs-generated.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "RNMapsSpecs-generated.mm"; sourceTree = "<group>"; };
-		4E84CA2E2D3C4ACF00D23ADD /* ShadowNodes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShadowNodes.h; sourceTree = "<group>"; };
-		4E84CA2F2D3C4ACF00D23ADD /* ShadowNodes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowNodes.cpp; sourceTree = "<group>"; };
-		4E84CA302D3C4ACF00D23ADD /* States.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = States.h; sourceTree = "<group>"; };
-		4E84CA312D3C4ACF00D23ADD /* States.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = States.cpp; sourceTree = "<group>"; };
-		4E84CA332D3C4ACF00D23ADD /* RNMapsSpecsJSI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNMapsSpecsJSI.h; sourceTree = "<group>"; };
-		4E84CA342D3C4ACF00D23ADD /* RNMapsSpecsJSI-generated.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "RNMapsSpecsJSI-generated.cpp"; sourceTree = "<group>"; };
 		53D31635202E723B00B55447 /* AIRMapOverlayManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AIRMapOverlayManager.m; sourceTree = "<group>"; };
 		53D31637202E725E00B55447 /* AIRMapOverlayManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AIRMapOverlayManager.h; sourceTree = "<group>"; };
 		53D31638202E72D500B55447 /* AIRMapOverlay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AIRMapOverlay.h; sourceTree = "<group>"; };
@@ -230,7 +214,6 @@
 		11FA5C481C4A1296003AC2EE = {
 			isa = PBXGroup;
 			children = (
-				4E84CA352D3C4ACF00D23ADD /* generated */,
 				4E0A36152BFB4E76009FCCE4 /* PrivacyInfo.xcprivacy */,
 				9B9498A32017EF9D00158761 /* AirGoogleMaps */,
 				62AEC4D31FD5A0AA003225E0 /* AIRMapLocalTileOverlay.m */,
@@ -251,6 +234,7 @@
 		11FA5C531C4A1296003AC2EE /* AirMaps */ = {
 			isa = PBXGroup;
 			children = (
+				4E34F9FF2D84E24A009CC683 /* FabricPlaceholders */,
 				4E0CFBDC2B388F2B0017E126 /* RCTComponentData+Maps.h */,
 				4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */,
 				BE2E4EC72621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.h */,
@@ -320,34 +304,15 @@
 			path = AirMaps;
 			sourceTree = "<group>";
 		};
-		4E84CA322D3C4ACF00D23ADD /* RNMapsSpecs */ = {
+		4E34F9FF2D84E24A009CC683 /* FabricPlaceholders */ = {
 			isa = PBXGroup;
 			children = (
-				4E84CA252D3C4ACF00D23ADD /* ComponentDescriptors.h */,
-				4E84CA262D3C4ACF00D23ADD /* ComponentDescriptors.cpp */,
-				4E84CA272D3C4ACF00D23ADD /* EventEmitters.h */,
-				4E84CA282D3C4ACF00D23ADD /* EventEmitters.cpp */,
-				4E84CA292D3C4ACF00D23ADD /* Props.h */,
-				4E84CA2A2D3C4ACF00D23ADD /* Props.cpp */,
-				4E84CA2B2D3C4ACF00D23ADD /* RCTComponentViewHelpers.h */,
-				4E84CA2C2D3C4ACF00D23ADD /* RNMapsSpecs.h */,
-				4E84CA2D2D3C4ACF00D23ADD /* RNMapsSpecs-generated.mm */,
-				4E84CA2E2D3C4ACF00D23ADD /* ShadowNodes.h */,
-				4E84CA2F2D3C4ACF00D23ADD /* ShadowNodes.cpp */,
-				4E84CA302D3C4ACF00D23ADD /* States.h */,
-				4E84CA312D3C4ACF00D23ADD /* States.cpp */,
+				4E34F9FB2D84E24A009CC683 /* PlaceHolderGoogleMapView.h */,
+				4E34F9FC2D84E24A009CC683 /* PlaceHolderGoogleMapView.mm */,
+				4E34F9FD2D84E24A009CC683 /* PlaceHolderPolygonView.h */,
+				4E34F9FE2D84E24A009CC683 /* PlaceHolderPolygonView.mm */,
 			);
-			path = RNMapsSpecs;
-			sourceTree = "<group>";
-		};
-		4E84CA352D3C4ACF00D23ADD /* generated */ = {
-			isa = PBXGroup;
-			children = (
-				4E84CA322D3C4ACF00D23ADD /* RNMapsSpecs */,
-				4E84CA332D3C4ACF00D23ADD /* RNMapsSpecsJSI.h */,
-				4E84CA342D3C4ACF00D23ADD /* RNMapsSpecsJSI-generated.cpp */,
-			);
-			path = generated;
+			path = FabricPlaceholders;
 			sourceTree = "<group>";
 		};
 		9B9498A32017EF9D00158761 /* AirGoogleMaps */ = {
@@ -490,6 +455,8 @@
 				BE2E4EC92621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.m in Sources */,
 				DA6C263E1C9E324A0035349F /* AIRMapUrlTileManager.m in Sources */,
 				9B9498DB2017EFB800158761 /* AIRGoogleMapMarker.m in Sources */,
+				4E34FA002D84E24A009CC683 /* PlaceHolderGoogleMapView.mm in Sources */,
+				4E34FA012D84E24A009CC683 /* PlaceHolderPolygonView.mm in Sources */,
 				628F81201FD16DF80058313A /* AIRMapLocalTile.m in Sources */,
 				9B9498D92017EFB800158761 /* AIRGoogleMapCalloutManager.m in Sources */,
 				53D3163A202E72FC00B55447 /* AIRMapOverlay.m in Sources */,
@@ -498,13 +465,6 @@
 				1125B2DF1C4AD3DA007D0023 /* AIRMapCoordinate.m in Sources */,
 				9B9498D62017EFB800158761 /* AIRGoogleMapCircleManager.m in Sources */,
 				8BC85FB02107CFEC0006CEA5 /* AIRGoogleMapOverlay.m in Sources */,
-				4E84CA362D3C4ACF00D23ADD /* EventEmitters.cpp in Sources */,
-				4E84CA372D3C4ACF00D23ADD /* RNMapsSpecsJSI-generated.cpp in Sources */,
-				4E84CA382D3C4ACF00D23ADD /* Props.cpp in Sources */,
-				4E84CA392D3C4ACF00D23ADD /* ShadowNodes.cpp in Sources */,
-				4E84CA3A2D3C4ACF00D23ADD /* RNMapsSpecs-generated.mm in Sources */,
-				4E84CA3B2D3C4ACF00D23ADD /* ComponentDescriptors.cpp in Sources */,
-				4E84CA3C2D3C4ACF00D23ADD /* States.cpp in Sources */,
 				1125B2F21C4AD445007D0023 /* SMCalloutView.m in Sources */,
 				2163AA501FEAEDD100BBEC95 /* AIRMapPolylineRenderer.m in Sources */,
 				9B9498D02017EFB800158761 /* AIRGoogleMapPolylineManager.m in Sources */,

package/lib/MapView.d.ts

@@ -245,7 +245,7 @@ export type MapViewProps = ViewProps & {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    onMapLoaded?: (event: NativeSyntheticEvent<{}>) => void;
+    onMapLoaded?: (event: NativeSyntheticEvent<null>) => void;
     /**
      * Callback that is called once the map is ready.
      *
@@ -255,7 +255,7 @@ export type MapViewProps = ViewProps & {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    onMapReady?: (event?: NativeSyntheticEvent<{}>) => void;
+    onMapReady?: (event?: NativeSyntheticEvent<null>) => void;
     /**
      * Callback that is called when a marker on the map becomes deselected.
      * This will be called when the callout for that marker is about to be hidden.

package/lib/specs/NativeComponentMapView.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { HostComponent, ViewProps, ColorValue } from 'react-native';
-import { Double, Int32, WithDefault, Float, DirectEventHandler, BubblingEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
+import { Double, Int32, WithDefault, Float, DirectEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
 export type EdgePadding = Readonly<{
     top: Double;
     right: Double;
@@ -14,7 +14,7 @@ export type Frame = Readonly<{
     width: Double;
     height: Double;
 }>;
-export type ClickEvent = BubblingEventHandler<Readonly<{
+export type ClickEvent = DirectEventHandler<Readonly<{
     coordinate: {
         latitude: Double;
         longitude: Double;
@@ -37,7 +37,7 @@ export type KmlMarker = {
         y: Double;
     };
 };
-export type LongPressEventHandler = BubblingEventHandler<Readonly<{
+export type LongPressEventHandler = DirectEventHandler<Readonly<{
     coordinate: {
         latitude: Double;
         longitude: Double;
@@ -48,7 +48,7 @@ export type LongPressEventHandler = BubblingEventHandler<Readonly<{
     };
     action?: string;
 }>>;
-export type MarkerDeselectEventHandler = BubblingEventHandler<Readonly<{
+export type MarkerDeselectEventHandler = DirectEventHandler<Readonly<{
     action?: string;
     id: string;
     coordinate: {
@@ -56,7 +56,7 @@ export type MarkerDeselectEventHandler = BubblingEventHandler<Readonly<{
         longitude: Double;
     };
 }>>;
-export type MarkerSelectEventHandler = BubblingEventHandler<Readonly<{
+export type MarkerSelectEventHandler = DirectEventHandler<Readonly<{
     action?: string;
     id: string;
     coordinate: {
@@ -64,7 +64,7 @@ export type MarkerSelectEventHandler = BubblingEventHandler<Readonly<{
         longitude: Double;
     };
 }>>;
-export type CalloutPressEvent = BubblingEventHandler<{
+export type CalloutPressEvent = DirectEventHandler<{
     action?: string;
     /**
      * @platform iOS
@@ -150,13 +150,10 @@ export type IndoorBuildingEventHandler = DirectEventHandler<Readonly<{
         activeLevelIndex: Int32;
     };
 }>>;
-export type KmlMapEventHandler = DirectEventHandler<Readonly<{}>>;
-export type MapLoadedEventHandler = DirectEventHandler<Readonly<{}>>;
-export type MapReadyEventHandler = DirectEventHandler<Readonly<{}>>;
 export type Details = Readonly<{
     isGesture?: boolean;
 }>;
-export type MarkerDragEventHandler = BubblingEventHandler<Readonly<{
+export type MarkerDragEventHandler = DirectEventHandler<Readonly<{
     coordinate: {
         latitude: Double;
         longitude: Double;
@@ -167,7 +164,7 @@ export type MarkerDragEventHandler = BubblingEventHandler<Readonly<{
     };
     id?: string;
 }>>;
-export type MarkerDragStartEndEventHandler = BubblingEventHandler<Readonly<{
+export type MarkerDragStartEndEventHandler = DirectEventHandler<Readonly<{
     coordinate: {
         latitude: Double;
         longitude: Double;
@@ -178,7 +175,7 @@ export type MarkerDragStartEndEventHandler = BubblingEventHandler<Readonly<{
         y: Double;
     };
 }>>;
-export type MarkerPressEventHandler = BubblingEventHandler<Readonly<{
+export type MarkerPressEventHandler = DirectEventHandler<Readonly<{
     action?: string;
     id: string;
     coordinate: {
@@ -190,7 +187,7 @@ export type MarkerPressEventHandler = BubblingEventHandler<Readonly<{
         y: Double;
     };
 }>>;
-export type PanDragEventHandler = BubblingEventHandler<Readonly<{
+export type PanDragEventHandler = DirectEventHandler<Readonly<{
     coordinate: {
         latitude: Double;
         longitude: Double;
@@ -200,7 +197,7 @@ export type PanDragEventHandler = BubblingEventHandler<Readonly<{
         y: Double;
     };
 }>>;
-export type PoiClickEventHandler = BubblingEventHandler<Readonly<{
+export type PoiClickEventHandler = DirectEventHandler<Readonly<{
     placeId: string;
     name: string;
     coordinate: {
@@ -212,7 +209,7 @@ export type PoiClickEventHandler = BubblingEventHandler<Readonly<{
         y: Double;
     };
 }>>;
-export type MapPressEventHandler = BubblingEventHandler<Readonly<{
+export type MapPressEventHandler = DirectEventHandler<Readonly<{
     coordinate: {
         latitude: Double;
         longitude: Double;
@@ -223,7 +220,6 @@ export type MapPressEventHandler = BubblingEventHandler<Readonly<{
     };
     action?: string;
 }>>;
-export type RegionChangeStartEventHandler = DirectEventHandler<Details>;
 export type RegionChangeEvent = Readonly<{
     region: {
         latitude: Double;
@@ -233,7 +229,6 @@ export type RegionChangeEvent = Readonly<{
     };
     continuous?: boolean;
 }>;
-export type RegionChangeEventHandler = BubblingEventHandler<RegionChangeEvent>;
 export type UserLocationChangeEvent = Readonly<{
     coordinate?: {
         latitude: Double;
@@ -482,7 +477,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    onKmlReady?: KmlMapEventHandler;
+    onKmlReady?: DirectEventHandler<null>;
     /**
      * Callback that is called when user makes a "long press" somewhere on the map.
      *
@@ -496,7 +491,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    onMapLoaded?: MapLoadedEventHandler;
+    onMapLoaded?: DirectEventHandler<null>;
     /**
      * Callback that is called once the map is ready.
      *
@@ -506,7 +501,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    onMapReady?: MapReadyEventHandler;
+    onMapReady?: DirectEventHandler<null>;
     /**
      * Callback that is called when a marker on the map becomes deselected.
      * This will be called when the callout for that marker is about to be hidden.
@@ -583,7 +578,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    onRegionChangeStart?: RegionChangeEventHandler;
+    onRegionChangeStart?: DirectEventHandler<RegionChangeEvent>;
     /**
      * Callback that is called continuously when the region changes, such as when a user is dragging the map.
      * `isGesture` property indicates if the move was from the user (true) or an animation (false).
@@ -592,7 +587,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    onRegionChange?: RegionChangeEventHandler;
+    onRegionChange?: DirectEventHandler<RegionChangeEvent>;
     /**
      * Callback that is called once when the region changes, such as when the user is done moving the map.
      * `isGesture` property indicates if the move was from the user (true) or an animation (false).
@@ -601,7 +596,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform iOS: Supported
      * @platform Android: Supported
      */
-    onRegionChangeComplete?: RegionChangeEventHandler;
+    onRegionChangeComplete?: DirectEventHandler<RegionChangeEvent>;
     /**
      * Callback that is called when the underlying map figures our users current location
      * (coordinate also includes isFromMockProvider value for Android API 18 and above).

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.102",
+  "version": "1.21.0-alpha.104",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/specs/NativeComponentMapView.ts

@@ -8,7 +8,6 @@ import {
   WithDefault,
   Float,
   DirectEventHandler,
-  BubblingEventHandler,
 } from 'react-native/Libraries/Types/CodegenTypes';
 
 export type EdgePadding = Readonly<{
@@ -33,7 +32,7 @@ export type Frame = Readonly<{
   height: Double;
 }>;
 
-export type ClickEvent = BubblingEventHandler<
+export type ClickEvent = DirectEventHandler<
   Readonly<{
     coordinate: {
       latitude: Double; // Inlined LatLng
@@ -60,7 +59,7 @@ export type KmlMarker = {
   }; // Non-nullable Point
 };
 
-export type LongPressEventHandler = BubblingEventHandler<
+export type LongPressEventHandler = DirectEventHandler<
   Readonly<{
     coordinate: {
       latitude: Double; // Inlined LatLng
@@ -74,7 +73,7 @@ export type LongPressEventHandler = BubblingEventHandler<
   }>
 >;
 
-export type MarkerDeselectEventHandler = BubblingEventHandler<
+export type MarkerDeselectEventHandler = DirectEventHandler<
   Readonly<{
     action?: string;
     id: string;
@@ -85,7 +84,7 @@ export type MarkerDeselectEventHandler = BubblingEventHandler<
   }>
 >;
 
-export type MarkerSelectEventHandler = BubblingEventHandler<
+export type MarkerSelectEventHandler = DirectEventHandler<
   Readonly<{
     action?: string;
     id: string;
@@ -96,7 +95,7 @@ export type MarkerSelectEventHandler = BubblingEventHandler<
   }>
 >;
 
-export type CalloutPressEvent = BubblingEventHandler<{
+export type CalloutPressEvent = DirectEventHandler<{
   action?: string;
 
   /**
@@ -204,17 +203,11 @@ export type IndoorBuildingEventHandler = DirectEventHandler<
   }>
 >;
 
-export type KmlMapEventHandler = DirectEventHandler<Readonly<{}>>;
-
-export type MapLoadedEventHandler = DirectEventHandler<Readonly<{}>>;
-
-export type MapReadyEventHandler = DirectEventHandler<Readonly<{}>>;
-
 export type Details = Readonly<{
   isGesture?: boolean; // Optional boolean for gesture detail
 }>;
 
-export type MarkerDragEventHandler = BubblingEventHandler<
+export type MarkerDragEventHandler = DirectEventHandler<
   Readonly<{
     coordinate: {
       latitude: Double; // Inlined LatLng
@@ -228,7 +221,7 @@ export type MarkerDragEventHandler = BubblingEventHandler<
   }>
 >;
 
-export type MarkerDragStartEndEventHandler = BubblingEventHandler<
+export type MarkerDragStartEndEventHandler = DirectEventHandler<
   Readonly<{
     coordinate: {
       latitude: Double; // Inlined LatLng
@@ -242,7 +235,7 @@ export type MarkerDragStartEndEventHandler = BubblingEventHandler<
   }>
 >;
 
-export type MarkerPressEventHandler = BubblingEventHandler<
+export type MarkerPressEventHandler = DirectEventHandler<
   Readonly<{
     action?: string;
     id: string;
@@ -257,7 +250,7 @@ export type MarkerPressEventHandler = BubblingEventHandler<
   }>
 >;
 
-export type PanDragEventHandler = BubblingEventHandler<
+export type PanDragEventHandler = DirectEventHandler<
   Readonly<{
     coordinate: {
       latitude: Double; // Inlined LatLng
@@ -270,7 +263,7 @@ export type PanDragEventHandler = BubblingEventHandler<
   }>
 >;
 
-export type PoiClickEventHandler = BubblingEventHandler<
+export type PoiClickEventHandler = DirectEventHandler<
   Readonly<{
     placeId: string;
     name: string;
@@ -285,7 +278,7 @@ export type PoiClickEventHandler = BubblingEventHandler<
   }>
 >;
 
-export type MapPressEventHandler = BubblingEventHandler<
+export type MapPressEventHandler = DirectEventHandler<
   Readonly<{
     coordinate: {
       latitude: Double; // Inlined LatLng
@@ -298,9 +291,6 @@ export type MapPressEventHandler = BubblingEventHandler<
     action?: string;
   }>
 >;
-
-export type RegionChangeStartEventHandler = DirectEventHandler<Details>;
-
 export type RegionChangeEvent = Readonly<{
   region: {
     latitude: Double; // Non-nullable Double for latitude
@@ -310,9 +300,6 @@ export type RegionChangeEvent = Readonly<{
   }; // The region object
   continuous?: boolean;
 }>;
-
-export type RegionChangeEventHandler = BubblingEventHandler<RegionChangeEvent>;
-
 export type UserLocationChangeEvent = Readonly<{
   coordinate?: {
     latitude: Double; // Non-nullable Double for latitude
@@ -604,7 +591,7 @@ export interface MapFabricNativeProps extends ViewProps {
    * @platform iOS: Google Maps only
    * @platform Android: Supported
    */
-  onKmlReady?: KmlMapEventHandler;
+  onKmlReady?: DirectEventHandler<null>;
 
   /**
    * Callback that is called when user makes a "long press" somewhere on the map.
@@ -620,7 +607,7 @@ export interface MapFabricNativeProps extends ViewProps {
    * @platform iOS: Google Maps only
    * @platform Android: Supported
    */
-  onMapLoaded?: MapLoadedEventHandler;
+  onMapLoaded?: DirectEventHandler<null>;
 
   /**
    * Callback that is called once the map is ready.
@@ -631,7 +618,7 @@ export interface MapFabricNativeProps extends ViewProps {
    * @platform iOS: Supported
    * @platform Android: Supported
    */
-  onMapReady?: MapReadyEventHandler;
+  onMapReady?: DirectEventHandler<null>;
 
   /**
    * Callback that is called when a marker on the map becomes deselected.
@@ -723,7 +710,7 @@ export interface MapFabricNativeProps extends ViewProps {
    * @platform iOS: Supported
    * @platform Android: Supported
    */
-  onRegionChangeStart?: RegionChangeEventHandler;
+  onRegionChangeStart?: DirectEventHandler<RegionChangeEvent>;
 
   /**
    * Callback that is called continuously when the region changes, such as when a user is dragging the map.
@@ -733,7 +720,7 @@ export interface MapFabricNativeProps extends ViewProps {
    * @platform iOS: Supported
    * @platform Android: Supported
    */
-  onRegionChange?: RegionChangeEventHandler;
+  onRegionChange?: DirectEventHandler<RegionChangeEvent>;
 
   /**
    * Callback that is called once when the region changes, such as when the user is done moving the map.
@@ -743,7 +730,7 @@ export interface MapFabricNativeProps extends ViewProps {
    * @platform iOS: Supported
    * @platform Android: Supported
    */
-  onRegionChangeComplete?: RegionChangeEventHandler;
+  onRegionChangeComplete?: DirectEventHandler<RegionChangeEvent>;
 
   /**
    * Callback that is called when the underlying map figures our users current location