react-native-maps 1.21.0-alpha.14 → 1.21.0-alpha.16

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -246,6 +246,11 @@ id regionAsJSON(MKCoordinateRegion region) {
     AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
     [polygon didInsertInMap:self];
     [self.polygons addObject:polygon];
+      
+  } else if ([NSStringFromClass([subview class]) isEqualToString:@"RNMapsGooglePolygonView"]){
+//      RNMapsGooglePolygonView *polygon = (RNMapsGooglePolygonView*)subview;
+//      [polygon didInsertInMap:self];
+      [self.polygons addObject:subview];
   } else if ([subview isKindOfClass:[AIRGoogleMapPolyline class]]) {
     AIRGoogleMapPolyline *polyline = (AIRGoogleMapPolyline*)subview;
     polyline.polyline.map = self;
@@ -290,7 +295,9 @@ id regionAsJSON(MKCoordinateRegion region) {
     AIRGoogleMapMarker *marker = (AIRGoogleMapMarker*)subview;
     marker.realMarker.map = nil;
     [self.markers removeObject:marker];
-  } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
+  } else if ([NSStringFromClass([subview class]) isEqualToString:@"RNMapsGooglePolygonView"]) {
+      [self.polygons removeObject:subview];
+   } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
     AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
     polygon.polygon.map = nil;
     [self.polygons removeObject:polygon];

package/ios/AirGoogleMaps/AIRGoogleMapWMSTile.h

@@ -13,7 +13,7 @@
 
 @interface WMSTileOverlay : GMSSyncTileLayer
 @property (nonatomic) double MapX,MapY,FULL;
-@property (nonatomic, strong) NSString *template;
+@property (nonatomic, assign) NSString *urlTemplate;
 @property (nonatomic, assign) NSInteger maximumZ;
 @property (nonatomic, assign) NSInteger minimumZ;
 @end

package/ios/AirGoogleMaps/AIRGoogleMapWMSTile.m

@@ -62,7 +62,7 @@
 {
     _urlTemplate = urlTemplate;
     WMSTileOverlay *tile = [[WMSTileOverlay alloc] init];
-    [tile setTemplate:urlTemplate];
+    [tile setUrlTemplate:urlTemplate];
     [tile setMaximumZ:  _maximumZ];
     [tile setMinimumZ: _minimumZ];
     [tile setOpacity: _opacity];
@@ -107,7 +107,7 @@
         return nil;
     }
     NSArray *bb = [self getBoundBox:x yAxis:y zoom:zoom];
-    NSMutableString *url = [self.template mutableCopy];
+    NSMutableString *url = [self.urlTemplate mutableCopy];
     [url replaceOccurrencesOfString: @"{minX}" withString:[NSString stringWithFormat:@"%@", bb[0]] options:0 range:NSMakeRange(0, url.length)];
     [url replaceOccurrencesOfString: @"{minY}" withString:[NSString stringWithFormat:@"%@", bb[1]] options:0 range:NSMakeRange(0, url.length)];
     [url replaceOccurrencesOfString: @"{maxX}" withString:[NSString stringWithFormat:@"%@", bb[2]] options:0 range:NSMakeRange(0, url.length)];

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -1,6 +1,6 @@
 //
 //  RNMapsGoogleMapView.mm
-//  
+//
 //
 //  Created by Salah Ghanim on 23.11.24.
 //  Copyright © 2024 react-native-maps. All rights reserved.
@@ -8,6 +8,7 @@
 #ifdef HAVE_GOOGLE_MAPS
 
 #import "RNMapsGoogleMapView.h"
+#import "RNMapsGooglePolygonView.h"
 #import "AirGoogleMap.h"
 #import "AIRMapMarker.h"
 #import "AirGoogleMapManager.h"
@@ -32,6 +33,7 @@ using namespace facebook::react;
     AIRGoogleMap *_view;
     AIRGoogleMapManager* _legacyMapManager;
     NSMutableDictionary<NSNumber*, UIView*>* _pendingInsertsSubviews;
+    NSMutableArray *_polygons;
 }
 
 
@@ -77,7 +79,7 @@ using namespace facebook::react;
     }
 
     NSDictionary* edgePadding = [RCTConvert dictonaryFromString:edgePaddingJSON];
-    
+
     [_view fitToCoordinates:coordinatesArray withEdgePadding:edgePadding animated:animated];
 }
 
@@ -108,9 +110,10 @@ using namespace facebook::react;
 }
 
 - (void) prepareContentView {
-   
+
     _view = (AIRGoogleMap *)[_legacyMapManager view];
-    
+    _polygons = [NSMutableArray new];
+
     self.contentView = _view;
 
       _view.onPress = [self](NSDictionary* dictionary) {
@@ -140,7 +143,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onPress(data);
           }
       };
-    
+
     _view.onLongPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
@@ -177,7 +180,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onMapReady(data);
           }
       };
-    
+
     _view.onMapLoaded = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGoogleMapViewEventEmitter const>(_eventEmitter);
@@ -185,7 +188,7 @@ using namespace facebook::react;
             mapViewEventEmitter->onMapLoaded(data);
         }
     };
-      
+
       _view.onKmlReady = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
@@ -253,7 +256,7 @@ using namespace facebook::react;
               if (errorDict){
                   str = errorDict[@"message"];
               }
-              
+
               facebook::react::RNMapsGoogleMapViewEventEmitter::OnUserLocationChangeError error = {
                   .message = std::string([str UTF8String]),
               };
@@ -285,7 +288,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onRegionChangeStart(data);
           }
       };
-      
+
       _view.onRegionChange = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
@@ -301,7 +304,7 @@ using namespace facebook::react;
               mapViewEventEmitter->onRegionChange(data);
           }
       };
-      
+
       _view.onRegionChangeComplete = [self](NSDictionary* dictionary) {
           if (_eventEmitter) {
 
@@ -388,6 +391,11 @@ using namespace facebook::react;
         }
     } else {
         [_view insertReactSubview:childComponentView atIndex:index];
+        if ([childComponentView isKindOfClass:[RNMapsGooglePolygonView class]]){
+            RNMapsGooglePolygonView* polygon = (RNMapsGooglePolygonView *) childComponentView;
+            [_polygons addObject:childComponentView];
+            [polygon didInsertInMap:_view];
+        }
     }
 }
 
@@ -402,6 +410,11 @@ using namespace facebook::react;
         }
     } else {
         [_view removeReactSubview:childComponentView];
+        if ([childComponentView isKindOfClass:[RNMapsGooglePolygonView class]]){
+            RNMapsGooglePolygonView* polygon = (RNMapsGooglePolygonView *) childComponentView;
+            [_polygons removeObject:childComponentView];
+            [polygon didRemoveFromMap];
+        }
     }
 }
 - (void) prepareForRecycle
@@ -420,7 +433,7 @@ using namespace facebook::react;
 {
   const auto &oldViewProps = *std::static_pointer_cast<RNMapsGoogleMapViewProps const>(_props);
   const auto &newViewProps = *std::static_pointer_cast<RNMapsGoogleMapViewProps const>(props);
-    
+
 
     if (oldViewProps.googleMapId != newViewProps.googleMapId) {
         NSString* mapID = RCTNSStringFromString(newViewProps.googleMapId);
@@ -452,7 +465,7 @@ using namespace facebook::react;
         _legacyMapManager.camera = camera;
     }
 
-    
+
 
     if (!_view){
         [self prepareContentView];
@@ -500,11 +513,14 @@ using namespace facebook::react;
 
 
     REMAP_MAPVIEW_PROP(pitchEnabled)
-    
+
     REMAP_MAPVIEW_PROP(zoomTapEnabled)
-    
+
     REMAP_MAPVIEW_PROP(scrollEnabled)
-    
+    if (_view.scrollEnabled != newViewProps.scrollEnabled){
+        [_view setScrollEnabled:newViewProps.scrollEnabled];
+    }
+
     if (newViewProps.minZoom != oldViewProps.minZoom || newViewProps.maxZoom != oldViewProps.maxZoom){
         [_view setMinZoom:newViewProps.minZoom maxZoom:newViewProps.maxZoom];
     }
@@ -530,8 +546,8 @@ using namespace facebook::react;
                                                                viewingAngle:newViewProps.camera.pitch];
         _view.cameraProp = camera;
       }
-    
-    
+
+
     REMAP_MAPVIEW_EDGEINSETS_PROP(mapPadding)
 
 
@@ -554,7 +570,7 @@ using namespace facebook::react;
                 break;
         }
     }
-    
+
     if (oldViewProps.userInterfaceStyle != newViewProps.userInterfaceStyle){
         switch (newViewProps.userInterfaceStyle) {
             case RNMapsGoogleMapViewUserInterfaceStyle::Light:

package/ios/AirGoogleMaps/RNMapsGooglePolygonView.h

@@ -0,0 +1,26 @@
+//
+//  RNMapsGoogleMapView.h
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef HAVE_GOOGLE_MAPS
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+@class AIRGoogleMap;
+@class AIRGMSPolygon;
+
+NS_ASSUME_NONNULL_BEGIN
+@interface RNMapsGooglePolygonView : RCTViewComponentView
+- (void) didInsertInMap:(AIRGoogleMap*) map;
+- (void) didRemoveFromMap;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif

package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm

@@ -0,0 +1,217 @@
+//
+//  RNMapsGoogleMapView.mm
+//  
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef HAVE_GOOGLE_MAPS
+
+#import "RNMapsGooglePolygonView.h"
+#import "AIRGMSPolygon.h"
+#import "AIRGoogleMap.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 "RCTConvert+GMSMapViewType.h"
+#import "RCTConvert+AirMap.h"
+#import "UIView+AirMap.h"
+
+using namespace facebook::react;
+
+bool areHolesEqual(const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>>& newHoles, const std::vector<std::vector<RNMapsGooglePolygonHolesStruct>>& oldHoles) {
+    // First-level check: compare the sizes of the top-level vectors
+    if (newHoles.size() != oldHoles.size()) {
+        return false;
+    }
+
+    // Second-level check: compare the contents of each child vector
+    for (size_t i = 0; i < newHoles.size(); ++i) {
+        const auto& newHole = newHoles.at(i);
+        const auto& oldHole = oldHoles.at(i);
+
+        // Compare sizes of the child vectors
+        if (newHole.size() != oldHole.size()) {
+            return false;
+        }
+ 
+    }
+
+    return true;
+}
+
+@interface RNMapsGooglePolygonView () <RCTRNMapsGooglePolygonViewProtocol>
+@end
+
+@implementation RNMapsGooglePolygonView {
+    AIRGMSPolygon *_view;
+}
+
+
+- (AIRGMSPolygon*) polygon {
+    return _view;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>();
+}
+
+- (void) didInsertInMap:(AIRGoogleMap*) map
+{
+    _view.map = map;
+}
+
+-(void) didRemoveFromMap
+{
+    _view.map = nil;
+    _view = nil;
+}
+
+- (void) prepareContentView {
+   
+    _view = [AIRGMSPolygon new];
+    _view.onPress = [self](NSDictionary* dictionary) {
+          if (_eventEmitter) {
+              // Extract values from the NSDictionary
+                NSDictionary* coordinateDict = dictionary[@"coordinate"];
+                NSDictionary* positionDict = dictionary[@"position"];
+
+                // Populate the OnMapPressCoordinate struct
+              facebook::react::RNMapsGooglePolygonEventEmitter::OnPressCoordinate coordinate = {
+                    .latitude = [coordinateDict[@"latitude"] doubleValue],
+                    .longitude = [coordinateDict[@"longitude"] doubleValue],
+                };
+
+                // Populate the OnMapPressPosition struct
+              facebook::react::RNMapsGooglePolygonEventEmitter::OnPressPosition position = {
+                    .x = [positionDict[@"x"] doubleValue],
+                    .y = [positionDict[@"y"] doubleValue],
+                };
+
+              auto mapViewEventEmitter = std::static_pointer_cast<RNMapsGooglePolygonEventEmitter const>(_eventEmitter);
+              facebook::react::RNMapsGooglePolygonEventEmitter::OnPress data = {
+                  .action = std::string([@"press" UTF8String]),
+                  .position = position,
+                  .coordinate = coordinate
+              };
+              mapViewEventEmitter->onPress(data);
+          }
+      };
+
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const RNMapsGooglePolygonProps>();
+    _props = defaultProps;
+    [self prepareContentView];
+
+  }
+
+  return self;
+}
+
+
+
+- (void) prepareForRecycle
+{
+    [super prepareForRecycle];
+    static const auto defaultProps = std::make_shared<const RNMapsGooglePolygonProps>();
+    _props = defaultProps;
+    _view = nil;
+}
+
+
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
+{
+  const auto &oldViewProps = *std::static_pointer_cast<RNMapsGooglePolygonProps const>(_props);
+  const auto &newViewProps = *std::static_pointer_cast<RNMapsGooglePolygonProps const>(props);
+
+
+    if (!_view){
+        [self prepareContentView];
+    }
+
+#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_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.has_value()){
+        _view.zIndex = newViewProps.zIndex.value();
+    }
+    if (newViewProps.coordinates.size() != oldViewProps.coordinates.size()){
+        GMSMutablePath *path = [GMSMutablePath path];
+        for(int i = 0; i < newViewProps.coordinates.size(); i++)
+        {
+            CLLocationCoordinate2D coordinates = CLLocationCoordinate2DMake(
+                                                                            newViewProps.coordinates.at(i).latitude,newViewProps.coordinates.at(i).longitude);
+          [path addCoordinate:coordinates];
+        }
+        _view.path = path;
+    }
+    
+    if (!areHolesEqual(newViewProps.holes, oldViewProps.holes)){
+        NSMutableArray<GMSMutablePath *> *interiorPolygons = [NSMutableArray array];
+        for(int h = 0; h < newViewProps.holes.size(); h++)
+        {
+          GMSMutablePath *path = [GMSMutablePath path];
+          for(int i = 0; i < newViewProps.holes[h].size(); i++)
+          {
+              CLLocationCoordinate2D coordinates = CLLocationCoordinate2DMake(
+                                                                              newViewProps.holes.at(h).at(i).latitude,
+                                                                              newViewProps.holes.at(h).at(i).longitude);
+            [path addCoordinate:coordinates];
+          }
+          [interiorPolygons addObject:path];
+        }
+        _view.holes = interiorPolygons;
+    }
+    
+ 
+    REMAP_MAPVIEW_PROP(tappable)
+
+    if (newViewProps.fillColor){
+        _view.fillColor = RCTUIColorFromSharedColor(newViewProps.fillColor);
+    }
+    
+    if (newViewProps.strokeColor){
+        _view.strokeColor = RCTUIColorFromSharedColor(newViewProps.strokeColor);
+    }
+    
+    
+
+
+  [super updateProps:props oldProps:oldProps];
+}
+- (void) didMoveToSuperview {
+    [super didMoveToSuperview];
+    NSLog(@"SuperView ? %@", self.superview);
+}
+@end
+
+Class<RCTComponentViewProtocol> RNMapsGooglePolygonCls(void)
+{
+    return RNMapsGooglePolygonView.class;
+}
+
+#endif

package/ios/AirGoogleMaps/RNMapsGooglePolygonViewManager.mm

@@ -0,0 +1,25 @@
+//
+//  RNMapsMapViewManager.mm
+//  AirMaps
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef HAVE_GOOGLE_MAPS
+
+#import <React/RCTLog.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTViewManager.h>
+
+@interface RNMapsGooglePolygonViewManager : RCTViewManager
+@end
+
+@implementation RNMapsGooglePolygonViewManager
+
+RCT_EXPORT_MODULE(RNMapsGooglePolygonViewManager)
+
+
+
+@end
+
+#endif

package/ios/AirMaps/AIRMap.h

@@ -35,6 +35,7 @@ extern const NSInteger AIRMapMaxZoomLevel;
 @property (nonatomic, assign) BOOL hasStartedRendering;
 @property (nonatomic, assign) BOOL cacheEnabled;
 @property (nonatomic, assign) BOOL loadingEnabled;
+@property (nonatomic, assign) BOOL handlePanDrag;
 @property (nonatomic, assign) BOOL legacyZoomConstraintsEnabled;
 @property (nonatomic, strong) UIColor *loadingBackgroundColor;
 @property (nonatomic, strong) UIColor *loadingIndicatorColor;

package/ios/AirMaps/AIRMap.m

@@ -538,13 +538,14 @@ MKPolyline *polyline = [MKPolyline polylineWithCoordinates:coords count:coordina
     _userLocationCalloutEnabled = calloutEnabled;
 }
 
-- (void)setHandlePanDrag:(BOOL)handleMapDrag {
+- (void)setHandlePanDrag:(BOOL)handlePanDrag {
     for (UIGestureRecognizer *recognizer in [self gestureRecognizers]) {
         if ([recognizer isKindOfClass:[UIPanGestureRecognizer class]]) {
-            recognizer.enabled = handleMapDrag;
+            recognizer.enabled = handlePanDrag;
             break;
         }
     }
+    _handlePanDrag = handlePanDrag;
 }
 
 - (void)setRegion:(MKCoordinateRegion)region animated:(BOOL)animated

package/ios/AirMaps/RNMapsMapView.mm

@@ -82,12 +82,12 @@ using namespace facebook::react;
     for (id json : coordinatesArr){
         [mutableArray addObject:[RCTConvert AIRMapCoordinate:json]];
     }
-    
+
     NSDictionary* edgePadding = [RCTConvert dictonaryFromString:edgePaddingJSON];
-    
+
     UIEdgeInsets edgeInsets = [RCTConvert UIEdgeInsets:edgePadding];
     [_view fitToCoordinates:mutableArray edgePadding:edgeInsets animated:animated];
-    
+
 }
 
 #pragma mark - Native commands
@@ -110,27 +110,27 @@ using namespace facebook::react;
     _props = defaultProps;
     _legacyMapManager = [[AIRMapManager alloc] init];
     _view = (AIRMap *)[_legacyMapManager view];
-    
+
     self.contentView = _view;
-    
+
     _view.onPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
             // Extract values from the NSDictionary
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* positionDict = dictionary[@"position"];
-            
+
             // Populate the OnMapPressCoordinate struct
             facebook::react::RNMapsMapViewEventEmitter::OnPressCoordinate coordinate = {
                 .latitude = [coordinateDict[@"latitude"] doubleValue],
                 .longitude = [coordinateDict[@"longitude"] doubleValue],
             };
-            
+
             // Populate the OnMapPressPosition struct
             facebook::react::RNMapsMapViewEventEmitter::OnPressPosition position = {
                 .x = [positionDict[@"x"] doubleValue],
                 .y = [positionDict[@"y"] doubleValue],
             };
-            
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnPress data = {
                 .action = std::string([@"press" UTF8String]),
@@ -140,11 +140,11 @@ using namespace facebook::react;
             mapViewEventEmitter->onPress(data);
         }
     };
-    
-    
+
+
     _view.onMapReady = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnMapReady data = {};
             mapViewEventEmitter->onMapReady(data);
@@ -152,7 +152,7 @@ using namespace facebook::react;
     };
     _view.onChange = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* regionDict = dictionary[@"region"];
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnRegionChange data = {
@@ -167,23 +167,23 @@ using namespace facebook::react;
     };
     _view.onDoublePress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* positionDict = dictionary[@"position"];
-            
+
             // Populate the OnMapPressCoordinate struct
             facebook::react::RNMapsMapViewEventEmitter::OnDoublePressCoordinate coordinate = {
                 .latitude = [coordinateDict[@"latitude"] doubleValue],
                 .longitude = [coordinateDict[@"longitude"] doubleValue],
             };
-            
+
             // Populate the OnMapDouplePressPosition struct
             facebook::react::RNMapsMapViewEventEmitter::OnDoublePressPosition position = {
                 .x = [positionDict[@"x"] doubleValue],
                 .y = [positionDict[@"y"] doubleValue],
             };
-            
-            
+
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnDoublePress data = {
                 .position = position,
@@ -192,25 +192,25 @@ using namespace facebook::react;
             mapViewEventEmitter->onDoublePress(data);
         }
     };
-    
+
     _view.onPanDrag =  [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* positionDict = dictionary[@"position"];
-            
+
             // Populate the OnMapPressCoordinate struct
             facebook::react::RNMapsMapViewEventEmitter::OnPanDragCoordinate coordinate = {
                 .latitude = [coordinateDict[@"latitude"] doubleValue],
                 .longitude = [coordinateDict[@"longitude"] doubleValue],
             };
-            
+
             // Populate the OnMapDouplePressPosition struct
             facebook::react::RNMapsMapViewEventEmitter::OnPanDragPosition position = {
                 .x = [positionDict[@"x"] doubleValue],
                 .y = [positionDict[@"y"] doubleValue],
             };
-            
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnPanDrag data = {
                 .position = position,
@@ -219,14 +219,14 @@ using namespace facebook::react;
             mapViewEventEmitter->onPanDrag(data);
         }
     };
-    
+
     _view.onUserLocationChange =  [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* errorDict = dictionary[@"error"];
-            
-            
+
+
             // Populate the OnMapPressCoordinate struct
             facebook::react::RNMapsMapViewEventEmitter::OnUserLocationChangeCoordinate coordinate = {
                 .latitude = [coordinateDict[@"latitude"] doubleValue],
@@ -236,12 +236,12 @@ using namespace facebook::react;
             if (errorDict){
                 str = errorDict[@"message"];
             }
-            
+
             facebook::react::RNMapsMapViewEventEmitter::OnUserLocationChangeError error = {
                 .message = std::string([str UTF8String]),
             };
-            
-            
+
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnUserLocationChange data = {
                 .coordinate = coordinate,
@@ -250,27 +250,27 @@ using namespace facebook::react;
             mapViewEventEmitter->onUserLocationChange(data);
         }
     };
-    
+
     _view.onCalloutPress = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* coordinateDict = dictionary[@"coordinate"];
             NSDictionary* positionDict = dictionary[@"position"];
-            
+
             // Populate the OnCalloutPressPoint struct
             facebook::react::RNMapsMapViewEventEmitter::OnCalloutPressPoint point = {
                 .x = [coordinateDict[@"x"] doubleValue],
                 .y = [coordinateDict[@"y"] doubleValue],
             };
-            
-            
+
+
             facebook::react::RNMapsMapViewEventEmitter::OnCalloutPressFrame frame = {
                 .x = [positionDict[@"x"] doubleValue],
                 .y = [positionDict[@"y"] doubleValue],
                 .width = [positionDict[@"width"] doubleValue],
                 .height = [positionDict[@"height"] doubleValue],
             };
-            
+
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnCalloutPress data = {
                 .action = std::string([dictionary[@"action"] UTF8String]),
@@ -281,11 +281,11 @@ using namespace facebook::react;
             mapViewEventEmitter->onCalloutPress(data);
         }
     };
-    
-    
+
+
     _view.onRegionChangeStart = [self](NSDictionary* dictionary) {
         if (_eventEmitter) {
-            
+
             NSDictionary* regionDict = dictionary[@"region"];
             auto mapViewEventEmitter = std::static_pointer_cast<RNMapsMapViewEventEmitter const>(_eventEmitter);
             facebook::react::RNMapsMapViewEventEmitter::OnRegionChangeStart data = {
@@ -298,8 +298,8 @@ using namespace facebook::react;
             mapViewEventEmitter->onRegionChangeStart(data);
         }
     };
-    
-    
+
+
 #define HANDLE_MARKER_DRAG_EVENT(eventName, emitterFunction)                     \
 if (_eventEmitter) {                                                        \
 NSDictionary* coordinateDict = dictionary[@"coordinate"];               \
@@ -312,9 +312,9 @@ facebook::react::RNMapsMapViewEventEmitter::eventName data = {          \
 };                                                                      \
 mapViewEventEmitter->emitterFunction(data);                             \
 }
-    
-    
-    
+
+
+
 #define HANDLE_MARKER_EVENT(eventName, emitterFunction, actionName)                \
 if (_eventEmitter) {                                                          \
 NSDictionary* coordinateDict = dictionary[@"coordinate"];                 \
@@ -332,27 +332,27 @@ facebook::react::RNMapsMapViewEventEmitter::eventName data = {            \
 };                                                                        \
 mapViewEventEmitter->emitterFunction(data);                               \
 }
-    
+
     _view.onMarkerDrag = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_DRAG_EVENT(OnMarkerDrag, onMarkerDrag);
     };
-    
+
     _view.onMarkerDragStart = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_DRAG_EVENT(OnMarkerDragStart, onMarkerDragStart);
     };
-    
+
     _view.onMarkerDragEnd = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_DRAG_EVENT(OnMarkerDragEnd, onMarkerDragEnd);
     };
-    
+
     _view.onMarkerSelect = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_EVENT(OnMarkerSelect, onMarkerSelect, "marker-select");
     };
-    
+
     _view.onMarkerDeselect = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_EVENT(OnMarkerDeselect, onMarkerDeselect, "marker-deselect");
     };
-    
+
     _view.onMarkerPress = [self](NSDictionary* dictionary) {
         HANDLE_MARKER_EVENT(OnMarkerPress, onMarkerPress, "marker-press");
     };
@@ -362,7 +362,7 @@ mapViewEventEmitter->emitterFunction(data);                               \
     if (self = [super initWithFrame:frame]) {
         [self prepareMapView];
     }
-    
+
     return self;
 }
 
@@ -403,28 +403,28 @@ MKMapType mapRNTypeToMKMapType(RNMapsMapViewMapType rnMapType) {
     [self prepareMapView];
     const auto &oldViewProps = *std::static_pointer_cast<RNMapsMapViewProps const>(_props);
     const auto &newViewProps = *std::static_pointer_cast<RNMapsMapViewProps const>(props);
-    
+
 #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); \
 }
-    
+
 #define REMAP_MAPVIEW_REGION_PROP(name)                                      \
 if (newViewProps.name.latitude != oldViewProps.name.latitude ||          \
 newViewProps.name.longitude != oldViewProps.name.longitude ||        \
@@ -437,7 +437,7 @@ newViewProps.name.latitude, newViewProps.name.longitude), span); \
 _view.name = region;                                                 \
 [_view didSetRegion];                                                 \
 }
-    
+
 #define REMAP_MAPVIEW_CAMERA_PROP(name)                                    \
 if (newViewProps.name.center.latitude != oldViewProps.name.center.latitude || \
 newViewProps.name.center.longitude != oldViewProps.name.center.longitude || \
@@ -452,7 +452,7 @@ camera.heading = newViewProps.name.heading;                       \
 camera.pitch = newViewProps.name.pitch;                           \
 _view.name = camera;                                              \
 }
-    
+
 #define REMAP_MAPVIEW_EDGEINSETS_PROP(name)                               \
 if (newViewProps.name.top != oldViewProps.name.top ||                 \
 newViewProps.name.right != oldViewProps.name.right ||             \
@@ -463,49 +463,56 @@ newViewProps.name.left,             \
 newViewProps.name.bottom,           \
 newViewProps.name.right);           \
 }
-    
+
 #define REMAP_MAPVIEW_MAPTYPE(rnMapType) MKMapType##rnMapType
-    
-    
+
+
     REMAP_MAPVIEW_PROP(cacheEnabled)
-    
+
     REMAP_MAPVIEW_PROP(followsUserLocation)
     REMAP_MAPVIEW_PROP(loadingEnabled)
+    if (_view.scrollEnabled != newViewProps.scrollEnabled){
+        [_view setScrollEnabled:newViewProps.scrollEnabled];
+    }
+    if (_view.handlePanDrag != newViewProps.handlePanDrag){
+        [_view setHandlePanDrag:newViewProps.handlePanDrag];
+    }
+
     REMAP_MAPVIEW_PROP(scrollEnabled)
-    
+
     REMAP_MAPVIEW_PROP(maxDelta)
     REMAP_MAPVIEW_PROP(maxZoom)
     REMAP_MAPVIEW_PROP(minDelta)
     REMAP_MAPVIEW_PROP(minZoom)
-    
+
     REMAP_MAPVIEW_PROP(showsCompass)
     REMAP_MAPVIEW_PROP(showsScale)
     REMAP_MAPVIEW_PROP(showsTraffic)
     REMAP_MAPVIEW_PROP(showsUserLocation)
     REMAP_MAPVIEW_PROP(userLocationCalloutEnabled)
     REMAP_MAPVIEW_PROP(zoomEnabled)
-    
+
     REMAP_MAPVIEW_POINT_PROP(compassOffset)
-    
+
     if (![_view ignoreRegionChanges]){
         _view.ignoreRegionChanges = YES;
         REMAP_MAPVIEW_REGION_PROP(initialRegion)
         REMAP_MAPVIEW_REGION_PROP(region)
         _view.ignoreRegionChanges = NO;
     }
-    
+
     REMAP_MAPVIEW_CAMERA_PROP(initialCamera)
     REMAP_MAPVIEW_CAMERA_PROP(camera)
-    
+
     REMAP_MAPVIEW_EDGEINSETS_PROP(legalLabelInsets)
     REMAP_MAPVIEW_EDGEINSETS_PROP(mapPadding)
-    
+
     REMAP_MAPVIEW_COLOR_PROP(loadingIndicatorColor)
     REMAP_MAPVIEW_COLOR_PROP(loadingIndicatorColor)
     REMAP_MAPVIEW_COLOR_PROP(tintColor)
-    
+
     REMAP_MAPVIEW_STRING_PROP(userLocationAnnotationTitle)
-    
+
     if (oldViewProps.mapType != newViewProps.mapType){
         _view.mapType = mapRNTypeToMKMapType(newViewProps.mapType);
     }
@@ -522,16 +529,16 @@ newViewProps.name.right);           \
                 break;
         }
     }
-    
+
     if (oldViewProps.cameraZoomRange.minCenterCoordinateDistance != newViewProps.cameraZoomRange.minCenterCoordinateDistance ||
         oldViewProps.cameraZoomRange.maxCenterCoordinateDistance != newViewProps.cameraZoomRange.maxCenterCoordinateDistance ||
         oldViewProps.cameraZoomRange.animated != newViewProps.cameraZoomRange.animated) {
-        
+
         MKMapCameraZoomRange* zoomRange = [[MKMapCameraZoomRange alloc] initWithMinCenterCoordinateDistance:newViewProps.cameraZoomRange.minCenterCoordinateDistance maxCenterCoordinateDistance:newViewProps.cameraZoomRange.maxCenterCoordinateDistance];
         [_view setCameraZoomRange:zoomRange animated:newViewProps.cameraZoomRange.animated];
     }
-    
-    
+
+
     [super updateProps:props oldProps:oldProps];
 }
 

package/lib/MapView.js

@@ -374,7 +374,12 @@ class MapView extends React.Component {
                     longitudeDelta: this.props.region.longitudeDelta,
                 };
             }
-            if (!this.state.isReady) {
+            if (this.state.isReady) {
+                if (props.onPanDrag) {
+                    props.handlePanDrag = !!props.onPanDrag;
+                }
+            }
+            else {
                 props.style = this.props.style;
                 props.initialCamera = this.props.initialCamera;
                 props.onLayout = this.props.onLayout;
@@ -412,12 +417,7 @@ class MapView extends React.Component {
                     : undefined,
                 ...this.props,
             };
-            if (this.state.isReady) {
-                if (props.onPanDrag) {
-                    props.handlePanDrag = !!props.onPanDrag;
-                }
-            }
-            else {
+            if (!this.state.isReady) {
                 props.style = this.props.style;
                 props.initialCamera = this.props.initialCamera;
                 props.onLayout = this.props.onLayout;

package/lib/decorateMapComponent.js

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.googleMapIsInstalled = exports.createNotSupportedComponent = exports.getNativeMapName = exports.ProviderContext = exports.NOT_SUPPORTED = exports.USES_DEFAULT_IMPLEMENTATION = exports.SUPPORTED = void 0;
 const react_1 = require("react");
 const react_native_1 = require("react-native");
 const ProviderConstants_1 = require("./ProviderConstants");
+const NativeComponentGooglePolygon_1 = __importDefault(require("./specs/NativeComponentGooglePolygon"));
 exports.SUPPORTED = 'SUPPORTED';
 exports.USES_DEFAULT_IMPLEMENTATION = 'USES_DEFAULT_IMPLEMENTATION';
 exports.NOT_SUPPORTED = 'NOT_SUPPORTED';
@@ -47,6 +51,13 @@ function decorateMapComponent(Component, componentName, providers) {
             if (react_native_1.Platform.OS !== 'android' && react_native_1.Platform.OS !== 'ios') {
                 throw new Error(`react-native-maps doesn't support ${react_native_1.Platform.OS}`);
             }
+            if (componentName === 'Polygon' &&
+                provider === ProviderConstants_1.PROVIDER_GOOGLE &&
+                react_native_1.Platform.OS === 'ios' &&
+                exports.googleMapIsInstalled) {
+                // @ts-ignore
+                return NativeComponentGooglePolygon_1.default;
+            }
             const platformSupport = providerInfo[react_native_1.Platform.OS];
             const nativeComponentName = getNativeComponentName(provider, componentName);
             if (platformSupport === exports.NOT_SUPPORTED) {

package/lib/specs/NativeComponentGooglePolygon.d.ts

@@ -0,0 +1,75 @@
+import type { HostComponent, ViewProps, ColorValue } from 'react-native';
+import { Double, BubblingEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
+export type LatLng = Readonly<{
+    latitude: Double;
+    longitude: Double;
+}>;
+export type PolygonPressEventHandler = BubblingEventHandler<Readonly<{
+    action?: string;
+    id: string;
+    coordinate: {
+        latitude: Double;
+        longitude: Double;
+    };
+    position?: {
+        x: Double;
+        y: Double;
+    };
+}>>;
+export interface PolygonFabricNativeProps extends ViewProps {
+    /**
+     * An array of coordinates to describe the polygon
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    coordinates: ReadonlyArray<LatLng>;
+    /**
+     * The fill color to use for the path.
+     *
+     * @default `#000`, `rgba(r,g,b,0.5)`
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    fillColor?: ColorValue;
+    /**
+     * The stroke color to use for the path.
+     *
+     * @default `#000`, `rgba(r,g,b,0.5)`
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    strokeColor?: ColorValue;
+    /**
+     * Boolean to indicate whether to draw each segment of the line as a geodesic as opposed to straight lines on the Mercator projection.
+     * A geodesic is the shortest path between two points on the Earth's surface.
+     * The geodesic curve is constructed assuming the Earth is a sphere.
+     *
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    geodesic?: boolean;
+    /**
+     * A 2d array of coordinates to describe holes of the polygon where each hole has at least 3 points.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    holes?: ReadonlyArray<ReadonlyArray<LatLng>>;
+    /**
+     * Boolean to allow a polygon to be tappable and use the onPress function.
+     *
+     * @platform iOS: Google Maps only
+     * @platform Android: Supported
+     */
+    tappable?: boolean;
+    /**
+     * Callback that is called when user taps on the map.
+     *
+     * @platform iOS: Supported
+     * @platform Android: Supported
+     */
+    onPress?: PolygonPressEventHandler;
+}
+declare const _default: HostComponent<PolygonFabricNativeProps>;
+export default _default;

package/lib/specs/NativeComponentGooglePolygon.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const codegenNativeComponent_1 = __importDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
+exports.default = (0, codegenNativeComponent_1.default)('RNMapsGooglePolygon', {
+    excludedPlatforms: ['android'],
+});

package/lib/specs/NativeComponentMapView.d.ts

@@ -560,6 +560,7 @@ export interface MapFabricNativeProps extends ViewProps {
      * @platform Android: Supported
      */
     onPanDrag?: PanDragEventHandler;
+    handlePanDrag?: boolean;
     /**
      * Callback that is called when user click on a POI.
      *

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.14",
+  "version": "1.21.0-alpha.16",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",