fix(editor): creation question lapses, guard sites and flip tested

The creation's « Abandonner la création ? » no longer outlives it:
« Replacer le point », « Reprendre le tracé », « Créer » (« Utiliser
cette position » included) and « Annuler le tracé » clear a question
still open, which would otherwise reappear over the page. Locals
trimmed in the creation dialog and the tracing actions (5 max).

Tests added (no assertion removed): the two lapses (RED without the
fix, GREEN with it); a view chip and a tool ask during a tracing; the
mode flip keeps the dialog, its form and the ghost; a history jump out
of the editor waits for the creation's question; e2e: « Reprendre le
tracé » and « Revenir aux propriétés » under expectNoShift at 1 024,
1 180 and 1 280 px, the strip's last command inside it, axe on the
resumed state.
This commit is contained in:
bchanot committed 2026-11-17 23:41:24 +01:00
1 parent 4d2c64f57f
commit fe333c2bbd
6 files changed
+219 -37

No files matched your search

@@ -65,19 +65,21 @@ function twoCategories(): string {
}
/** The tab with the header's history controls, as the workspace shows them. */
function Page() {
function Page({ readOnly = false }: { readOnly?: boolean }) {
useUndoShortcuts(true)
return (
<>
<HistoryButtons />
<LayeredTab {...props} />
<LayeredTab {...props} readOnly={readOnly} />
</>
)
}
let view: ReturnType<typeof render>
async function mount(text = twoCategories()) {
await openReady({ text })
render(<Page />)
view = render(<Page />)
await waitFor(() =>
expect(screen.getByRole('button', { name: 'Point' })).toBeEnabled(),
)
@@ -85,6 +87,18 @@ async function mount(text = twoCategories()) {
}
const canvas = () => screen.getByTestId('annotation-canvas')
const withDetail = () =>
insert(twoCategories(), {
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: 10, width: 80, height: 80 },
parent_view_id: 'view-main',
},
} as never)
const ghost = () => screen.getByTestId('overlay-ghost')
const creation = () => useAnnotationWork.getState().creation
const annotations = () => store.getState().previewState!.document.annotations
@@ -312,3 +326,103 @@ describe('during a creation (A12, R-13)', () => {
).toBeInTheDocument()
})
})
describe('the question never outlives its creation', () => {
it('Escape, then « Replacer le point »: no question left over the page', async () => {
const user = await mount()
const shown = await placePoint(user)
await user.keyboard('{Escape}')
expect(useAnnotationWork.getState().question?.work).toBe('creation')
await user.click(
within(shown).getByRole('button', { name: 'Replacer le point' }),
)
expect(useAnnotationWork.getState().question).toBeNull()
await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
})
it('Escape, then « Utiliser cette position » (C26): created, nothing asked', async () => {
const user = await mount()
await user.click(screen.getByRole('button', { name: 'Point' }))
pressAt(canvas(), 0, 0)
const shown = await dialog()
await user.type(within(shown).getByLabelText('Nom (FR)'), 'A')
await user.type(within(shown).getByLabelText('Nom (EN)'), 'B')
await user.selectOptions(within(shown).getByLabelText('Latéralité'), 'left')
await user.click(within(shown).getByRole('button', { name: 'Créer' }))
const notice = await screen.findByTestId('correction-notice')
await user.keyboard('{Escape}')
await user.click(
within(notice).getByRole('button', { name: 'Utiliser cette position' }),
)
expect(creation()).toBeNull()
expect(useAnnotationWork.getState().question).toBeNull()
await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
})
})
describe('the guard sites of the drawing during a tracing (R-12)', () => {
async function tracing() {
const user = await mount(withDetail())
await user.click(screen.getByRole('button', { name: 'Zone' }))
pressAt(canvas(), 20, 20)
return user
}
const answer = async (
user: ReturnType<typeof userEvent.setup>,
name: 'Continuer' | 'Abandonner',
) =>
user.click(
within(
await screen.findByRole('dialog', { name: 'Abandonner la création ?' }),
).getByRole('button', { name }),
)
it('a view chip asks; « Continuer » keeps the tracing, « Abandonner » shows the view', async () => {
const user = await tracing()
const chip = screen.getByRole('button', { name: 'Tête' })
await user.click(chip)
await answer(user, 'Continuer')
expect(screen.getByText('1 sommet posé')).toBeInTheDocument()
await user.click(chip)
await answer(user, 'Abandonner')
expect(creation()).toBeNull()
expect(chip).toHaveAttribute('aria-pressed', 'true')
})
it('a tool asks the same way', async () => {
const user = await tracing()
await user.click(screen.getByRole('button', { name: 'Point' }))
await answer(user, 'Continuer')
expect(screen.getByRole('button', { name: 'Zone' })).toHaveAttribute(
'aria-pressed',
'true',
)
await user.click(screen.getByRole('button', { name: 'Point' }))
await answer(user, 'Abandonner')
expect(screen.getByRole('button', { name: 'Point' })).toHaveAttribute(
'aria-pressed',
'true',
)
})
})
describe('the mode flip (R-14, Review Focus 3)', () => {
it('read-only by a mode change, then back: the dialog, its form and the ghost stay', async () => {
const user = await mount()
const shown = await placePoint(user)
await user.type(within(shown).getByLabelText('Nom (FR)'), 'Gardé')
view.rerender(<Page readOnly />)
const kept = screen.getByRole('dialog', { name: 'Nouveau point' })
expect(within(kept).getByLabelText('Nom (FR)')).toHaveValue('Gardé')
expect(within(kept).getByRole('button', { name: 'Créer' })).toBeDisabled()
expect(
within(kept).getByRole('button', { name: 'Replacer le point' }),
).toBeDisabled()
expect(screen.getByTestId('overlay-ghost')).toBeInTheDocument()
view.rerender(<Page />)
const back = screen.getByRole('dialog', { name: 'Nouveau point' })
expect(within(back).getByLabelText('Nom (FR)')).toHaveValue('Gardé')
expect(within(back).getByRole('button', { name: 'Créer' })).toBeEnabled()
expect(annotations()).toHaveLength(1)
})
})
@@ -14,6 +14,8 @@ import {
} from '@/editor/useEditorNavigation'
import { useLocaleStore } from '@/state/localeStore'
import { answerDrawing } from '@/editor/annotations/drawingGuard'
import { emptyForm } from '@/editor/annotations/creation'
import { traceVertex } from '@/editor/annotations/creationWork'
import {
resetWork,
setModePreview,
@@ -160,6 +162,31 @@ describe('the drawing guard on a history jump out of the editor (R-12)', () => {
expect(api.traverseTo).toHaveBeenCalledWith('list')
})
it('during a creation (A12): the jump waits for « Abandonner la création ? », then goes', () => {
cleanup()
render(
<MemoryRouter initialEntries={[path]}>
<DrawingOnly />
</MemoryRouter>,
)
traceVertex(
{
viewId: 'v',
frame: null,
origin: 'tool',
form: emptyForm({ categories: [] } as never),
},
'zone',
[1, 1],
)
expect(jump().defaultPrevented).toBe(true)
expect(useAnnotationWork.getState().question?.work).toBe('creation')
expect(api.traverseTo).not.toHaveBeenCalled()
act(() => answerDrawing(true))
expect(useAnnotationWork.getState().creation).toBeNull()
expect(api.traverseTo).toHaveBeenCalledWith('list')
})
it('with nothing started: the jump is not held and the mode ends', () => {
cleanup()
render(