react-native-maps 1.21.0-alpha.74 → 1.21.0-alpha.76

package/ios/AirMaps/RNMapsMarkerView.mm

@@ -7,7 +7,7 @@
 //
 
 #import "RNMapsMarkerView.h"
-#import "AirMap.h"
+#import "AIRMap.h"
 #import "AIRMapMarker.h"
 #import "AIRMapMarkerManager.h"
 #import <react-native-maps-generated/ComponentDescriptors.h>
@@ -93,8 +93,8 @@ using namespace facebook::react;
     _props = defaultProps;
     _legacyMapManager = [[AIRMapMarkerManager alloc] init];
     _view = (AIRMapMarker *)[_legacyMapManager view];
-    
-    
+
+
     _view.onPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -123,7 +123,7 @@ using namespace facebook::react;
             eventEmitter->onPress(data);
         }
     };
-    
+
     _view.onDeselect = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -152,7 +152,7 @@ using namespace facebook::react;
             eventEmitter->onDeselect(data);
         }
     };
-    
+
     _view.onDrag = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -190,7 +190,7 @@ using namespace facebook::react;
             eventEmitter->onDragStart(data);
         }
     };
-    
+
     _view.onDragEnd = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -210,7 +210,7 @@ using namespace facebook::react;
             eventEmitter->onDragEnd(data);
         }
     };
-    
+
     _view.onSelect = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -239,8 +239,8 @@ using namespace facebook::react;
             eventEmitter->onSelect(data);
         }
     };
-    
-    
+
+
     _view.onCalloutPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -271,7 +271,7 @@ using namespace facebook::react;
             eventEmitter->onCalloutPress(data);
         }
     };
-    
+
 }
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index{
@@ -300,7 +300,7 @@ using namespace facebook::react;
     if (self = [super initWithFrame:frame]) {
         [self prepareMarkerView];
     }
-    
+
     return self;
 }
 
@@ -310,28 +310,28 @@ using namespace facebook::react;
     const auto &oldViewProps = *std::static_pointer_cast<RNMapsMarkerProps const>(_props);
     const auto &newViewProps = *std::static_pointer_cast<RNMapsMarkerProps const>(props);
     BOOL completionHandlerCalled = false;
-    
+
 #define REMAP_MAPVIEW_PROP(name)                    \
 if (oldViewProps.name != newViewProps.name) {   \
 _view.name = newViewProps.name;             \
 }
-    
+
 #define REMAP_MAPVIEW_STRING_PROP(name)                             \
 if (oldViewProps.name != newViewProps.name) {                   \
 _view.name = RCTNSStringFromString(newViewProps.name);      \
 }
-    
+
 #define REMAP_MAPVIEW_COLOR_PROP(name)                                   \
 if (oldViewProps.name != newViewProps.name) {                        \
 _view.name = RCTUIColorFromSharedColor(newViewProps.name);       \
 }
-    
+
 #define REMAP_MAPVIEW_POINT_PROP(name)                               \
 if (newViewProps.name.x != oldViewProps.name.x ||                \
 newViewProps.name.y != oldViewProps.name.y) {                \
 _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
 }
-    
+
     if (newViewProps.zIndex != oldViewProps.zIndex){
         if (newViewProps.zIndex.has_value()){
             _view.zIndex = newViewProps.zIndex.value();
@@ -348,17 +348,17 @@ _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
             [_view setImageSrc:nil];
         }
     }
-    
+
     REMAP_MAPVIEW_PROP(useLegacyPinView)
-    
-    
+
+
     REMAP_MAPVIEW_PROP(opacity)
     REMAP_MAPVIEW_PROP(draggable)
     REMAP_MAPVIEW_PROP(isPreselected)
-    
+
     REMAP_MAPVIEW_COLOR_PROP(pinColor)
 
-    
+
     REMAP_MAPVIEW_POINT_PROP(calloutOffset)
     if (newViewProps.coordinate.latitude != oldViewProps.coordinate.latitude ||
         newViewProps.coordinate.longitude != oldViewProps.coordinate.longitude) {
@@ -367,8 +367,8 @@ _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
                                                                         newViewProps.coordinate.longitude);
         _view.coordinate = coordinates;
     }
-    
-    
+
+
     if (newViewProps.description != oldViewProps.description){
         _view.subtitle = RCTNSStringFromString(newViewProps.description);
     }
@@ -398,10 +398,10 @@ _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
             case RNMapsMarkerSubtitleVisibility::Hidden:
                 [_view setSubtitleVisibility:MKFeatureVisibilityHidden];
                 break;
-                
+
         }
     }
-    
+
     if (newViewProps.displayPriority != oldViewProps.displayPriority){
         switch (newViewProps.displayPriority) {
             case RNMapsMarkerDisplayPriority::Required:
@@ -413,11 +413,11 @@ _view.name = CGPointMake(newViewProps.name.x, newViewProps.name.y); \
             case RNMapsMarkerDisplayPriority::Low:
                 [_view setDisplayPriority:MKFeatureDisplayPriorityDefaultLow];
                 break;
-                
+
         }
     }
 
-    
+
     [super updateProps:props oldProps:oldProps];
 }
 

package/ios/generated/RCTAppDependencyProvider.h

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-
-#import <Foundation/Foundation.h>
-
-#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>)
-#import <React-RCTAppDelegate/RCTDependencyProvider.h>
-#elif __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
-#import <React_RCTAppDelegate/RCTDependencyProvider.h>
-#else
-#import "RCTDependencyProvider.h"
-#endif
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RCTAppDependencyProvider : NSObject <RCTDependencyProvider>
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/generated/RCTAppDependencyProvider.mm

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTAppDependencyProvider.h"
-#import <ReactCodegen/RCTModulesConformingToProtocolsProvider.h>
-#import <ReactCodegen/RCTThirdPartyComponentsProvider.h>
-
-@implementation RCTAppDependencyProvider {
-  NSArray<NSString *> * _URLRequestHandlerClassNames;
-  NSArray<NSString *> * _imageDataDecoderClassNames;
-  NSArray<NSString *> * _imageURLLoaderClassNames;
-  NSDictionary<NSString *,Class<RCTComponentViewProtocol>> * _thirdPartyFabricComponents;
-}
-
-- (nonnull NSArray<NSString *> *)URLRequestHandlerClassNames {
-  static dispatch_once_t requestUrlToken;
-  dispatch_once(&requestUrlToken, ^{
-    self->_URLRequestHandlerClassNames = RCTModulesConformingToProtocolsProvider.URLRequestHandlerClassNames;
-  });
-
-  return _URLRequestHandlerClassNames;
-}
-
-- (nonnull NSArray<NSString *> *)imageDataDecoderClassNames {
-  static dispatch_once_t dataDecoderToken;
-  dispatch_once(&dataDecoderToken, ^{
-    _imageDataDecoderClassNames = RCTModulesConformingToProtocolsProvider.imageDataDecoderClassNames;
-  });
-
-  return _imageDataDecoderClassNames;
-}
-
-- (nonnull NSArray<NSString *> *)imageURLLoaderClassNames {
-  static dispatch_once_t urlLoaderToken;
-  dispatch_once(&urlLoaderToken, ^{
-    _imageURLLoaderClassNames = RCTModulesConformingToProtocolsProvider.imageURLLoaderClassNames;
-  });
-
-  return _imageURLLoaderClassNames;
-}
-
-- (nonnull NSDictionary<NSString *,Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents {
-  static dispatch_once_t nativeComponentsToken;
-  dispatch_once(&nativeComponentsToken, ^{
-    _thirdPartyFabricComponents = RCTThirdPartyComponentsProvider.thirdPartyFabricComponents;
-  });
-
-  return _thirdPartyFabricComponents;
-}
-
-@end

package/ios/generated/RCTModulesConformingToProtocolsProvider.h

@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface RCTModulesConformingToProtocolsProvider: NSObject
-
-+(NSArray<NSString *> *)imageURLLoaderClassNames;
-
-+(NSArray<NSString *> *)imageDataDecoderClassNames;
-
-+(NSArray<NSString *> *)URLRequestHandlerClassNames;
-
-@end

package/ios/generated/RCTModulesConformingToProtocolsProvider.mm

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTModulesConformingToProtocolsProvider.h"
-
-@implementation RCTModulesConformingToProtocolsProvider
-
-+(NSArray<NSString *> *)imageURLLoaderClassNames
-{
-  return @[
-    
-  ];
-}
-
-+(NSArray<NSString *> *)imageDataDecoderClassNames
-{
-  return @[
-    
-  ];
-}
-
-+(NSArray<NSString *> *)URLRequestHandlerClassNames
-{
-  return @[
-    
-  ];
-}
-
-@end

package/ios/generated/RCTThirdPartyComponentsProvider.h

@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <Foundation/Foundation.h>
-
-@protocol RCTComponentViewProtocol;
-
-@interface RCTThirdPartyComponentsProvider: NSObject
-
-+ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents;
-
-@end

package/ios/generated/RCTThirdPartyComponentsProvider.mm

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-
-#import <Foundation/Foundation.h>
-
-#import "RCTThirdPartyComponentsProvider.h"
-#import <React/RCTComponentViewProtocol.h>
-
-@implementation RCTThirdPartyComponentsProvider
-
-+ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
-{
-  return @{
-		@"RNMapsGoogleMapView": NSClassFromString(@"RNMapsGoogleMapView"), // react-native-maps
-		@"RNMapsGooglePolygon": NSClassFromString(@"RNMapsGooglePolygonView"), // react-native-maps
-		@"RNMapsMapView": NSClassFromString(@"RNMapsMapView"), // react-native-maps
-		@"RNMapsMarker": NSClassFromString(@"RNMapsMarkerView"), // react-native-maps
-  };
-}
-
-@end

package/ios/generated/RNMapsSpecs/EventEmitters.cpp

@@ -39,10 +39,10 @@ void RNMapsGoogleMapViewEventEmitter::onIndoorBuildingFocused(OnIndoorBuildingFo
   dispatchEvent("indoorBuildingFocused", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     {
-  auto IndoorBuilding = jsi::Object(runtime);
-  IndoorBuilding.setProperty(runtime, "underground", $event.IndoorBuilding.underground);
-  IndoorBuilding.setProperty(runtime, "activeLevelIndex", $event.IndoorBuilding.activeLevelIndex);
-  $payload.setProperty(runtime, "IndoorBuilding", IndoorBuilding);
+  auto indoorBuilding = jsi::Object(runtime);
+  indoorBuilding.setProperty(runtime, "underground", $event.indoorBuilding.underground);
+  indoorBuilding.setProperty(runtime, "activeLevelIndex", $event.indoorBuilding.activeLevelIndex);
+  $payload.setProperty(runtime, "indoorBuilding", indoorBuilding);
 }
     return $payload;
   });
@@ -53,11 +53,11 @@ void RNMapsGoogleMapViewEventEmitter::onIndoorLevelActivated(OnIndoorLevelActiva
   dispatchEvent("indoorLevelActivated", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     {
-  auto IndoorLevel = jsi::Object(runtime);
-  IndoorLevel.setProperty(runtime, "activeLevelIndex", $event.IndoorLevel.activeLevelIndex);
-  IndoorLevel.setProperty(runtime, "name", $event.IndoorLevel.name);
-  IndoorLevel.setProperty(runtime, "shortName", $event.IndoorLevel.shortName);
-  $payload.setProperty(runtime, "IndoorLevel", IndoorLevel);
+  auto indoorLevel = jsi::Object(runtime);
+  indoorLevel.setProperty(runtime, "activeLevelIndex", $event.indoorLevel.activeLevelIndex);
+  indoorLevel.setProperty(runtime, "name", $event.indoorLevel.name);
+  indoorLevel.setProperty(runtime, "shortName", $event.indoorLevel.shortName);
+  $payload.setProperty(runtime, "indoorLevel", indoorLevel);
 }
     return $payload;
   });

package/ios/generated/RNMapsSpecs/EventEmitters.h

@@ -45,7 +45,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
     };
 
   struct OnIndoorBuildingFocused {
-      OnIndoorBuildingFocusedIndoorBuilding IndoorBuilding;
+      OnIndoorBuildingFocusedIndoorBuilding indoorBuilding;
     };
 
   struct OnIndoorLevelActivatedIndoorLevel {
@@ -55,7 +55,7 @@ class RNMapsGoogleMapViewEventEmitter : public ViewEventEmitter {
     };
 
   struct OnIndoorLevelActivated {
-      OnIndoorLevelActivatedIndoorLevel IndoorLevel;
+      OnIndoorLevelActivatedIndoorLevel indoorLevel;
     };
 
   struct OnKmlReady {

package/ios/generated/RNMapsSpecs/Props.cpp

@@ -125,6 +125,7 @@ RNMapsMapViewProps::RNMapsMapViewProps(
     userLocationUpdateInterval(convertRawProp(context, rawProps, "userLocationUpdateInterval", sourceProps.userLocationUpdateInterval, {5000})),
     zoomControlEnabled(convertRawProp(context, rawProps, "zoomControlEnabled", sourceProps.zoomControlEnabled, {true})),
     zoomEnabled(convertRawProp(context, rawProps, "zoomEnabled", sourceProps.zoomEnabled, {true})),
+    showsTraffic(convertRawProp(context, rawProps, "showsTraffic", sourceProps.showsTraffic, {false})),
     zoomTapEnabled(convertRawProp(context, rawProps, "zoomTapEnabled", sourceProps.zoomTapEnabled, {true})),
     cameraZoomRange(convertRawProp(context, rawProps, "cameraZoomRange", sourceProps.cameraZoomRange, {}))
       {}

package/ios/generated/RNMapsSpecs/Props.h

@@ -888,6 +888,7 @@ class RNMapsMapViewProps final : public ViewProps {
   int userLocationUpdateInterval{5000};
   bool zoomControlEnabled{true};
   bool zoomEnabled{true};
+  bool showsTraffic{false};
   bool zoomTapEnabled{true};
   RNMapsMapViewCameraZoomRangeStruct cameraZoomRange{};
 };

package/ios/generated/RNMapsSpecs/RCTComponentViewHelpers.h

@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (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;
 @end
 
 RCT_EXTERN inline void RCTRNMapsGoogleMapViewHandleCommand(
@@ -203,6 +204,26 @@ NSObject *arg2 = args[2];
   return;
 }
 
+if ([commandName isEqualToString:@"setIndoorActiveLevelIndex"]) {
+#if RCT_DEBUG
+  if ([args count] != 1) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsGoogleMapView", commandName, (int)[args count], 1);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"number", @"RNMapsGoogleMapView", commandName, @"1st")) {
+    return;
+  }
+#endif
+  NSInteger activeLevelIndex = [(NSNumber *)arg0 intValue];
+
+  [componentView setIndoorActiveLevelIndex:activeLevelIndex];
+  return;
+}
+
 #if RCT_DEBUG
   RCTLogError(@"%@ received command %@, which is not a supported command.", @"RNMapsGoogleMapView", commandName);
 #endif
@@ -219,6 +240,7 @@ NSObject *arg2 = args[2];
 - (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;
 @end
 
 RCT_EXTERN inline void RCTRNMapsMapViewHandleCommand(
@@ -402,6 +424,26 @@ NSObject *arg2 = args[2];
   return;
 }
 
+if ([commandName isEqualToString:@"setIndoorActiveLevelIndex"]) {
+#if RCT_DEBUG
+  if ([args count] != 1) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"RNMapsMapView", commandName, (int)[args count], 1);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"number", @"RNMapsMapView", commandName, @"1st")) {
+    return;
+  }
+#endif
+  NSInteger activeLevelIndex = [(NSNumber *)arg0 intValue];
+
+  [componentView setIndoorActiveLevelIndex:activeLevelIndex];
+  return;
+}
+
 #if RCT_DEBUG
   RCTLogError(@"%@ received command %@, which is not a supported command.", @"RNMapsMapView", commandName);
 #endif

package/lib/MapCircle.d.ts

@@ -101,7 +101,7 @@ export type MapCircleProps = ViewProps & {
     zIndex?: number;
 };
 type NativeProps = MapCircleProps & {
-    ref: React.RefObject<View>;
+    ref: React.RefObject<View | null>;
 };
 export declare class MapCircle extends React.Component<MapCircleProps> {
     context: React.ContextType<typeof ProviderContext>;

package/lib/MapHeatmap.d.ts

@@ -59,9 +59,9 @@ type NativeProps = Modify<MapHeatmapProps, {
         colors: (ProcessedColorValue | null | undefined)[];
     }>;
 }> & {
-    ref: React.RefObject<View>;
+    ref: React.RefObject<View | null>;
 };
-export declare class MapHeatmap extends React.Component<MapHeatmapProps> {
+export declare class MapHeatmap extends React.Component<MapHeatmapProps | null> {
     context: React.ContextType<typeof ProviderContext>;
     getNativeComponent: () => NativeComponent<NativeProps>;
     getMapManagerCommand: (name: string) => MapManagerCommand;

package/lib/MapHeatmap.js

@@ -41,7 +41,7 @@ class MapHeatmap extends React.Component {
     }
     render() {
         const AIRMapHeatmap = this.getNativeComponent();
-        const propGradient = this.props.gradient;
+        const propGradient = this.props?.gradient;
         let gradient;
         if (propGradient) {
             const colors = propGradient.colors.map(c => (0, react_native_1.processColor)(c));

package/lib/MapMarker.d.ts

@@ -298,7 +298,7 @@ export type NativeProps = Modify<OmittedProps, {
     icon?: string;
     image?: MapMarkerProps['image'] | string;
 }> & {
-    ref: React.RefObject<MapMarkerNativeComponentType>;
+    ref: React.RefObject<MapMarkerNativeComponentType | null>;
 };
 export declare class MapMarker extends React.Component<MapMarkerProps> {
     context: React.ContextType<typeof ProviderContext>;

package/lib/MapPolygon.d.ts

@@ -124,7 +124,7 @@ export type MapPolygonProps = ViewProps & {
     zIndex?: number;
 };
 type NativeProps = MapPolygonProps & {
-    ref: React.RefObject<View>;
+    ref: React.RefObject<View | null>;
 };
 export declare class MapPolygon extends React.Component<MapPolygonProps> {
     context: React.ContextType<typeof ProviderContext>;

package/lib/MapPolyline.d.ts

@@ -125,7 +125,7 @@ export type MapPolylineProps = ViewProps & {
     zIndex?: number;
 };
 type NativeProps = MapPolylineProps & {
-    ref: React.RefObject<View>;
+    ref: React.RefObject<View | null>;
 };
 export declare class MapPolyline extends React.Component<MapPolylineProps> {
     context: React.ContextType<typeof ProviderContext>;

package/lib/MapView.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Animated as RNAnimated, Animated, NativeSyntheticEvent, ViewProps } from 'react-native';
 import { CalloutPressEvent, ClickEvent, Frame, LatLng, MarkerDeselectEvent, MarkerDragEvent, MarkerDragStartEndEvent, MarkerPressEvent, MarkerSelectEvent, Point, Provider, Region } from './sharedTypes';
-import { Address, BoundingBox, Camera, CameraZoomRange, ChangeEvent, Details, EdgePadding, FitToOptions, IndoorBuildingEvent, IndoorLevelActivatedEvent, KmlMapEvent, LongPressEvent, MapPressEvent, MapStyleElement, MapType, MapTypes, PanDragEvent, PoiClickEvent, SnapshotOptions, UserLocationChangeEvent } from './MapView.types';
+import { ActiveIndoorLevel, Address, BoundingBox, Camera, CameraZoomRange, ChangeEvent, Details, EdgePadding, FitToOptions, IndoorBuilding, KmlMapEvent, LongPressEvent, MapPressEvent, MapStyleElement, MapType, MapTypes, PanDragEvent, PoiClickEvent, SnapshotOptions, UserLocationChangeEvent } from './MapView.types';
 import { Modify } from './sharedTypesInternal';
 import { MapViewNativeComponentType } from './MapViewNativeComponent';
 import AnimatedRegion from './AnimatedRegion';
@@ -217,14 +217,14 @@ export type MapViewProps = ViewProps & {
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    onIndoorBuildingFocused?: (event: IndoorBuildingEvent) => void;
+    onIndoorBuildingFocused?: (indoorBuilding: IndoorBuilding) => void;
     /**
      * Callback that is called when a level on indoor building is activated
      *
      * @platform iOS: Google Maps only
      * @platform Android: Supported
      */
-    onIndoorLevelActivated?: (event: IndoorLevelActivatedEvent) => void;
+    onIndoorLevelActivated?: (indoorLevel: ActiveIndoorLevel) => void;
     /**
      * Callback that is called once the kml is fully loaded.
      *
@@ -586,7 +586,7 @@ type ModifiedProps = Modify<MapViewProps, {
     initialRegion?: MapViewProps['initialRegion'] | null;
 }>;
 export type NativeProps = Omit<ModifiedProps, 'customMapStyle' | 'onRegionChange' | 'onRegionChangeComplete'> & {
-    ref: React.RefObject<MapViewNativeComponentType>;
+    ref: React.RefObject<MapViewNativeComponentType | null>;
     customMapStyleString?: string;
     handlePanDrag?: boolean;
     onChange?: (e: ChangeEvent) => void;
@@ -619,7 +619,7 @@ declare class MapView extends React.Component<MapViewProps, State> {
      */
     getMapBoundaries(): Promise<BoundingBox>;
     setMapBoundaries(northEast: LatLng, southWest: LatLng): void;
-    setIndoorActiveLevelIndex(activeLevelIndex: number): void;
+    setIndoorActiveLevelIndex(activeLevelIndex: number): void | Promise<never>;
     /**
      * Takes a snapshot of the map and saves it to a picture
      * file or returns the image as a base64 encoded string.
@@ -693,6 +693,8 @@ declare class MapView extends React.Component<MapViewProps, State> {
     private handleMarkerDeselect;
     private handleRegionChange;
     private handleRegionChangeStarted;
+    private handleIndoorBuildingFocused;
+    private handleIndoorLevelActivated;
     private handleRegionChangeComplete;
     render(): React.JSX.Element;
 }

package/lib/MapView.js

@@ -167,9 +167,10 @@ class MapView extends React.Component {
         }
     }
     setIndoorActiveLevelIndex(activeLevelIndex) {
-        if (this.map.current) {
-            MapViewNativeComponent_1.Commands.setIndoorActiveLevelIndex(this.map.current, activeLevelIndex);
+        if (this.fabricMap.current) {
+            return this.fabricMap.current.setIndoorActiveLevelIndex(activeLevelIndex);
         }
+        return Promise.reject('getMapBoundaries not supported on this platform');
     }
     /**
      * Takes a snapshot of the map and saves it to a picture
@@ -340,6 +341,16 @@ class MapView extends React.Component {
             this.props.onRegionChangeStart(event);
         }
     };
+    handleIndoorBuildingFocused = (event) => {
+        if (this.props.onIndoorBuildingFocused) {
+            this.props.onIndoorBuildingFocused(event);
+        }
+    };
+    handleIndoorLevelActivated = (event) => {
+        if (this.props.onIndoorLevelActivated) {
+            this.props.onIndoorLevelActivated(event);
+        }
+    };
     handleRegionChangeComplete = (event) => {
         const isGesture = event.nativeEvent.isGesture;
         const details = { isGesture };
@@ -368,6 +379,9 @@ class MapView extends React.Component {
             onRegionChange: this.handleRegionChange,
             onRegionChangeStart: this.handleRegionChangeStarted,
             onRegionChangeComplete: this.handleRegionChangeComplete,
+            onIndoorBuildingFocused: this.handleIndoorBuildingFocused,
+            // @ts-ignore
+            onIndoorLevelActivated: this.handleIndoorLevelActivated,
             ...restProps,
         };
         if (this.props.region) {

package/lib/MapView.types.d.ts

@@ -46,7 +46,7 @@ export type ActiveIndoorLevel = {
     shortName: string;
 };
 export type IndoorLevelActivatedEvent = NativeSyntheticEvent<{
-    IndoorLevel: ActiveIndoorLevel;
+    indoorLevel: ActiveIndoorLevel;
 }>;
 export type IndoorBuilding = {
     underground: boolean;

package/lib/createFabricMap.d.ts

@@ -18,6 +18,7 @@ export interface FabricMapHandle {
     getAddressFromCoordinates: (coordinate: LatLng) => Promise<Address>;
     getPointForCoordinate: (coordinate: LatLng) => Promise<Point>;
     getCoordinateForPoint: (point: Point) => Promise<LatLng>;
+    setIndoorActiveLevelIndex: (activeLevelIndex: number) => void;
 }
 declare const createFabricMap: (ViewComponent: React.ComponentType, Commands: any) => React.ForwardRefExoticComponent<MapFabricNativeProps & React.RefAttributes<FabricMapHandle>>;
 export default createFabricMap;