react-native-maps 1.21.0-alpha.144 → 1.21.0-alpha.146

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -16,13 +16,8 @@
 
 #import "AIRGoogleMapCoordinate.h"
 
-#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
-#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
-#else
-#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
-#endif
 
-@interface AIRGoogleMap : GMSMapView<RNMapsAirModuleDelegate>
+@interface AIRGoogleMap : GMSMapView
 
 // TODO: don't use MK region?
 @property (nonatomic, weak) RCTBridge *bridge;

package/ios/AirGoogleMaps/AIRGoogleMap.mm

@@ -50,8 +50,12 @@ id regionAsJSON(MKCoordinateRegion region) {
            @"longitudeDelta": [NSNumber numberWithDouble:region.span.longitudeDelta],
            };
 }
-
-@interface AIRGoogleMap () <GMSIndoorDisplayDelegate>
+#if __has_include(<ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>)
+#import <ReactNativeMapsGenerated/RNMapsAirModuleDelegate.h>
+#else
+#import <react-native-maps-generated/RNMapsAirModuleDelegate.h>
+#endif
+@interface AIRGoogleMap () <GMSIndoorDisplayDelegate, RNMapsAirModuleDelegate>
 
 - (id)eventFromCoordinate:(CLLocationCoordinate2D)coordinate;
 

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

@@ -272,10 +272,9 @@ RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber *)reactTag
         if (![view isKindOfClass:[AIRGoogleMap class]]) {
             RCTLogError(@"Invalid view returned from registry, expecting AIRMap, got: %@", view);
         } else {
-            AIRGoogleMap *mapView = (AIRGoogleMap *)view;
             NSMutableDictionary* config = [NSMutableDictionary new];
             
-            [mapView takeSnapshotWithConfig:config success:callback error:^(NSString *code, NSString *message, NSError *error) {
+            [view takeSnapshotWithConfig:config success:callback error:^(NSString *code, NSString *message, NSError *error) {
                 callback(@[error]);
             }];
             
@@ -288,6 +287,9 @@ RCT_EXPORT_METHOD(takeSnapshot:(nonnull NSNumber *)reactTag
             
             // TODO: currently we are ignoring width, height, region
             
+            AIRGoogleMap* mapView = (AIRGoogleMap *) view;
+
+            
             UIGraphicsBeginImageContextWithOptions(mapView.frame.size, YES, 0.0f);
             [mapView.layer renderInContext:UIGraphicsGetCurrentContext()];
             UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
@@ -329,7 +331,7 @@ RCT_EXPORT_METHOD(pointForCoordinate:(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([mapView getPointForCoordinates:coord]);
         }
     }];

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -52,7 +52,7 @@ using namespace facebook::react;
 
 
 - (id<RNMapsAirModuleDelegate>) mapView {
-    return _view;
+    return (id<RNMapsAirModuleDelegate>)_view;
 }
 
 #pragma mark - JS Commands

package/ios/generated/module.modulemap

@@ -0,0 +1,15 @@
+framework module ReactNativeMapsGenerated {
+    header "RNMapsAirModuleDelegate.h"
+    header "RNMapsHostVewDelegate.h"
+
+    explicit module RNMapsSpecs {
+        header "ComponentDescriptors.h"
+        header "EventEmitters.h"
+        header "Props.h"
+        header "RCTComponentViewHelpers.h"
+        header "RNMapsSpecs.h"
+        export *
+    }
+
+    export *
+}

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.144",
+  "version": "1.21.0-alpha.146",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -16,7 +16,7 @@
     "prepare": "husky install",
     "release": "semantic-release",
     "bundle-install": "cd example && bundle install",
-    "pod-install": "cd example/ios && bundle exec pod install",
+    "pod-install": "cd example/ios && RCT_NEW_ARCH_ENABLED=1 bundle exec pod install",
     "bootstrap": "yarn --cwd example && yarn && yarn bundle-install && yarn pod-install"
   },
   "files": [

package/react-native-maps-generated.podspec

@@ -22,6 +22,7 @@ Pod::Spec.new do |s|
     "ios/generated/RCTModulesConformingToProtocolsProvider.h",
     "ios/generated/RCTModulesConformingToProtocolsProvider.mm",
   ]
+  s.module_map = 'ios/generated/module.modulemap'
   s.public_header_files = "ios/generated/**/*.h"
   s.module_name = 'ReactNativeMapsGenerated'
   s.compiler_flags = folly_compiler_flags

package/react-native-maps.podspec

@@ -32,15 +32,22 @@ Pod::Spec.new do |s|
           :script => %(
             set -x
             echo "Running Google Maps detection script..."
-            GOOGLE_MAPS_HEADER_PATH="$PODS_ROOT/Headers/Public/react-native-google-maps/AIRGoogleMap.h"
             DEFINES_DIR="${PODS_TARGET_SRCROOT}/ios/AirMaps"
             DEFINES_FILE="${DEFINES_DIR}/RNMapsDefines.h"
 
-            echo "GOOGLE_MAPS_HEADER_PATH=$GOOGLE_MAPS_HEADER_PATH"
-            echo "DEFINES_FILE=$DEFINES_FILE"
+            # Standard path
+            GOOGLE_MAPS_STANDARD_PATH="$PODS_ROOT/Headers/Public/react-native-google-maps/AIRGoogleMap.h"
 
-            # Check if Google Maps is available and write to the defines file
-            if [ -f "$GOOGLE_MAPS_HEADER_PATH" ]; then
+            # Framework paths
+            GOOGLE_MAPS_FRAMEWORK_MODULE="$PODS_ROOT/Target Support Files/react-native-google-maps/react-native-google-maps.modulemap"
+            GOOGLE_MAPS_UMBRELLA_HEADER="$PODS_ROOT/Target Support Files/react-native-google-maps/react-native-google-maps-umbrella.h"
+
+            echo "Checking standard path: $GOOGLE_MAPS_STANDARD_PATH"
+            echo "Checking framework module path: $GOOGLE_MAPS_FRAMEWORK_MODULE"
+            echo "Checking umbrella header path: $GOOGLE_MAPS_UMBRELLA_HEADER"
+
+            # Check if Google Maps is available via any detection method
+            if [ -f "$GOOGLE_MAPS_STANDARD_PATH" ] || [ -f "$GOOGLE_MAPS_FRAMEWORK_MODULE" ] || [ -f "$GOOGLE_MAPS_UMBRELLA_HEADER" ]; then
               echo "#define HAVE_GOOGLE_MAPS 1" > "$DEFINES_FILE"
               echo "Google Maps detected. HAVE_GOOGLE_MAPS defined."
             else