feat(editor): drawing guard before navigations drop a started move (R-12)
The move mode lives in the work store with its document stamp. guardDrawing ends an unstarted mode at once and asks « Abandonner le déplacement ? » (DrawingGuardDialog, at workspace level) once work is started, before a tab, a section, « Aller à », Back and a history jump out of the editor; the leave guard and sign-out count started work. An undo from the header, Ctrl+Z or the message only cancels a pending mode or preview (R-13), and a document change drops a stale mode, keeping a started one to be said. ConfirmDialog takes an optional body. Strings for Task 4 added.
This commit is contained in:
1 parent
8cd1bda6c2
commit
2882821661
18 files changed
+465
-37
No files matched your search
@@ -1,8 +1,14 @@
|
||||
/** U2 Task 2: the annotation work store and its stale stamp (R-13). */
|
||||
import { afterEach, describe, expect, it } from 'vitest'
|
||||
import { vi } from 'vitest'
|
||||
import { answerDrawing, guardDrawing } from '@/editor/annotations/drawingGuard'
|
||||
import {
|
||||
cancelPending,
|
||||
dropStale,
|
||||
guardWork,
|
||||
resetWork,
|
||||
setModePreview,
|
||||
startMove,
|
||||
useAnnotationWork,
|
||||
type Preview,
|
||||
} from '@/editor/annotations/workStore'
|
||||
@@ -44,9 +50,89 @@ describe('dropStale (R-13)', () => {
|
||||
|
||||
it('a new session (another sheet, the editor closed) resets the work', () => {
|
||||
useAnnotationWork.setState({
|
||||
mode: { kind: 'move', annotationId: 'a', started: true },
|
||||
mode: { kind: 'move', annotationId: 'a', started: true, base: 'one' },
|
||||
})
|
||||
useEditorStore.setState({ session: useEditorStore.getState().session + 1 })
|
||||
expect(useAnnotationWork.getState().mode).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
const STORED = { type: 'circle' as const, cx: 1, cy: 2, r: 3 }
|
||||
const MOVED = { type: 'circle' as const, cx: 5, cy: 2, r: 3 }
|
||||
|
||||
describe('the move mode in the work store (R-12, R-13)', () => {
|
||||
it('is started once its preview differs from the stored shape', () => {
|
||||
startMove('a', 'one')
|
||||
expect(guardWork(useAnnotationWork.getState())).toBeNull()
|
||||
setModePreview(STORED, STORED)
|
||||
expect(useAnnotationWork.getState().mode?.started).toBe(false)
|
||||
setModePreview(MOVED, STORED)
|
||||
const work = useAnnotationWork.getState()
|
||||
expect(work.mode?.started).toBe(true)
|
||||
expect(work.preview).toMatchObject({ source: 'move', base: 'one' })
|
||||
expect(guardWork(work)).toBe('move')
|
||||
})
|
||||
|
||||
it('an undo only cancels what is pending (cancelPending)', () => {
|
||||
expect(cancelPending()).toBe(false)
|
||||
startMove('a', 'one')
|
||||
setModePreview(MOVED, STORED)
|
||||
expect(cancelPending()).toBe(true)
|
||||
expect(useAnnotationWork.getState()).toMatchObject({
|
||||
mode: null,
|
||||
preview: null,
|
||||
})
|
||||
useAnnotationWork.setState({
|
||||
preview: { ...preview('one'), source: 'keys' },
|
||||
})
|
||||
expect(cancelPending()).toBe(true)
|
||||
expect(useAnnotationWork.getState().preview).toBeNull()
|
||||
})
|
||||
|
||||
it('a document change drops the mode; a started one is kept to be said', () => {
|
||||
startMove('a', 'one')
|
||||
dropStale('two')
|
||||
expect(useAnnotationWork.getState()).toMatchObject({
|
||||
mode: null,
|
||||
dropped: null,
|
||||
})
|
||||
startMove('a', 'two')
|
||||
setModePreview(MOVED, STORED)
|
||||
dropStale('two')
|
||||
expect(useAnnotationWork.getState().mode).not.toBeNull()
|
||||
dropStale('three')
|
||||
expect(useAnnotationWork.getState()).toMatchObject({
|
||||
mode: null,
|
||||
preview: null,
|
||||
dropped: 'move',
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('the drawing guard (R-12)', () => {
|
||||
it('an unstarted mode ends at once and the move goes on', () => {
|
||||
startMove('a', 'one')
|
||||
const proceed = vi.fn()
|
||||
expect(guardDrawing(proceed)).toBe(true)
|
||||
expect(useAnnotationWork.getState().mode).toBeNull()
|
||||
expect(useAnnotationWork.getState().question).toBeNull()
|
||||
expect(proceed).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('a started mode asks; « Continuer » keeps it, « Abandonner » drops it and moves', () => {
|
||||
startMove('a', 'one')
|
||||
setModePreview(MOVED, STORED)
|
||||
const proceed = vi.fn()
|
||||
expect(guardDrawing(proceed)).toBe(false)
|
||||
expect(useAnnotationWork.getState().question?.work).toBe('move')
|
||||
answerDrawing(false)
|
||||
const kept = useAnnotationWork.getState()
|
||||
expect(kept.question).toBeNull()
|
||||
expect(kept.preview?.geometry).toEqual(MOVED)
|
||||
expect(proceed).not.toHaveBeenCalled()
|
||||
guardDrawing(proceed)
|
||||
answerDrawing(true)
|
||||
expect(useAnnotationWork.getState().mode).toBeNull()
|
||||
expect(proceed).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user