Skip to content

fix(mobile): keep the collapsed Android rail square #26039

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
juliusmarminge merged 1 commit into from
Oct 27, 2026
Merged

fix(mobile): keep the collapsed Android rail square #26039

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
6 changes: 3 additions & 3 deletions ...ntrols/android/src/main/java/expo/modules/t3nativecontrols/T3WorkspaceNavigationModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ class T3WorkspaceNavigationView(
},
) {
val fraction = progress.coerceIn(0f, 1f)
val railShape = RoundedCornerShape(topEnd = 16.dp * fraction, bottomEnd = 16.dp * fraction)
if (fraction > 0f) {
Scrim(
contentDescription = "Close navigation rail",
Expand All @@ -295,8 +296,8 @@ class T3WorkspaceNavigationView(
Modifier
.fillMaxHeight()
.width(lerp(RAIL_WIDTH, EXPANDED_RAIL_WIDTH, progress.coerceAtLeast(0f)))
.shadow(RAIL_SHADOW * fraction, RAIL_EXPANDED_SHAPE, clip = false)
.background(Color(containerColor), RAIL_EXPANDED_SHAPE)
.shadow(RAIL_SHADOW * fraction, railShape, clip = false)
.background(Color(containerColor), railShape)
.padding(top = safeAreaTop.dp, bottom = safeAreaBottom.dp + 12.dp)
.selectableGroup(),
) {
Expand Down Expand Up @@ -437,7 +438,6 @@ class T3WorkspaceNavigationView(
val FAB_SIZE = 48.dp
val ICON_SIZE = 24.dp
val RAIL_SHADOW = 6.dp
val RAIL_EXPANDED_SHAPE = RoundedCornerShape(topEnd = 16.dp, bottomEnd = 16.dp)
const val DISABLED_ALPHA = 0.4f

// Labels fade in over the second half of the widening, once there is room for them, and
Expand Down
Loading