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)
299 lines
10 KiB
TypeScript
299 lines
10 KiB
TypeScript
/** U1 Lot B1: the Annotations sections, their entries, the view fallback, « Aller à » kept. */
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import {
|
|
act,
|
|
cleanup,
|
|
render,
|
|
screen,
|
|
waitFor,
|
|
within,
|
|
} from '@testing-library/react'
|
|
import userEvent from '@testing-library/user-event'
|
|
import AnnotationsTab from '@/components/editor/tabs/AnnotationsTab'
|
|
import {
|
|
AnnounceContext,
|
|
FocusConsumedContext,
|
|
type FocusRequest,
|
|
} from '@/editor/focusRequest'
|
|
import { targetOfKey } from '@/editor/navigation'
|
|
import { useLocaleStore } from '@/state/localeStore'
|
|
import { drawnText, insert, point } from '../helpers/editorFixtures'
|
|
import {
|
|
baseText,
|
|
openReady,
|
|
resetStore,
|
|
serverHas,
|
|
store,
|
|
pressAt,
|
|
} from '../helpers/editorHarness'
|
|
import { mountDraft, setWidth } from '../helpers/editorRoute'
|
|
|
|
vi.mock('@/lib/supabase', () => ({ getSupabaseClient: () => ({}) }))
|
|
vi.mock('@faunosteo/supabase', async (orig) => ({
|
|
...(await orig<typeof import('@faunosteo/supabase')>()),
|
|
getSheetVersion: vi.fn(),
|
|
downloadSheetDrawing: vi.fn(),
|
|
saveSheetDraft: vi.fn(),
|
|
getOfficialSheetAdmin: vi.fn(),
|
|
submitSheetReview: vi.fn(),
|
|
}))
|
|
|
|
beforeEach(() => {
|
|
useLocaleStore.setState({ locale: 'fr' })
|
|
const identity = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }
|
|
Object.defineProperty(window.SVGElement.prototype, 'getScreenCTM', {
|
|
configurable: true,
|
|
value: () => ({ ...identity, inverse: () => identity }),
|
|
})
|
|
})
|
|
afterEach(() => {
|
|
cleanup()
|
|
resetStore()
|
|
setWidth(1024)
|
|
})
|
|
|
|
const ready = () =>
|
|
screen.findByRole('heading', { level: 1, name: 'Brouillon, version 4' })
|
|
const entry = (name: string | RegExp) => screen.getByRole('button', { name })
|
|
const place = (name: string) =>
|
|
document.querySelector<HTMLElement>(`[data-place="${name}"]`)
|
|
|
|
describe('the overview entries', () => {
|
|
beforeEach(() => serverHas(baseText(), 3))
|
|
|
|
it.each([
|
|
['Gérer les vues', 'views', 'Vues'],
|
|
['Modifier les catégories', 'categories', 'Catégories'],
|
|
[/^Régions vertébrales/, 'regions', 'Régions vertébrales'],
|
|
] as const)(
|
|
'%s opens its section on the heading; « Retour au dessin » refocuses the entry',
|
|
async (label, section, title) => {
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
await user.click(entry(label))
|
|
const shown = place(`annotations.${section}`)!
|
|
expect(shown).toBeVisible()
|
|
expect(document.activeElement).toBe(
|
|
within(shown).getByRole('heading', { level: 2, name: title }),
|
|
)
|
|
expect(screen.getByRole('tab', { name: 'Annotations' })).toHaveAttribute(
|
|
'aria-selected',
|
|
'true',
|
|
)
|
|
expect(place('annotations.drawing')).not.toBeVisible()
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
expect(place('annotations.drawing')).toBeVisible()
|
|
expect(document.activeElement).toHaveAttribute(
|
|
'data-section-entry',
|
|
section,
|
|
)
|
|
},
|
|
)
|
|
|
|
it('the categories section shows its own heading once, as the other sections', async () => {
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
await user.click(entry('Modifier les catégories'))
|
|
const headings = within(place('annotations.categories')!).getAllByRole(
|
|
'heading',
|
|
)
|
|
expect(headings.map((h) => [h.tagName, h.textContent])).toEqual([
|
|
['H2', 'Catégories'],
|
|
])
|
|
})
|
|
|
|
it('the Catégories card header shows the number of categories', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
expect(screen.getByTestId('overview-categories-count')).toHaveTextContent(
|
|
'1',
|
|
)
|
|
})
|
|
|
|
it('the regions entry is there with no role code, counting the regions', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
expect(entry('Régions vertébrales (0 région)')).toBeVisible()
|
|
})
|
|
|
|
it('announces the section reached, politely', async () => {
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
await user.click(entry('Gérer les vues'))
|
|
const live = document.querySelector('p[aria-live="polite"]')!
|
|
expect(live).toHaveTextContent('Annotations · Vues')
|
|
})
|
|
|
|
it('read-only: the entries read « Voir … » and still open the sections', async () => {
|
|
const user = userEvent.setup()
|
|
mountDraft({ width: 800 })
|
|
await ready()
|
|
expect(screen.queryByRole('button', { name: 'Gérer les vues' })).toBeNull()
|
|
await user.click(entry('Voir les catégories'))
|
|
expect(place('annotations.categories')).toBeVisible()
|
|
expect(
|
|
within(place('annotations.categories')!).queryByRole('textbox'),
|
|
).toBeNull()
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
await user.click(entry('Voir les vues'))
|
|
expect(place('annotations.views')).toBeVisible()
|
|
})
|
|
})
|
|
|
|
const props = {
|
|
readOnly: false,
|
|
navigate: vi.fn(),
|
|
reloadSheet: vi.fn(),
|
|
section: 'drawing' as const,
|
|
visited: ['drawing'] as const,
|
|
onOpenSection: vi.fn(),
|
|
onBack: vi.fn(),
|
|
}
|
|
|
|
const detailView = {
|
|
kind: 'view',
|
|
value: {
|
|
kind: 'detail',
|
|
id: 'view-det',
|
|
name: { fr: 'Tête', en: 'Head' },
|
|
svg_asset_id: null,
|
|
view_box: { min_x: 10, min_y: 20, width: 40, height: 60 },
|
|
parent_view_id: 'view-main',
|
|
},
|
|
} as const
|
|
|
|
const consumed = vi.fn()
|
|
const announce = vi.fn()
|
|
const Drawing = ({ focus }: { focus?: FocusRequest }) => (
|
|
<FocusConsumedContext value={consumed}>
|
|
<AnnounceContext value={announce}>
|
|
<AnnotationsTab {...props} focus={focus} />
|
|
</AnnounceContext>
|
|
</FocusConsumedContext>
|
|
)
|
|
|
|
async function mountDrawing(text = drawnText()) {
|
|
consumed.mockReset()
|
|
announce.mockReset()
|
|
await openReady({ text })
|
|
const user = userEvent.setup()
|
|
const view = render(<Drawing />)
|
|
await waitFor(() =>
|
|
expect(
|
|
screen.getByTestId('annotation-canvas-drawing').querySelector('svg'),
|
|
).not.toBeNull(),
|
|
)
|
|
return { user, view }
|
|
}
|
|
|
|
const addPoint = async (user: ReturnType<typeof userEvent.setup>) => {
|
|
await waitFor(() =>
|
|
expect(
|
|
screen.getByRole('button', { name: 'Ajouter un point' }),
|
|
).toBeEnabled(),
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Ajouter un point' }))
|
|
}
|
|
|
|
describe('the shown view disappears (undo)', () => {
|
|
async function onDetailView() {
|
|
const base = await mountDrawing()
|
|
act(
|
|
() => void store.getState().commit({ op: 'insert', element: detailView }),
|
|
)
|
|
await base.user.click(await screen.findByRole('button', { name: 'Tête' }))
|
|
return base
|
|
}
|
|
|
|
it('a pending point on it: back to the main view, the creation cleared', async () => {
|
|
const { user } = await onDetailView()
|
|
await addPoint(user)
|
|
expect(await screen.findByTestId('annotation-creation')).toBeInTheDocument()
|
|
act(() => void store.getState().undoStep())
|
|
await waitFor(() =>
|
|
expect(screen.queryByTestId('annotation-creation')).toBeNull(),
|
|
)
|
|
expect(screen.queryByRole('button', { name: 'Tête' })).toBeNull()
|
|
expect(screen.getByTestId('annotation-overview')).toBeInTheDocument()
|
|
expect(store.getState().previewState!.document.annotations).toHaveLength(0)
|
|
})
|
|
|
|
it('a tracing on it: the tracing is cleared too', async () => {
|
|
const { user } = await onDetailView()
|
|
await waitFor(() =>
|
|
expect(screen.getByRole('button', { name: 'Zone' })).toBeEnabled(),
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Zone' }))
|
|
pressAt(screen.getByTestId('annotation-canvas'), 20, 30)
|
|
expect(screen.getByTestId('tracing-commands')).toBeInTheDocument()
|
|
act(() => void store.getState().undoStep())
|
|
await waitFor(() =>
|
|
expect(screen.queryByTestId('tracing-commands')).toBeNull(),
|
|
)
|
|
})
|
|
|
|
it('dispatches nothing while the shown view still exists', async () => {
|
|
const { user } = await onDetailView()
|
|
await addPoint(user)
|
|
const panel = await screen.findByTestId('annotation-creation')
|
|
const element = point('anno-x', 30, 40, 2, 'view-det')
|
|
act(() => void store.getState().commit({ op: 'insert', element }))
|
|
expect(screen.getByTestId('annotation-creation')).toBe(panel)
|
|
})
|
|
})
|
|
|
|
describe('« Aller à » an annotation while something is in progress', () => {
|
|
const key = { kind: 'annotation', id: 'anno-a' } as const
|
|
const request = { target: targetOfKey(key), serial: 7 }
|
|
|
|
async function withProgress(
|
|
start: (user: ReturnType<typeof userEvent.setup>) => Promise<void>,
|
|
) {
|
|
const text = insert(drawnText(), point('anno-a', 50, 50, 5))
|
|
const { user, view } = await mountDrawing(text)
|
|
await start(user)
|
|
view.rerender(<Drawing focus={request} />)
|
|
return { consumed, announce }
|
|
}
|
|
|
|
it('a pending creation is kept: its panel takes the focus, the live region says why', async () => {
|
|
const { consumed, announce } = await withProgress(addPoint)
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'kept'))
|
|
expect(screen.getByTestId('annotation-creation')).toBeInTheDocument()
|
|
expect(document.activeElement).toHaveAttribute('data-creation-heading')
|
|
expect(announce).toHaveBeenCalledWith(
|
|
expect.stringContaining('création est en cours'),
|
|
)
|
|
expect(screen.queryByRole('button', { name: 'Propriétés' })).toBeNull()
|
|
})
|
|
|
|
it('an open zone tracing is kept: the strip tracing commands take the focus', async () => {
|
|
const { consumed, announce } = await withProgress(async (user) => {
|
|
await waitFor(() =>
|
|
expect(screen.getByRole('button', { name: 'Zone' })).toBeEnabled(),
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Zone' }))
|
|
pressAt(screen.getByTestId('annotation-canvas'), 20, 20)
|
|
})
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'kept'))
|
|
expect(document.activeElement).toBe(screen.getByTestId('tracing-commands'))
|
|
expect(announce).toHaveBeenCalledWith(
|
|
expect.stringContaining('tracé est en cours'),
|
|
)
|
|
})
|
|
|
|
it('with nothing in progress the annotation is selected and its row focused (R-5)', async () => {
|
|
const { consumed } = await withProgress(async () => undefined)
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'found'))
|
|
await waitFor(() =>
|
|
expect(document.activeElement).toHaveAttribute(
|
|
'data-focus-key',
|
|
JSON.stringify({ kind: 'annotation', id: 'anno-a' }),
|
|
),
|
|
)
|
|
})
|
|
})
|