Fixes overlays level - #4145 (#4264)

* Fixes overlays level - #4145

* Disable overlay unmounts when dismissed

* Fixes e2e

lib/ios/RNNCommandsHandler.m

@@ -58,8 +58,8 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	UIViewController *vc = [_controllerFactory createLayout:layout[@"root"] saveToStore:_store];
 	
-	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
-	[UIApplication.sharedApplication.delegate.window makeKeyWindow];
+	[UIApplication sharedApplication].windows.firstObject.rootViewController = vc;
+
 	[_eventEmitter sendOnNavigationCommandCompletion:setRoot params:@{@"layout": layout}];
 	completion();
 }
@@ -279,7 +279,9 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	
 	UIViewController<RNNParentProtocol>* overlayVC = [_controllerFactory createLayout:layout saveToStore:_store];
-	[_overlayManager showOverlay:overlayVC];
+	UIWindow* overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+	overlayWindow.rootViewController = overlayVC;
+	[_overlayManager showOverlayWindow:overlayWindow];
 	[_eventEmitter sendOnNavigationCommandCompletion:showOverlay params:@{@"layout": layout}];
 	completion();
 }

lib/ios/RNNOverlayManager.h

@@ -5,7 +5,7 @@
 
 @interface RNNOverlayManager : NSObject
 
-- (void)showOverlay:(UIViewController*)viewController;
+- (void)showOverlayWindow:(UIWindow*)viewController;
 - (void)dismissOverlay:(UIViewController*)viewController;
 
 @property (nonatomic, retain) NSMutableArray* overlayWindows;

lib/ios/RNNOverlayManager.m

@@ -11,17 +11,17 @@
 
 #pragma mark - public
 
-- (void)showOverlay:(UIViewController *)viewController {
-	UIWindow* overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+- (void)showOverlayWindow:(RNNOverlayWindow *)overlayWindow {
+	overlayWindow.previousWindow = [UIApplication sharedApplication].keyWindow;
 	[_overlayWindows addObject:overlayWindow];
-	viewController.view.backgroundColor = [UIColor clearColor];
+	overlayWindow.rootViewController.view.backgroundColor = [UIColor clearColor];
 	[overlayWindow setWindowLevel:UIWindowLevelNormal];
-	[overlayWindow setRootViewController:viewController];
-	[overlayWindow setHidden:NO];
+	[overlayWindow makeKeyAndVisible];
 }
 
 - (void)dismissOverlay:(UIViewController*)viewController {
-	UIWindow* overlayWindow = [self findWindowByRootViewController:viewController];
+	RNNOverlayWindow* overlayWindow = [self findWindowByRootViewController:viewController];
+	[overlayWindow.previousWindow makeKeyWindow];
 	[self detachOverlayWindow:overlayWindow];
 }
 
@@ -33,8 +33,8 @@
 	[_overlayWindows removeObject:overlayWindow];
 }
 
-- (UIWindow *)findWindowByRootViewController:(UIViewController *)viewController {
-	for (UIWindow* window in _overlayWindows) {
+- (RNNOverlayWindow *)findWindowByRootViewController:(UIViewController *)viewController {
+	for (RNNOverlayWindow* window in _overlayWindows) {
 		if ([window.rootViewController isEqual:viewController]) {
 			return window;
 		}

lib/ios/RNNOverlayWindow.h

@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
 
 @interface RNNOverlayWindow : UIWindow
-
+@property (nonatomic, weak) UIWindow* previousWindow;
 @end

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -192,7 +192,7 @@
 
 - (void)testShowOverlay_createLayout {
 	[self.store setReadyToReceiveCommands:true];
-	OCMStub([self.overlayManager showOverlay:[OCMArg any]]);
+	OCMStub([self.overlayManager showOverlayWindow:[OCMArg any]]);
 	NSDictionary* layout = @{};
 	
 	[[self.controllerFactory expect] createLayout:layout saveToStore:self.store];
@@ -202,7 +202,7 @@
 
 - (void)testShowOverlay_saveToStore {
 	[self.store setReadyToReceiveCommands:true];
-	OCMStub([self.overlayManager showOverlay:[OCMArg any]]);
+	OCMStub([self.overlayManager showOverlayWindow:[OCMArg any]]);
 	OCMStub([self.controllerFactory createLayout:[OCMArg any] saveToStore:[OCMArg any]]);
 	
 	[[self.controllerFactory expect] createLayout:[OCMArg any] saveToStore:self.store];
@@ -215,14 +215,14 @@
 	UIViewController* layoutVC = [RNNRootViewController new];
 	OCMStub([self.controllerFactory createLayout:[OCMArg any] saveToStore:[OCMArg any]]).andReturn(layoutVC);
 	
-	[[self.overlayManager expect] showOverlay:layoutVC];
+	[[self.overlayManager expect] showOverlayWindow:[OCMArg any]];
 	[self.uut showOverlay:@{} completion:^{}];
 	[self.overlayManager verify];
 }
 
 - (void)testShowOverlay_invokeNavigationCommandEventWithLayout {
 	[self.store setReadyToReceiveCommands:true];
-	OCMStub([self.overlayManager showOverlay:[OCMArg any]]);
+	OCMStub([self.overlayManager showOverlayWindow:[OCMArg any]]);
 	OCMStub([self.controllerFactory createLayout:[OCMArg any] saveToStore:[OCMArg any]]);
 
 	NSDictionary* layout = @{};

lib/ios/ReactNativeNavigationTests/RNNOverlayManagerTest.m

@@ -1,10 +1,12 @@
 #import <XCTest/XCTest.h>
+#import <OCMock/OCMock.h>
 #import "RNNOverlayManager.h"
 
 @interface RNNOverlayManagerTest : XCTestCase
 
 @property (nonatomic, retain) RNNOverlayManager* overlayManager;
 @property (nonatomic, retain) UIViewController* overlayVC;
+@property (nonatomic, retain) RNNOverlayWindow* overlayWindow;
 
 @end
 
@@ -14,57 +16,54 @@
     [super setUp];
 	_overlayManager = [RNNOverlayManager new];
 	_overlayVC = [UIViewController new];
+	_overlayWindow = [OCMockObject partialMockForObject:[RNNOverlayWindow new]];
+	OCMStub([_overlayWindow makeKeyAndVisible]);
+	_overlayWindow.rootViewController = _overlayVC;
 }
 
 
 - (void)testShowOverlayShouldAddWindowWithVCAsRoot {
-	[_overlayManager showOverlay:_overlayVC];
+	[_overlayManager showOverlayWindow:_overlayWindow];
 	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)testShowOverlayShouldSetKeyAndVisibleWindow {
+	id window = _overlayManager.overlayWindows.lastObject;
+	[[window expect] makeKeyAndVisible];
+	[_overlayManager showOverlayWindow:_overlayWindow];
+	[window verify];
 }
 
 - (void)testShowOverlayShouldCreateTransparentView {
-	[_overlayManager showOverlay:_overlayVC];
+	[_overlayManager showOverlayWindow:_overlayWindow];
 	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];
+	[_overlayManager showOverlayWindow:_overlayWindow];
 	UIWindow* window = _overlayManager.overlayWindows.lastObject;
 	[_overlayManager dismissOverlay:_overlayVC];
 	XCTAssertNil(window.rootViewController);
 }
 
 - (void)testDismissOverlayShouldHideWindow {
-	[_overlayManager showOverlay:_overlayVC];
+	[_overlayManager showOverlayWindow:_overlayWindow];
 	UIWindow* window = _overlayManager.overlayWindows.lastObject;
 	[_overlayManager dismissOverlay:_overlayVC];
 	XCTAssertTrue(window.hidden);
 }
 
 - (void)testDismissOverlayShouldRemoveOverlayWindow {
-	[_overlayManager showOverlay:_overlayVC];
+	[_overlayManager showOverlayWindow:_overlayWindow];
 	UIWindow* window = _overlayManager.overlayWindows.lastObject;
 	[_overlayManager dismissOverlay:_overlayVC];
 	XCTAssertFalse([_overlayManager.overlayWindows containsObject:window]);
 }
 
 - (void)testDismissOverlayShouldNotRemoveWrongVC {
-	[_overlayManager showOverlay:_overlayVC];
+	[_overlayManager showOverlayWindow:_overlayWindow];
 	UIWindow* window = _overlayManager.overlayWindows.lastObject;
 	[_overlayManager dismissOverlay:[UIViewController new]];
 	XCTAssertTrue([_overlayManager.overlayWindows containsObject:window]);

package.json

@@ -128,6 +128,15 @@
     "test-runner": "jest",
     "specs": "e2e",
     "configurations": {
+      "ios.none": {
+        "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app",
+        "type": "ios.none",
+        "name": "iPhone X",
+        "session": {
+          "server": "ws://localhost:8099",
+          "sessionId": "playground"
+        }
+      },
       "ios.sim.debug": {
         "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app",
         "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground -project playground/ios/playground.xcodeproj -sdk iphonesimulator -configuration Debug -derivedDataPath playground/ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet",
@@ -154,4 +163,4 @@
       }
     }
   }
-}
+}