Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

fix(ok): settle header layout before the drag-region geometry read (#4197)

Nick Gomez1d1c276abbe3
diff --git a/packages/desktop/tests/smoke/window-chrome.e2e.ts b/packages/desktop/tests/smoke/window-chrome.e2e.ts
index eed9c929a..352a58ceb 100644
--- a/packages/desktop/tests/smoke/window-chrome.e2e.ts
+++ b/packages/desktop/tests/smoke/window-chrome.e2e.ts
@@ -18,6 +18,10 @@ const TARGET = resolveDesktopTarget();
const DARWIN = process.platform === 'darwin';
+const HEADER_SETTLE_FRAMES = 4;
+
+const PROBE_INSET_PX = 4;
+
interface SeededHome {
tmpHome: string;
projectDir: string;
@@ -145,14 +149,49 @@ test.describe('Editor header drag-region smoke', () => {
await expect(filesToggle).toBeVisible();
await filesToggle.click();
await expect
- .poll(() =>
- editor.evaluate(() =>
- document.querySelector('[data-slot="sidebar"]')?.getAttribute('data-state'),
- ),
+ .poll(
+ () =>
+ editor.evaluate(
+ (frames) =>
+ new Promise<string>((resolve) => {
+ const headerGeometrySignature = () => {
+ const sidebar = document.querySelector('[data-slot="sidebar"]');
+ const leadingActions = document.querySelector(
+ '[data-editor-header-leading-actions]',
+ );
+ const overflowRoot = document.querySelector('[data-editor-tab-overflow-root]');
+ if (!sidebar || !leadingActions || !overflowRoot)
+ return 'header chrome not mounted';
+ const leading = leadingActions.getBoundingClientRect();
+ const overflow = overflowRoot.getBoundingClientRect();
+ return `${sidebar.getAttribute('data-state')} leadingRight=${leading.right} overflowLeft=${overflow.left} overflowWidth=${overflow.width}`;
+ };
+ const readings = [headerGeometrySignature()];
+ const sample = () => {
+ readings.push(headerGeometrySignature());
+ if (readings.length > frames) {
+ const settled = readings.every((reading) => reading === readings[0]);
+ resolve(
+ settled
+ ? readings[0]
+ : `still moving after ${frames} frames: ${readings[0]} -> ${readings[readings.length - 1]}`,
+ );
+ return;
+ }
+ requestAnimationFrame(sample);
+ };
+ requestAnimationFrame(sample);
+ }),
+ HEADER_SETTLE_FRAMES,
+ ),
+ {
+ timeout: 5_000,
+ message: 'editor header geometry did not settle after the sidebar collapsed',
+ },
)
- .toBe('collapsed');
+ .toMatch(/^collapsed /);
- const appRegions = await editor.evaluate(() => {
+ const appRegions = await editor.evaluate((probeInsetPx) => {
const requireElement = (selector: string): HTMLElement => {
const element = document.querySelector<HTMLElement>(selector);
if (!element) throw new Error(`Missing drag-region fixture: ${selector}`);
@@ -179,20 +218,21 @@ test.describe('Editor header drag-region smoke', () => {
const shareButtonRect = shareButton.getBoundingClientRect();
const trailingActionsRect = trailingActions.getBoundingClientRect();
const leadingGapPx = overflowRootRect.left - leadingActionsRect.right;
- const hasLeadingGap = leadingGapPx > 4;
const probeLeadingGapRegion = () => {
- if (!hasLeadingGap) return true;
- const probeX = leadingActionsRect.right + Math.min(4, leadingGapPx / 2);
+ const measured = `${leadingGapPx.toFixed(2)}px`;
+ if (leadingGapPx <= 0) return `tab strip reaches the leading actions (${measured})`;
+ if (leadingGapPx <= probeInsetPx) return `leading gap too narrow to probe (${measured})`;
+ const probeX = leadingActionsRect.right + Math.min(probeInsetPx, leadingGapPx / 2);
const probeY = (leadingActionsRect.top + leadingActionsRect.bottom) / 2;
const probeElement = document.elementFromPoint(probeX, probeY);
- if (!(probeElement instanceof HTMLElement)) return false;
- return appRegion(probeElement) === 'drag';
+ if (!(probeElement instanceof HTMLElement)) return 'leading gap covered by no element';
+ return appRegion(probeElement);
};
return {
filesButton: appRegionFor('[data-editor-header-leading-actions] [data-sidebar="trigger"]'),
headerCanvas: appRegionFor('header[data-electron-drag]'),
- leadingGapIsDraggable: probeLeadingGapRegion(),
+ leadingGapRegion: probeLeadingGapRegion(),
leadingActions: appRegion(leadingActions),
newTabButton: appRegionFor('[data-testid="editor-new-tab-button"]'),
overflowRoot: appRegion(overflowRoot),
@@ -209,12 +249,12 @@ test.describe('Editor header drag-region smoke', () => {
precedes(tabsHost, leadingActions) && precedes(tabsHost, trailingActions),
trailingActions: appRegion(trailingActions),
};
- });
+ }, PROBE_INSET_PX);
expect(appRegions).toEqual({
filesButton: 'no-drag',
headerCanvas: 'drag',
- leadingGapIsDraggable: true,
+ leadingGapRegion: 'drag',
leadingActions: 'drag',
newTabButton: 'no-drag',
overflowRoot: 'drag',