fix(workbench): preserve cross-domain undo order
This commit is contained in:
1 parent
31552a5b6f
commit
bb6c51c489
2 files changed
+40
-6
No files matched your search
@@ -80,6 +80,15 @@ function App() {
|
||||
const [status, setStatus] = useState('正在加载工作台...');
|
||||
const [filter, setFilter] = useState<'all' | 'candidates' | 'other'>('all');
|
||||
const [marking, setMarking] = useState<Record<string, unknown> | null>(null);
|
||||
const editOrderRef = useRef<Array<'session' | 'signal'>>([]);
|
||||
const redoOrderRef = useRef<Array<'session' | 'signal'>>([]);
|
||||
const recordSignalEdit = useMemo(
|
||||
() => () => {
|
||||
editOrderRef.current.push('signal');
|
||||
redoOrderRef.current = [];
|
||||
},
|
||||
[],
|
||||
);
|
||||
const [editMode, setEditMode] = useState(() => {
|
||||
if (typeof window === 'undefined') return false;
|
||||
try {
|
||||
@@ -90,7 +99,7 @@ function App() {
|
||||
});
|
||||
const overrideDraft = useOverrideDraft({ state, setState, setStatus });
|
||||
const { staged, stage, save, clear: clearStaged } = overrideDraft;
|
||||
const signalDraft = useTrafficSignalDraft({ state, setState });
|
||||
const signalDraft = useTrafficSignalDraft({ state, setState, onEdit: recordSignalEdit });
|
||||
const {
|
||||
dirty: signalDirty,
|
||||
setDirty: setSignalDirty,
|
||||
@@ -393,6 +402,8 @@ function App() {
|
||||
if (!draft || !session) return;
|
||||
requester?.flush(draft);
|
||||
session.commit(draft.constraints ?? [], constraintIds, gestureIdentity());
|
||||
editOrderRef.current.push('session');
|
||||
redoOrderRef.current = [];
|
||||
gesture.current = null;
|
||||
touch();
|
||||
};
|
||||
@@ -471,9 +482,14 @@ function App() {
|
||||
);
|
||||
};
|
||||
const undoEdit = () => {
|
||||
const domain = editOrderRef.current.at(-1);
|
||||
if (domain === 'signal') {
|
||||
editOrderRef.current.pop();
|
||||
redoOrderRef.current.push('signal');
|
||||
}
|
||||
// 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 (!session?.canUndo && signalUndoRef.current.length) {
|
||||
if (domain === 'signal' && signalUndoRef.current.length) {
|
||||
const previous = signalUndoRef.current.pop()!;
|
||||
signalRedoRef.current.push(state?.trafficSignals.assemblies.features || []);
|
||||
setState((current) =>
|
||||
@@ -491,6 +507,10 @@ function App() {
|
||||
setSignalDirty(true);
|
||||
return;
|
||||
}
|
||||
if (domain === 'session') {
|
||||
editOrderRef.current.pop();
|
||||
redoOrderRef.current.push('session');
|
||||
}
|
||||
const reversed = session?.undo({
|
||||
operationId: `operation:undo:${Date.now()}`,
|
||||
createdAt: new Date().toISOString(),
|
||||
@@ -500,7 +520,10 @@ function App() {
|
||||
previewSession();
|
||||
};
|
||||
const redoEdit = () => {
|
||||
if (!session?.canRedo && signalRedoRef.current.length) {
|
||||
const domain = redoOrderRef.current.at(-1);
|
||||
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) =>
|
||||
@@ -518,6 +541,10 @@ function App() {
|
||||
setSignalDirty(true);
|
||||
return;
|
||||
}
|
||||
if (domain === 'session') {
|
||||
redoOrderRef.current.pop();
|
||||
editOrderRef.current.push('session');
|
||||
}
|
||||
if (!session?.redo()) return;
|
||||
touch();
|
||||
previewSession();
|
||||
@@ -541,6 +568,8 @@ function App() {
|
||||
signalDraftRef.current = null;
|
||||
signalUndoRef.current = [];
|
||||
signalRedoRef.current = [];
|
||||
editOrderRef.current = [];
|
||||
redoOrderRef.current = [];
|
||||
setSignalDirty(false);
|
||||
clearStaged();
|
||||
gesture.current = null;
|
||||
|
||||
Reference in new issue
Block a user