react-native-maps 1.20.1 → 1.21.0-alpha.10

package/ios/AirMaps/RNMapsMapView.mm

@@ -0,0 +1,535 @@
+//
+//  RNMapsMarker.m
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+
+#import "RNMapsMapView.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 "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+
+using namespace facebook::react;
+
+@interface RNMapsMapView () <RCTRNMapsMapViewViewProtocol>
+@end
+
+@implementation RNMapsMapView {
+    AIRMap *_view;
+    AIRMapManager* _legacyMapManager;
+}
+
+
+- (id<RNMapsAirModuleDelegate>) mapView {
+    return _view;
+}
+
+#pragma mark - JS Commands
+- (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration{
+    NSDictionary* regionDic = [RCTConvert dictonaryFromString:regionJSON];
+    [AIRMap animateWithDuration:duration/1000 animations:^{
+        [self->_view setRegion:[RCTConvert MKCoordinateRegion:regionDic] animated:YES];
+    }];
+}
+- (void)setCamera:(NSString *)cameraJSON{
+    NSDictionary* cameraDic = [RCTConvert dictonaryFromString:cameraJSON];
+    MKMapCamera *camera = [RCTConvert MKMapCameraWithDefaults:cameraDic existingCamera:[_view camera]];
+    [_view setCamera:camera];
+}
+
+- (void)animateCamera:(NSString *)cameraJSON duration:(NSInteger)duration{
+    NSDictionary* cameraDic = [RCTConvert dictonaryFromString:cameraJSON];
+    MKMapCamera *camera = [RCTConvert MKMapCameraWithDefaults:cameraDic existingCamera:[_view camera]];
+
+    // don't emit region change events when we are setting the camera
+    BOOL originalIgnore = _view.ignoreRegionChanges;
+    _view.ignoreRegionChanges = YES;
+    [AIRMap animateWithDuration:duration/1000 animations:^{
+        [self->_view setCamera:camera animated:YES];
+    } completion:^(BOOL finished){
+        self->_view.ignoreRegionChanges = originalIgnore;
+    }];
+
+}
+
+- (void)fitToElements:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+    [_view showAnnotations:_view.annotations animated:animated];
+}
+
+- (void)fitToSuppliedMarkers:(NSString *)markersJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+    NSArray* markers = [RCTConvert arrayFromString:markersJSON];
+    NSPredicate *filterMarkers = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
+        AIRMapMarker *marker = (AIRMapMarker *)evaluatedObject;
+        return [marker isKindOfClass:[AIRMapMarker class]] && [markers containsObject:marker.identifier];
+    }];
+    NSArray *filteredMarkers = [_view.annotations filteredArrayUsingPredicate:filterMarkers];
+    [_view showAnnotations:filteredMarkers animated:animated];
+
+}
+- (void)fitToCoordinates:(NSString *)coordinatesJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+    NSArray* coordinatesArr = [RCTConvert arrayFromString:coordinatesJSON];
+    NSMutableArray<AIRMapCoordinate*>* mutableArray = [NSMutableArray new];
+    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];
+
+}
+
+#pragma mark - Native commands
+
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
+{
+    RCTRNMapsMapViewHandleCommand(self, commandName, args);
+}
+
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMapsMapViewComponentDescriptor>();
+}
+
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMapsMapViewProps>();
+    _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]),
+                  .position = position,
+                  .coordinate = coordinate
+              };
+              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) {
+          if (_eventEmitter) {
+
+              NSDictionary* regionDict = dictionary[@"region"];
+              auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
+              facebook::react::RNMapsMapViewEventEmitter::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.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,
+                  .coordinate = coordinate
+                 };
+              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,
+                        .coordinate = coordinate,
+                 };
+              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],
+                  .longitude = [coordinateDict[@"longitude"] doubleValue],
+              };
+              facebook::react::RNMapsMapViewEventEmitter::OnUserLocationChangeError error = {
+                  .message = std::string([errorDict[@"message"] UTF8String]),
+              };
+
+
+              auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
+              facebook::react::RNMapsMapViewEventEmitter::OnUserLocationChange data = {
+                  .coordinate = coordinate,
+                  .error = error,
+                 };
+              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]),
+                  .id = std::string([dictionary[@"id"] UTF8String]),
+                  .point = point,
+                  .frame = frame,
+                 };
+              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 = {
+                  .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->onRegionChangeStart(data);
+          }
+      };
+
+
+#define HANDLE_MARKER_DRAG_EVENT(eventName, emitterFunction)                     \
+    if (_eventEmitter) {                                                        \
+        NSDictionary* coordinateDict = dictionary[@"coordinate"];               \
+        auto mapViewEventEmitter =                                              \
+            std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter); \
+        facebook::react::RNMapsMapViewEventEmitter::eventName data = {          \
+            .coordinate.latitude = [coordinateDict[@"latitude"] doubleValue],   \
+            .coordinate.longitude = [coordinateDict[@"longitude"] doubleValue], \
+            .id = std::string([[dictionary valueForKey:@"id"] UTF8String]),     \
+        };                                                                      \
+        mapViewEventEmitter->emitterFunction(data);                             \
+    }
+
+
+
+#define HANDLE_MARKER_EVENT(eventName, emitterFunction, actionName)                \
+    if (_eventEmitter) {                                                          \
+        NSDictionary* coordinateDict = dictionary[@"coordinate"];                 \
+        facebook::react::RNMapsMapViewEventEmitter::eventName##Coordinate coordinate = { \
+            .latitude = [coordinateDict[@"latitude"] doubleValue],                 \
+            .longitude = [coordinateDict[@"longitude"] doubleValue],               \
+        };                                                                        \
+                                                                                  \
+        auto mapViewEventEmitter =                                                \
+            std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter); \
+        facebook::react::RNMapsMapViewEventEmitter::eventName data = {            \
+            .action = std::string([@actionName UTF8String]),                      \
+            .id = std::string([[dictionary valueForKey:@"id"] UTF8String]),       \
+            .coordinate = coordinate                                              \
+        };                                                                        \
+        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");
+      };
+
+
+
+  }
+
+  return self;
+}
+
+- (id)getPaperViewFromChildComponentView:(UIView *)childComponentView {
+    // Check if the childComponentView responds to the "adapter" selector
+    if ([childComponentView respondsToSelector:@selector(paperView)]) {
+        // Safely return the paperView
+        return [childComponentView valueForKey:@"paperView"];
+    }
+    // Return nil if paperView is not accessible
+    return nil;
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index{
+    id<RCTComponent> paperView = [self getPaperViewFromChildComponentView:childComponentView];
+    if (paperView){
+        [_view insertReactSubview:paperView atIndex:index];
+    }
+}
+- (void) unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    id<RCTComponent> paperView = [self getPaperViewFromChildComponentView:childComponentView];
+    if (paperView){
+        [_view removeReactSubview:paperView];
+    }
+}
+
+MKMapType mapRNTypeToMKMapType(RNMapsMapViewMapType rnMapType) {
+    switch (rnMapType) {
+        case RNMapsMapViewMapType::Standard: return MKMapTypeStandard;
+        case RNMapsMapViewMapType::Satellite: return MKMapTypeSatellite;
+        case RNMapsMapViewMapType::Hybrid: return MKMapTypeHybrid;
+        case RNMapsMapViewMapType::MutedStandard: return MKMapTypeMutedStandard;
+        case RNMapsMapViewMapType::SatelliteFlyover: return MKMapTypeSatelliteFlyover;
+        case RNMapsMapViewMapType::HybridFlyover: return MKMapTypeHybridFlyover;
+        default: return MKMapTypeStandard; // Default case
+    }
+}
+
+
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
+{
+  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;                                                 \
+    }
+
+#define REMAP_MAPVIEW_CAMERA_PROP(name)                                    \
+    if (newViewProps.name.center.latitude != oldViewProps.name.center.latitude || \
+        newViewProps.name.center.longitude != oldViewProps.name.center.longitude || \
+        newViewProps.name.heading != oldViewProps.name.heading ||         \
+        newViewProps.name.pitch != oldViewProps.name.pitch) {             \
+        CLLocationCoordinate2D center = CLLocationCoordinate2DMake(       \
+            newViewProps.name.center.latitude,                            \
+            newViewProps.name.center.longitude);                          \
+        MKMapCamera* camera = [[MKMapCamera alloc] init];                 \
+        camera.centerCoordinate = center;                                 \
+        camera.heading = newViewProps.name.heading;                       \
+        camera.pitch = newViewProps.name.pitch;                           \
+        _view.name = camera;                                              \
+    }
+
+#define REMAP_MAPVIEW_EDGEINSETS_PROP(name)                               \
+    if (newViewProps.name.top != oldViewProps.name.top ||                 \
+        newViewProps.name.right != oldViewProps.name.right ||             \
+        newViewProps.name.bottom != oldViewProps.name.bottom ||           \
+        newViewProps.name.left != oldViewProps.name.left) {               \
+        _view.name = UIEdgeInsetsMake(newViewProps.name.top,              \
+                                      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(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)
+
+    REMAP_MAPVIEW_REGION_PROP(region)
+    REMAP_MAPVIEW_REGION_PROP(initialRegion)
+
+    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);
+    }
+    if (oldViewProps.userInterfaceStyle != newViewProps.userInterfaceStyle){
+        switch (newViewProps.userInterfaceStyle) {
+            case RNMapsMapViewUserInterfaceStyle::Light:
+                _view.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
+                break;
+            case RNMapsMapViewUserInterfaceStyle::Dark:
+                _view.overrideUserInterfaceStyle = UIUserInterfaceStyleDark;
+                break;
+            case RNMapsMapViewUserInterfaceStyle::System:
+                _view.overrideUserInterfaceStyle = UIUserInterfaceStyleUnspecified;
+                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];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMapsMapViewCls(void)
+{
+  return RNMapsMapView.class;
+}

package/ios/AirMaps/RNMapsMapViewManager.mm

@@ -0,0 +1,24 @@
+//
+//  RNMapsMarkerManager.m
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+
+#import <React/RCTLog.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTViewManager.h>
+
+@interface RNMapsMapViewManager : RCTViewManager
+@end
+
+@implementation RNMapsMapViewManager
+
+RCT_EXPORT_MODULE(RNMapsMapViewManager)
+
+
+
+
+
+@end

package/ios/AirMaps.xcodeproj/project.pbxproj

@@ -26,6 +26,8 @@
 		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 */; };
+		4E430F272CF20153006E4F41 /* RNMapsMarkerManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E430F262CF20153006E4F41 /* RNMapsMarkerManager.mm */; };
+		4E430F2A2CF20305006E4F41 /* RNMapsMarker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E430F292CF20305006E4F41 /* RNMapsMarker.mm */; };
 		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 */; };
@@ -117,6 +119,9 @@
 		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>"; };
+		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>"; };
 		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>"; };
@@ -285,6 +290,9 @@
 				4C99C9DD2226CF2800A8693E /* AIRWeakTimerReference.m */,
 				4C99C9DF2226D8C400A8693E /* AIRWeakMapReference.h */,
 				4C99C9E02226D8C400A8693E /* AIRWeakMapReference.m */,
+				4E430F262CF20153006E4F41 /* RNMapsMarkerManager.mm */,
+				4E430F282CF20305006E4F41 /* RNMapsMarker.h */,
+				4E430F292CF20305006E4F41 /* RNMapsMarker.mm */,
 			);
 			path = AirMaps;
 			sourceTree = "<group>";
@@ -417,6 +425,7 @@
 				9B9498CE2017EFB800158761 /* AIRGMSMarker.m in Sources */,
 				9B9498D72017EFB800158761 /* AIRGoogleMapManager.m in Sources */,
 				19DABC7F1E7C9D3C00F41150 /* RCTConvert+AirMap.m in Sources */,
+				4E430F272CF20153006E4F41 /* RNMapsMarkerManager.mm in Sources */,
 				A8494E2E218891180092506D /* AIRGoogleMapWMSTileManager.m in Sources */,
 				8B19A3C82257BBDF00BB8735 /* AIRMapCalloutSubview.m in Sources */,
 				1125B2E51C4AD3DA007D0023 /* AIRMapPolyline.m in Sources */,
@@ -449,6 +458,7 @@
 				DA6C26381C9E2AFE0035349F /* AIRMapUrlTile.m in Sources */,
 				628F81231FD16EFA0058313A /* AIRMapLocalTileManager.m in Sources */,
 				9B9498D22017EFB800158761 /* AIRGoogleMapMarkerManager.m in Sources */,
+				4E430F2A2CF20305006E4F41 /* RNMapsMarker.mm in Sources */,
 				9B9498CC2017EFB800158761 /* AIRGMSPolygon.m in Sources */,
 				1125B2DE1C4AD3DA007D0023 /* AIRMapCircleManager.m in Sources */,
 				1125B2DC1C4AD3DA007D0023 /* AIRMapCalloutManager.m in Sources */,

package/lib/MapOverlay.d.ts

@@ -70,7 +70,7 @@ type OverlayPressEvent = NativeSyntheticEvent<{
      */
     action: 'overlay-press' | 'image-overlay-press';
     /**
-     * @platform iOS: Apple maps
+     * @platform iOS: Apple Maps
      */
     name?: string;
     /**

package/lib/MapView.d.ts

@@ -11,7 +11,7 @@ export type MapViewProps = ViewProps & {
      * If `true` map will be cached and displayed as an image instead of being interactable, for performance usage.
      *
      * @default false
-     * @platform iOS: Apple maps only
+     * @platform iOS: Apple Maps only
      * @platform Android: Supported
      */
     cacheEnabled?: boolean;
@@ -92,7 +92,7 @@ export type MapViewProps = ViewProps & {
      */
     kmlSrc?: string;
     /**
-     * If set, changes the position of the "Legal" label link in Apple maps.
+     * If set, changes the position of the "Legal" label link in Apple Maps.
      *
      * @platform iOS: Apple Maps only
      * @platform Android: Not supported
@@ -615,6 +615,7 @@ type State = {
 declare class MapView extends React.Component<MapViewProps, State> {
     static Animated: Animated.AnimatedComponent<typeof MapView>;
     private map;
+    private fabricMap;
     constructor(props: MapViewProps);
     setNativeProps(props: Partial<NativeProps>): void;
     private _onMapReady;
@@ -702,9 +703,12 @@ declare class MapView extends React.Component<MapViewProps, State> {
      * @return Object Object bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
      */
     boundingBoxForRegion(region: Region): BoundingBox;
-    private _mapManagerCommand;
     private _getHandle;
-    private _runCommand;
+    private handleMapPress;
+    private handleMarkerPress;
+    private handleMarkerSelect;
+    private handleMarkerDeselect;
+    private handleRegionChange;
     render(): React.JSX.Element;
 }
 export declare const AnimatedMapView: RNAnimated.AnimatedComponent<typeof MapView>;