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

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

@@ -654,6 +654,7 @@ public void onCreate(LifecycleOwner owner) {
         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(OnCalloutPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnCalloutPressEvent.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));
@@ -664,7 +665,6 @@ public void onCreate(LifecycleOwner owner) {
         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));

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -27,18 +27,17 @@
 @property (nonatomic, assign) NSString *customMapStyleString;
 @property (nonatomic, assign) UIEdgeInsets mapPadding;
 @property (nonatomic, assign) NSString *paddingAdjustmentBehaviorString;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapLoaded;
-@property (nonatomic, copy) RCTBubblingEventBlock onKmlReady;
+@property (nonatomic, copy) RCTDirectEventBlock onMapReady;
+@property (nonatomic, copy) RCTDirectEventBlock onMapLoaded;
+@property (nonatomic, copy) RCTDirectEventBlock onKmlReady;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, copy) RCTBubblingEventBlock onLongPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
-@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerSelect;
-@property (nonatomic, copy) RCTBubblingEventBlock onMarkerDeselect;
-@property (nonatomic, copy) RCTBubblingEventBlock onChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onPoiClick;
+@property (nonatomic, copy) RCTDirectEventBlock onPanDrag;
+@property (nonatomic, copy) RCTDirectEventBlock onUserLocationChange;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerPress;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerSelect;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerDeselect;
+@property (nonatomic, copy) RCTDirectEventBlock onPoiClick;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeStart;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeComplete;

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -524,7 +524,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
 
-  if (self.onChange) self.onChange(event);
+  if (self.onRegionChange) self.onRegionChange(event);
 }
 
 - (void)didTapPOIWithPlaceID:(NSString *)placeID
@@ -546,7 +546,7 @@ id regionAsJSON(MKCoordinateRegion region) {
                @"region": regionAsJSON([AIRGoogleMap makeGMSCameraPositionFromMap:self andGMSCameraPosition:position]),
                @"isGesture": [NSNumber numberWithBool:isGesture],
                };
-  if (self.onChange) self.onChange(event);  // complete
+    if (self.onRegionChangeComplete) self.onRegionChangeComplete(event);  // complete
     _isAnimating = NO;
 }
 
@@ -1068,7 +1068,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 + (NSString *)GetIconUrl:(GMUPlacemark *) marker parser:(GMUKMLParser *) parser {
-#ifdef HAVE_GOOGLE_MAPS_UTILS
+#if HAVE_GOOGLE_MAPS_UTILS
   if (marker.style.styleID != nil) {
     for (GMUStyle *style in parser.styles) {
       if (style.styleID == marker.style.styleID) {
@@ -1133,7 +1133,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)setKmlSrc:(NSString *)kmlUrl {
-#ifdef HAVE_GOOGLE_MAPS_UTILS
+#if HAVE_GOOGLE_MAPS_UTILS
 
   _kmlSrc = kmlUrl;
 

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -97,14 +97,13 @@ RCT_EXPORT_VIEW_PROPERTY(showsIndoorLevelPicker, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(customMapStyleString, NSString)
 RCT_EXPORT_VIEW_PROPERTY(mapPadding, UIEdgeInsets)
 RCT_REMAP_VIEW_PROPERTY(paddingAdjustmentBehavior, paddingAdjustmentBehaviorString, NSString)
-RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onMapLoaded, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onKmlReady, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapLoaded, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onKmlReady, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
@@ -266,11 +265,11 @@ RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber *)reactTag
     } else {
         AIRGoogleMap *mapView = (AIRGoogleMap *)view;
         NSMutableDictionary* config = [NSMutableDictionary new];
-        
+
         [mapView takeSnapshotWithConfig:config success:callback error:^(NSString *code, NSString *message, NSError *error) {
             callback(@[error]);
         }];
-        
+
         [config setObject:width forKey:@"width"];
         [config setObject:height forKey:@"height"];
         [config setObject:format forKey:@"format"];

package/ios/AirGoogleMaps/AIRGoogleMapMarker.m

@@ -376,7 +376,7 @@ CGRect unionRect(CGRect a, CGRect b) {
             // TODO(lmr): do something with the error?
             NSLog(@"%@", error);
         }
-        
+
         dispatch_async(dispatch_get_main_queue(), ^{
             __strong AIRGoogleMapMarker* strongSelf  = weakSelf;
 

package/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m

@@ -86,7 +86,7 @@ RCT_EXPORT_METHOD(redrawCallout:(nonnull NSNumber *)reactTag)
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
             AIRGoogleMapMarker* marker = (AIRGoogleMapMarker *) view;
-            
+
             [NSTimer scheduledTimerWithTimeInterval:0.0
                                              target:[NSBlockOperation blockOperationWithBlock:^{
                 [marker hideCalloutView];

package/ios/AirGoogleMaps/AIRGoogleMapUrlTile.m

@@ -28,11 +28,11 @@
   NSInteger *maximumZ = self.maximumZ;
   NSInteger *minimumZ = self.minimumZ;
   GMSTileURLConstructor urls = ^NSURL* _Nullable (NSUInteger x, NSUInteger y, NSUInteger zoom) {
-    
+
     if (self.flipY == YES) {
       y = (1 << zoom) - y - 1;
     }
-    
+
     NSString *url = urlTemplate;
     url = [url stringByReplacingOccurrencesOfString:@"{x}" withString:[NSString stringWithFormat: @"%ld", (long)x]];
     url = [url stringByReplacingOccurrencesOfString:@"{y}" withString:[NSString stringWithFormat: @"%ld", (long)y]];

package/ios/AirGoogleMaps/AIRGoogleMapWMSTile.m

@@ -91,9 +91,9 @@
                        [NSNumber numberWithDouble:_MapX + (double)(x+1) * tile ],
                        [NSNumber numberWithDouble:_MapY - (double)y * tile ],
                        nil];
-    
+
     return result;
-    
+
 }
 
 - (UIImage *)tileForX:(NSUInteger)x y:(NSUInteger)y zoom:(NSUInteger)zoom

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -242,7 +242,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onKmlReady(data);
           }
       };
-      _view.onChange = [self](NSDictionary* dictionary) {
+      _view.onRegionChange = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
               NSDictionary* regionDict = dictionary[@"region"];
@@ -363,22 +363,6 @@ using namespace facebook::react;
           }
       };
 
-      _view.onRegionChange = [self](NSDictionary* dictionary) {
-          if (_eventEmitter) {
-
-              NSDictionary* regionDict = dictionary[@"region"];
-              auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
-              facebook::react::RNMapsGoogleMapViewEventEmitter::OnRegionChange data = {
-                  .region.latitude = [regionDict[@"latitude"] doubleValue],
-                  .region.longitude = [regionDict[@"longitude"] doubleValue],
-                  .region.latitudeDelta = [regionDict[@"latitudeDelta"] doubleValue],
-                  .region.longitudeDelta = [regionDict[@"longitudeDelta"] doubleValue],
-                  .continuous = [dictionary[@"continuous"] boolValue],
-                 };
-              mapViewEventEmitter->onRegionChange(data);
-          }
-      };
-
       _view.onRegionChangeComplete = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 

package/ios/AirGoogleMaps/RNMapsGoogleMapViewManager.mm

@@ -18,7 +18,22 @@
 
 RCT_EXPORT_MODULE(RNMapsGoogleMapViewManager)
 
-
+RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapLoaded, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onKmlReady, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeComplete, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPoiClick, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onIndoorLevelActivated, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onIndoorBuildingFocused, RCTDirectEventBlock)
 
 @end
 

package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm

@@ -1,6 +1,6 @@
 //
 //  RNMapsGoogleMapView.mm
-//  
+//
 //
 //  Created by Salah Ghanim on 23.11.24.
 //  Copyright © 2024 react-native-maps. All rights reserved.
@@ -39,7 +39,7 @@ bool areHolesEqual(const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>
         if (newHole.size() != oldHole.size()) {
             return false;
         }
- 
+
     }
 
     return true;
@@ -74,7 +74,7 @@ bool areHolesEqual(const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>
 }
 
 - (void) prepareContentView {
-   
+
     _view = [AIRGMSPolygon new];
     _view.onPress = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
@@ -169,7 +169,7 @@ bool areHolesEqual(const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>
         }
         _view.path = path;
     }
-    
+
     if (!areHolesEqual(newViewProps.holes, oldViewProps.holes)){
         NSMutableArray<GMSMutablePath *> *interiorPolygons = [NSMutableArray array];
         for(int h = 0; h < newViewProps.holes.size(); h++)
@@ -186,19 +186,19 @@ bool areHolesEqual(const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>
         }
         _view.holes = interiorPolygons;
     }
-    
- 
+
+
     REMAP_MAPVIEW_PROP(tappable)
 
     if (newViewProps.fillColor){
         _view.fillColor = RCTUIColorFromSharedColor(newViewProps.fillColor);
     }
-    
+
     if (newViewProps.strokeColor){
         _view.strokeColor = RCTUIColorFromSharedColor(newViewProps.strokeColor);
     }
-    
-    
+
+
 
 
   [super updateProps:props oldProps:oldProps];

package/ios/AirMaps/AIRMap.h

@@ -56,12 +56,12 @@ extern const NSInteger AIRMapMaxZoomLevel;
 
 @property (nonatomic, assign) BOOL ignoreRegionChanges;
 
-@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
-@property (nonatomic, copy) RCTBubblingEventBlock onChange;
+@property (nonatomic, copy) RCTDirectEventBlock onMapReady;
+@property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
-@property (nonatomic, copy) RCTBubblingEventBlock onDoublePress;
 @property (nonatomic, copy) RCTBubblingEventBlock onLongPress;
+@property (nonatomic, copy) RCTDirectEventBlock onPanDrag;
+@property (nonatomic, copy) RCTDirectEventBlock onDoublePress;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerPress;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerSelect;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerDeselect;
@@ -71,8 +71,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 
 @property (nonatomic, copy) RCTDirectEventBlock onCalloutPress;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeStart;
-@property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
+@property (nonatomic, copy) RCTDirectEventBlock onUserLocationChange;
 
 - (void)cacheViewIfNeeded;
 - (void)beginLoading;

package/ios/AirMaps/AIRMapManager.m

@@ -111,13 +111,13 @@ RCT_EXPORT_VIEW_PROPERTY(legalLabelInsets, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(mapPadding, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(mapType, MKMapType)
 RCT_EXPORT_VIEW_PROPERTY(cameraZoomRange, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onRegionChangeStart, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onDoublePress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDoublePress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
@@ -125,7 +125,7 @@ RCT_EXPORT_VIEW_PROPERTY(onMarkerDragStart, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDrag, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerDragEnd, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onCalloutPress, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTDirectEventBlock)
 RCT_CUSTOM_VIEW_PROPERTY(initialRegion, MKCoordinateRegion, AIRMap)
 {
     if (json == nil) return;
@@ -1006,14 +1006,14 @@ static int kDragCenterContext;
 
 - (void)_emitRegionChangeEvent:(AIRMap *)mapView continuous:(BOOL)continuous
 {
-    if (!mapView.ignoreRegionChanges && mapView.onChange) {
+    if (!mapView.ignoreRegionChanges && mapView.onRegionChange) {
         MKCoordinateRegion region = mapView.region;
         if (!CLLocationCoordinate2DIsValid(region.center)) {
             return;
         }
 
 #define FLUSH_NAN(value) (isnan(value) ? 0 : value)
-        mapView.onChange(@{
+        mapView.onRegionChange(@{
                 @"continuous": @(continuous),
                 @"region": @{
                         @"latitude": @(FLUSH_NAN(region.center.latitude)),

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.mm

@@ -38,7 +38,7 @@ using namespace facebook::react;
 - (void)fitToSuppliedMarkers:(NSString *)markersJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
 }
 - (void)fitToCoordinates:(NSString *)coordinatesJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
-    
+
 }
 - (void) setIndoorActiveLevelIndex:(NSInteger)activeLevelIndex
 {

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm

@@ -1,6 +1,6 @@
 //
 //  RNMapsGoogleMapView.mm
-//  
+//
 //
 //  Created by Salah Ghanim on 23.11.24.
 //  Copyright © 2024 react-native-maps. All rights reserved.

package/ios/AirMaps/RNMapsMapView.mm

@@ -157,7 +157,7 @@ using namespace facebook::react;
             mapViewEventEmitter->onMapReady(data);
         }
     };
-    _view.onChange = [self](NSDictionary* dictionary) {
+    _view.onRegionChange = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             NSDictionary* regionDict = dictionary[@"region"];
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);

package/ios/AirMaps/RNMapsMapViewManager.mm

@@ -17,7 +17,25 @@
 
 RCT_EXPORT_MODULE(RNMapsMapViewManager)
 
-
+RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onCalloutPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDoublePress, RCTDirectEventBlock)
+
+RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTDirectEventBlock)
+
+RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDragStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDrag, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDragEnd, RCTDirectEventBlock)
+
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeComplete, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTDirectEventBlock)
 
 
 

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 } from 'react-native/Libraries/Types/CodegenTypes';
+import { Double, Int32, WithDefault, Float, DirectEventHandler, BubblingEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
 export type EdgePadding = Readonly<{
     top: Double;
     right: Double;
@@ -37,7 +37,7 @@ export type KmlMarker = {
         y: Double;
     };
 };
-export type LongPressEventHandler = DirectEventHandler<Readonly<{
+export type LongPressEventHandler = BubblingEventHandler<Readonly<{
     coordinate: {
         latitude: Double;
         longitude: Double;
@@ -209,7 +209,7 @@ export type PoiClickEventHandler = DirectEventHandler<Readonly<{
         y: Double;
     };
 }>>;
-export type MapPressEventHandler = DirectEventHandler<Readonly<{
+export type MapPressEventHandler = BubblingEventHandler<Readonly<{
     coordinate: {
         latitude: Double;
         longitude: Double;

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.104",
+  "version": "1.21.0-alpha.106",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/react-native-maps.podspec

@@ -33,7 +33,6 @@ Pod::Spec.new do |s|
       'GoogleMapsPrivacy' => ['ios/AirGoogleMaps/Resources/GoogleMapsPrivacy.bundle']
     }
     sp.compiler_flags = folly_compiler_flags + ' -DHAVE_GOOGLE_MAPS=1 -DHAVE_GOOGLE_MAPS_UTILS=1'
-    sp.dependency "react-native-maps/generated"
     sp.dependency 'GoogleMaps', '9.3.0'
     sp.dependency 'Google-Maps-iOS-Utils', '6.1.0'
     install_modules_dependencies(sp)

package/specs/NativeComponentMapView.ts

@@ -8,6 +8,7 @@ import {
   WithDefault,
   Float,
   DirectEventHandler,
+  BubblingEventHandler,
 } from 'react-native/Libraries/Types/CodegenTypes';
 
 export type EdgePadding = Readonly<{
@@ -59,7 +60,7 @@ export type KmlMarker = {
   }; // Non-nullable Point
 };
 
-export type LongPressEventHandler = DirectEventHandler<
+export type LongPressEventHandler = BubblingEventHandler<
   Readonly<{
     coordinate: {
       latitude: Double; // Inlined LatLng
@@ -278,7 +279,7 @@ export type PoiClickEventHandler = DirectEventHandler<
   }>
 >;
 
-export type MapPressEventHandler = DirectEventHandler<
+export type MapPressEventHandler = BubblingEventHandler<
   Readonly<{
     coordinate: {
       latitude: Double; // Inlined LatLng