Fix pageSheet modals causing memory leak when swiped (#5601)

wix · Oct 23, 2019 · 2b4d897 · 2b4d897
1 parent 507b675
commit 2b4d897
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/ios/RNNModalManager.h b/lib/ios/RNNModalManager.h
@@ -12,7 +12,7 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, N
 
 @end
 
-@interface RNNModalManager : NSObject
+@interface RNNModalManager : NSObject <UIAdaptivePresentationControllerDelegate>
 
 @property (nonatomic, weak) id<RNNModalManagerDelegate> delegate;
 

diff --git a/lib/ios/RNNModalManager.m b/lib/ios/RNNModalManager.m
@@ -29,6 +29,10 @@ -(void)showModal:(UIViewController<RNNLayoutProtocol> *)viewController animated:
 	UIViewController* topVC = [self topPresentedVC];
 	topVC.definesPresentationContext = YES;
 
+	if (viewController.presentationController) {
+		viewController.presentationController.delegate = self;
+	}
+
 	RNNAnimationsTransitionDelegate* tr = [[RNNAnimationsTransitionDelegate alloc] initWithScreenTransition:viewController.resolveOptions.animations.showModal isDismiss:NO];
 	if (hasCustomAnimation) {
 		viewController.transitioningDelegate = tr;
@@ -105,6 +109,10 @@ - (void)dismissedModal:(UIViewController *)viewController {
 	[_delegate dismissedModal:viewController];
 }
 
+- (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController {
+	[_presentedModals removeObject:presentationController.presentedViewController];
+}
+
 -(UIViewController*)topPresentedVC {
 	UIViewController *root = UIApplication.sharedApplication.delegate.window.rootViewController;
 	while(root.presentedViewController) {