Important 1: a touch press fires pointer leave between up and click; only a mouse leave (or a pointer cancel) forgets the refused field, so Annuler no longer undoes an unrelated change. Important 2: the LAN spec reads the revision before the attach, through shownRevision, which throws instead of NaN (spec stays not run). Minor 1: refocusIfHidden refocuses a still shown element the commit blurred (references search on a 1 024 px crossing). Minor 2: discardChanges keeps lastSave (reload path still drops it). Minor 3: the overview filter term lives in UiState / the read-only twin, not the card. Minor 4: categories section drops its inner h3 and the unused editor.general.categories keys. AC8: badge test. Assertions rewritten or added (R-24): - editor-tabs-general « Général no longer holds the categories editor »: queryByText of the deleted heading (now vacuous) -> queryByLabelText of the category name fields. - editor-focus-request « Annotations: selects the annotation »: findAllByText /anno-b|Sélection/ -> the properties panel holds Centre x = 20 (anno-b) and owns the focused heading. - editor-shell-layout panel walk: added after.at(-1) === 'side'. - editor-recovery title « Annuler les modifications » -> « Abandonner ». - new: touch/cancel/mouse press, references search crossing, discard keeps lastSave, filter kept, one categories heading, badge 1/2/0, shownRevision.
300 lines
10 KiB
TypeScript
300 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,
|
|
fireEvent,
|
|
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,
|
|
} 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' }))
|
|
fireEvent.click(screen.getByTestId('annotation-canvas'), {
|
|
clientX: 20,
|
|
clientY: 30,
|
|
})
|
|
expect(screen.getByTestId('tracing-bar')).toBeInTheDocument()
|
|
act(() => void store.getState().undoStep())
|
|
await waitFor(() => expect(screen.queryByTestId('tracing-bar')).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.queryByTestId('annotation-properties')).toBeNull()
|
|
})
|
|
|
|
it('an open zone tracing is kept: the bar takes 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' }))
|
|
fireEvent.click(screen.getByTestId('annotation-canvas'), {
|
|
clientX: 20,
|
|
clientY: 20,
|
|
})
|
|
})
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'kept'))
|
|
expect(document.activeElement).toBe(screen.getByTestId('tracing-bar'))
|
|
expect(announce).toHaveBeenCalledWith(
|
|
expect.stringContaining('tracé est en cours'),
|
|
)
|
|
})
|
|
|
|
it('with nothing in progress the annotation is selected and its heading focused', async () => {
|
|
const { consumed } = await withProgress(async () => undefined)
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'found'))
|
|
await waitFor(() =>
|
|
expect(document.activeElement).toHaveAttribute('data-properties-heading'),
|
|
)
|
|
})
|
|
})
|