react-native-maps 1.21.0-alpha.11 → 1.21.0-alpha.111

package/ios/AirMaps/RNMapsMapViewManager.mm

@@ -17,7 +17,25 @@
 
 RCT_EXPORT_MODULE(RNMapsMapViewManager)
 
-
+RCT_EXPORT_VIEW_PROPERTY(onMapReady, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLongPress, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onCalloutPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDoublePress, RCTDirectEventBlock)
+
+RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTDirectEventBlock)
+
+RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDragStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDrag, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDragEnd, RCTDirectEventBlock)
+
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChangeComplete, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTDirectEventBlock)
 
 
 

package/ios/AirMaps/RNMapsMarkerView.h

@@ -0,0 +1,24 @@
+//
+//  RNMapsMarker.h
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^LoadCompletionHandler)(UIView *view);
+
+@class AIRMapMarker;
+@interface RNMapsMarkerView : RCTViewComponentView
+- (AIRMapMarker*) marker;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif

package/ios/AirMaps/RNMapsMarkerView.mm

@@ -0,0 +1,430 @@
+//
+//  RNMapsMarker.m
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+
+#import "RNMapsMarkerView.h"
+#import "AIRMap.h"
+#import "AIRMapMarker.h"
+#import "AIRMapMarkerManager.h"
+#import <react/renderer/components/RNMapsSpecs/ComponentDescriptors.h>
+#import <react/renderer/components/RNMapsSpecs/EventEmitters.h>
+#import <react/renderer/components/RNMapsSpecs/Props.h>
+#import <react/renderer/components/RNMapsSpecs/RCTComponentViewHelpers.h>
+#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import "UIView+AirMap.h"
+
+using namespace facebook::react;
+
+@interface RNMapsMarkerView () <RCTRNMapsMarkerViewProtocol>
+@end
+
+@implementation RNMapsMarkerView {
+    AIRMapMarker *_view;
+    AIRMapMarkerManager* _legacyMapManager;
+}
+
+- (AIRMapMarker *) marker {
+    return _view;
+}
+- (void) prepareForRecycle
+{
+    [super prepareForRecycle];
+    [_view removeFromSuperview];
+    _view = nil;
+    _legacyMapManager = nil;
+}
+
+#pragma mark - JS Commands
+
+
+#pragma mark - Native commands
+
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
+{
+    RCTRNMapsMarkerHandleCommand(self, commandName, args);
+}
+
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+    return concreteComponentDescriptorProvider<RNMapsMarkerComponentDescriptor>();
+}
+
+- (void) animateToCoordinates:(double)latitude longitude:(double)longitude duration:(NSInteger)duration
+{
+    [_view animateToCoordinate:CLLocationCoordinate2DMake(latitude, longitude) duration:duration/1000];
+}
+
+- (void) showCallout
+{
+    [_view.map selectAnnotation:_view animated:YES];
+}
+
+- (void) hideCallout
+{
+    [_view.map deselectAnnotation:_view animated:YES];
+
+}
+- (void) redraw
+{
+   // do nothing
+}
+- (void) redrawCallout
+{
+    // do nothing
+}
+
+- (void) setCoordinates:(double)latitude longitude:(double)longitude
+{
+    [_view setCoordinate:CLLocationCoordinate2DMake(latitude, longitude)];
+}
+
+
+
+- (void) prepareMarkerView
+{
+    if (_legacyMapManager && _view) return;
+    static const auto defaultProps = std::make_shared<const RNMapsMarkerProps>();
+    _props = defaultProps;
+    _legacyMapManager = [[AIRMapMarkerManager alloc] init];
+    _view = (AIRMapMarker *)[_legacyMapManager view];
+
+
+    _view.onPress = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            // Extract values from the NSDictionary
+            NSDictionary* coordinateDict = dictionary[@"coordinate"];
+            NSDictionary* positionDict = dictionary[@"position"];
+
+            // Populate the OnCalloutPressPoint struct
+            facebook::react::RNMapsMarkerEventEmitter::OnPressPosition point = {
+                .x = [coordinateDict[@"x"] doubleValue],
+                .y = [coordinateDict[@"y"] doubleValue],
+            };
+
+
+            facebook::react::RNMapsMarkerEventEmitter::OnPressCoordinate coordinate = {
+                .latitude = [coordinateDict[@"latitude"] doubleValue],
+                .longitude = [coordinateDict[@"longitude"] doubleValue],
+            };
+
+            auto eventEmitter = std::static_pointer_cast<RNMapsMarkerEventEmitter const>(_eventEmitter);
+            facebook::react::RNMapsMarkerEventEmitter::OnPress data = {
+                .action = std::string([dictionary[@"action"] UTF8String]),
+                .id = std::string([dictionary[@"id"] UTF8String]),
+                .position = point,
+                .coordinate = coordinate,
+            };
+            eventEmitter->onPress(data);
+        }
+    };
+
+    _view.onDeselect = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            // Extract values from the NSDictionary
+            NSDictionary* coordinateDict = dictionary[@"coordinate"];
+            NSDictionary* positionDict = dictionary[@"position"];
+
+            // Populate the OnCalloutPressPoint struct
+            facebook::react::RNMapsMarkerEventEmitter::OnDeselectPosition point = {
+                .x = [coordinateDict[@"x"] doubleValue],
+                .y = [coordinateDict[@"y"] doubleValue],
+            };
+
+
+            facebook::react::RNMapsMarkerEventEmitter::OnDeselectCoordinate coordinate = {
+                .latitude = [coordinateDict[@"latitude"] doubleValue],
+                .longitude = [coordinateDict[@"longitude"] doubleValue],
+            };
+
+            auto eventEmitter = std::static_pointer_cast<RNMapsMarkerEventEmitter const>(_eventEmitter);
+            facebook::react::RNMapsMarkerEventEmitter::OnDeselect data = {
+                .action = std::string([dictionary[@"action"] UTF8String]),
+                .id = std::string([dictionary[@"id"] UTF8String]),
+                .position = point,
+                .coordinate = coordinate,
+            };
+            eventEmitter->onDeselect(data);
+        }
+    };
+
+    _view.onDrag = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            // Extract values from the NSDictionary
+            NSDictionary* coordinateDict = dictionary[@"coordinate"];
+
+
+            facebook::react::RNMapsMarkerEventEmitter::OnDragCoordinate coordinate = {
+                .latitude = [coordinateDict[@"latitude"] doubleValue],
+                .longitude = [coordinateDict[@"longitude"] doubleValue],
+            };
+
+            auto eventEmitter = std::static_pointer_cast<RNMapsMarkerEventEmitter const>(_eventEmitter);
+            facebook::react::RNMapsMarkerEventEmitter::OnDrag data = {
+                .id = std::string([dictionary[@"id"] UTF8String]),
+                .coordinate = coordinate,
+            };
+            eventEmitter->onDrag(data);
+        }
+    };
+    _view.onDragStart = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            // Extract values from the NSDictionary
+            NSDictionary* coordinateDict = dictionary[@"coordinate"];
+
+            facebook::react::RNMapsMarkerEventEmitter::OnDragStartCoordinate coordinate = {
+                .latitude = [coordinateDict[@"latitude"] doubleValue],
+                .longitude = [coordinateDict[@"longitude"] doubleValue],
+            };
+
+            auto eventEmitter = std::static_pointer_cast<RNMapsMarkerEventEmitter const>(_eventEmitter);
+            facebook::react::RNMapsMarkerEventEmitter::OnDragStart data = {
+                .id = std::string([dictionary[@"id"] UTF8String]),
+                .coordinate = coordinate,
+            };
+            eventEmitter->onDragStart(data);
+        }
+    };
+
+    _view.onDragEnd = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            // Extract values from the NSDictionary
+            NSDictionary* coordinateDict = dictionary[@"coordinate"];
+
+
+            facebook::react::RNMapsMarkerEventEmitter::OnDragEndCoordinate coordinate = {
+                .latitude = [coordinateDict[@"latitude"] doubleValue],
+                .longitude = [coordinateDict[@"longitude"] doubleValue],
+            };
+
+            auto eventEmitter = std::static_pointer_cast<RNMapsMarkerEventEmitter const>(_eventEmitter);
+            facebook::react::RNMapsMarkerEventEmitter::OnDragEnd data = {
+                .id = std::string([dictionary[@"id"] UTF8String]),
+                .coordinate = coordinate,
+            };
+            eventEmitter->onDragEnd(data);
+        }
+    };
+
+    _view.onSelect = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            // Extract values from the NSDictionary
+            NSDictionary* coordinateDict = dictionary[@"coordinate"];
+            NSDictionary* positionDict = dictionary[@"position"];
+
+            // Populate the OnCalloutPressPoint struct
+            facebook::react::RNMapsMarkerEventEmitter::OnSelectPosition point = {
+                .x = [coordinateDict[@"x"] doubleValue],
+                .y = [coordinateDict[@"y"] doubleValue],
+            };
+
+
+            facebook::react::RNMapsMarkerEventEmitter::OnSelectCoordinate coordinate = {
+                .latitude = [coordinateDict[@"latitude"] doubleValue],
+                .longitude = [coordinateDict[@"longitude"] doubleValue],
+            };
+
+            auto eventEmitter = std::static_pointer_cast<RNMapsMarkerEventEmitter const>(_eventEmitter);
+            facebook::react::RNMapsMarkerEventEmitter::OnSelect data = {
+                .action = std::string([dictionary[@"action"] UTF8String]),
+                .id = std::string([dictionary[@"id"] UTF8String]),
+                .position = point,
+                .coordinate = coordinate,
+            };
+            eventEmitter->onSelect(data);
+        }
+    };
+
+
+    _view.onCalloutPress = [self](NSDictionary* dictionary) {
+        if (_eventEmitter) {
+            // Extract values from the NSDictionary
+            NSDictionary* pointDict = dictionary[@"point"];
+            NSDictionary* frameDict = dictionary[@"frame"];
+
+            // Populate the OnCalloutPressPoint struct
+            facebook::react::RNMapsMarkerEventEmitter::OnCalloutPressPoint point = {
+                .x = [pointDict[@"x"] doubleValue],
+                .y = [pointDict[@"y"] doubleValue],
+            };
+
+
+            facebook::react::RNMapsMarkerEventEmitter::OnCalloutPressFrame frame = {
+                .x = [frameDict[@"x"] doubleValue],
+                .y = [frameDict[@"x"] doubleValue],
+                .width = [frameDict[@"width"] doubleValue],
+                .height = [frameDict[@"height"] doubleValue],
+            };
+
+            auto eventEmitter = std::static_pointer_cast<RNMapsMarkerEventEmitter const>(_eventEmitter);
+            facebook::react::RNMapsMarkerEventEmitter::OnCalloutPress data = {
+                .action = std::string([dictionary[@"action"] UTF8String]),
+                .id = std::string([dictionary[@"id"] UTF8String]),
+                .frame = frame,
+                .point = point,
+            };
+            eventEmitter->onCalloutPress(data);
+        }
+    };
+
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index{
+    if (!_view){
+        [self prepareMarkerView];
+    }
+    id<RCTComponent> paperView = [childComponentView getPaperViewFromChildComponentView];
+    if (paperView){
+        [_view insertReactSubview:paperView atIndex:index];
+    } else  {
+        [_view insertReactSubview:childComponentView atIndex:index];
+    }
+}
+
+- (void) unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    id<RCTComponent> paperView = [childComponentView getPaperViewFromChildComponentView];
+    if (paperView){
+        [_view removeReactSubview:paperView];
+    } else {
+        [_view removeReactSubview:childComponentView];
+    }
+}
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        [self prepareMarkerView];
+    }
+
+    return self;
+}
+
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
+{
+    [self prepareMarkerView];
+    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();
+        } else {
+            // default
+            _view.zIndex = 0;
+        }
+    }
+    if (newViewProps.image != oldViewProps.image){
+        if (newViewProps.image.uri.size()){
+            [_view setImageSrc:RCTNSStringFromString(newViewProps.image.uri)];
+            completionHandlerCalled = true;
+        } else {
+            [_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) {
+        CLLocationCoordinate2D coordinates = CLLocationCoordinate2DMake(
+                                                                        newViewProps.coordinate.latitude,
+                                                                        newViewProps.coordinate.longitude);
+        _view.coordinate = coordinates;
+    }
+
+
+    if (newViewProps.description != oldViewProps.description){
+        _view.subtitle = RCTNSStringFromString(newViewProps.description);
+    }
+    REMAP_MAPVIEW_STRING_PROP(title)
+    REMAP_MAPVIEW_STRING_PROP(identifier)
+    if (newViewProps.titleVisibility != oldViewProps.titleVisibility){
+        switch (newViewProps.titleVisibility) {
+            case RNMapsMarkerTitleVisibility::Visible:
+                [_view setTitleVisibility:MKFeatureVisibilityVisible];
+                break;
+            case RNMapsMarkerTitleVisibility::Adaptive:
+                [_view setTitleVisibility:MKFeatureVisibilityAdaptive];
+                break;
+            case RNMapsMarkerTitleVisibility::Hidden:
+                [_view setTitleVisibility:MKFeatureVisibilityHidden];
+                break;
+        }
+    }
+    if (newViewProps.subtitleVisibility != oldViewProps.subtitleVisibility){
+        switch (newViewProps.subtitleVisibility) {
+            case RNMapsMarkerSubtitleVisibility::Visible:
+                [_view setSubtitleVisibility:MKFeatureVisibilityVisible];
+                break;
+            case RNMapsMarkerSubtitleVisibility::Adaptive:
+                [_view setSubtitleVisibility:MKFeatureVisibilityAdaptive];
+                break;
+            case RNMapsMarkerSubtitleVisibility::Hidden:
+                [_view setSubtitleVisibility:MKFeatureVisibilityHidden];
+                break;
+
+        }
+    }
+
+    if (newViewProps.displayPriority != oldViewProps.displayPriority){
+        switch (newViewProps.displayPriority) {
+            case RNMapsMarkerDisplayPriority::Required:
+                [_view setDisplayPriority:MKFeatureDisplayPriorityRequired];
+                break;
+            case RNMapsMarkerDisplayPriority::High:
+                [_view setDisplayPriority:MKFeatureDisplayPriorityDefaultHigh];
+                break;
+            case RNMapsMarkerDisplayPriority::Low:
+                [_view setDisplayPriority:MKFeatureDisplayPriorityDefaultLow];
+                break;
+
+        }
+    }
+
+
+    [super updateProps:props oldProps:oldProps];
+}
+
+
+@end
+
+Class<RCTComponentViewProtocol> RNMapsMarkerCls(void)
+{
+    return RNMapsMarkerView.class;
+}

package/ios/AirMaps/RNMapsMarkerViewManager.mm

@@ -0,0 +1,28 @@
+//
+//  RNMapsMarkerManager.m
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+
+#import <React/RCTLog.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTViewManager.h>
+
+@interface RNMapsMarkerViewManager : RCTViewManager
+@end
+
+@implementation RNMapsMarkerViewManager
+
+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/ios/AirMaps.xcodeproj/project.pbxproj

@@ -26,6 +26,8 @@
 		4C99C9DE2226CF2800A8693E /* AIRWeakTimerReference.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C99C9DD2226CF2800A8693E /* AIRWeakTimerReference.m */; };
 		4C99C9E12226D8C400A8693E /* AIRWeakMapReference.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C99C9E02226D8C400A8693E /* AIRWeakMapReference.m */; };
 		4E0CFBDE2B388F2B0017E126 /* RCTComponentData+Maps.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */; };
+		4E34FA002D84E24A009CC683 /* PlaceHolderGoogleMapView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E34F9FC2D84E24A009CC683 /* PlaceHolderGoogleMapView.mm */; };
+		4E34FA012D84E24A009CC683 /* PlaceHolderPolygonView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E34F9FE2D84E24A009CC683 /* PlaceHolderPolygonView.mm */; };
 		4E430F272CF20153006E4F41 /* RNMapsMarkerManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E430F262CF20153006E4F41 /* RNMapsMarkerManager.mm */; };
 		4E430F2A2CF20305006E4F41 /* RNMapsMarker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E430F292CF20305006E4F41 /* RNMapsMarker.mm */; };
 		53D31636202E723B00B55447 /* AIRMapOverlayManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D31635202E723B00B55447 /* AIRMapOverlayManager.m */; };
@@ -119,6 +121,10 @@
 		4E0A36152BFB4E76009FCCE4 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		4E0CFBDC2B388F2B0017E126 /* RCTComponentData+Maps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTComponentData+Maps.h"; sourceTree = "<group>"; };
 		4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTComponentData+Maps.m"; sourceTree = "<group>"; };
+		4E34F9FB2D84E24A009CC683 /* PlaceHolderGoogleMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaceHolderGoogleMapView.h; sourceTree = "<group>"; };
+		4E34F9FC2D84E24A009CC683 /* PlaceHolderGoogleMapView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaceHolderGoogleMapView.mm; sourceTree = "<group>"; };
+		4E34F9FD2D84E24A009CC683 /* PlaceHolderPolygonView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlaceHolderPolygonView.h; sourceTree = "<group>"; };
+		4E34F9FE2D84E24A009CC683 /* PlaceHolderPolygonView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaceHolderPolygonView.mm; sourceTree = "<group>"; };
 		4E430F262CF20153006E4F41 /* RNMapsMarkerManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNMapsMarkerManager.mm; sourceTree = "<group>"; };
 		4E430F282CF20305006E4F41 /* RNMapsMarker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNMapsMarker.h; sourceTree = "<group>"; };
 		4E430F292CF20305006E4F41 /* RNMapsMarker.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNMapsMarker.mm; sourceTree = "<group>"; };
@@ -228,6 +234,7 @@
 		11FA5C531C4A1296003AC2EE /* AirMaps */ = {
 			isa = PBXGroup;
 			children = (
+				4E34F9FF2D84E24A009CC683 /* FabricPlaceholders */,
 				4E0CFBDC2B388F2B0017E126 /* RCTComponentData+Maps.h */,
 				4E0CFBDD2B388F2B0017E126 /* RCTComponentData+Maps.m */,
 				BE2E4EC72621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.h */,
@@ -297,6 +304,17 @@
 			path = AirMaps;
 			sourceTree = "<group>";
 		};
+		4E34F9FF2D84E24A009CC683 /* FabricPlaceholders */ = {
+			isa = PBXGroup;
+			children = (
+				4E34F9FB2D84E24A009CC683 /* PlaceHolderGoogleMapView.h */,
+				4E34F9FC2D84E24A009CC683 /* PlaceHolderGoogleMapView.mm */,
+				4E34F9FD2D84E24A009CC683 /* PlaceHolderPolygonView.h */,
+				4E34F9FE2D84E24A009CC683 /* PlaceHolderPolygonView.mm */,
+			);
+			path = FabricPlaceholders;
+			sourceTree = "<group>";
+		};
 		9B9498A32017EF9D00158761 /* AirGoogleMaps */ = {
 			isa = PBXGroup;
 			children = (
@@ -437,6 +455,8 @@
 				BE2E4EC92621F63C00CC7F2E /* AIRMapUrlTileCachedOverlay.m in Sources */,
 				DA6C263E1C9E324A0035349F /* AIRMapUrlTileManager.m in Sources */,
 				9B9498DB2017EFB800158761 /* AIRGoogleMapMarker.m in Sources */,
+				4E34FA002D84E24A009CC683 /* PlaceHolderGoogleMapView.mm in Sources */,
+				4E34FA012D84E24A009CC683 /* PlaceHolderPolygonView.mm in Sources */,
 				628F81201FD16DF80058313A /* AIRMapLocalTile.m in Sources */,
 				9B9498D92017EFB800158761 /* AIRGoogleMapCalloutManager.m in Sources */,
 				53D3163A202E72FC00B55447 /* AIRMapOverlay.m in Sources */,

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

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Animated, ViewProps, ImageURISource, ImageRequireSource } from 'react-native';
 import { MapManagerCommand, NativeComponent, ProviderContext, UIManagerCommand } from './decorateMapComponent';
 import { MapMarkerNativeComponentType } from './MapMarkerNativeComponent';
+import type { AppleMarkerPriority } from './specs/NativeComponentMarker';
 import { CalloutPressEvent, LatLng, MarkerDeselectEvent, MarkerDragEvent, MarkerDragStartEndEvent, MarkerPressEvent, MarkerSelectEvent, Point } from './sharedTypes';
 import { Modify } from './sharedTypesInternal';
 type AppleMarkerVisibility = 'hidden' | 'adaptive' | 'visible';
@@ -42,7 +43,7 @@ export type MapMarkerProps = ViewProps & {
      *
      * @default {x: 0.0, y: 0.0}
      * @platform iOS: Apple Maps only. For Google Maps, see the `calloutAnchor` prop
-     * @platform Android: Not supported. See see the `calloutAnchor` prop
+     * @platform Android: Not supported. see the `calloutAnchor` prop
      */
     calloutOffset?: Point;
     /**
@@ -54,7 +55,7 @@ export type MapMarkerProps = ViewProps & {
      *
      * @default {x: 0.0, y: 0.0}
      * @platform iOS: Apple Maps only. For Google Maps, see the `anchor` prop
-     * @platform Android: Not supported. See see the `anchor` prop
+     * @platform Android: Not supported. see the `anchor` prop
      */
     centerOffset?: Point;
     /**
@@ -261,6 +262,17 @@ export type MapMarkerProps = ViewProps & {
      * @platform Android: Supported
      */
     zIndex?: number;
+    /**
+     Constants that indicates the display priority for annotations.
+     @default required
+     @platform iOS: Apple Maps only.
+     @platform Android: Not supported
+  
+      Required: A constant indicating that the item is required.
+      High: A constant indicating that the item’s display priority is high.
+      Low: A constant indicating that the item’s display priority is Low.
+     */
+    displayPriority?: AppleMarkerPriority;
     /**
      * Visibility of the title text rendered beneath Marker balloon
      * @platform iOS: Apple Maps only
@@ -286,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>;
@@ -295,6 +307,7 @@ export declare class MapMarker extends React.Component<MapMarkerProps> {
     getUIManagerCommand: (name: string) => UIManagerCommand;
     static Animated: Animated.AnimatedComponent<typeof MapMarker>;
     private marker;
+    private fabricMarker?;
     constructor(props: MapMarkerProps);
     setNativeProps(props: Partial<NativeProps>): void;
     showCallout(): void;