Closes #2621

lib/ios/RNNControllerFactory.m

@@ -96,8 +96,7 @@
 
 - (UIViewController<RNNRootViewProtocol> *)createComponent:(RNNLayoutNode*)node {
 	NSString* name = node.data[@"name"];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:_defaultOptionsDict];
-	[options mergeWith:node.data[@"options"]];
+	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
 
 	NSString* componentId = node.nodeId;
 	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:NO];
@@ -113,8 +112,7 @@
 	NSDictionary* props = node.data[@"passProps"];
 	
 	UIViewController* externalVC = [_store getExternalComponent:name props:props bridge:_bridge];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:_defaultOptionsDict];
-	[options mergeWith:node.data[@"options"]];
+	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
 	
 	NSString* componentId = node.nodeId;
 	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:YES];
@@ -130,7 +128,7 @@
 - (UIViewController<RNNRootViewProtocol> *)createStack:(RNNLayoutNode*)node {
 	RNNNavigationController* vc = [[RNNNavigationController alloc] init];
 	[vc setComponentId:node.nodeId];
-	NSDictionary* options = node.data[@"options"];
+	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary* child in node.children) {
 		[controllers addObject:[self fromTree:child]];
@@ -143,7 +141,7 @@
 
 -(UIViewController<RNNRootViewProtocol> *)createTabs:(RNNLayoutNode*)node {
 	RNNTabBarController* vc = [[RNNTabBarController alloc] initWithEventEmitter:_eventEmitter];
-	NSDictionary* options = node.data[@"options"];
+	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
 
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary *child in node.children) {
@@ -178,18 +176,18 @@
 - (UIViewController<RNNRootViewProtocol> *)createSideMenu:(RNNLayoutNode*)node {
 	NSMutableArray* childrenVCs = [NSMutableArray new];
 	
-	
 	for (NSDictionary *child in node.children) {
 		UIViewController *vc = [self fromTree:child];
 		[childrenVCs addObject:vc];
 	}
 	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithControllers:childrenVCs];
+	[sideMenu mergeOptions:[self createOptions:node.data[@"options"]]];
 	return sideMenu;
 }
 
 
 - (UIViewController<RNNRootViewProtocol> *)createSideMenuChild:(RNNLayoutNode*)node type:(RNNSideMenuChildType)type {
-	UIViewController* child = (UIViewController*)[self fromTree:node.children[0]];
+	UIViewController<RNNRootViewProtocol>* child = [self fromTree:node.children[0]];
 	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithChild: child type:type];
 	
 	return sideMenuChild;
@@ -234,4 +232,10 @@
 	return svc;
 }
 
+- (RNNNavigationOptions *)createOptions:(NSDictionary *)optionsDict {
+	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:_defaultOptionsDict];
+	[options mergeWith:optionsDict];
+	return options;
+}
+
 @end

lib/ios/RNNNavigationController.m

@@ -20,7 +20,7 @@
 	return [self.getTopViewController isCustomViewController];
 }
 
-- (void)mergeOptions:(NSDictionary *)options {
+- (void)mergeOptions:(RNNOptions *)options {
 	[self.getTopViewController mergeOptions:options];
 }
 

lib/ios/RNNOptions.h

@@ -16,8 +16,9 @@
 
 - (instancetype)initWithDict:(NSDictionary*)dict;
 - (void)mergeWith:(NSDictionary*)otherOptions;
-- (void)mergeIfEmptyWith:(NSDictionary*)otherOptions;
 - (void)applyOn:(UIViewController *)viewController defaultOptions:(RNNOptions*)defaultOptions;
 - (BOOL)hasProperty:(NSString*)propName;
+- (void)mergeOptions:(RNNOptions *)otherOptions;
+- (void)mergeOptions:(RNNOptions *)otherOptions overrideOptions:(BOOL)override;
 
 @end

lib/ios/RNNOptions.m

@@ -30,19 +30,21 @@
 	}
 }
 
--(void)mergeIfEmptyWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		if ([self hasProperty:key]) {
-			if ([[self valueForKey:key] isKindOfClass:[RNNOptions class]]) {
-				RNNOptions* options = [self valueForKey:key];
-				[options mergeIfEmptyWith:[otherOptions objectForKey:key]];
-			} else if (![self valueForKey:key]) {
-				[self setValue:[otherOptions objectForKey:key] forKey:key];
-			}
+- (void)mergeOptions:(RNNOptions *)otherOptions overrideOptions:(BOOL)override {
+	for (id prop in [self objectProperties:otherOptions]) {
+		id value = [otherOptions valueForKey:prop];
+		if ([value isKindOfClass:[RNNOptions class]]) {
+			[[self valueForKey:prop] mergeOptions:value overrideOptions:override];
+		} else if (value && (override || ![self valueForKey:prop])) {
+			[self setValue:value forKey:prop];
 		}
 	}
 }
 
+- (void)mergeOptions:(RNNOptions *)otherOptions {
+	[self mergeOptions:otherOptions overrideOptions:YES];
+}
+
 - (BOOL)hasProperty:(NSString*)propName {
 	return [self respondsToSelector:NSSelectorFromString(propName)];
 }
@@ -71,4 +73,18 @@
 	free(props);
 }
 
+- (NSArray *)objectProperties:(NSObject *)object {
+	NSMutableArray* properties = [NSMutableArray new];
+	unsigned int count;
+	objc_property_t* props = class_copyPropertyList([object class], &count);
+	for (int i = 0; i < count; i++) {
+		objc_property_t property = props[i];
+		NSString *propertyName = [NSString stringWithCString:property_getName(property) encoding:NSUTF8StringEncoding];
+		[properties addObject:propertyName];
+	}
+	
+	free(props);
+	return properties;
+}
+
 @end

lib/ios/RNNRootViewController.m

@@ -124,8 +124,8 @@
 	[self.options applyModalOptions:self];
 }
 
-- (void)mergeOptions:(NSDictionary *)options {
-	[self.options mergeIfEmptyWith:options];
+- (void)mergeOptions:(RNNOptions *)options {
+	[self.options mergeOptions:options overrideOptions:NO];
 }
 
 - (void)setCustomNavigationTitleView {

lib/ios/RNNRootViewProtocol.h

@@ -3,7 +3,7 @@
 @protocol RNNRootViewProtocol <NSObject, UINavigationControllerDelegate, UIViewControllerTransitioningDelegate, UISplitViewControllerDelegate>
 
 @optional
-- (void)mergeOptions:(NSDictionary*)options;
+- (void)mergeOptions:(RNNOptions*)options;
 - (BOOL)isCustomViewController;
 - (void)performOnRotation:(void (^)(void))block;
 - (void)optionsUpdated;

lib/ios/RNNSideMenuChildVC.h

@@ -19,8 +19,8 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 @interface RNNSideMenuChildVC : UIViewController <RNNRootViewProtocol>
 
 @property (readonly) RNNSideMenuChildType type;
-@property (readonly) UIViewController *child;
+@property (readonly) UIViewController<RNNRootViewProtocol> *child;
 
--(instancetype) initWithChild:(UIViewController*)child type:(RNNSideMenuChildType)type;
+-(instancetype) initWithChild:(UIViewController<RNNRootViewProtocol>*)child type:(RNNSideMenuChildType)type;
 
 @end

lib/ios/RNNSideMenuChildVC.m

@@ -31,6 +31,10 @@
 	return self;
 }
 
+- (void)mergeOptions:(RNNOptions *)options {
+	[self.child mergeOptions:options];
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return self.child.preferredStatusBarStyle;
 }

lib/ios/RNNSideMenuController.m

@@ -89,6 +89,10 @@
 	}
 }
 
+- (void)mergeOptions:(RNNOptions *)options {
+	[self.center mergeOptions:options];
+}
+
 - (NSString *)componentId {
 	return _center.componentId;
 }

lib/ios/RNNSideMenuOptions.h

@@ -1,10 +1,9 @@
 #import "RNNOptions.h"
+#import "RNNSideMenuSideOptions.h"
 
 @interface RNNSideMenuOptions : RNNOptions
 
-@property (nonatomic, strong) NSNumber* leftSideVisible;
-@property (nonatomic, strong) NSNumber* rightSideVisible;
-@property (nonatomic, strong) NSNumber* rightSideEnabled;
-@property (nonatomic, strong) NSNumber* leftSideEnabled;
+@property (nonatomic, strong) RNNSideMenuSideOptions* left;
+@property (nonatomic, strong) RNNSideMenuSideOptions* right;
 
 @end

lib/ios/RNNSideMenuOptions.m

@@ -4,48 +4,8 @@
 @implementation RNNSideMenuOptions
 
 - (void)applyOn:(UIViewController *)viewController {
-	RNNSideMenuController* sideMenuController = (RNNSideMenuController*)UIApplication.sharedApplication.delegate.window.rootViewController;
-	if ([sideMenuController isKindOfClass:[RNNSideMenuController class]]) {
-		if (self.leftSideVisible) {
-			if (self.leftSideVisible.boolValue) {
-				[sideMenuController showSideMenu:MMDrawerSideLeft animated:YES];
-			} else {
-				[sideMenuController hideSideMenu:MMDrawerSideLeft animated:YES];
-			}
-		}
-		
-		if (self.rightSideVisible) {
-			if (self.rightSideVisible.boolValue) {
-				[sideMenuController showSideMenu:MMDrawerSideRight animated:YES];
-			} else {
-				[sideMenuController hideSideMenu:MMDrawerSideRight animated:YES];
-			}
-		}
-		
-		if (self.leftSideEnabled) {
-			sideMenuController.sideMenu.leftSideEnabled = [self.leftSideEnabled boolValue];
-		}
-		
-		if (self.rightSideEnabled) {
-			sideMenuController.sideMenu.rightSideEnabled = [self.rightSideEnabled boolValue];
-		}
-		
-		[self resetOptions];
-	}
-}
-
--(void)mergeWith:(NSDictionary *)otherOptions {
-	self.leftSideVisible = [[otherOptions valueForKey:@"left"] valueForKey:@"visible"];
-	self.rightSideVisible = [[otherOptions valueForKey:@"right"] valueForKey:@"visible"];
-	self.leftSideEnabled = [[otherOptions valueForKey:@"left"] valueForKey:@"enabled"];
-	self.rightSideEnabled = [[otherOptions valueForKey:@"right"] valueForKey:@"enabled"];
-}
-
--(void)resetOptions {
-	self.leftSideVisible = nil;
-	self.rightSideVisible = nil;
-	self.leftSideEnabled = nil;
-	self.rightSideEnabled = nil;
+	[self.left applyOnSide:MMDrawerSideLeft viewController:viewController];
+	[self.right applyOnSide:MMDrawerSideRight viewController:viewController];
 }
 
 @end

lib/ios/RNNSideMenuSideOptions.h

@@ -0,0 +1,11 @@
+#import "RNNOptions.h"
+#import "MMDrawerController.h"
+
+@interface RNNSideMenuSideOptions : RNNOptions
+
+- (void)applyOnSide:(MMDrawerSide)side viewController:(UIViewController *)viewController;
+
+@property (nonatomic, strong) NSNumber* visible;
+@property (nonatomic, strong) NSNumber* enabled;
+
+@end

lib/ios/RNNSideMenuSideOptions.m

@@ -0,0 +1,36 @@
+#import "RNNSideMenuSideOptions.h"
+#import "RNNSideMenuController.h"
+
+@implementation RNNSideMenuSideOptions
+
+- (void)applyOnSide:(MMDrawerSide)side viewController:(UIViewController *)viewController {
+	RNNSideMenuController* sideMenuController = (RNNSideMenuController*)UIApplication.sharedApplication.delegate.window.rootViewController;
+	if (self.enabled) {
+		switch (side) {
+			case MMDrawerSideRight:
+				sideMenuController.sideMenu.rightSideEnabled = [self.enabled boolValue];
+				break;
+			case MMDrawerSideLeft:
+				sideMenuController.sideMenu.leftSideEnabled = [self.enabled boolValue];
+			default:
+				break;
+		}
+	}
+	
+	if (self.visible) {
+		if (self.visible.boolValue) {
+			[sideMenuController showSideMenu:side animated:YES];
+		} else {
+			[sideMenuController hideSideMenu:side animated:YES];
+		}
+	}
+	
+	[self resetOptions];
+}
+
+- (void)resetOptions {
+	self.visible = nil;
+	self.enabled = nil;
+}
+
+@end

lib/ios/RNNSplitViewController.m

@@ -33,8 +33,8 @@
 - (void)optionsUpdated {
 }
 
-- (void)mergeOptions:(NSDictionary *)options {
-	[self.options mergeIfEmptyWith:options];
+- (void)mergeOptions:(RNNOptions *)options {
+	[self.options mergeOptions:options];
 }
 
 @end

lib/ios/RNNTabBarController.m

@@ -41,7 +41,7 @@
 	}
 }
 
-- (void)mergeOptions:(NSDictionary *)options {
+- (void)mergeOptions:(RNNOptions *)options {
 	[((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) mergeOptions:options];
 }
 

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -89,6 +89,8 @@
 		50570B272061473D006A1B5C /* RNNTitleOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50570B252061473D006A1B5C /* RNNTitleOptions.m */; };
 		50570BEA2063E09B006A1B5C /* RNNTitleViewHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */; };
 		50570BEB2063E09B006A1B5C /* RNNTitleViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */; };
+		5064495D20DC62B90026709C /* RNNSideMenuSideOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5064495B20DC62B90026709C /* RNNSideMenuSideOptions.h */; };
+		5064495E20DC62B90026709C /* RNNSideMenuSideOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5064495C20DC62B90026709C /* RNNSideMenuSideOptions.m */; };
 		506A2B1420973DFD00F43A95 /* RNNErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */; };
 		506A2B1520973DFD00F43A95 /* RNNErrorHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */; };
 		50762D08205E96C200E3D18A /* RNNModalAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 50762D06205E96C200E3D18A /* RNNModalAnimation.h */; };
@@ -301,6 +303,8 @@
 		50570B252061473D006A1B5C /* RNNTitleOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTitleOptions.m; sourceTree = "<group>"; };
 		50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTitleViewHelper.h; sourceTree = "<group>"; };
 		50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTitleViewHelper.m; sourceTree = "<group>"; };
+		5064495B20DC62B90026709C /* RNNSideMenuSideOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuSideOptions.h; sourceTree = "<group>"; };
+		5064495C20DC62B90026709C /* RNNSideMenuSideOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuSideOptions.m; sourceTree = "<group>"; };
 		506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNErrorHandler.h; sourceTree = "<group>"; };
 		506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNErrorHandler.m; sourceTree = "<group>"; };
 		50762D06205E96C200E3D18A /* RNNModalAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNModalAnimation.h; sourceTree = "<group>"; };
@@ -564,6 +568,8 @@
 				504AFE731FFFF0540076E904 /* RNNTopTabsOptions.m */,
 				50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */,
 				50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */,
+				5064495B20DC62B90026709C /* RNNSideMenuSideOptions.h */,
+				5064495C20DC62B90026709C /* RNNSideMenuSideOptions.m */,
 				50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */,
 				50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */,
 				507E7D55201DDD3000444E6C /* RNNAnimationOptions.h */,
@@ -802,6 +808,7 @@
 				50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */,
 				7B4928081E70415400555040 /* RNNCommandsHandler.h in Headers */,
 				263905AE1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h in Headers */,
+				5064495D20DC62B90026709C /* RNNSideMenuSideOptions.h in Headers */,
 				50F5DFC11F407A8C001A00BC /* RNNTabBarController.h in Headers */,
 				50CB3B691FDE911400AA153B /* RNNSideMenuOptions.h in Headers */,
 				263905BD1E4C6F440023D7D3 /* RCCDrawerProtocol.h in Headers */,
@@ -1022,6 +1029,7 @@
 				50EB4ED82068EBE000D6ED34 /* RNNBackgroundOptions.m in Sources */,
 				507F43CA1FF4F9CC00D9425B /* RNNTopTabOptions.m in Sources */,
 				26916C991E4B9E7700D13680 /* RNNReactRootViewCreator.m in Sources */,
+				5064495E20DC62B90026709C /* RNNSideMenuSideOptions.m in Sources */,
 				214545251F4DC125006E8DA1 /* RNNUIBarButtonItem.m in Sources */,
 				263905B81E4C6F440023D7D3 /* UIViewController+MMDrawerController.m in Sources */,
 				263905CD1E4C6F440023D7D3 /* SidebarWunderlistAnimation.m in Sources */,