V2 default options (#2489)

* default options support
* refactored navigation options

e2e/ScreenStyle.test.js

@@ -110,4 +110,20 @@ describe('screen style', () => {
     await expect(elementById(testIDs.FIRST_TAB_BAR_BUTTON)).toBeVisible();
     await expect(elementById(testIDs.SECOND_TAB_BAR_BUTTON)).toBeVisible();
   });
+
+  it('default options should apply to all screens in stack', async () => {
+    await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
+    await elementById(testIDs.PUSH_DEFAULT_OPTIONS_BUTTON).tap();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeNotVisible();
+    await elementById(testIDs.PUSH_BUTTON).tap();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeNotVisible();
+  });
+
+  it('default options should not override static options', async () => {
+    await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
+    await elementById(testIDs.PUSH_DEFAULT_OPTIONS_BUTTON).tap();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeNotVisible();
+    await elementById(testIDs.POP_BUTTON).tap();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
+  });
 });

lib/ios/RNNBridgeModule.m

@@ -30,6 +30,12 @@ RCT_EXPORT_METHOD(setOptions:(NSString*)componentId options:(NSDictionary*)optio
 	}];
 }
 
+RCT_EXPORT_METHOD(setDefaultOptions:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler setDefaultOptions:options completion:^{
+		resolve(nil);
+	}];
+}
+
 RCT_EXPORT_METHOD(push:(NSString*)componentId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
 	[_commandsHandler push:componentId layout:layout completion:^{
 		resolve(componentId);

lib/ios/RNNCommandsHandler.h

@@ -12,6 +12,8 @@
 
 -(void) setOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 
+-(void) setDefaultOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
+
 -(void) push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 
 -(void) pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;

lib/ios/RNNCommandsHandler.m

@@ -51,6 +51,12 @@
 	}
 }
 
+-(void) setDefaultOptions:(NSDictionary*)optionsDict completion:(RNNTransitionCompletionBlock)completion {
+	[self assertReady];
+	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:optionsDict];
+	[_controllerFactory setDefaultOptions:options];
+}
+
 -(void) push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	

lib/ios/RNNControllerFactory.h

@@ -15,4 +15,6 @@
 
 -(UIViewController<RNNRootViewProtocol> *)createLayoutAndSaveToStore:(NSDictionary*)layout;
 
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
+
 @end

lib/ios/RNNControllerFactory.m

@@ -89,6 +89,7 @@
 	NSDictionary* customTransition = node.data[@"customTransition"];
 	RNNAnimator* animator = [[RNNAnimator alloc] initWithAnimationsDictionary:customTransition];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
+	options.defaultOptions = _defaultOptions;
 	NSString* componentId = node.nodeId;
 	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter animator:animator];
 	CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;

lib/ios/RNNNavigationOptions.h

@@ -19,6 +19,8 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNTopTabOptions* topTab;
 @property (nonatomic, strong) RNNSideMenuOptions* sideMenu;
 
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
+
 @property (nonatomic, strong) NSNumber* statusBarHidden;
 @property (nonatomic, strong) NSNumber* screenBackgroundColor;
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;

lib/ios/RNNNavigationOptions.m

@@ -46,12 +46,17 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 }
 
 -(void)applyOn:(UIViewController*)viewController {
+	[_defaultOptions applyOn:viewController];
+	
 	[self.topBar applyOn:viewController];
 	[self.bottomTabs applyOn:viewController];
 	[self.topTab applyOn:viewController];
 	[self.bottomTab applyOn:viewController];
 	[self.sideMenu applyOn:viewController];
-	
+	[self applyOtherOptionsOn:viewController];
+}
+
+- (void)applyOtherOptionsOn:(UIViewController*)viewController {
 	if (self.popGesture) {
 		viewController.navigationController.interactivePopGestureRecognizer.enabled = [self.popGesture boolValue];
 	}

lib/ios/RNNOptions.h

@@ -1,17 +1,21 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <React/RCTConvert.h>
+
+@class RNNOptions;
+
 @protocol RNNOptionsProtocol <NSObject>
 
 @optional
--(void)resetOptions;
--(void)applyOn:(UIViewController*)viewController;
+- (void)resetOptions;
+- (void)applyOn:(UIViewController *)viewController;
 
 @end
 
 @interface RNNOptions : NSObject <RNNOptionsProtocol>
 
--(instancetype)initWithDict:(NSDictionary*)dict;
--(void)mergeWith:(NSDictionary*)otherOptions;
+- (instancetype)initWithDict:(NSDictionary*)dict;
+- (void)mergeWith:(NSDictionary*)otherOptions;
+- (void)applyOn:(UIViewController *)viewController defaultOptions:(RNNOptions*)defaultOptions;
 
 @end

lib/ios/RNNOptions.m

@@ -9,6 +9,11 @@
 	return self;
 }
 
+- (void)applyOn:(UIViewController *)viewController defaultOptions:(RNNOptions *)defaultOptions {
+	[defaultOptions applyOn:viewController];
+	[self applyOn:viewController];
+}
+
 -(void)mergeWith:(NSDictionary *)otherOptions {
 	for (id key in otherOptions) {
 		[self setValue:[otherOptions objectForKey:key] forKey:key];

playground/src/screens/OptionsScreen.js

@@ -48,6 +48,7 @@ class OptionsScreen extends Component {
     this.onClickTopBarTransparent = this.onClickTopBarTransparent.bind(this);
     this.onClickTopBarOpaque = this.onClickTopBarOpaque.bind(this);
     this.onClickCustomTranstition = this.onClickCustomTranstition.bind(this);
+    this.onClickPushDefaultOptionsScreen = this.onClickPushDefaultOptionsScreen.bind(this);
   }
 
   render() {
@@ -63,7 +64,8 @@ class OptionsScreen extends Component {
         <Button title="Custom Transition" onPress={this.onClickCustomTranstition} />
         <Button title="Show custom alert" testID={testIDs.SHOW_CUSTOM_ALERT_BUTTON} onPress={this.onClickAlert} />
         <Button title="Show snackbar" testID={testIDs.SHOW_SNACKBAR_BUTTON} onPress={this.onClickSnackbar} />
-        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
+        <Button title="Push Default Options Screen" testID={testIDs.PUSH_DEFAULT_OPTIONS_BUTTON} onPress={this.onClickPushDefaultOptionsScreen} />
+        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
       </View>
     );
   }
@@ -187,6 +189,20 @@ class OptionsScreen extends Component {
       }
     });
   }
+
+  onClickPushDefaultOptionsScreen() {
+    Navigation.setDefaultOptions({
+      topBar: {
+        hidden: true
+      }
+    });
+
+    Navigation.push(this.props.componentId, {
+      component: {
+        name: 'navigation.playground.PushedScreen'
+      }
+    });
+  }
 }
 
 const styles = {

playground/src/screens/PushedScreen.js

@@ -9,6 +9,14 @@ const Navigation = require('react-native-navigation');
 const testIDs = require('../testIDs');
 
 class PushedScreen extends Component {
+  static get navigationOptions() {
+    return {
+      topBar: {
+        testID: testIDs.TOP_BAR_ELEMENT
+      }
+    };
+  }
+
   constructor(props) {
     super(props);
     this.onClickPush = this.onClickPush.bind(this);

playground/src/testIDs.js

@@ -7,6 +7,7 @@ module.exports = {
   PUSH_LIFECYCLE_BUTTON: `PUSH_LIFECYCLE_BUTTON`,
   PUSH_BUTTON: `PUSH_BUTTON`,
   PUSH_OPTIONS_BUTTON: `PUSH_OPTIONS_BUTTON`,
+  PUSH_DEFAULT_OPTIONS_BUTTON: `PUSH_DEFAULT_OPTIONS_BUTTON`,
   BACK_HANDLER_BUTTON: `BACK_HANDLER_BUTTON`,
   SHOW_MODAL_BUTTON: `SHOW_MODAL_BUTTON`,
   SHOW_REDBOX_BUTTON: `SHOW_REDBOX_BUTTON`,