diff --git a/client/src/mobile/components/MDayPager.test.tsx b/client/src/mobile/components/MDayPager.test.tsx index c3ec4a657..2009eee04 100644 --- a/client/src/mobile/components/MDayPager.test.tsx +++ b/client/src/mobile/components/MDayPager.test.tsx @@ -39,19 +39,20 @@ beforeEach(() => { }); describe('pagesFor', () => { - it('windows the selection with two days on either side, room for a second swipe', () => { - expect(pagesFor(DAYS, 3).map((p) => [p.dayId, p.active])).toEqual([ - [1, false], - [2, false], - [3, true], - [4, false], - [5, false], + it('has a page for every day and draws the selection with two days on either side', () => { + expect(pagesFor(DAYS, 3).map((p) => [p.dayId, p.active, p.near])).toEqual([ + [1, false, true], + [2, false, true], + [3, true, true], + [4, false, true], + [5, false, true], + [6, false, false], ]); }); - it('has no page beyond the first and last day', () => { - expect(pagesFor(DAYS, 1).map((p) => p.dayId)).toEqual([1, 2, 3]); - expect(pagesFor(DAYS, 6).map((p) => p.dayId)).toEqual([4, 5, 6]); + it('keeps the same pages whichever day is selected, so a run of swipes never meets an end', () => { + expect(pagesFor(DAYS, 1).map((p) => p.key)).toEqual(pagesFor(DAYS, 6).map((p) => p.key)); + expect(pagesFor(DAYS, 6).filter((p) => p.near).map((p) => p.dayId)).toEqual([4, 5, 6]); }); it('keeps a page for a selection that points at no day, with the first day as the way back', () => { @@ -69,7 +70,9 @@ describe('MDayPager', () => { expect(screen.getByText('page 2 live')).toBeInTheDocument(); const pages = Array.from(strip.children) as HTMLElement[]; - expect(pages.map((p) => p.hasAttribute('inert'))).toEqual([true, false, true, true]); + expect(pages.map((p) => p.hasAttribute('inert'))).toEqual([true, false, true, true, true, true]); + // Day 6 is three away: its page is there to swipe onto, its content is not drawn yet. + expect(screen.queryByText('page 6')).not.toBeInTheDocument(); expect(pages[0]).toHaveAttribute('aria-hidden', 'true'); expect(pages[1]).not.toHaveAttribute('aria-hidden'); }); @@ -166,7 +169,7 @@ describe('MDayPager', () => { } }); - it('puts the strip back on the current page when the window moves', () => { + it('puts the strip on the current page when the selection moves', () => { const { strip, rerender, onSelectDay } = setup(2); // jsdom keeps no scroll offset, so give the strip one to move. let scrollLeft = 0; diff --git a/client/src/mobile/components/MDayPager.tsx b/client/src/mobile/components/MDayPager.tsx index 2e119e5b7..166ba6107 100644 --- a/client/src/mobile/components/MDayPager.tsx +++ b/client/src/mobile/components/MDayPager.tsx @@ -4,11 +4,11 @@ import { tickHaptic } from '../../native/haptics'; import { pagesFor, type PagerItem } from './dayPagerPages'; /** - * Pages through the trip's days the way a native pager does: the current day - * and two on either side sit side by side in a horizontal scroll-snap strip - * (dayPagerPages.ts), so the finger drags real paper, the neighbour slides in - * with it, and a second swipe made while the first still snaps carries on to - * the day after. The browser's compositor owns the gesture. Momentum, rubber-banding at the first + * Pages through the trip's days the way a native pager does: every day is a + * page of a horizontal scroll-snap strip (dayPagerPages.ts), the current one + * and two on either side drawn, so the finger drags real paper, the neighbour + * slides in with it, and swipes made while the last one still snaps carry on + * as far as the trip goes. The browser's compositor owns the gesture. Momentum, rubber-banding at the first * and last day, axis locking against the vertical scroll and the swallowed tap * after a swipe are all the platform's own, in the PWA and the app alike. * @@ -16,8 +16,7 @@ import { pagesFor, type PagerItem } from './dayPagerPages'; * the swipe is decided, not once the snap has settled, which on iOS comes * a good while later. The day only changes once the strip has come to rest on * another page. Then - * the selection moves, the window of three shifts by one and the strip is put - * back on the centre page before the next paint, so nothing visibly jumps. + * the selection moves and the days around it draw their content. * Keys follow the day ids, so the page that slid in keeps its state (scroll * position, fetched route and weather) as it becomes the current one. * @@ -215,7 +214,7 @@ export default function MDayPager({ aria-hidden={page.active ? undefined : true} className={`relative w-full flex-none snap-center snap-always ${inFlow ? '' : 'h-full'}`} > - {renderDay(page.dayId, page.active)} + {page.near ? renderDay(page.dayId, page.active) : null} ))} diff --git a/client/src/mobile/components/dayPagerPages.ts b/client/src/mobile/components/dayPagerPages.ts index b20bda675..5f9d5a474 100644 --- a/client/src/mobile/components/dayPagerPages.ts +++ b/client/src/mobile/components/dayPagerPages.ts @@ -7,29 +7,28 @@ interface Page { key: string; dayId: number | null; active: boolean; + /** Drawn with its content; the pages further out are empty paper of the same width. */ + near: boolean; } -/** - * Pages kept either side of the selection. Two, not one: a second swipe that - * starts while the first is still snapping has to find a page beyond the - * neighbour, or it runs into the end of the strip and springs back instead of - * reaching the day after. - */ +/** Pages drawn with their content either side of the selection. */ const REACH = 2; -/** The window of pages around the selection. A selection that points at no - * day (the whole-trip view, or a day deleted remotely) still gets its page, - * with the first day next to it as a way back. */ +/** + * A page for every day, so quick swipes in a row never run into the end of the + * strip before the first has settled (they used to spring back after two days). + * Only the selection and REACH days either side draw their content. A selection + * that points at no day (the whole-trip view, or a day deleted remotely) still + * gets its page, with the first day next to it as a way back. + */ export function pagesFor(days: PagerItem[], selectedDayId: number | null): Page[] { const i = days.findIndex((d) => d.id === selectedDayId); if (i < 0) { const first = days[0]; return [ - { key: 'none', dayId: selectedDayId, active: true }, - ...(first ? [{ key: `d${first.id}`, dayId: first.id, active: false }] : []), + { key: 'none', dayId: selectedDayId, active: true, near: true }, + ...(first ? [{ key: `d${first.id}`, dayId: first.id, active: false, near: true }] : []), ]; } - return days - .slice(Math.max(0, i - REACH), i + REACH + 1) - .map((d) => ({ key: `d${d.id}`, dayId: d.id, active: d.id === days[i].id })); + return days.map((d, j) => ({ key: `d${d.id}`, dayId: d.id, active: j === i, near: Math.abs(j - i) <= REACH })); }