Final review I-1. Redo (Ctrl+Shift+Z and the header « Refaire ») is inactive while a started move or redraw, a keyboard series or a size change is pending (holdsRedo): the work stays, the user commits or cancels it first. In a move mode, Insert and Delete on a vertex and Enter or Space on « + » and « − » do nothing, as the press machine. Tests: no assertion removed. The history-guards move-mode helper and reset run in act, since « Refaire » now re-renders on a started mode.
188 lines
6.2 KiB
TypeScript
188 lines
6.2 KiB
TypeScript
/** Lot H fix H2: Ctrl+Z and Ctrl+Shift+Z are editor-wide, writable only, not in a dialog. */
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { act, cleanup, fireEvent, screen } from '@testing-library/react'
|
|
import userEvent from '@testing-library/user-event'
|
|
import {
|
|
baseText,
|
|
commitMove,
|
|
resetStore,
|
|
serverHas,
|
|
store,
|
|
} from '../helpers/editorHarness'
|
|
import { mountDraft, setWidth } from '../helpers/editorRoute'
|
|
import { useAnnotationWork } from '@/editor/annotations/workStore'
|
|
|
|
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(() => serverHas(baseText(), 3))
|
|
afterEach(() => {
|
|
cleanup()
|
|
resetStore()
|
|
setWidth(1024)
|
|
})
|
|
|
|
const ready = () =>
|
|
screen.findByRole('heading', { level: 1, name: 'Brouillon, version 4' })
|
|
const cx = () => store.getState().previewState?.document.annotations[0].geometry
|
|
const ctrlZ = (target: Element, shift = false) =>
|
|
fireEvent.keyDown(target, { key: 'z', ctrlKey: true, shiftKey: shift })
|
|
|
|
describe('editor-wide undo', () => {
|
|
it('undoes and redoes from another tab', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
act(() => void commitMove(40))
|
|
await userEvent.setup().click(screen.getByRole('tab', { name: 'Général' }))
|
|
ctrlZ(document.body)
|
|
expect(cx()).toMatchObject({ cx: 50 })
|
|
ctrlZ(document.body, true)
|
|
expect(cx()).toMatchObject({ cx: 40 })
|
|
})
|
|
|
|
it('does nothing in a text field', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
act(() => void commitMove(40))
|
|
await userEvent.setup().click(screen.getByRole('tab', { name: 'Général' }))
|
|
ctrlZ(document.querySelector('input') as Element)
|
|
expect(cx()).toMatchObject({ cx: 40 })
|
|
})
|
|
|
|
it('does nothing while a modal dialog is open', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
act(() => void commitMove(40))
|
|
const dialog = document.createElement('dialog')
|
|
dialog.setAttribute('open', '')
|
|
document.body.append(dialog)
|
|
ctrlZ(document.body)
|
|
expect(cx()).toMatchObject({ cx: 40 })
|
|
dialog.remove()
|
|
})
|
|
|
|
it("is off in the narrow read-only mode, with the route's own store state", async () => {
|
|
mountDraft({ width: 1280 })
|
|
await ready()
|
|
act(() => void commitMove(40))
|
|
act(() => {
|
|
setWidth(800)
|
|
window.dispatchEvent(new Event('resize'))
|
|
})
|
|
await screen.findByText(/L'édition nécessite une largeur/)
|
|
// The route keeps the store able to hold a recovery copy in `narrow`: no forced flag.
|
|
expect(store.getState().canEdit).toBe(true)
|
|
ctrlZ(document.body)
|
|
expect(cx()).toMatchObject({ cx: 40 })
|
|
expect(store.getState().unsaved).toBe(true)
|
|
})
|
|
})
|
|
|
|
describe('undo with something pending (R-13)', () => {
|
|
it('Ctrl+Z only cancels a keyboard series; the next one undoes', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
act(() => void commitMove(40))
|
|
const stored = store.getState().previewState!.document.annotations[0]
|
|
act(() =>
|
|
useAnnotationWork.setState({
|
|
preview: {
|
|
annotationId: stored.id,
|
|
geometry: { type: 'circle', cx: 90, cy: 50, r: 10 },
|
|
base: store.getState().documentText,
|
|
source: 'keys',
|
|
},
|
|
}),
|
|
)
|
|
ctrlZ(document.body)
|
|
expect(useAnnotationWork.getState().preview).toBeNull()
|
|
expect(cx()).toMatchObject({ cx: 40 })
|
|
ctrlZ(document.body)
|
|
expect(cx()).toMatchObject({ cx: 50 })
|
|
})
|
|
|
|
it('the header « Défaire » only cancels a pending size preview', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
act(() => void commitMove(40))
|
|
const stored = store.getState().previewState!.document.annotations[0]
|
|
act(() =>
|
|
useAnnotationWork.setState({
|
|
preview: {
|
|
annotationId: stored.id,
|
|
geometry: { type: 'circle', cx: 40, cy: 50, r: 20 },
|
|
base: store.getState().documentText,
|
|
source: 'size',
|
|
},
|
|
}),
|
|
)
|
|
const user = userEvent.setup()
|
|
await user.click(screen.getByRole('button', { name: /Défaire/ }))
|
|
expect(useAnnotationWork.getState().preview).toBeNull()
|
|
expect(cx()).toMatchObject({ cx: 40 })
|
|
await user.click(screen.getByRole('button', { name: /Défaire/ }))
|
|
expect(cx()).toMatchObject({ cx: 50 })
|
|
})
|
|
})
|
|
|
|
describe('redo with something pending (final review I-1)', () => {
|
|
const REDO = 'Refaire la dernière modification défaite'
|
|
/** A commit undone: the redo stack holds it, the shape is back at cx 50. */
|
|
async function undone() {
|
|
mountDraft()
|
|
await ready()
|
|
act(() => void commitMove(40))
|
|
ctrlZ(document.body)
|
|
expect(cx()).toMatchObject({ cx: 50 })
|
|
}
|
|
const pend = (source: 'keys' | 'size') => {
|
|
const stored = store.getState().previewState!.document.annotations[0]
|
|
act(() =>
|
|
useAnnotationWork.setState({
|
|
preview: {
|
|
annotationId: stored.id,
|
|
geometry: { type: 'circle', cx: 60, cy: 50, r: 10 },
|
|
base: store.getState().documentText,
|
|
source,
|
|
},
|
|
}),
|
|
)
|
|
}
|
|
|
|
it('Ctrl+Shift+Z keeps a pending size change and redoes nothing', async () => {
|
|
await undone()
|
|
pend('size')
|
|
ctrlZ(document.body, true)
|
|
expect(useAnnotationWork.getState().preview?.source).toBe('size')
|
|
expect(cx()).toMatchObject({ cx: 50 })
|
|
})
|
|
|
|
it('the header « Refaire » is off and keeps a keyboard series', async () => {
|
|
await undone()
|
|
pend('keys')
|
|
const redo = screen.getByRole('button', { name: REDO })
|
|
// A click that leaves the focus in place (Safari does not focus a clicked button).
|
|
fireEvent.click(redo)
|
|
expect(useAnnotationWork.getState().preview?.source).toBe('keys')
|
|
expect(cx()).toMatchObject({ cx: 50 })
|
|
expect(redo).toHaveAttribute('aria-disabled', 'true')
|
|
})
|
|
|
|
it('once the work is gone, redo works again', async () => {
|
|
await undone()
|
|
pend('keys')
|
|
act(() => useAnnotationWork.setState({ preview: null }))
|
|
const redo = screen.getByRole('button', { name: REDO })
|
|
expect(redo).toHaveAttribute('aria-disabled', 'false')
|
|
fireEvent.click(redo)
|
|
expect(cx()).toMatchObject({ cx: 40 })
|
|
})
|
|
})
|