Skip to content

Commit 1034e32

Browse files
committed
fix(ios): correctly handle active items for scroll edge transparent
1 parent d7373ac commit 1034e32

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

packages/react-native-bottom-tabs/ios/TabViewImpl.swift

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,7 @@ private func createFontAttributes(
195195
) -> [NSAttributedString.Key: Any] {
196196
var attributes: [NSAttributedString.Key: Any] = [:]
197197

198-
if let inactiveTintColor {
199-
attributes[.foregroundColor] = inactiveTintColor
200-
}
198+
201199

202200
if family != nil || weight != nil {
203201
attributes[.font] = RCTFont.update(
@@ -226,6 +224,7 @@ private func configureTransparentAppearance(tabBar: UITabBar, props: TabViewProp
226224
tabBar.barTintColor = props.barTintColor
227225
tabBar.isTranslucent = props.translucent
228226
tabBar.unselectedItemTintColor = props.inactiveTintColor
227+
tabBar.tintColor = props.activeTintColor
229228

230229
guard let items = tabBar.items else { return }
231230

@@ -258,12 +257,16 @@ private func configureStandardAppearance(tabBar: UITabBar, props: TabViewProps)
258257
let itemAppearance = UITabBarItemAppearance()
259258
let fontSize = props.fontSize != nil ? CGFloat(props.fontSize!) : tabBarDefaultFontSize
260259

261-
let attributes = createFontAttributes(
260+
var attributes = createFontAttributes(
262261
size: fontSize,
263262
family: props.fontFamily,
264263
weight: props.fontWeight,
265264
inactiveTintColor: props.inactiveTintColor
266265
)
266+
267+
if let inactiveTintColor = props.inactiveTintColor {
268+
attributes[.foregroundColor] = inactiveTintColor
269+
}
267270

268271
if let inactiveTintColor = props.inactiveTintColor {
269272
itemAppearance.normal.iconColor = inactiveTintColor

0 commit comments

Comments
 (0)