U2 Task 5. A selected polygon gets its vertex, « + » and « − » handles (R-9, hidden « + » under two hit radii, R-18 zoom hint in the strip), the handle cap at 40 (R-7), vertex drag and keys, the move mode on the zone or the chosen vertex, « Redessiner » as a redraw mode kept in step with its tracing (R-12 guard, R-13 drop), close radius in CSS px (R-11). The numeric group leaves the properties panel (D1). Removed or rewritten assertions (numeric group -> replacement): - tab « shows its exact stored numbers » (Centre x field) -> the overlay selection circle's cx attribute, same exact value. - tab « a numeric edit » x3 -> « an edit on the drawing »: Enter on the handle without a step commits nothing, a step + Enter commits once; a refused handle drag keeps the stored shape then a drag inside the frame repairs it (issues gone); Escape drops a pending series. - tab C26 « Centre x 15 » -> overlay cx 15. - tab C32 unmeasured « Centre x as text » -> no handle, no field. - tab « adds and removes a vertex as part of the whole group » -> « + » then « − » on the drawing; « never offers to remove below three » -> « − » aria-disabled at 3. - tab H8 « refused Remplacer drops the tracing » -> keeps it open with « Fermeture refusée » (board 33 A); « refused vertex add/remove stay non appliqué » -> a refused vertex drag restores the shape exactly. - tab Désélectionner and D6b (typed Centre x committed, refused, undone) x6 and strip « a new commit replaces the message » -> the same with the Nom (FR) field (a blank name is the refused value). - focus-request « Centre x 20 » -> overlay cx 20. - escape « strip commands keep their Escape » -> a redraw: Escape on the strip or the box cancels it (R-12 row 4); kept for a new zone tracing. - keep-alive « Remplacer tracing kept across Aller à » -> ended by a tab when empty, asked once a vertex is placed (R-12). - e2e annotations: numeric cx edit + undo/redo -> handle keys + undo/ redo; jitter/drag and Task 4 point reads -> overlay attributes (the stored place during the mode -> overlay-old-place); keyboard-only cy and vertex x typed -> handle and vertex keys. - e2e deselect: Centre x typed/refused/committed -> Nom (FR). - e2e geometry, shell-crossing: Centre x/cy reads -> overlay attributes. - e2e journey: cx +3 and vertex x +4 typed -> 3 and 4 arrow steps + Enter; a far typed value + revert -> a far handle drag refused. - e2e equine latency: typed cx rounds -> handle arrow + Enter rounds.
123 lines
4.1 KiB
TypeScript
123 lines
4.1 KiB
TypeScript
import type { KeyboardEvent } from 'react'
|
||
import type { Annotation } from '@faunosteo/core-wasm/types'
|
||
import { useEditorStore } from '../state/editorStore'
|
||
import { moveStep, type Frame } from './frame'
|
||
import type { Drop } from './usePlacement'
|
||
import { takeMove, takePreview, stepSelection } from './previewCommit'
|
||
import { chooseVertex, freshChosen } from './zoneEdit'
|
||
import {
|
||
endMode,
|
||
startMove,
|
||
useAnnotationWork,
|
||
type Preview,
|
||
} from './workStore'
|
||
|
||
export interface PointEditInput {
|
||
/** The selection when it can be moved now: a circle (point, link) or a polygon. */
|
||
target: Annotation | null
|
||
frame: Frame | null
|
||
onDrop: Drop
|
||
}
|
||
|
||
export type Direction = 'left' | 'up' | 'down' | 'right'
|
||
|
||
const DELTA: Record<Direction, [number, number]> = {
|
||
left: [-1, 0],
|
||
up: [0, -1],
|
||
down: [0, 1],
|
||
right: [1, 0],
|
||
}
|
||
|
||
const KEY_DIRECTION: Record<string, Direction> = {
|
||
ArrowLeft: 'left',
|
||
ArrowUp: 'up',
|
||
ArrowDown: 'down',
|
||
ArrowRight: 'right',
|
||
}
|
||
|
||
/** One step (R-11) of the target, into the move mode or a keyboard series. */
|
||
function step(input: PointEditInput, direction: Direction, big: boolean) {
|
||
const { target, frame } = input
|
||
if (!target?.geometry || !frame) return
|
||
const size = moveStep(frame, big)
|
||
const [x, y] = DELTA[direction]
|
||
stepSelection(target.id, target.geometry, { x: x * size, y: y * size })
|
||
}
|
||
|
||
/** A preview back on the stored shape (there and back, a pinned slider) is no change. */
|
||
function changed(
|
||
preview: Preview | null,
|
||
target: Annotation | null,
|
||
): preview is Preview {
|
||
if (!preview || preview.annotationId !== target?.id) return false
|
||
return JSON.stringify(preview.geometry) !== JSON.stringify(target.geometry)
|
||
}
|
||
|
||
/** The commits of the pending work: each takes its preview, fresh and changed only (R-13). */
|
||
function commits({ onDrop, target }: PointEditInput) {
|
||
const keys = () => {
|
||
const preview = takePreview('keys')
|
||
if (changed(preview, target)) onDrop(preview.annotationId, preview.geometry)
|
||
}
|
||
const size = () => {
|
||
const preview = takePreview('size')
|
||
if (changed(preview, target)) {
|
||
onDrop(preview.annotationId, preview.geometry, 'size')
|
||
}
|
||
}
|
||
const move = () => {
|
||
const vertex = useAnnotationWork.getState().mode?.vertex ?? null
|
||
const preview = takeMove()
|
||
if (!preview) return
|
||
const { annotationId: id, geometry } = preview
|
||
if (vertex === null) return void onDrop(id, geometry)
|
||
// The moved vertex stays chosen on the new text.
|
||
if (onDrop(id, geometry, 'vertex')) chooseVertex(id, vertex)
|
||
}
|
||
return { keys, size, move }
|
||
}
|
||
|
||
const inMoveMode = () => useAnnotationWork.getState().mode?.kind === 'move'
|
||
|
||
/** The point handle's keys: arrows step (Shift ×10), Enter commits the series or the mode. */
|
||
function handleKeys(input: PointEditInput, commit: ReturnType<typeof commits>) {
|
||
return (event: KeyboardEvent) => {
|
||
const direction = KEY_DIRECTION[event.key]
|
||
if (direction) {
|
||
event.preventDefault()
|
||
return step(input, direction, event.shiftKey)
|
||
}
|
||
if (event.key !== 'Enter') return
|
||
event.preventDefault()
|
||
if (inMoveMode()) commit.move()
|
||
else commit.keys()
|
||
}
|
||
}
|
||
|
||
/**
|
||
* Point editing (R-10 to R-13): the handle's keyboard series (one commit on Enter or
|
||
* blur), the size slider's commit, and the move mode (« Déplacer le point », its arrows,
|
||
* « Valider la position » committing once, « Annuler »).
|
||
*/
|
||
export function usePointEdit(input: PointEditInput) {
|
||
const commit = commits(input)
|
||
return {
|
||
onHandleKey: handleKeys(input, commit),
|
||
// BDR-050: leaving the handle commits its series; a move mode waits for « Valider ».
|
||
onHandleBlur: () => commit.keys(),
|
||
commitSize: commit.size,
|
||
// « Déplacer le sommet » while a vertex is chosen, else the whole shape.
|
||
startMove: () => {
|
||
const id = input.target?.id
|
||
if (!id) return
|
||
const base = useEditorStore.getState().documentText
|
||
startMove(id, base, freshChosen(id))
|
||
},
|
||
stepMove: (direction: Direction) => step(input, direction, false),
|
||
confirmMove: commit.move,
|
||
cancelMove: endMode,
|
||
}
|
||
}
|
||
|
||
export type PointEdit = ReturnType<typeof usePointEdit>
|