Adresses #3272

lib/ios/RNNModalManager.m

@@ -22,6 +22,8 @@
 -(void)showModalAfterLoad:(NSDictionary*)notif {
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
 	RNNRootViewController *topVC = (RNNRootViewController*)[self topPresentedVC];
+	topVC.definesPresentationContext = YES;
+	
 	if (topVC.options.animations.showModal.hasCustomAnimation) {
 		self.toVC.transitioningDelegate = topVC;
 	}

lib/ios/RNNNavigationController.m

@@ -8,24 +8,36 @@
 	return self.viewControllers.lastObject.supportedInterfaceOrientations;
 }
 
+- (UIViewController<RNNRootViewProtocol>*)getTopViewController {
+	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController);
+}
+
 - (BOOL)isCustomTransitioned {
 	return NO;
 }
 
 - (BOOL)isCustomViewController {
-	return [((UIViewController<RNNRootViewProtocol>*)self.topViewController) isCustomViewController];
+	return [self.getTopViewController isCustomViewController];
 }
 
 - (void)mergeOptions:(NSDictionary *)options {
-	[((UIViewController<RNNRootViewProtocol>*)self.topViewController) mergeOptions:options];
+	[self.getTopViewController mergeOptions:options];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController).preferredStatusBarStyle;
+	return self.getTopViewController.preferredStatusBarStyle;
+}
+
+- (UIModalPresentationStyle)modalPresentationStyle {
+	return self.getTopViewController.modalPresentationStyle;
+}
+
+- (void)applyModalOptions {
+	[self.getTopViewController applyModalOptions];
 }
 
 - (NSString *)componentId {
-	return _componentId ? _componentId : ((UIViewController<RNNRootViewProtocol>*)self.topViewController).componentId;
+	return _componentId ? _componentId : self.getTopViewController.componentId;
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
@@ -37,7 +49,7 @@
 }
 
 - (RNNNavigationOptions *)options {
-	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController).options;
+	return self.getTopViewController.options;
 }
 
 - (UIViewController *)childViewControllerForStatusBarStyle {

lib/ios/RNNNavigationOptions.m

@@ -31,11 +31,11 @@ RCT_ENUM_CONVERTER(UIModalPresentationStyle,
 @implementation RCTConvert (UIModalTransitionStyle)
 
 RCT_ENUM_CONVERTER(UIModalTransitionStyle,
-                   (@{@"coverVertical": @(UIModalTransitionStyleCoverVertical),
-                      @"flipHorizontal": @(UIModalTransitionStyleFlipHorizontal),
-                      @"crossDissolve": @(UIModalTransitionStyleCrossDissolve),
-                      @"partialCurl": @(UIModalTransitionStylePartialCurl)
-                      }), UIModalTransitionStyleCoverVertical, integerValue)
+				   (@{@"coverVertical": @(UIModalTransitionStyleCoverVertical),
+					  @"flipHorizontal": @(UIModalTransitionStyleFlipHorizontal),
+					  @"crossDissolve": @(UIModalTransitionStyleCrossDissolve),
+					  @"partialCurl": @(UIModalTransitionStylePartialCurl)
+					  }), UIModalTransitionStyleCoverVertical, integerValue)
 
 @end
 
@@ -67,7 +67,7 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 			backgroundImageView = [[UIImageView alloc] initWithFrame:viewController.view.bounds];
 			[viewController.view insertSubview:backgroundImageView atIndex:0];
 		}
-
+		
 		backgroundImageView.layer.masksToBounds = YES;
 		backgroundImageView.image = [self.backgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)self.backgroundImage : [RCTConvert UIImage:self.backgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
@@ -79,22 +79,23 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 			backgroundImageView = [[UIImageView alloc] initWithFrame:viewController.view.bounds];
 			[viewController.navigationController.view insertSubview:backgroundImageView atIndex:0];
 		}
-
+		
 		backgroundImageView.layer.masksToBounds = YES;
 		backgroundImageView.image = [self.rootBackgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)self.rootBackgroundImage : [RCTConvert UIImage:self.rootBackgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
-    
-    [self applyModalOptions:viewController];
+	
+	[self applyModalOptions:viewController];
 }
 
 - (void)applyModalOptions:(UIViewController*)viewController {
-    if (self.modalPresentationStyle) {
-        viewController.modalPresentationStyle = [RCTConvert UIModalPresentationStyle:self.modalPresentationStyle];
-    }
-    if (self.modalTransitionStyle) {
-        viewController.modalTransitionStyle = [RCTConvert UIModalTransitionStyle:self.modalTransitionStyle];
-    }
+	if (self.modalPresentationStyle) {
+		viewController.modalPresentationStyle = [RCTConvert UIModalPresentationStyle:self.modalPresentationStyle];
+		[viewController.view setBackgroundColor:[UIColor clearColor]];
+	}
+	if (self.modalTransitionStyle) {
+		viewController.modalTransitionStyle = [RCTConvert UIModalTransitionStyle:self.modalTransitionStyle];
+	}
 }
 
 

lib/ios/RNNRootViewController.m

@@ -37,7 +37,7 @@
 	if (!self.isExternalComponent) {
 		self.view = [creator createRootView:self.componentName rootViewId:self.componentId];
 	}
-
+	
 	[[NSNotificationCenter defaultCenter] addObserver:self
 											 selector:@selector(onJsReload)
 												 name:RCTJavaScriptWillStartLoadingNotification
@@ -81,7 +81,8 @@
 }
 
 - (void)applyModalOptions {
-    [self.options applyModalOptions:self];
+	[self.options applyOn:self];
+	[self.options applyModalOptions:self];
 }
 
 - (void)mergeOptions:(NSDictionary *)options {
@@ -100,12 +101,12 @@
 		} if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]] && !_customTitleView) {
 			self.navigationItem.title = nil;
 		}
-    } else if (_customTitleView && _customTitleView.superview == nil) {
-        if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]] && !_customTitleView) {
-            self.navigationItem.title = nil;
-        }
-        self.navigationItem.titleView = _customTitleView;
-    }
+	} else if (_customTitleView && _customTitleView.superview == nil) {
+		if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]] && !_customTitleView) {
+			self.navigationItem.title = nil;
+		}
+		self.navigationItem.titleView = _customTitleView;
+	}
 }
 
 - (void)setCustomNavigationBarView {
@@ -120,12 +121,12 @@
 		} else if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]] && !_customTopBar) {
 			[[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
 		}
-    } else if (_customTopBar && _customTopBar.superview == nil) {
-        if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]] && !_customTopBar) {
-            [[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
-        }
-        [self.navigationController.navigationBar addSubview:_customTopBar];
-    }
+	} else if (_customTopBar && _customTopBar.superview == nil) {
+		if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]] && !_customTopBar) {
+			[[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
+		}
+		[self.navigationController.navigationBar addSubview:_customTopBar];
+	}
 }
 
 - (void)setCustomNavigationComponentBackground {
@@ -140,13 +141,13 @@
 			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
 			self.navigationController.navigationBar.clipsToBounds = NO;
 		}
-    } if (_customTopBarBackground && _customTopBarBackground.superview == nil) {
-        if ([[self.navigationController.navigationBar.subviews objectAtIndex:1] isKindOfClass:[RNNCustomTitleView class]]) {
-            [[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
-        }
-        [self.navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
-        self.navigationController.navigationBar.clipsToBounds = YES;
-    }
+	} if (_customTopBarBackground && _customTopBarBackground.superview == nil) {
+		if ([[self.navigationController.navigationBar.subviews objectAtIndex:1] isKindOfClass:[RNNCustomTitleView class]]) {
+			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
+		}
+		[self.navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
+		self.navigationController.navigationBar.clipsToBounds = YES;
+	}
 }
 
 -(BOOL)isCustomTransitioned {
@@ -163,7 +164,7 @@
 	} else if ([self.options.statusBar.hideWithTopBar boolValue]) {
 		return self.navigationController.isNavigationBarHidden;
 	}
-
+	
 	return NO;
 }
 
@@ -198,17 +199,17 @@
 								  animationControllerForOperation:(UINavigationControllerOperation)operation
 											   fromViewController:(UIViewController*)fromVC
 												 toViewController:(UIViewController*)toVC {
-{
-	if (self.animator) {
-		return self.animator;
-	} else if (operation == UINavigationControllerOperationPush && self.options.animations.push.hasCustomAnimation) {
-		return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.push];
-	} else if (operation == UINavigationControllerOperationPop && self.options.animations.pop.hasCustomAnimation) {
-		return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.pop];
-	} else {
-		return nil;
+	{
+		if (self.animator) {
+			return self.animator;
+		} else if (operation == UINavigationControllerOperationPush && self.options.animations.push.hasCustomAnimation) {
+			return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.push];
+		} else if (operation == UINavigationControllerOperationPop && self.options.animations.pop.hasCustomAnimation) {
+			return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.pop];
+		} else {
+			return nil;
+		}
 	}
-}
 	return nil;
 }
 
@@ -242,9 +243,9 @@
 	if (self.previewController) {
 		RNNRootViewController * vc = (RNNRootViewController*) self.previewController;
 		[_eventEmitter sendOnNavigationEvent:@"previewContext" params:@{
-																   @"previewComponentId": vc.componentId,
-																   @"componentId": self.componentId
-																   }];
+																		@"previewComponentId": vc.componentId,
+																		@"componentId": self.componentId
+																		}];
 	}
 	return self.previewController;
 }
@@ -253,9 +254,9 @@
 - (void)previewingContext:(id<UIViewControllerPreviewing>)previewingContext commitViewController:(UIViewController *)viewControllerToCommit {
 	RNNRootViewController * vc = (RNNRootViewController*) self.previewController;
 	NSDictionary * params = @{
-						  @"previewComponentId": vc.componentId,
-						  @"componentId": self.componentId
-						  };
+							  @"previewComponentId": vc.componentId,
+							  @"componentId": self.componentId
+							  };
 	if (vc.options.preview.commit) {
 		[_eventEmitter sendOnNavigationEvent:@"previewCommit" params:params];
 		[self.navigationController pushViewController:vc animated:false];
@@ -273,7 +274,7 @@
 	NSString *actionTitle = action[@"title"];
 	UIPreviewActionStyle actionStyle = UIPreviewActionStyleDefault;
 	if ([action[@"style"] isEqualToString:@"selected"]) {
-	   	actionStyle = UIPreviewActionStyleSelected;
+		actionStyle = UIPreviewActionStyleSelected;
 	} else if ([action[@"style"] isEqualToString:@"destructive"]) {
 		actionStyle = UIPreviewActionStyleDestructive;
 	}
@@ -288,16 +289,16 @@
 	for (NSDictionary *previewAction in self.options.preview.actions) {
 		UIPreviewAction *action = [self convertAction:previewAction];
 		NSDictionary *actionActions = previewAction[@"actions"];
-	    if (actionActions.count > 0) {
+		if (actionActions.count > 0) {
 			NSMutableArray *group = [[NSMutableArray alloc] init];
-	     	for (NSDictionary *previewGroupAction in actionActions) {
-	        	[group addObject:[self convertAction:previewGroupAction]];
-	      	}
-	      	UIPreviewActionGroup *actionGroup = [UIPreviewActionGroup actionGroupWithTitle:action.title style:UIPreviewActionStyleDefault actions:group];
-	      	[actions addObject:actionGroup];
+			for (NSDictionary *previewGroupAction in actionActions) {
+				[group addObject:[self convertAction:previewGroupAction]];
+			}
+			UIPreviewActionGroup *actionGroup = [UIPreviewActionGroup actionGroupWithTitle:action.title style:UIPreviewActionStyleDefault actions:group];
+			[actions addObject:actionGroup];
 		} else {
-	    	[actions addObject:action];
-	    }
+			[actions addObject:action];
+		}
 	}
 	return actions;
 }