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

package/ios/AirGoogleMaps/AIRGMSMarker.h

@@ -12,7 +12,7 @@
 
 @class AIRGoogleMapMarker;
 
-@interface AIRGMSMarker : GMSAdvancedMarker
+@interface AIRGMSMarker : GMSMarker
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, weak) AIRGoogleMapMarker *fakeMarker;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -239,7 +239,7 @@ id regionAsJSON(MKCoordinateRegion region) {
   // This is where we intercept them and do the appropriate underlying mapview action.
   if ([subview isKindOfClass:[AIRGoogleMapMarker class]]) {
     AIRGoogleMapMarker *marker = (AIRGoogleMapMarker*)subview;
-    marker.realMarker.map = self;
+    [marker didInsertInMap:self];
     [self.markers addObject:marker];
   } else if ([subview isKindOfClass:[AIRGoogleMapPolygon class]]) {
     AIRGoogleMapPolygon *polygon = (AIRGoogleMapPolygon*)subview;
@@ -784,7 +784,7 @@ id regionAsJSON(MKCoordinateRegion region) {
     NSString *result = [config objectForKey:@"result"];
     NSString *filePath = [config objectForKey:@"filePath"];
 
-    
+
     // TODO: currently we are ignoring width, height, region
 
     UIGraphicsBeginImageContextWithOptions(self.frame.size, YES, 0.0f);
@@ -798,14 +798,14 @@ id regionAsJSON(MKCoordinateRegion region) {
     } else if([format isEqualToString:@"jpg"]) {
           data = UIImageJPEGRepresentation(image, quality.floatValue);
     }
-    
+
     if ([result isEqualToString:@"file"]) {
         [data writeToFile:filePath atomically:YES];
         callback(filePath);
     } else if ([result isEqualToString:@"base64"]) {
           callback([data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]);
     }
-  
+
   UIGraphicsEndImageContext();
 }
 

package/ios/AirGoogleMaps/AIRGoogleMapMarker.h

@@ -53,6 +53,8 @@
 - (void)didDragMarker:(AIRGMSMarker *)marker;
 - (id)makeEventData;
 - (id)makeEventData:(NSString *)action;
+- (UIView *) iconView;
+- (void) didInsertInMap:(AIRGoogleMap *) map;
 @end
 
 #endif

package/ios/AirGoogleMaps/AIRGoogleMapMarker.m

@@ -16,141 +16,225 @@
 #import "AIRDummyView.h"
 
 CGRect unionRect(CGRect a, CGRect b) {
-  return CGRectMake(
-                    MIN(a.origin.x, b.origin.x),
-                    MIN(a.origin.y, b.origin.y),
-                    MAX(a.size.width, b.size.width),
-                    MAX(a.size.height, b.size.height));
+    return CGRectMake(
+                      MIN(a.origin.x, b.origin.x),
+                      MIN(a.origin.y, b.origin.y),
+                      MAX(a.size.width, b.size.width),
+                      MAX(a.size.height, b.size.height));
 }
 
 @interface AIRGoogleMapMarker ()
 @end
 
 @implementation AIRGoogleMapMarker {
-  RCTImageLoaderCancellationBlock _reloadImageCancellationBlock;
-  __weak UIImageView *_iconImageView;
-  UIView *_iconView;
+    RCTImageLoaderCancellationBlock _reloadImageCancellationBlock;
+    RCTBubblingEventBlock _onPress;
+    RCTBubblingEventBlock _onSelect;
+    RCTBubblingEventBlock _onDeselect;
+    __weak UIImageView *_iconImageView;
+    UIView *_iconView;
+    UIColor *_pinColor;
+    CLLocationCoordinate2D _coordinates;
+    CLLocationDegrees _rotation;
+    BOOL _tracksInfoWindowChanges;
+    BOOL _tracksViewChanges;
+    BOOL _draggable;
+    BOOL _tappable;
+    BOOL _flat;
+    double _opacity;
+    NSString* _identifier;
+    NSString* _title;
+    NSString* _subtitle;
+
 }
 
 - (instancetype)init
 {
-  if ((self = [super init])) {
-    _realMarker = [[AIRGMSMarker alloc] init];
-    _realMarker.fakeMarker = self;
-    _realMarker.tracksViewChanges = true;
-    _realMarker.tracksInfoWindowChanges = false;
-  }
-  return self;
+    if ((self = [super init])) {
+        _tracksViewChanges = true;
+        _tracksInfoWindowChanges = false;
+        _tappable = true;
+        _opacity = 1.0;
+    }
+    return self;
 }
 
 - (void)layoutSubviews {
-  float width = 0;
-  float height = 0;
+    float width = 0;
+    float height = 0;
+
+    for (UIView *v in [_iconView subviews]) {
 
-  for (UIView *v in [_iconView subviews]) {
+        float fw = v.frame.origin.x + v.frame.size.width;
+        float fh = v.frame.origin.y + v.frame.size.height;
 
-    float fw = v.frame.origin.x + v.frame.size.width;
-    float fh = v.frame.origin.y + v.frame.size.height;
+        width = MAX(fw, width);
+        height = MAX(fh, height);
+    }
+
+    [_iconView setFrame:CGRectMake(0, 0, width, height)];
+}
 
-    width = MAX(fw, width);
-    height = MAX(fh, height);
-  }
 
-  [_iconView setFrame:CGRectMake(0, 0, width, height)];
+- (UIView *) iconView
+{
+    return _iconView;
 }
 
+- (void) didUpdateReactSubviews
+{
+    [super didUpdateReactSubviews];
+    if (_iconView){
+        [_iconView setFrame:self.frame];
+    }
+}
 
+- (void) didInsertInMap:(AIRGoogleMap *) map
+{
+    _realMarker = [AIRGMSMarker new];
+    _realMarker.fakeMarker = self;
+    _realMarker.tracksViewChanges = _tracksViewChanges;
+    _realMarker.tracksInfoWindowChanges = _tracksInfoWindowChanges;
+
+    [_realMarker setPosition:_coordinates];
+    if (_iconView){
+        [_realMarker setIconView:_iconView];
+    }
+    if (_rotation != 0){
+        [_realMarker setRotation:_rotation];
+    }
+    if (_identifier){
+        [_realMarker setIdentifier:_identifier];
+    }
+    if (_title){
+        [_realMarker setTitle:_title];
+    }
+    if (_subtitle){
+        [_realMarker setSnippet:_subtitle];
+    }
+    if (!CGPointEqualToPoint(_anchor, CGPointZero)){
+        [_realMarker setGroundAnchor:_anchor];
+    }
+    if (!CGPointEqualToPoint(_calloutAnchor, CGPointZero)){
+        [_realMarker setInfoWindowAnchor:_calloutAnchor];
+    }
+    if (_flat){
+        [_realMarker setFlat:_flat];
+    }
+    if (_draggable){
+        [_realMarker setDraggable:_draggable];
+    }
+    [_realMarker setTappable:_tappable];
+    if (_pinColor){
+        _realMarker.icon = [GMSMarker markerImageWithColor:_pinColor];
+    }
+    if (_opacity != 1.0){
+        [_realMarker setOpacity:_opacity];
+    }
+    if (_onSelect){
+        [_realMarker setOnSelect:_onSelect];
+    }
+    if (_onDeselect){
+        [_realMarker setOnDeselect:_onDeselect];
+    }
+    if (_onPress){
+        [_realMarker setOnPress:_onPress];
+    }
+    [_realMarker setMap:map];
+}
 
 - (void)iconViewInsertSubview:(UIView*)subview atIndex:(NSInteger)atIndex {
-  if (!_realMarker.iconView) {
-    _iconView = [[UIView alloc] init];
-    _realMarker.iconView = _iconView;
-  }
-  [_iconView insertSubview:subview atIndex:atIndex];
+    if (!_iconView){
+        _iconView = [[UIView alloc] init];
+    }
+    if (!_realMarker.iconView) {
+        _realMarker.iconView = _iconView;
+    }
+    [_iconView insertSubview:subview atIndex:atIndex];
 }
 
 - (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
-  if ([subview isKindOfClass:[AIRGoogleMapCallout class]]) {
-    self.calloutView = (AIRGoogleMapCallout *)subview;
-  } else { // a child view of the marker
-    [self iconViewInsertSubview:(UIView*)subview atIndex:atIndex+1];
-  }
-  AIRDummyView *dummySubview = [[AIRDummyView alloc] initWithView:(UIView *)subview];
-  [super insertReactSubview:(UIView*)dummySubview atIndex:atIndex];
+    if ([subview isKindOfClass:[AIRGoogleMapCallout class]]) {
+        self.calloutView = (AIRGoogleMapCallout *)subview;
+    } else { // a child view of the marker
+        [self iconViewInsertSubview:(UIView*)subview atIndex:atIndex+1];
+    }
+    AIRDummyView *dummySubview = [[AIRDummyView alloc] initWithView:(UIView *)subview];
+    [super insertReactSubview:(UIView*)dummySubview atIndex:atIndex];
 }
 
 - (void)removeReactSubview:(id<RCTComponent>)dummySubview {
-   UIView *subview = [dummySubview isKindOfClass:[AIRDummyView class]] ? ((AIRDummyView *)dummySubview).view : (UIView *)dummySubview;
+    UIView *subview = [dummySubview isKindOfClass:[AIRDummyView class]] ? ((AIRDummyView *)dummySubview).view : (UIView *)dummySubview;
 
-  if ([subview isKindOfClass:[AIRGoogleMapCallout class]]) {
-    self.calloutView = nil;
-  } else {
-    [subview removeFromSuperview];
-  }
-  [super removeReactSubview:(UIView*)dummySubview];
+    if ([subview isKindOfClass:[AIRGoogleMapCallout class]]) {
+        self.calloutView = nil;
+    } else {
+        [subview removeFromSuperview];
+    }
+    [super removeReactSubview:(UIView*)dummySubview];
 }
 
 - (void)showCalloutView {
-  [_realMarker.map setSelectedMarker:_realMarker];
+    [_realMarker.map setSelectedMarker:_realMarker];
 }
 
 - (void)hideCalloutView {
-  [_realMarker.map setSelectedMarker:Nil];
+    [_realMarker.map setSelectedMarker:Nil];
 }
 
 - (void)redraw {
-  if (!_realMarker.iconView) return;
+    if (!_realMarker.iconView) return;
 
-  BOOL oldValue = _realMarker.tracksViewChanges;
+    BOOL oldValue = _realMarker.tracksViewChanges;
 
-  if (oldValue == YES)
-  {
-    // Immediate refresh, like right now. Not waiting for next frame.
-    UIView *view = _realMarker.iconView;
-    _realMarker.iconView = nil;
-    _realMarker.iconView = view;
-  }
-  else
-  {
-    // Refresh according to docs
-    _realMarker.tracksViewChanges = YES;
-    _realMarker.tracksViewChanges = NO;
-  }
+    if (oldValue == YES)
+    {
+        // Immediate refresh, like right now. Not waiting for next frame.
+        UIView *view = _realMarker.iconView;
+        _realMarker.iconView = nil;
+        _realMarker.iconView = view;
+    }
+    else
+    {
+        // Refresh according to docs
+        _realMarker.tracksViewChanges = YES;
+        _realMarker.tracksViewChanges = NO;
+    }
 }
 
 - (UIView *)markerInfoContents {
-  if (self.calloutView && !self.calloutView.tooltip) {
-    return self.calloutView;
-  }
-  return nil;
+    if (self.calloutView && !self.calloutView.tooltip) {
+        return self.calloutView;
+    }
+    return nil;
 }
 
 - (UIView *)markerInfoWindow {
-  if (self.calloutView && self.calloutView.tooltip) {
-    return self.calloutView;
-  }
-  return nil;
+    if (self.calloutView && self.calloutView.tooltip) {
+        return self.calloutView;
+    }
+    return nil;
 }
 
 - (void)didTapInfoWindowOfMarker:(AIRGMSMarker *)marker point:(CGPoint)point frame:(CGRect)frame {
-  if (self.calloutView && self.calloutView.onPress) {
-      //todo: why not 'callout-press' ?
-    id event = @{
-               @"action": @"marker-overlay-press",
-               @"id": self.identifier ?: @"unknown",
-               @"point": @{
-                   @"x": @(point.x),
-                   @"y": @(point.y),
-                   },
-               @"frame": @{
-                   @"x": @(frame.origin.x),
-                   @"y": @(frame.origin.y),
-                   @"width": @(frame.size.width),
-                   @"height": @(frame.size.height),
-                   }
-               };
-    self.calloutView.onPress(event);
-  }
+    if (self.calloutView && self.calloutView.onPress) {
+        //todo: why not 'callout-press' ?
+        id event = @{
+            @"action": @"marker-overlay-press",
+            @"id": self.identifier ?: @"unknown",
+            @"point": @{
+                @"x": @(point.x),
+                @"y": @(point.y),
+            },
+            @"frame": @{
+                @"x": @(frame.origin.x),
+                @"y": @(frame.origin.y),
+                @"width": @(frame.size.width),
+                @"height": @(frame.size.height),
+            }
+        };
+        self.calloutView.onPress(event);
+    }
 }
 
 - (void)didTapInfoWindowOfMarker:(AIRGMSMarker *)marker {
@@ -161,19 +245,19 @@ CGRect unionRect(CGRect a, CGRect b) {
     if (subview && subview.onPress) {
         //todo: why not 'callout-inside-press' ?
         id event = @{
-                   @"action": @"marker-inside-overlay-press",
-                   @"id": self.identifier ?: @"unknown",
-                   @"point": @{
-                       @"x": @(point.x),
-                       @"y": @(point.y),
-                       },
-                   @"frame": @{
-                       @"x": @(frame.origin.x),
-                       @"y": @(frame.origin.y),
-                       @"width": @(frame.size.width),
-                       @"height": @(frame.size.height),
-                       }
-                   };
+            @"action": @"marker-inside-overlay-press",
+            @"id": self.identifier ?: @"unknown",
+            @"point": @{
+                @"x": @(point.x),
+                @"y": @(point.y),
+            },
+            @"frame": @{
+                @"x": @(frame.origin.x),
+                @"y": @(frame.origin.y),
+                @"width": @(frame.size.width),
+                @"height": @(frame.size.height),
+            }
+        };
         subview.onPress(event);
     } else {
         [self didTapInfoWindowOfMarker:marker point:point frame:frame];
@@ -181,30 +265,32 @@ CGRect unionRect(CGRect a, CGRect b) {
 }
 
 - (void)didBeginDraggingMarker:(AIRGMSMarker *)marker {
-  if (!self.onDragStart) return;
-  self.onDragStart([self makeEventData]);
+    if (!self.onDragStart) return;
+    self.onDragStart([self makeEventData]);
 }
 
 - (void)didEndDraggingMarker:(AIRGMSMarker *)marker {
-  if (!self.onDragEnd) return;
-  self.onDragEnd([self makeEventData]);
+    if (!self.onDragEnd) return;
+    self.onDragEnd([self makeEventData]);
 }
 
 - (void)didDragMarker:(AIRGMSMarker *)marker {
-  if (!self.onDrag) return;
-  self.onDrag([self makeEventData]);
+    if (!self.onDrag) return;
+    self.onDrag([self makeEventData]);
 }
 
 - (void)setCoordinate:(CLLocationCoordinate2D)coordinate {
-  _realMarker.position = coordinate;
+    _realMarker.position = coordinate;
+    _coordinates = coordinate;
 }
 
 - (CLLocationCoordinate2D)coordinate {
-  return _realMarker.position;
+    return _realMarker.position;
 }
 
 - (void)setRotation:(CLLocationDegrees)rotation {
     _realMarker.rotation = rotation;
+    _rotation = rotation;
 }
 
 - (CLLocationDegrees)rotation {
@@ -212,220 +298,230 @@ CGRect unionRect(CGRect a, CGRect b) {
 }
 
 - (void)setIdentifier:(NSString *)identifier {
-  _realMarker.identifier = identifier;
+    _realMarker.identifier = identifier;
+    _identifier = identifier;
 }
 
 - (NSString *)identifier {
-  return _realMarker.identifier;
+    return _realMarker.identifier;
 }
 
 - (void)setOnPress:(RCTBubblingEventBlock)onPress {
-  _realMarker.onPress = onPress;
+    _realMarker.onPress = onPress;
+    _onPress = onPress;
 }
 
 - (RCTBubblingEventBlock)onPress {
-  return _realMarker.onPress;
+    return _realMarker.onPress;
 }
 
 - (void)setOnSelect:(RCTDirectEventBlock)onSelect {
-  _realMarker.onSelect = onSelect;
+    _realMarker.onSelect = onSelect;
+    _onSelect = onSelect;
 }
 
 - (RCTDirectEventBlock)onSelect {
-  return _realMarker.onSelect;
+    return _realMarker.onSelect;
 }
 
 - (void)setOnDeselect:(RCTDirectEventBlock)onDeselect {
-  _realMarker.onDeselect = onDeselect;
+    _realMarker.onDeselect = onDeselect;
+    _onDeselect = onDeselect;
 }
 
 - (RCTDirectEventBlock)onDeselect {
-  return _realMarker.onDeselect;
+    return _realMarker.onDeselect;
 }
 
 - (void)setOpacity:(double)opacity
 {
-  _realMarker.opacity = opacity;
+    _realMarker.opacity = opacity;
+    _opacity = opacity;
 }
 
 - (void)setImageSrc:(NSString *)imageSrc
 {
-  _imageSrc = imageSrc;
-
-  if (_reloadImageCancellationBlock) {
-    _reloadImageCancellationBlock();
-    _reloadImageCancellationBlock = nil;
-  }
-
-  if (!_imageSrc) {
-    if (_iconImageView) [_iconImageView removeFromSuperview];
-    return;
-  }
-
-  if (!_iconImageView) {
-    // prevent glitch with marker (cf. https://github.com/react-native-maps/react-native-maps/issues/738)
-    UIImageView *empyImageView = [[UIImageView alloc] init];
-    _iconImageView = empyImageView;
-    [self iconViewInsertSubview:_iconImageView atIndex:0];
-  }
-
-  _reloadImageCancellationBlock = [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
-                                                                          size:self.bounds.size
-                                                                         scale:RCTScreenScale()
-                                                                       clipped:YES
-                                                                    resizeMode:RCTResizeModeCenter
-                                                                 progressBlock:nil
-                                                              partialLoadBlock:nil
-                                                               completionBlock:^(NSError *error, UIImage *image) {
-                                                                 if (error) {
-                                                                   // TODO(lmr): do something with the error?
-                                                                   NSLog(@"%@", error);
-                                                                 }
-                                                                 dispatch_async(dispatch_get_main_queue(), ^{
-
-                                                                   // TODO(gil): This way allows different image sizes
-                                                                   if (self->_iconImageView) [self->_iconImageView removeFromSuperview];
-
-                                                                   // ... but this way is more efficient?
-//                                                                   if (_iconImageView) {
-//                                                                     [_iconImageView setImage:image];
-//                                                                     return;
-//                                                                   }
-
-                                                                   UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
-
-                                                                   // TODO: w,h or pixel density could be a prop.
-                                                                   float density = 1;
-                                                                   float w = image.size.width/density;
-                                                                   float h = image.size.height/density;
-                                                                   CGRect bounds = CGRectMake(0, 0, w, h);
-
-                                                                   imageView.contentMode = UIViewContentModeScaleAspectFit;
-                                                                   [imageView setFrame:bounds];
-
-                                                                   // NOTE: sizeToFit doesn't work instead. Not sure why.
-                                                                   // TODO: Doing it this way is not ideal because it causes things to reshuffle
-                                                                   //       when the image loads IF the image is larger than the UIView.
-                                                                   //       Shouldn't required images have size info automatically via RN?
-                                                                   CGRect selfBounds = unionRect(bounds, self.bounds);
-                                                                   [self setFrame:selfBounds];
-
-                                                                   self->_iconImageView = imageView;
-                                                                   [self iconViewInsertSubview:imageView atIndex:0];
-                                                                 });
-                                                               }];
+    _imageSrc = imageSrc;
+
+    if (_reloadImageCancellationBlock) {
+        _reloadImageCancellationBlock();
+        _reloadImageCancellationBlock = nil;
+    }
+
+    if (!_imageSrc) {
+        if (_iconImageView) [_iconImageView removeFromSuperview];
+        return;
+    }
+
+    if (!_iconImageView) {
+        // prevent glitch with marker (cf. https://github.com/react-native-maps/react-native-maps/issues/738)
+        UIImageView *empyImageView = [[UIImageView alloc] init];
+        _iconImageView = empyImageView;
+        [self iconViewInsertSubview:_iconImageView atIndex:0];
+    }
+
+    _reloadImageCancellationBlock = [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_imageSrc]
+                                                                                               size:self.bounds.size
+                                                                                              scale:RCTScreenScale()
+                                                                                            clipped:YES
+                                                                                         resizeMode:RCTResizeModeCenter
+                                                                                      progressBlock:nil
+                                                                                   partialLoadBlock:nil
+                                                                                    completionBlock:^(NSError *error, UIImage *image) {
+        if (error) {
+            // TODO(lmr): do something with the error?
+            NSLog(@"%@", error);
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+
+            // TODO(gil): This way allows different image sizes
+            if (self->_iconImageView) [self->_iconImageView removeFromSuperview];
+
+            // ... but this way is more efficient?
+            //                                                                   if (_iconImageView) {
+            //                                                                     [_iconImageView setImage:image];
+            //                                                                     return;
+            //                                                                   }
+
+            UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
+
+            // TODO: w,h or pixel density could be a prop.
+            float density = 1;
+            float w = image.size.width/density;
+            float h = image.size.height/density;
+            CGRect bounds = CGRectMake(0, 0, w, h);
+
+            imageView.contentMode = UIViewContentModeScaleAspectFit;
+            [imageView setFrame:bounds];
+
+            // NOTE: sizeToFit doesn't work instead. Not sure why.
+            // TODO: Doing it this way is not ideal because it causes things to reshuffle
+            //       when the image loads IF the image is larger than the UIView.
+            //       Shouldn't required images have size info automatically via RN?
+            CGRect selfBounds = unionRect(bounds, self.bounds);
+            [self setFrame:selfBounds];
+
+            self->_iconImageView = imageView;
+            [self iconViewInsertSubview:imageView atIndex:0];
+        });
+    }];
 }
 
 - (void)setIconSrc:(NSString *)iconSrc
 {
-  _iconSrc = iconSrc;
-
-  if (_reloadImageCancellationBlock) {
-    _reloadImageCancellationBlock();
-    _reloadImageCancellationBlock = nil;
-  }
-
-  if (!_realMarker.icon) {
-    // prevent glitch with marker (cf. https://github.com/react-native-maps/react-native-maps/issues/3657)
-    UIImage *emptyImage = [[UIImage alloc] init];
-    _realMarker.icon = emptyImage;
-  }
-
-  _reloadImageCancellationBlock =
-  [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_iconSrc]
-                                          size:self.bounds.size
-                                         scale:RCTScreenScale()
-                                       clipped:YES
-                                    resizeMode:RCTResizeModeCenter
-                                 progressBlock:nil
-                              partialLoadBlock:nil
-                               completionBlock:^(NSError *error, UIImage *image) {
-                                 if (error) {
-                                   // TODO(lmr): do something with the error?
-                                   NSLog(@"%@", error);
-                                 }
-                                 dispatch_async(dispatch_get_main_queue(), ^{
-                                   self->_realMarker.icon = image;
-                                 });
-                               }];
+    _iconSrc = iconSrc;
+
+    if (_reloadImageCancellationBlock) {
+        _reloadImageCancellationBlock();
+        _reloadImageCancellationBlock = nil;
+    }
+
+    if (!_realMarker.icon) {
+        // prevent glitch with marker (cf. https://github.com/react-native-maps/react-native-maps/issues/3657)
+        UIImage *emptyImage = [[UIImage alloc] init];
+        _realMarker.icon = emptyImage;
+    }
+
+    _reloadImageCancellationBlock =
+    [[_bridge moduleForName:@"ImageLoader"] loadImageWithURLRequest:[RCTConvert NSURLRequest:_iconSrc]
+                                                               size:self.bounds.size
+                                                              scale:RCTScreenScale()
+                                                            clipped:YES
+                                                         resizeMode:RCTResizeModeCenter
+                                                      progressBlock:nil
+                                                   partialLoadBlock:nil
+                                                    completionBlock:^(NSError *error, UIImage *image) {
+        if (error) {
+            // TODO(lmr): do something with the error?
+            NSLog(@"%@", error);
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self->_realMarker.icon = image;
+        });
+    }];
 }
 
 - (void)setTitle:(NSString *)title {
-  _realMarker.title = [title copy];
+    _realMarker.title = [title copy];
+    _title = title;
 }
 
 - (NSString *)title {
-  return _realMarker.title;
+    return _realMarker.title;
 }
 
 - (void)setSubtitle:(NSString *)subtitle {
-  _realMarker.snippet = subtitle;
+    _realMarker.snippet = subtitle;
+    _subtitle = subtitle;
 }
 
 - (NSString *)subtitle {
-  return _realMarker.snippet;
+    return _realMarker.snippet;
 }
 
 - (void)setPinColor:(UIColor *)pinColor {
-  _pinColor = pinColor;
-  _realMarker.icon = [GMSMarker markerImageWithColor:pinColor];
+    _pinColor = pinColor;
+    _realMarker.icon = [GMSMarker markerImageWithColor:pinColor];
 }
 
 - (void)setAnchor:(CGPoint)anchor {
-  _anchor = anchor;
-  _realMarker.groundAnchor = anchor;
+    _anchor = anchor;
+    _realMarker.groundAnchor = anchor;
 }
 
 - (void)setCalloutAnchor:(CGPoint)calloutAnchor {
-  _calloutAnchor = calloutAnchor;
-  _realMarker.infoWindowAnchor = calloutAnchor;
+    _calloutAnchor = calloutAnchor;
+    _realMarker.infoWindowAnchor = calloutAnchor;
 }
 
 
 - (void)setZIndex:(NSInteger)zIndex
 {
-  _zIndex = zIndex;
-  _realMarker.zIndex = (int)zIndex;
+    _zIndex = zIndex;
+    _realMarker.zIndex = (int)zIndex;
 }
 
 - (void)setDraggable:(BOOL)draggable {
-  _realMarker.draggable = draggable;
+    _realMarker.draggable = draggable;
+    _draggable = draggable;
 }
 
 - (BOOL)draggable {
-  return _realMarker.draggable;
+    return _realMarker.draggable;
 }
 
 - (void)setTappable:(BOOL)tappable {
-  _realMarker.tappable = tappable;
+    _realMarker.tappable = tappable;
+    _tappable = tappable;
 }
 
 - (BOOL)tappable {
-  return _realMarker.tappable;
+    return _realMarker.tappable;
 }
 
 - (void)setFlat:(BOOL)flat {
-  _realMarker.flat = flat;
+    _realMarker.flat = flat;
+    _flat = flat;
 }
 
 - (BOOL)flat {
-  return _realMarker.flat;
+    return _realMarker.flat;
 }
 
 - (void)setTracksViewChanges:(BOOL)tracksViewChanges {
-  _realMarker.tracksViewChanges = tracksViewChanges;
+    _realMarker.tracksViewChanges = tracksViewChanges;
 }
 
 - (BOOL)tracksViewChanges {
-  return _realMarker.tracksViewChanges;
+    return _realMarker.tracksViewChanges;
 }
 
 - (void)setTracksInfoWindowChanges:(BOOL)tracksInfoWindowChanges {
-  _realMarker.tracksInfoWindowChanges = tracksInfoWindowChanges;
+    _realMarker.tracksInfoWindowChanges = tracksInfoWindowChanges;
 }
 
 - (BOOL)tracksInfoWindowChanges {
-  return _realMarker.tracksInfoWindowChanges;
+    return _realMarker.tracksInfoWindowChanges;
 }
 
 
@@ -434,17 +530,17 @@ CGRect unionRect(CGRect a, CGRect b) {
     CGPoint position = [self.realMarker.map.projection pointForCoordinate:coordinate];
 
     return @{
-            @"id": self.identifier ?: @"unknown",
-            @"position": @{
-                @"x": @(position.x),
-                @"y": @(position.y),
-                },
-            @"coordinate": @{
-                @"latitude": @(coordinate.latitude),
-                @"longitude": @(coordinate.longitude),
-                },
-            @"action": action,
-            };
+        @"id": self.identifier ?: @"unknown",
+        @"position": @{
+            @"x": @(position.x),
+            @"y": @(position.y),
+        },
+        @"coordinate": @{
+            @"latitude": @(coordinate.latitude),
+            @"longitude": @(coordinate.longitude),
+        },
+        @"action": action,
+    };
 }
 
 - (id)makeEventData {

package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm

@@ -389,8 +389,11 @@ using namespace facebook::react;
         } else {
             [_pendingInsertsSubviews setObject:paperView forKey:[NSNumber numberWithInteger:index]];
         }
+    } else {
+        [_view insertReactSubview:childComponentView atIndex:index];
     }
 }
+
 - (void) unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
     id<RCTComponent> paperView = [childComponentView getPaperViewFromChildComponentView];
@@ -400,8 +403,20 @@ using namespace facebook::react;
         } else {
             [_pendingInsertsSubviews removeObjectForKey:[NSNumber numberWithInteger:index]];
         }
+    } else {
+        [_view removeReactSubview:childComponentView];
     }
 }
+- (void) prepareForRecycle
+{
+    [super prepareForRecycle];
+    static const auto defaultProps = std::make_shared<const RNMapsGoogleMapViewProps>();
+    _props = defaultProps;
+    _legacyMapManager = [[AIRGoogleMapManager alloc] init];
+      _pendingInsertsSubviews = [NSMutableDictionary new];
+    [_view removeFromSuperview];
+    _view = nil;
+}
 
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps

package/lib/MapView.js

@@ -55,7 +55,7 @@ class MapView extends React.Component {
         this.map = React.createRef();
         this.fabricMap = React.createRef();
         this.state = {
-            isReady: react_native_1.Platform.OS === 'ios',
+            isReady: false,
         };
         this._onMapReady = this._onMapReady.bind(this);
         this._onChange = this._onChange.bind(this);
@@ -348,7 +348,7 @@ class MapView extends React.Component {
         if (react_native_1.Platform.OS === 'ios') {
             // Define props specifically for MapFabricNativeProps
             /* eslint-disable @typescript-eslint/no-unused-vars */
-            const { onCalloutPress, onIndoorBuildingFocused, onKmlReady, onLongPress, onMarkerDeselect, onMarkerPress, onMarkerSelect, onRegionChangeStart, onRegionChange, onRegionChangeComplete, onPress, minZoomLevel, maxZoomLevel, region, provider, ...restProps } = this.props;
+            const { onCalloutPress, onIndoorBuildingFocused, onKmlReady, onLongPress, onMarkerDeselect, onMarkerPress, onMarkerSelect, onRegionChangeStart, onRegionChange, onRegionChangeComplete, onPress, minZoomLevel, maxZoomLevel, region, provider, children, ...restProps } = this.props;
             /* eslint-enable @typescript-eslint/no-unused-vars */
             const userInterfaceStyle = this.props.userInterfaceStyle || 'system';
             const props = {
@@ -379,14 +379,19 @@ class MapView extends React.Component {
                 props.initialCamera = this.props.initialCamera;
                 props.onLayout = this.props.onLayout;
             }
+            const childrenNodes = this.state.isReady ? children : null;
             if (provider === 'google') {
                 return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
-            <FabricGoogleMap {...props} ref={this.fabricMap}/>
+            <FabricGoogleMap {...props} ref={this.fabricMap}>
+              {childrenNodes}
+            </FabricGoogleMap>
           </decorateMapComponent_1.ProviderContext.Provider>);
             }
             else {
                 return (<decorateMapComponent_1.ProviderContext.Provider value={this.props.provider}>
-            <FabricMap {...props} ref={this.fabricMap}/>
+            <FabricMap {...props} ref={this.fabricMap}>
+              {childrenNodes}
+            </FabricMap>
           </decorateMapComponent_1.ProviderContext.Provider>);
             }
         }

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

package/react-native-maps.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
   s.homepage     = package["homepage"]
   s.license      = package["license"]
-  s.platform     = :ios, "11.0"
+  s.platform     = :ios, "12.0"
 
   s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
   s.source_files  = "ios/AirMaps/**/*.{h,m,mm,swift}"