feat(editor): properties dialog over the column, transactional save

U2 Task 6 (A1, A2, A3, A9, A10, R-3, R-5, R-6, R-14, R-16).

- Dialog: `anchor` places the panel at the column's left and width,
  from its top, under a 22 % ink veil that ignores clicks; the visual
  viewport below 320 px; centred without an anchor box.
- Navigation: `annotation` layer (LAYERS, EditorView, history entry,
  leave guards, left-draft flag); Back closes, Forward reopens.
- AnnotationDialog: read body, « Modifier » form (CreationFields with
  « Couleur », missingFields, R-3 messages), one `update` on the
  current annotation by id, « Marquer comme relu », « Modifier la
  forme », « Supprimer »; read-only flip keeps the draft.
- The column always shows the overview, selected row marked; Enter on
  it, a second click or a double click, the strip's « Propriétés »
  open the dialog. « Aller à » focuses the row (R-5).
- Read-only twin: strip and read-only dialog at 1 024 px and wider,
  inline read body below. PropertiesPanel and AnnotationFields gone.
- Strip lead 256 px and a fixed status slot, so the commands fit at
  1 024 px and a status change moves nothing.
- e2e: `aside-content` exemption removed; scroll-to-top workarounds
  of editor-geometry, editor-zones and editor-journey removed.

Removed assertions mapped:
  editor-annotations-tab.test.tsx:
  - selectFromList waited for `annotation-properties` -> waits for the strip's « Propriétés » (selection without dialog, A1)
  - refused place: issues block `annotation-geometry-issues` in the panel -> the strip notice alert (present, then gone)
  - keyboard creation / C26 confirmation: `annotation-properties` after create -> strip « Propriétés » (new element selected)
  - Désélectionner from the panel -> « Désélectionner » in the strip (all 7 tests); « panel closes » -> strip has no « Propriétés »
  - undo after deselect (typed name) -> handle key series then deselect then undo
  - commits a valid typed value once without blur (name field) -> a pending handle key series committed once by the strip deselect
  - a refused typed value: the panel closes (two tests: strip deselect, tap deselect) -> removed: no field outside the dialog; the dialog's draft writes nothing before « Enregistrer » (new dialog tests)
  - not offered while a replace tracing runs: panel's Désélectionner absent -> strip offers neither « Désélectionner » nor « Propriétés » during the tracing
  - tap: isDeselected read `annotation-properties` -> strip « Propriétés » absent; link select -> strip title data-selection
  - tap: undo after tap deselect (typed name) -> handle series; typed value committed on blur -> handle series committed on blur
  - strip geometry issues: list read in the panel -> list read in the properties dialog's issues block
  - a new commit replaces the message (typed name) -> « Marquer comme relu » in the dialog
  editor-escape.test.tsx:
  - `panel()` = `annotation-properties` -> the strip's « Propriétés » or the phone twin's inline read body
  - Escape from a panel button (« Marquer comme relu ») -> from the selected row in the side column: focus on the row
  - after A then B from the panel (via « Toutes les annotations ») -> select A, select B, Escape from a button of the side column: focus on B's row
  - a text field (panel « Nom (FR) ») -> the overview « Filtrer par nom »
  - redraw via the panel's « Remplacer par un polygone » -> the strip's command
  - modal / delete dialog opened by the panel's « Supprimer » -> « Supprimer » of the properties dialog
  - read-only width: hidden `annotation-properties` -> hidden strip « Propriétés » of the kept edit body
  editor-history-buttons.test.tsx (typed text and the press, 8 tests): the annotation's committed « Nom (FR) » field of the panel -> the sheet's committed « Nom (FR) » on Général (same TextField commit-on-blur path; annotation fields are now a dialog draft)
  editor-focus-request.test.tsx: « Aller à » focuses `data-properties-heading` inside `annotation-properties` -> focuses the annotation's row, marked aria-current, no dialog (R-5)
  editor-sections.test.tsx: « Aller à » with nothing in progress focused the properties heading -> focuses the row (R-5); creation kept: no `annotation-properties` -> no strip « Propriétés »
  editor-overview.test.tsx (edit and read-only): row opens `annotation-properties`, « Toutes les annotations » returns -> row selects, stays marked aria-current, no dialog; strip « Désélectionner » returns focus to the row; filter kept across select and « Désélectionner »
  editor-citations-guards.test.tsx: LAYERS_TOP_DOWN gains 'annotation' at the bottom
  editor-keep-alive.test.tsx: `annotation-properties` visible after the round trip -> the strip's « Propriétés » visible (selection kept)
  editor-no-loss.test.tsx: ids `ro-annotation-name-fr` and `annotation-name-fr` (both panels' fields) -> the twin's inline read body (no ids), then the dialog edit form's `annotation-edit-fr`, kept through a flip to 800 px, no duplicate id; « Aller à » visible `annotation-properties` -> visible `annotation-read` (inline twin), none at 1 280
  editor-point-edit.test.tsx / editor-zone-edit.test.tsx: `select()` waited for `annotation-properties` and returned it -> waits for the strip's « Propriétés » and returns the strip (its « Désélectionner » and « Remplacer par un polygone » moved there)
  - move mode Escape: `annotation-properties` still there -> the strip's « Propriétés » back after the mode
  - « Toutes les annotations » asks first during a started move -> Enter on the selected row asks first (no dialog), and the strip offers neither « Propriétés » nor « Désélectionner » during the mode
  - Escape from the handle / slider: `annotation-properties` gone -> the strip's « Propriétés » gone
  - I-3 touch tap: `annotation-properties` gone -> the strip's « Propriétés » gone
  e2e (sandbox):
  - support/layout.ts: `aside-content` exemption removed (ShiftExemption type, the loose compare); every `swaps`/`SWAPS` argument removed (editor-annotations, editor-zones, editor-geometry)
  - support/editor.ts pickAnnotation: clicked « Toutes les annotations » first when the panel showed -> the overview is always shown: clicks the row, then scrolls back to the top (the page no longer shortens)
  - editor-annotations: `annotation-properties` visible after a creation -> strip with « Propriétés »; review toggle and « Supprimer » of the panel -> the properties dialog's; a jitter click on the selected point now opens the dialog (A1), closed by Escape before the drag; handle names exact (the marked row shares the prefix); trace close moved out of expectNoShift (creation panel until Task 7, shortcut + TODO)
  - editor-deselect: `annotation-properties` -> the strip with « Propriétés » or the twin's inline read body; Escape in a field: panel « Nom (FR) » -> overview filter; delete dialog from the panel -> from the properties dialog (Escape closes it, then the dialog); « a typed value is applied by the click that deselects » (name field, refused blank) -> a pending point-handle key series applied by the deselecting click and by « Désélectionner » (refused value: no field outside the dialog); « the selected one stays » -> a second click, double click and jitter open the dialog, Escape closes it, selection kept
  - editor-geometry: `annotation-geometry-issues` in the panel -> read in the properties dialog, then the strip notice; after the refusal the error count unchanged; scroll-to-top workaround removed
  - editor-zones: panel « Désélectionner » -> strip; scroll-to-top after pickAnnotation removed (helper does it)
  - editor-structures: panel « Supprimer » -> properties dialog « Supprimer », confirmation over it
  - editor-journey: `#annotation-name-fr` committed field + `#annotation-laterality` -> the dialog's edit form, one « Enregistrer »; scroll-to-top removed
  - editor-shell / editor-shell-journeys: « Aller à » focus on `data-properties-heading` -> the annotation's row (aria-current), no dialog (R-5)
  - editor-shell-layout: focus kind `annotation-properties` -> removed (the overview is the side)
This commit is contained in:
bchanot committed 2026-11-17 22:01:57 +01:00
1 parent e596e0765e
commit cd794f3c39
66 files changed
+3351 -1357

No files matched your search

@@ -0,0 +1,100 @@
import { useEffect, useMemo, useRef, type RefObject } from 'react'
import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
import { visibleElement } from '../focusRequest'
import { MIN_EDIT_WIDTH } from '../mode'
import type { AnnotationLayer } from '../tabs'
import { CANVAS_BOX } from '../useEditorNavigation'
import { guardDrawing } from './drawingGuard'
/** What opened the properties dialog: the strip's « Propriétés », or the drawing or the list. */
export type OpenedBy = 'button' | 'drawing'
/** Opens the properties dialog of `id` (A1). */
export type OpenDialog = (id: string, by: OpenedBy) => void
/**
* The column the dialog sits over (A2), resolved when measured: the right column of the
* body shown (`data-annotation-aside`: `edit`, or `read` while read-only) at 1 024 px and
* wider, none below (stacked layout: the dialog is centred, R-14).
*/
function columnAnchor(readOnly: boolean): RefObject<HTMLElement | null> {
const column = `[data-annotation-aside="${readOnly ? 'read' : 'edit'}"]`
return {
get current() {
if (window.innerWidth < MIN_EDIT_WIDTH) return null
return visibleElement(column)
},
}
}
/** The visible row of the annotation `id` in the overview. */
function rowOf(id: string): HTMLElement | null {
const wanted = JSON.stringify({ kind: 'annotation', id })
return visibleElement('[data-focus-key]', (row) => {
return row.dataset.focusKey === wanted
})
}
/**
* The dialog's way in, out and place (board 32): an opening first commits a key series and
* asks started drawing work (R-12); once closed, the focus goes back to « Propriétés »
* when it opened it, else to the annotation's row, or the drawing when a filter hides it.
* The anchor is measured again when the editor turns read-only or back.
*/
export function useDialogOpening(
layer: AnnotationLayer | undefined,
readOnly: boolean,
) {
const opened = useRef<{ id: string; by: OpenedBy } | null>(null)
const latest = useRef(layer)
latest.current = layer
const open: OpenDialog = (id, by) => {
const go = () => {
opened.current = { id, by }
latest.current?.open(id)
}
if (guardDrawing(go)) go()
}
const returnFocus = () => {
const last = opened.current
if (!last) return null
const button =
last.by === 'button' && visibleElement('[data-properties-button]')
return button || rowOf(last.id) || visibleElement(CANVAS_BOX)
}
// A new object per flip: the dialog measures its place again (no resize fires).
const anchor = useMemo(() => columnAnchor(readOnly), [readOnly])
return { open, returnFocus, anchor }
}
/** What a body lets the layer do with its selection. */
export interface LayerSelection {
viewId: string
selectedId: string | null
show: (viewId: string, annotationId: string) => void
clear: () => void
}
/**
* The selection follows the layer (a Back, a Forward, a reload): its annotation is shown
* on its view and selected; a layer whose annotation is gone leaves nothing selected.
*/
export function useLayerFollow(
layerId: string | null,
doc: AnatomicalSheetDocument,
body: LayerSelection,
): void {
const latest = useRef(body)
latest.current = body
const { viewId, selectedId } = body
useEffect(() => {
if (layerId === null) return
const found = doc.annotations.find((a) => a.id === layerId)
if (!found) {
if (selectedId !== null) latest.current.clear()
return
}
if (found.id === selectedId && found.view_id === viewId) return
latest.current.show(found.view_id, found.id)
}, [layerId, doc, viewId, selectedId])
}
@@ -11,6 +11,7 @@ import {
type FocusRequest,
} from '../focusRequest'
import { useT } from '@/i18n/useT'
import { focusRowOrDrawing } from './deselect'
/** What « Aller à … » seeds on the drawing: the view and the annotation a key names. */
export function annotationFocus(
@@ -60,7 +61,7 @@ function showAnnotation(
const same =
drawing.selectedId === found.annotationId && drawing.viewId === found.viewId
if (same) {
focusFirst('[data-properties-heading]')
focusRowOrDrawing(found.annotationId)
return
}
awaiting.current = found.annotationId
@@ -68,8 +69,8 @@ function showAnnotation(
}
/**
* « Aller à » an annotation on the drawing: shows its view, selects it, then focuses the
* properties heading once it has rendered. While a creation or a tracing is in progress
* « Aller à » an annotation on the drawing (R-5): shows its view, selects it, then focuses
* its row (the drawing when a filter hides it) once it has rendered; no dialog opens (A1). While a creation or a tracing is in progress
* the request is kept: nothing is dispatched (it would drop the work), the panel or the
* strip's tracing commands take the focus and the live region says why.
*/
@@ -98,7 +99,8 @@ export function useAnnotationRequest(
if (awaiting.current === null || drawing.selectedId !== awaiting.current) {
return
}
const id = awaiting.current
awaiting.current = null
focusFirst('[data-properties-heading]')
focusRowOrDrawing(id)
})
}
@@ -0,0 +1,28 @@
import type { CreationForm, NewKind } from './creation'
/** A field the creation dialog and the edit form require (R-3). */
export type MissingField =
| 'name_fr'
| 'name_en'
| 'category'
| 'laterality'
| 'opens'
const blank = (v: string) => v.trim() === ''
/** Board 33 adjustment: only what is really missing, in the form's order. */
export function missingFields(
kind: NewKind,
form: CreationForm,
): MissingField[] {
const missing: MissingField[] = []
const bothOrNone =
kind === 'detail_trigger' && blank(form.fr) && blank(form.en)
if (!bothOrNone && blank(form.fr)) missing.push('name_fr')
if (!bothOrNone && blank(form.en)) missing.push('name_en')
if (form.categoryId === '') missing.push('category')
if (form.laterality === '') missing.push('laterality')
if (kind === 'detail_trigger' && form.opensViewId === '')
missing.push('opens')
return missing
}
@@ -0,0 +1,9 @@
import { geometryErrorsById } from '../issues'
import { useEditorStore } from '../state/editorStore'
/** What still names this annotation as invalid: never hidden, never shown as valid. */
export function useGeometryIssues(id: string): string[] {
const state = useEditorStore((s) => s.previewState)
const issues = state ? geometryErrorsById(state).get(id) : undefined
return [...new Set((issues ?? []).map((issue) => issue.message))]
}
@@ -32,6 +32,8 @@ export interface PressInput extends BlockDragInput {
selectedId: string | null
viewport: RefObject<HTMLDivElement | null>
onSelect: (id: string) => void
/** A second click on the selection, or a double click: its properties dialog (A1). */
onOpen: (id: string) => void
/** A click with a drawing tool, in drawing units, with its closing reach (R-11). */
onPlace: (at: XY, reach: number) => void
/** A click on a vertex handle, a « + » or the « − » bubble. */
@@ -107,9 +109,10 @@ const isHandleAction = (action: ClickAction): action is HandleAction =>
action.type === 'insert' ||
action.type === 'remove'
/** What a click does with the select tool. `open` (the properties dialog) has nothing yet. */
/** What a click does with the select tool. */
function runClick(action: ClickAction, input: PressInput): void {
if (action.type === 'select') input.onSelect(action.id)
else if (action.type === 'open') input.onOpen(action.id)
else if (action.type === 'deselect') input.onDeselect()
else if (action.type === 'unchoose') {
useAnnotationWork.setState({ chosen: null })