From 929d83b3b691ee51a3ea8903a010f956fc5ec0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 22 Oct 2026 14:50:01 +0200
Subject: [PATCH] test(e2e): record the whole drag instead of one fixed-time
 sample

---
 e2e/bottom-sheet.spec.ts | 58 +++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/e2e/bottom-sheet.spec.ts b/e2e/bottom-sheet.spec.ts
index 0e5d958f8..be83e5978 100644
--- a/e2e/bottom-sheet.spec.ts
+++ b/e2e/bottom-sheet.spec.ts
@@ -223,26 +223,46 @@ test.describe("the bottom sheet", () => {
     await expect(more(page)).toBeVisible();
     const before = await topOf(more(page));
     const { x, y } = await centre(more(page).getByRole("heading").first());
-    // Dragging: the sheet follows the finger and the backdrop lightens.
-    const during = page.evaluate(
-      () =>
-        new Promise<{ moved: number; opacity: number }>((resolve) => {
-          setTimeout(() => {
-            const sheet = document.querySelector(
-              '[data-testid="bottom-nav-more-sheet"]',
-            ) as HTMLElement;
-            const overlay = document.querySelector(
-              '[data-slot="sheet-overlay"]',
-            ) as HTMLElement;
-            resolve({
-              moved: new DOMMatrix(getComputedStyle(sheet).transform).f,
-              opacity: Number(getComputedStyle(overlay).opacity),
-            });
-          }, 380);
-        }),
-    );
+    // Dragging: the sheet follows the finger and the backdrop lightens. A
+    // frame loop records the furthest the sheet travelled and the lightest
+    // the backdrop got for the whole gesture, so a slow runner cannot make
+    // a single fixed-time sample land before the drag has begun.
+    await page.evaluate(() => {
+      const w = window as unknown as {
+        __sheetDrag?: { moved: number; opacity: number; on: boolean };
+      };
+      w.__sheetDrag = { moved: 0, opacity: 1, on: true };
+      const tick = () => {
+        const rec = w.__sheetDrag!;
+        if (!rec.on) return;
+        const sheet = document.querySelector(
+          '[data-testid="bottom-nav-more-sheet"]',
+        ) as HTMLElement | null;
+        const overlay = document.querySelector(
+          '[data-slot="sheet-overlay"]',
+        ) as HTMLElement | null;
+        if (sheet) {
+          const moved = new DOMMatrix(getComputedStyle(sheet).transform).f;
+          rec.moved = Math.max(rec.moved, moved);
+        }
+        if (overlay) {
+          rec.opacity = Math.min(
+            rec.opacity,
+            Number(getComputedStyle(overlay).opacity),
+          );
+        }
+        requestAnimationFrame(tick);
+      };
+      requestAnimationFrame(tick);
+    });
     await touchDrag(page, x, y, { dy: 60, ms: 300, holdMs: 200 });
-    const seen = await during;
+    const seen = await page.evaluate(() => {
+      const w = window as unknown as {
+        __sheetDrag: { moved: number; opacity: number; on: boolean };
+      };
+      w.__sheetDrag.on = false;
+      return { moved: w.__sheetDrag.moved, opacity: w.__sheetDrag.opacity };
+    });
     expect(seen.moved).toBeGreaterThan(40);
     expect(seen.opacity).toBeLessThan(1);
     await settled(more(page));