react-native-maps 1.21.0-alpha.107 → 1.21.0-alpha.109

package/android/build.gradle

@@ -58,7 +58,7 @@ android {
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 35)
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
 
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1747,24 +1747,20 @@ public void onCreate(LifecycleOwner owner) {
                 levelsArray.pushMap(levelMap);
                 index++;
             }
-            WritableMap event = Arguments.createMap();
             WritableMap indoorBuilding = Arguments.createMap();
             indoorBuilding.putArray("levels", levelsArray);
             indoorBuilding.putInt("activeLevelIndex", building.getActiveLevelIndex());
             indoorBuilding.putBoolean("underground", building.isUnderground());
 
-            event.putMap("indoorBuilding", indoorBuilding);
-            dispatchEvent(event, OnIndoorBuildingFocusedEvent::new);
+            dispatchEvent(indoorBuilding, OnIndoorBuildingFocusedEvent::new);
         } else {
-            WritableMap event = Arguments.createMap();
             WritableArray levelsArray = Arguments.createArray();
             WritableMap indoorBuilding = Arguments.createMap();
             indoorBuilding.putArray("levels", levelsArray);
             indoorBuilding.putInt("activeLevelIndex", 0);
             indoorBuilding.putBoolean("underground", false);
 
-            event.putMap("indoorBuilding", indoorBuilding);
-            dispatchEvent(event, OnIndoorBuildingFocusedEvent::new);
+            dispatchEvent(indoorBuilding, OnIndoorBuildingFocusedEvent::new);
         }
     }
 
@@ -1779,15 +1775,13 @@ public void onCreate(LifecycleOwner owner) {
         }
         IndoorLevel level = building.getLevels().get(activeLevelIndex);
 
-        WritableMap event = Arguments.createMap();
         WritableMap indoorlevel = Arguments.createMap();
 
         indoorlevel.putInt("activeLevelIndex", activeLevelIndex);
         indoorlevel.putString("name", level.getName());
         indoorlevel.putString("shortName", level.getShortName());
 
-        event.putMap("indoorLevel", indoorlevel);
-        dispatchEvent(event, OnIndoorLevelActivatedEvent::new);
+        dispatchEvent(indoorlevel, OnIndoorLevelActivatedEvent::new);
     }
 
     public void setIndoorActiveLevelIndex(int activeLevelIndex) {

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -1172,11 +1172,9 @@ id regionAsJSON(MKCoordinateRegion region) {
             return;
         }
         self.onIndoorBuildingFocused(@{
-            @"indoorBuilding": @{
-                    @"activeLevelIndex": @0,
-                    @"underground": @false,
-                    @"levels": [[NSMutableArray alloc]init]
-            }
+            @"activeLevelIndex": @0,
+            @"underground": @false,
+            @"levels": [[NSMutableArray alloc]init]
         });
     }
     NSInteger i = 0;
@@ -1193,11 +1191,9 @@ id regionAsJSON(MKCoordinateRegion region) {
         return;
     }
     self.onIndoorBuildingFocused(@{
-        @"indoorBuilding": @{
-                @"activeLevelIndex": @(building.defaultLevelIndex),
-                @"underground": @(building.underground),
-                @"levels": arrayLevels
-        }
+            @"activeLevelIndex": @(building.defaultLevelIndex),
+            @"underground": @(building.underground),
+            @"levels": arrayLevels
     });
 }
 
@@ -1213,11 +1209,9 @@ id regionAsJSON(MKCoordinateRegion region) {
         i++;
     }
     self.onIndoorLevelActivated(@{
-        @"indoorLevel": @{
-                @"activeLevelIndex": @(i),
-                @"name": level.name,
-                @"shortName": level.shortName
-        }
+            @"activeLevelIndex": @(i),
+            @"name": level.name,
+            @"shortName": level.shortName
     });
 }
 // do nothing, passed as options on initialization

package/ios/AirGoogleMaps/AIRGoogleMapMarker.m

@@ -29,8 +29,8 @@ CGRect unionRect(CGRect a, CGRect b) {
 @implementation AIRGoogleMapMarker {
     RCTImageLoaderCancellationBlock _reloadImageCancellationBlock;
     RCTBubblingEventBlock _onPress;
-    RCTBubblingEventBlock _onSelect;
-    RCTBubblingEventBlock _onDeselect;
+    RCTDirectEventBlock _onSelect;
+    RCTDirectEventBlock _onDeselect;
     __weak UIImageView *_iconImageView;
     UIView *_iconView;
     UIColor *_pinColor;

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -18,6 +18,7 @@
 #import <react/renderer/components/RNMapsSpecs/RCTComponentViewHelpers.h>
 #import "RCTFabricComponentsPlugins.h"
 #import <React/RCTConversions.h>
+#import <React/RCTUtils.h>
 #import "RCTConvert+GMSMapViewType.h"
 #import "RCTConvert+AirMap.h"
 #import "UIView+AirMap.h"
@@ -195,17 +196,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 +212,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);
         }

package/ios/AirGoogleMaps/RNMapsGooglePolygonViewManager.mm

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

package/ios/AirMaps/NSObject+DynamicLoad.m

@@ -20,13 +20,8 @@
     if (!existingClass) {
         // If the class does not exist, create a new class that is a subclass of NSObject
         Class newClass = objc_allocateClassPair([NSObject class], className, 0);
-
         // Register the new class with the runtime
         objc_registerClassPair(newClass);
-
-        NSLog(@"Class %s created successfully.", className);
-    } else {
-        NSLog(@"Class %s already exists.", className);
     }
 }
 

package/ios/AirMaps/RNMapsMarkerViewManager.mm

@@ -17,5 +17,12 @@
 
 RCT_EXPORT_MODULE(RNMapsMarkerViewManager)
 
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDeselect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onCalloutPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDragStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDrag, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDragEnd, RCTDirectEventBlock)
 
 @end

package/lib/MapView.js

@@ -52,7 +52,7 @@ exports.MAP_TYPES = {
 class MapView extends React.Component {
     static Animated;
     map;
-    fabricMap;
+    fabricMap = React.createRef();
     constructor(props) {
         super(props);
         this.map = React.createRef();
@@ -333,6 +333,9 @@ class MapView extends React.Component {
     };
     handleIndoorBuildingFocused = (event) => {
         if (this.props.onIndoorBuildingFocused) {
+            if (typeof event.nativeEvent.levels === 'string') {
+                event.nativeEvent.levels = JSON.parse(event.nativeEvent.levels);
+            }
             this.props.onIndoorBuildingFocused(event);
         }
     };

package/lib/specs/NativeComponentGoogleMapView.d.ts

@@ -133,11 +133,9 @@ export type IndoorLevel = Readonly<{
     shortName: string;
 }>;
 export type IndoorLevelActivatedEventHandler = DirectEventHandler<Readonly<{
-    indoorLevel: {
-        activeLevelIndex: Int32;
-        name: string;
-        shortName: string;
-    };
+    activeLevelIndex: Int32;
+    name: string;
+    shortName: string;
 }>>;
 export type IndoorBuilding = Readonly<{
     underground: boolean;
@@ -145,10 +143,9 @@ export type IndoorBuilding = Readonly<{
     levels: ReadonlyArray<IndoorLevel>;
 }>;
 export type IndoorBuildingEventHandler = DirectEventHandler<Readonly<{
-    indoorBuilding: {
-        underground: boolean;
-        activeLevelIndex: Int32;
-    };
+    underground: boolean;
+    activeLevelIndex: Int32;
+    levels: string;
 }>>;
 export type KmlMapEventHandler = DirectEventHandler<Readonly<{}>>;
 export type MapLoadedEventHandler = DirectEventHandler<Readonly<{}>>;

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.107",
+  "version": "1.21.0-alpha.109",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -46,8 +46,8 @@
     "mapkit"
   ],
   "peerDependencies": {
-    "react": ">= 19.0.0",
-    "react-native": ">= 0.78.0",
+    "react": ">= 18.3.1",
+    "react-native": ">= 0.77.1",
     "react-native-web": ">= 0.11"
   },
   "peerDependenciesMeta": {
@@ -62,23 +62,23 @@
     "@commitlint/cli": "17.6.1",
     "@commitlint/config-conventional": "17.6.1",
     "@react-native-community/cli": "15.1.3",
-    "@react-native/babel-preset": "0.78.0",
-    "@react-native/eslint-config": "0.78.0",
-    "@react-native/metro-config": "0.78.0",
-    "@react-native/typescript-config": "0.78.0",
+    "@react-native/babel-preset": "0.77.1",
+    "@react-native/eslint-config": "0.77.1",
+    "@react-native/metro-config": "0.77.1",
+    "@react-native/typescript-config": "0.77.1",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@types/jest": "29.5.14",
-    "@types/react": "^19.0.10",
+    "@types/react": "^18.2.6",
     "@types/react-native": "0.73.0",
-    "@types/react-test-renderer": "^19.0.0",
+    "@types/react-test-renderer": "^18.0.0",
     "eslint": "^8.19.0",
     "husky": "8.0.3",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react": "^19.0.0",
-    "react-native": "^0.78.0",
-    "react-test-renderer": "19.0.0",
+    "react": "^18.3.1",
+    "react-native": "^0.77.1",
+    "react-test-renderer": "18.3.1",
     "semantic-release": "24.2.0",
     "typescript": "5.0.4"
   },

package/specs/NativeComponentGoogleMapView.ts

@@ -181,11 +181,9 @@ export type IndoorLevel = Readonly<{
 
 export type IndoorLevelActivatedEventHandler = DirectEventHandler<
   Readonly<{
-    indoorLevel: {
-      activeLevelIndex: Int32; // Int32 for integers
-      name: string; // Non-nullable string
-      shortName: string; // Non-nullable string
-    }; // Nested ActiveIndoorLevel type
+    activeLevelIndex: Int32; // Int32 for integers
+    name: string; // Non-nullable string
+    shortName: string; // Non-nullable string
   }>
 >;
 
@@ -197,10 +195,9 @@ export type IndoorBuilding = Readonly<{
 
 export type IndoorBuildingEventHandler = DirectEventHandler<
   Readonly<{
-    indoorBuilding: {
-      underground: boolean; // Non-nullable boolean
-      activeLevelIndex: Int32; // Int32 for integers
-    };
+    underground: boolean; // Non-nullable boolean
+    activeLevelIndex: Int32; // Int32 for integers
+    levels: string; // Immutable array of IndoorLevel
   }>
 >;