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
@@ -27,6 +27,7 @@ import {
|
||||
point,
|
||||
svgBytes,
|
||||
} from '../helpers/editorFixtures'
|
||||
import { LayeredTab } from '../helpers/annotationLayer'
|
||||
import {
|
||||
USER,
|
||||
VERSION,
|
||||
@@ -61,8 +62,6 @@ const props = {
|
||||
const named = (id: string, cx: number, cy: number, r: number) =>
|
||||
point(id, cx, cy, r)
|
||||
const annotations = () => store.getState().previewState!.document.annotations
|
||||
const nameOf = (id: string) =>
|
||||
annotations().find((a: Annotation) => a.id === id)?.name?.fr
|
||||
const geometryOf = (id: string) =>
|
||||
annotations().find((a: Annotation) => a.id === id)?.geometry
|
||||
/** The selection as the overlay draws it (U2 Task 5: no coordinate field in the panel). */
|
||||
@@ -106,7 +105,7 @@ const text = () => insert(drawnText(), named('anno-a', 50, 50, 5))
|
||||
|
||||
async function mount(options: { text?: string; readOnly?: boolean } = {}) {
|
||||
await openReady({ text: options.text ?? text() })
|
||||
render(<AnnotationsTab {...props} readOnly={options.readOnly ?? false} />)
|
||||
render(<LayeredTab {...props} readOnly={options.readOnly ?? false} />)
|
||||
const drawing = options.readOnly
|
||||
? 'catalogue-canvas-drawing'
|
||||
: 'annotation-canvas-drawing'
|
||||
@@ -121,7 +120,17 @@ async function selectFromList(name: RegExp | string = /N/) {
|
||||
})
|
||||
await userEvent.setup().click(within(list).getAllByRole('button')[0])
|
||||
void name
|
||||
return screen.findByTestId('annotation-properties')
|
||||
// A1: a row selects only; the strip names the selection (the dialog stays closed).
|
||||
await screen.findByRole('button', { name: 'Propriétés' })
|
||||
return screen.getByTestId('edit-strip')
|
||||
}
|
||||
|
||||
/** « Propriétés » in the strip: the properties dialog of the selection (A1). */
|
||||
async function openProperties() {
|
||||
await userEvent
|
||||
.setup()
|
||||
.click(screen.getByRole('button', { name: 'Propriétés' }))
|
||||
return screen.findByRole('dialog')
|
||||
}
|
||||
|
||||
describe('selection and the list', () => {
|
||||
@@ -165,11 +174,11 @@ describe('an edit on the drawing (U2 Task 5: the numeric group left the panel)',
|
||||
|
||||
it('a refused place keeps the stored shape, then a place inside the frame repairs it', async () => {
|
||||
await mount({ text: insert(drawnText(), named('anno-a', 150, 150, 5)) })
|
||||
const panel = await selectFromList()
|
||||
const strip = await selectFromList()
|
||||
const before = store.getState().documentText
|
||||
expect(
|
||||
within(panel).getByTestId('annotation-geometry-issues'),
|
||||
).toBeInTheDocument()
|
||||
// The issue shows in the strip's notice (U2 Task 6: the panel left).
|
||||
const issue = () => within(strip).queryByRole('alert')
|
||||
expect(issue()).toBeInTheDocument()
|
||||
mouseDrag(pointHandle(), [150, 150], [50, 150])
|
||||
expect(store.getState().documentText).toBe(before)
|
||||
expect(screen.getByTestId('overlay-refused-place')).toBeInTheDocument()
|
||||
@@ -181,7 +190,7 @@ describe('an edit on the drawing (U2 Task 5: the numeric group left the panel)',
|
||||
cy: 50,
|
||||
r: 5,
|
||||
})
|
||||
expect(screen.queryByTestId('annotation-geometry-issues')).toBeNull()
|
||||
expect(issue()).toBeNull()
|
||||
})
|
||||
|
||||
it('Escape drops a pending series: the stored shape shows again', async () => {
|
||||
@@ -231,8 +240,9 @@ describe('the keyboard creation path', () => {
|
||||
laterality: 'unpaired',
|
||||
geometry: { type: 'circle', cx: 50, cy: 50 },
|
||||
})
|
||||
// A7: the new point selected (the strip offers its properties).
|
||||
expect(
|
||||
await screen.findByTestId('annotation-properties'),
|
||||
await screen.findByRole('button', { name: 'Propriétés' }),
|
||||
).toBeInTheDocument()
|
||||
})
|
||||
|
||||
@@ -308,7 +318,7 @@ describe('the point tool and the corrected position (C26)', () => {
|
||||
})
|
||||
expect(panel).not.toBeInTheDocument()
|
||||
expect(screen.queryByTestId('overlay-click-cross')).toBeNull()
|
||||
await screen.findByTestId('annotation-properties')
|
||||
await screen.findByRole('button', { name: 'Propriétés' })
|
||||
expect(shownCircle()).toHaveAttribute('cx', '15')
|
||||
})
|
||||
|
||||
@@ -1001,7 +1011,7 @@ describe('« Désélectionner » (R1, A6)', () => {
|
||||
const panel = await selectFromList()
|
||||
const before = snapshot()
|
||||
await userEvent.setup().click(button(panel))
|
||||
expect(screen.queryByTestId('annotation-properties')).toBeNull()
|
||||
expect(screen.queryByRole('button', { name: 'Propriétés' })).toBeNull()
|
||||
expect(screen.getByTestId('annotation-overview')).toBeInTheDocument()
|
||||
expect(document.activeElement).toBe(rowOf('anno-a'))
|
||||
expect(announce).toHaveBeenCalledWith('Aucune annotation sélectionnée.')
|
||||
@@ -1020,22 +1030,22 @@ describe('« Désélectionner » (R1, A6)', () => {
|
||||
.getByTestId('annotation-canvas-drawing')
|
||||
.querySelector('[data-anno-id="anno-a"]')!,
|
||||
)
|
||||
const reopened = await screen.findByTestId('annotation-properties')
|
||||
await userEvent.setup().click(button(reopened))
|
||||
await screen.findByRole('button', { name: 'Propriétés' })
|
||||
await userEvent.setup().click(button(screen.getByTestId('edit-strip')))
|
||||
expect(document.activeElement).toBe(screen.getByTestId('annotation-canvas'))
|
||||
expect(screen.queryByTestId('annotation-properties')).toBeNull()
|
||||
expect(screen.queryByRole('button', { name: 'Propriétés' })).toBeNull()
|
||||
})
|
||||
|
||||
it('undo after it undoes the earlier edit', async () => {
|
||||
await mountSpy()
|
||||
const panel = await selectFromList()
|
||||
const user = userEvent.setup()
|
||||
await user.clear(within(panel).getByLabelText('Nom (FR)'))
|
||||
await user.type(within(panel).getByLabelText('Nom (FR)'), 'Nuque{Enter}')
|
||||
expect(nameOf('anno-a')).toBe('Nuque')
|
||||
await user.click(button(panel))
|
||||
const handle = screen.getByTestId('point-handle')
|
||||
fireEvent.keyDown(handle, { key: 'ArrowRight' })
|
||||
fireEvent.keyDown(handle, { key: 'Enter' })
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 50.5 })
|
||||
await userEvent.setup().click(button(panel))
|
||||
act(() => void store.getState().undoStep())
|
||||
expect(nameOf('anno-a')).toBe('N')
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 50 })
|
||||
})
|
||||
|
||||
it('read-only: no « Supprimer », it deselects and focuses the ro- row', async () => {
|
||||
@@ -1045,7 +1055,7 @@ describe('« Désélectionner » (R1, A6)', () => {
|
||||
within(panel).queryByRole('button', { name: 'Supprimer' }),
|
||||
).toBeNull()
|
||||
await userEvent.setup().click(button(panel))
|
||||
expect(screen.queryByTestId('annotation-properties')).toBeNull()
|
||||
expect(screen.queryByRole('button', { name: 'Propriétés' })).toBeNull()
|
||||
const row = document.querySelector(
|
||||
'[data-focus-key=\'{"kind":"annotation","id":"anno-a"}\']',
|
||||
)
|
||||
@@ -1053,38 +1063,27 @@ describe('« Désélectionner » (R1, A6)', () => {
|
||||
expect(announce).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('commits a valid typed value once when the field is not blurred', async () => {
|
||||
it('commits a pending key series once when the handle is not blurred', async () => {
|
||||
await mountSpy()
|
||||
const panel = await selectFromList()
|
||||
const user = userEvent.setup()
|
||||
const name = within(panel).getByLabelText('Nom (FR)')
|
||||
await user.clear(name)
|
||||
await user.type(name, 'Nuque')
|
||||
const handle = screen.getByTestId('point-handle')
|
||||
handle.focus()
|
||||
fireEvent.keyDown(handle, { key: 'ArrowRight' })
|
||||
const depth = store.getState().undo.length
|
||||
await user.click(button(panel))
|
||||
expect(nameOf('anno-a')).toBe('Nuque')
|
||||
await userEvent.setup().click(button(panel))
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 50.5 })
|
||||
expect(store.getState().undo.length).toBe(depth + 1)
|
||||
})
|
||||
|
||||
it('a refused typed value: the panel closes, the document is unchanged', async () => {
|
||||
await mountSpy()
|
||||
const panel = await selectFromList()
|
||||
const user = userEvent.setup()
|
||||
const before = store.getState().documentText
|
||||
// A blank name is refused (both names are required).
|
||||
await user.clear(within(panel).getByLabelText('Nom (FR)'))
|
||||
await user.click(button(panel))
|
||||
expect(screen.queryByTestId('annotation-properties')).toBeNull()
|
||||
expect(store.getState().documentText).toBe(before)
|
||||
})
|
||||
|
||||
it('speaks English', async () => {
|
||||
useLocaleStore.setState({ locale: 'en' })
|
||||
await mountSpy()
|
||||
await screen.findByTestId('annotation-overview')
|
||||
await userEvent.setup().click(rowOf('anno-a')!)
|
||||
const panel = await screen.findByTestId('annotation-properties')
|
||||
await userEvent.setup().click(button(panel, 'Deselect'))
|
||||
await screen.findByRole('button', { name: 'Properties' })
|
||||
await userEvent
|
||||
.setup()
|
||||
.click(button(screen.getByTestId('edit-strip'), 'Deselect'))
|
||||
expect(announce).toHaveBeenCalledWith('No annotation selected.')
|
||||
})
|
||||
|
||||
@@ -1101,10 +1100,9 @@ describe('« Désélectionner » (R1, A6)', () => {
|
||||
name: 'Remplacer par un polygone',
|
||||
}),
|
||||
)
|
||||
const open = await screen.findByTestId('annotation-properties')
|
||||
expect(
|
||||
within(open).queryByRole('button', { name: 'Désélectionner' }),
|
||||
).toBeNull()
|
||||
await screen.findByRole('button', { name: 'Annuler le tracé' })
|
||||
expect(screen.queryByRole('button', { name: 'Désélectionner' })).toBeNull()
|
||||
expect(screen.queryByRole('button', { name: 'Propriétés' })).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1173,8 +1171,9 @@ describe('a tap on the drawing (D6b)', () => {
|
||||
expect(drawing(readOnly).querySelector('svg')).not.toBeNull(),
|
||||
)
|
||||
}
|
||||
// U2 Task 6: a selection shows « Propriétés » in the strip (the panel left).
|
||||
const isDeselected = () =>
|
||||
screen.queryByTestId('annotation-properties') === null
|
||||
screen.queryByRole('button', { name: 'Propriétés' }) === null
|
||||
async function selected(options: { text?: string } = {}) {
|
||||
await mountSpy(options)
|
||||
await selectFromList()
|
||||
@@ -1252,7 +1251,9 @@ describe('a tap on the drawing (D6b)', () => {
|
||||
} as Annotation
|
||||
await mountSpy({ text: insert(view, { kind: 'annotation', value: link }) })
|
||||
tap(marker('link-a'))
|
||||
expect(screen.getByTestId('annotation-properties')).toBeInTheDocument()
|
||||
expect(screen.getByTestId('edit-strip-title')).toHaveAttribute(
|
||||
'data-selection',
|
||||
)
|
||||
expect(announce).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
@@ -1575,47 +1576,31 @@ describe('a tap on the drawing (D6b)', () => {
|
||||
|
||||
it('undo after a tap deselect undoes the earlier edit, redo restores it', async () => {
|
||||
await selected()
|
||||
const user = userEvent.setup()
|
||||
const name = screen.getByLabelText('Nom (FR)')
|
||||
await user.clear(name)
|
||||
await user.type(name, 'Nuque{Enter}')
|
||||
const handle = screen.getByTestId('point-handle')
|
||||
fireEvent.keyDown(handle, { key: 'ArrowRight' })
|
||||
fireEvent.keyDown(handle, { key: 'Enter' })
|
||||
tap(rect())
|
||||
act(() => void store.getState().undoStep())
|
||||
expect(nameOf('anno-a')).toBe('N')
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 50 })
|
||||
act(() => void store.getState().redoStep())
|
||||
expect(nameOf('anno-a')).toBe('Nuque')
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 50.5 })
|
||||
})
|
||||
|
||||
it('commits a typed valid value once and deselects when the press blurs the field', async () => {
|
||||
it('commits a pending key series once and deselects when the press blurs the handle', async () => {
|
||||
await selected()
|
||||
const user = userEvent.setup()
|
||||
const name = screen.getByLabelText('Nom (FR)')
|
||||
await user.clear(name)
|
||||
await user.type(name, 'Nuque')
|
||||
const handle = screen.getByTestId('point-handle')
|
||||
act(() => handle.focus())
|
||||
fireEvent.keyDown(handle, { key: 'ArrowRight' })
|
||||
const depth = store.getState().undo.length
|
||||
fireEvent.pointerDown(rect(), { ...init(), clientX: 10, clientY: 10 })
|
||||
// What mousedown does: the focus moves to the box, the field commits, the drawing rebuilds.
|
||||
// What mousedown does: the focus moves to the box, the series commits on the blur.
|
||||
act(() => box().focus())
|
||||
fireEvent.pointerUp(rect(), { ...init(), clientX: 10, clientY: 10 })
|
||||
fireEvent.click(rect())
|
||||
expect(nameOf('anno-a')).toBe('Nuque')
|
||||
expect(geometryOf('anno-a')).toMatchObject({ cx: 50.5 })
|
||||
expect(store.getState().undo.length).toBe(depth + 1)
|
||||
expect(isDeselected()).toBe(true)
|
||||
})
|
||||
|
||||
it('a refused typed value: the panel closes, the document is unchanged', async () => {
|
||||
await selected()
|
||||
const user = userEvent.setup()
|
||||
const before = store.getState().documentText
|
||||
// A blank name is refused (both names are required).
|
||||
await user.clear(screen.getByLabelText('Nom (FR)'))
|
||||
fireEvent.pointerDown(rect(), { ...init(), clientX: 10, clientY: 10 })
|
||||
act(() => box().focus())
|
||||
fireEvent.pointerUp(rect(), { ...init(), clientX: 10, clientY: 10 })
|
||||
fireEvent.click(rect())
|
||||
expect(isDeselected()).toBe(true)
|
||||
expect(store.getState().documentText).toBe(before)
|
||||
})
|
||||
})
|
||||
|
||||
describe('the strip', () => {
|
||||
@@ -1765,7 +1750,10 @@ describe('the strip', () => {
|
||||
]),
|
||||
})
|
||||
await selectFromList()
|
||||
const issues = within(screen.getByTestId('annotation-properties'))
|
||||
const dialog = await openProperties()
|
||||
const issues = within(
|
||||
within(dialog).getByTestId('annotation-geometry-issues'),
|
||||
)
|
||||
.getAllByRole('listitem')
|
||||
.map((item) => item.textContent)
|
||||
// The core gives one frame fault per annotation: « +n » is shown by the strip below.
|
||||
@@ -1805,10 +1793,13 @@ describe('the strip', () => {
|
||||
await selectFromList()
|
||||
drag(marker('anno-a'), [60, 40])
|
||||
expect(line()).toHaveTextContent('Point déplacé')
|
||||
const name = screen.getByLabelText('Nom (FR)')
|
||||
// A commit that is no gesture: the review toggle of the properties dialog (A10).
|
||||
const user = userEvent.setup()
|
||||
await user.clear(name)
|
||||
await user.type(name, 'Nuque{Enter}')
|
||||
const dialog = await openProperties()
|
||||
await user.click(
|
||||
within(dialog).getByRole('button', { name: 'Marquer comme relu' }),
|
||||
)
|
||||
await user.click(within(dialog).getByRole('button', { name: 'Fermer' }))
|
||||
expect(line()).not.toHaveTextContent('Point déplacé')
|
||||
drag(marker('anno-a'), [40, 40])
|
||||
expect(line()).toHaveTextContent('Point déplacé')
|
||||
|
||||
Reference in new issue
Block a user