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:
1 parent
4d2c64f57f
commit
fe333c2bbd
6 files changed
+219
-37
No files matched your search
@@ -56,8 +56,7 @@ const NONE: Outcome = { missing: [], messages: [] }
|
||||
* undo); a point lets the core's verdict offer C (C26); a success ends the creation.
|
||||
*/
|
||||
function useCreate(work: Creation, created: { current: boolean }) {
|
||||
const t = useT()
|
||||
const locale = useLocaleStore((s) => s.locale)
|
||||
const context = { t: useT(), locale: useLocaleStore((s) => s.locale) }
|
||||
const [outcome, setOutcome] = useState<Outcome>(NONE)
|
||||
const settle = (attempt: Attempt) => {
|
||||
if (attempt.status === 'invalid') {
|
||||
@@ -74,44 +73,43 @@ function useCreate(work: Creation, created: { current: boolean }) {
|
||||
if (attempt.id) finishCreation(attempt.id, work.pending.kind)
|
||||
else dropCreation()
|
||||
}
|
||||
const input = { ...work, context: { t, locale } }
|
||||
return {
|
||||
outcome,
|
||||
create: () => settle(createAttempt(input, work.form)),
|
||||
create: () => settle(createAttempt({ ...work, context }, work.form)),
|
||||
confirm: () => {
|
||||
const { correction } = work.pending
|
||||
if (correction) settle(confirmAttempt(input, work.form, correction))
|
||||
if (!correction) return
|
||||
settle(confirmAttempt({ ...work, context }, work.form, correction))
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/** « Point placé · Replacer le point », « Zone tracée, 5 sommets · Reprendre le tracé ». */
|
||||
function ShapeLine({ work, readOnly }: { work: Creation; readOnly: boolean }) {
|
||||
const GLYPH = { point: 'point', zone: 'zone', detail_trigger: 'link' } as const
|
||||
|
||||
/** « Point placé », « Zone tracée, 5 sommets », « Accès tracé, 3 sommets ». */
|
||||
function useShapeText(pending: Creation['pending']): string {
|
||||
const t = useT()
|
||||
const locale = useLocaleStore((s) => s.locale)
|
||||
const { kind, geometry } = work.pending
|
||||
const count = geometry.type === 'polygon' ? geometry.points.length : 0
|
||||
const text =
|
||||
kind === 'point'
|
||||
? t('editor.annotations.creation.placed')
|
||||
: t(
|
||||
pluralKey(
|
||||
locale,
|
||||
`editor.annotations.creation.traced.${kind}`,
|
||||
count,
|
||||
),
|
||||
).replace('{count}', String(count))
|
||||
const point = kind === 'point'
|
||||
const { kind, geometry } = pending
|
||||
if (geometry.type !== 'polygon')
|
||||
return t('editor.annotations.creation.placed')
|
||||
const count = geometry.points.length
|
||||
const key = `editor.annotations.creation.traced.${kind}`
|
||||
return t(pluralKey(locale, key, count)).replace('{count}', String(count))
|
||||
}
|
||||
|
||||
function ShapeLine({ work, readOnly }: { work: Creation; readOnly: boolean }) {
|
||||
const t = useT()
|
||||
const text = useShapeText(work.pending)
|
||||
const point = work.pending.kind === 'point'
|
||||
return (
|
||||
<div
|
||||
data-creation-focus=""
|
||||
tabIndex={-1}
|
||||
className="flex flex-wrap items-center gap-x-2 gap-y-1 rounded-lg bg-[var(--color-surface-strong)] px-3 py-2 text-sm outline-none"
|
||||
>
|
||||
<EditorGlyph
|
||||
name={point ? 'point' : kind === 'zone' ? 'zone' : 'link'}
|
||||
size={16}
|
||||
/>
|
||||
<EditorGlyph name={GLYPH[work.pending.kind]} size={16} />
|
||||
<span>{text}</span>
|
||||
<button
|
||||
type="button"
|
||||
@@ -257,14 +255,12 @@ export default function CreationDialog(props: CreationDialogProps) {
|
||||
const visible = usePlaceVisible()
|
||||
const work = useAnnotationWork((s) => s.creation)
|
||||
const back = useCreationReturn(work)
|
||||
const shown = visible && work !== null && work.dialog
|
||||
const title = work ? t(`editor.annotations.new.${work.pending.kind}`) : ''
|
||||
return (
|
||||
<Dialog
|
||||
open={shown}
|
||||
open={visible && work !== null && work.dialog}
|
||||
anchor={props.anchor}
|
||||
veilCloses={false}
|
||||
title={title}
|
||||
title={work ? t(`editor.annotations.new.${work.pending.kind}`) : ''}
|
||||
returnFocus={back.returnFocus}
|
||||
onClose={() => (askDiscard() ? undefined : 'kept')}
|
||||
>
|
||||
|
||||
@@ -15,6 +15,15 @@ export interface CreationStart {
|
||||
|
||||
const creation = () => useAnnotationWork.getState().creation
|
||||
|
||||
/**
|
||||
* The creation's own question (« Abandonner la création ? ») lapses once the creation ends
|
||||
* or its dialog hides: it would otherwise reappear over the page with nothing to ask.
|
||||
*/
|
||||
const lapsed = () => {
|
||||
const { question } = useAnnotationWork.getState()
|
||||
return question?.work === 'creation' ? null : question
|
||||
}
|
||||
|
||||
function patch(change: Partial<Creation>): void {
|
||||
const current = creation()
|
||||
if (current)
|
||||
@@ -93,11 +102,13 @@ export function closeTrace(): boolean {
|
||||
|
||||
/** « Reprendre le tracé »: the dialog hides, the vertices and the form are kept. */
|
||||
export function resumeTrace(): void {
|
||||
useAnnotationWork.setState({ question: lapsed() })
|
||||
patch({ closed: false, dialog: false, resumed: true })
|
||||
}
|
||||
|
||||
/** « Replacer le point »: the dialog hides; the next click moves the ghost. */
|
||||
export function replacePoint(): void {
|
||||
useAnnotationWork.setState({ question: lapsed() })
|
||||
patch({ dialog: false, resumed: true })
|
||||
}
|
||||
|
||||
@@ -125,12 +136,16 @@ export function setCorrection(correction: Correction | null): void {
|
||||
|
||||
/** « Abandonner », or a guard's « Abandonner »: nothing of the creation is left. */
|
||||
export function dropCreation(): void {
|
||||
useAnnotationWork.setState({ creation: null })
|
||||
useAnnotationWork.setState({ creation: null, question: lapsed() })
|
||||
}
|
||||
|
||||
/** « Créer » succeeded: the creation ends, the drawing selects `id` (A7). */
|
||||
export function finishCreation(id: string, kind: NewKind): void {
|
||||
useAnnotationWork.setState({ creation: null, created: { id, kind } })
|
||||
useAnnotationWork.setState({
|
||||
creation: null,
|
||||
created: { id, kind },
|
||||
question: lapsed(),
|
||||
})
|
||||
}
|
||||
|
||||
/** The open tracing of a new shape on `viewId`, as the drawing reads a tracing. */
|
||||
|
||||
@@ -82,6 +82,12 @@ export const creationStart = (
|
||||
|
||||
const isRedraw = (tracing: Tracing | null) => tracing?.target === 'replace'
|
||||
|
||||
/** Backspace or « Retirer le dernier sommet »: the redraw's vertex, or the creation's. */
|
||||
function popTrace({ tracing, dispatch }: PlacementInput): void {
|
||||
if (isRedraw(tracing)) dispatch({ type: 'trace_pop' })
|
||||
else popVertex()
|
||||
}
|
||||
|
||||
/**
|
||||
* Tracing with the zone and link tools: vertices, closing, Enter, Backspace and Escape. A
|
||||
* redraw's tracing is the reducer's; a new shape's is the creation's (A12): its Escape
|
||||
@@ -104,14 +110,12 @@ function tracingActions(input: PlacementInput) {
|
||||
return dispatch({ type: 'trace_add', point: asPoint(at) })
|
||||
traceVertex(creationStart(input, 'tool'), TOOL_TARGET[tool], asPoint(at))
|
||||
}
|
||||
const pop = () =>
|
||||
isRedraw(tracing) ? dispatch({ type: 'trace_pop' }) : popVertex()
|
||||
const onTraceKey = (event: KeyboardEvent) => {
|
||||
if (!tracing) return
|
||||
if (event.key === 'Enter') closeTracing()
|
||||
if (event.key === 'Backspace') {
|
||||
event.preventDefault()
|
||||
pop()
|
||||
popTrace(input)
|
||||
}
|
||||
if (event.key === 'Escape') {
|
||||
event.preventDefault()
|
||||
@@ -119,7 +123,7 @@ function tracingActions(input: PlacementInput) {
|
||||
else askCreation()
|
||||
}
|
||||
}
|
||||
return { closeTracing, trace, onTraceKey, pop }
|
||||
return { closeTracing, trace, onTraceKey }
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -202,6 +206,6 @@ export function usePlacement(input: PlacementInput) {
|
||||
onDrop: dropAction(input),
|
||||
onTraceKey: tracing.onTraceKey,
|
||||
closeTracing: tracing.closeTracing,
|
||||
popVertex: tracing.pop,
|
||||
popVertex: () => popTrace(input),
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user