@@ -83,9 +83,6 @@ struct TabViewImpl: View {
8383 . tintColor( props. selectedActiveTintColor)
8484 . getSidebarAdaptable ( enabled: props. sidebarAdaptable ?? false )
8585 . onChange ( of: props. selectedPage ?? " " ) { newValue in
86- #if !os(macOS)
87- tabBar? . tintColor = props. selectedActiveTintColor
88- #endif
8986 #if !os(macOS)
9087 if props. disablePageAnimations {
9188 UIView . setAnimationsEnabled ( false )
@@ -124,9 +121,9 @@ struct TabViewImpl: View {
124121 if props. scrollEdgeAppearance == " transparent " {
125122 configureTransparentAppearance ( tabBar: tabBar, props: props)
126123 return
127- } else {
128- configureStandardAppearance ( tabBar: tabBar, props: props)
129124 }
125+
126+ configureStandardAppearance ( tabBar: tabBar, props: props)
130127 }
131128#endif
132129
@@ -141,15 +138,15 @@ struct TabViewImpl: View {
141138
142139 guard let items = tabBar. items else { return }
143140
144- let attributes = TabBarFontSize . createNormalStateAttributes (
141+ let fontAttributes = TabBarFontSize . createNormalStateAttributes (
145142 fontSize: props. fontSize,
146143 fontFamily: props. fontFamily,
147144 fontWeight: props. fontWeight,
148- inactiveColor: props . inactiveTintColor
145+ inactiveColor: nil
149146 )
150147
151148 items. forEach { item in
152- item. setTitleTextAttributes ( attributes , for: . normal)
149+ item. setTitleTextAttributes ( fontAttributes , for: . normal)
153150 item. setTitleTextAttributes ( selectedAttributes ( props: props) , for: . selected)
154151 }
155152 configureTabBarItemImages ( items: items, props: props)
@@ -208,27 +205,11 @@ struct TabViewImpl: View {
208205 tabBar. scrollEdgeAppearance = appearance. copy ( )
209206 }
210207 if let items = tabBar. items {
211- configureTabBarItemTitles ( items: items, props: props)
212208 configureTabBarItemImages ( items: items, props: props)
213209 configureTabBarItemImagesAfterLayout ( tabBar: tabBar, props: props)
214210 }
215211 }
216212
217- private func configureTabBarItemTitles( items: [ UITabBarItem ] , props: TabViewProps ) {
218- let normalAttributes = TabBarFontSize . createNormalStateAttributes (
219- fontSize: props. fontSize,
220- fontFamily: props. fontFamily,
221- fontWeight: props. fontWeight,
222- inactiveColor: props. inactiveTintColor
223- )
224- let selectedAttributes = selectedAttributes ( props: props)
225-
226- items. forEach { item in
227- item. setTitleTextAttributes ( normalAttributes, for: . normal)
228- item. setTitleTextAttributes ( selectedAttributes, for: . selected)
229- }
230- }
231-
232213 private func configureTabBarItemImages( items: [ UITabBarItem ] , props: TabViewProps ) {
233214 for (tabBarIndex, item) in items. enumerated ( ) {
234215 guard let tabData = props. filteredItems [ safe: tabBarIndex] ,
0 commit comments