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

package/README.md

@@ -14,10 +14,19 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 
 ## Compatibility
 
-## React-Native Requirements
+## React Native Compatibility
 
-- **Version 1.14.0 and above**: Requires `react-native >= 0.74`.
-- **Versions below 1.14.0**: Require `react-native >= 0.64.3`.
+### Important Notes:
+
+- **Fabric is not yet supported**:  
+  This feature is currently under development. Fabric is enabled by default in React Native `0.76` and above, so **please disable it** for now.  
+  Follow updates on this issue here: [react-native-maps/issues/5206](https://github.com/react-native-maps/react-native-maps/issues/5206).  
+  Kindly refrain from opening duplicate tickets regarding this matter.
+
+### Version Requirements:
+
+- **Version `1.14.0` and above**: Requires **React Native `>= 0.74`**.
+- **Versions below `1.14.0`**: Require **React Native `>= 0.64.3`**.
 
 ## Component API
 
@@ -202,9 +211,7 @@ For IOS: configure [App Transport Security](https://developer.apple.com/library/
 
 ## React Native Configuration for Fabric / New Architecture
 
-This library works with Fabric using the [New Renderer Interop Layer](https://github.com/reactwg/react-native-new-architecture/discussions/135)
-
-There is a warning message that those steps are not necessary; but we couldn't get the example working without them so far.
+This library doesn't support the new arch yet due to issues with inserting subviews / interoplayer. we're working on it.
 
 ### Configuration Steps
 

package/ios/AirMaps/AIRMap.h

@@ -28,7 +28,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 @property (nonatomic, strong) UIView *loadingView;
 
 @property (nonatomic, copy) NSString *userLocationAnnotationTitle;
-@property (nonatomic, assign) BOOL followUserLocation;
+@property (nonatomic, assign) BOOL followsUserLocation;
 @property (nonatomic, assign) BOOL userLocationCalloutEnabled;
 @property (nonatomic, assign) BOOL hasStartedRendering;
 @property (nonatomic, assign) BOOL cacheEnabled;
@@ -79,5 +79,6 @@ extern const NSInteger AIRMapMaxZoomLevel;
 
 - (AIRMapMarker*) markerAtPoint:(CGPoint)point;
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
+- (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex;
 
 @end

package/ios/AirMaps/AIRMap.m

@@ -372,7 +372,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 - (void)setFollowsUserLocation:(BOOL)followsUserLocation
 {
-    _followUserLocation = followsUserLocation;
+    _followsUserLocation = followsUserLocation;
 }
 
 - (void)setUserLocationCalloutEnabled:(BOOL)calloutEnabled

package/ios/AirMaps/AIRMapManager.m

@@ -52,13 +52,13 @@ RCT_EXPORT_MODULE()
 
     map.isAccessibilityElement = NO;
     map.accessibilityElementsHidden = NO;
-    
+
     // MKMapView doesn't report tap events, so we attach gesture recognizers to it
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleMapTap:)];
     UITapGestureRecognizer *doubleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleMapDoubleTap:)];
     [doubleTap setNumberOfTapsRequired:2];
     [tap requireGestureRecognizerToFail:doubleTap];
-    
+
     UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleMapLongPress:)];
     UIPanGestureRecognizer *drag = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleMapDrag:)];
     [drag setMinimumNumberOfTouches:1];
@@ -66,13 +66,13 @@ RCT_EXPORT_MODULE()
     tap.cancelsTouchesInView = NO;
     doubleTap.cancelsTouchesInView = NO;
     longPress.cancelsTouchesInView = NO;
-    
+
     doubleTap.delegate = self;
-    
+
     // disable drag by default
     drag.enabled = NO;
     drag.delegate = self;
-  
+
     [map addGestureRecognizer:tap];
     [map addGestureRecognizer:doubleTap];
     [map addGestureRecognizer:longPress];
@@ -139,7 +139,7 @@ RCT_CUSTOM_VIEW_PROPERTY(initialRegion, MKCoordinateRegion, AIRMap)
 RCT_CUSTOM_VIEW_PROPERTY(initialCamera, MKMapCamera, AIRMap)
 {
     if (json == nil) return;
-    
+
     // don't emit region change events when we are setting the initialCamera
     BOOL originalIgnore = view.ignoreRegionChanges;
     view.ignoreRegionChanges = YES;
@@ -166,7 +166,7 @@ RCT_CUSTOM_VIEW_PROPERTY(region, MKCoordinateRegion, AIRMap)
 RCT_CUSTOM_VIEW_PROPERTY(camera, MKMapCamera*, AIRMap)
 {
     if (json == nil) return;
-    
+
     // don't emit region change events when we are setting the camera
     BOOL originalIgnore = view.ignoreRegionChanges;
     view.ignoreRegionChanges = YES;
@@ -551,16 +551,16 @@ RCT_EXPORT_METHOD(getAddressFromCoordinates:(nonnull NSNumber *)reactTag
                                   [overlay drawToSnapshot:snapshot context:UIGraphicsGetCurrentContext()];
                           }
                       }
-                      
+
                       for (id <MKAnnotation> annotation in mapView.annotations) {
                           CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
-                          
+
                           MKAnnotationView* anView = [mapView viewForAnnotation: annotation];
-                          
+
                           if (anView){
                               pin = anView;
                           }
-                          
+
                           if (CGRectContainsPoint(rect, point)) {
                               point.x = point.x + pin.centerOffset.x - (pin.bounds.size.width / 2.0f);
                               point.y = point.y + pin.centerOffset.y - (pin.bounds.size.height / 2.0f);
@@ -720,7 +720,7 @@ RCT_EXPORT_METHOD(getAddressFromCoordinates:(nonnull NSNumber *)reactTag
 - (void)handleMapDoubleTap:(UIPanGestureRecognizer*)recognizer {
     AIRMap *map = (AIRMap *)recognizer.view;
     if (!map.onDoublePress) return;
-    
+
     CGPoint touchPoint = [recognizer locationInView:map];
     CLLocationCoordinate2D coord = [map convertPoint:touchPoint toCoordinateFromView:map];
     map.onDoublePress(@{
@@ -733,7 +733,7 @@ RCT_EXPORT_METHOD(getAddressFromCoordinates:(nonnull NSNumber *)reactTag
                             @"y": @(touchPoint.y),
                             },
                     });
-    
+
 }
 
 
@@ -925,15 +925,15 @@ static int kDragCenterContext;
                          @"heading": @(location.location.course),
                          }
                  };
-    
+
     if (mapView.onUserLocationChange) {
         mapView.onUserLocationChange(event);
     }
-    
-    if (mapView.followUserLocation) {
+
+    if (mapView.followsUserLocation) {
         [mapView setCenterCoordinate:location.coordinate animated:YES];
     }
-    
+
 }
 
 - (void)mapView:(AIRMap *)mapView regionWillChangeAnimated:(BOOL)animated
@@ -1171,7 +1171,7 @@ static int kDragCenterContext;
     // flyover maps don't use mercator projection so we can't calculate their zoom level.
     if (mapView.mapType == MKMapTypeHybridFlyover || mapView.mapType == MKMapTypeSatelliteFlyover) {
         return;
-    } 
+    }
 
     CGFloat zoomLevel = [mapView getZoomLevel];
 

package/ios/AirMaps/AIRMapMarker.m

@@ -70,6 +70,14 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         [super insertReactSubview:(UIView *)subview atIndex:atIndex];
     }
 }
+- (void) setFrame:(CGRect)frame {
+    // hack to ignore call by react transactions when it shouldn't
+    if (!CGPointEqualToPoint(self.frame.origin, CGPointZero) &&
+        CGPointEqualToPoint(frame.origin, CGPointZero)){
+        return;
+    }
+    [super setFrame:frame];
+}
 
 - (void)removeReactSubview:(id<RCTComponent>)subview {
     if ([subview isKindOfClass:[AIRMapCallout class]] && self.calloutView == subview) {
@@ -84,7 +92,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     if ([self shouldUsePinView]) {
         // In this case, we want to render a platform "default" legacy marker.
 
-        
+
         if (_pinView == nil && _useLegacyPinView) {
             _pinView = [[MKPinAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];
             [self addGestureRecognizerToView:_pinView];
@@ -99,8 +107,8 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 
             return _pinView;
         }
-    
-        
+
+
 
         if (_markerView == nil && !_useLegacyPinView) {
             _markerView = [[MKMarkerAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];

package/ios/AirMaps/RCTConvert+AirMap.h

@@ -14,5 +14,6 @@
 + (MKMapCamera*)MKMapCamera:(id)json;
 + (MKMapCamera*)MKMapCameraWithDefaults:(id)json existingCamera:(MKMapCamera*)camera;
 + (MKMapType)MKMapType:(id)json;
-
++ (NSDictionary*) dictonaryFromString:(NSString *) str;
++ (NSArray*) arrayFromString:(NSString *) str;
 @end

package/ios/AirMaps/RCTConvert+AirMap.m

@@ -33,6 +33,22 @@
     return [RCTConvert MKMapCameraWithDefaults:json existingCamera:nil];
 }
 
++ (NSDictionary*) dictonaryFromString:(NSString *) str {
+    NSError *jsonError;
+    NSData *objectData = [str dataUsingEncoding:NSUTF8StringEncoding];
+    return [NSJSONSerialization JSONObjectWithData:objectData
+                                              options:NSJSONReadingMutableContainers
+                                                error:&jsonError];
+}
+
++ (NSArray*) arrayFromString:(NSString *) str {
+    NSError *jsonError;
+    NSData *objectData = [str dataUsingEncoding:NSUTF8StringEncoding];
+    return [NSJSONSerialization JSONObjectWithData:objectData
+                                              options:NSJSONReadingMutableContainers
+                                                error:&jsonError];
+}
+
 + (MKMapCamera*)MKMapCameraWithDefaults:(id)json existingCamera:(MKMapCamera*)camera
 {
     json = [self NSDictionary:json];

package/ios/AirMaps/RNMapsAirModule.h

@@ -0,0 +1,13 @@
+//  RCTNativeLocalStorage.h
+//  TurboModuleExample
+
+#import <Foundation/Foundation.h>
+#import <RNMapsSpecs/RNMapsSpecs.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMapsAirModule : NSObject <NativeAirMapsModuleSpec>
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/AirMaps/RNMapsAirModule.mm

@@ -0,0 +1,280 @@
+//
+//  RNMapsMarkerManager.m
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+
+#import "RNMapsAirModule.h"
+#import <React/RCTUIManager.h>
+#import <React/RCTViewManager.h>
+#import "RNMapsMapView.h"
+#import "AIRMap.h"
+#import "AIRMapSnapshot.h"
+#import <MapKit/MapKit.h>
+#import "RCTConvert+AirMap.h"
+
+@implementation RNMapsAirModule
+
+@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
+
+- (void)executeWithMapView:(double)tag
+                   success:(void (^)(AIRMap *mapView))success
+                   reject:(RCTPromiseRejectBlock)reject {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        id view = [_viewRegistry_DEPRECATED viewForReactTag:[NSNumber numberWithDouble:tag]];
+        if (![view isKindOfClass:[RNMapsMapView class]]) {
+            reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RNMapsMapView, got: %@", view], NULL);
+        } else {
+            AIRMap *mapView = [view mapView];
+            success(mapView);
+        }
+    });
+}
+
+- (void)getCamera:(double)tag
+          resolve:(RCTPromiseResolveBlock)resolve
+           reject:(RCTPromiseRejectBlock)reject {
+    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+            MKMapCamera *camera = [mapView camera];
+            resolve(@{
+                      @"center": @{
+                              @"latitude": @(camera.centerCoordinate.latitude),
+                              @"longitude": @(camera.centerCoordinate.longitude),
+                      },
+                      @"pitch": @(camera.pitch),
+                      @"heading": @(camera.heading),
+                      @"altitude": @(camera.altitude),
+            });
+    } reject:reject];
+
+}
+
+- (void)getMarkersFrames:(double)tag
+             onlyVisible:(BOOL)onlyVisible
+                 resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject
+{
+    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+        resolve([mapView getMarkersFramesWithOnlyVisible:onlyVisible]);
+    } reject:reject];
+}
+- (void)getMapBoundaries:(double)tag
+                 resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject
+{
+    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+        resolve([mapView getMapBoundaries]);
+    } reject:reject];
+}
+- (void)takeSnapshot:(double)tag
+              config:(NSDictionary *)config
+             resolve:(RCTPromiseResolveBlock)resolve
+              reject:(RCTPromiseRejectBlock)reject
+{
+
+    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+          
+        MKMapSnapshotOptions *options = [[MKMapSnapshotOptions alloc] init];
+       
+        options.mapType = mapView.mapType;
+        NSNumber *width = config[@"width"];
+        NSNumber *height = config[@"height"];
+        NSNumber *quality = config[@"quality"];
+        NSString*format =config[@"format"];
+        NSString*result =config[@"result"];
+        MKCoordinateRegion region = [RCTConvert MKCoordinateRegion:config[@"region"]];
+       
+     
+        options.region = (region.center.latitude && region.center.longitude) ? region : mapView.region;
+        options.size = CGSizeMake(
+          ([width floatValue] == 0) ? mapView.bounds.size.width : [width floatValue],
+          ([height floatValue] == 0) ? mapView.bounds.size.height : [height floatValue]
+        );
+        
+        options.scale = [[UIScreen mainScreen] scale];
+
+
+        MKMapSnapshotter *snapshotter = [[MKMapSnapshotter alloc] initWithOptions:options];
+
+        [self takeMapSnapshot:mapView
+            snapshotter:snapshotter
+            format:format
+            quality:[quality floatValue]
+            result:result
+            callback:resolve];
+        
+    } reject:reject];
+    
+   
+}
+- (void)getAddressFromCoordinates:(double)tag
+                       coordinate:(JS::NativeAirMapsModule::LatLng &)coordinate
+                          resolve:(RCTPromiseResolveBlock)resolve
+                           reject:(RCTPromiseRejectBlock)reject
+{
+    double latitude = coordinate.latitude();
+    double longitude = coordinate.longitude();
+    
+    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+        CLLocation *location = [[CLLocation alloc] initWithLatitude:latitude
+                                                          longitude:longitude];
+        CLGeocoder *geoCoder = [[CLGeocoder alloc] init];
+        [geoCoder reverseGeocodeLocation:location
+                       completionHandler:^(NSArray *placemarks, NSError *error) {
+            if (error == nil && [placemarks count] > 0){
+                CLPlacemark *placemark = placemarks[0];
+                resolve(@{
+                    @"name" : [NSString stringWithFormat:@"%@", placemark.name],
+                    @"thoroughfare" : [NSString stringWithFormat:@"%@", placemark.thoroughfare],
+                    @"subThoroughfare" : [NSString stringWithFormat:@"%@", placemark.subThoroughfare],
+                    @"locality" : [NSString stringWithFormat:@"%@", placemark.locality],
+                    @"subLocality" : [NSString stringWithFormat:@"%@", placemark.subLocality],
+                    @"administrativeArea" : [NSString stringWithFormat:@"%@", placemark.administrativeArea],
+                    @"subAdministrativeArea" : [NSString stringWithFormat:@"%@", placemark.subAdministrativeArea],
+                    @"postalCode" : [NSString stringWithFormat:@"%@", placemark.postalCode],
+                    @"countryCode" : [NSString stringWithFormat:@"%@", placemark.ISOcountryCode],
+                    @"country" : [NSString stringWithFormat:@"%@", placemark.country],
+                });
+            } else {
+                reject(@"Invalid argument", [NSString stringWithFormat:@"Can not get address location"], NULL);
+            }
+        }];
+        
+    } reject:reject];
+}
+
+- (void)getPointForCoordinate:(double)tag
+                   coordinate:(JS::NativeAirMapsModule::LatLng &)coordinate
+                      resolve:(RCTPromiseResolveBlock)resolve
+                       reject:(RCTPromiseRejectBlock)reject
+{
+    double latitude = coordinate.latitude();
+    double longitude = coordinate.longitude();
+    
+    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+    
+        CGPoint touchPoint = [mapView convertCoordinate:
+                              CLLocationCoordinate2DMake(latitude,longitude)
+                                          toPointToView:mapView];
+
+        resolve(@{
+                  @"x": @(touchPoint.x),
+                  @"y": @(touchPoint.y),
+                  });
+        
+    } reject:reject];
+    
+}
+- (void)getCoordinateForPoint:(double)tag
+                        point:(JS::NativeAirMapsModule::Point &)point
+                      resolve:(RCTPromiseResolveBlock)resolve
+                       reject:(RCTPromiseRejectBlock)reject
+{
+    double x = point.x();
+    double y = point.y();
+    
+    [self executeWithMapView:tag success:^(AIRMap *mapView) {
+    
+       
+        CLLocationCoordinate2D coordinate = [mapView convertPoint:CGPointMake(x,y)
+            toCoordinateFromView:mapView];
+
+            resolve(@{
+                      @"latitude": @(coordinate.latitude),
+                      @"longitude": @(coordinate.longitude),
+                      });
+        
+    } reject:reject];
+    
+   
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeAirMapsModuleSpecJSI>(params);
+}
+
++ (NSString *)moduleName { 
+    return nil;
+}
+
+#pragma mark Take Snapshot
+- (void)takeMapSnapshot:(AIRMap *)mapView
+        snapshotter:(MKMapSnapshotter *) snapshotter
+        format:(NSString *)format
+        quality:(CGFloat) quality
+        result:(NSString *)result
+        callback:(RCTPromiseResolveBlock) callback {
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    NSString *pathComponent = [NSString stringWithFormat:@"Documents/snapshot-%.20lf.%@", timeStamp, format];
+    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
+
+    [snapshotter startWithQueue:dispatch_get_main_queue()
+              completionHandler:^(MKMapSnapshot *snapshot, NSError *error) {
+                  if (error) {
+                      callback(@[error]);
+                      return;
+                  }
+                  MKAnnotationView *pin = [[MKPinAnnotationView alloc] initWithAnnotation:nil reuseIdentifier:nil];
+
+                  UIImage *image = snapshot.image;
+                  UIGraphicsBeginImageContextWithOptions(image.size, YES, image.scale);
+                  {
+                      [image drawAtPoint:CGPointMake(0.0f, 0.0f)];
+
+                      CGRect rect = CGRectMake(0.0f, 0.0f, image.size.width, image.size.height);
+
+                      for (id <AIRMapSnapshot> overlay in mapView.overlays) {
+                          if ([overlay respondsToSelector:@selector(drawToSnapshot:context:)]) {
+                                  [overlay drawToSnapshot:snapshot context:UIGraphicsGetCurrentContext()];
+                          }
+                      }
+                      
+                      for (id <MKAnnotation> annotation in mapView.annotations) {
+                          CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
+                          
+                          MKAnnotationView* anView = [mapView viewForAnnotation: annotation];
+                          
+                          if (anView){
+                              pin = anView;
+                          }
+                          
+                          if (CGRectContainsPoint(rect, point)) {
+                              point.x = point.x + pin.centerOffset.x - (pin.bounds.size.width / 2.0f);
+                              point.y = point.y + pin.centerOffset.y - (pin.bounds.size.height / 2.0f);
+                              if (pin.image) {
+                                  [pin.image drawAtPoint:point];
+                              } else {
+                                  CGRect pinRect = CGRectMake(point.x, point.y, pin.bounds.size.width, pin.bounds.size.height);
+                                  [pin drawViewHierarchyInRect:pinRect afterScreenUpdates:NO];
+                              }
+                          }
+                      }
+
+                      UIImage *compositeImage = UIGraphicsGetImageFromCurrentImageContext();
+
+                      NSData *data;
+                      if ([format isEqualToString:@"png"]) {
+                          data = UIImagePNGRepresentation(compositeImage);
+                      }
+                      else if([format isEqualToString:@"jpg"]) {
+                          data = UIImageJPEGRepresentation(compositeImage, quality);
+                      }
+
+                      if ([result isEqualToString:@"file"]) {
+                          [data writeToFile:filePath atomically:YES];
+                          callback(filePath);
+                      }
+                      else if ([result isEqualToString:@"base64"]) {
+                          callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
+                      }
+                  }
+                  UIGraphicsEndImageContext();
+              }];
+}
+
+@end
+

package/ios/AirMaps/RNMapsMapView.h

@@ -0,0 +1,21 @@
+//
+//  RNMapsMarker.h
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+@class AIRMap;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMapsMapView : RCTViewComponentView
+
+- (AIRMap *) mapView;
+
+@end
+
+NS_ASSUME_NONNULL_END