U2 Task 6 (A1, A2, A3, A9, A10, R-3, R-5, R-6, R-14, R-16). - Dialog: `anchor` places the panel at the column's left and width, from its top, under a 22 % ink veil that ignores clicks; the visual viewport below 320 px; centred without an anchor box. - Navigation: `annotation` layer (LAYERS, EditorView, history entry, leave guards, left-draft flag); Back closes, Forward reopens. - AnnotationDialog: read body, « Modifier » form (CreationFields with « Couleur », missingFields, R-3 messages), one `update` on the current annotation by id, « Marquer comme relu », « Modifier la forme », « Supprimer »; read-only flip keeps the draft. - The column always shows the overview, selected row marked; Enter on it, a second click or a double click, the strip's « Propriétés » open the dialog. « Aller à » focuses the row (R-5). - Read-only twin: strip and read-only dialog at 1 024 px and wider, inline read body below. PropertiesPanel and AnnotationFields gone. - Strip lead 256 px and a fixed status slot, so the commands fit at 1 024 px and a status change moves nothing. - e2e: `aside-content` exemption removed; scroll-to-top workarounds of editor-geometry, editor-zones and editor-journey removed. Removed assertions mapped: editor-annotations-tab.test.tsx: - selectFromList waited for `annotation-properties` -> waits for the strip's « Propriétés » (selection without dialog, A1) - refused place: issues block `annotation-geometry-issues` in the panel -> the strip notice alert (present, then gone) - keyboard creation / C26 confirmation: `annotation-properties` after create -> strip « Propriétés » (new element selected) - Désélectionner from the panel -> « Désélectionner » in the strip (all 7 tests); « panel closes » -> strip has no « Propriétés » - undo after deselect (typed name) -> handle key series then deselect then undo - commits a valid typed value once without blur (name field) -> a pending handle key series committed once by the strip deselect - a refused typed value: the panel closes (two tests: strip deselect, tap deselect) -> removed: no field outside the dialog; the dialog's draft writes nothing before « Enregistrer » (new dialog tests) - not offered while a replace tracing runs: panel's Désélectionner absent -> strip offers neither « Désélectionner » nor « Propriétés » during the tracing - tap: isDeselected read `annotation-properties` -> strip « Propriétés » absent; link select -> strip title data-selection - tap: undo after tap deselect (typed name) -> handle series; typed value committed on blur -> handle series committed on blur - strip geometry issues: list read in the panel -> list read in the properties dialog's issues block - a new commit replaces the message (typed name) -> « Marquer comme relu » in the dialog editor-escape.test.tsx: - `panel()` = `annotation-properties` -> the strip's « Propriétés » or the phone twin's inline read body - Escape from a panel button (« Marquer comme relu ») -> from the selected row in the side column: focus on the row - after A then B from the panel (via « Toutes les annotations ») -> select A, select B, Escape from a button of the side column: focus on B's row - a text field (panel « Nom (FR) ») -> the overview « Filtrer par nom » - redraw via the panel's « Remplacer par un polygone » -> the strip's command - modal / delete dialog opened by the panel's « Supprimer » -> « Supprimer » of the properties dialog - read-only width: hidden `annotation-properties` -> hidden strip « Propriétés » of the kept edit body editor-history-buttons.test.tsx (typed text and the press, 8 tests): the annotation's committed « Nom (FR) » field of the panel -> the sheet's committed « Nom (FR) » on Général (same TextField commit-on-blur path; annotation fields are now a dialog draft) editor-focus-request.test.tsx: « Aller à » focuses `data-properties-heading` inside `annotation-properties` -> focuses the annotation's row, marked aria-current, no dialog (R-5) editor-sections.test.tsx: « Aller à » with nothing in progress focused the properties heading -> focuses the row (R-5); creation kept: no `annotation-properties` -> no strip « Propriétés » editor-overview.test.tsx (edit and read-only): row opens `annotation-properties`, « Toutes les annotations » returns -> row selects, stays marked aria-current, no dialog; strip « Désélectionner » returns focus to the row; filter kept across select and « Désélectionner » editor-citations-guards.test.tsx: LAYERS_TOP_DOWN gains 'annotation' at the bottom editor-keep-alive.test.tsx: `annotation-properties` visible after the round trip -> the strip's « Propriétés » visible (selection kept) editor-no-loss.test.tsx: ids `ro-annotation-name-fr` and `annotation-name-fr` (both panels' fields) -> the twin's inline read body (no ids), then the dialog edit form's `annotation-edit-fr`, kept through a flip to 800 px, no duplicate id; « Aller à » visible `annotation-properties` -> visible `annotation-read` (inline twin), none at 1 280 editor-point-edit.test.tsx / editor-zone-edit.test.tsx: `select()` waited for `annotation-properties` and returned it -> waits for the strip's « Propriétés » and returns the strip (its « Désélectionner » and « Remplacer par un polygone » moved there) - move mode Escape: `annotation-properties` still there -> the strip's « Propriétés » back after the mode - « Toutes les annotations » asks first during a started move -> Enter on the selected row asks first (no dialog), and the strip offers neither « Propriétés » nor « Désélectionner » during the mode - Escape from the handle / slider: `annotation-properties` gone -> the strip's « Propriétés » gone - I-3 touch tap: `annotation-properties` gone -> the strip's « Propriétés » gone e2e (sandbox): - support/layout.ts: `aside-content` exemption removed (ShiftExemption type, the loose compare); every `swaps`/`SWAPS` argument removed (editor-annotations, editor-zones, editor-geometry) - support/editor.ts pickAnnotation: clicked « Toutes les annotations » first when the panel showed -> the overview is always shown: clicks the row, then scrolls back to the top (the page no longer shortens) - editor-annotations: `annotation-properties` visible after a creation -> strip with « Propriétés »; review toggle and « Supprimer » of the panel -> the properties dialog's; a jitter click on the selected point now opens the dialog (A1), closed by Escape before the drag; handle names exact (the marked row shares the prefix); trace close moved out of expectNoShift (creation panel until Task 7, shortcut + TODO) - editor-deselect: `annotation-properties` -> the strip with « Propriétés » or the twin's inline read body; Escape in a field: panel « Nom (FR) » -> overview filter; delete dialog from the panel -> from the properties dialog (Escape closes it, then the dialog); « a typed value is applied by the click that deselects » (name field, refused blank) -> a pending point-handle key series applied by the deselecting click and by « Désélectionner » (refused value: no field outside the dialog); « the selected one stays » -> a second click, double click and jitter open the dialog, Escape closes it, selection kept - editor-geometry: `annotation-geometry-issues` in the panel -> read in the properties dialog, then the strip notice; after the refusal the error count unchanged; scroll-to-top workaround removed - editor-zones: panel « Désélectionner » -> strip; scroll-to-top after pickAnnotation removed (helper does it) - editor-structures: panel « Supprimer » -> properties dialog « Supprimer », confirmation over it - editor-journey: `#annotation-name-fr` committed field + `#annotation-laterality` -> the dialog's edit form, one « Enregistrer »; scroll-to-top removed - editor-shell / editor-shell-journeys: « Aller à » focus on `data-properties-heading` -> the annotation's row (aria-current), no dialog (R-5) - editor-shell-layout: focus kind `annotation-properties` -> removed (the overview is the side)
149 lines
5.2 KiB
TypeScript
149 lines
5.2 KiB
TypeScript
/**
|
|
* The no-shift probe of U2 (adjustment A14, plan Task 3): a state change of the annotations
|
|
* tab moves no box. The boxes of the canvas, the strip, the message row, the aside and the
|
|
* draft header, the page's scroll height, its scrollbar gutter and its client width are read
|
|
* before and after `act`; a layout-shift observer adds up every entry in between, the ones following
|
|
* an input included (a message appearing after a drop is still a shift).
|
|
*/
|
|
import { expect, type Page } from '@playwright/test'
|
|
|
|
interface Box {
|
|
x: number
|
|
y: number
|
|
width: number
|
|
height: number
|
|
}
|
|
|
|
interface Snapshot {
|
|
boxes: Record<string, Box | null>
|
|
scrollHeight: number
|
|
gutter: string
|
|
clientWidth: number
|
|
}
|
|
|
|
const PARTS = {
|
|
canvas: '[data-testid="annotation-canvas"]',
|
|
strip: '[data-testid="edit-strip"]',
|
|
line: '[data-testid="gesture-line"]',
|
|
aside: '[data-testid="editor-tab-annotations"] aside',
|
|
header: 'header:has(> nav + div > h1)',
|
|
} as const
|
|
|
|
function snapshot(page: Page): Promise<Snapshot> {
|
|
return page.evaluate((parts) => {
|
|
const shown = (selector: string) =>
|
|
[...document.querySelectorAll(selector)].find(
|
|
(element) => (element as HTMLElement).offsetParent !== null,
|
|
)
|
|
const boxes: Record<string, Box | null> = {}
|
|
for (const [name, selector] of Object.entries(parts)) {
|
|
const rect = shown(selector)?.getBoundingClientRect()
|
|
boxes[name] = rect
|
|
? { x: rect.x, y: rect.y, width: rect.width, height: rect.height }
|
|
: null
|
|
}
|
|
const root = document.documentElement
|
|
return {
|
|
boxes,
|
|
scrollHeight: root.scrollHeight,
|
|
gutter: getComputedStyle(root).scrollbarGutter,
|
|
clientWidth: root.clientWidth,
|
|
}
|
|
}, PARTS)
|
|
}
|
|
|
|
/** The page side of the probe: the summed shift and what moved, for the failure message. */
|
|
interface ShiftScope {
|
|
__shift: { total: number; moved: string[] }
|
|
__shiftObserver?: PerformanceObserver
|
|
/** The browser's own requestAnimationFrame, kept before `page.clock` replaces it. */
|
|
__nativeRaf?: (callback: FrameRequestCallback) => number
|
|
}
|
|
|
|
/**
|
|
* Keeps the native requestAnimationFrame: call it before `page.clock.install()`, whose fake
|
|
* frames would let the two-frame wait end before the real layout (and its shift) happens.
|
|
*/
|
|
export async function keepNativeFrames(page: Page): Promise<void> {
|
|
await page.addInitScript(() => {
|
|
const scope = window as unknown as ShiftScope
|
|
const raf = window.requestAnimationFrame
|
|
// Kept only when this script ran before the clock's (else the probe would wait on fakes).
|
|
if (String(raf).includes('[native code]'))
|
|
scope.__nativeRaf = raf.bind(window)
|
|
else throw new Error('keepNativeFrames ran after page.clock.install()')
|
|
})
|
|
}
|
|
|
|
/** Starts summing layout-shift entries; read back with `shiftTotal`. */
|
|
function observeShifts(page: Page): Promise<void> {
|
|
return page.evaluate(() => {
|
|
const scope = window as unknown as ShiftScope
|
|
scope.__shiftObserver?.disconnect()
|
|
scope.__shift = { total: 0, moved: [] }
|
|
const observer = new PerformanceObserver((list) => {
|
|
for (const entry of list.getEntries()) {
|
|
const shift = entry as unknown as {
|
|
value: number
|
|
sources: { node?: Node }[]
|
|
}
|
|
scope.__shift.total += shift.value
|
|
for (const source of shift.sources) {
|
|
const node = source.node as Element | undefined
|
|
scope.__shift.moved.push(
|
|
node?.outerHTML?.slice(0, 160) ?? String(source.node),
|
|
)
|
|
}
|
|
}
|
|
})
|
|
observer.observe({ type: 'layout-shift' })
|
|
scope.__shiftObserver = observer
|
|
})
|
|
}
|
|
|
|
/** Two frames for layout to settle, then the pending entries and the total. */
|
|
function shiftTotal(page: Page): Promise<ShiftScope['__shift']> {
|
|
return page.evaluate(async () => {
|
|
const scope = window as unknown as ShiftScope
|
|
const faked = !String(window.requestAnimationFrame).includes(
|
|
'[native code]',
|
|
)
|
|
if (faked && !scope.__nativeRaf) {
|
|
throw new Error(
|
|
'page.clock fakes the frames: call keepNativeFrames first',
|
|
)
|
|
}
|
|
const frame = scope.__nativeRaf ?? window.requestAnimationFrame.bind(window)
|
|
await new Promise((done) => frame(() => frame(done)))
|
|
const observer = scope.__shiftObserver!
|
|
const pending = observer.takeRecords()
|
|
observer.disconnect()
|
|
for (const entry of pending) {
|
|
scope.__shift.total += (entry as unknown as { value: number }).value
|
|
}
|
|
return scope.__shift
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Runs `act` and asserts nothing moved: the boxes of the canvas, the strip, the message
|
|
* row, the aside and the header, the scroll height, and no layout shift anywhere (U2 Task
|
|
* 6: the aside always shows the overview, so no exemption is left).
|
|
*/
|
|
export async function expectNoShift(
|
|
page: Page,
|
|
act: () => Promise<void>,
|
|
): Promise<void> {
|
|
const before = await snapshot(page)
|
|
// A selector that stops matching would compare null with null: every part must be there.
|
|
for (const [name, box] of Object.entries(before.boxes)) {
|
|
expect(box, `${name} box before the act`).not.toBeNull()
|
|
}
|
|
await observeShifts(page)
|
|
await act()
|
|
const shift = await shiftTotal(page)
|
|
const after = await snapshot(page)
|
|
expect(after).toEqual(before)
|
|
expect(shift.total, `layout shift of ${shift.moved.join(' | ')}`).toBe(0)
|
|
}
|