Skip to content

Give minWidth to tab indicator only #7095

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

Merged
gaearon merged 1 commit into from
Dec 13, 2024
Merged

Give minWidth to tab indicator only #7095

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
18 changes: 15 additions & 3 deletions src/view/com/pager/TabBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,25 @@ export function TabBar({
opacity: 0,
}
}

function getScaleX(index: number) {
const textWidth = textLayoutsValue[index].width
const itemWidth = layoutsValue[index].width
const minIndicatorWidth = 45
const maxIndicatorWidth = itemWidth - 2 * CONTENT_PADDING
const indicatorWidth = Math.min(
Math.max(minIndicatorWidth, textWidth),
maxIndicatorWidth,
)
return indicatorWidth / contentSize.get()
}

if (textLayoutsValue.length === 1) {
return {
opacity: 1,
transform: [
{
scaleX: textLayoutsValue[0].width / contentSize.get(),
scaleX: getScaleX(0),
},
],
}
Expand All @@ -261,7 +274,7 @@ export function TabBar({
scaleX: interpolate(
dragProgress.get(),
textLayoutsValue.map((l, i) => i),
textLayoutsValue.map(l => l.width / contentSize.get()),
textLayoutsValue.map((l, i) => getScaleX(i)),
),
},
],
Expand Down Expand Up @@ -429,7 +442,6 @@ const styles = StyleSheet.create({
},
itemText: {
lineHeight: 20,
minWidth: 45,
textAlign: 'center',
},
outerBottomBorder: {
Expand Down
39 changes: 28 additions & 11 deletions src/view/com/pager/TabBar.web.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,12 @@ export function TabBar({
testID,
selectedPage,
items,
indicatorColor,
onSelect,
onPressSelected,
}: TabBarProps) {
const t = useTheme()
const scrollElRef = useRef<ScrollView>(null)
const itemRefs = useRef<Array<Element>>([])
const indicatorStyle = {
borderBottomColor: indicatorColor || t.palette.primary_500,
}
const {gtMobile} = useBreakpoints()
const styles = gtMobile ? desktopStyles : mobileStyles

Expand Down Expand Up @@ -122,12 +118,19 @@ export function TabBar({
style={[
styles.itemText,
selected ? t.atoms.text : t.atoms.text_contrast_medium,
selected && indicatorStyle,
a.text_md,
a.font_bold,
{lineHeight: 20},
]}>
{item}
<View
style={[
styles.itemIndicator,
selected && {
backgroundColor: t.palette.primary_500,
},
]}
/>
</Text>
</View>
</PressableWithHover>
Expand Down Expand Up @@ -158,13 +161,20 @@ const desktopStyles = StyleSheet.create({
},
itemInner: {
alignItems: 'center',
overflowX: 'hidden',
},
itemText: {
textAlign: 'center',
paddingBottom: 10 + 3,
},
itemIndicator: {
position: 'absolute',
bottom: 0,
height: 3,
left: '50%',
transform: 'translateX(-50%)',
minWidth: 45,
paddingBottom: 12,
borderBottomWidth: 3,
borderBottomColor: 'transparent',
width: '100%',
},
outerBottomBorder: {
position: 'absolute',
Expand Down Expand Up @@ -194,13 +204,20 @@ const mobileStyles = StyleSheet.create({
itemInner: {
flexGrow: 1,
alignItems: 'center',
overflowX: 'hidden',
},
itemText: {
textAlign: 'center',
paddingBottom: 10 + 3,
},
itemIndicator: {
position: 'absolute',
bottom: 0,
height: 3,
left: '50%',
transform: 'translateX(-50%)',
minWidth: 45,
paddingBottom: 10,
borderBottomWidth: 3,
borderBottomColor: 'transparent',
width: '100%',
},
outerBottomBorder: {
position: 'absolute',
Expand Down