feat(editor): creation on the drawing then the creation dialog
U2 Task 7 (A2, A4, A5, A7, A12, A15; R-3, R-4, R-12, R-13, R-14). The work store's `creation` owns the new shape, its form, its view and F: a click with the point tool, a closed tracing or a keyboard « Ajouter … » opens « Nouveau point / zone / accès », a modal without a history layer over the right column, mounted beside EditOnly so a read-only flip keeps it (« Créer », « Replacer », « Reprendre » off). A new zone or link is a creation from its first vertex. The ghost takes the form's category colour; the point tool previews under a mouse; the canvas carries data-creating (other markers dimmed, unselectable). « Replacer le point » / « Reprendre le tracé » hide the dialog and keep the form; the strip offers « Revenir aux propriétés », « Retirer le dernier sommet », « Abandonner ». « Créer »: one insert, tool back to « Sélectionner », the new element selected, « Point créé · Défaire », focus on its row. ✕, Échap, « Abandonner » and Back always ask « Abandonner la création ? » (DiscardConfirm inside the dialog; DrawingGuardDialog elsewhere); answerDrawing drops the creation. Undo, its shortcuts and the line's « Défaire » are inactive during a creation. missingFields replaces formProblem (MissingSummary shared with the edit form); the C26 notice has no numbers. CreationPanel, formProblem, withGeometry and the keys required.fields, required.names and create_cancel are gone; GeometryGroup is imported by RepairDialog only. Removed or rewritten assertions: - tab « holds a point at the frame centre »: « Centre x » = 50 -> the ghost circle cx = 50; plus tool back to Sélectionner, « Point créé », one undo step. - tab « refuses a creation without laterality »: the general line « Choisissez la catégorie et la latéralité » -> only « Choisissez une latéralité. » and « À compléter : Latéralité. », focus on it. - tab « applies the geometry group to a pending zone »: removed (A8, no coordinate field) -> « places a triangle at the centre: the ghost shows it, Créer inserts it »; vertex edits after Créer are the e2e keyboard test. - tab C26 « proposes C »: « x = 15, y = 15 » in the notice -> the R-4 text, the notice inside the dialog; cancel test « Centre x » = 0 -> ghost cx = 0. - tab « offers the correction when the core refuses a pending point » (typed cx 98): removed, no typed coordinate is possible; the verdict path stays covered by the C26 click tests and correctionFor units. - tab H5 « a typed radius shows the core issue »: removed (A8); the size refusal is the slider's (Task 4 tests). - tab H6 « a second click moves the pending point »: -> « Replacer le point », then the click moves the ghost, the form kept. - tab H7 « Centre x/y » = 30/50 -> ghost cx/cy. - tab tracing Enter: « x du sommet 3 » -> ghost points; « drops the tracing on Escape » -> Escape asks first (board 32 row 3), Continuer keeps, Abandonner drops; new « Annuler le tracé acts at once ». - keep-alive « a pending creation is kept and focused » and « a tracing … is kept and focused »: the tab now asks first (R-12) -> « Continuer » keeps the tracing / the form, « Abandonner » goes. - sections « its panel takes the focus » -> its dialog's [data-creation-focus] takes it. - no-loss « pending creation with its name » (hidden with the body) -> the dialog stays across the crossing, read-only, Créer off (R-14). - point-edit A5 « Rayon » = 7 / 9 -> ghost r = 7 / 9. - e2e editor-annotations keyboard test « numeric position » (cx field 250) -> UX_TESTS Keyboard: zone added, vertex added and removed, moved by the move mode, validated, saved. The « Fermer le tracé » step runs under expectNoShift again (shortcut removed). - e2e editor-geometry C26: the proposed x, y read from the notice text -> from the overlay's correction circle; the R-4 text checked in the dialog. - e2e editor-deselect « Escape cancels the tracing only » -> Escape asks, « Abandonner » cancels it, the selection kept. - e2e editor-shell-crossing « keeps its tool and its pending creation » (field hidden) -> the dialog stays read-only, Créer off, then editable on widening.
This commit is contained in:
1 parent
2d58da7d01
commit
4d2c64f57f
50 files changed
+3050
-1181
No files matched your search
@@ -469,49 +469,38 @@ describe('a request reaches only its owner', () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe('« Aller à » while a creation or a tracing is in progress', () => {
|
||||
const liveText = () =>
|
||||
document.querySelector('p[aria-live="polite"]')?.textContent ?? ''
|
||||
|
||||
describe('a tab while a creation or a tracing is in progress', () => {
|
||||
function bareAnnotationText(): string {
|
||||
const bare = point('anno-bare', 10, 10, 2)
|
||||
const value = { ...bare.value, geometry: null, name: name('Sans tracé') }
|
||||
return insert(drawnText(), { kind: 'annotation', value } as typeof bare)
|
||||
}
|
||||
|
||||
async function gotoBare(
|
||||
user: ReturnType<typeof userEvent.setup>,
|
||||
start: () => Promise<void>,
|
||||
) {
|
||||
// U2 Task 7 (R-12, A12): a creation no longer waits for « Aller à » in the background;
|
||||
// the tab that would leave it asks first. « Continuer » keeps it, « Abandonner » goes.
|
||||
it('a tracing from the Zone tool: the tab asks first, « Continuer » keeps it', async () => {
|
||||
const user = await mount(bareAnnotationText())
|
||||
const drawing = inPlace('annotations.drawing')
|
||||
await waitFor(() =>
|
||||
expect(
|
||||
inPlace('annotations.drawing').getByRole('button', { name: 'Zone' }),
|
||||
).toBeEnabled(),
|
||||
expect(drawing.getByRole('button', { name: 'Zone' })).toBeEnabled(),
|
||||
)
|
||||
await start()
|
||||
await user.click(drawing.getByRole('button', { name: 'Zone' }))
|
||||
pressAt(screen.getByTestId('annotation-canvas'), 20, 20)
|
||||
await user.click(tab(/Vérification/))
|
||||
const ask = await screen.findByRole('dialog', {
|
||||
name: 'Abandonner la création ?',
|
||||
})
|
||||
await user.click(within(ask).getByRole('button', { name: 'Continuer' }))
|
||||
expect(tab('Annotations')).toHaveAttribute('aria-selected', 'true')
|
||||
expect(drawing.getByTestId('tracing-commands')).toBeVisible()
|
||||
await user.click(tab(/Vérification/))
|
||||
await user.click(
|
||||
inPlace('verification').getAllByRole('button', {
|
||||
name: 'Aller à Sans tracé',
|
||||
})[0],
|
||||
within(
|
||||
await screen.findByRole('dialog', { name: 'Abandonner la création ?' }),
|
||||
).getByRole('button', { name: 'Abandonner' }),
|
||||
)
|
||||
}
|
||||
|
||||
it('a tracing from the Zone tool is kept and focused', async () => {
|
||||
const user = await mount(bareAnnotationText())
|
||||
await gotoBare(user, async () => {
|
||||
await user.click(
|
||||
inPlace('annotations.drawing').getByRole('button', { name: 'Zone' }),
|
||||
)
|
||||
pressAt(screen.getByTestId('annotation-canvas'), 20, 20)
|
||||
})
|
||||
expect(tab('Annotations')).toHaveAttribute('aria-selected', 'true')
|
||||
const bar = within(place('annotations.drawing')).getByTestId(
|
||||
'tracing-commands',
|
||||
)
|
||||
expect(bar).toBeVisible()
|
||||
await waitFor(() => expect(document.activeElement).toBe(bar))
|
||||
expect(liveText()).toContain('tracé est en cours')
|
||||
expect(tab(/Vérification/)).toHaveAttribute('aria-selected', 'true')
|
||||
expect(useAnnotationWork.getState().creation).toBeNull()
|
||||
})
|
||||
|
||||
// U2 Task 5 (R-12): « Remplacer par un polygone » is a redraw mode. With nothing placed a
|
||||
@@ -557,22 +546,32 @@ describe('« Aller à » while a creation or a tracing is in progress', () => {
|
||||
expect(drawing.getByTestId('tracing-commands')).toBeVisible()
|
||||
})
|
||||
|
||||
it('a pending creation is kept and focused', async () => {
|
||||
it('a point being replaced (dialog hidden): the tab asks, « Continuer » keeps the form', async () => {
|
||||
const user = await mount(bareAnnotationText())
|
||||
await gotoBare(user, async () => {
|
||||
await user.click(
|
||||
inPlace('annotations.drawing').getByRole('button', {
|
||||
name: 'Ajouter un point',
|
||||
}),
|
||||
)
|
||||
})
|
||||
const panel = within(place('annotations.drawing')).getByTestId(
|
||||
'annotation-creation',
|
||||
)
|
||||
expect(panel).toBeVisible()
|
||||
const drawing = inPlace('annotations.drawing')
|
||||
await waitFor(() =>
|
||||
expect(document.activeElement).toHaveAttribute('data-creation-heading'),
|
||||
expect(
|
||||
drawing.getByRole('button', { name: 'Ajouter un point' }),
|
||||
).toBeEnabled(),
|
||||
)
|
||||
expect(liveText()).toContain('création est en cours')
|
||||
await user.click(drawing.getByRole('button', { name: 'Ajouter un point' }))
|
||||
const dialog = await screen.findByRole('dialog', { name: 'Nouveau point' })
|
||||
await user.type(within(dialog).getByLabelText('Nom (FR)'), 'Nuque')
|
||||
await user.click(
|
||||
within(dialog).getByRole('button', { name: 'Replacer le point' }),
|
||||
)
|
||||
await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
|
||||
await user.click(tab(/Vérification/))
|
||||
await user.click(
|
||||
within(
|
||||
await screen.findByRole('dialog', { name: 'Abandonner la création ?' }),
|
||||
).getByRole('button', { name: 'Continuer' }),
|
||||
)
|
||||
expect(tab('Annotations')).toHaveAttribute('aria-selected', 'true')
|
||||
await user.click(
|
||||
drawing.getByRole('button', { name: 'Revenir aux propriétés' }),
|
||||
)
|
||||
const back = await screen.findByRole('dialog', { name: 'Nouveau point' })
|
||||
expect(within(back).getByLabelText('Nom (FR)')).toHaveValue('Nuque')
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user