Skip to content

fix(mobile): restore the reserved compose space on Android #28819

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 2 commits into from
Nov 1, 2026
+3 −16
Merged

fix(mobile): restore the reserved compose space on Android #28819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a7f0bb
fix(mobile): restore the reserved compose space on Android
PixPMusic Nov 1, 2026
9b35ec9
fix(mobile): preserve floating tab cutout clearance
PixPMusic Nov 1, 2026
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
15 changes: 1 addition & 14 deletions apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.android.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,7 @@ export function AndroidWorkspaceNavigation(props: {
const barWidth =
props.paneWidth ??
window.width - (Math.max(insets.left, FLOATING_TABS.edge) - FLOATING_TABS.edge);
// A phone draws compose on the Chats list only; the split sidebar draws it on every tab
// except the Settings and Usage pages.
const composeBesideBar =
props.paneWidth === undefined
? selectedTab === "threads"
: selectedTab !== "settings" && selectedTab !== "usage";
const metrics = floatingTabsMetrics(
tabs.length,
scale,
fabSize,
barWidth,
props.fillWidth,
composeBesideBar && connectionState.hasConnections,
);
const metrics = floatingTabsMetrics(tabs.length, scale, fabSize, barWidth, props.fillWidth);
if (!rail && keyboardVisible) return null;

return (
Expand Down
4 changes: 2 additions & 2 deletions apps/mobile/src/features/workspace/floating-workspace-tabs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export function floatingTabsMetrics(
fabSize: number,
paneWidth?: number,
fillWidth = false,
composeVisible = true,
) {
const unit = Math.max(1, scale);
const height = fabSize;
Expand All @@ -17,10 +16,11 @@ export function floatingTabsMetrics(
const room =
paneWidth === undefined
? count * 60 * unit
: sharesRow && composeVisible
: sharesRow
? paneWidth - beside
: paneWidth - 2 * FLOATING_TABS.edge;
return {
// Reserve the compose slot even while its button is hidden.
pill: Math.max(0, fillWidth ? room : Math.min(count * 72 * unit, room)),
height,
row,
Expand Down
Loading