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.
58 lines
2.1 KiB
TypeScript
58 lines
2.1 KiB
TypeScript
import { endMode, guardWork, useAnnotationWork } from './workStore'
|
|
|
|
/**
|
|
* A keyboard series or a size change still pending (no blur yet: a mouse Back button)
|
|
* commits now, through its own blur (BDR-050): leaving never drops it.
|
|
*/
|
|
export function commitFocusedSeries(): void {
|
|
const { preview } = useAnnotationWork.getState()
|
|
if (!preview || preview.source === 'move') return
|
|
const active = document.activeElement
|
|
const series = active instanceof HTMLElement || active instanceof SVGElement
|
|
if (series && active.closest('[data-series]')) active.blur()
|
|
}
|
|
|
|
/** An unstarted mode ends; a pending series that is not the mode's stays. */
|
|
function endModeOnly(): void {
|
|
useAnnotationWork.setState((work) => ({
|
|
mode: null,
|
|
preview: work.preview?.source === 'move' ? null : work.preview,
|
|
}))
|
|
}
|
|
|
|
/**
|
|
* The drawing guard (R-12), asked by every navigation that would drop the drawing's work:
|
|
* a tab, a section, « Aller à », a view chip, a tool, Back, leaving the editor. Nothing
|
|
* started: an unstarted mode ends at once and the caller goes on (true). Work started:
|
|
* the question is shown (`DrawingGuardDialog`) and `proceed` waits for « Abandonner »
|
|
* (false).
|
|
*/
|
|
export function guardDrawing(proceed: () => void): boolean {
|
|
const state = useAnnotationWork.getState()
|
|
const work = guardWork(state)
|
|
if (work === null) {
|
|
commitFocusedSeries()
|
|
endModeOnly()
|
|
return true
|
|
}
|
|
// A question already open keeps its own move (a Back over it is not replayed).
|
|
if (state.question === null) {
|
|
useAnnotationWork.setState({ question: { work, proceed } })
|
|
}
|
|
return false
|
|
}
|
|
|
|
/**
|
|
* « Continuer » keeps the work as it is; « Abandonner » drops the work the question
|
|
* named (the mode, or the whole creation) and makes the move.
|
|
*/
|
|
export function answerDrawing(discard: boolean): void {
|
|
const { question } = useAnnotationWork.getState()
|
|
useAnnotationWork.setState({ question: null })
|
|
if (!discard || !question) return
|
|
if (question.work === 'creation')
|
|
useAnnotationWork.setState({ creation: null })
|
|
else endMode()
|
|
question.proceed()
|
|
}
|