Files
faunosteo/apps/app/src/components/editor/annotations/AnnotationOverlay.tsx
T
bchanot 6211046537 feat(editor): vertex handles, insert and remove, zone move, redraw
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.
2026-11-17 20:24:49 +01:00

187 lines
5.4 KiB
TypeScript

import type { Ref } from 'react'
import type { Geometry, Point } from '@faunosteo/core-wasm/types'
import type { Correction } from '@/editor/annotations/correction'
import type { Frame } from '@/editor/annotations/frame'
import { isEditable } from '@/editor/annotations/geometryEdit'
import { useAnnotationWork } from '@/editor/annotations/workStore'
export interface OverlayProps {
svgRef: Ref<SVGSVGElement>
/** The composed root's own attributes: the overlay shares its coordinates. */
viewBox: string
ratio: string
frame: Frame | null
selectedId: string | null
selected: Geometry | null
dragged: Geometry | null
/** The place the core just refused (red dashes while its message shows). */
refused: Geometry | null
pending: Geometry | null
tracing: Point[] | null
correction: Correction | null
/** A redraw runs: the stored outline stays as the old place until the close (06 C). */
redrawing: boolean
}
const STROKE = { fill: 'none', vectorEffect: 'non-scaling-stroke' } as const
function Outline({
geometry,
dashed,
colour,
}: {
geometry: Geometry
dashed: boolean
colour: string
}) {
const style = {
...STROKE,
stroke: colour,
strokeWidth: 2,
strokeDasharray: dashed ? '6 4' : undefined,
}
if (geometry.type === 'circle') {
return (
<circle cx={geometry.cx} cy={geometry.cy} r={geometry.r} {...style} />
)
}
if (geometry.type === 'polygon') {
return <polygon points={geometry.points.join(' ')} {...style} />
}
return null
}
function Vertices({ geometry, size }: { geometry: Geometry; size: number }) {
if (geometry.type !== 'polygon') return null
return (
<>
{geometry.points.map(([x, y], index) => (
<circle
key={index}
cx={x}
cy={y}
r={size}
fill="white"
stroke="var(--color-ink)"
strokeWidth={1.5}
vectorEffect="non-scaling-stroke"
/>
))}
</>
)
}
/** The hollow cross of the position the user chose, drawn apart from the proposal. */
function HollowCross({
at,
size,
}: {
at: { x: number; y: number }
size: number
}) {
const style = { ...STROKE, stroke: 'var(--color-ink)', strokeWidth: 2 }
return (
<g data-testid="overlay-click-cross">
<path
d={`M ${at.x - size} ${at.y - size} L ${at.x + size} ${at.y + size}`}
{...style}
/>
<path
d={`M ${at.x - size} ${at.y + size} L ${at.x + size} ${at.y - size}`}
{...style}
/>
</g>
)
}
function TracingPath({ points, size }: { points: Point[]; size: number }) {
if (points.length === 0) return null
const shape: Geometry = { type: 'polygon', points }
return (
<>
<polyline
points={points.join(' ')}
{...STROKE}
stroke="var(--color-accent)"
strokeWidth={2}
strokeDasharray="6 4"
/>
<Vertices geometry={shape} size={size} />
</>
)
}
/** The selection's pending preview (move mode, slider, keys), read without the tab. */
function usePreviewOf(selectedId: string | null): Geometry | null {
return useAnnotationWork((s) =>
selectedId !== null && s.preview?.annotationId === selectedId
? s.preview.geometry
: null,
)
}
/**
* The page-drawn overlay (docs/ANNOTATION-RENDERING.md « Editor overlay »): numbers only,
* no annotation. Selection outline, vertex circles, the tracing in progress, the pending
* or dragged outline, a corrected position with the click marked apart; during a gesture
* the old place in grey dashes, after a refusal the refused place in red dashes. It never
* takes the pointer: the canvas box does.
*/
export default function AnnotationOverlay(props: OverlayProps) {
const { frame, selected, pending, tracing, correction } = props
const size = frame ? Math.max(frame.w, frame.h) / 200 : 1
const preview = usePreviewOf(props.selectedId)
const moved = props.dragged ?? preview
const old = moved !== null || props.redrawing
const shown = props.redrawing ? null : (moved ?? selected)
return (
<svg
ref={props.svgRef}
aria-hidden="true"
data-testid="annotation-overlay"
viewBox={props.viewBox}
preserveAspectRatio={props.ratio}
className="pointer-events-none absolute inset-0 h-full w-full"
>
{old && selected && isEditable(selected) && (
<g data-testid="overlay-old-place">
<Outline geometry={selected} dashed colour="var(--color-ink-muted)" />
</g>
)}
{props.refused && (
<g data-testid="overlay-refused-place">
<Outline
geometry={props.refused}
dashed
colour="var(--color-danger-strong)"
/>
</g>
)}
{shown && isEditable(shown) && (
<g data-testid="overlay-selection">
<Outline geometry={shown} dashed colour="var(--color-ink)" />
<Vertices geometry={shown} size={size} />
</g>
)}
{pending && (
<Outline
geometry={pending}
dashed={false}
colour="var(--color-accent)"
/>
)}
{correction && (
<>
<Outline
geometry={{ type: 'circle', ...correction.circle }}
dashed
colour="var(--color-accent)"
/>
<HollowCross at={correction.click} size={size * 1.5} />
</>
)}
{tracing && <TracingPath points={tracing} size={size} />}
</svg>
)
}