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:
1 parent
e596e0765e
commit
cd794f3c39
66 files changed
+3351
-1357
No files matched your search
@@ -18,15 +18,14 @@ import {
|
||||
useModeFollowsSelection,
|
||||
} from '@/editor/annotations/modeEnds'
|
||||
import { handledPoints } from '@/editor/annotations/zoneEdit'
|
||||
import { useAnnotationWork } from '@/editor/annotations/workStore'
|
||||
import { isEditable } from '@/editor/annotations/geometryEdit'
|
||||
import { useSelectionEscape } from '@/editor/annotations/deselect'
|
||||
import { usePlacement } from '@/editor/annotations/usePlacement'
|
||||
import { stripLeadOf } from '@/editor/annotations/stripLead'
|
||||
import {
|
||||
useGestureMessage,
|
||||
type GestureMessage as ShownMessage,
|
||||
} from '@/editor/annotations/useGestureMessage'
|
||||
useLayerFollow,
|
||||
type OpenDialog,
|
||||
} from '@/editor/annotations/dialogOpening'
|
||||
import { usePlacement } from '@/editor/annotations/usePlacement'
|
||||
import { useGestureMessage } from '@/editor/annotations/useGestureMessage'
|
||||
import {
|
||||
initialUi,
|
||||
uiReducer,
|
||||
@@ -40,26 +39,18 @@ import {
|
||||
useViewModel,
|
||||
type ViewModel,
|
||||
} from '@/editor/annotations/useViewModel'
|
||||
import { targetOfKey, type AnnotationSection } from '@/editor/navigation'
|
||||
import type { AnnotationSection } from '@/editor/navigation'
|
||||
import { usePlaceVisible } from '@/lib/placeVisibility'
|
||||
import type { EditorPlaceProps } from '@/editor/tabs'
|
||||
import { useT } from '@/i18n/useT'
|
||||
import { useLocaleStore } from '@/state/localeStore'
|
||||
import AnnotationCanvas from './AnnotationCanvas'
|
||||
import { annotationName } from './AnnotationList'
|
||||
import {
|
||||
SelectionPointCommands,
|
||||
ToolSize,
|
||||
useMoveFocusReturn,
|
||||
} from './PointCommands'
|
||||
import CreationPanel from './CreationPanel'
|
||||
import EditStrip, { type StripNotice } from './EditStrip'
|
||||
import TracingCommands from './TracingCommands'
|
||||
import ZoneCommands, { moveTitleKey, useChosenVertex } from './ZoneCommands'
|
||||
import GestureMessage from './GestureMessage'
|
||||
import KeyboardAdd from './KeyboardAdd'
|
||||
import OverviewPanel from './OverviewPanel'
|
||||
import PropertiesPanel, { useGeometryIssues } from './PropertiesPanel'
|
||||
import SceneStrip from './SceneStrip'
|
||||
import ViewSwitcher from './ViewSwitcher'
|
||||
|
||||
interface Props {
|
||||
@@ -67,10 +58,13 @@ interface Props {
|
||||
navigate: EditorPlaceProps['navigate']
|
||||
onOpenSection: (section: AnnotationSection, opener: HTMLElement) => void
|
||||
focus: EditorPlaceProps['focus']
|
||||
/** Opens the properties dialog (A1); the layer's id, which the selection follows. */
|
||||
onOpen: OpenDialog
|
||||
layerId: string | null
|
||||
}
|
||||
|
||||
/** What both columns read: the tab's state, the view, its frame and its selection. */
|
||||
interface Scene {
|
||||
export interface Scene {
|
||||
doc: AnatomicalSheetDocument
|
||||
ui: UiState
|
||||
dispatch: Dispatch<UiAction>
|
||||
@@ -82,6 +76,7 @@ interface Scene {
|
||||
setRoot: (root: RootAttributes | null) => void
|
||||
navigate: EditorPlaceProps['navigate']
|
||||
onOpenSection: Props['onOpenSection']
|
||||
onOpen: OpenDialog
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -106,25 +101,32 @@ function useViewFallback(
|
||||
|
||||
/** « Aller à » an annotation: the request, with what it needs of the drawing's state. */
|
||||
function useSceneRequest(
|
||||
{ doc, focus }: Props,
|
||||
{ doc, focus, layerId }: Props,
|
||||
ui: UiState,
|
||||
viewId: string,
|
||||
dispatch: Dispatch<UiAction>,
|
||||
) {
|
||||
useViewFallback(doc, ui.viewId, dispatch)
|
||||
const show = (view: string, id: string) => {
|
||||
if (view !== viewId) dispatch({ type: 'view', viewId: view })
|
||||
dispatch({ type: 'select', id })
|
||||
}
|
||||
useAnnotationRequest(focus, doc, {
|
||||
viewId,
|
||||
selectedId: ui.selectedId,
|
||||
busy: ui.pending ? 'creation' : ui.tracing ? 'tracing' : null,
|
||||
show: (view, id) => {
|
||||
dispatch({ type: 'view', viewId: view })
|
||||
dispatch({ type: 'select', id })
|
||||
},
|
||||
show,
|
||||
})
|
||||
useLayerFollow(layerId, doc, {
|
||||
viewId,
|
||||
selectedId: ui.selectedId,
|
||||
show,
|
||||
clear: () => dispatch({ type: 'select', id: null }),
|
||||
})
|
||||
}
|
||||
|
||||
function useScene(props: Props): Scene {
|
||||
const { doc, navigate, onOpenSection } = props
|
||||
const { doc, navigate, onOpenSection, onOpen } = props
|
||||
const [ui, dispatch] = useReducer(uiReducer, initialUi)
|
||||
const [root, setRoot] = useState<RootAttributes | null>(null)
|
||||
const viewId = ui.viewId ?? mainViewId(doc)
|
||||
@@ -142,6 +144,7 @@ function useScene(props: Props): Scene {
|
||||
setRoot,
|
||||
navigate,
|
||||
onOpenSection,
|
||||
onOpen,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,7 +188,7 @@ function useWork(scene: Scene) {
|
||||
}
|
||||
}
|
||||
|
||||
type Work = ReturnType<typeof useWork>
|
||||
export type Work = ReturnType<typeof useWork>
|
||||
|
||||
export default function EditableAnnotations(props: Props) {
|
||||
const scene = useScene(props)
|
||||
@@ -206,7 +209,7 @@ export default function EditableAnnotations(props: Props) {
|
||||
<SceneStrip scene={scene} work={work} />
|
||||
<div className="grid gap-4 lg:grid-cols-[minmax(0,1fr)_22rem]">
|
||||
<CanvasColumn scene={scene} work={work} onDeselect={byDrawing} />
|
||||
<aside ref={asideRef}>
|
||||
<aside ref={asideRef} data-annotation-aside="edit">
|
||||
<SidePanel scene={scene} context={work.context} />
|
||||
</aside>
|
||||
</div>
|
||||
@@ -311,6 +314,7 @@ function CanvasStage({
|
||||
}}
|
||||
onRoot={scene.setRoot}
|
||||
onSelect={(id) => dispatch({ type: 'select', id })}
|
||||
onOpen={(id) => scene.onOpen(id, 'drawing')}
|
||||
onPlace={work.placement.onPlace}
|
||||
onDrop={work.placement.onDrop}
|
||||
onHandle={work.zone.onHandle}
|
||||
@@ -329,7 +333,7 @@ function addAtCentre(
|
||||
dispatch({ type: 'pending_new', pending: keyboardPending(kind, frame, size) })
|
||||
}
|
||||
|
||||
/** The creation panel while an element is pending, else the selection's properties. */
|
||||
/** The creation panel while an element is pending, else the overview (A3). */
|
||||
function SidePanel({
|
||||
scene,
|
||||
context,
|
||||
@@ -337,9 +341,7 @@ function SidePanel({
|
||||
scene: Scene
|
||||
context: CommitContext
|
||||
}) {
|
||||
const { doc, ui, dispatch, model, frame, selected } = scene
|
||||
// During the move mode the panel offers no deselect: only the mode's own exits.
|
||||
const moving = useAnnotationWork((s) => s.mode?.kind === 'move')
|
||||
const { doc, ui, dispatch, frame } = scene
|
||||
if (ui.pending) {
|
||||
return (
|
||||
<CreationPanel
|
||||
@@ -353,32 +355,18 @@ function SidePanel({
|
||||
/>
|
||||
)
|
||||
}
|
||||
if (!selected) {
|
||||
return (
|
||||
<OverviewPanel
|
||||
doc={doc}
|
||||
viewId={scene.viewId}
|
||||
readOnly={false}
|
||||
filter={ui.filter}
|
||||
onFilter={(term) => dispatch({ type: 'filter', term })}
|
||||
onSelectView={(id) => dispatch({ type: 'view', viewId: id })}
|
||||
onSelectAnnotation={(id) => dispatch({ type: 'select', id })}
|
||||
onOpenSection={scene.onOpenSection}
|
||||
/>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<PropertiesPanel
|
||||
key={selected.id}
|
||||
annotation={selected}
|
||||
<OverviewPanel
|
||||
doc={doc}
|
||||
viewId={scene.viewId}
|
||||
readOnly={false}
|
||||
geometryLocked={!model.measured}
|
||||
dispatch={dispatch}
|
||||
navigate={scene.navigate}
|
||||
// « Tout afficher » leaves the selection: a started move asks first (R-12).
|
||||
onShowAll={guarded(() => dispatch({ type: 'select', id: null }))}
|
||||
busy={ui.tracing !== null || moving}
|
||||
filter={ui.filter}
|
||||
onFilter={(term) => dispatch({ type: 'filter', term })}
|
||||
onSelectView={(id) => dispatch({ type: 'view', viewId: id })}
|
||||
selectedId={scene.selected?.id ?? null}
|
||||
onSelectAnnotation={(id) => dispatch({ type: 'select', id })}
|
||||
onOpenAnnotation={(id) => scene.onOpen(id, 'drawing')}
|
||||
onOpenSection={scene.onOpenSection}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -420,142 +408,3 @@ function overlayOf(
|
||||
redrawing: ui.tracing?.target === 'replace',
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The strip of the edit body: the lead of the scene (the move mode's own while it runs),
|
||||
* its notice, the commands.
|
||||
*/
|
||||
function SceneStrip({ scene, work }: { scene: Scene; work: Work }) {
|
||||
const t = useT()
|
||||
const locale = useLocaleStore((s) => s.locale)
|
||||
const notice = useStripNotice(scene, work)
|
||||
const mode = useAnnotationWork((s) =>
|
||||
s.mode?.kind === 'move' ? s.mode : null,
|
||||
)
|
||||
useMoveFocusReturn(mode !== null)
|
||||
const { ui, selected, doc } = scene
|
||||
const chosenVertex = useChosenVertex(selected?.id)
|
||||
const lead = mode
|
||||
? {
|
||||
title: t(moveTitleKey(mode, work.target?.kind)),
|
||||
detail: t('editor.annotations.move.hint'),
|
||||
icon: 'move' as const,
|
||||
}
|
||||
: stripLeadOf(ui, selected, doc, { t, locale, chosenVertex })
|
||||
const commandsKey = commandsKeyOf(
|
||||
ui,
|
||||
mode !== null,
|
||||
work.target,
|
||||
chosenVertex,
|
||||
)
|
||||
return (
|
||||
<EditStrip
|
||||
lead={lead}
|
||||
notice={notice}
|
||||
commands={<SceneCommands scene={scene} work={work} />}
|
||||
commandsKey={commandsKey}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
/** One box per set of commands: a wider set never moves an existing box (A14). */
|
||||
function commandsKeyOf(
|
||||
ui: UiState,
|
||||
moving: boolean,
|
||||
target: Annotation | null,
|
||||
chosen: number | null,
|
||||
) {
|
||||
if (ui.tracing) return 'tracing'
|
||||
if (moving) return 'move'
|
||||
if (target?.geometry?.type === 'polygon') return `zone-${chosen !== null}`
|
||||
return target?.kind === 'point' ? 'point' : `tool-${ui.tool}`
|
||||
}
|
||||
|
||||
/** A tracing's commands, a movable point's, or the Point tool's size (A5). */
|
||||
function SceneCommands({ scene, work }: { scene: Scene; work: Work }) {
|
||||
const { ui, doc, viewId, frame, dispatch } = scene
|
||||
if (ui.tracing) {
|
||||
return (
|
||||
<TracingCommands
|
||||
count={ui.tracing.points.length}
|
||||
onClose={work.placement.closeTracing}
|
||||
onPop={work.placement.popVertex}
|
||||
onCancel={() => dispatch({ type: 'trace_cancel' })}
|
||||
/>
|
||||
)
|
||||
}
|
||||
if (work.target?.geometry?.type === 'polygon') {
|
||||
const edit = work.edit
|
||||
return (
|
||||
<ZoneCommands annotation={work.target} edit={edit} dispatch={dispatch} />
|
||||
)
|
||||
}
|
||||
// A link circle keeps its handle but has no size and no move mode (R-10; no label).
|
||||
if (work.target?.kind === 'point') {
|
||||
const props = { doc, viewId, frame, edit: work.edit }
|
||||
return <SelectionPointCommands annotation={work.target} {...props} />
|
||||
}
|
||||
if (ui.tool !== 'point' || ui.pending || !frame) return null
|
||||
const size = ui.size
|
||||
return (
|
||||
<ToolSize
|
||||
doc={doc}
|
||||
viewId={viewId}
|
||||
frame={frame}
|
||||
size={size}
|
||||
dispatch={dispatch}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* The strip's middle, first match wins: a refusal (the strip's own, then a refused gesture
|
||||
* whose line under the drawing may be cut short: its full text here, A6), the selection's
|
||||
* geometry issues (the first, then « +n »), R-18's zoom line for a hidden « + », then why
|
||||
* a tool cannot be used now.
|
||||
*/
|
||||
function useStripNotice(
|
||||
scene: Scene,
|
||||
work: Pick<Work, 'message' | 'insertsHidden'>,
|
||||
): StripNotice | null {
|
||||
const t = useT()
|
||||
const issues = useGeometryIssues(scene.selected?.id ?? '')
|
||||
const inMode = useAnnotationWork((s) => s.mode !== null)
|
||||
const message: ShownMessage | null = work.message.message
|
||||
const { ui, model, doc } = scene
|
||||
if (ui.hint) return { tone: 'error', text: ui.hint }
|
||||
if (message?.tone === 'error') {
|
||||
return { tone: 'error', text: message.text, quiet: true }
|
||||
}
|
||||
if (scene.selected && issues.length > 0) {
|
||||
return { tone: 'error', text: issues[0]!, more: issues.length - 1 }
|
||||
}
|
||||
// R-18: a « + » hidden for its short segment; never in a mode (move, redraw).
|
||||
if (work.insertsHidden && !inMode && !ui.tracing) {
|
||||
return { tone: 'info', text: t('editor.annotations.strip.zoom_hint') }
|
||||
}
|
||||
if (!model.measured) return unmeasuredNotice(scene, t)
|
||||
if (doc.categories.length === 0) {
|
||||
return { tone: 'info', text: t('editor.annotations.no_category') }
|
||||
}
|
||||
if (ui.tool === 'link' && model.children.length === 0) {
|
||||
return { tone: 'info', text: t('editor.annotations.no_child_view') }
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
/** Points to the views section, on the view whose drawing cannot be measured. */
|
||||
function unmeasuredNotice(
|
||||
scene: Scene,
|
||||
t: (key: string) => string,
|
||||
): StripNotice {
|
||||
const target = targetOfKey({ kind: 'view', id: scene.viewId })
|
||||
return {
|
||||
tone: 'info',
|
||||
text: t('editor.annotations.unmeasured.hint'),
|
||||
link: {
|
||||
label: t('editor.place.views'),
|
||||
onClick: () => scene.navigate(target),
|
||||
},
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user