Skip to content

refactor(web): composer clears scroll-collapse in render, not after paint #25909

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

refactor(web): composer clears scroll-collapse in render, not after paint #25909

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
11 changes: 5 additions & 6 deletions apps/web/src/components/chat/ChatComposer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2380,17 +2380,16 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
settings.composerCollapseOnScroll &&
!hasMultilinePrompt &&
!composerHasExpandedChrome;
// Clear rather than mask: once eligibility drops, the composer stays expanded until the next
// scroll gesture even if it becomes eligible again.
if (!canScrollCollapseComposer && isComposerScrollCollapsed) {
setIsComposerScrollCollapsed(false);
}
const composerScrollCollapseEligible = canScrollCollapseComposer && !isComposerResting;
useLayoutEffect(() => {
composerScrollCollapseEligibleRef.current = composerScrollCollapseEligible;
});

useEffect(() => {
if (!canScrollCollapseComposer) {
setIsComposerScrollCollapsed(false);
}
}, [canScrollCollapseComposer, setIsComposerScrollCollapsed]);

// Window activation re-fires focus; ignore that frame to keep the composer collapsed.
useEffect(() => {
if (!isComposerScrollCollapsed) return;
Expand Down
Loading