modalPresentationStyle support

docs/docs/styling.md

@@ -65,6 +65,7 @@ Navigation.mergeOptions(this.props.componentId, {
   popGesture: true,
   backgroundImage: require('background.png'),
   rootBackgroundImage: require('rootBackground.png'),
+  modalPresentationStyle: 'formSheet', // Supported styles are: 'formSheet', 'pageSheet', 'overFullScreen', 'overCurrentContext', 'currentContext', 'popOver', 'fullScreen' and 'none'.
   topBar: {
     visible: true,
     leftButtons: [{

lib/ios/RNNNavigationOptions.h

@@ -35,8 +35,9 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) NSNumber* statusBarHideWithTopBar;
 @property (nonatomic, strong) NSString* statusBarStyle;
 @property (nonatomic, strong) NSNumber* popGesture;
-@property (nonatomic, strong) UIImage* backgroundImage;
-@property (nonatomic, strong) UIImage* rootBackgroundImage;
+@property (nonatomic, strong) NSDictionary* backgroundImage;
+@property (nonatomic, strong) NSDictionary* rootBackgroundImage;
+@property (nonatomic, strong) NSString* modalPresentationStyle;
 
 - (UIInterfaceOrientationMask)supportedOrientations;
 

lib/ios/RNNNavigationOptions.m

@@ -11,46 +11,24 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 const NSInteger BLUR_TOPBAR_TAG = 78264802;
 const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 
-@implementation RNNNavigationOptions
+@implementation RCTConvert (UIModalPresentationStyle)
 
--(instancetype)init {
-	return [self initWithDict:@{}];
-}
+RCT_ENUM_CONVERTER(UIModalPresentationStyle,
+				   (@{@"fullScreen": @(UIModalPresentationFullScreen),
+					  @"pageSheet": @(UIModalPresentationPageSheet),
+					  @"formSheet": @(UIModalPresentationFormSheet),
+					  @"currentContext": @(UIModalPresentationCurrentContext),
+					  @"custom": @(UIModalPresentationCustom),
+					  @"overFullScreen": @(UIModalPresentationOverFullScreen),
+					  @"overCurrentContext": @(UIModalPresentationOverCurrentContext),
+					  @"popover": @(UIModalPresentationPopover),
+					  @"none": @(UIModalPresentationNone)
+					  }), UIModalPresentationFullScreen, integerValue)
 
--(instancetype)initWithDict:(NSDictionary *)options {
-	self = [super init];
-	self.statusBarHidden = [options objectForKey:@"statusBarHidden"];
-	self.statusBarBlur = [options objectForKey:@"statusBarBlur"];
-	self.statusBarStyle = [options objectForKey:@"statusBarStyle"];
-	self.screenBackgroundColor = [options objectForKey:@"screenBackgroundColor"];
-	self.backButtonTransition = [options objectForKey:@"backButtonTransition"];
-	self.orientation = [options objectForKey:@"orientation"];
-	self.topBar = [[RNNTopBarOptions alloc] initWithDict:[options objectForKey:@"topBar"]];
-	self.topTab = [[RNNTopTabOptions alloc] initWithDict:[options objectForKey:@"topTab"]];
-	self.bottomTabs = [[RNNBottomTabsOptions alloc] initWithDict:[options objectForKey:@"bottomTabs"]];
-	self.sideMenu = [[RNNSideMenuOptions alloc] initWithDict:[options objectForKey:@"sideMenu"]];
-	self.backgroundImage = [RCTConvert UIImage:[options objectForKey:@"backgroundImage"]];
-	self.rootBackgroundImage = [RCTConvert UIImage:[options objectForKey:@"rootBackgroundImage"]];
-	self.bottomTab = [[RNNBottomTabOptions alloc] initWithDict:[options objectForKey:@"bottomTab"]];
-	self.overlay = [[RNNOverlayOptions alloc] initWithDict:[options objectForKey:@"overlay"]];
-	self.customTransition = [[RNNAnimationOptions alloc] initWithDict:[options objectForKey:@"customTransition"]];
-	self.animations = [[RNNTransitionsOptions alloc] initWithDict:[options objectForKey:@"animations"]];
+@end
 
-	return self;
-}
+@implementation RNNNavigationOptions
 
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		if ([self hasProperty:key]) {
-			if ([[self valueForKey:key] isKindOfClass:[RNNOptions class]]) {
-				RNNOptions* options = [self valueForKey:key];
-				[options mergeWith:[otherOptions objectForKey:key]];
-			} else {
-				[self setValue:[otherOptions objectForKey:key] forKey:key];
-			}
-		}
-	}
-}
 
 -(void)applyOn:(UIViewController<RNNRootViewProtocol> *)viewController {
 	[self.topBar applyOn:viewController];
@@ -98,7 +76,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 		}
 		
 		backgroundImageView.layer.masksToBounds = YES;
-		backgroundImageView.image = self.backgroundImage;
+		backgroundImageView.image = [RCTConvert UIImage:self.backgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
 	
@@ -110,9 +88,13 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 		}
 		
 		backgroundImageView.layer.masksToBounds = YES;
-		backgroundImageView.image = self.rootBackgroundImage;
+		backgroundImageView.image = [RCTConvert UIImage:self.rootBackgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
+	
+	if (self.modalPresentationStyle) {
+		viewController.modalPresentationStyle = [RCTConvert UIModalPresentationStyle:self.modalPresentationStyle];
+	}
 }
 
 - (UIInterfaceOrientationMask)supportedOrientations {

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -62,7 +62,7 @@
 }
 
 -(void)testDynamicStylesMergeWithStaticStyles {
-	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] init];
+	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
 	initialOptions.topBar.title.text = @"the title";
 	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithName:@"name"
 																withOptions:initialOptions
@@ -77,7 +77,7 @@
 	[self.store setReadyToReceiveCommands:true];
 	[self.store setComponent:vc componentId:@"componentId"];
 	
-	NSDictionary* dictFromJs = @{@"topBar": @{@"backgroundColor" :@(0xFFFF0000)}};
+	NSDictionary* dictFromJs = @{@"topBar": @{@"background" : @{@"color" : @(0xFFFF0000)}}};
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 
 	[self.uut mergeOptions:@"componentId" options:dictFromJs completion:^{