feat(app): Désélectionner and the Escape priority (R1, D6, A5, A6)
« Désélectionner » (secondary sm, deselect glyph) sits left of « Supprimer » in a bordered row of the properties panel, read-only too, hidden while a tracing runs. It commits the typed field, clears the selection, focuses the row (else the drawing) and announces. Escape deselects through one document listener per visible body (not in a text field, only inside the workspace); G1: row focus only from the panel. « Plus » and the references panel close first; a tracing cancel marks its Escape. No existing assertion rewritten.
This commit is contained in:
1 parent
7dda61d2ae
commit
bbb1668406
14 files changed
+633
-42
No files matched your search
@@ -12,6 +12,7 @@ import {
|
||||
import userEvent from '@testing-library/user-event'
|
||||
import type { Annotation } from '@faunosteo/core-wasm/types'
|
||||
import AnnotationsTab from '@/components/editor/tabs/AnnotationsTab'
|
||||
import { AnnounceContext } from '@/editor/focusRequest'
|
||||
import { useLocaleStore } from '@/state/localeStore'
|
||||
import {
|
||||
ASSET,
|
||||
@@ -944,3 +945,147 @@ describe('the drag and the canvas follow the handle (H8)', () => {
|
||||
await waitFor(() => expect(marker('anno-a')).not.toBe(first))
|
||||
})
|
||||
})
|
||||
|
||||
describe('« Désélectionner » (R1, A6)', () => {
|
||||
const announce = vi.fn()
|
||||
const rowOf = (id: string, prefix = '') =>
|
||||
document.querySelector<HTMLElement>(
|
||||
`[data-focus-key='{"kind":"annotation","id":"${id}"}']`,
|
||||
) ?? document.getElementById(`${prefix}${id}`)
|
||||
const snapshot = () => {
|
||||
const state = store.getState()
|
||||
return [
|
||||
state.documentText,
|
||||
state.handleVersion,
|
||||
state.undo.length,
|
||||
state.unsaved,
|
||||
]
|
||||
}
|
||||
|
||||
async function mountSpy(options: { text?: string; readOnly?: boolean } = {}) {
|
||||
announce.mockReset()
|
||||
await openReady({ text: options.text ?? text() })
|
||||
const readOnly = options.readOnly ?? false
|
||||
render(
|
||||
<AnnounceContext value={announce}>
|
||||
<AnnotationsTab {...props} readOnly={readOnly} />
|
||||
</AnnounceContext>,
|
||||
)
|
||||
const drawing = readOnly
|
||||
? 'catalogue-canvas-drawing'
|
||||
: 'annotation-canvas-drawing'
|
||||
await waitFor(() =>
|
||||
expect(screen.getByTestId(drawing).querySelector('svg')).not.toBeNull(),
|
||||
)
|
||||
}
|
||||
const button = (panel: HTMLElement, name = 'Désélectionner') =>
|
||||
within(panel).getByRole('button', { name })
|
||||
|
||||
it('shows the overview, focuses the row, announces, and changes nothing else', async () => {
|
||||
await mountSpy()
|
||||
const panel = await selectFromList()
|
||||
const before = snapshot()
|
||||
await userEvent.setup().click(button(panel))
|
||||
expect(screen.queryByTestId('annotation-properties')).toBeNull()
|
||||
expect(screen.getByTestId('annotation-overview')).toBeInTheDocument()
|
||||
expect(document.activeElement).toBe(rowOf('anno-a'))
|
||||
expect(announce).toHaveBeenCalledWith('Aucune annotation sélectionnée.')
|
||||
expect(snapshot()).toEqual(before)
|
||||
})
|
||||
|
||||
it('focuses the drawing when a filter hides the row', async () => {
|
||||
await mountSpy()
|
||||
const panel = await selectFromList()
|
||||
// The filter lives in the overview: type it there, then reselect from the drawing.
|
||||
await userEvent.setup().click(button(panel))
|
||||
const filter = screen.getByLabelText('Filtrer par nom')
|
||||
fireEvent.change(filter, { target: { value: 'zzz-no-match' } })
|
||||
fireEvent.click(
|
||||
screen.getByTestId('annotation-canvas-drawing').querySelector(
|
||||
'[data-anno-id="anno-a"]',
|
||||
)!,
|
||||
)
|
||||
const reopened = await screen.findByTestId('annotation-properties')
|
||||
await userEvent.setup().click(button(reopened))
|
||||
expect(document.activeElement).toBe(screen.getByTestId('annotation-canvas'))
|
||||
expect(screen.queryByTestId('annotation-properties')).toBeNull()
|
||||
})
|
||||
|
||||
it('undo after it undoes the earlier edit', async () => {
|
||||
await mountSpy()
|
||||
const panel = await selectFromList()
|
||||
const user = userEvent.setup()
|
||||
await user.clear(within(panel).getByLabelText('Centre x'))
|
||||
await user.type(within(panel).getByLabelText('Centre x'), '60{Enter}')
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 60 })
|
||||
await user.click(button(panel))
|
||||
act(() => void store.getState().undoStep())
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 50 })
|
||||
})
|
||||
|
||||
it('read-only: no « Supprimer », it deselects and focuses the ro- row', async () => {
|
||||
await mountSpy({ readOnly: true })
|
||||
const panel = await selectFromList()
|
||||
expect(within(panel).queryByRole('button', { name: 'Supprimer' })).toBeNull()
|
||||
await userEvent.setup().click(button(panel))
|
||||
expect(screen.queryByTestId('annotation-properties')).toBeNull()
|
||||
const row = document.querySelector(
|
||||
'[data-focus-key=\'{"kind":"annotation","id":"anno-a"}\']',
|
||||
)
|
||||
expect(document.activeElement).toBe(row)
|
||||
expect(announce).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('commits a valid typed value once when the field is not blurred', async () => {
|
||||
await mountSpy()
|
||||
const panel = await selectFromList()
|
||||
const user = userEvent.setup()
|
||||
const cx = within(panel).getByLabelText('Centre x')
|
||||
await user.clear(cx)
|
||||
await user.type(cx, '60')
|
||||
const depth = store.getState().undo.length
|
||||
await user.click(button(panel))
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 60 })
|
||||
expect(store.getState().undo.length).toBe(depth + 1)
|
||||
})
|
||||
|
||||
it('a refused typed value: the panel closes, the document is unchanged', async () => {
|
||||
await mountSpy({ text: insert(drawnText(), named('anno-a', 150, 150, 5)) })
|
||||
const panel = await selectFromList()
|
||||
const user = userEvent.setup()
|
||||
const before = store.getState().documentText
|
||||
const cx = within(panel).getByLabelText('Centre x')
|
||||
await user.clear(cx)
|
||||
await user.type(cx, '1000000')
|
||||
await user.click(button(panel))
|
||||
expect(screen.queryByTestId('annotation-properties')).toBeNull()
|
||||
expect(store.getState().documentText).toBe(before)
|
||||
})
|
||||
|
||||
it('speaks English', async () => {
|
||||
useLocaleStore.setState({ locale: 'en' })
|
||||
await mountSpy()
|
||||
await screen.findByTestId('annotation-overview')
|
||||
await userEvent.setup().click(rowOf('anno-a')!)
|
||||
const panel = await screen.findByTestId('annotation-properties')
|
||||
await userEvent.setup().click(button(panel, 'Deselect'))
|
||||
expect(announce).toHaveBeenCalledWith('No annotation selected.')
|
||||
})
|
||||
|
||||
it('is not offered while a replace tracing runs', async () => {
|
||||
await mountSpy({
|
||||
text: insert(drawnText(), {
|
||||
kind: 'annotation',
|
||||
value: zoneAnnotation({ type: 'path', d: 'M 20 20 L 80 20 L 50 80 Z' }),
|
||||
}),
|
||||
})
|
||||
const panel = await selectFromList()
|
||||
await userEvent.setup().click(
|
||||
within(panel).getByRole('button', { name: 'Remplacer par un polygone' }),
|
||||
)
|
||||
const open = await screen.findByTestId('annotation-properties')
|
||||
expect(
|
||||
within(open).queryByRole('button', { name: 'Désélectionner' }),
|
||||
).toBeNull()
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user