react-native-maps 1.21.0-alpha.13 → 1.21.0-alpha.131

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm

@@ -0,0 +1,43 @@
+//
+//  RNMapsGoogleMapView.mm
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <react-native-maps-generated/ComponentDescriptors.h>
+#import <react-native-maps-generated/EventEmitters.h>
+#import <react-native-maps-generated/Props.h>
+#import <react-native-maps-generated/RCTComponentViewHelpers.h>
+
+#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import "PlaceHolderPolygonView.h"
+
+using namespace facebook::react;
+
+
+@interface RNMapsGooglePolygonView () <RCTRNMapsGooglePolygonViewProtocol>
+@end
+
+@implementation RNMapsGooglePolygonView
+
+
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>();
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMapsGooglePolygonCls(void)
+{
+    return RNMapsGooglePolygonView.class;
+}
+
+#endif

package/ios/AirMaps/RNMapsAirModule.h

@@ -3,7 +3,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <RNMapsSpecs/RNMapsSpecs.h>
+#import <react-native-maps-generated/RNMapsSpecs.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/AirMaps/RNMapsAirModule.mm

@@ -37,7 +37,7 @@
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject {
     [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
-        resolve([mapView getCamera]);
+        resolve([mapView getCameraDic]);
     } reject:reject];
 
 }
@@ -60,12 +60,13 @@
     } reject:reject];
 }
 - (void)takeSnapshot:(double)tag
-              config:(NSDictionary *)config
+              config:(NSString *)configStr
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
+    NSDictionary* config = [RCTConvert dictonaryFromString:configStr];
     [self executeWithMapView:tag success:^(id<RNMapsAirModuleDelegate> mapView) {
-        [mapView takeSnapshotWithConfig:config callback:resolve];
+        [mapView takeSnapshotWithConfig:config success:resolve error:reject];
     } reject:reject];
 }
 

package/ios/AirMaps/RNMapsMapView.h

@@ -9,7 +9,7 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
-#import "RNMapsHostVewDelegate.h"
+#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
 
 @class AIRMap;
 

package/ios/AirMaps/RNMapsMapView.mm

@@ -7,13 +7,14 @@
 //
 
 #import "RNMapsMapView.h"
-#import "AirMap.h"
+#import "AIRMap.h"
 #import "AIRMapMarker.h"
 #import "AIRMapManager.h"
-#import <react/renderer/components/RNMapsSpecs/ComponentDescriptors.h>
-#import <react/renderer/components/RNMapsSpecs/EventEmitters.h>
-#import <react/renderer/components/RNMapsSpecs/Props.h>
-#import <react/renderer/components/RNMapsSpecs/RCTComponentViewHelpers.h>
+#import "RNMapsMarkerView.h"
+#import <react-native-maps-generated/EventEmitters.h>
+#import <react-native-maps-generated/ComponentDescriptors.h>
+#import <react-native-maps-generated/Props.h>
+#import <react-native-maps-generated/RCTComponentViewHelpers.h>
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
 #import "UIView+AirMap.h"
@@ -46,8 +47,9 @@ using namespace facebook::react;
 - (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration{
     NSDictionary* regionDic = [RCTConvert dictonaryFromString:regionJSON];
     MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:regionDic];
-    _view.ignoreRegionChanges = YES;
-    [_view setRegion:region animated:YES];
+    Boolean animated = duration == 0 ? NO :YES;
+    _view.ignoreRegionChanges = animated;
+    [_view setRegion:region animated:animated];
 }
 - (void)setCamera:(NSString *)cameraJSON{
     NSDictionary* cameraDic = [RCTConvert dictonaryFromString:cameraJSON];
@@ -82,12 +84,17 @@ using namespace facebook::react;
     for (id json : coordinatesArr){
         [mutableArray addObject:[RCTConvert AIRMapCoordinate:json]];
     }
-    
+
     NSDictionary* edgePadding = [RCTConvert dictonaryFromString:edgePaddingJSON];
-    
+
     UIEdgeInsets edgeInsets = [RCTConvert UIEdgeInsets:edgePadding];
     [_view fitToCoordinates:mutableArray edgePadding:edgeInsets animated:animated];
-    
+
+}
+
+- (void) setIndoorActiveLevelIndex:(NSInteger) activeLevelIndex
+{
+    // do nothing (google only)
 }
 
 #pragma mark - Native commands
@@ -110,27 +117,27 @@ using namespace facebook::react;
     _props = defaultProps;
     _legacyMapManager = [[AIRMapManager alloc] init];
     _view = (AIRMap *)[_legacyMapManager view];
-    
+
     self.contentView = _view;
-    
+
     _view.onPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* positionDict = dictionary[@"position"];
-            
+
             // Populate the OnMapPressCoordinate struct
             facebook::react::RNMapsMapViewEventEmitter::OnPressCoordinate coordinate = {
                 .latitude = [coordinateDict[@"latitude"] doubleValue],
                 .longitude = [coordinateDict[@"longitude"] doubleValue],
             };
-            
+
             // Populate the OnMapPressPosition struct
             facebook::react::RNMapsMapViewEventEmitter::OnPressPosition position = {
                 .x = [positionDict[@"x"] doubleValue],
                 .y = [positionDict[@"y"] doubleValue],
             };
-            
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnPress data = {
                 .action = std::string([@"press" UTF8String]),
@@ -140,19 +147,18 @@ using namespace facebook::react;
             mapViewEventEmitter->onPress(data);
         }
     };
-    
-    
+
+
     _view.onMapReady = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnMapReady data = {};
             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);
             facebook::react::RNMapsMapViewEventEmitter::OnRegionChange data = {
@@ -167,23 +173,23 @@ using namespace facebook::react;
     };
     _view.onDoublePress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* positionDict = dictionary[@"position"];
-            
+
             // Populate the OnMapPressCoordinate struct
             facebook::react::RNMapsMapViewEventEmitter::OnDoublePressCoordinate coordinate = {
                 .latitude = [coordinateDict[@"latitude"] doubleValue],
                 .longitude = [coordinateDict[@"longitude"] doubleValue],
             };
-            
+
             // Populate the OnMapDouplePressPosition struct
             facebook::react::RNMapsMapViewEventEmitter::OnDoublePressPosition position = {
                 .x = [positionDict[@"x"] doubleValue],
                 .y = [positionDict[@"y"] doubleValue],
             };
-            
-            
+
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnDoublePress data = {
                 .position = position,
@@ -192,25 +198,25 @@ using namespace facebook::react;
             mapViewEventEmitter->onDoublePress(data);
         }
     };
-    
+
     _view.onPanDrag =  [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* positionDict = dictionary[@"position"];
-            
+
             // Populate the OnMapPressCoordinate struct
             facebook::react::RNMapsMapViewEventEmitter::OnPanDragCoordinate coordinate = {
                 .latitude = [coordinateDict[@"latitude"] doubleValue],
                 .longitude = [coordinateDict[@"longitude"] doubleValue],
             };
-            
+
             // Populate the OnMapDouplePressPosition struct
             facebook::react::RNMapsMapViewEventEmitter::OnPanDragPosition position = {
                 .x = [positionDict[@"x"] doubleValue],
                 .y = [positionDict[@"y"] doubleValue],
             };
-            
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnPanDrag data = {
                 .position = position,
@@ -219,14 +225,14 @@ using namespace facebook::react;
             mapViewEventEmitter->onPanDrag(data);
         }
     };
-    
+
     _view.onUserLocationChange =  [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* errorDict = dictionary[@"error"];
-            
-            
+
+
             // Populate the OnMapPressCoordinate struct
             facebook::react::RNMapsMapViewEventEmitter::OnUserLocationChangeCoordinate coordinate = {
                 .latitude = [coordinateDict[@"latitude"] doubleValue],
@@ -236,12 +242,12 @@ using namespace facebook::react;
             if (errorDict){
                 str = errorDict[@"message"];
             }
-            
+
             facebook::react::RNMapsMapViewEventEmitter::OnUserLocationChangeError error = {
                 .message = std::string([str UTF8String]),
             };
-            
-            
+
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnUserLocationChange data = {
                 .coordinate = coordinate,
@@ -250,27 +256,27 @@ using namespace facebook::react;
             mapViewEventEmitter->onUserLocationChange(data);
         }
     };
-    
+
     _view.onCalloutPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* positionDict = dictionary[@"position"];
-            
+
             // Populate the OnCalloutPressPoint struct
             facebook::react::RNMapsMapViewEventEmitter::OnCalloutPressPoint point = {
                 .x = [coordinateDict[@"x"] doubleValue],
                 .y = [coordinateDict[@"y"] doubleValue],
             };
-            
-            
+
+
             facebook::react::RNMapsMapViewEventEmitter::OnCalloutPressFrame frame = {
                 .x = [positionDict[@"x"] doubleValue],
                 .y = [positionDict[@"y"] doubleValue],
                 .width = [positionDict[@"width"] doubleValue],
                 .height = [positionDict[@"height"] doubleValue],
             };
-            
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnCalloutPress data = {
                 .action = std::string([dictionary[@"action"] UTF8String]),
@@ -281,11 +287,11 @@ using namespace facebook::react;
             mapViewEventEmitter->onCalloutPress(data);
         }
     };
-    
-    
+
+
     _view.onRegionChangeStart = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* regionDict = dictionary[@"region"];
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnRegionChangeStart data = {
@@ -298,8 +304,8 @@ using namespace facebook::react;
             mapViewEventEmitter->onRegionChangeStart(data);
         }
     };
-    
-    
+
+
 #define HANDLE_MARKER_DRAG_EVENT(eventName, emitterFunction)                     \
 if (_eventEmitter) {                                                        \
 NSDictionary* coordinateDict = dictionary[@"coordinate"];               \
@@ -312,9 +318,9 @@ facebook::react::RNMapsMapViewEventEmitter::eventName data = {          \
 };                                                                      \
 mapViewEventEmitter->emitterFunction(data);                             \
 }
-    
-    
-    
+
+
+
 #define HANDLE_MARKER_EVENT(eventName, emitterFunction, actionName)                \
 if (_eventEmitter) {                                                          \
 NSDictionary* coordinateDict = dictionary[@"coordinate"];                 \
@@ -332,27 +338,27 @@ facebook::react::RNMapsMapViewEventEmitter::eventName data = {            \
 };                                                                        \
 mapViewEventEmitter->emitterFunction(data);                               \
 }
-    
+
     _view.onMarkerDrag = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_DRAG_EVENT(OnMarkerDrag, onMarkerDrag);
     };
-    
+
     _view.onMarkerDragStart = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_DRAG_EVENT(OnMarkerDragStart, onMarkerDragStart);
     };
-    
+
     _view.onMarkerDragEnd = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_DRAG_EVENT(OnMarkerDragEnd, onMarkerDragEnd);
     };
-    
+
     _view.onMarkerSelect = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_EVENT(OnMarkerSelect, onMarkerSelect, "marker-select");
     };
-    
+
     _view.onMarkerDeselect = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_EVENT(OnMarkerDeselect, onMarkerDeselect, "marker-deselect");
     };
-    
+
     _view.onMarkerPress = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_EVENT(OnMarkerPress, onMarkerPress, "marker-press");
     };
@@ -362,7 +368,7 @@ mapViewEventEmitter->emitterFunction(data);                               \
     if (self = [super initWithFrame:frame]) {
         [self prepareMapView];
     }
-    
+
     return self;
 }
 
@@ -371,16 +377,25 @@ mapViewEventEmitter->emitterFunction(data);                               \
     id<RCTComponent> paperView = [childComponentView getPaperViewFromChildComponentView];
     if (paperView){
         [_view insertReactSubview:paperView atIndex:index];
-    } else {
+    } else if ([childComponentView isKindOfClass:[RNMapsMarkerView class]]){
+        RNMapsMarkerView* fabricMarker = (RNMapsMarkerView *) childComponentView;
+        [_view insertReactSubview:[fabricMarker marker] atIndex:index];
+    }
+    else  {
         [_view insertReactSubview:childComponentView atIndex:index];
     }
 }
+
 - (void) unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
     id<RCTComponent> paperView = [childComponentView getPaperViewFromChildComponentView];
     if (paperView){
         [_view removeReactSubview:paperView];
-    } else {
+    }
+    else if ([childComponentView isKindOfClass:[RNMapsMarkerView class]]){
+       RNMapsMarkerView* fabricMarker = (RNMapsMarkerView *) childComponentView;
+        [_view removeReactSubview:[fabricMarker marker]];
+   } else {
         [_view removeReactSubview:childComponentView];
     }
 }
@@ -403,41 +418,47 @@ MKMapType mapRNTypeToMKMapType(RNMapsMapViewMapType rnMapType) {
     [self prepareMapView];
     const auto &oldViewProps = *std::static_pointer_cast<RNMapsMapViewProps const>(_props);
     const auto &newViewProps = *std::static_pointer_cast<RNMapsMapViewProps const>(props);
-    
+
 #define REMAP_MAPVIEW_PROP(name)                    \
 if (oldViewProps.name != newViewProps.name) {   \
 _view.name = newViewProps.name;             \
 }
-    
+
 #define REMAP_MAPVIEW_STRING_PROP(name)                             \
 if (oldViewProps.name != newViewProps.name) {                   \
 _view.name = RCTNSStringFromString(newViewProps.name);      \
 }
-    
+
 #define REMAP_MAPVIEW_COLOR_PROP(name)                                   \
 if (oldViewProps.name != newViewProps.name) {                        \
 _view.name = RCTUIColorFromSharedColor(newViewProps.name);       \
 }
-    
+
 #define REMAP_MAPVIEW_POINT_PROP(name)                               \
 if (newViewProps.name.x != oldViewProps.name.x ||                \
 newViewProps.name.y != oldViewProps.name.y) {                \
 _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
 }
-    
+
 #define REMAP_MAPVIEW_REGION_PROP(name)                                      \
-if (newViewProps.name.latitude != oldViewProps.name.latitude ||          \
-newViewProps.name.longitude != oldViewProps.name.longitude ||        \
-newViewProps.name.latitudeDelta != oldViewProps.name.latitudeDelta ||\
-newViewProps.name.longitudeDelta != oldViewProps.name.longitudeDelta) { \
-MKCoordinateSpan span = MKCoordinateSpanMake(newViewProps.name.latitudeDelta, \
-newViewProps.name.longitudeDelta); \
-MKCoordinateRegion region = MKCoordinateRegionMake(CLLocationCoordinate2DMake( \
-newViewProps.name.latitude, newViewProps.name.longitude), span); \
-_view.name = region;                                                 \
-[_view didSetRegion];                                                 \
+if (!(newViewProps.name.latitude == 0 &&                                    \
+      newViewProps.name.longitude == 0 &&                                   \
+      newViewProps.name.latitudeDelta == 0 &&                               \
+      newViewProps.name.longitudeDelta == 0)) {                             \
+    if (newViewProps.name.latitude != oldViewProps.name.latitude ||         \
+        newViewProps.name.longitude != oldViewProps.name.longitude ||       \
+        newViewProps.name.latitudeDelta != oldViewProps.name.latitudeDelta ||\
+        newViewProps.name.longitudeDelta != oldViewProps.name.longitudeDelta) { \
+        MKCoordinateSpan span = MKCoordinateSpanMake(newViewProps.name.latitudeDelta, \
+                                                     newViewProps.name.longitudeDelta); \
+        MKCoordinateRegion region = MKCoordinateRegionMake(CLLocationCoordinate2DMake( \
+                                                           newViewProps.name.latitude, \
+                                                           newViewProps.name.longitude), span); \
+        _view.name = region;                                                 \
+    }                                                                        \
 }
-    
+
+
 #define REMAP_MAPVIEW_CAMERA_PROP(name)                                    \
 if (newViewProps.name.center.latitude != oldViewProps.name.center.latitude || \
 newViewProps.name.center.longitude != oldViewProps.name.center.longitude || \
@@ -450,9 +471,10 @@ MKMapCamera* camera = [[MKMapCamera alloc] init];                 \
 camera.centerCoordinate = center;                                 \
 camera.heading = newViewProps.name.heading;                       \
 camera.pitch = newViewProps.name.pitch;                           \
+camera.centerCoordinateDistance = newViewProps.name.altitude;     \
 _view.name = camera;                                              \
 }
-    
+
 #define REMAP_MAPVIEW_EDGEINSETS_PROP(name)                               \
 if (newViewProps.name.top != oldViewProps.name.top ||                 \
 newViewProps.name.right != oldViewProps.name.right ||             \
@@ -463,49 +485,51 @@ newViewProps.name.left,             \
 newViewProps.name.bottom,           \
 newViewProps.name.right);           \
 }
-    
+
 #define REMAP_MAPVIEW_MAPTYPE(rnMapType) MKMapType##rnMapType
-    
-    
+
+
     REMAP_MAPVIEW_PROP(cacheEnabled)
-    
+
     REMAP_MAPVIEW_PROP(followsUserLocation)
     REMAP_MAPVIEW_PROP(loadingEnabled)
+
     REMAP_MAPVIEW_PROP(scrollEnabled)
-    
+    REMAP_MAPVIEW_PROP(handlePanDrag)
+
     REMAP_MAPVIEW_PROP(maxDelta)
     REMAP_MAPVIEW_PROP(maxZoom)
     REMAP_MAPVIEW_PROP(minDelta)
     REMAP_MAPVIEW_PROP(minZoom)
-    
+
     REMAP_MAPVIEW_PROP(showsCompass)
     REMAP_MAPVIEW_PROP(showsScale)
-    REMAP_MAPVIEW_PROP(showsTraffic)
     REMAP_MAPVIEW_PROP(showsUserLocation)
     REMAP_MAPVIEW_PROP(userLocationCalloutEnabled)
     REMAP_MAPVIEW_PROP(zoomEnabled)
-    
+
+
     REMAP_MAPVIEW_POINT_PROP(compassOffset)
-    
+
     if (![_view ignoreRegionChanges]){
         _view.ignoreRegionChanges = YES;
         REMAP_MAPVIEW_REGION_PROP(initialRegion)
         REMAP_MAPVIEW_REGION_PROP(region)
         _view.ignoreRegionChanges = NO;
     }
-    
+
     REMAP_MAPVIEW_CAMERA_PROP(initialCamera)
     REMAP_MAPVIEW_CAMERA_PROP(camera)
-    
+
     REMAP_MAPVIEW_EDGEINSETS_PROP(legalLabelInsets)
     REMAP_MAPVIEW_EDGEINSETS_PROP(mapPadding)
-    
+
     REMAP_MAPVIEW_COLOR_PROP(loadingIndicatorColor)
     REMAP_MAPVIEW_COLOR_PROP(loadingIndicatorColor)
     REMAP_MAPVIEW_COLOR_PROP(tintColor)
-    
+
     REMAP_MAPVIEW_STRING_PROP(userLocationAnnotationTitle)
-    
+
     if (oldViewProps.mapType != newViewProps.mapType){
         _view.mapType = mapRNTypeToMKMapType(newViewProps.mapType);
     }
@@ -522,16 +546,16 @@ newViewProps.name.right);           \
                 break;
         }
     }
-    
+
     if (oldViewProps.cameraZoomRange.minCenterCoordinateDistance != newViewProps.cameraZoomRange.minCenterCoordinateDistance ||
         oldViewProps.cameraZoomRange.maxCenterCoordinateDistance != newViewProps.cameraZoomRange.maxCenterCoordinateDistance ||
         oldViewProps.cameraZoomRange.animated != newViewProps.cameraZoomRange.animated) {
-        
+
         MKMapCameraZoomRange* zoomRange = [[MKMapCameraZoomRange alloc] initWithMinCenterCoordinateDistance:newViewProps.cameraZoomRange.minCenterCoordinateDistance maxCenterCoordinateDistance:newViewProps.cameraZoomRange.maxCenterCoordinateDistance];
         [_view setCameraZoomRange:zoomRange animated:newViewProps.cameraZoomRange.animated];
     }
-    
-    
+
+
     [super updateProps:props oldProps:oldProps];
 }
 

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/ios/AirMaps/RNMapsMarkerView.h

@@ -0,0 +1,24 @@
+//
+//  RNMapsMarker.h
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^LoadCompletionHandler)(UIView *view);
+
+@class AIRMapMarker;
+@interface RNMapsMarkerView : RCTViewComponentView
+- (AIRMapMarker*) marker;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif