Add overlay.handleKeyboardEvents options (#5002)

wix · Apr 18, 2019 · e9ca247 · e9ca247
1 parent 189f559
commit e9ca247
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/lib/ios/RNNCommandsHandler.m b/lib/ios/RNNCommandsHandler.m
@@ -301,7 +301,12 @@ - (void)showOverlay:(NSDictionary *)layout commandId:(NSString*)commandId comple
 	[overlayVC renderTreeAndWait:NO perform:^{
 		UIWindow* overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 		overlayWindow.rootViewController = overlayVC;
-		[_overlayManager showOverlayWindow:overlayWindow];
+		if ([overlayVC.resolveOptions.overlay.handleKeyboardEvents getWithDefaultValue:NO]) {
+			[_overlayManager showOverlayWindowAsKeyWindow:overlayWindow];
+		} else {
+			[_overlayManager showOverlayWindow:overlayWindow];
+		}
+
 		[_eventEmitter sendOnNavigationCommandCompletion:showOverlay commandId:commandId params:@{@"layout": layout}];
 		completion();
 	}];

diff --git a/lib/ios/RNNOverlayManager.h b/lib/ios/RNNOverlayManager.h
@@ -5,6 +5,7 @@
 @interface RNNOverlayManager : NSObject
 
 - (void)showOverlayWindow:(UIWindow*)viewController;
+- (void)showOverlayWindowAsKeyWindow:(UIWindow *)overlayWindow;
 - (void)dismissOverlay:(UIViewController*)viewController;
 
 @property (nonatomic, retain) NSMutableArray* overlayWindows;

diff --git a/lib/ios/RNNOverlayManager.m b/lib/ios/RNNOverlayManager.m
@@ -19,6 +19,11 @@ - (void)showOverlayWindow:(RNNOverlayWindow *)overlayWindow {
 	[overlayWindow setHidden: NO];
 }
 
+- (void)showOverlayWindowAsKeyWindow:(RNNOverlayWindow *)overlayWindow {
+	[self showOverlayWindow:overlayWindow];
+	[overlayWindow makeKeyWindow];
+}
+
 - (void)dismissOverlay:(UIViewController*)viewController {
 	RNNOverlayWindow* overlayWindow = [self findWindowByRootViewController:viewController];
 	[overlayWindow.previousWindow makeKeyWindow];

diff --git a/lib/ios/RNNOverlayOptions.h b/lib/ios/RNNOverlayOptions.h
@@ -3,5 +3,6 @@
 @interface RNNOverlayOptions : RNNOptions
 
 @property (nonatomic, strong) Bool* interceptTouchOutside;
+@property (nonatomic, strong) Bool* handleKeyboardEvents;
 
 @end
diff --git a/lib/ios/RNNOverlayOptions.m b/lib/ios/RNNOverlayOptions.m
@@ -7,6 +7,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
 	self = [super init];
 
 	self.interceptTouchOutside = [BoolParser parse:dict key:@"interceptTouchOutside"];
+	self.handleKeyboardEvents = [BoolParser parse:dict key:@"handleKeyboardEvents"];
 
 	return self;
 }