Fix large title presentation (#5984)

* Fix largeTitle animation and crash * Create button if not exist * Prevents largeTitle transition crash * Fix unit tests * Set navigationBar.prefersLargeTitles true on stack initialization * Bump minimum deployment target to iOS 11.0 * Add unit test
wix · Mar 3, 2020 · 54b2855 · 54b2855
1 parent c33ff12
commit 54b2855
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 32 deletions.
diff --git a/lib/ios/RNNStackController.m b/lib/ios/RNNStackController.m
@@ -12,6 +12,7 @@ - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNCo
     self = [super initWithLayoutInfo:layoutInfo creator:creator options:options defaultOptions:defaultOptions presenter:presenter eventEmitter:eventEmitter childViewControllers:childViewControllers];
     _stackDelegate = [[StackControllerDelegate alloc] initWithEventEmitter:self.eventEmitter];
     self.delegate = _stackDelegate;
+    self.navigationBar.prefersLargeTitles = YES;
     return self;
 }
 

diff --git a/lib/ios/RNNStackPresenter.m b/lib/ios/RNNStackPresenter.m
@@ -62,7 +62,6 @@ - (void)applyOptions:(RNNNavigationOptions *)options {
     [_topBarPresenter applyOptions:withDefault.topBar];
 
     [stack setNavigationBarBlur:[withDefault.topBar.background.blur getWithDefaultValue:NO]];
-    [stack setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
     [stack setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds getWithDefaultValue:NO]];
     [stack setBackButtonColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil]];
 
@@ -79,7 +78,6 @@ - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {
 - (void)applyOptionsBeforePopping:(RNNNavigationOptions *)options {
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
     RNNStackController* navigationController = self.stackController;
-    [navigationController setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
     [_topBarPresenter applyOptionsBeforePopping:options.topBar];
 }
 
@@ -119,10 +117,6 @@ - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigat
         [stack setNavigationBarBlur:[options.topBar.background.blur get]];
     }
 
-    if (options.topBar.largeTitle.visible.hasValue) {
-        [stack setNavigationBarLargeTitleVisible:options.topBar.largeTitle.visible.get];
-    }
-
     if (options.topBar.backButton.color.hasValue) {
         [stack setBackButtonColor:options.topBar.backButton.color.get];
     }

diff --git a/lib/ios/TopBarPresenter.m b/lib/ios/TopBarPresenter.m
@@ -120,20 +120,22 @@ - (void)setBackButtonOptions:(RNNBackButtonOptions *)backButtonOptions {
     NSNumber* fontSize = [backButtonOptions.fontSize getWithDefaultValue:nil];
     NSString* testID = [backButtonOptions.testID getWithDefaultValue:nil];
 
-	UIBarButtonItem *backItem = [[UIBarButtonItem alloc] init];
-    backItem.accessibilityIdentifier = testID;
-
     NSArray* stackChildren = self.navigationController.viewControllers;
+    UIViewController *lastViewControllerInStack = stackChildren.count > 1 ? stackChildren[stackChildren.count - 2] : self.navigationController.topViewController;
+    UIBarButtonItem *backItem = lastViewControllerInStack.navigationItem.backBarButtonItem ?: [UIBarButtonItem new];
+    backItem.accessibilityIdentifier = testID;
+
     icon = color
     ? [[icon withTintColor:color] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
     : icon;
     [self setBackIndicatorImage:icon withColor:color];
 
-    UIViewController *lastViewControllerInStack = stackChildren.count > 1 ? stackChildren[stackChildren.count - 2] : self.navigationController.topViewController;
-
     if (showTitle) {
         backItem.title = title ? title : lastViewControllerInStack.navigationItem.title;
+    } else {
+        backItem.title = @"";
     }
+
     backItem.tintColor = color;
 
     if (fontFamily) {

diff --git a/lib/ios/UINavigationController+RNNOptions.h b/lib/ios/UINavigationController+RNNOptions.h
@@ -16,8 +16,6 @@
 
 - (void)setNavigationBarClipsToBounds:(BOOL)clipsToBounds;
 
-- (void)setNavigationBarLargeTitleVisible:(BOOL)visible;
-
 - (void)setBackButtonColor:(UIColor *)color;
 
 @end
diff --git a/lib/ios/UINavigationController+RNNOptions.m b/lib/ios/UINavigationController+RNNOptions.m
@@ -33,16 +33,6 @@ - (void)setBarStyle:(UIBarStyle)barStyle {
 	self.navigationBar.barStyle = barStyle;
 }
 
-- (void)setNavigationBarLargeTitleVisible:(BOOL)visible {
-	if (@available(iOS 11.0, *)) {
-		if (visible){
-			self.navigationBar.prefersLargeTitles = YES;
-		} else {
-			self.navigationBar.prefersLargeTitles = NO;
-		}
-	}
-}
-
 - (void)setNavigationBarBlur:(BOOL)blur {
 	if (blur && ![self.navigationBar viewWithTag:BLUR_TOPBAR_TAG]) {
 		[self.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];

diff --git a/playground/ios/NavigationTests/RNNStackControllerTest.m b/playground/ios/NavigationTests/RNNStackControllerTest.m
@@ -38,6 +38,10 @@ - (void)testInitWithLayoutInfo_shouldBindPresenter {
 	XCTAssertNotNil(self.uut.presenter);
 }
 
+- (void)testInitWithLayoutInfo_shouldPreferLargeTitle {
+	XCTAssertTrue(self.uut.navigationBar.prefersLargeTitles);
+}
+
 - (void)testInitWithLayoutInfo_shouldSetMultipleViewControllers {
 	self.uut = [[RNNStackController alloc] initWithLayoutInfo:nil creator:_creator options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNComponentPresenter alloc] init] eventEmitter:nil childViewControllers:@[_vc1, _vc2]];
 	XCTAssertTrue(self.uut.viewControllers.count == 2);

diff --git a/playground/ios/NavigationTests/RNNStackPresenterTest.m b/playground/ios/NavigationTests/RNNStackPresenterTest.m
@@ -44,19 +44,13 @@ - (void)testApplyOptionsBeforePoppingShouldSetTopBarBackgroundForPoppingViewCont
 	XCTAssertTrue([_boundViewController.navigationBar.standardAppearance.backgroundColor isEqual:[UIColor redColor]]);
 }
 
-- (void)testApplyOptionsBeforePoppingShouldSetLargeTitleForPoppingViewController {
+- (void)testApplyOptionsShouldSetLargeTitleVisible {
 	_options.topBar.largeTitle.visible = [[Bool alloc] initWithBOOL:YES];
 
-	[self.uut applyOptionsBeforePopping:self.options];
+	[self.uut applyOptions:self.options];
 	XCTAssertTrue([[_boundViewController navigationBar] prefersLargeTitles]);
 }
 
-- (void)testApplyOptionsBeforePoppingShouldSetDefaultLargeTitleFalseForPoppingViewController {
-	_options.topBar.largeTitle.visible = nil;
-	[self.uut applyOptionsBeforePopping:self.options];
-	XCTAssertFalse([[_boundViewController navigationBar] prefersLargeTitles]);
-}
-
 - (void)testApplyOptions_shouldSetBackButtonOnBoundViewController_withTitle {
 	Text* title = [[Text alloc] initWithValue:@"Title"];
 	self.options.topBar.backButton.title = title;
@@ -69,7 +63,8 @@ - (void)testApplyOptions_shouldSetBackButtonOnBoundViewController_withHideTitle
 	self.options.topBar.backButton.title = title;
 	self.options.topBar.backButton.showTitle = [[Bool alloc] initWithValue:@(0)];
 	[self.uut applyOptions:self.options];
-	XCTAssertNil(self.boundViewController.viewControllers.firstObject.navigationItem.backBarButtonItem.title);
+	NSLog(@"%@", self.boundViewController.viewControllers.firstObject.navigationItem.backBarButtonItem.title);
+	XCTAssertTrue([self.boundViewController.viewControllers.firstObject.navigationItem.backBarButtonItem.title isEqualToString:@""]);
 }
 
 - (void)testApplyOptions_shouldSetBackButtonOnBoundViewController_withDefaultValues {

diff --git a/playground/ios/playground.xcodeproj/project.pbxproj b/playground/ios/playground.xcodeproj/project.pbxproj
@@ -815,6 +815,7 @@
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = XPHGA2FMQQ;
 				INFOPLIST_FILE = playground/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -838,6 +839,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = XPHGA2FMQQ;
 				INFOPLIST_FILE = playground/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",