react-native-maps 1.21.0-alpha.141 → 1.21.0-alpha.143

package/README.md

@@ -18,13 +18,13 @@ See [Setup Instructions for the Included Example Project](docs/examples-setup.md
 
 ### 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.
+- **Fabric is now supported**:  
+  Fabric is now supported for the latest version of the library, if you don't have Fabric (New Arch) enabled, please use v1.21.0 or earlier
 
 ### Version Requirements:
 
+- **Version `1.22.0` and below**: Requires **React Native `>= 0.76`**.
+- **Version `1.21.0` and below**: Requires **React Native `>= 0.74`**.
 - **Version `1.14.0` and above**: Requires **React Native `>= 0.74`**.
 - **Versions below `1.14.0`**: Require **React Native `>= 0.64.3`**.
 

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -313,7 +313,6 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
         }
 
         view.applyBaseMapPadding(left, top, right, bottom);
-        view.map.setPadding(left, top, right, bottom);
     }
 
     @Override

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -9,6 +9,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.location.Location;
+
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 
@@ -194,15 +195,16 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
 
 
-@Override
-public void onCreate(LifecycleOwner owner) {
-    super.onCreate(null);
-}
+    @Override
+    public void onCreate(LifecycleOwner owner) {
+        super.onCreate(null);
+    }
 
     @Override
     public void onStart(LifecycleOwner owner) {
         super.onStart();
     }
+
     @Override
     public void onResume(LifecycleOwner owner) {
         if (hasPermissions() && map != null) {
@@ -220,7 +222,7 @@ public void onCreate(LifecycleOwner owner) {
 
 
     @Override
-    public void onPause(LifecycleOwner owner){
+    public void onPause(LifecycleOwner owner) {
         super.onPause();
         if (hasPermissions() && map != null) {
             //noinspection MissingPermission
@@ -240,7 +242,7 @@ public void onCreate(LifecycleOwner owner) {
     }
 
     @Override
-    public void onDestroy(LifecycleOwner owner){
+    public void onDestroy(LifecycleOwner owner) {
         MapView.this.doDestroy();
     }
 
@@ -250,7 +252,7 @@ public void onCreate(LifecycleOwner owner) {
         this.context = context;
         Activity activity = context.getCurrentActivity();
         if (activity instanceof LifecycleOwner) {
-          ((LifecycleOwner) activity).getLifecycle().addObserver(this);
+            ((LifecycleOwner) activity).getLifecycle().addObserver(this);
         }
         super.getMapAsync(this);
 
@@ -324,7 +326,7 @@ public void onCreate(LifecycleOwner owner) {
         }
         if (addedPosition) {
 
-           LatLngBounds bounds = builder.build();
+            LatLngBounds bounds = builder.build();
             LatLng northEast = bounds.northeast;
             LatLng southWest = bounds.southwest;
 
@@ -338,7 +340,7 @@ public void onCreate(LifecycleOwner owner) {
 
     public void setShowsTraffic(boolean value) {
         showsTraffic = value;
-        if (map != null){
+        if (map != null) {
             map.setTrafficEnabled(value);
         }
     }
@@ -554,8 +556,8 @@ public void onCreate(LifecycleOwner owner) {
                 event.putString("action", "overlay-press");
 
                 dispatchEvent(event, OnPressEvent::new);
-                event =  makeClickEventData(groundOverlay.getPosition());
-                dispatchEvent(event, OnPressEvent::new,overlayMap.get(groundOverlay).getId(), context);
+                event = makeClickEventData(groundOverlay.getPosition());
+                dispatchEvent(event, OnPressEvent::new, overlayMap.get(groundOverlay).getId(), context);
             }
         });
 
@@ -599,7 +601,7 @@ public void onCreate(LifecycleOwner owner) {
 
 
         isMapReady = true;
-        if (kmlSrc != null){
+        if (kmlSrc != null) {
             setKmlSrc(kmlSrc);
             kmlSrc = null;
         }
@@ -651,7 +653,8 @@ public void onCreate(LifecycleOwner owner) {
         builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnLongPressEvent.EVENT_NAME));
         return builder.build();
     }
-//                 , ,
+
+    //                 , ,
     public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
         MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
         builder.put(OnMarkerPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerPressEvent.EVENT_NAME));
@@ -735,6 +738,13 @@ public void onCreate(LifecycleOwner owner) {
             map.setMapStyle(new MapStyleOptions(customMapStyleString));
         }
         this.setPoiClickEnabled(poiClickEnabled);
+        if (setPaddingDeferred &&
+                (baseLeftMapPadding != 0 ||
+                        baseTopMapPadding != 0 ||
+                        baseRightMapPadding != 0 ||
+                        baseBottomMapPadding != 0)) {
+            applyBaseMapPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
+        }
     }
 
     public static LatLngBounds latLngBoundsFromRegion(ReadableMap region) {
@@ -1219,6 +1229,7 @@ public void onCreate(LifecycleOwner owner) {
             cameraToSet = null;
         }
     }
+
     public void animateToCamera(CameraPosition position, int duration) {
         if (map == null) return;
         CameraUpdate update = CameraUpdateFactory.newCameraPosition(position);
@@ -1263,16 +1274,16 @@ public void onCreate(LifecycleOwner owner) {
         LatLngBounds.Builder builder = new LatLngBounds.Builder();
 
         boolean addedPosition = false;
-       if (features.size() > 0) {
-           for (MapFeature feature : features) {
-               if (feature instanceof MapMarker) {
-                   Marker marker = (Marker) feature.getFeature();
-                   builder.include(marker.getPosition());
-                   addedPosition = true;
-               }
-               // TODO(lmr): may want to include shapes / etc.
-           }
-       }
+        if (features.size() > 0) {
+            for (MapFeature feature : features) {
+                if (feature instanceof MapMarker) {
+                    Marker marker = (Marker) feature.getFeature();
+                    builder.include(marker.getPosition());
+                    addedPosition = true;
+                }
+                // TODO(lmr): may want to include shapes / etc.
+            }
+        }
         if (addedPosition) {
             LatLngBounds bounds = builder.build();
             CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, 0);
@@ -1379,6 +1390,7 @@ public void onCreate(LifecycleOwner owner) {
 
         // Move the google logo to the default base padding value.
         map.setPadding(left, top, right, bottom);
+        setPaddingDeferred = false;
     }
 
     public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePadding,
@@ -1728,7 +1740,7 @@ public void onCreate(LifecycleOwner owner) {
                 e.printStackTrace();
             }
         } else {
-           this.kmlSrc = kmlSrc;
+            this.kmlSrc = kmlSrc;
         }
     }
 

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -13,10 +13,16 @@
 #import <GoogleMaps/GoogleMaps.h>
 #import <MapKit/MapKit.h>
 #import "AIRGMSMarker.h"
-#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+
 #import "AIRGoogleMapCoordinate.h"
 
-@interface AIRGoogleMap : GMSMapView <RNMapsAirModuleDelegate>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#endif
+
+@interface AIRGoogleMap : GMSMapView<RNMapsAirModuleDelegate>
 
 // TODO: don't use MK region?
 @property (nonatomic, weak) RCTBridge *bridge;
@@ -78,7 +84,7 @@
 - (void)didChangeCameraPosition:(GMSCameraPosition *)position isGesture:(BOOL)isGesture;
 - (void)idleAtCameraPosition:(GMSCameraPosition *)position isGesture:(BOOL)isGesture;
 - (void)didTapPOIWithPlaceID:(NSString *)placeID name:(NSString *) name location:(CLLocationCoordinate2D) location;
-- (NSArray *)getMapBoundaries;
+- (NSDictionary *)getMapBoundaries;
 
 + (MKCoordinateRegion)makeGMSCameraPositionFromMap:(GMSMapView *)map andGMSCameraPosition:(GMSCameraPosition *)position;
 + (GMSCameraPosition*)makeGMSCameraPositionFromMap:(GMSMapView *)map andMKCoordinateRegion:(MKCoordinateRegion)region;

package/ios/AirGoogleMaps/{AIRGoogleMap.m → AIRGoogleMap.mm}

@@ -25,6 +25,7 @@
 #import <React/RCTConvert.h>
 #import <objc/runtime.h>
 
+
 #ifdef HAVE_GOOGLE_MAPS_UTILS
 #import "GMUKMLParser.h"
 #import "GMUPlacemark.h"
@@ -342,7 +343,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 #pragma clang diagnostic pop
 
-- (NSArray *)getMapBoundaries
+- (NSDictionary *)getMapBoundaries
 {
     GMSVisibleRegion visibleRegion = self.projection.visibleRegion;
     GMSCoordinateBounds *bounds = [[GMSCoordinateBounds alloc] initWithRegion:visibleRegion];
@@ -350,16 +351,16 @@ id regionAsJSON(MKCoordinateRegion region) {
     CLLocationCoordinate2D northEast = bounds.northEast;
     CLLocationCoordinate2D southWest = bounds.southWest;
 
-    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 *) getCameraDic {

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -25,6 +25,12 @@
 #import <MapKit/MapKit.h>
 #import <QuartzCore/QuartzCore.h>
 
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#endif
+
 static NSString *const RCTMapViewKey = @"MapView";
 
 
@@ -344,7 +350,7 @@ RCT_EXPORT_METHOD(coordinateForPoint:(nonnull NSNumber *)reactTag
         if (![view isKindOfClass:[AIRGoogleMap class]]) {
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
-            AIRGoogleMap *mapView = (AIRGoogleMap *)view;
+            id<RNMapsAirModuleDelegate> mapView = (id<RNMapsAirModuleDelegate>) view;
             resolve([view getCoordinatesForPoint:pt]);
         }
     }];

package/ios/AirGoogleMaps/RNMapsGoogleMapView.h

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

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -10,18 +10,33 @@
 #import "RNMapsGoogleMapView.h"
 #import "RNMapsGooglePolygonView.h"
 #import "AIRGoogleMap.h"
-#import "AIRMapMarker.h"
 #import "AIRGoogleMapManager.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;
 

package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm

@@ -10,11 +10,20 @@
 #import "RNMapsGooglePolygonView.h"
 #import "AIRGMSPolygon.h"
 #import "AIRGoogleMap.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>

package/ios/AirMaps/AIRMap.h

@@ -14,7 +14,7 @@
 #import "SMCalloutView.h"
 #import "RCTConvert+AirMap.h"
 #import "AIRMapCalloutSubview.h"
-#import <react-native-maps-generated/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;
@@ -77,7 +77,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 - (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

@@ -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]);
         }
     }];
 }

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.h

@@ -12,9 +12,6 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.h>
-#import <react-native-maps-generated/RNMapsHostVewDelegate.h>
-
-
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.mm

@@ -9,10 +9,19 @@
 
 #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"

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm

@@ -9,10 +9,18 @@
 
 #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>

package/ios/AirMaps/RNMapsAirModule.h

@@ -1,13 +1,12 @@
-//  RCTNativeLocalStorage.h
 //  TurboModuleExample
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <react-native-maps-generated/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

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

package/ios/AirMaps/RNMapsMapView.h

@@ -9,8 +9,11 @@
 
 #import <React/RCTViewComponentView.h>
 #import <UIKit/UIKit.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-native-maps-generated/EventEmitters.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

package/ios/AirMaps/RNMapsMarkerView.mm

@@ -10,10 +10,18 @@
 #import "AIRMap.h"
 #import "AIRMapMarker.h"
 #import "AIRMapMarkerManager.h"
+#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 "UIView+AirMap.h"

package/ios/AirMaps/module.modulemap

@@ -0,0 +1,6 @@
+framework module ReactNativeMaps {
+  header "UIView+AirMap.h"
+  header "RCTConvert+AirMap.h"
+
+  export *
+}

package/ios/generated/RNMapsAirModuleDelegate.h

@@ -18,7 +18,7 @@
 
 - (NSDictionary *) getCameraDic;
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
-- (NSArray *) getMapBoundaries;
+- (NSDictionary *) getMapBoundaries;
 - (NSDictionary *) getPointForCoordinates:(CLLocationCoordinate2D) location;
 - (NSDictionary *) getCoordinatesForPoint:(CGPoint) point;
 @end

package/package.json

@@ -5,7 +5,7 @@
   "main": "src/index.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.141",
+  "version": "1.21.0-alpha.143",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",

package/react-native-google-maps.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.authors = package["author"]
   s.homepage = package["homepage"]
   s.license = package["license"]
-  s.platform = :ios, "15.0"
+  s.platform = :ios, "15.1"
   s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
   s.source_files = "ios/AirGoogleMaps/**/*.{h,m,mm,swift}"
   s.resource_bundles = {
@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
   s.dependency 'GoogleMaps', '9.3.0'
   s.dependency 'Google-Maps-iOS-Utils', '6.1.0'
   s.dependency 'react-native-maps-generated'
+  s.dependency 'react-native-maps'
   install_modules_dependencies(s)
 
 end

package/react-native-maps-generated.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.authors = package["author"]
   s.homepage = package["homepage"]
   s.license = package["license"]
-  s.platform = :ios, "13.0"
+  s.platform = :ios, "15.1"
   s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
   s.source_files = "ios/generated/**/*.{h,m,mm,cpp,swift}"
   s.exclude_files = [
@@ -24,7 +24,6 @@ Pod::Spec.new do |s|
   ]
   s.public_header_files = "ios/generated/**/*.h"
   s.module_name = 'ReactNativeMapsGenerated'
-  s.dependency "React-Core"
   s.compiler_flags = folly_compiler_flags
   install_modules_dependencies(s)
 

package/react-native-maps.podspec

@@ -11,13 +11,19 @@ Pod::Spec.new do |s|
   s.authors = package["author"]
   s.homepage = package["homepage"]
   s.license = package["license"]
-  s.platform = :ios, "13.0"
+  s.platform = :ios, "15.1"
   s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
 
   s.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
-  s.dependency "React-Core"
+  s.module_map = 'ios/AirMaps/module.modulemap'
+  s.public_header_files = [
+    'ios/AirMaps/UIView+AirMap.h',
+    'ios/AirMaps/RCTConvert+AirMap.h',
+  ]
+  s.module_name = 'ReactNativeMaps'
   s.compiler_flags = folly_compiler_flags
   s.dependency 'react-native-maps-generated'
+  s.dependency "React-Core"
   install_modules_dependencies(s)
 
      # Add script phase to detect Google Maps
@@ -55,8 +61,11 @@ Pod::Spec.new do |s|
       }
   ]
 
-  # Add the generated defines header to the header search path
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => "\"$(CONFIGURATION_BUILD_DIR)/react-native-google-maps\" \"${PODS_ROOT}/Headers/Private/Yoga\""
+    'HEADER_SEARCH_PATHS' => [
+      '$(PODS_ROOT)/Headers/Public/React-Core',
+      '$(PODS_TARGET_SRCROOT)/../../../node_modules/react-native/React'
+    ]
   }
+
 end