Fixes overlay closes keyboard - #3892 (#4211)

lib/ios/RNNOverlayManager.m

@@ -17,7 +17,7 @@
 	viewController.view.backgroundColor = [UIColor clearColor];
 	[overlayWindow setWindowLevel:UIWindowLevelNormal];
 	[overlayWindow setRootViewController:viewController];
-	[overlayWindow makeKeyAndVisible];
+	[overlayWindow setHidden:NO];
 }
 
 - (void)dismissOverlay:(UIViewController*)viewController {
@@ -30,21 +30,9 @@
 - (void)detachOverlayWindow:(UIWindow *)overlayWindow {
 	[overlayWindow setHidden:YES];
 	[overlayWindow setRootViewController:nil];
-	[overlayWindow resignKeyWindow];
-	[self assignKeyWindow];
 	[_overlayWindows removeObject:overlayWindow];
 }
 
-- (void)assignKeyWindow {
-	NSArray* windows = [[[UIApplication sharedApplication].windows reverseObjectEnumerator] allObjects];
-	for (UIWindow* window in windows) {
-		if (window.rootViewController) {
-			[window makeKeyAndVisible];
-			return;
-		}
-	}
-}
-
 - (UIWindow *)findWindowByRootViewController:(UIViewController *)viewController {
 	for (UIWindow* window in _overlayWindows) {
 		if ([window.rootViewController isEqual:viewController]) {

lib/ios/ReactNativeNavigationTests/RNNOverlayManagerTest.m

@@ -17,45 +17,57 @@
 }
 
 
-//- (void)testShowOverlayShouldAddWindowWithVCAsRoot {
-//	[_overlayManager showOverlay:_overlayVC];
-//	UIWindow* window = _overlayManager.overlayWindows.lastObject;
-//	XCTAssertTrue([window.rootViewController isEqual:_overlayVC]);
-//}
-//
-//- (void)testShowOverlayShouldAddVisibleWindow {
-//	[_overlayManager showOverlay:_overlayVC];
-//	UIWindow* window = _overlayManager.overlayWindows.lastObject;
-//	XCTAssertTrue(window.windowLevel == UIWindowLevelNormal);
-//	XCTAssertFalse(window.hidden);
-//}
-//
-//- (void)testDismissOverlayShouldCleanWindowRootVC {
-//	[_overlayManager showOverlay:_overlayVC];
-//	UIWindow* window = _overlayManager.overlayWindows.lastObject;
-//	[_overlayManager dismissOverlay:_overlayVC];
-//	XCTAssertNil(window.rootViewController);
-//}
-//
-//- (void)testDismissOverlayShouldHideWindow {
-//	[_overlayManager showOverlay:_overlayVC];
-//	UIWindow* window = _overlayManager.overlayWindows.lastObject;
-//	[_overlayManager dismissOverlay:_overlayVC];
-//	XCTAssertTrue(window.hidden);
-//}
-//
-//- (void)testDismissOverlayShouldRemoveOverlayWindow {
-//	[_overlayManager showOverlay:_overlayVC];
-//	UIWindow* window = _overlayManager.overlayWindows.lastObject;
-//	[_overlayManager dismissOverlay:_overlayVC];
-//	XCTAssertFalse([_overlayManager.overlayWindows containsObject:window]);
-//}
-//
-//- (void)testDismissOverlayShouldNotRemoveWrongVC {
-//	[_overlayManager showOverlay:_overlayVC];
-//	UIWindow* window = _overlayManager.overlayWindows.lastObject;
-//	[_overlayManager dismissOverlay:[UIViewController new]];
-//	XCTAssertTrue([_overlayManager.overlayWindows containsObject:window]);
-//}
+- (void)testShowOverlayShouldAddWindowWithVCAsRoot {
+	[_overlayManager showOverlay:_overlayVC];
+	UIWindow* window = _overlayManager.overlayWindows.lastObject;
+	XCTAssertTrue([window.rootViewController isEqual:_overlayVC]);
+}
+
+- (void)testShowOverlayShouldAddVisibleWindow {
+	[_overlayManager showOverlay:_overlayVC];
+	UIWindow* window = _overlayManager.overlayWindows.lastObject;
+	XCTAssertTrue(window.windowLevel == UIWindowLevelNormal);
+	XCTAssertFalse(window.hidden);
+}
+
+- (void)testShowOverlayShouldCreateTransparentView {
+	[_overlayManager showOverlay:_overlayVC];
+	UIWindow* window = _overlayManager.overlayWindows.lastObject;
+	XCTAssertTrue(window.rootViewController.view.backgroundColor == [UIColor clearColor]);
+}
+
+- (void)testShowOverlayShouldNotBeKeyWindow {
+	[_overlayManager showOverlay:_overlayVC];
+	UIWindow* window = _overlayManager.overlayWindows.lastObject;
+	XCTAssertFalse(window.keyWindow);
+}
+
+- (void)testDismissOverlayShouldCleanWindowRootVC {
+	[_overlayManager showOverlay:_overlayVC];
+	UIWindow* window = _overlayManager.overlayWindows.lastObject;
+	[_overlayManager dismissOverlay:_overlayVC];
+	XCTAssertNil(window.rootViewController);
+}
+
+- (void)testDismissOverlayShouldHideWindow {
+	[_overlayManager showOverlay:_overlayVC];
+	UIWindow* window = _overlayManager.overlayWindows.lastObject;
+	[_overlayManager dismissOverlay:_overlayVC];
+	XCTAssertTrue(window.hidden);
+}
+
+- (void)testDismissOverlayShouldRemoveOverlayWindow {
+	[_overlayManager showOverlay:_overlayVC];
+	UIWindow* window = _overlayManager.overlayWindows.lastObject;
+	[_overlayManager dismissOverlay:_overlayVC];
+	XCTAssertFalse([_overlayManager.overlayWindows containsObject:window]);
+}
+
+- (void)testDismissOverlayShouldNotRemoveWrongVC {
+	[_overlayManager showOverlay:_overlayVC];
+	UIWindow* window = _overlayManager.overlayWindows.lastObject;
+	[_overlayManager dismissOverlay:[UIViewController new]];
+	XCTAssertTrue([_overlayManager.overlayWindows containsObject:window]);
+}
 
 @end