1 files changed, 35 insertions, 12 deletions

diff --git a/tools/pager-swipe-fly-test.js b/tools/pager-swipe-fly-test.js
index 6f62007..707aad6 100644
--- a/tools/pager-swipe-fly-test.js
+++ b/tools/pager-swipe-fly-test.js
@@ -1,8 +1,9 @@
 // On a phone, a fast flick up or down in the media pager flies past several
 // posts and lands snapped on one, the way a spin of the wheel does; a
 // gentler swipe is one post, as before; a fling at the end lands on the
-// last post rather than wrapping past it; a finger put down mid-flight
-// catches it. Run: bun tools/pager-swipe-fly-test.js
+// last post rather than wrapping past it; a tap mid-flight stops it on the
+// post most on screen, and a swipe back from there goes to the one before.
+// Run: bun tools/pager-swipe-fly-test.js
 import puppeteer from './puppeteer.js';
 import { cacheKeyFor } from '../src/wallet.js';
 import { generateSecretKey, getPublicKey, finalizeEvent } from 'nostr-tools/pure';
@@ -141,17 +142,39 @@ try {
   check('a fast flick whose last move was handled 300ms late still flies', typeof (await at()) === 'number' && (await at()) >= 5, String(await at()));
   while ((await at()) !== 1) { await page.keyboard.press('ArrowUp'); await settled(); }
 
-  console.log('\n[a finger down mid-flight catches it]');
+  console.log('\n[a tap mid-flight stops it on the post most on screen]');
+  // the post most on screen as the finger comes down (its number), then the touch, in one go
+  const down = () => page.evaluate(() => {
+    const sc = document.querySelector('.mp-scroll'), y = sc.scrollTop;
+    const g = [...sc.querySelectorAll(':scope > .mp-group:not(.mp-wait):not(.mp-off)')].reduce((b, x) => (Math.abs(x.offsetTop - y) < Math.abs(b.offsetTop - y) ? x : b));
+    const target = window.__tt = document.elementFromPoint(195, 500), t = new Touch({ identifier: 2, target, clientX: 195, clientY: 500, pageX: 195, pageY: 500 });
+    target.dispatchEvent(new TouchEvent('touchstart', { bubbles: true, cancelable: true, touches: [t], changedTouches: [t], targetTouches: [t] }));
+    return Number(/p(\d+)\.png/.exec(g.querySelector('.mp-slide').getAttribute('data-k'))[1]);
+  });
+  // the same finger moving (to y), or lifted there
+  const finger = (y, up) => page.evaluate(([y, up]) => {
+    const target = window.__tt, t = new Touch({ identifier: 2, target, clientX: 195, clientY: y, pageX: 195, pageY: y });
+    target.dispatchEvent(new TouchEvent(up ? 'touchend' : 'touchmove', { bubbles: true, cancelable: true, touches: up ? [] : [t], changedTouches: [t], targetTouches: up ? [] : [t] }));
+  }, [y, up]);
   await swipe(600, 80, 3);
-  await sleep(120);
-  const mid = await page.evaluate(() => document.querySelector('.mp-scroll').scrollTop);
-  await page.touchscreen.touchStart(195, 500);
-  await page.touchscreen.touchMove(195, 480); await sleep(30);
-  await page.touchscreen.touchMove(195, 470); await sleep(200);
-  const held = await page.evaluate(() => document.querySelector('.mp-scroll').scrollTop);
-  await page.touchscreen.touchEnd(); await settled();
-  check('the flight stops under the finger', mid > 0 && Math.abs(held - mid) < 844, mid + ' → ' + held);
-  check('…and lands square on a post when it lifts', (await at()) !== 'between', String(await at()));
+  await sleep(150);
+  const flying = await page.evaluate(() => document.querySelector('.mp-scroll').scrollTop);
+  const most = await down();
+  await sleep(60); await finger(500, true);
+  await sleep(250);
+  check('a tap mid-flight: on the post most on screen in a moment', flying > 0 && (await at()) === most, most + ' wanted, ' + (await at()));
+  await settled();
+  check('…and stays there', (await at()) === most, String(await at()));
+  check('…the tap only stopped it (no details brought up)', !(await page.evaluate(() => document.querySelector('.media-pager').classList.contains('show'))));
+
+  console.log('\n[a swipe back mid-flight: the post before]');
+  while ((await at()) !== 1) { await page.keyboard.press('ArrowUp'); await settled(); }
+  await swipe(600, 80, 3);
+  await sleep(150);
+  const most2 = await down();
+  for (const y of [520, 560, 640, 760]) { await finger(y); await sleep(20); }
+  await finger(760, true); await settled();
+  check('caught on post ' + most2 + ' and swiped back: post ' + (most2 - 1), most2 > 1 && (await at()) === most2 - 1, String(await at()));
   check('no page errors', errs.length === 0, errs.slice(0, 2).join(' | '));
 } catch (e) { console.error(e); ok = false; } finally { await browser.close(); server.stop(true); }
 console.log(ok ? '\n✅ a fast flick flies through the pager' : '\n❌ failed');