Fix modal dismissed event emits wrong componentId (#5773)

Fix modal dismissed with swipe gesture emits wrong componentId

lib/ios/RNNLayoutProtocol.h

@@ -25,6 +25,8 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (CGFloat)getBottomTabsHeight;
 
+- (UIViewController *)topMostViewController;
+
 - (void)mergeOptions:(RNNNavigationOptions *)options;
 
 - (RNNNavigationOptions *)resolveOptions;

lib/ios/RNNModalManager.m

@@ -1,7 +1,7 @@
 #import "RNNModalManager.h"
 #import "RNNComponentViewController.h"
 #import "RNNAnimationsTransitionDelegate.h"
-#import "RNNLayoutProtocol.h"
+#import "UIViewController+LayoutProtocol.h"
 
 @implementation RNNModalManager {
 	NSMutableArray* _pendingModalIdsToDismiss;
@@ -43,7 +43,7 @@
 			completion(nil);
 		}
 		
-		[_presentedModals addObject:viewController.navigationController ? viewController.navigationController : viewController];
+        [self->_presentedModals addObject:[viewController topMostViewController]];
 	}];
 }
 
@@ -118,13 +118,13 @@
 }
 
 - (void)dismissedModal:(UIViewController *)viewController {
-	[_presentedModals removeObject:viewController.navigationController ? viewController.navigationController : viewController];
-	[_delegate dismissedModal:viewController];
+	[_presentedModals removeObject:[viewController topMostViewController]];
+	[_delegate dismissedModal:viewController.presentedComponentViewController];
 }
 
 - (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController {
 	[_presentedModals removeObject:presentationController.presentedViewController];
-    [_delegate dismissedModal:presentationController.presentedViewController];
+    [_delegate dismissedModal:presentationController.presentedViewController.presentedComponentViewController];
 }
 
 -(UIViewController*)topPresentedVC {

lib/ios/UIViewController+LayoutProtocol.h

@@ -12,6 +12,8 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (UIViewController *)presentedComponentViewController;
 
+- (UIViewController *)topMostViewController;
+
 - (void)mergeOptions:(RNNNavigationOptions *)options;
 
 - (void)mergeChildOptions:(RNNNavigationOptions *)options;

lib/ios/UIViewController+LayoutProtocol.m

@@ -87,6 +87,13 @@
     return self.getCurrentChild ? self.getCurrentChild.presentedComponentViewController : self;
 }
 
+- (UIViewController *)topMostViewController {
+    if (self.parentViewController) {
+        return [self.parentViewController topMostViewController];
+    } else
+        return self;
+}
+
 - (CGFloat)getTopBarHeight {
     for(UIViewController * child in [self childViewControllers]) {
         CGFloat childTopBarHeight = [child getTopBarHeight];

playground/ios/NavigationTests/RNNModalManagerTest.m

@@ -2,6 +2,7 @@
 #import <OCMock/OCMock.h>
 #import "RNNModalManager.h"
 #import "RNNComponentViewController.h"
+#import "RNNStackController.h"
 
 @interface MockViewController : UIViewController
 
@@ -129,6 +130,18 @@
 	[mockDelegate verify];
 }
 
+- (void)testPresentationControllerDidDismiss_ShouldInvokeDelegateDismissedModalWithPresentedChild {
+	id mockDelegate = [OCMockObject mockForProtocol:@protocol(RNNModalManagerDelegate)];
+	_modalManager.delegate = mockDelegate;
+	RNNStackController* nav = [[RNNStackController alloc] initWithRootViewController:_vc2];
+	
+	UIPresentationController* presentationController = [[UIPresentationController alloc] initWithPresentedViewController:nav presentingViewController:_vc1];
+	
+	[[mockDelegate expect] dismissedModal:_vc2];
+	[_modalManager presentationControllerDidDismiss:presentationController];
+	[mockDelegate verify];
+}
+
 #pragma mark RNNModalManagerDelegate
 
 - (void)dismissedMultipleModals:(NSArray *)viewControllers {