Revert "fix overlay options bug"

This reverts commit fc493775eb.

lib/ios/RNNOverlayManager.m

@@ -1,11 +1,9 @@
 #import "RNNOverlayManager.h"
 #import "RNNErrorHandler.h"
-#import "RNNOverlayWindow.h"
 
 @implementation RNNOverlayManager {
 	NSMutableDictionary* _overlayDict;
 	RNNStore* _store;
-	RNNOverlayWindow *_overlayWindow;
 }
 
 - (instancetype)initWithStore:(RNNStore *)store {
@@ -19,11 +17,7 @@
 
 - (void)showOverlay:(RNNRootViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
 	[self cacheOverlay:viewController];
-	_overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-	[_overlayWindow setWindowLevel:UIWindowLevelNormal];
-	[_overlayWindow setRootViewController:viewController];
-	[_overlayWindow makeKeyAndVisible];
-	
+	[[[UIApplication sharedApplication] keyWindow] addSubview:viewController.view];
 	completion();
 }
 
@@ -44,10 +38,7 @@
 }
 
 - (void)removeCachedOverlay:(RNNRootViewController*)viewController {
-	[_overlayWindow setRootViewController:nil];
-	[_overlayWindow resignKeyWindow];
-	_overlayWindow = nil;
-	
+	[viewController.view removeFromSuperview];
 	[_overlayDict removeObjectForKey:viewController.componentId];
 	[_store removeComponent:viewController.componentId];
 }

lib/ios/RNNOverlayWindow.h

@@ -1,5 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface RNNOverlayWindow : UIWindow
-
-@end

lib/ios/RNNOverlayWindow.m

@@ -1,15 +0,0 @@
-#import "RNNOverlayWindow.h"
-
-@implementation RNNOverlayWindow
-
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
-	UIView *hitTestResult = [super hitTest:point withEvent:event];
-	
-	if ([hitTestResult isKindOfClass:[UIWindow class]]) {
-		return nil;
-	}
-	
-	return hitTestResult;
-}
-
-@end

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -112,8 +112,6 @@
 		507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */; };
 		50887C1520ECC5C200D06111 /* RNNButtonOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50887C1320ECC5C200D06111 /* RNNButtonOptions.h */; };
 		50887C1620ECC5C200D06111 /* RNNButtonOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887C1420ECC5C200D06111 /* RNNButtonOptions.m */; };
-		50887CA920F26BFE00D06111 /* RNNOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */; };
-		50887CAA20F26BFE00D06111 /* RNNOverlayWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */; };
 		50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */; };
 		50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */; };
 		50BE951220B5A787004F5DF5 /* RNNStatusBarOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50BE951020B5A787004F5DF5 /* RNNStatusBarOptions.m */; };
@@ -334,8 +332,6 @@
 		507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNRootViewProtocol.h; sourceTree = "<group>"; };
 		50887C1320ECC5C200D06111 /* RNNButtonOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNButtonOptions.h; sourceTree = "<group>"; };
 		50887C1420ECC5C200D06111 /* RNNButtonOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNButtonOptions.m; sourceTree = "<group>"; };
-		50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayWindow.m; sourceTree = "<group>"; };
-		50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNOverlayWindow.h; sourceTree = "<group>"; };
 		50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOverlayOptions.h; sourceTree = "<group>"; };
 		50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayOptions.m; sourceTree = "<group>"; };
 		50BE951020B5A787004F5DF5 /* RNNStatusBarOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNStatusBarOptions.m; sourceTree = "<group>"; };
@@ -671,8 +667,6 @@
 				507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */,
 				E33AC1FF20B5BA0B0090DB8A /* RNNSplitViewController.m */,
 				E33AC20120B5BA550090DB8A /* RNNSplitViewController.h */,
-				50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */,
-				50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -884,7 +878,6 @@
 				50570B262061473D006A1B5C /* RNNTitleOptions.h in Headers */,
 				504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */,
 				E8E5182E1F83A48B000467AC /* RNNTransitionStateHolder.h in Headers */,
-				50887CAA20F26BFE00D06111 /* RNNOverlayWindow.h in Headers */,
 				507E7D57201DDD3000444E6C /* RNNAnimationOptions.h in Headers */,
 				2DCD9195200014A900EDC75D /* RNNBridgeManager.h in Headers */,
 				7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */,
@@ -1048,7 +1041,6 @@
 				504AFE651FFE53070076E904 /* RNNOptions.m in Sources */,
 				263905BA1E4C6F440023D7D3 /* RCCDrawerController.m in Sources */,
 				50F5DFC21F407A8C001A00BC /* RNNTabBarController.m in Sources */,
-				50887CA920F26BFE00D06111 /* RNNOverlayWindow.m in Sources */,
 				263905BC1E4C6F440023D7D3 /* RCCDrawerHelper.m in Sources */,
 				4534E72620CB6724009F8185 /* RNNLargeTitleOptions.m in Sources */,
 				507E7D58201DDD3000444E6C /* RNNAnimationOptions.m in Sources */,