iOS: Open modal in a new UIWindow (#37)

* iOS: Open modal in a new UIWindow

* iOS: clear modal window on dismiss

* iOS: hide UIWindow before removal

Author: paufau

ios/Library/RNTModalMountingHelper/RNTModalMountingHelper.m

@@ -2,12 +2,8 @@
 #import "RNTModalMountingHelper.h"
 #import "RNTModalWindowHelper.h"
 
-@implementation RNTModalMountingHelper
-
-- (instancetype)init
-{
-    [NSException raise:@"init" format:@"init has not been implemented"];
-    return self;
+@implementation RNTModalMountingHelper {
+    __strong UIWindow *modalWindow;
 }
 
 - (instancetype _Nonnull)initWithViewController:(RNTModalViewController * _Nonnull)viewController {
@@ -53,7 +49,8 @@ - (void)unmountIfNeeded {
 
 - (void)mount {
     RNTModalWindowHelper *windowHelper = [[RNTModalWindowHelper alloc] init];
-    UIViewController *rvc = [windowHelper getRootController];
+    modalWindow = [windowHelper createNewKeyWindow];
+    UIViewController *rvc = modalWindow.rootViewController;
 
     if (!rvc) {
         NSLog(@"reactViewController not found");
@@ -69,10 +66,12 @@ - (void)mount {
 
 - (void)unmount {
     [self.modal dismiss];
-    _modal = nil;
-    _isMounted = NO;
-    _hasProps = NO;
-    _hasChildren = NO;
+    self.modal = nil;
+    self.isMounted = NO;
+    self.hasProps = NO;
+    self.hasChildren = NO;
+    modalWindow.hidden = YES;
+    modalWindow = nil;
 }
 
 @end

ios/Library/RNTModalViewController/RNTModalViewController.m

@@ -56,9 +56,6 @@ - (void)viewDidLayoutSubviews
 #pragma mark - ModalViewControllerProtocol
 
 - (void)presentOn:(UIViewController *)parentVC onView:(UIView *)parentView {
-    self.modalPresentationStyle = UIModalPresentationCustom;
-    self.view.accessibilityViewIsModal = YES;
-    
     [self willMoveToParentViewController:parentVC];
     [parentVC addChildViewController:self];
     [parentView addSubview:self.view];

ios/Library/RNTModalWindowHelper/RNTModalWindowHelper.h

@@ -8,6 +8,7 @@
 - (UIWindow *_Nullable)getKeyWindow;
 - (UIViewController *_Nullable)getRootController;
 - (UIInterfaceOrientation)getWindowOrientation;
+- (UIWindow *_Nonnull)createNewKeyWindow;
 
 @end
 

ios/Library/RNTModalWindowHelper/RNTModalWindowHelper.m

@@ -33,4 +33,20 @@ - (UIInterfaceOrientation)getWindowOrientation
     return [self getKeyWindow].windowScene.interfaceOrientation ?: UIInterfaceOrientationPortrait;
 }
 
+- (UIWindow *)createNewKeyWindow {
+    UIWindow *keyWindow = [self getKeyWindow];
+    
+    UIWindow *nextWindow = [[UIWindow alloc] initWithFrame: keyWindow.bounds];
+    
+    nextWindow.windowScene = keyWindow.windowScene;
+    nextWindow.rootViewController = [[UIViewController alloc] init];
+    nextWindow.backgroundColor = UIColor.clearColor;
+    nextWindow.accessibilityViewIsModal = YES;
+    nextWindow.rootViewController.modalPresentationStyle = UIModalPresentationCustom;
+    
+    [nextWindow makeKeyAndVisible];
+    
+    return nextWindow;
+}
+
 @end

ios/RNTModalView.m

@@ -48,6 +48,8 @@ - (void)removeReactSubview:(UIView *)subview
         [self.mountingHelper unmountIfNeeded];
         [subview removeFromSuperview];
         self.reactSubview = nil;
+        self.modalViewController = nil;
+        self.mountingHelper = nil;
     });
 }