diff --git a/workbench/client/src/App.tsx b/workbench/client/src/App.tsx index 875450a..180e88d 100644 --- a/workbench/client/src/App.tsx +++ b/workbench/client/src/App.tsx @@ -33,6 +33,7 @@ import { import { previewArrowFeatures } from './edit/arrow-preview'; import { rendersSame } from './edit/parameter'; import { PreviewRequester, type PreviewDraft } from './edit/preview-request'; +import { clearEditHistory, recordEdit, takeRedoDomain, takeUndoDomain, type EditHistory } from './edit/edit-history'; import { anchorSnapshotFor, constraintValueFor, @@ -80,12 +81,10 @@ function App() { const [status, setStatus] = useState('正在加载工作台...'); const [filter, setFilter] = useState<'all' | 'candidates' | 'other'>('all'); const [marking, setMarking] = useState | null>(null); - const editOrderRef = useRef>([]); - const redoOrderRef = useRef>([]); + const editHistoryRef = useRef({ undo: [], redo: [] }); const recordSignalEdit = useMemo( () => () => { - editOrderRef.current.push('signal'); - redoOrderRef.current = []; + recordEdit(editHistoryRef.current, 'signal'); }, [], ); @@ -402,8 +401,7 @@ function App() { if (!draft || !session) return; requester?.flush(draft); session.commit(draft.constraints ?? [], constraintIds, gestureIdentity()); - editOrderRef.current.push('session'); - redoOrderRef.current = []; + recordEdit(editHistoryRef.current, 'session'); gesture.current = null; touch(); }; @@ -482,11 +480,7 @@ function App() { ); }; const undoEdit = () => { - const domain = editOrderRef.current.at(-1); - if (domain === 'signal') { - editOrderRef.current.pop(); - redoOrderRef.current.push('signal'); - } + const domain = takeUndoDomain(editHistoryRef.current); // A saved gesture cannot be un-applied — persisted history is append-only — so // it is reversed by an inverse operation, which needs its own identity. if (domain === 'signal' && signalUndoRef.current.length) { @@ -507,10 +501,7 @@ function App() { setSignalDirty(true); return; } - if (domain === 'session') { - editOrderRef.current.pop(); - redoOrderRef.current.push('session'); - } + if (domain !== 'session') return; const reversed = session?.undo({ operationId: `operation:undo:${Date.now()}`, createdAt: new Date().toISOString(), @@ -520,10 +511,8 @@ function App() { previewSession(); }; const redoEdit = () => { - const domain = redoOrderRef.current.at(-1); + const domain = takeRedoDomain(editHistoryRef.current); if (domain === 'signal' && signalRedoRef.current.length) { - redoOrderRef.current.pop(); - editOrderRef.current.push('signal'); const next = signalRedoRef.current.pop()!; signalUndoRef.current.push(state?.trafficSignals.assemblies.features || []); setState((current) => @@ -541,10 +530,7 @@ function App() { setSignalDirty(true); return; } - if (domain === 'session') { - redoOrderRef.current.pop(); - editOrderRef.current.push('session'); - } + if (domain !== 'session') return; if (!session?.redo()) return; touch(); previewSession(); @@ -568,8 +554,7 @@ function App() { signalDraftRef.current = null; signalUndoRef.current = []; signalRedoRef.current = []; - editOrderRef.current = []; - redoOrderRef.current = []; + clearEditHistory(editHistoryRef.current); setSignalDirty(false); clearStaged(); gesture.current = null; diff --git a/workbench/client/src/edit/edit-history.test.ts b/workbench/client/src/edit/edit-history.test.ts new file mode 100644 index 0000000..b82a014 --- /dev/null +++ b/workbench/client/src/edit/edit-history.test.ts @@ -0,0 +1,39 @@ +import { describe, expect, it } from 'vitest'; +import { clearEditHistory, recordEdit, takeRedoDomain, takeUndoDomain, type EditHistory } from './edit-history'; + +const history = (): EditHistory => ({ undo: [], redo: [] }); + +describe('edit history domains', () => { + it('undoes the most recent domain across session and signal stacks', () => { + const value = history(); + recordEdit(value, 'session'); + recordEdit(value, 'signal'); + expect(takeUndoDomain(value)).toBe('signal'); + expect(takeUndoDomain(value)).toBe('session'); + }); + + it('redo preserves the same cross-domain order', () => { + const value = history(); + recordEdit(value, 'session'); + recordEdit(value, 'signal'); + takeUndoDomain(value); + expect(takeRedoDomain(value)).toBe('signal'); + expect(value.undo).toEqual(['session', 'signal']); + }); + + it('clears redo after a new edit', () => { + const value = history(); + recordEdit(value, 'session'); + takeUndoDomain(value); + recordEdit(value, 'signal'); + expect(value.redo).toEqual([]); + }); + + it('clears both stacks', () => { + const value = history(); + recordEdit(value, 'session'); + takeUndoDomain(value); + clearEditHistory(value); + expect(value).toEqual({ undo: [], redo: [] }); + }); +}); diff --git a/workbench/client/src/edit/edit-history.ts b/workbench/client/src/edit/edit-history.ts new file mode 100644 index 0000000..d7cb060 --- /dev/null +++ b/workbench/client/src/edit/edit-history.ts @@ -0,0 +1,30 @@ +export type EditDomain = 'session' | 'signal'; + +export interface EditHistory { + undo: EditDomain[]; + redo: EditDomain[]; +} + +export function recordEdit(history: EditHistory, domain: EditDomain): void { + history.undo.push(domain); + history.redo.length = 0; +} + +export function takeUndoDomain(history: EditHistory): EditDomain | null { + const domain = history.undo.pop(); + if (!domain) return null; + history.redo.push(domain); + return domain; +} + +export function takeRedoDomain(history: EditHistory): EditDomain | null { + const domain = history.redo.pop(); + if (!domain) return null; + history.undo.push(domain); + return domain; +} + +export function clearEditHistory(history: EditHistory): void { + history.undo.length = 0; + history.redo.length = 0; +}