react-native-maps 1.21.0-alpha.99 → 1.22.0

package/ios/AirMaps/AIRMapMarker.m

@@ -30,7 +30,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     BOOL _calloutIsOpen;
     NSInteger _zIndexBeforeOpen;
     BOOL _useLegacyPinView;
-    
+
     CADisplayLink *_displayLink;
     CLLocationCoordinate2D _startCoordinate;
     CLLocationCoordinate2D _endCoordinate;
@@ -52,13 +52,13 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     // Make sure we use the image size when available
     CGSize size = self.image ? self.image.size : frame.size;
     CGRect bounds = {CGPointZero, size};
-    
+
     // The MapView is basically in charge of figuring out the center position of the marker view. If the view changed in
     // height though, we need to compensate in such a way that the bottom of the marker stays at the same spot on the
     // map.
     CGFloat dy = (bounds.size.height - self.bounds.size.height) / 2;
     CGPoint center = (CGPoint){ self.center.x, self.center.y - dy };
-    
+
     // Avoid crashes due to nan coords
     if (isnan(center.x) || isnan(center.y) ||
         isnan(bounds.origin.x) || isnan(bounds.origin.y) ||
@@ -67,7 +67,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
                     self.reactTag, self, NSStringFromCGPoint(center), NSStringFromCGRect(bounds));
         return;
     }
-    
+
     self.center = center;
     self.bounds = bounds;
 }
@@ -102,31 +102,31 @@ 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];
             _pinView.annotation = self;
-            
+
             if ([_pinView respondsToSelector:@selector(setPinTintColor:)]) {
                 _pinView.pinTintColor = self.pinColor;
             }
-            
+
             _pinView.draggable = self.draggable;
             _pinView.layer.zPosition = self.zIndex;
             _pinView.displayPriority = self.displayPriority;
             _pinView.zPriority = self.zIndex;
             return _pinView;
         }
-        
-        
-        
+
+
+
         if (_markerView == nil && !_useLegacyPinView) {
             _markerView = [[MKMarkerAnnotationView alloc] initWithAnnotation:self reuseIdentifier: nil];
             [self addGestureRecognizerToView:_markerView];
             _markerView.annotation = self;
-            
+
             _markerView.draggable = self.draggable;
             _markerView.layer.zPosition = self.zIndex;
             _markerView.markerTintColor = self.pinColor;
@@ -135,7 +135,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             _markerView.displayPriority = self.displayPriority;
             _markerView.zPriority = self.zIndex;
 
-            
+
         }
         return _markerView ?: _pinView;
     } else {
@@ -152,14 +152,14 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (void)fillCalloutView:(SMCalloutView *)calloutView
 {
     // Set everything necessary on the calloutView before it becomes visible.
-    
+
     // Apply the MKAnnotationView's desired calloutOffset (from the top-middle of the view)
     if ([self shouldUsePinView] && !_hasSetCalloutOffset && _useLegacyPinView) {
         calloutView.calloutOffset = CGPointMake(-8,0);
     } else {
         calloutView.calloutOffset = self.calloutOffset;
     }
-    
+
     if (self.calloutView) {
         calloutView.title = nil;
         calloutView.subtitle = nil;
@@ -172,13 +172,13 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             // as a result, we use the default "masked" background view.
             calloutView.backgroundView = [SMCalloutMaskedBackgroundView new];
         }
-        
+
         // when this is set, the callout's content will be whatever react views the user has put as the callout's
         // children.
         calloutView.contentView = self.calloutView;
-        
+
     } else {
-        
+
         // if there is no calloutView, it means the user wants to use the default callout behavior with title/subtitle
         // pairs.
         calloutView.title = self.title;
@@ -192,12 +192,12 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 {
     _calloutIsOpen = YES;
     [self setZIndex:_zIndexBeforeOpen];
-    
+
     MKAnnotationView *annotationView = [self getAnnotationView];
-    
+
     [self setSelected:YES animated:NO];
     [self.map selectAnnotation:self animated:NO];
-    
+
     id event = @{
         @"action": @"marker-select",
         @"id": self.identifier ?: @"unknown",
@@ -206,17 +206,17 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             @"longitude": @(self.coordinate.longitude)
         }
     };
-    
+
     if (self.map.onMarkerSelect) self.map.onMarkerSelect(event);
     if (self.onSelect) self.onSelect(event);
-    
+
     if (![self shouldShowCalloutView]) {
         // no callout to show
         return;
     }
-    
+
     [self fillCalloutView:self.map.calloutView];
-    
+
     // This is where we present our custom callout view... MapKit's built-in callout doesn't have the flexibility
     // we need, but a lot of work was done by Nick Farina to make this identical to MapKit's built-in.
     [self.map.calloutView presentCalloutFromRect:annotationView.bounds
@@ -244,12 +244,12 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (void)_handleTap:(UITapGestureRecognizer *)recognizer {
     AIRMapMarker *marker = self;
     if (!marker) return;
-    
+
     if (marker.selected) {
         CGPoint touchPoint = [recognizer locationInView:marker.map.calloutView];
         CGRect bubbleFrame = [self.calloutView convertRect:marker.map.calloutView.bounds toView:marker.map];
         CGPoint touchPointReal = [recognizer locationInView:self.calloutView];
-        
+
         UIView *calloutView = [marker.map.calloutView hitTest:touchPoint withEvent:nil];
         if (calloutView) {
             // the callout (or its subview) got clicked, not the marker
@@ -263,7 +263,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
                 }
                 tmp = tmp.superview;
             }
-            
+
             id event = @{
                 @"action": calloutSubview ? @"callout-inside-press" : @"callout-press",
                 @"id": marker.identifier ?: @"unknown",
@@ -278,7 +278,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
                     @"height": @(bubbleFrame.size.height),
                 }
             };
-            
+
             if (calloutSubview) calloutSubview.onPress(event);
             if (marker.onCalloutPress) marker.onCalloutPress(event);
             if (marker.calloutView && marker.calloutView.onPress) marker.calloutView.onPress(event);
@@ -286,7 +286,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             return;
         }
     }
-    
+
     // the actual marker got clicked
     CGPoint touchPointReal = [recognizer locationInView:self.calloutView];
     id event = @{
@@ -301,10 +301,10 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             @"y": @(touchPointReal.y),
         }
     };
-    
+
     if (marker.onPress) marker.onPress(event);
     if (marker.map.onMarkerPress) marker.map.onMarkerPress(event);
-    
+
     [marker.map selectAnnotation:marker animated:NO];
 }
 
@@ -314,10 +314,10 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
     [self setZIndex:_zIndexBeforeOpen];
     // hide the callout view
     [self.map.calloutView dismissCalloutAnimated:YES];
-    
+
     [self setSelected:NO animated:NO];
     [self.map deselectAnnotation:self animated:NO];
-    
+
     id event = @{
         @"action": @"marker-deselect",
         @"id": self.identifier ?: @"unknown",
@@ -326,7 +326,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
             @"longitude": @(self.coordinate.longitude)
         }
     };
-    
+
     if (self.map.onMarkerDeselect) self.map.onMarkerDeselect(event);
     if (self.onDeselect) self.onDeselect(event);
 }
@@ -355,13 +355,13 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (void)setImageSrc:(NSString *)imageSrc
 {
     _imageSrc = imageSrc;
-    
+
     if (_reloadImageCancellationBlock) {
         _reloadImageCancellationBlock();
         _reloadImageCancellationBlock = nil;
     }
     __weak __typeof(self) weakSelf = self;
-    
+
     _reloadImageCancellationBlock = [[[RCTBridge currentBridge] moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
                                                                                                                  size:self.bounds.size
                                                                                                                 scale:RCTScreenScale()
@@ -384,7 +384,7 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (void)setPinColor:(UIColor *)pinColor
 {
     _pinColor = pinColor;
-    
+
     if(_useLegacyPinView && [_pinView respondsToSelector:@selector(setPinTintColor:)]) {
         _pinView.pinTintColor = _pinColor;
     } else {
@@ -412,6 +412,19 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         self.layer.zPosition = _zIndex;
     }
 }
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+
+    CGRect reactFrame = self.frame;
+
+    UIView *firstSubView = self.subviews.firstObject;
+    if (firstSubView && (CGRectGetWidth(firstSubView.frame) > CGRectGetWidth(reactFrame) ||
+                         CGRectGetHeight(firstSubView.frame) > CGRectGetHeight(reactFrame))) {
+        reactFrame = firstSubView.frame;
+    }
+    [self reactSetFrame:reactFrame];
+}
 
 - (void)setUseLegacyPinView:(BOOL)value {
     _useLegacyPinView = value;
@@ -422,16 +435,16 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
         NSLog(@"Animation already in progress. Rejecting new animation request.");
         return;
     }
-    
+
     // Mark as animating
     _isAnimating = YES;
-    
+
     // Store animation parameters
     _startCoordinate = self.coordinate;
     _endCoordinate = newCoordinate;
     _animationDuration = duration;
     _animationStartTime = [NSDate timeIntervalSinceReferenceDate];
-    
+
     // Start a CADisplayLink
     if (_displayLink) {
         [_displayLink invalidate];
@@ -443,15 +456,15 @@ NSInteger const AIR_CALLOUT_OPEN_ZINDEX_BASELINE = 999;
 - (void)updatePosition {
     NSTimeInterval elapsed = [NSDate timeIntervalSinceReferenceDate] - _animationStartTime;
     CGFloat progress = MIN(elapsed / _animationDuration, 1.0);
-    
+
     // Interpolate coordinates
     CLLocationDegrees currentLatitude = _startCoordinate.latitude + progress * (_endCoordinate.latitude - _startCoordinate.latitude);
     CLLocationDegrees currentLongitude = _startCoordinate.longitude + progress * (_endCoordinate.longitude - _startCoordinate.longitude);
-    
+
     // Update annotation's coordinate
     CLLocationCoordinate2D currentCoordinate = CLLocationCoordinate2DMake(currentLatitude, currentLongitude);
     [self setValue:[NSValue valueWithMKCoordinate:currentCoordinate] forKey:@"coordinate"];
-    
+
     // Stop the animation when complete
     if (progress == 1.0) {
         [_displayLink invalidate];

package/ios/AirMaps/AIRMapOverlay.m

@@ -50,8 +50,8 @@
 - (void)setBoundsRect:(NSArray *)boundsRect {
     _boundsRect = boundsRect;
 
-    _southWest = CLLocationCoordinate2DMake([boundsRect[0][0] doubleValue], [boundsRect[0][1] doubleValue]);
-    _northEast = CLLocationCoordinate2DMake([boundsRect[1][0] doubleValue], [boundsRect[1][1] doubleValue]);
+    _northEast = CLLocationCoordinate2DMake([boundsRect[0][0] doubleValue], [boundsRect[0][1] doubleValue]);
+    _southWest = CLLocationCoordinate2DMake([boundsRect[1][0] doubleValue], [boundsRect[1][1] doubleValue]);
 
     MKMapPoint southWest = MKMapPointForCoordinate(_southWest);
     MKMapPoint northEast = MKMapPointForCoordinate(_northEast);

package/ios/AirMaps/AIRMapWMSTile.m

@@ -10,7 +10,7 @@
 #import <React/UIView+React.h>
 
 @implementation AIRMapWMSTile
- 
+
 - (void)createTileOverlayAndRendererIfPossible
 {
     if (!_urlTemplateSet) return;
@@ -52,7 +52,7 @@
 
 @implementation AIRMapWMSTileOverlay
 
-- (id)initWithURLTemplate:(NSString *)URLTemplate 
+- (id)initWithURLTemplate:(NSString *)URLTemplate
 {
     self = [super initWithURLTemplate:URLTemplate];
     return self;
@@ -68,7 +68,7 @@
 
 @implementation AIRMapWMSTileCachedOverlay
 
-- (id)initWithURLTemplate:(NSString *)URLTemplate 
+- (id)initWithURLTemplate:(NSString *)URLTemplate
 {
     self = [super initWithURLTemplate:URLTemplate];
     return self;
@@ -82,7 +82,7 @@
 @end
 
 
-@implementation AIRMapWMSTileHelper 
+@implementation AIRMapWMSTileHelper
 + (NSURL *)URLForTilePath:(MKTileOverlayPath)path withURLTemplate:(NSString *)URLTemplate withTileSize:(NSInteger)tileSize
 {
     NSArray *bb = [self getBoundBox:path.x yAxis:path.y zoom:path.z];
@@ -102,15 +102,15 @@
     double MapY = 20037508.34789244;
     double FULL = 20037508.34789244 * 2;
     double tile = FULL / pow(2.0, (double)zoom);
-    
+
     NSArray *result  =[[NSArray alloc] initWithObjects:
                        [NSNumber numberWithDouble:MapX + (double)x * tile],
                        [NSNumber numberWithDouble:MapY - (double)(y + 1) * tile],
                        [NSNumber numberWithDouble:MapX + (double)(x + 1) * tile],
                        [NSNumber numberWithDouble:MapY - (double)y * tile],
                        nil];
-    
-    return result;   
+
+    return result;
 }
 
-@end
+@end

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.h

@@ -0,0 +1,25 @@
+//
+//  RNMapsGoogleMapView.h
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNMapsGoogleMapView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.mm

@@ -0,0 +1,77 @@
+//
+//  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
+
+#if __has_include(<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/ComponentDescriptors.h>
+#import <react-native-maps-generated/EventEmitters.h>
+#import <react-native-maps-generated/Props.h>
+#import <react-native-maps-generated/RCTComponentViewHelpers.h>
+#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
+#endif
+#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import "PlaceHolderGoogleMapView.h"
+
+using namespace facebook::react;
+
+
+@implementation RNMapsGoogleMapView
+
+
+#pragma mark - JS Commands
+- (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration{
+}
+- (void)setCamera:(NSString *)cameraJSON{
+}
+
+- (void)animateCamera:(NSString *)cameraJSON duration:(NSInteger)duration{
+}
+
+- (void)fitToElements:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+}
+
+- (void)fitToSuppliedMarkers:(NSString *)markersJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+}
+- (void)fitToCoordinates:(NSString *)coordinatesJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+
+}
+- (void) setIndoorActiveLevelIndex:(NSInteger)activeLevelIndex
+{
+
+}
+
+#pragma mark - Native commands
+
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
+{
+}
+
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+    return concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDescriptor>();
+}
+
+
+@end
+
+Class<RCTComponentViewProtocol> RNMapsGoogleMapViewCls(void)
+{
+    return RNMapsGoogleMapView.class;
+}
+
+#endif

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.h

@@ -0,0 +1,25 @@
+//
+//  RNMapsGoogleMapView.h
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+@interface RNMapsGooglePolygonView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm

@@ -0,0 +1,51 @@
+//
+//  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
+
+#if __has_include(<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/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 "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

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

package/ios/AirMaps/RNMapsAirModule.mm

@@ -5,6 +5,8 @@
 //  Created by Salah Ghanim on 23.11.24.
 //  Copyright © 2024 react-native-maps. All rights reserved.
 //
+#ifdef RCT_NEW_ARCH_ENABLED
+
 
 #import "RNMapsAirModule.h"
 #import <React/RCTUIManager.h>
@@ -15,6 +17,16 @@
 #import <MapKit/MapKit.h>
 #import "RCTConvert+AirMap.h"
 
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsSpecs.h>
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsSpecs.h>
+#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
+#endif
+@interface RNMapsAirModule()<NativeAirMapsModuleSpec>
+@end
+
 @implementation RNMapsAirModule
 
 @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
@@ -148,3 +160,5 @@
 
 @end
 
+
+#endif

package/ios/AirMaps/RNMapsDefines.h

@@ -0,0 +1 @@
+#define HAVE_GOOGLE_MAPS 0

package/ios/AirMaps/RNMapsMapView.h

@@ -9,8 +9,11 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
-#import "RNMapsHostVewDelegate.h"
-
+#if __has_include(<ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsHostVewDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
+#endif
 @class AIRMap;
 
 NS_ASSUME_NONNULL_BEGIN

package/ios/AirMaps/RNMapsMapView.mm

@@ -11,10 +11,20 @@
 #import "AIRMapMarker.h"
 #import "AIRMapManager.h"
 #import "RNMapsMarkerView.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>
 #import "UIView+AirMap.h"
@@ -31,7 +41,7 @@ using namespace facebook::react;
 
 
 - (id<RNMapsAirModuleDelegate>) mapView {
-    return _view;
+    return nil;
 }
 
 - (void) prepareForRecycle
@@ -157,7 +167,7 @@ using namespace facebook::react;
             mapViewEventEmitter->onMapReady(data);
         }
     };
-    _view.onChange = [self](NSDictionary* dictionary) {
+    _view.onRegionChange = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             NSDictionary* regionDict = dictionary[@"region"];
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);