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
@@ -28,12 +28,22 @@ import { defaultView, targetOfKey } from '@/editor/navigation'
|
||||
import { useEditorNavigation } from '@/editor/useEditorNavigation'
|
||||
import { useLocaleStore } from '@/state/localeStore'
|
||||
import DrawingGuardDialog from '@/components/editor/annotations/DrawingGuardDialog'
|
||||
import CreationDialog from '@/components/editor/annotations/CreationDialog'
|
||||
import { drawnText } from '../helpers/editorFixtures'
|
||||
import {
|
||||
markRedraw,
|
||||
resetWork,
|
||||
setModePreview,
|
||||
startMove,
|
||||
startRedraw,
|
||||
useAnnotationWork,
|
||||
} from '@/editor/annotations/workStore'
|
||||
import { emptyForm } from '@/editor/annotations/creation'
|
||||
import {
|
||||
placePending,
|
||||
replacePoint,
|
||||
traceVertex,
|
||||
} from '@/editor/annotations/creationWork'
|
||||
|
||||
afterEach(cleanup)
|
||||
|
||||
@@ -477,6 +487,212 @@ describe('the drawing guard (R-12): a move mode and the navigations', () => {
|
||||
})
|
||||
})
|
||||
|
||||
/**
|
||||
* U2 Task 7 (R-12, A12): every guard site asks during a creation, and for a move mode or a
|
||||
* redraw once work has started; with nothing started a mode ends at once.
|
||||
*/
|
||||
describe('the drawing guard at every site: creation, move, redraw', () => {
|
||||
const STORED = { type: 'circle' as const, cx: 1, cy: 2, r: 3 }
|
||||
afterEach(() => act(() => resetWork()))
|
||||
const tabShown = () => screen.getByRole('tab', { selected: true })
|
||||
const start = {
|
||||
viewId: 'v',
|
||||
frame: null,
|
||||
origin: 'tool' as const,
|
||||
form: emptyForm({ categories: [] } as never),
|
||||
}
|
||||
const point = {
|
||||
kind: 'point' as const,
|
||||
geometry: { type: 'circle' as const, cx: 5, cy: 5, r: 2 },
|
||||
}
|
||||
const WORK = {
|
||||
// A point being replaced: no dialog, nothing typed, still asked (A12).
|
||||
creation: () => {
|
||||
placePending(start, point)
|
||||
replacePoint()
|
||||
},
|
||||
tracing: () => traceVertex(start, 'zone', [1, 1]),
|
||||
move: () => {
|
||||
startMove('a', 'doc')
|
||||
setModePreview({ ...STORED, cx: 9 }, STORED)
|
||||
},
|
||||
redraw: () => {
|
||||
startRedraw('a', 'doc')
|
||||
markRedraw(true)
|
||||
},
|
||||
}
|
||||
const TITLE = {
|
||||
creation: 'Abandonner la création ?',
|
||||
tracing: 'Abandonner la création ?',
|
||||
move: 'Abandonner le déplacement ?',
|
||||
redraw: 'Abandonner le nouveau tracé ?',
|
||||
}
|
||||
const left = () => {
|
||||
const work = useAnnotationWork.getState()
|
||||
return work.creation === null && work.mode === null
|
||||
}
|
||||
type Kind = keyof typeof WORK
|
||||
const kinds = Object.keys(WORK) as Kind[]
|
||||
|
||||
async function asks(kind: Kind, run: () => Promise<void>) {
|
||||
const user = userEvent.setup()
|
||||
await run()
|
||||
const dialog = screen.getByRole('dialog', { name: TITLE[kind] })
|
||||
await user.click(within(dialog).getByRole('button', { name: 'Continuer' }))
|
||||
expect(left()).toBe(false)
|
||||
return user
|
||||
}
|
||||
|
||||
it.each(kinds)(
|
||||
'%s: a tab click asks; « Continuer » keeps, « Abandonner » goes',
|
||||
async (kind) => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
mount()
|
||||
act(() => WORK[kind]())
|
||||
const user = await asks(kind, () =>
|
||||
userEvent.setup().click(screen.getByRole('tab', { name: 'Constats' })),
|
||||
)
|
||||
expect(tabShown()).toHaveTextContent('Général')
|
||||
await user.click(screen.getByRole('tab', { name: 'Constats' }))
|
||||
await user.click(screen.getByRole('button', { name: 'Abandonner' }))
|
||||
expect(tabShown()).toHaveTextContent('Constats')
|
||||
expect(left()).toBe(true)
|
||||
},
|
||||
)
|
||||
|
||||
it.each(kinds)(
|
||||
'%s: an arrow-key tab move asks the same way',
|
||||
async (kind) => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
mount()
|
||||
const general = screen.getByRole('tab', { name: 'Général' })
|
||||
act(() => general.focus())
|
||||
act(() => WORK[kind]())
|
||||
await asks(kind, async () => {
|
||||
fireEvent.keyDown(general, { key: 'ArrowRight' })
|
||||
})
|
||||
expect(tabShown()).toHaveTextContent('Général')
|
||||
},
|
||||
)
|
||||
|
||||
it.each(kinds)('%s: a section entry asks the same way', async (kind) => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
mount()
|
||||
act(() => WORK[kind]())
|
||||
const user = await asks(kind, () =>
|
||||
userEvent.setup().click(screen.getByRole('button', { name: 'section' })),
|
||||
)
|
||||
await user.click(screen.getByRole('button', { name: 'section' }))
|
||||
await user.click(screen.getByRole('button', { name: 'Abandonner' }))
|
||||
expect(left()).toBe(true)
|
||||
})
|
||||
|
||||
it.each(kinds)('%s: a Back asks and keeps the view', async (kind) => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
const user = userEvent.setup()
|
||||
mount()
|
||||
await user.click(screen.getByRole('tab', { name: 'Constats' }))
|
||||
act(() => WORK[kind]())
|
||||
act(() => navigate(-1))
|
||||
expect(tabShown()).toHaveTextContent('Constats')
|
||||
await user.click(
|
||||
within(screen.getByRole('dialog', { name: TITLE[kind] })).getByRole(
|
||||
'button',
|
||||
{ name: 'Abandonner' },
|
||||
),
|
||||
)
|
||||
expect(left()).toBe(true)
|
||||
})
|
||||
|
||||
it.each(['move', 'redraw'] as const)(
|
||||
'%s with nothing started: tab, arrow key and section act at once',
|
||||
async (kind) => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
const user = userEvent.setup()
|
||||
mount()
|
||||
const begin = () =>
|
||||
kind === 'move' ? startMove('a', 'doc') : startRedraw('a', 'doc')
|
||||
act(() => begin())
|
||||
const general = screen.getByRole('tab', { name: 'Général' })
|
||||
act(() => general.focus())
|
||||
fireEvent.keyDown(general, { key: 'ArrowRight' })
|
||||
expect(tabShown()).not.toHaveTextContent('Général')
|
||||
expect(useAnnotationWork.getState().mode).toBeNull()
|
||||
act(() => begin())
|
||||
await user.click(screen.getByRole('button', { name: 'section' }))
|
||||
expect(useAnnotationWork.getState().mode).toBeNull()
|
||||
expect(screen.queryByRole('dialog')).toBeNull()
|
||||
},
|
||||
)
|
||||
})
|
||||
|
||||
/**
|
||||
* U2 Task 7: the creation dialog is a modal without a history layer. A Back while it is
|
||||
* open is refused, and its « Abandonner la création ? » shows inside it. (Under happy-dom
|
||||
* the refusal is reached through the drawing guard; the browser's modal branch is proved
|
||||
* by the e2e in editor-annotations.spec.ts.)
|
||||
*/
|
||||
describe('a Back on the creation dialog', () => {
|
||||
afterEach(() => act(() => resetWork()))
|
||||
const doc = JSON.parse(drawnText())
|
||||
function CreationPage() {
|
||||
const nav = useEditorNavigation('annotations')
|
||||
navigate = useNavigate()
|
||||
location = useLocation()
|
||||
useEditorHistory(nav, owner, defaultView('annotations'))
|
||||
return (
|
||||
<>
|
||||
<EditorTabs
|
||||
active={nav.state.tab}
|
||||
tier="wide"
|
||||
onSelect={nav.selectTab}
|
||||
/>
|
||||
<CreationDialog doc={doc} readOnly={false} anchor={{ current: null }} />
|
||||
<DrawingGuardDialog />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
it('with nothing typed it asks inside the dialog; « Continuer » keeps the shape', async () => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
const user = userEvent.setup()
|
||||
render(
|
||||
<MemoryRouter initialEntries={['/x']}>
|
||||
<CreationPage />
|
||||
</MemoryRouter>,
|
||||
)
|
||||
// An entry of this editor to go Back to.
|
||||
await user.click(screen.getByRole('tab', { name: 'Constats' }))
|
||||
act(() =>
|
||||
placePending(
|
||||
{
|
||||
viewId: 'view-main',
|
||||
frame: null,
|
||||
origin: 'tool',
|
||||
form: emptyForm(doc),
|
||||
},
|
||||
{ kind: 'point', geometry: { type: 'circle', cx: 50, cy: 50, r: 5 } },
|
||||
),
|
||||
)
|
||||
const dialog = await screen.findByRole('dialog', { name: 'Nouveau point' })
|
||||
act(() => navigate(-1))
|
||||
const ask = within(dialog).getByRole('group', {
|
||||
name: 'Abandonner la création ?',
|
||||
})
|
||||
// One question, inside the dialog: the workspace's own stays closed.
|
||||
expect(screen.getAllByRole('dialog')).toHaveLength(1)
|
||||
await user.click(within(ask).getByRole('button', { name: 'Continuer' }))
|
||||
expect(useAnnotationWork.getState().creation).not.toBeNull()
|
||||
expect(
|
||||
within(dialog).queryByRole('group', { name: /Abandonner/ }),
|
||||
).toBeNull()
|
||||
act(() => navigate(-1))
|
||||
await user.click(within(dialog).getByRole('button', { name: 'Abandonner' }))
|
||||
expect(useAnnotationWork.getState().creation).toBeNull()
|
||||
await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
|
||||
})
|
||||
})
|
||||
|
||||
/** U2 Task 6: the annotation properties dialog is a layer of the browser history. */
|
||||
describe('the annotation layer and the history', () => {
|
||||
function AnnotationPage({ dirty }: { dirty: boolean }) {
|
||||
|
||||
Reference in new issue
Block a user