fix(editor): final review fixes (touch undo guard, focus, save line)

Important 1: a touch press fires pointer leave between up and click; only a
mouse leave (or a pointer cancel) forgets the refused field, so Annuler no
longer undoes an unrelated change. Important 2: the LAN spec reads the
revision before the attach, through shownRevision, which throws instead of NaN
(spec stays not run). Minor 1: refocusIfHidden refocuses a still shown element
the commit blurred (references search on a 1 024 px crossing). Minor 2:
discardChanges keeps lastSave (reload path still drops it). Minor 3: the
overview filter term lives in UiState / the read-only twin, not the card.
Minor 4: categories section drops its inner h3 and the unused
editor.general.categories keys. AC8: badge test.

Assertions rewritten or added (R-24):
- editor-tabs-general « Général no longer holds the categories editor »:
  queryByText of the deleted heading (now vacuous) -> queryByLabelText of the
  category name fields.
- editor-focus-request « Annotations: selects the annotation »: findAllByText
  /anno-b|Sélection/ -> the properties panel holds Centre x = 20 (anno-b) and
  owns the focused heading.
- editor-shell-layout panel walk: added after.at(-1) === 'side'.
- editor-recovery title « Annuler les modifications » -> « Abandonner ».
- new: touch/cancel/mouse press, references search crossing, discard keeps
  lastSave, filter kept, one categories heading, badge 1/2/0, shownRevision.
This commit is contained in:
bchanot committed 2026-11-09 12:19:32 +01:00
1 parent 942d52a835
commit 0467885527
22 files changed
+327 -38

No files matched your search

@@ -0,0 +1,39 @@
/** The LAN spec's revision reading, run on the strings the save line really shows. */
import { describe, expect, it } from 'vitest'
import { fr } from '@/i18n/fr'
import { shownRevision } from '../../e2e/support/saveLineText'
const line = (key: keyof typeof fr, values: Record<string, string> = {}) =>
Object.entries(values).reduce(
(text, [name, value]) => text.replace(`{${name}}`, value),
fr[key],
)
describe('shownRevision', () => {
it('reads the revision of the « Révision n » line', () => {
expect(
shownRevision(line('editor.draft.status.revision', { revision: '7' })),
).toBe(7)
})
it('reads it from both saved forms', () => {
const saved = line('editor.draft.status.saved', { revision: '8' })
const savedAt = line('editor.draft.status.saved_at', {
revision: '12',
time: '14:02',
})
expect([shownRevision(saved), shownRevision(savedAt)]).toEqual([8, 12])
})
it('throws on the forms that carry none, never answers NaN', () => {
const texts = [
fr['editor.draft.status.unsaved'],
line('editor.draft.status.unsaved_count_one', { count: '1' }),
fr['editor.draft.status.saving'],
'',
]
for (const text of texts) {
expect(() => shownRevision(text)).toThrow('shows no revision')
}
})
})
@@ -1,7 +1,13 @@
/** « Aller à … »: each request reaches the place its target names, once, and never lands on body. */
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { useState } from 'react'
import { cleanup, render, screen, waitFor } from '@testing-library/react'
import {
cleanup,
render,
screen,
waitFor,
within,
} from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import type {
AnatomicalSheetDocument,
@@ -125,10 +131,13 @@ describe('focus requests', () => {
focus={request({ kind: 'annotation', id: 'anno-b' })}
/>,
)
expect(await screen.findAllByText(/anno-b|Sélection/)).not.toHaveLength(0)
// anno-b and anno-a share a name: the circle's centre tells which one is selected.
const properties = await screen.findByTestId('annotation-properties')
expect(within(properties).getByLabelText('Centre x')).toHaveValue('20')
await waitFor(() =>
expect(document.activeElement).toHaveAttribute('data-properties-heading'),
)
expect(properties).toContainElement(document.activeElement as HTMLElement)
})
it('Références and Régions: focus the named row', async () => {
@@ -252,6 +252,52 @@ describe('typed text and the press', () => {
expect(geometry()).toMatchObject({ cx: 40 })
})
async function refusedField() {
const user = userEvent.setup()
mountDraft()
await ready()
act(() => void commitMove(40))
const field = await selectAnnotation(user)
await user.clear(field)
return field
}
/** A press as a touch sends it: down, up, the leave it fires, then the click. */
function touchPress() {
const init = { pointerType: 'touch' }
fireEvent.pointerDown(undoButton(), init)
fireEvent.pointerUp(undoButton(), init)
fireEvent.pointerLeave(undoButton(), init)
fireEvent.click(undoButton())
}
it('a touch press keeps the refused field across pointer leave and click', async () => {
const field = await refusedField()
touchPress()
expect(field).toHaveAttribute('aria-invalid', 'true')
expect(field).toHaveFocus()
expect(geometry()).toMatchObject({ cx: 40 })
expect(store.getState().undo).toHaveLength(1)
})
it('a touch press cancelled by the browser forgets the field', async () => {
const field = await refusedField()
fireEvent.pointerDown(undoButton(), { pointerType: 'touch' })
fireEvent.pointerCancel(undoButton(), { pointerType: 'touch' })
fireEvent.click(undoButton())
expect(field).not.toHaveFocus()
expect(geometry()).toMatchObject({ cx: 50 })
})
it('a mouse leaving the button forgets the field', async () => {
const field = await refusedField()
fireEvent.pointerDown(undoButton(), { pointerType: 'mouse' })
fireEvent.pointerLeave(undoButton(), { pointerType: 'mouse' })
fireEvent.click(undoButton())
expect(field).not.toHaveFocus()
expect(geometry()).toMatchObject({ cx: 50 })
})
it('a keyboard activation after a refused blur commit skips the undo too', async () => {
const user = userEvent.setup()
mountDraft()
@@ -443,6 +489,29 @@ describe('« Abandonner les modifications »', () => {
).toBeInTheDocument()
})
it('keeps the session\'s save in the save line, and the save line says it', async () => {
const user = userEvent.setup()
sb.saveSheetDraft.mockResolvedValue({ revision: 4 } as never)
sb.getOfficialSheetAdmin.mockRejectedValue(new Error('offline'))
mountDraft()
await ready()
act(() => void commitMove(40))
await user.click(screen.getByRole('button', { name: 'Enregistrer' }))
const line = screen.getByTestId('save-line')
await waitFor(() =>
expect(line).toHaveTextContent(/^Enregistré · révision 4$/),
)
act(() => void commitMove(41))
expect(line).toHaveTextContent(/^1 modification non enregistrée$/)
const dialog = await open(user)
await user.click(
dialog.getByRole('button', { name: fr['editor.draft.discard_confirm'] }),
)
expect(store.getState().unsaved).toBe(false)
expect(geometry()).toMatchObject({ cx: 40 })
expect(line).toHaveTextContent(/^Enregistré · révision 4$/)
})
it('does not mention a copy when none is stored', async () => {
const user = userEvent.setup()
vi.spyOn(console, 'warn').mockImplementation(() => {})
@@ -290,6 +290,22 @@ describe('the guards of a width change', () => {
expect(document.activeElement).toBe(refs)
})
it('the references search, shown in both modes, keeps its focus and its text', async () => {
const user = await mount()
await user.click(button('Références'))
const panel = screen.getByTestId('editor-references-panel')
const search = within(panel).getByRole('searchbox', {
name: 'Rechercher une référence',
})
await user.type(search, 'code')
expect(document.activeElement).toBe(search)
cross(800)
expect(document.activeElement).toBe(search)
expect(search).toHaveValue('code')
cross(1280)
expect(document.activeElement).toBe(search)
})
it('a crossing with the focus on no field leaves the focus alone', async () => {
const user = await mount()
await user.click(tab('Général'))
@@ -143,6 +143,21 @@ describe.each([
await waitFor(() => expect(document.activeElement).toBe(rows()[1]))
})
it('keeps the « Filtrer par nom » term across a selection and back', async () => {
await mount(readOnly)
const user = userEvent.setup()
const field = () =>
within(overview()).getByRole('searchbox', { name: 'Filtrer par nom' })
await user.type(field(), 'epaule')
await user.click(rows()[0])
await user.click(
screen.getByRole('button', { name: 'Toutes les annotations' }),
)
expect(field()).toHaveValue('epaule')
expect(rows()).toHaveLength(1)
expect(rows()[0]).toHaveTextContent('Épaule')
})
it('a view row switches the canvas view', async () => {
await mount(readOnly)
const user = userEvent.setup()
+14 -1
View File
@@ -171,7 +171,7 @@ describe('restore', () => {
expect(node).toMatchObject({ reference_ids: [], children: [], review_status: 'inherited' })
})
it('takes the reload path for « Annuler les modifications » under staleBase', async () => {
it('takes the reload path for « Abandonner les modifications » under staleBase', async () => {
seed(movedText(10), 2)
await openReady({ revision: 5 })
await store.getState().restoreCopy()
@@ -182,6 +182,19 @@ describe('restore', () => {
expect(storedCopy()).toBeNull()
})
it('keeps `lastSave` on a plain discard, drops it on the reload path', async () => {
await openReady({ revision: 3 })
const saved = { revision: 3, savedAt: '2026-11-04T13:32:00Z' }
store.setState({ lastSave: saved })
commitMove(40)
expect(await store.getState().discardChanges({ confirmed: true })).toEqual({ ok: true })
expect(store.getState().lastSave).toBe(saved)
store.setState({ staleBase: true })
serverHas(baseText(), 6)
await store.getState().discardChanges({ confirmed: true })
expect(store.getState().lastSave).toBeNull()
})
it('reports a copy the core refuses, keeps it, blocks editing until ignored', async () => {
sessionStorage.setItem(
copyKeyOf(),
@@ -91,6 +91,19 @@ describe('the overview entries', () => {
},
)
it('the categories section shows its own heading once, as the other sections', async () => {
const user = userEvent.setup()
mountDraft()
await ready()
await user.click(entry('Modifier les catégories'))
const headings = within(place('annotations.categories')!).getAllByRole(
'heading',
)
expect(headings.map((h) => [h.tagName, h.textContent])).toEqual([
['H2', 'Catégories'],
])
})
it('the Catégories card header shows the number of categories', async () => {
mountDraft()
await ready()
@@ -0,0 +1,78 @@
/** AC8: the Vérification tab carries the blocking-error count as text, and nothing at zero. */
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { act, cleanup, render, screen } from '@testing-library/react'
import type { SheetIssue } from '@faunosteo/core-wasm/types'
import EditorTabs from '@/components/editor/EditorTabs'
import { useLocaleStore } from '@/state/localeStore'
import { openReady, resetStore, store } from '../helpers/editorHarness'
vi.mock('@/lib/supabase', () => ({ getSupabaseClient: () => ({}) }))
vi.mock('@faunosteo/supabase', async (orig) => ({
...(await orig<typeof import('@faunosteo/supabase')>()),
getSheetVersion: vi.fn(),
downloadSheetDrawing: vi.fn(),
saveSheetDraft: vi.fn(),
getOfficialSheetAdmin: vi.fn(),
submitSheetReview: vi.fn(),
}))
beforeEach(() => useLocaleStore.setState({ locale: 'fr' }))
afterEach(() => {
cleanup()
resetStore()
})
const issue = (severity: SheetIssue['severity'], at: number): SheetIssue => ({
code: 'x.y',
severity,
path: `annotations[${at}]`,
message: 'm',
})
function reportIssues(issues: SheetIssue[]) {
const previewState = store.getState().previewState
if (!previewState) throw new Error('the editor is not ready')
act(() =>
store.setState({
previewState: {
...previewState,
report: { ...previewState.report, issues },
},
}),
)
}
const verificationTab = () => screen.getByRole('tab', { name: /^Vérification/ })
describe('the Vérification tab badge', () => {
it.each([
[1, 'Vérification 1 erreur'],
[2, 'Vérification 2 erreurs'],
])('says « n erreur(s) » for %i blocking error(s)', async (count, name) => {
await openReady()
render(<EditorTabs active="general" tier="wide" onSelect={vi.fn()} />)
reportIssues(
Array.from({ length: count }, (_, at) => issue('error', at)),
)
expect(verificationTab()).toHaveTextContent(new RegExp(`^${name}$`))
})
it('shows nothing at zero, and warnings do not count', async () => {
await openReady()
render(<EditorTabs active="general" tier="wide" onSelect={vi.fn()} />)
reportIssues([])
expect(verificationTab()).toHaveTextContent(/^Vérification$/)
reportIssues([issue('warning', 0), issue('warning', 1)])
expect(verificationTab()).toHaveTextContent(/^Vérification$/)
expect(screen.queryByText(/erreur/)).toBeNull()
})
it('the other tabs never carry the count', async () => {
await openReady()
render(<EditorTabs active="general" tier="wide" onSelect={vi.fn()} />)
reportIssues([issue('error', 0)])
expect(screen.getByRole('tab', { name: 'Général' })).toHaveTextContent(
/^Général$/,
)
})
})
@@ -107,7 +107,7 @@ describe('Annotations, section Catégories', () => {
it('Général no longer holds the categories editor', async () => {
await openReady()
render(<GeneralTab {...props} />)
expect(screen.queryByText("Catégories d'annotation")).toBeNull()
expect(screen.queryByLabelText(/Nom de la catégorie/)).toBeNull()
})
it('renames, recolours and adds a category', async () => {