fix(editor): one history entry per reference edit, focus kept
Final review fixes. « Terminer » and every panel close re-committed the edited field against a stale value, adding a second identical history entry so the first « Défaire » seemed to do nothing: the tile now reads the latest applied value (tests assert the undo-length delta). A tile leaving the search on « Terminer » stays pinned until the next view change and keeps focus; « Ajouter la référence » resets search and sort and focuses the new tile. Also: refused draft dropped on a read-only flip is announced; arrow keys respect a refused tab switch; pinned index kept across read-only; the panel announces « Références citées »; search text inserted literally; « Aller à » names its citer; the edit header's name starts with « Terminer. »; undo removing the focused panel tile moves focus per P20; no-result announced once; docs corrected. Gates: typecheck, lint, test:run (app 1510), build, e2e:ui 251; e2e:shell 16 specs (admin and editor-equine excluded): 117 passed / 108 skipped / 1 failed (crossing:211 stuck on the MFA step-up screen before the editor), rerun alone 11 passed; full-row guard: no pre-existing row changed in any table.
This commit is contained in:
1 parent
2182307c62
commit
1bf27014b3
21 files changed
+677
-136
No files matched your search
@@ -4,6 +4,7 @@ import { act, cleanup, render, screen, within } from '@testing-library/react'
|
||||
import userEvent from '@testing-library/user-event'
|
||||
import type { ReferenceType } from '@faunosteo/core-wasm/types'
|
||||
import ReferencesTab from '@/components/editor/tabs/ReferencesTab'
|
||||
import { AnnounceContext } from '@/editor/focusRequest'
|
||||
import { targetOfKey } from '@/editor/navigation'
|
||||
import { useLocaleStore } from '@/state/localeStore'
|
||||
import { edit, insert } from '../helpers/editorFixtures'
|
||||
@@ -208,6 +209,22 @@ describe('clearing the search', () => {
|
||||
expect(order()).toHaveLength(5)
|
||||
})
|
||||
|
||||
it('is announced once: the count line is the live region, the notice is not (M11)', async () => {
|
||||
const { user } = await mount()
|
||||
await user.type(search(), 'radiographie')
|
||||
const live = document.querySelectorAll('[aria-live], [role="status"]')
|
||||
expect(live).toHaveLength(1)
|
||||
expect(live[0]).toHaveTextContent('0 référence sur 5')
|
||||
})
|
||||
|
||||
it('writes the typed text as it is, `$&` and friends included (M5)', async () => {
|
||||
const { user } = await mount()
|
||||
await user.type(search(), "$& $` $'")
|
||||
expect(screen.getByTestId('editor-references-no-result')).toHaveTextContent(
|
||||
"Aucune référence ne contient « $& $` $' ».",
|
||||
)
|
||||
})
|
||||
|
||||
it('Escape empties a non-empty search and stops there (P12)', async () => {
|
||||
const { user } = await mount()
|
||||
const bubbled = vi.fn()
|
||||
@@ -229,9 +246,7 @@ describe('no result (board 24 B)', () => {
|
||||
const { user } = await mount()
|
||||
await user.type(search(), 'radiographie')
|
||||
expect(order()).toEqual([])
|
||||
const notice = screen.getByRole('status', {
|
||||
name: '',
|
||||
})
|
||||
const notice = screen.getByTestId('editor-references-no-result')
|
||||
expect(notice).toHaveTextContent(
|
||||
"Aucune référence ne contient « radiographie ». La recherche porte sur la citation, le DOI et l'URL.",
|
||||
)
|
||||
@@ -315,16 +330,43 @@ describe('the tile in edit is pinned (P23)', () => {
|
||||
expect(order()).toEqual(['r5', 'r4', 'r3', 'r2', 'r1'])
|
||||
})
|
||||
|
||||
it('stays shown under a search that does not match it, until it leaves edit', async () => {
|
||||
it('stays shown under a search that does not match it, also after « Terminer », until the next search change (I1)', async () => {
|
||||
const { user } = await mount()
|
||||
const item = await startEdit(user, 'r1')
|
||||
await user.type(search(), 'alpha')
|
||||
expect(order()).toEqual(['r1', 'r5'])
|
||||
expect(within(item).getByLabelText('Citation')).toBeInTheDocument()
|
||||
await user.click(within(item).getByRole('button', { name: 'Terminer' }))
|
||||
expect(order()).toEqual(['r1', 'r5'])
|
||||
expect(document.activeElement).toBe(header('r1'))
|
||||
await user.clear(search())
|
||||
await user.type(search(), 'alpha')
|
||||
expect(order()).toEqual(['r5'])
|
||||
})
|
||||
|
||||
it('keeps the tile shown and focused when its edit stops matching the search (I1)', async () => {
|
||||
const { user } = await mount()
|
||||
await user.type(search(), 'zèbre')
|
||||
const item = await startEdit(user, 'r1')
|
||||
const citation = within(item).getByLabelText('Citation')
|
||||
await user.clear(citation)
|
||||
await user.type(citation, 'Autre titre')
|
||||
await user.click(within(item).getByRole('button', { name: 'Terminer' }))
|
||||
expect(order()).toEqual(['r1', 'r2'])
|
||||
expect(document.activeElement).toBe(header('r1'))
|
||||
})
|
||||
|
||||
it('keeps its index across a search or sort change made while read-only (M3)', async () => {
|
||||
const { user, view } = await mount()
|
||||
await user.selectOptions(sortBox(), 'citation')
|
||||
await startEdit(user, 'r3')
|
||||
expect(order()).toEqual(['r5', 'r3', 'r4', 'r2', 'r1'])
|
||||
view.rerender(lib(true))
|
||||
await user.selectOptions(sortBox(), 'count')
|
||||
view.rerender(lib(false))
|
||||
expect(order()).toEqual(['r2', 'r3', 'r1', 'r5', 'r4'])
|
||||
})
|
||||
|
||||
it('is suspended in read-only: the tile renders its read view', async () => {
|
||||
const { user, view } = await mount()
|
||||
await startEdit(user, 'r1')
|
||||
@@ -384,6 +426,22 @@ describe('adding (P24)', () => {
|
||||
).toBeInTheDocument()
|
||||
})
|
||||
|
||||
it('a search typed after « Ajouter une référence » is cleared by the add, the new tile takes the focus (I1)', async () => {
|
||||
const { user } = await mount()
|
||||
await user.click(add())
|
||||
await user.selectOptions(screen.getByLabelText('Type'), 'book')
|
||||
await user.type(draftCitation()!, 'Nouvelle source')
|
||||
await user.type(search(), 'alpha')
|
||||
expect(order()).toEqual(['r5'])
|
||||
await user.click(
|
||||
screen.getByRole('button', { name: 'Ajouter la référence' }),
|
||||
)
|
||||
const id = doc().references[5].id
|
||||
expect(search()).toHaveValue('')
|
||||
expect(order()).toHaveLength(6)
|
||||
expect(document.activeElement).toBe(header(id))
|
||||
})
|
||||
|
||||
it('a second click on the button takes the focus back to the citation', async () => {
|
||||
const { user } = await mount()
|
||||
await user.click(add())
|
||||
@@ -492,3 +550,53 @@ describe('state of a reference that left the document (P23-prime)', () => {
|
||||
).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
describe('a read-only flip with a tile in edit (M1)', () => {
|
||||
const ui = (announce: (text: string) => void, readOnly: boolean) => (
|
||||
<AnnounceContext value={announce}>{lib(readOnly)}</AnnounceContext>
|
||||
)
|
||||
|
||||
async function refusedUrl() {
|
||||
await openReady({ text: sortText() })
|
||||
const user = userEvent.setup()
|
||||
const announce = vi.fn()
|
||||
const view = render(ui(announce, false))
|
||||
const item = await startEdit(user, 'r1')
|
||||
await user.type(
|
||||
within(item).getByLabelText('Adresse web (URL)'),
|
||||
'exemple.org',
|
||||
)
|
||||
await user.tab()
|
||||
return { view, announce, item, user }
|
||||
}
|
||||
|
||||
it('says which refused draft is dropped, once', async () => {
|
||||
const { view, announce } = await refusedUrl()
|
||||
view.rerender(ui(announce, true))
|
||||
expect(announce).toHaveBeenCalledTimes(1)
|
||||
expect(announce).toHaveBeenCalledWith(
|
||||
'Saisie non appliquée : Adresse web (URL)',
|
||||
)
|
||||
view.rerender(ui(announce, false))
|
||||
expect(announce).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('does not move the focus to Citation when editing is possible again', async () => {
|
||||
const { view, announce } = await refusedUrl()
|
||||
view.rerender(ui(announce, true))
|
||||
view.rerender(ui(announce, false))
|
||||
const citation = screen.getByLabelText('Citation')
|
||||
expect(document.activeElement).not.toBe(citation)
|
||||
expect(screen.getByLabelText('Adresse web (URL)')).toHaveValue('')
|
||||
})
|
||||
|
||||
it('says nothing when no draft is lost', async () => {
|
||||
await openReady({ text: sortText() })
|
||||
const user = userEvent.setup()
|
||||
const announce = vi.fn()
|
||||
const view = render(ui(announce, false))
|
||||
await startEdit(user, 'r1')
|
||||
view.rerender(ui(announce, true))
|
||||
expect(announce).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user