Skip to content

Commit 7607a83

Browse files
authored
TabController - design tokens - fixes (#1935)
* TabController - design tokens - fixes * Fader color will be handled within Fader * Revert
1 parent 8dcdf5c commit 7607a83

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

demo/src/screens/MainScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class MainScreen extends Component {
202202
paddingV-s2
203203
onPress={() => this.openScreen(item)}
204204
onLongPress={() => this.setDefaultScreen(item)}
205-
activeBackgroundColor={Colors.primary}
205+
activeBackgroundColor={Colors.$backgroundPrimaryHeavy}
206206
activeOpacity={1}
207207
>
208208
<Text style={[item.deprecate && styles.entryTextDeprecated]} grey10 text50>

demo/src/screens/componentScreens/TabControllerScreen/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class TabControllerScreen extends Component<{}, State> {
174174
// iconColor={'green'}
175175
// selectedIconColor={'blue'}
176176
enableShadow
177-
activeBackgroundColor={Colors.blue60}
177+
activeBackgroundColor={Colors.$backgroundGeneralLight}
178178
centerSelected={centerSelected}
179179
>
180180
{/* {this.renderTabItems()} */}

src/components/tabController/TabBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ interface Props extends TabControllerBarProps, BaseComponentInjectedProps, Forwa
121121
children?: ChildProps[] | ChildProps;
122122
}
123123

124-
const FADER_PROPS = {size: 76, tintColor: Colors.$backgroundDefault};
124+
const FADER_PROPS = {size: 76, tintColor: Colors.$backgroundElevated};
125125

126126
/**
127127
* @description: TabController's TabBar component
@@ -285,7 +285,7 @@ const TabBar = (props: Props) => {
285285
}, [containerWidth]);
286286

287287
return (
288-
<View style={_containerStyle} key={key}>
288+
<View style={_containerStyle} key={key} bg-$backgroundElevated>
289289
<FadedScrollView
290290
// @ts-expect-error
291291
ref={tabBar}

src/components/tabController/TabBarItem.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ export default function TabBarItem({
192192
// @ts-expect-error
193193
ref={itemRef}
194194
style={_style}
195+
bg-$backgroundElevated
195196
onLayout={onLayout}
196197
activeBackgroundColor={activeBackgroundColor}
197198
activeOpacity={activeOpacity}

0 commit comments

Comments
 (0)