Closes #2743

e2e/ScreenStyle.test.js

@@ -123,4 +123,11 @@ describe('screen style', () => {
     await elementById(testIDs.PROVIDED_ID).tap();
     await expect(elementByLabel('User provided id')).toBeVisible();
   });
+
+  it('stack options should not override component options', async () => {
+    await elementById(testIDs.TAB_BASED_APP_BUTTON).tap();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeNotVisible();
+    await elementById(testIDs.SECOND_TAB_BAR_BUTTON).tap();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
+  });
 });

lib/ios/RNNControllerFactory.m

@@ -97,21 +97,21 @@
 
 - (UIViewController<RNNRootViewProtocol> *)createStack:(RNNLayoutNode*)node {
 	RNNNavigationController* vc = [[RNNNavigationController alloc] init];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
+	NSDictionary* options = node.data[@"options"];
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary* child in node.children) {
 		[controllers addObject:[self fromTree:child]];
 	}
 	[vc setViewControllers:controllers];
-	[vc setOptions:options];
+	[vc mergeOptions:options];
 	
 	return vc;
 }
 
 -(UIViewController<RNNRootViewProtocol> *)createTabs:(RNNLayoutNode*)node {
 	RNNTabBarController* vc = [[RNNTabBarController alloc] init];
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
-	
+	NSDictionary* options = node.data[@"options"];
+
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary *child in node.children) {
 		UIViewController* childVc = (UIViewController*)[self fromTree:child];
@@ -121,7 +121,7 @@
 		[controllers addObject:childVc];
 	}
 	[vc setViewControllers:controllers];
-	[vc setOptions:options];
+	[vc mergeOptions:options];
 	
 	return vc;
 }

lib/ios/RNNNavigationController.m

@@ -16,8 +16,8 @@
 	return rootVC.isAnimated;
 }
 
-- (void)setOptions:(RNNNavigationOptions *)options {
-	((UIViewController<RNNRootViewProtocol>*)self.topViewController).options = options;
+- (void)mergeOptions:(NSDictionary *)options {
+	[((UIViewController<RNNRootViewProtocol>*)self.topViewController) mergeOptions:options];
 }
 
 - (NSString *)componentId {

lib/ios/RNNNavigationOptions.m

@@ -44,7 +44,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 			[options mergeWith:[otherOptions objectForKey:key]];
 		} else {
 			[self setValue:[otherOptions objectForKey:key] forKey:key];
-		}
+		} 
 	}
 }
 

lib/ios/RNNRootViewController.m

@@ -60,6 +60,10 @@
 	[super viewDidLoad];
 }
 
+- (void)mergeOptions:(NSDictionary *)options {
+	[self.options mergeWith:options];
+}
+
 - (void)setCustomNavigationTitleView {
 	if (self.options.topBar.customTitleViewName) {
 		UIView *reactView = [_creator createRootView:self.options.topBar.customTitleViewName rootViewId:self.options.topBar.customTitleViewName];

lib/ios/RNNRootViewProtocol.h

@@ -3,7 +3,7 @@
 @protocol RNNRootViewProtocol <NSObject, UINavigationControllerDelegate>
 
 @optional
-- (void)setOptions:(RNNNavigationOptions*)options;
+- (void)mergeOptions:(NSDictionary*)options;
 
 @required
 

lib/ios/RNNTabBarController.m

@@ -41,8 +41,8 @@
 	return YES;
 }
 
-- (void)setOptions:(RNNNavigationOptions *)options {
-	[((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) setOptions:options];
+- (void)mergeOptions:(NSDictionary *)options {
+	[((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) mergeOptions:options];
 }
 
 - (NSString *)componentId {

playground/src/screens/TextScreen.js

@@ -13,6 +13,9 @@ class TextScreen extends Component {
     return {
       bottomTabs: {
         testID: testIDs.BOTTOM_TABS_ELEMENT
+      },
+      topBar: {
+        testID: testIDs.TOP_BAR_ELEMENT
       }
     };
   }

playground/src/screens/WelcomeScreen.js

@@ -61,6 +61,11 @@ class WelcomeScreen extends Component {
                     passProps: {
                       text: 'This is tab 1',
                       myFunction: () => 'Hello from a function!'
+                    },
+                    options: {
+                      topBar: {
+                        visible: false
+                      }
                     }
                   }
                 }