Skip to content

Fix iOS bottomTab textColor regression #8255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yedidyak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix iOS bottomTab textColor regression #8255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions ios/BottomTabsAppearancePresenter.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,6 @@ - (void)applyTabBarAppearance:(UITabBarAppearance *)appearance {
self.tabBar.scrollEdgeAppearance = [appearance copy];
}
#endif

for (UIViewController *childViewController in self.tabBarController.childViewControllers) {
childViewController.tabBarItem.standardAppearance = [appearance copy];
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
if (@available(iOS 15.0, *)) {
childViewController.tabBarItem.scrollEdgeAppearance = [appearance copy];
}
#endif
}
}

@end
42 changes: 40 additions & 2 deletions playground/ios/NavigationTests/RNNBottomTabsAppearancePresenterTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,46 @@ - (void)testBackgroundColor_validColor {
- (void)testTabBarBackgroundColor {
UIColor *tabBarBackgroundColor = [UIColor redColor];
[self.uut setTabBarBackgroundColor:tabBarBackgroundColor];
XCTAssertTrue([self.children.lastObject.tabBarItem.standardAppearance.backgroundColor
isEqual:tabBarBackgroundColor]);
XCTAssertTrue(
[((UITabBarController *)self.boundViewController).tabBar.standardAppearance.backgroundColor
isEqual:tabBarBackgroundColor]);
}

- (void)testSetTabBarBackgroundColor_shouldPreserveBottomTabTitleColors {
RNNNavigationOptions *options = [RNNNavigationOptions emptyOptions];
options.bottomTab = [[RNNBottomTabOptions alloc] initWithDict:@{
@"text" : @"Home",
@"textColor" : @(0xFFFF0000),
@"selectedTextColor" : @(0xFF00FF00)
}];

BottomTabPresenter *bottomTabPresenter =
[BottomTabPresenterCreator createWithDefaultOptions:nil];
UIViewController *child = self.children.lastObject;
[bottomTabPresenter applyOptions:options child:child];

[self.uut setTabBarBackgroundColor:UIColor.blueColor];

UIColor *normalColor = child.tabBarItem.standardAppearance.stackedLayoutAppearance.normal
.titleTextAttributes[NSForegroundColorAttributeName];
UIColor *selectedColor = child.tabBarItem.standardAppearance.stackedLayoutAppearance.selected
.titleTextAttributes[NSForegroundColorAttributeName];

XCTAssertTrue([normalColor isEqual:UIColor.redColor]);
XCTAssertTrue([selectedColor isEqual:UIColor.greenColor]);
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000
if (@available(iOS 15.0, *)) {
UIColor *scrollEdgeNormalColor =
child.tabBarItem.scrollEdgeAppearance.stackedLayoutAppearance.normal
.titleTextAttributes[NSForegroundColorAttributeName];
UIColor *scrollEdgeSelectedColor =
child.tabBarItem.scrollEdgeAppearance.stackedLayoutAppearance.selected
.titleTextAttributes[NSForegroundColorAttributeName];

XCTAssertTrue([scrollEdgeNormalColor isEqual:UIColor.redColor]);
XCTAssertTrue([scrollEdgeSelectedColor isEqual:UIColor.greenColor]);
}
#endif
}

- (void)testApplyOptions_applyTabBarShadowDefaultValues {
Expand Down
Loading