Skip to content

Commit 8044b2d

Browse files
guycaguyca
committed
Fix mergeOptions
Merging TopBar title, buttons and status bar options is broken on iOS in 3.1.1. Parent options aren't resolved properly and default options aren't regarded when they should be.
1 parent 9f6e09a commit 8044b2d

12 files changed

+126
-46
lines changed

‎lib/ios/RNNBasePresenter.h

+4
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
3131
- (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock;
3232

3333
- (void)viewDidLayoutSubviews;
34+
35+
- (UIStatusBarStyle)getStatusBarStyle:(RNNNavigationOptions *)resolvedOptions;
36+
37+
- (BOOL)isStatusBarVisibility:(UINavigationController *)stack resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
3438
@end

‎lib/ios/RNNBasePresenter.m

+21
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,25 @@ - (void)viewDidLayoutSubviews {
164164
- (void)applyDotIndicator:(UIViewController *)child {
165165
[[self dotIndicatorPresenter] apply:child:[child resolveOptions].bottomTab.dotIndicator];
166166
}
167+
168+
- (UIStatusBarStyle)getStatusBarStyle:(RNNNavigationOptions *)resolvedOptions {
169+
RNNNavigationOptions *withDefault = [resolvedOptions withDefault:[self defaultOptions]];
170+
if ([[withDefault.statusBar.style getWithDefaultValue:@"default"] isEqualToString:@"light"]) {
171+
return UIStatusBarStyleLightContent;
172+
} else {
173+
return UIStatusBarStyleDefault;
174+
}
175+
}
176+
177+
- (BOOL)isStatusBarVisibility:(UINavigationController *)stack resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
178+
RNNNavigationOptions *withDefault = [resolvedOptions withDefault:[self defaultOptions]];
179+
if (withDefault.statusBar.visible.hasValue) {
180+
return ![withDefault.statusBar.visible get];
181+
} else if ([withDefault.statusBar.hideWithTopBar getWithDefaultValue:NO]) {
182+
return stack.isNavigationBarHidden;
183+
}
184+
return NO;
185+
}
186+
187+
167188
@end

‎lib/ios/RNNNavigationController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ - (UINavigationController *)navigationController {
3232
}
3333

3434
- (UIStatusBarStyle)preferredStatusBarStyle {
35-
return self.getCurrentChild.preferredStatusBarStyle;
35+
return [_presenter getStatusBarStyle:self.resolveOptions];
3636
}
3737

3838
- (UIModalPresentationStyle)modalPresentationStyle {

‎lib/ios/RNNNavigationControllerPresenter.m

+7-4
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,15 @@ - (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavig
120120
}
121121

122122

123-
RNNLargeTitleOptions *largteTitleOptions = newOptions.topBar.largeTitle;
124-
if (largteTitleOptions.color.hasValue || largteTitleOptions.fontSize.hasValue || largteTitleOptions.fontFamily.hasValue) {
123+
RNNLargeTitleOptions *largeTitleOptions = newOptions.topBar.largeTitle;
124+
if (largeTitleOptions.color.hasValue || largeTitleOptions.fontSize.hasValue || largeTitleOptions.fontFamily.hasValue) {
125125
[navigationController rnn_setNavigationBarLargeTitleFontFamily:[newOptions.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[newOptions.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[newOptions.topBar.largeTitle.color getWithDefaultValue:nil]];
126126
}
127-
128-
[navigationController rnn_setNavigationBarFontFamily:[newOptions.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[newOptions.topBar.title.fontSize getWithDefaultValue:nil] color:[newOptions.topBar.title.color getWithDefaultValue:nil]];
127+
128+
RNNNavigationOptions * withDefault = (RNNNavigationOptions *) [[newOptions mergeInOptions:currentOptions] withDefault:[self defaultOptions]];
129+
[navigationController rnn_setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil]
130+
fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil]
131+
color:[withDefault.topBar.title.color getWithDefaultValue:nil]];
129132

130133
if (newOptions.topBar.component.name.hasValue) {
131134
[self setCustomNavigationBarView:newOptions perform:nil];

‎lib/ios/RNNRootViewController.m

+2-12
Original file line numberDiff line numberDiff line change
@@ -116,21 +116,11 @@ - (BOOL)isExternalViewController {
116116
}
117117

118118
- (BOOL)prefersStatusBarHidden {
119-
if (self.resolveOptions.statusBar.visible.hasValue) {
120-
return ![self.resolveOptions.statusBar.visible get];
121-
} else if ([self.resolveOptions.statusBar.hideWithTopBar getWithDefaultValue:NO]) {
122-
return self.navigationController.isNavigationBarHidden;
123-
}
124-
125-
return NO;
119+
return [_presenter isStatusBarVisibility:self.navigationController resolvedOptions:self.resolveOptions];
126120
}
127121

128122
- (UIStatusBarStyle)preferredStatusBarStyle {
129-
if ([[self.resolveOptions.statusBar.style getWithDefaultValue:@"default"] isEqualToString:@"light"]) {
130-
return UIStatusBarStyleLightContent;
131-
} else {
132-
return UIStatusBarStyleDefault;
133-
}
123+
return [_presenter getStatusBarStyle:[self resolveOptions]];
134124
}
135125

136126
- (UIInterfaceOrientationMask)supportedInterfaceOrientations {

‎lib/ios/RNNSideMenuChildVC.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ - (UIViewController *)getCurrentChild {
4040
}
4141

4242
- (UIStatusBarStyle)preferredStatusBarStyle {
43-
return self.child.preferredStatusBarStyle;
43+
return [[self presenter] getStatusBarStyle:[self resolveOptions]];
4444
}
4545

4646
- (UIInterfaceOrientationMask)supportedInterfaceOrientations {

‎lib/ios/RNNTabBarController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ - (void)setSelectedIndex:(NSUInteger)selectedIndex {
4444
}
4545

4646
- (UIStatusBarStyle)preferredStatusBarStyle {
47-
return self.selectedViewController.preferredStatusBarStyle;
47+
return [[self presenter] getStatusBarStyle:self.resolveOptions];
4848
}
4949

5050
#pragma mark UITabBarControllerDelegate

‎lib/ios/RNNViewControllerPresenter.m

+8-7
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ - (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
7979

8080
- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions {
8181
[super mergeOptions:newOptions currentOptions:currentOptions];
82-
82+
RNNNavigationOptions * withDefault = (RNNNavigationOptions *) [[currentOptions overrideOptions:newOptions] withDefault:[self defaultOptions]];
83+
8384
UIViewController* viewController = self.boundViewController;
8485

8586
if (newOptions.backgroundImage.hasValue) {
@@ -135,25 +136,25 @@ - (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavig
135136
}
136137

137138
if (newOptions.statusBar.style.hasValue) {
138-
[viewController rnn_setStatusBarStyle:newOptions.statusBar.style.get animated:[newOptions.statusBar.animate getWithDefaultValue:YES]];
139+
[viewController rnn_setStatusBarStyle:newOptions.statusBar.style.get animated:[withDefault.statusBar.animate getWithDefaultValue:YES]];
139140
}
140141

141142
if (newOptions.topBar.backButton.visible.hasValue) {
142143
[viewController rnn_setBackButtonVisible:newOptions.topBar.backButton.visible.get];
143144
}
144145

145146
if (newOptions.topBar.leftButtons || newOptions.topBar.rightButtons) {
146-
RNNNavigationOptions* buttonsResolvedOptions = (RNNNavigationOptions *)[currentOptions overrideOptions:newOptions];
147-
[_navigationButtons applyLeftButtons:newOptions.topBar.leftButtons rightButtons:newOptions.topBar.rightButtons defaultLeftButtonStyle:buttonsResolvedOptions.topBar.leftButtonStyle defaultRightButtonStyle:buttonsResolvedOptions.topBar.rightButtonStyle];
147+
[_navigationButtons applyLeftButtons:newOptions.topBar.leftButtons rightButtons:newOptions.topBar.rightButtons defaultLeftButtonStyle:withDefault.topBar.leftButtonStyle defaultRightButtonStyle:withDefault.topBar.rightButtonStyle];
148148
}
149149

150+
150151
if (newOptions.overlay.interceptTouchOutside.hasValue) {
151152
RCTRootView* rootView = (RCTRootView*)viewController.view;
152153
rootView.passThroughTouches = !newOptions.overlay.interceptTouchOutside.get;
153154
}
154-
155-
[self setTitleViewWithSubtitle:(RNNNavigationOptions *)[currentOptions overrideOptions:newOptions]];
156-
155+
156+
[self setTitleViewWithSubtitle:withDefault];
157+
157158
if (newOptions.topBar.title.component.name.hasValue) {
158159
[self setCustomNavigationTitleView:newOptions perform:nil];
159160
}

‎lib/ios/ReactNativeNavigationTests/RNNBasePresenterTest.m

+30
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,34 @@ - (void)testApplyOptions_setTabBarItemBadgeShouldWhenNoValue {
6060
[self.mockBoundViewController verify];
6161
}
6262

63+
- (void)testGetPreferredStatusBarStyle_returnLightIfLight {
64+
RNNNavigationOptions * lightOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
65+
lightOptions.statusBar.style = [[Text alloc] initWithValue:@"light"];
66+
67+
XCTAssertEqual([_uut getStatusBarStyle:lightOptions], UIStatusBarStyleLightContent);
68+
}
69+
70+
- (void)testGetPreferredStatusBarStyle_returnDefaultIfDark {
71+
RNNNavigationOptions * darkOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
72+
darkOptions.statusBar.style = [[Text alloc] initWithValue:@"dark"];
73+
74+
XCTAssertEqual([_uut getStatusBarStyle:darkOptions], UIStatusBarStyleDefault);
75+
}
76+
77+
- (void)testGetPreferredStatusBarStyle_returnDefaultIfNil {
78+
RNNNavigationOptions * options = [[RNNNavigationOptions alloc] initEmptyOptions];
79+
80+
XCTAssertEqual([_uut getStatusBarStyle:options], UIStatusBarStyleDefault);
81+
}
82+
83+
- (void)testGetPreferredStatusBarStyle_considersDefaultOptions {
84+
RNNNavigationOptions * options = [[RNNNavigationOptions alloc] initEmptyOptions];
85+
RNNNavigationOptions * lightOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
86+
lightOptions.statusBar.style = [[Text alloc] initWithValue:@"light"];
87+
[_uut setDefaultOptions:lightOptions];
88+
89+
XCTAssertEqual([_uut getStatusBarStyle:options], UIStatusBarStyleLightContent);
90+
}
91+
92+
6393
@end

‎lib/ios/ReactNativeNavigationTests/RNNTabBarControllerTest.m

+2-8
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,9 @@ - (void)testGetCurrentChild_shouldReturnSelectedViewController {
126126
}
127127

128128
- (void)testPreferredStatusBarStyle_shouldInvokeSelectedViewControllerPreferredStatusBarStyle {
129-
[[self.mockChildViewController expect] preferredStatusBarStyle];
129+
[[self.mockTabBarPresenter expect] getStatusBarStyle:[OCMArg any]];
130130
[self.uut preferredStatusBarStyle];
131-
[self.mockChildViewController verify];
132-
}
133-
134-
- (void)testPreferredStatusBarStyle_shouldInvokeOnSelectedViewController {
135-
[[self.mockChildViewController expect] preferredStatusBarStyle];
136-
[self.uut preferredStatusBarStyle];
137-
[self.mockChildViewController verify];
131+
[self.mockTabBarPresenter verify];
138132
}
139133

140134
- (void)testTabBarControllerDidSelectViewControllerDelegate_shouldInvokeSendBottomTabSelectedEvent {

‎lib/ios/ReactNativeNavigationTests/UIViewController+LayoutProtocolTest.m

+44-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@interface UIViewController_LayoutProtocolTest : XCTestCase
1111

12-
@property (nonatomic, retain) UIViewController* uut;
12+
@property (nonatomic, retain) UIViewController * uut;
1313

1414
@end
1515

@@ -18,8 +18,8 @@ @implementation UIViewController_LayoutProtocolTest
1818
- (void)setUp {
1919
[super setUp];
2020
self.uut = [OCMockObject partialMockForObject:[UIViewController new]];
21-
self.uut.layoutInfo = [[RNNLayoutInfo alloc] init];
22-
self.uut.layoutInfo.componentId = @"componentId";
21+
_uut.layoutInfo = [[RNNLayoutInfo alloc] init];
22+
_uut.layoutInfo.componentId = @"componentId";
2323
}
2424

2525
- (void)testInitWithLayoutApplyDefaultOptions {
@@ -53,17 +53,17 @@ - (void)testSetBackButtonIcon_withColor_shouldSetColor {
5353

5454
- (void)testSetBackButtonIcon_withColor_shouldSetTitle {
5555
UIViewController* uut = [UIViewController new];
56-
UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:uut];
57-
NSString* title = @"Title";
56+
UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:uut];
57+
NSString* title = @"Title";
5858

5959
[uut rnn_setBackButtonIcon:nil withColor:nil title:title];
6060
XCTAssertEqual(title, uut.navigationItem.backBarButtonItem.title);
6161
}
6262

6363
- (void)testSetBackButtonIcon_withColor_shouldSetIcon {
6464
UIViewController* uut = [UIViewController new];
65-
UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:uut];
66-
UIImage* icon = [UIImage new];
65+
UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:uut];
66+
UIImage* icon = [UIImage new];
6767

6868
[uut rnn_setBackButtonIcon:icon withColor:nil title:nil];
6969
XCTAssertEqual(icon, uut.navigationItem.backBarButtonItem.image);
@@ -99,4 +99,41 @@ - (void)testResolveOptions {
9999
XCTAssertEqual([[parent resolveOptions].bottomTab.selectedIconColor get], UIColor.redColor);
100100
}
101101

102+
- (void)testMergeOptions_invokedOnParentViewController {
103+
id parent = [OCMockObject partialMockForObject:[RNNNavigationController new]];
104+
RNNNavigationOptions * toMerge = [[RNNNavigationOptions alloc] initEmptyOptions];
105+
[(UIViewController *) [parent expect] mergeOptions:toMerge];
106+
107+
RNNNavigationController* uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:nil];
108+
[parent addChildViewController:uut];
109+
110+
[uut mergeOptions:toMerge];
111+
[parent verify];
112+
}
113+
114+
- (void)testMergeOptions_presenterIsInvokedWithResolvedOptions {
115+
id parent = [OCMockObject partialMockForObject:[RNNNavigationController new]];
116+
id presenter = [OCMockObject partialMockForObject:[RNNNavigationControllerPresenter new]];
117+
RNNNavigationOptions * toMerge = [[RNNNavigationOptions alloc] initEmptyOptions];
118+
toMerge.topBar.title.color = [[Color alloc] initWithValue:[UIColor redColor]];
119+
120+
[[presenter expect] mergeOptions:toMerge currentOptions:[OCMArg checkWithBlock:^(id value) {
121+
RNNNavigationOptions * options = (RNNNavigationOptions *) value;
122+
XCTAssertEqual([options.topBar.title.text get], @"Initial title");
123+
XCTAssertEqual([options.bottomTab.text get], @"Child tab text");
124+
return YES;
125+
}]];
126+
127+
RNNNavigationOptions * childOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
128+
childOptions.bottomTab.text = [[Text alloc] initWithValue:@"Child tab text"];
129+
UIViewController* child = [[UIViewController alloc] initWithLayoutInfo:nil creator:nil options:childOptions defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:nil];
130+
RNNNavigationOptions * initialOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
131+
initialOptions.topBar.title.text = [[Text alloc] initWithValue:@"Initial title"];
132+
RNNNavigationController* uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:nil options:initialOptions defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:@[child]];
133+
[parent addChildViewController:uut];
134+
135+
[uut mergeOptions:toMerge];
136+
[presenter verify];
137+
}
138+
102139
@end

‎lib/ios/UIViewController+LayoutProtocol.m

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
2828
return self;
2929
}
3030

31-
- (RNNNavigationOptions *)resolveOptions {
32-
return (RNNNavigationOptions *) [self.options mergeInOptions:self.getCurrentChild.resolveOptions.copy];
33-
}
34-
3531
- (void)mergeOptions:(RNNNavigationOptions *)options {
36-
[self.presenter mergeOptions:options currentOptions:self.options];
32+
[self.presenter mergeOptions:options currentOptions:self.resolveOptions];
3733
[self.parentViewController mergeOptions:options];
3834
}
3935

36+
- (RNNNavigationOptions *)resolveOptions {
37+
return (RNNNavigationOptions *) [self.options mergeInOptions:self.getCurrentChild.resolveOptions.copy];
38+
}
39+
4040
- (void)overrideOptions:(RNNNavigationOptions *)options {
4141
[self.options overrideOptions:options];
4242
}

0 commit comments

Comments
 (0)