react-native-maps 1.21.0-alpha.98 → 1.21.0

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -10,17 +10,33 @@
 #import "RNMapsGoogleMapView.h"
 #import "RNMapsGooglePolygonView.h"
 #import "AIRGoogleMap.h"
-#import "AIRMapMarker.h"
 #import "AIRGoogleMapManager.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>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#import <ReactNativeMapsGenerated/ComponentDescriptors.h>
+#import <ReactNativeMapsGenerated/EventEmitters.h>
+#import <ReactNativeMapsGenerated/Props.h>
+#import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#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>
+#endif
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
+#import <React/RCTUtils.h>
 #import "RCTConvert+GMSMapViewType.h"
+#if __has_include(<ReactNativeMaps/RCTConvert+AirMap.h>)
+#import <ReactNativeMaps/RCTConvert+AirMap.h>
+#import <ReactNativeMaps/UIView+AirMap.h>
+#else
 #import "RCTConvert+AirMap.h"
 #import "UIView+AirMap.h"
+#endif
+
 
 using namespace facebook::react;
 
@@ -36,7 +52,7 @@ using namespace facebook::react;
 
 
 - (id<RNMapsAirModuleDelegate>) mapView {
-    return _view;
+    return (id<RNMapsAirModuleDelegate>)_view;
 }
 
 #pragma mark - JS Commands
@@ -195,17 +211,14 @@ using namespace facebook::react;
 
     _view.onIndoorLevelActivated = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
 
-            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorLevelActivatedIndoorLevel level = {
+            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorLevelActivated data = {
                 .activeLevelIndex= (int) [dictionary[@"activeLevelIndex"] integerValue],
                 .name = [dictionary[@"name"] UTF8String],
                 .shortName = [dictionary[@"shortName"] UTF8String],
             };
-
-            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorLevelActivated data = {
-                .indoorLevel = level,
-            };
             mapViewEventEmitter->onIndoorLevelActivated(data);
         }
     };
@@ -214,13 +227,13 @@ using namespace facebook::react;
         if (_eventEmitter) {
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
 
-            facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorBuildingFocusedIndoorBuilding indoorBuilding = {
-                .underground = [dictionary[@"underground"] boolValue],
-                .activeLevelIndex = (int) [dictionary[@"activeLevelIndex"] integerValue]
-            };
+            NSError *jsError = nil;
+            NSString *levelsStr = RCTJSONStringify(dictionary[@"levels"], &jsError);
 
             facebook::react::RNMapsGoogleMapViewEventEmitter::OnIndoorBuildingFocused data = {
-                .indoorBuilding = indoorBuilding
+                .underground = [dictionary[@"underground"] boolValue],
+                .activeLevelIndex = (int) [dictionary[@"activeLevelIndex"] integerValue],
+                .levels = [levelsStr  UTF8String]
             };
             mapViewEventEmitter->onIndoorBuildingFocused(data);
         }
@@ -242,7 +255,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 +376,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) {
 
@@ -515,6 +512,12 @@ using namespace facebook::react;
             _legacyMapManager.googleMapId = mapID;
         }
     }
+    if (oldViewProps.customMapStyleString != newViewProps.customMapStyleString) {
+        NSString* customStyle = RCTNSStringFromString(newViewProps.customMapStyleString);
+        if (customStyle && [customStyle length]){
+            _legacyMapManager.customMapStyle = customStyle;
+        }
+    }
     if (!newViewProps.zoomTapEnabled) {
         _legacyMapManager.zoomTapEnabled = newViewProps.zoomTapEnabled;
     } else {
@@ -591,6 +594,8 @@ using namespace facebook::react;
     REMAP_MAPVIEW_PROP(scrollEnabled)
 
     REMAP_MAPVIEW_STRING_PROP(kmlSrc)
+    REMAP_MAPVIEW_STRING_PROP(customMapStyleString)
+
 
     if (newViewProps.minZoom != oldViewProps.minZoom || newViewProps.maxZoom != oldViewProps.maxZoom){
         [_view setMinZoom:newViewProps.minZoom maxZoom:newViewProps.maxZoom];
@@ -636,6 +641,9 @@ using namespace facebook::react;
             case RNMapsGoogleMapViewMapType::Hybrid:
                 _view.mapType = kGMSTypeHybrid;
                 break;
+            case RNMapsGoogleMapViewMapType::None:
+                _view.mapType = kGMSTypeNone;
+                break;
             default:
                 _view.mapType = kGMSTypeNormal;
                 break;

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.
@@ -10,11 +10,20 @@
 #import "RNMapsGooglePolygonView.h"
 #import "AIRGMSPolygon.h"
 #import "AIRGoogleMap.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>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsSpecs.h>
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#import <ReactNativeMapsGenerated/ComponentDescriptors.h>
+#import <ReactNativeMapsGenerated/EventEmitters.h>
+#import <ReactNativeMapsGenerated/Props.h>
+#import <ReactNativeMapsGenerated/RCTComponentViewHelpers.h>
+#else
+#import <react-native-maps-generated/RNMapsSpecs.h>
+#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>
+#endif
 
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
@@ -39,7 +48,7 @@ bool areHolesEqual(const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>
         if (newHole.size() != oldHole.size()) {
             return false;
         }
- 
+
     }
 
     return true;
@@ -74,7 +83,7 @@ bool areHolesEqual(const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>
 }
 
 - (void) prepareContentView {
-   
+
     _view = [AIRGMSPolygon new];
     _view.onPress = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
@@ -169,7 +178,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 +195,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/AirGoogleMaps/RNMapsGooglePolygonViewManager.mm

@@ -18,6 +18,7 @@
 
 RCT_EXPORT_MODULE(RNMapsGooglePolygonViewManager)
 
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
 
 
 @end

package/ios/AirMaps/AIRMap.h

@@ -14,7 +14,7 @@
 #import "SMCalloutView.h"
 #import "RCTConvert+AirMap.h"
 #import "AIRMapCalloutSubview.h"
-#import "RNMapsAirModuleDelegate.h"
+
 
 @class AIRMapCoordinate;
 @class AIRMapMarker;
@@ -23,7 +23,7 @@ extern const NSTimeInterval AIRMapRegionChangeObserveInterval;
 extern const CGFloat AIRMapZoomBoundBuffer;
 extern const NSInteger AIRMapMaxZoomLevel;
 
-@interface AIRMap: MKMapView<SMCalloutViewDelegate, RNMapsAirModuleDelegate>
+@interface AIRMap: MKMapView<SMCalloutViewDelegate>
 
 @property (nonatomic, strong) SMCalloutView *calloutView;
 @property (nonatomic, strong) UIImageView *cacheImageView;
@@ -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,14 +71,13 @@ 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;
 - (void)finishLoading;
 - (double)getZoomLevel;
-- (NSArray *)getMapBoundaries;
+- (NSDictionary *)getMapBoundaries;
 
 - (AIRMapMarker*) markerAtPoint:(CGPoint)point;
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;

package/ios/AirMaps/{AIRMap.m → AIRMap.mm}

@@ -26,8 +26,12 @@ const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1;
 const CGFloat AIRMapZoomBoundBuffer = 0.01;
 const NSInteger AIRMapMaxZoomLevel = 20;
 
-
-@interface MKMapView (UIGestureRecognizer)
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#endif
+@interface MKMapView (UIGestureRecognizer)<RNMapsAirModuleDelegate>
 
 // this tells the compiler that MKMapView actually implements this method
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch;
@@ -320,23 +324,23 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 #pragma mark RNMapsAirModuleDelegate.h
 
-- (NSArray *)getMapBoundaries
+- (NSDictionary *)getMapBoundaries
 {
     MKMapRect mapRect = self.visibleMapRect;
 
     CLLocationCoordinate2D northEast = MKCoordinateForMapPoint(MKMapPointMake(MKMapRectGetMaxX(mapRect), mapRect.origin.y));
     CLLocationCoordinate2D southWest = MKCoordinateForMapPoint(MKMapPointMake(mapRect.origin.x, MKMapRectGetMaxY(mapRect)));
 
-    return @[
-        @[
-            [NSNumber numberWithDouble:northEast.longitude],
-            [NSNumber numberWithDouble:northEast.latitude]
-        ],
-        @[
-            [NSNumber numberWithDouble:southWest.longitude],
-            [NSNumber numberWithDouble:southWest.latitude]
-        ]
-    ];
+    return @{
+          @"northEast": @{
+              @"latitude": [NSNumber numberWithDouble:northEast.latitude],
+              @"longitude": [NSNumber numberWithDouble:northEast.longitude],
+                  },
+          @"southWest": @{
+              @"latitude": [NSNumber numberWithDouble:southWest.latitude],
+              @"longitude": [NSNumber numberWithDouble:southWest.longitude],
+              },
+      };
 }
 - (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location
 {
@@ -749,7 +753,7 @@ const NSInteger AIRMapMaxZoomLevel = 20;
 
 - (void) listenToMemoryWarnings
 {
-    __weak typeof(self) weakSelf = self;
+    __weak __typeof(self) weakSelf = self;
     static dispatch_once_t onceToken;
     static dispatch_source_t source;
     dispatch_once(&onceToken, ^{

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;
@@ -186,18 +186,7 @@ RCT_EXPORT_METHOD(getMapBoundaries:(nonnull NSNumber *)reactTag
         if (![view isKindOfClass:[AIRMap class]]) {
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
-            NSArray *boundingBox = [view getMapBoundaries];
-
-            resolve(@{
-                @"northEast" : @{
-                    @"longitude" : boundingBox[0][0],
-                    @"latitude" : boundingBox[0][1]
-                },
-                @"southWest" : @{
-                    @"longitude" : boundingBox[1][0],
-                    @"latitude" : boundingBox[1][1]
-                }
-            });
+            resolve([view getMapBoundaries]);
         }
     }];
 }
@@ -1006,14 +995,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)),