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)
334 lines
10 KiB
TypeScript
334 lines
10 KiB
TypeScript
import { describe, it, expect, vi } from 'vitest'
|
||
import { useState } from 'react'
|
||
import { fireEvent, render, screen, waitFor } from '@testing-library/react'
|
||
import userEvent from '@testing-library/user-event'
|
||
import Dialog from '@/components/ui/Dialog'
|
||
import ModalDialog from '@/components/ui/ModalDialog'
|
||
import { useLocaleStore } from '@/state/localeStore'
|
||
|
||
// happy-dom implements neither the top layer nor inertness nor the dialog's focus
|
||
// steps: these tests cover the React wiring, the browser behaviour is proven by
|
||
// the Playwright suites (apps/app/e2e).
|
||
|
||
describe('Dialog', () => {
|
||
it('renders nothing when open=false', () => {
|
||
render(
|
||
<Dialog open={false} onClose={() => {}} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
expect(screen.queryByText('body')).toBeNull()
|
||
})
|
||
|
||
it('renders content when open=true', () => {
|
||
render(
|
||
<Dialog open={true} onClose={() => {}} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
expect(screen.getByText('body')).toBeInTheDocument()
|
||
})
|
||
|
||
it('calls onClose on backdrop click', async () => {
|
||
const onClose = vi.fn()
|
||
render(
|
||
<Dialog open onClose={onClose} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
await userEvent.click(screen.getByTestId('dialog-backdrop'))
|
||
expect(onClose).toHaveBeenCalled()
|
||
})
|
||
|
||
it('is a native dialog named by its title and described by its message', () => {
|
||
render(
|
||
<Dialog
|
||
open
|
||
onClose={() => {}}
|
||
title="Remove the photo?"
|
||
description={<p>It goes for good.</p>}
|
||
>
|
||
<button type="button">Remove</button>
|
||
</Dialog>,
|
||
)
|
||
const dialog = screen.getByRole('dialog', { name: 'Remove the photo?' })
|
||
expect(dialog.tagName).toBe('DIALOG')
|
||
expect(dialog).toHaveAccessibleDescription('It goes for good.')
|
||
})
|
||
|
||
it('its ✕ is a 44 px box with a visible focus ring; a long title wraps beside it (Rev 6)', () => {
|
||
useLocaleStore.setState({ locale: 'fr' })
|
||
render(
|
||
<Dialog open onClose={() => {}} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
const close = screen.getByRole('button', { name: 'Fermer' })
|
||
for (const name of [
|
||
'grid',
|
||
'h-11',
|
||
'w-11',
|
||
'shrink-0',
|
||
'place-items-center',
|
||
'rounded-lg',
|
||
'focus-visible:ring-2',
|
||
]) {
|
||
expect(close).toHaveClass(name)
|
||
}
|
||
expect(screen.getByRole('heading', { name: 'X' })).toHaveClass(
|
||
'min-w-0',
|
||
'break-words',
|
||
)
|
||
})
|
||
|
||
it('has no description when none is given', () => {
|
||
render(
|
||
<Dialog open onClose={() => {}} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
expect(screen.getByRole('dialog')).not.toHaveAttribute('aria-describedby')
|
||
})
|
||
|
||
it.each([
|
||
['fr', 'Fermer'],
|
||
['en', 'Close'],
|
||
] as const)(
|
||
'asks to close from the close button, named in %s',
|
||
async (locale, name) => {
|
||
useLocaleStore.setState({ locale })
|
||
const onClose = vi.fn()
|
||
render(
|
||
<Dialog open onClose={onClose} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
await userEvent.click(screen.getByRole('button', { name }))
|
||
expect(onClose).toHaveBeenCalledTimes(1)
|
||
},
|
||
)
|
||
})
|
||
|
||
describe('ModalDialog', () => {
|
||
it('opens as a modal while mounted and closes on unmount', () => {
|
||
const showModal = vi.spyOn(HTMLDialogElement.prototype, 'showModal')
|
||
const close = vi.spyOn(HTMLDialogElement.prototype, 'close')
|
||
const { unmount } = render(
|
||
<ModalDialog onClose={() => {}} label="Menu">
|
||
<button type="button">Inside</button>
|
||
</ModalDialog>,
|
||
)
|
||
expect(showModal).toHaveBeenCalledTimes(1)
|
||
unmount()
|
||
expect(close).toHaveBeenCalledTimes(1)
|
||
showModal.mockRestore()
|
||
close.mockRestore()
|
||
})
|
||
|
||
it('turns Escape into a request: the consumer decides, the dialog stays open', () => {
|
||
const onClose = vi.fn()
|
||
render(
|
||
<ModalDialog onClose={onClose} label="Menu">
|
||
<button type="button">Inside</button>
|
||
</ModalDialog>,
|
||
)
|
||
const dialog = screen.getByRole('dialog', {
|
||
name: 'Menu',
|
||
}) as HTMLDialogElement
|
||
const escape = new KeyboardEvent('keydown', {
|
||
key: 'Escape',
|
||
bubbles: true,
|
||
cancelable: true,
|
||
})
|
||
screen.getByRole('button', { name: 'Inside' }).dispatchEvent(escape)
|
||
fireEvent.keyDown(dialog, { key: 'Escape' })
|
||
expect(escape.defaultPrevented).toBe(true)
|
||
expect(onClose).toHaveBeenCalledTimes(2)
|
||
expect(dialog.open).toBe(true)
|
||
})
|
||
|
||
it('ignores Escape while a composition is in progress', () => {
|
||
const onClose = vi.fn()
|
||
render(
|
||
<ModalDialog onClose={onClose} label="Menu">
|
||
<input aria-label="Name" />
|
||
</ModalDialog>,
|
||
)
|
||
fireEvent.keyDown(screen.getByLabelText('Name'), {
|
||
key: 'Escape',
|
||
isComposing: true,
|
||
})
|
||
expect(onClose).not.toHaveBeenCalled()
|
||
})
|
||
|
||
it('cancels the platform close request and asks the consumer instead', () => {
|
||
const onClose = vi.fn()
|
||
render(
|
||
<ModalDialog onClose={onClose} label="Menu">
|
||
<button type="button">Inside</button>
|
||
</ModalDialog>,
|
||
)
|
||
const cancel = new Event('cancel', { cancelable: true })
|
||
screen.getByRole('dialog').dispatchEvent(cancel)
|
||
expect(cancel.defaultPrevented).toBe(true)
|
||
expect(onClose).toHaveBeenCalledTimes(1)
|
||
})
|
||
|
||
it('follows a close the platform forced, and ignores a close event while still open', () => {
|
||
const onClose = vi.fn()
|
||
render(
|
||
<ModalDialog onClose={onClose} label="Menu">
|
||
<button type="button">Inside</button>
|
||
</ModalDialog>,
|
||
)
|
||
const dialog = screen.getByRole('dialog') as HTMLDialogElement
|
||
dialog.dispatchEvent(new Event('close'))
|
||
expect(onClose).not.toHaveBeenCalled()
|
||
dialog.close()
|
||
expect(onClose).toHaveBeenCalledTimes(1)
|
||
})
|
||
})
|
||
|
||
/** An opener that can disappear while its dialog is open, beside a sibling control. */
|
||
function Harness({ removeOpener = false }: { removeOpener?: boolean }) {
|
||
const [open, setOpen] = useState(false)
|
||
const [openerShown, setOpenerShown] = useState(true)
|
||
const confirm = () => {
|
||
if (removeOpener) setOpenerShown(false)
|
||
setOpen(false)
|
||
}
|
||
return (
|
||
<main>
|
||
<section>
|
||
<button type="button">Sibling</button>
|
||
{openerShown && (
|
||
<button type="button" onClick={() => setOpen(true)}>
|
||
Open
|
||
</button>
|
||
)}
|
||
</section>
|
||
<Dialog open={open} onClose={() => setOpen(false)} title="Confirm">
|
||
<button type="button" onClick={confirm}>
|
||
Confirm
|
||
</button>
|
||
</Dialog>
|
||
</main>
|
||
)
|
||
}
|
||
|
||
describe('Dialog focus return', () => {
|
||
it('returns focus to the opener', async () => {
|
||
render(<Harness />)
|
||
await userEvent.click(screen.getByRole('button', { name: 'Open' }))
|
||
fireEvent.keyDown(screen.getByRole('dialog'), { key: 'Escape' })
|
||
await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
|
||
expect(screen.getByRole('button', { name: 'Open' })).toHaveFocus()
|
||
})
|
||
|
||
it('falls back to the first control of the opener’s container when the opener is gone', async () => {
|
||
render(<Harness removeOpener />)
|
||
await userEvent.click(screen.getByRole('button', { name: 'Open' }))
|
||
await userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
|
||
await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
|
||
expect(screen.queryByRole('button', { name: 'Open' })).toBeNull()
|
||
expect(screen.getByRole('button', { name: 'Sibling' })).toHaveFocus()
|
||
})
|
||
})
|
||
|
||
/** U2 Task 6 (A2, R-6): the panel over an anchor box, the keyboard fallback, the veil. */
|
||
describe('Dialog anchored over a column', () => {
|
||
const rect = (box: Partial<DOMRect>) =>
|
||
({ left: 0, top: 0, width: 0, height: 0, ...box }) as DOMRect
|
||
function anchorAt(box: Partial<DOMRect>) {
|
||
const element = document.createElement('aside')
|
||
element.getBoundingClientRect = () => rect(box)
|
||
document.body.append(element)
|
||
return { current: element }
|
||
}
|
||
const panel = () => screen.getByTestId('dialog-panel')
|
||
const withViewport = (value: unknown) =>
|
||
Object.defineProperty(window, 'visualViewport', {
|
||
configurable: true,
|
||
value,
|
||
})
|
||
|
||
it('sits at the anchor’s left and width, from its top, down to 12 px above the bottom', () => {
|
||
withViewport(undefined)
|
||
window.innerHeight = 800
|
||
const anchor = anchorAt({ left: 900, top: 140, width: 352 })
|
||
render(
|
||
<Dialog open anchor={anchor} onClose={() => {}} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
expect(panel().style.left).toBe('900px')
|
||
expect(panel().style.width).toBe('352px')
|
||
expect(panel().style.top).toBe('140px')
|
||
expect(panel().style.maxHeight).toBe('648px')
|
||
})
|
||
|
||
it('never starts above 12 px when the column’s top is scrolled away', () => {
|
||
withViewport(undefined)
|
||
window.innerHeight = 800
|
||
const anchor = anchorAt({ left: 900, top: -300, width: 352 })
|
||
render(
|
||
<Dialog open anchor={anchor} onClose={() => {}} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
expect(panel().style.top).toBe('12px')
|
||
expect(panel().style.maxHeight).toBe('776px')
|
||
})
|
||
|
||
it('a tablet keyboard leaving under 320 px: the visual viewport’s top and height', () => {
|
||
window.innerHeight = 800
|
||
withViewport({
|
||
height: 350,
|
||
offsetTop: 0,
|
||
addEventListener: () => undefined,
|
||
removeEventListener: () => undefined,
|
||
})
|
||
const anchor = anchorAt({ left: 900, top: 140, width: 352 })
|
||
render(
|
||
<Dialog open anchor={anchor} onClose={() => {}} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
expect(panel().style.top).toBe('12px')
|
||
expect(panel().style.height).toBe('326px')
|
||
expect(panel().style.left).toBe('900px')
|
||
withViewport(undefined)
|
||
})
|
||
|
||
it('without an anchor box the panel is centred, as before', () => {
|
||
render(
|
||
<Dialog open anchor={{ current: null }} onClose={() => {}} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
expect(panel().style.left).toBe('')
|
||
expect(panel().className).toContain('max-w-md')
|
||
})
|
||
|
||
it('the veil of an anchored dialog ignores clicks; a centred one still asks', async () => {
|
||
withViewport(undefined)
|
||
const onClose = vi.fn()
|
||
const anchor = anchorAt({ left: 900, top: 140, width: 352 })
|
||
const { unmount } = render(
|
||
<Dialog open anchor={anchor} onClose={onClose} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
await userEvent.click(screen.getByTestId('dialog-backdrop'))
|
||
expect(onClose).not.toHaveBeenCalled()
|
||
unmount()
|
||
render(
|
||
<Dialog open onClose={onClose} title="X">
|
||
body
|
||
</Dialog>,
|
||
)
|
||
await userEvent.click(screen.getByTestId('dialog-backdrop'))
|
||
expect(onClose).toHaveBeenCalled()
|
||
})
|
||
})
|