Merge commit 'b623557c23567442bb325b3f1f4a46bad39ca022' into eres

# Conflicts:
#	package.json

.gitignore

@@ -40,3 +40,4 @@ yarn-error.log
 
 # Bundle artifact
 *.jsbundle
+example/ios/bundles

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Change Log
+
+## 0.24.2 (April 17, 2019 )
+* iOS: [#2818](https://github.com/react-native-community/react-native-maps/pull/2818) Google Maps - Weak refs to gesture targets to address memory leak
+
+## 0.24.1 (April 16, 2019 )
+* iOS: [#2815](https://github.com/react-native-community/react-native-maps/pull/2815) Google Maps - Free instance variable in getActionForTarget to address memory leak
+
 # Change Log
 ## 0.24.0 (April 11, 2019 )
 * Common: [#2740](https://github.com/react-native-community/react-native-maps/pull/2740) Fix deprecated UIManager usage when accessing component names

example/ios/Podfile.lock

@@ -29,11 +29,11 @@ PODS:
     - GoogleMaps/Base
   - React (0.59.3):
     - React/Core (= 0.59.3)
-  - react-native-google-maps (0.24.0):
+  - react-native-google-maps (0.24.2):
     - Google-Maps-iOS-Utils (= 2.1.0)
     - GoogleMaps (= 2.5.0)
     - React
-  - react-native-maps (0.24.0):
+  - react-native-maps (0.24.2):
     - React
   - React/Core (0.59.3):
     - yoga (= 0.59.3.React)

gradle.properties

@@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 
 VERSION_CODE=4
-VERSION_NAME=0.24.0
+VERSION_NAME=0.24.2
 GROUP=com.airbnb.android
 
 POM_DESCRIPTION=React Native Map view component for Android

lib/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -52,6 +52,8 @@ @interface AIRGoogleMap ()
 
 - (id)eventFromCoordinate:(CLLocationCoordinate2D)coordinate;
 
+@property (nonatomic, strong) NSMutableDictionary<NSNumber *, NSDictionary*> *origGestureRecognizersMeta;
+
 @end
 
 @implementation AIRGoogleMap
@@ -62,7 +64,6 @@ @implementation AIRGoogleMap
   BOOL _initialCameraSetOnLoad;
   BOOL _didCallOnMapReady;
   BOOL _didMoveToWindow;
-  NSMutableDictionary<NSNumber *, NSDictionary*> *_origGestureRecognizersMeta;
   BOOL _zoomTapEnabled;
 }
 
@@ -91,7 +92,7 @@ - (instancetype)init
               options:NSKeyValueObservingOptionNew
               context:NULL];
 
-    _origGestureRecognizersMeta = [[NSMutableDictionary alloc] init];
+    self.origGestureRecognizersMeta = [[NSMutableDictionary alloc] init];
   }
   return self;
 }
@@ -619,6 +620,7 @@ -(SEL)getActionForTarget:(NSObject*)target {
             }
         }
     }
+    free(ivars);
     return action;
 }
 
@@ -628,7 +630,7 @@ -(void)overrideGestureRecognizersForView:(UIView*)view {
     NSArray* grs = view.gestureRecognizers;
     for (UIGestureRecognizer* gestureRecognizer in grs) {
         NSNumber* grHash = [NSNumber numberWithUnsignedInteger:gestureRecognizer.hash];
-        if([_origGestureRecognizersMeta objectForKey:grHash] != nil)
+        if([self.origGestureRecognizersMeta objectForKey:grHash] != nil)
             continue; //already patched
 
         //get original handlers
@@ -639,7 +641,10 @@ -(void)overrideGestureRecognizersForView:(UIView*)view {
             NSObject* target = [trg valueForKey:@"target"];
             SEL action = [self getActionForTarget:trg];
             isZoomTapGesture = [NSStringFromSelector(action) isEqualToString:@"handleZoomTapGesture:"];
-            [origTargetsActions addObject:@{@"target": target, @"action": NSStringFromSelector(action)}];
+            [origTargetsActions addObject:@{
+                                            @"target": [NSValue valueWithNonretainedObject:target],
+                                            @"action": NSStringFromSelector(action)
+                                            }];
         }
         if (isZoomTapGesture && self.zoomTapEnabled == NO) {
             [view removeGestureRecognizer:gestureRecognizer];
@@ -648,15 +653,16 @@ -(void)overrideGestureRecognizersForView:(UIView*)view {
 
         //replace with extendedMapGestureHandler
         for (NSDictionary* origTargetAction in origTargetsActions) {
-            NSObject* target = [origTargetAction objectForKey:@"target"];
+            NSValue* targetValue = [origTargetAction objectForKey:@"target"];
+            NSObject* target = [targetValue nonretainedObjectValue];
             NSString* actionString = [origTargetAction objectForKey:@"action"];
             SEL action = NSSelectorFromString(actionString);
             [gestureRecognizer removeTarget:target action:action];
         }
         [gestureRecognizer addTarget:self action:@selector(extendedMapGestureHandler:)];
 
-        [_origGestureRecognizersMeta setObject:@{@"targets": origTargetsActions}
-                                        forKey:grHash];
+        [self.origGestureRecognizersMeta setObject:@{@"targets": origTargetsActions}
+                                            forKey:grHash];
     }
 }
 
@@ -734,10 +740,11 @@ - (id)extendedMapGestureHandler:(UIGestureRecognizer*)gestureRecognizer {
     }
 
     if (performOriginalActions) {
-        NSDictionary* origMeta = [_origGestureRecognizersMeta objectForKey:grHash];
+        NSDictionary* origMeta = [self.origGestureRecognizersMeta objectForKey:grHash];
         NSDictionary* origTargets = [origMeta objectForKey:@"targets"];
         for (NSDictionary* origTarget in origTargets) {
-            NSObject* target = [origTarget objectForKey:@"target"];
+            NSValue* targetValue = [origTarget objectForKey:@"target"];
+            NSObject* target = [targetValue nonretainedObjectValue];
             NSString* actionString = [origTarget objectForKey:@"action"];
             SEL action = NSSelectorFromString(actionString);
 #pragma clang diagnostic push

package.json

@@ -3,7 +3,7 @@
   "description": "React Native Mapview component for iOS + Android",
   "main": "index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
-  "version": "0.24.0-eres",
+  "version": "0.24.2-eres",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "run:packager": "./node_modules/react-native/scripts/packager.sh",