Skip to content
Merged

V2 rn49 #2411

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion e2e/init.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require('babel-polyfill'); // eslint-disable-line import/no-extraneous-dependencies
const detox = require('detox');
const config = require('../package.json').detox;

Expand Down
4 changes: 4 additions & 0 deletions lib/ios/RNNNavigationOptions.m
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ -(void)applyOn:(UIViewController*)viewController {
navigationBarTitleTextAttributes[NSFontAttributeName] = [UIFont systemFontOfSize:[self.topBar.textFontSize floatValue]];
}
viewController.navigationController.navigationBar.titleTextAttributes = navigationBarTitleTextAttributes;
if (@available(iOS 11.0, *)){
viewController.navigationController.navigationBar.largeTitleTextAttributes = navigationBarTitleTextAttributes;
}

}


Expand Down
8 changes: 8 additions & 0 deletions lib/ios/ReactNativeNavigation.m
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ -(void)onJavaScriptLoaded {
[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
}

-(void)onBridgeWillReload {
UIApplication.sharedApplication.delegate.window.rootViewController = nil;
}

# pragma mark - private

-(void)createBridgeLoadJsAndThenInitDependencyGraph {
Expand All @@ -102,6 +106,10 @@ -(void)registerForJsEvents {
selector:@selector(onJavaScriptWillLoad)
name:RCTJavaScriptWillStartLoadingNotification
object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(onBridgeWillReload)
name:RCTBridgeWillReloadNotification
object:nil];
}

@end
Loading