feat(editor): sheet landings, history and e2e for the finding layers

« Tout afficher » clears the search and keeps the sort. A landing waits
for the dialogs a move closed and for their focus restore. Helpers and
shell specs move to the dialog and sheet flow; new finding dialog spec
(entries, guards, flip, gone rule, Back and Forward over the layers).
This commit is contained in:
bchanot committed 2026-11-13 19:03:21 +01:00
1 parent 18085cecf8
commit 4731a3376a
21 files changed
+782 -474

No files matched your search

+70 -290
View File
@@ -1,5 +1,5 @@
import { fr } from '@/i18n/fr'
import type { CDPSession, Locator, Page, TestInfo } from '@playwright/test'
import type { Page, TestInfo } from '@playwright/test'
import { stepUpAdmin } from '../support/admin'
import {
expect,
@@ -12,12 +12,15 @@ import {
SECTIONS,
TABS,
closeCitations,
closeFinding,
draftPath,
expectNoDialog,
draftTitle,
editorActor,
historyButton,
openEditor,
openCitations,
openFinding,
openTab,
openSection,
pickAnnotation,
@@ -26,6 +29,7 @@ import {
seedDraft,
selectTab,
shapeWith,
showCitations,
showDrawing,
} from '../support/editor'
import { signIn } from '../support/shell'
@@ -52,18 +56,6 @@ async function open(page: Page) {
return { ...seed, actor }
}
/** Selects a finding in the tree of Constats (expanding down to it), the panel closed. */
async function selectFinding(page: Page, name: string) {
await openTab(page, dict, 'findings')
const item = page.getByRole('treeitem', { name })
for (let depth = 0; depth < 4 && (await item.count()) === 0; depth++) {
const closed = page.getByRole('treeitem', { expanded: false }).first()
await closed.focus()
await closed.press('ArrowRight')
}
await item.click()
}
/**
* Samples the document's size on every frame until stopped (the click that opens or
* closes the panel is inside the window): the distinct sizes seen come back.
@@ -92,58 +84,28 @@ async function watchDocumentSize(page: Page) {
}
const REM = 16
/** The panel's own padding (`p-4` top and bottom): its box cannot be shorter than this. */
const PANEL_PADDING_PX = 32
/**
* The panel is at most 34 rem and no wider than the viewport, and at scroll 0, halfway and
* at the end of the page its bottom is the nearer of the viewport's bottom and its
* container's bottom (its visible height is kept right on scroll).
* The sheet is a modal at the right edge: at most 34 rem and no wider than the viewport,
* as tall as the window whatever the page's scroll (it is in the top layer).
*/
async function expectPanelWithin(
page: Page,
viewportWidth: number,
cramped = false,
) {
async function expectSheetWithin(page: Page, viewportWidth: number) {
const layer = page.locator('[data-place="citations"]')
const box = await layer.boundingBox()
expect(box!.width).toBeLessThanOrEqual(34 * REM + 0.5)
expect(box!.width).toBeLessThanOrEqual(viewportWidth)
for (const at of [0, 0.5, 1]) {
await page.evaluate((share) => {
const root = document.documentElement
window.scrollTo(0, (root.scrollHeight - window.innerHeight) * share)
}, at)
await page.evaluate(
() => new Promise((done) => requestAnimationFrame(() => done(null))),
)
const edges = await page.evaluate(() => {
const container = document.querySelector('[data-place="citations"]')!
const panel = document.querySelector('#editor-citations-panel')!
const outer = container.getBoundingClientRect()
const inner = panel.getBoundingClientRect()
const viewport = window.visualViewport?.height ?? window.innerHeight
return {
panelBottom: inner.bottom,
expected: Math.min(viewport, outer.bottom),
panelTop: inner.top,
}
})
if (edges.expected - edges.panelTop < PANEL_PADDING_PX) {
// Only the landscape phone at scroll 0 may leave less room than the padding.
expect(
cramped && at === 0,
`panel room below its padding at scroll share ${at}`,
).toBe(true)
continue
}
expect(
Math.abs(edges.panelBottom - edges.expected),
`panel bottom at scroll share ${at}`,
).toBeLessThanOrEqual(1)
expect(edges.panelBottom).toBeGreaterThan(edges.panelTop)
}
await page.evaluate(() => window.scrollTo(0, 0))
const edges = await page.evaluate(() => {
const sheet = document.querySelector('[data-place="citations"]')!
const rect = sheet.getBoundingClientRect()
return { top: rect.top, bottom: rect.bottom, right: rect.right }
})
expect(edges.top, 'sheet top').toBeLessThanOrEqual(1)
expect(
Math.abs(edges.right - viewportWidth),
'sheet right edge',
).toBeLessThan(1)
const height = await page.evaluate(() => window.innerHeight)
expect(Math.abs(edges.bottom - height), 'sheet bottom').toBeLessThanOrEqual(1)
}
async function settle(page: Page) {
@@ -155,160 +117,6 @@ async function settle(page: Page) {
)
}
/** Opens the finding by taps only: the caret of a closed row opens the branch. */
async function tapFinding(page: Page, name: string) {
await openTab(page, dict, 'findings')
const item = page.getByRole('treeitem', { name })
for (let depth = 0; depth < 4 && (await item.count()) === 0; depth++) {
const closed = page.getByRole('treeitem', { expanded: false }).first()
await closed.locator('span').first().tap()
}
await item.tap()
}
/** The window's scrollY once two animation frames in a row agree (no fling left). */
async function stableScrollY(page: Page) {
let last = -1
for (let tries = 0; tries < 60; tries++) {
await settle(page)
const now = await page.evaluate(() => window.scrollY)
if (now === last) return now
last = now
}
throw new Error('the scroll never settled')
}
/** The trigger's box; `gap` is the room between its bottom and the viewport bottom. */
function triggerRect(trigger: Locator) {
return trigger.evaluate((el) => {
const box = el.getBoundingClientRect()
return {
top: box.top,
bottom: box.bottom,
gap: window.innerHeight - box.bottom,
}
})
}
/** One finger swipe on the page: `travel` > 0 moves the finger up (the page goes down). */
async function touchSwipe(page: Page, cdp: CDPSession, travel: number) {
const from = 340
const point = (y: number) => [{ x: 200, y }]
await cdp.send('Input.dispatchTouchEvent', {
type: 'touchStart',
touchPoints: point(from),
})
for (let step = 1; step <= 10; step++) {
const y = from - (travel * step) / 10
await cdp.send('Input.dispatchTouchEvent', {
type: 'touchMove',
touchPoints: point(y),
})
}
await cdp.send('Input.dispatchTouchEvent', {
type: 'touchEnd',
touchPoints: [],
})
return stableScrollY(page)
}
/** Finger travel of each reach swipe, well above the touch slop (a swipe <= ~60 px moves 0). */
const REACH_TRAVEL = 200
const REACH_MAX_SWIPES = 12
/**
* Swipes by touch only until the trigger is wholly on screen and hit-testable. Answers the
* swipe count; throws with the scrollY trace after REACH_MAX_SWIPES swipes.
*/
async function swipeUntilReached(
page: Page,
cdp: CDPSession,
trigger: Locator,
) {
const trace: number[] = []
for (let swipes = 0; swipes <= REACH_MAX_SWIPES; swipes++) {
const view = await probeInView(trigger)
if (view.inside && view.hit) return swipes
if (swipes < REACH_MAX_SWIPES)
trace.push(await touchSwipe(page, cdp, REACH_TRAVEL))
}
throw new Error(
`the trigger never came into view: scrollY after each swipe ${trace.join(' ')}`,
)
}
/** Scrolls at once so the trigger's bottom sits on the viewport bottom (clamped to the page). */
async function scrollToWorstCase(page: Page, trigger: Locator) {
await trigger.evaluate((el) => {
const max = document.documentElement.scrollHeight - window.innerHeight
const want =
window.scrollY + el.getBoundingClientRect().bottom - window.innerHeight
window.scrollTo({
top: Math.min(Math.max(Math.ceil(want), 0), max),
behavior: 'instant',
})
})
return stableScrollY(page)
}
/** Taps the trigger: the panel opens with heading and close in view, the page does not scroll. */
async function tapOpensInPlace(page: Page, trigger: Locator, scrollY: number) {
expect(await probeInView(trigger), 'trigger in view').toEqual({
inside: true,
hit: true,
})
await trigger.tap()
await expect(page.locator('#editor-citations-title')).toBeFocused()
expect(await stableScrollY(page), 'no scroll once the panel is open').toBe(
scrollY,
)
await expectPanelReachable(page)
}
/** Whether the element is wholly on screen and the topmost thing at its centre. */
function probeInView(target: Locator) {
return target.evaluate((el) => {
const box = el.getBoundingClientRect()
const at = document.elementFromPoint(
box.x + box.width / 2,
box.y + box.height / 2,
)
const inside =
box.top >= 0 &&
box.left >= 0 &&
box.bottom <= window.innerHeight &&
box.right <= window.innerWidth
return { inside, hit: !!at && el.contains(at) }
})
}
/** The open panel's heading and close button, in view and hit-testable, no scroll needed. */
async function expectPanelReachable(page: Page) {
const panel = page.locator('#editor-citations-panel')
const heading = page.locator('#editor-citations-title')
const close = panel.getByRole('button', {
name: dict['editor.references.close'],
})
const visible = await panel.evaluate(
(el) =>
Math.min(el.getBoundingClientRect().bottom, window.innerHeight) -
Math.max(el.getBoundingClientRect().top, 0),
)
test.info().annotations.push({
type: 'c4-measure',
description: `panel visible ${visible}`,
})
expect(visible).toBeGreaterThan(0)
expect(await probeInView(heading), 'heading').toEqual({
inside: true,
hit: true,
})
expect(await probeInView(close), 'close button').toEqual({
inside: true,
hit: true,
})
}
test.describe('editor shell layout (H)', () => {
test.use({ locale: 'fr-FR', actionTimeout: 15_000 })
test.beforeEach(async ({ context }, info) => {
@@ -319,7 +127,7 @@ test.describe('editor shell layout (H)', () => {
await dropLateReplays(context)
})
test('no horizontal scroll from 1 024 to 1 280 px on the five tabs, the three sections and the open citations panel', async ({
test('no horizontal scroll from 1 024 to 1 280 px on the five tabs, the three sections and the open citations sheet', async ({
page,
}) => {
test.setTimeout(150_000)
@@ -335,25 +143,26 @@ test.describe('editor shell layout (H)', () => {
await expectNoHorizontalOverflow(page, `${section} at ${width} px`)
}
await openCitations(page, dict, 'Constat A')
await expectNoHorizontalOverflow(page, `the panel at ${width} px`)
await expectNoHorizontalOverflow(page, `the sheet at ${width} px`)
await closeCitations(page, dict)
await closeFinding(page, dict)
}
})
test('the open panel is at most 34 rem and the viewport wide, and the document never changes size, before, during and after', async ({
test('the open sheet is at most 34 rem and the viewport wide, and the document never changes size, before, during and after', async ({
page,
}) => {
test.setTimeout(150_000)
await open(page)
for (const width of WIDTHS) {
await page.setViewportSize({ width, height: 800 })
await selectFinding(page, 'Constat A')
await openFinding(page, dict, 'Constat A')
const stop = await watchDocumentSize(page)
await page.locator('[data-citations-trigger]:visible').click()
await expect(page.locator('#editor-citations-title')).toBeFocused()
await expectPanelWithin(page, width)
await expectNoHorizontalOverflow(page, `the open panel at ${width} px`)
await showCitations(page)
await expectSheetWithin(page, width)
await expectNoHorizontalOverflow(page, `the open sheet at ${width} px`)
await closeCitations(page, dict)
await closeFinding(page, dict)
const sizes = await stop()
expect(
sizes,
@@ -396,7 +205,7 @@ test.describe('editor shell layout (H)', () => {
}
})
test('the canvas width is the same before the citations panel opens and after a tab switch closes it', async ({
test('the canvas width is the same before the citations sheet opens and after both layers close', async ({
page,
}) => {
test.setTimeout(150_000)
@@ -413,7 +222,9 @@ test.describe('editor shell layout (H)', () => {
description: `${before}px at ${width}px`,
})
await openCitations(page, dict, 'Constat A')
// The panel exists on Constats only: leaving for Annotations closes it (P21).
await page.keyboard.press('Escape')
await page.keyboard.press('Escape')
await expectNoDialog(page)
await selectTab(page, dict, 'annotations')
await expect(place(page, 'citations')).toHaveCount(0)
await expect(page.getByTestId('annotation-canvas')).toBeVisible()
@@ -421,7 +232,7 @@ test.describe('editor shell layout (H)', () => {
}
})
test('axe from the top on the five tabs, each section and the open citations panel', async ({
test('axe from the top on the five tabs, each section and the open dialog and sheet', async ({
page,
}) => {
test.setTimeout(150_000)
@@ -442,12 +253,14 @@ test.describe('editor shell layout (H)', () => {
await expect(page.locator('dialog[open]')).toHaveCount(0)
await expectAccessible(page, `${name} at ${width} px`)
}
await openCitations(page, dict, 'Constat A')
await openFinding(page, dict, 'Constat A')
await settle(page)
await page.evaluate(() => window.scrollTo(0, 0))
await expect(page.locator('dialog[open]')).toHaveCount(0)
await expectAccessible(page, `the open panel at ${width} px`)
await expectAccessible(page, `the finding dialog at ${width} px`)
await showCitations(page)
await settle(page)
await expectAccessible(page, `the open sheet at ${width} px`)
await closeCitations(page, dict)
await closeFinding(page, dict)
}
})
@@ -546,21 +359,31 @@ test.describe('editor shell keyboard order (H)', () => {
expect(order).toEqual(['tab', 'undo', 'redo', 'tools', 'canvas', 'side'])
})
test('with the panel open: tab list, Défaire, Refaire, the panel, then the page content', async ({
test('with the sheet open: Tab stays in the sheet; closed, the order is the page again', async ({
page,
}) => {
await open(page)
await openCitations(page, dict, 'Constat A')
const order = await walk(page, 'panel')
test.info().annotations.push({
type: 'keyboard-order-panel',
description: order.join(' > '),
})
expect(order).toEqual(['tab', 'undo', 'redo', 'panel'])
const met = new Set<Kind>()
for (let step = 0; step < 12; step++) {
await page.keyboard.press('Tab')
met.add(await focusKind(page))
}
// The page behind the dialogs is inert: the tab row, Défaire and Refaire are out of reach.
for (const kind of [
'tab',
'undo',
'redo',
'tools',
'canvas',
'side',
] as const) {
expect(met.has(kind), `Tab reached ${kind}`).toBe(false)
}
expect(met.has('panel')).toBe(true)
await page.keyboard.press('Escape')
await expect(page.locator('[data-place="citations"]:visible')).toHaveCount(
0,
)
await page.keyboard.press('Escape')
await expectNoDialog(page)
await selectTab(page, dict, 'annotations')
const after = await walk(page, 'side')
expect(after.slice(0, 3)).toEqual(['tab', 'undo', 'redo'])
@@ -569,7 +392,7 @@ test.describe('editor shell keyboard order (H)', () => {
})
})
test.describe('citations panel at 375 px, read-only (O4-2)', () => {
test.describe('citations sheet at 375 px, read-only (O4-2)', () => {
test.use({ locale: 'fr-FR', actionTimeout: 15_000 })
test.beforeEach(async ({ context }, info) => {
test.skip(!isPhone(info), 'the phone sizes are set by the test itself')
@@ -579,7 +402,7 @@ test.describe('citations panel at 375 px, read-only (O4-2)', () => {
await dropLateReplays(context)
})
test('full width, never wider than the screen, bottom on the viewport bottom through a height change and a rotation, the drawing box unchanged @phone', async ({
test('the whole screen, never wider than it, as tall as the window through a height change and a rotation, the drawing box unchanged @phone', async ({
page,
}) => {
test.setTimeout(150_000)
@@ -588,9 +411,7 @@ test.describe('citations panel at 375 px, read-only (O4-2)', () => {
const drawingBox = () => place(page, 'annotations.drawing').boundingBox()
await expect(place(page, 'annotations.drawing')).toBeVisible()
const drawing = await drawingBox()
await selectFinding(page, 'Constat A')
await page.locator('[data-citations-trigger]:visible').click()
await expect(page.locator('#editor-citations-title')).toBeFocused()
await openCitations(page, dict, 'Constat A')
for (const size of [
{ width: 375, height: 667 },
{ width: 375, height: 560 },
@@ -600,71 +421,30 @@ test.describe('citations panel at 375 px, read-only (O4-2)', () => {
await page.evaluate(
() => new Promise((done) => requestAnimationFrame(() => done(null))),
)
await expectPanelWithin(page, size.width, size.width === 667)
await expectSheetWithin(page, size.width)
await expectNoHorizontalOverflow(
page,
`the panel at ${size.width} x ${size.height}`,
`the sheet at ${size.width} x ${size.height}`,
)
}
await page.setViewportSize({ width: 375, height: 667 })
await closeCitations(page, dict)
await closeFinding(page, dict)
await openTab(page, dict, 'annotations')
await expect(place(page, 'annotations.drawing')).toBeVisible()
expect(await drawingBox()).toEqual(drawing)
})
test('667 x 375: reached by touch; at the worst case the panel stays in view @phone', async ({
test('the document size does not change while the dialog and the sheet open and close @phone', async ({
page,
}) => {
test.setTimeout(150_000)
await open(page)
await page.setViewportSize({ width: 667, height: 375 })
await tapFinding(page, 'Constat A')
const trigger = page.locator('[data-citations-trigger]:visible')
await expect(trigger).toBeVisible()
await page.evaluate(() => window.scrollTo(0, 0))
expect(await stableScrollY(page), 'start at the top').toBe(0)
const start = await triggerRect(trigger)
// A. Reachability by touch swipes only (CDP touch events, no keyboard, no programmatic scroll).
const cdp = await page.context().newCDPSession(page)
const swipes = await swipeUntilReached(page, cdp, trigger)
const reached = await stableScrollY(page)
expect(reached, 'the page scrolled by touch').toBeGreaterThan(0)
await tapOpensInPlace(page, trigger, reached)
const close = page.getByRole('button', {
name: dict['editor.references.close'],
})
await close.tap()
await expect(place(page, 'citations')).toHaveCount(0)
// B. Worst case: the trigger's bottom exactly on the viewport bottom. Set by window.scrollTo
// because touch has a slop floor and a load-dependent gain, so a pixel-exact touch landing
// is not deterministic; A already proves the trigger is reachable by touch.
const worst = await scrollToWorstCase(page, trigger)
const end = await triggerRect(trigger)
test.info().annotations.push({
type: 'c4-measure',
description:
`top=${start.top} bottom=${start.bottom}; A swipes=${swipes} y=${reached}; ` +
`B gap=${end.gap} y=${worst}`,
})
expect(
end.gap,
'trigger gap to the viewport bottom',
).toBeGreaterThanOrEqual(0)
expect(end.gap, 'trigger gap to the viewport bottom').toBeLessThanOrEqual(1)
await tapOpensInPlace(page, trigger, worst)
})
test('the document size does not change while the panel opens and closes @phone', async ({
page,
}) => {
test.setTimeout(150_000)
await open(page)
await selectFinding(page, 'Constat A')
await openFinding(page, dict, 'Constat A')
const stop = await watchDocumentSize(page)
await page.locator('[data-citations-trigger]:visible').click()
await expect(page.locator('#editor-citations-title')).toBeFocused()
await showCitations(page)
await closeCitations(page, dict)
await closeFinding(page, dict)
expect(await stop()).toHaveLength(1)
})
})