react-native-maps 2.0.0-beta.12 → 2.0.0-beta.13

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

@@ -311,7 +311,7 @@ public class MapManager extends ViewGroupManager<MapView> {
         "onIndoorLevelActivated", MapBuilder.of("registrationName", "onIndoorLevelActivated"),
         "onIndoorBuildingFocused", MapBuilder.of("registrationName", "onIndoorBuildingFocused"),
         "onDoublePress", MapBuilder.of("registrationName", "onDoublePress"),
-        "onMapLoaded", MapBuilder.of("registrationName", "onMapLoaded")
+        "onTilesRendered", MapBuilder.of("registrationName", "onTilesRendered")
     ));
 
     return map;

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

@@ -404,7 +404,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     map.setOnMapLoadedCallback(new GoogleMap.OnMapLoadedCallback() {
       @Override public void onMapLoaded() {
         isMapLoaded = true;
-        manager.pushEvent(context, view, "onMapLoaded", new WritableNativeMap());
+        manager.pushEvent(context, view, "onTilesRendered", new WritableNativeMap());
         MapView.this.cacheView();
       }
     });

package/ios/GoogleMaps/RNMGoogleMap.h

@@ -18,62 +18,61 @@
 @interface RNMGoogleMap : GMSMapView
 
 // TODO: don't use MK region?
-@property (nonatomic, weak) RCTBridge *bridge;
+@property (nonatomic, assign) BOOL pitchEnabled;
+@property (nonatomic, assign) BOOL rotateEnabled;
+@property (nonatomic, assign) BOOL scrollDuringRotateOrZoomEnabled;
+@property (nonatomic, assign) BOOL scrollEnabled;
+@property (nonatomic, assign) BOOL showsBuildings;
+@property (nonatomic, assign) BOOL showsCompass;
+@property (nonatomic, assign) BOOL showsIndoorLevelPicker;
+@property (nonatomic, assign) BOOL showsIndoors;
+@property (nonatomic, assign) BOOL showsMyLocationButton;
+@property (nonatomic, assign) BOOL showsTraffic;
+@property (nonatomic, assign) BOOL showsUserLocation;
+@property (nonatomic, assign) BOOL zoomEnabled;
+@property (nonatomic, assign) BOOL zoomTapEnabled;
+@property (nonatomic, assign) GMSCameraPosition *cameraProp;   // Because the base class already has a "camera" prop.
 @property (nonatomic, assign) MKCoordinateRegion initialRegion;
 @property (nonatomic, assign) MKCoordinateRegion region;
-@property (nonatomic, assign) GMSCameraPosition *cameraProp;   // Because the base class already has a "camera" prop.
-@property (nonatomic, strong) GMSCameraPosition *initialCamera;
 @property (nonatomic, assign) NSString *customMapStyleString;
-@property (nonatomic, assign) UIEdgeInsets mapPadding;
+@property (nonatomic, assign) NSString *kmlSrc;
 @property (nonatomic, assign) NSString *paddingAdjustmentBehaviorString;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
-@property (nonatomic, copy) RCTBubblingEventBlock onMapLoaded;
+@property (nonatomic, assign) UIEdgeInsets mapPadding;
+@property (nonatomic, copy) RCTBubblingEventBlock onChange;
 @property (nonatomic, copy) RCTBubblingEventBlock onKmlReady;
-@property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, copy) RCTBubblingEventBlock onLongPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
-@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
+@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
 @property (nonatomic, copy) RCTBubblingEventBlock onMarkerPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onChange;
+@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
 @property (nonatomic, copy) RCTBubblingEventBlock onPoiClick;
+@property (nonatomic, copy) RCTBubblingEventBlock onPress;
+@property (nonatomic, copy) RCTBubblingEventBlock onTilesRendered;
+@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
+@property (nonatomic, copy) RCTDirectEventBlock onIndoorBuildingFocused;
+@property (nonatomic, copy) RCTDirectEventBlock onIndoorLevelActivated;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChangeComplete;
-@property (nonatomic, copy) RCTDirectEventBlock onIndoorLevelActivated;
-@property (nonatomic, copy) RCTDirectEventBlock onIndoorBuildingFocused;
+@property (nonatomic, strong) GMSCameraPosition *initialCamera;
+@property (nonatomic, strong) NSMutableArray *circles;
+@property (nonatomic, strong) NSMutableArray *heatmaps;
 @property (nonatomic, strong) NSMutableArray *markers;
+@property (nonatomic, strong) NSMutableArray *overlays;
 @property (nonatomic, strong) NSMutableArray *polygons;
 @property (nonatomic, strong) NSMutableArray *polylines;
-@property (nonatomic, strong) NSMutableArray *circles;
-@property (nonatomic, strong) NSMutableArray *heatmaps;
 @property (nonatomic, strong) NSMutableArray *tiles;
-@property (nonatomic, strong) NSMutableArray *overlays;
-
-@property (nonatomic, assign) BOOL showsBuildings;
-@property (nonatomic, assign) BOOL showsTraffic;
-@property (nonatomic, assign) BOOL showsCompass;
-@property (nonatomic, assign) BOOL scrollEnabled;
-@property (nonatomic, assign) BOOL zoomEnabled;
-@property (nonatomic, assign) BOOL rotateEnabled;
-@property (nonatomic, assign) BOOL scrollDuringRotateOrZoomEnabled;
-@property (nonatomic, assign) BOOL pitchEnabled;
-@property (nonatomic, assign) BOOL zoomTapEnabled;
-@property (nonatomic, assign) BOOL showsUserLocation;
-@property (nonatomic, assign) BOOL showsMyLocationButton;
-@property (nonatomic, assign) BOOL showsIndoors;
-@property (nonatomic, assign) BOOL showsIndoorLevelPicker;
-@property (nonatomic, assign) NSString *kmlSrc;
+@property (nonatomic, weak) RCTBridge *bridge;
 
-- (void)didPrepareMap;
-- (void)mapViewDidFinishTileRendering;
 - (BOOL)didTapMarker:(GMSMarker *)marker;
-- (void)didTapPolyline:(GMSPolyline *)polyline;
-- (void)didTapPolygon:(GMSPolygon *)polygon;
-- (void)didTapAtCoordinate:(CLLocationCoordinate2D)coordinate;
-- (void)didLongPressAtCoordinate:(CLLocationCoordinate2D)coordinate;
+- (NSArray *)getMapBoundaries;
 - (void)didChangeCameraPosition:(GMSCameraPosition *)position isGesture:(BOOL)isGesture;
-- (void)idleAtCameraPosition:(GMSCameraPosition *)position isGesture:(BOOL)isGesture;
+- (void)didLongPressAtCoordinate:(CLLocationCoordinate2D)coordinate;
+- (void)didPrepareMap;
+- (void)didTapAtCoordinate:(CLLocationCoordinate2D)coordinate;
 - (void)didTapPOIWithPlaceID:(NSString *)placeID name:(NSString *) name location:(CLLocationCoordinate2D) location;
-- (NSArray *)getMapBoundaries;
+- (void)didTapPolygon:(GMSPolygon *)polygon;
+- (void)didTapPolyline:(GMSPolyline *)polyline;
+- (void)idleAtCameraPosition:(GMSCameraPosition *)position isGesture:(BOOL)isGesture;
+- (void)mapViewDidFinishTileRendering;
 
 + (MKCoordinateRegion)makeGMSCameraPositionFromMap:(GMSMapView *)map andGMSCameraPosition:(GMSCameraPosition *)position;
 + (GMSCameraPosition*)makeGMSCameraPositionFromMap:(GMSMapView *)map andMKCoordinateRegion:(MKCoordinateRegion)region;

package/ios/GoogleMaps/RNMGoogleMap.m

@@ -330,7 +330,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 }
 
 - (void)mapViewDidFinishTileRendering {
-  if (self.onMapLoaded) self.onMapLoaded(@{});
+  if (self.onTilesRendered) self.onTilesRendered(@{});
 }
 
 - (BOOL)didTapMarker:(GMSMarker *)marker {

package/ios/GoogleMaps/RNMGoogleMapManager.m

@@ -81,7 +81,6 @@ RCT_EXPORT_VIEW_PROPERTY(onIndoorBuildingFocused, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onIndoorLevelActivated, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onKmlReady, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onMapLoaded, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
@@ -89,6 +88,7 @@ RCT_EXPORT_VIEW_PROPERTY(onPoiClick, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onRegionChangeComplete, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onTilesRendered, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(pitchEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(region, MKCoordinateRegion)

package/ios/Maps/RNMMap.h

@@ -66,6 +66,7 @@ extern const NSInteger RNMMapMaxZoomLevel;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerDragEnd;
 @property (nonatomic, copy) RCTDirectEventBlock onCalloutPress;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
+@property (nonatomic, copy) RCTBubblingEventBlock onTilesRendered;
 @property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
 
 - (void)cacheViewIfNeeded;

package/ios/Maps/RNMMapManager.m

@@ -111,6 +111,7 @@ RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onTilesRendered, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(pitchEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(rotateEnabled, BOOL)
@@ -551,9 +552,12 @@ static int kDragCenterContext;
     [mapView beginLoading];
 }
 
-- (void)mapViewDidFinishRenderingMap:(RNMMap *)mapView fullyRendered:(BOOL)fullyRendered
+- (void)mapViewDidFinishRenderingMap:(RNMMap *)mapView fullyRendered:(__unused BOOL)fullyRendered
 {
     [mapView finishLoading];
+    if (mapView.onTilesRendered) {
+        mapView.onTilesRendered(@{});
+    }
 }
 
 #pragma mark Private

package/lib/MapView.d.ts

@@ -227,13 +227,6 @@ export type MapViewProps = ViewProps & {
      * @platform Android: Supported
      */
     onLongPress?: (event: LongPressEvent) => void;
-    /**
-     * Callback that is called when the map has finished rendering all tiles.
-     *
-     * @platform iOS: Google Maps only
-     * @platform Android: Supported
-     */
-    onMapLoaded?: (event: NativeSyntheticEvent<{}>) => void;
     /**
      * Callback that is called once the map is ready.
      *
@@ -329,6 +322,13 @@ export type MapViewProps = ViewProps & {
      * @platform Android: Supported
      */
     onRegionChangeComplete?: (region: Region, details: Details) => void;
+    /**
+     * Callback that is called when the map has finished rendering all tiles.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    onTilesRendered?: (event: NativeSyntheticEvent<{}>) => void;
     /**
      * Callback that is called when the underlying map figures our users current location
      * (coordinate also includes isFromMockProvider value for Android API 18 and above).

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": "2.0.0-beta.12",
+  "version": "2.0.0-beta.13",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",