Skip to content

fix(desktop): keep channel chrome clear of window controls #1159

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
tlongwell-block merged 3 commits into from
Jun 21, 2026
Merged

fix(desktop): keep channel chrome clear of window controls #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6feddf3
fix(desktop): disable timeline overscroll bounce
Jun 21, 2026
c51c962
fix(desktop): keep channel header below top chrome
Jun 21, 2026
0627c68
fix(desktop): offset collapsed channel title
Jun 21, 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
5 changes: 5 additions & 0 deletions desktop/src/features/chat/ui/ChatHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import type { ChannelType, ChannelVisibility } from "@/shared/api/types";
import { UpdateIndicator } from "@/features/settings/UpdateIndicator";
import { cn } from "@/shared/lib/cn";
import { channelChrome } from "@/shared/layout/chromeLayout";
import { useOptionalSidebar } from "@/shared/ui/sidebar";

type ChatHeaderProps = {
actions?: React.ReactNode;
Expand Down Expand Up @@ -94,6 +95,9 @@ export function ChatHeader({
statusBadge,
}: ChatHeaderProps) {
const trimmedDescription = description?.trim() ?? "";
const sidebar = useOptionalSidebar();
const clearCollapsedTopChromeControls =
belowSystemChrome && sidebar?.state === "collapsed" && !sidebar.isMobile;

const header = (
<header
Expand All @@ -105,6 +109,7 @@ export function ChatHeader({
: "min-h-8 py-0"
: "min-h-11 py-1.5",
overlaysContent && !belowSystemChrome && "-mb-11",
clearCollapsedTopChromeControls && "pl-[176px]",
)}
data-testid="chat-header"
data-tauri-drag-region
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/features/messages/ui/MessageTimeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ const MessageTimelineBase = React.forwardRef<
) : null}
<div
className={cn(
"absolute inset-0 overflow-y-auto overflow-x-hidden overscroll-contain px-2 pt-1 [overflow-anchor:none]",
"absolute inset-0 overflow-y-auto overflow-x-hidden overscroll-none px-2 pt-1 [overflow-anchor:none]",
hasComposerOverlay ? "pb-24" : "pb-4",
)}
data-scroll-restoration-id={scrollRestorationId}
Expand Down