Skip to content

Commit d6b53b8

Browse files
fix(web): keep browser pages aligned during panel animations
1 parent e26af33 commit d6b53b8

2 files changed

Lines changed: 114 additions & 0 deletions

File tree

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
import { act } from "react";
2+
import { create, type ReactTestRenderer } from "react-test-renderer";
3+
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
4+
5+
import { BrowserSurfaceSlot } from "./BrowserSurfaceSlot";
6+
import { useBrowserSurfaceStore } from "./browserSurfaceStore";
7+
8+
interface MeasuredElement {
9+
getBoundingClientRect: () => { x: number; y: number; width: number; height: number };
10+
}
11+
12+
class LayoutResizeObserver {
13+
static observers = new Set<LayoutResizeObserver>();
14+
readonly sizes = new Map<MeasuredElement, string>();
15+
16+
constructor(readonly callback: () => void) {
17+
LayoutResizeObserver.observers.add(this);
18+
}
19+
20+
observe(element: MeasuredElement) {
21+
this.sizes.set(element, this.size(element));
22+
}
23+
24+
disconnect() {
25+
LayoutResizeObserver.observers.delete(this);
26+
}
27+
28+
size(element: MeasuredElement) {
29+
const { width, height } = element.getBoundingClientRect();
30+
return `${width}:${height}`;
31+
}
32+
33+
static deliverResizes() {
34+
for (const observer of this.observers) {
35+
let resized = false;
36+
for (const [element, previous] of observer.sizes) {
37+
const next = observer.size(element);
38+
if (next === previous) continue;
39+
observer.sizes.set(element, next);
40+
resized = true;
41+
}
42+
if (resized) observer.callback();
43+
}
44+
}
45+
}
46+
47+
let renderer: ReactTestRenderer | undefined;
48+
49+
beforeEach(() => {
50+
useBrowserSurfaceStore.setState({ activityByTabId: {}, byTabId: {} });
51+
vi.stubGlobal("window", new EventTarget());
52+
vi.stubGlobal("ResizeObserver", LayoutResizeObserver);
53+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
54+
vi.spyOn(console, "error").mockImplementation(() => undefined);
55+
});
56+
57+
afterEach(async () => {
58+
await act(() => renderer?.unmount());
59+
renderer = undefined;
60+
LayoutResizeObserver.observers.clear();
61+
vi.restoreAllMocks();
62+
vi.unstubAllGlobals();
63+
});
64+
65+
describe("BrowserSurfaceSlot", () => {
66+
it("follows an opening panel when the full-width slot moves without resizing", async () => {
67+
const tabId = "reopened-browser";
68+
let panelWidth = 0;
69+
const panel = {
70+
getBoundingClientRect: () => ({
71+
x: 1_280 - panelWidth,
72+
y: 0,
73+
width: panelWidth,
74+
height: 800,
75+
}),
76+
};
77+
const slot = {
78+
closest: () => panel,
79+
getBoundingClientRect: () => ({ x: 1_280 - panelWidth, y: 92, width: 539, height: 708 }),
80+
};
81+
82+
await act(() => {
83+
renderer = create(<BrowserSurfaceSlot tabId={tabId} visible />, {
84+
createNodeMock: () => slot,
85+
});
86+
});
87+
expect(useBrowserSurfaceStore.getState().byTabId[tabId]?.rect?.x).toBe(1_280);
88+
89+
for (const width of [180, 360, 540]) {
90+
await act(() => {
91+
panelWidth = width;
92+
LayoutResizeObserver.deliverResizes();
93+
});
94+
expect(useBrowserSurfaceStore.getState().byTabId[tabId]).toMatchObject({
95+
visible: true,
96+
rect: { x: 1_280 - width, y: 92, width: 539, height: 708 },
97+
});
98+
}
99+
100+
await act(() => renderer?.unmount());
101+
renderer = undefined;
102+
panelWidth = 0;
103+
LayoutResizeObserver.deliverResizes();
104+
expect(useBrowserSurfaceStore.getState().byTabId[tabId]).toMatchObject({
105+
visible: false,
106+
rect: { x: 740, y: 92, width: 539, height: 708 },
107+
});
108+
expect(LayoutResizeObserver.observers.size).toBe(0);
109+
});
110+
});

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ export function BrowserSurfaceSlot(props: {
6464
update();
6565
const observer = new ResizeObserver(update);
6666
observer.observe(element);
67+
// Inline panels animate their outer width while keeping the content at
68+
// full width. The slot moves without resizing, so measure on shell resizes too.
69+
const panel = element.closest('[data-preview-panel-mode="inline"]');
70+
if (panel) observer.observe(panel);
6771
window.addEventListener("resize", update);
6872
window.addEventListener("scroll", update, true);
6973
return () => {

0 commit comments

Comments
 (0)