Skip to content

Commit d970607

Browse files
authored
fix(web): every resize-driven layout commits in the same frame (pingdotgg#17656)
1 parent b87b13d commit d970607

34 files changed

Lines changed: 311 additions & 211 deletions

‎apps/web/src/browser/BrowserSurfaceSlot.tsx‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { useLayoutEffect, useRef } from "react";
44

55
import { acquireBrowserSurface } from "./browserSurfaceStore";
6+
import { observeResize } from "../lib/observeResize";
67

78
export function BrowserSurfaceSlot(props: {
89
readonly tabId: string;
@@ -62,22 +63,20 @@ export function BrowserSurfaceSlot(props: {
6263
};
6364
updateRef.current = update;
6465
update();
65-
const observer = new ResizeObserver(update);
66-
observer.observe(element);
66+
const observed: Element[] = [element];
6767
// Inline panels animate their outer width while keeping the content at
6868
// full width. The slot moves without resizing, so measure on shell resizes too.
6969
const panel = element.closest('[data-preview-panel-mode="inline"]');
70-
if (panel) observer.observe(panel);
70+
if (panel) observed.push(panel);
7171
// A sidebar opening or closing shifts the whole column, so a slot that keeps
7272
// its size and its offset inside the column (the mini player on the left)
7373
// still moves on screen. The gap element carries the sidebar's width.
74-
for (const gap of document.querySelectorAll('[data-slot="sidebar-gap"]')) {
75-
observer.observe(gap);
76-
}
74+
observed.push(...document.querySelectorAll('[data-slot="sidebar-gap"]'));
75+
const stopObserving = observeResize(observed, update);
7776
window.addEventListener("resize", update);
7877
window.addEventListener("scroll", update, true);
7978
return () => {
80-
observer.disconnect();
79+
stopObserving();
8180
window.removeEventListener("resize", update);
8281
window.removeEventListener("scroll", update, true);
8382
if (updateRef.current === update) updateRef.current = null;

‎apps/web/src/browser/ServerBrowserSurface.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import { Input } from "~/components/ui/input";
4141
import { toastManager } from "~/components/ui/toast";
4242
import { cn } from "~/lib/utils";
4343
import { refreshPreviewStreamAccess, usePreviewStreamAccess } from "~/state/previewStream";
44+
import { observeResize } from "~/lib/observeResize";
4445

4546
/** Chrome-row controls for a server tab; commands require current ownership. */
4647
export interface ServerBrowserHandle {
@@ -354,14 +355,13 @@ export function ServerBrowserSurface(props: {
354355
},
355356
);
356357
};
357-
const observer = new ResizeObserver(() => {
358+
const stopObserving = observeResize(element, () => {
358359
if (timer !== null) clearTimeout(timer);
359360
// The first size connects right away; later ones settle before resizing the page.
360361
timer = setTimeout(measure, sizeRef.current === null ? 0 : RESIZE_DEBOUNCE_MS);
361362
});
362-
observer.observe(element);
363363
return () => {
364-
observer.disconnect();
364+
stopObserving();
365365
if (timer !== null) clearTimeout(timer);
366366
};
367367
}, [followSize]);

‎apps/web/src/components/AnimatedHeight.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"use client";
22

33
import { type ReactNode, useEffect, useLayoutEffect, useRef, useState } from "react";
4+
import { observeResize } from "../lib/observeResize";
45

56
const HEIGHT_TRANSITION_FALLBACK_MS = 250;
67

@@ -69,10 +70,9 @@ export function AnimatedHeight({
6970
};
7071

7172
updateHeightAfterPaint();
72-
const resizeObserver = new ResizeObserver(updateHeightAfterPaint);
73-
resizeObserver.observe(element);
73+
const stopObserving = observeResize(element, updateHeightAfterPaint);
7474
return () => {
75-
resizeObserver.disconnect();
75+
stopObserving();
7676
cancelPendingFrames();
7777
};
7878
}, [holdHeight]);

‎apps/web/src/components/BranchToolbar.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import { useComposerMenuProps } from "./chat/composerEventScope";
6969
import { measureRestingComposerControls } from "./chat/restingComposerControlsMeasurement";
7070
import { resolveRestingComposerControlsNaturalWidth } from "./composerFooterLayout";
7171
import { cn } from "~/lib/utils";
72+
import { observeResize } from "~/lib/observeResize";
7273

7374
export interface BranchToolbarHandle {
7475
openBranchPicker: () => void;
@@ -580,11 +581,10 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
580581

581582
useEffect(() => {
582583
if (!element) return;
583-
const observer = new ResizeObserver(measure);
584-
observer.observe(element);
584+
const stopObserving = observeResize(element, measure);
585585
document.fonts.addEventListener("loadingdone", measure);
586586
return () => {
587-
observer.disconnect();
587+
stopObserving();
588588
document.fonts.removeEventListener("loadingdone", measure);
589589
};
590590
}, [element, measure]);

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ import { isCommandPaletteOpen } from "../commandPaletteBus";
241241
import { subscribeSnapShotComposerFocus } from "../lib/desktopSnapShot";
242242
import { useMediaQuery } from "../hooks/useMediaQuery";
243243
import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
244-
import { useElementWidth } from "../hooks/useElementWidth";
245244
import { usePreviewPanelInlineSize } from "../hooks/usePreviewPanelInlineSize";
246245
import {
247246
RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY,
@@ -606,6 +605,7 @@ import {
606605
ATTACHMENT_ONLY_BOOTSTRAP_PROMPT,
607606
recallableComposerPrompt,
608607
} from "./chat/composerPromptHistory";
608+
import { observeResize } from "~/lib/observeResize";
609609

610610
const EMPTY_PROVIDERS: ServerProvider[] = [];
611611
const EMPTY_PROVIDER_MODELS: ServerProvider["models"] = [];
@@ -1938,7 +1938,7 @@ export default function ChatView(props: ChatViewProps) {
19381938
useState<Record<string, number>>({});
19391939
const shouldUsePlanSidebarSheet = useMediaQuery(RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY);
19401940
const isMobileViewport = useMediaQuery("max-sm");
1941-
const [workspaceLayoutRef, workspaceLayoutWidth] = useElementWidth<HTMLDivElement>();
1941+
const [workspaceLayoutElement, setWorkspaceLayoutElement] = useState<HTMLDivElement | null>(null);
19421942
const threadPanelPopoverAnchorRef = useRef<HTMLElement | null>(null);
19431943
// Tracks whether the user explicitly dismissed the sidebar for the active turn.
19441944
// When set, the thread-change reset effect will open the sidebar instead of closing it.
@@ -2255,7 +2255,7 @@ export default function ChatView(props: ChatViewProps) {
22552255
// Electron hosts its own browser tabs; other clients need the environment to host them.
22562256
const browserAvailable = isPreviewSupportedInRuntime() || activeEnvironmentServerBrowser;
22572257
const previewPanelInlineSize = usePreviewPanelInlineSize(undefined, {
2258-
containerWidth: workspaceLayoutWidth ?? undefined,
2258+
container: workspaceLayoutElement,
22592259
widthStorageKey: `t3code:preview-panel-width:${activeThreadKey}`,
22602260
});
22612261
const activeThreadShell = useThreadShell(isServerThread ? activeThreadRef : null);
@@ -7053,13 +7053,7 @@ export default function ChatView(props: ChatViewProps) {
70537053
};
70547054

70557055
updateHeight();
7056-
if (typeof ResizeObserver === "undefined") return;
7057-
7058-
const resizeObserver = new ResizeObserver(updateHeight);
7059-
resizeObserver.observe(composerOverlayElement);
7060-
return () => {
7061-
resizeObserver.disconnect();
7062-
};
7056+
return observeResize(composerOverlayElement, updateHeight);
70637057
}, [composerOverlayElement, publishComposerOverlayHeight, showScrollToBottom]);
70647058
// Swapping the composer for the status bar (or back) changes what the
70657059
// overlay holds, so rebuild the reservation from the new content.
@@ -11248,7 +11242,7 @@ export default function ChatView(props: ChatViewProps) {
1124811242

1124911243
return (
1125011244
<div
11251-
ref={workspaceLayoutRef}
11245+
ref={setWorkspaceLayoutElement}
1125211246
className="relative flex min-h-0 min-w-0 flex-1 overflow-hidden bg-background"
1125311247
>
1125411248
<Dialog

‎apps/web/src/components/RightPanelTabs.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ import { previewBridge } from "./preview/previewBridge";
8181
import { PierreEntryIcon } from "./chat/PierreEntryIcon";
8282
import { resolvePullRequestState } from "./pullRequest/pullRequestPresentation";
8383
import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
84+
import { observeResize } from "~/lib/observeResize";
8485

8586
interface RightPanelTabsProps {
8687
mode: PreviewPanelMode;
@@ -1051,14 +1052,15 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
10511052
if (!viewport) return;
10521053

10531054
const content = viewport.firstElementChild;
1054-
const resizeObserver = new ResizeObserver(updateTabScrollState);
1055-
resizeObserver.observe(viewport);
1056-
if (content) resizeObserver.observe(content);
1055+
const stopObserving = observeResize(
1056+
content ? [viewport, content] : viewport,
1057+
updateTabScrollState,
1058+
);
10571059
viewport.addEventListener("scroll", updateTabScrollState, { passive: true });
10581060
updateTabScrollState();
10591061

10601062
return () => {
1061-
resizeObserver.disconnect();
1063+
stopObserving();
10621064
viewport.removeEventListener("scroll", updateTabScrollState);
10631065
};
10641066
}, [updateTabScrollState]);

‎apps/web/src/components/chat/AssistantCitationChip.tsx‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
import { Link, useNavigate } from "@tanstack/react-router";
77
import { ArrowUpRightIcon, PencilIcon, QuoteIcon } from "lucide-react";
88
import {
9+
useCallback,
910
useEffect,
1011
useEffectEvent,
1112
useRef,
@@ -30,6 +31,7 @@ import { AssistantCitationCommentEditor } from "./AssistantCitationCommentEditor
3031
import { resolveAssistantCitationCommentDismissal } from "./assistantCitationCommentDismissal";
3132
import { observeAssistantCitationCommentSource } from "./AssistantCitationSource";
3233
import { composerFloatingLayerProps } from "./composerEventScope";
34+
import { observeResize } from "~/lib/observeResize";
3335

3436
export function AssistantCitationChip({
3537
citation,
@@ -242,21 +244,22 @@ export function AssistantCitationChip({
242244

243245
function AssistantCitationQuote({ citation }: { citation: AssistantCitation }) {
244246
const [fade, setFade] = useState({ top: false, bottom: false });
245-
const updateFade = (element: HTMLElement) => {
247+
const updateFade = useCallback((element: HTMLElement) => {
246248
const top = element.scrollTop > 1;
247249
const bottom = element.scrollHeight - element.clientHeight - element.scrollTop > 1;
248250
setFade((current) =>
249251
current.top === top && current.bottom === bottom ? current : { top, bottom },
250252
);
251-
};
253+
}, []);
254+
// Stable so a fade update during resize delivery does not resubscribe the element.
255+
const observeFade = useCallback(
256+
(element: HTMLDivElement | null) =>
257+
element ? observeResize(element, () => updateFade(element)) : undefined,
258+
[updateFade],
259+
);
252260
return (
253261
<div
254-
ref={(element) => {
255-
if (!element) return;
256-
const observer = new ResizeObserver(() => updateFade(element));
257-
observer.observe(element);
258-
return () => observer.disconnect();
259-
}}
262+
ref={observeFade}
260263
onScroll={(event) => updateFade(event.currentTarget)}
261264
className={cn(
262265
"max-h-64 min-h-0 space-y-3 self-stretch overflow-y-auto whitespace-pre-wrap wrap-break-word",

‎apps/web/src/components/chat/AssistantCitationSource.test.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ function createSource({ reducedMotion = false } = {}) {
141141
};
142142
const mutationCallbacks = new Set<MutationCallback>();
143143
let resize: ResizeObserverCallback = () => {};
144+
const resizeEntries: ResizeObserverEntry[] = [];
144145
vi.stubGlobal(
145146
"MutationObserver",
146147
class {
@@ -159,7 +160,9 @@ function createSource({ reducedMotion = false } = {}) {
159160
constructor(callback: ResizeObserverCallback) {
160161
resize = callback;
161162
}
162-
observe() {}
163+
observe(target: Element) {
164+
resizeEntries.push({ target } as ResizeObserverEntry);
165+
}
163166
disconnect() {
164167
resize = () => {};
165168
}
@@ -298,7 +301,7 @@ function createSource({ reducedMotion = false } = {}) {
298301
root.animations.at(-1)?.finish();
299302
await Promise.resolve();
300303
},
301-
resize: () => resize([], {} as ResizeObserver),
304+
resize: () => resize(resizeEntries, {} as ResizeObserver),
302305
setMeasured: (value: boolean) => {
303306
measured = value;
304307
},

‎apps/web/src/components/chat/AssistantCitationSource.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
type AssistantCitationSourceAnchor,
77
} from "~/lib/assistantTextSelection";
88
import { toastManager } from "../ui/toast";
9+
import { observeResize } from "~/lib/observeResize";
910

1011
const CITATION_PULSE_DURATION_MS = 650;
1112
// The second pulse settles into a held highlight so late glances still find the quote.
@@ -303,9 +304,7 @@ export function observeAssistantCitationSource({
303304
}
304305
});
305306
observer.observe(scrollNode, { childList: true, characterData: true, subtree: true });
306-
const resizeObserver = new ResizeObserver(schedule);
307-
resizeObserver.observe(root);
308-
resizeObserver.observe(scrollNode);
307+
const stopObservingResize = observeResize([root, scrollNode], schedule);
309308
const state = list.getState();
310309
const unsubscribe = [
311310
state.listenToPosition(itemKey, schedule),
@@ -334,7 +333,7 @@ export function observeAssistantCitationSource({
334333
pulseAnimation?.cancel();
335334
if (frame !== null) cancelAnimationFrame(frame);
336335
observer.disconnect();
337-
resizeObserver.disconnect();
336+
stopObservingResize();
338337
for (const stop of unsubscribe) stop();
339338
if (activation.cancelScroll === cancelScroll) delete activation.cancelScroll;
340339
clear();

‎apps/web/src/components/chat/ChatCanvas.tsx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {
77
type ComponentProps,
88
type CSSProperties,
99
} from "react";
10-
import { flushSync } from "react-dom";
1110
import { ChatCanvasContext } from "./ChatCanvasContext";
1211
import { resolveChatCanvasLayout, type ChatCanvasPreview } from "./chatCanvasLayout";
1312
import type { PreviewMiniPlayerObstacles } from "../preview/previewMiniPlayerLayout";
13+
import { observeResize } from "../../lib/observeResize";
1414

1515
/**
1616
* Owns the available conversation space. Cards only report where they sit; the
@@ -91,12 +91,10 @@ export function ChatCanvas({
9191
);
9292
};
9393
measure();
94-
const observer = new ResizeObserver(() => flushSync(measure));
95-
observer.observe(element);
96-
observer.observe(probe);
97-
if (composerOverlayElement) observer.observe(composerOverlayElement);
98-
if (timelineElement) observer.observe(timelineElement);
99-
return () => observer.disconnect();
94+
const observed: Element[] = [element, probe];
95+
if (composerOverlayElement) observed.push(composerOverlayElement);
96+
if (timelineElement) observed.push(timelineElement);
97+
return observeResize(observed, measure);
10098
}, [composerOverlayElement, timelineElement]);
10199
const context = useMemo(() => {
102100
const container = { width: measurements.width, height: measurements.height };

0 commit comments

Comments
 (0)