Skip to content

refactor(web): composer overlay re-measures from one layout effect #25915

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
+8 −13
Merged

refactor(web): composer overlay re-measures from one layout effect #25915

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
21 changes: 8 additions & 13 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,6 @@ export default function ChatView(props: ChatViewProps) {
const composerReservedHeightRef = useRef(0);
const composerExpandedHeightRef = useRef(0);
const composerRestingRef = useRef(false);
const composerMountedRef = useRef(true);
const [scrollToEndClearance, setScrollToEndClearance] = useState(0);
const [timelineOverflows, setTimelineOverflows] = useState(false);
const fanoutSelectionsAtom = draftFanoutSelectionsAtom(routeThreadKey);
Expand Down Expand Up @@ -2127,7 +2126,7 @@ export default function ChatView(props: ChatViewProps) {
const nextHeight = Math.ceil(height);
if (nextHeight <= 0) return;
const isResting = overlayComposerIsResting({
composerMounted: composerMountedRef.current,
composerMounted,
composerReportedResting: composerRestingRef.current,
});
const modelStrip = composerOverlayElement?.querySelector<HTMLElement>(
Expand Down Expand Up @@ -2200,8 +2199,13 @@ export default function ChatView(props: ChatViewProps) {
composerReservedHeightRef.current = 0;
composerExpandedHeightRef.current = 0;
publishComposerOverlayHeightStable(composerOverlayElement.getBoundingClientRect().height);
// oxlint-disable-next-line react/exhaustive-effect-dependencies -- A thread switch must re-measure the overlay for the new timeline.
}, [activeThreadKey, composerOverlayElement, publishComposerOverlayHeightStable]);
}, [
// oxlint-disable-next-line react/exhaustive-effect-dependencies -- A thread switch or a composer mount/unmount must re-measure the overlay for the new timeline.
activeThreadKey,
composerMounted,
composerOverlayElement,
publishComposerOverlayHeightStable,
]);

useLayoutEffect(() => {
if (!composerOverlayElement) return;
Expand All @@ -2226,15 +2230,6 @@ export default function ChatView(props: ChatViewProps) {
// oxlint-disable-next-line react/exhaustive-effect-dependencies -- The scroll-to-bottom button changes the overlay's height without resizing the observed node first.
showScrollToBottom,
]);
useLayoutEffect(() => {
if (composerMountedRef.current === composerMounted) return;
composerMountedRef.current = composerMounted;
if (!composerOverlayElement) return;
composerTimelineInsetRef.current = 0;
composerReservedHeightRef.current = 0;
composerExpandedHeightRef.current = 0;
publishComposerOverlayHeightStable(composerOverlayElement.getBoundingClientRect().height);
}, [composerMounted, composerOverlayElement, publishComposerOverlayHeightStable]);
const openPanelPullRequestUrl = useOpenPanelPullRequestUrl(activeThreadRef);
const activeThreadReferenceCopyTarget =
activeThreadId === null || !isServerThread
Expand Down
Loading