Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.
TypeScript cross-platformelectronffmpegopen-sourceproduct-demorustscreen-capturescreen-recorderscreen-recordingscreen-studioscreencastspeech-to-texttypescriptvideo-editingvideo-editorwaylandwgpuwhisper
fix(timeline): roll a focus drag back when its commit fails late
EtienneLescot0a081ab74105
diff --git a/src/lib/ai-edition/store/useTimeline.test.ts b/src/lib/ai-edition/store/useTimeline.test.tsindex 787f07996..d0a220095 100644--- a/src/lib/ai-edition/store/useTimeline.test.ts+++ b/src/lib/ai-edition/store/useTimeline.test.ts@@ -1513,6 +1513,47 @@ describe("useTimeline undo history", () => {}});+ // A focus commit out of time leaves the zoom chain, but its save can still fail. The drag+ // must come off screen then, as for any failed commit, or a later save persists it.+ it("rolls a focus drag back when its commit fails after the deadline", async () => {+ seed(docWithZoom);+ vi.useFakeTimers();+ try {+ let failHungSave: () => void;+ bridgeMocks.save.mockImplementation(+ () =>+ new Promise((resolve) => {+ failHungSave = () => resolve({ success: false, error: "disk full" });+ }),+ );+ const { result } = renderTimeline();++ act(() => result.current.updateZoomFocusLive("zoom_a", { cx: 0.8, cy: 0.2 }));+ act(() => {+ void result.current.commitZoomFocus();+ });+ // No answer by the deadline: the save may still land, so the drag stays.+ await act(async () => {+ await vi.advanceTimersByTimeAsync(10_000);+ });+ expect(useProjectStore.getState().document?.zoomRanges[0]?.focus).toEqual({+ cx: 0.8,+ cy: 0.2,+ });++ await act(async () => {+ failHungSave();+ for (let i = 0; i < 20; i++) await Promise.resolve();+ });+ expect(useProjectStore.getState().document?.zoomRanges[0]?.focus).toEqual({+ cx: 0.5,+ cy: 0.5,+ });+ } finally {+ vi.useRealTimers();+ }+ });+// Rebase-review follow-up (unknown save × replacement): the refusal must not outlive// its reason. Once an undo bumps the epoch, the stuck save can no longer install// anything (`saveDocument` drops it), so it must stop blocking zoom writes — even ifdiff --git a/src/lib/ai-edition/store/useTimeline.ts b/src/lib/ai-edition/store/useTimeline.tsindex 25c37e82e..267917ca4 100644--- a/src/lib/ai-edition/store/useTimeline.ts+++ b/src/lib/ai-edition/store/useTimeline.ts@@ -783,13 +783,15 @@ export function useTimeline() {// place of the dragged one.const live = zoomFocusLiveRef.current;const rollback = zoomFocusRollbackRef.current;+ const epoch = currentWriteEpoch();// A drag abandoned before an undo or a replacement is not this commit's to put back: the// document it was made on is gone, and restoring its focus would undo the undo.const pendingEdit = zoomFocusEditRef.current;- const edit = pendingEdit?.epoch === currentWriteEpoch() ? pendingEdit : null;+ const edit = pendingEdit?.epoch === epoch ? pendingEdit : null;zoomFocusRollbackRef.current = null;zoomFocusLiveRef.current = null;zoomFocusEditRef.current = null;+ const pending: { save?: Promise<boolean> } = {};const outcome = await queueZoomWrite((doc) => {// The snapshot counts only while the document on screen is still the one this// hook's last live write produced -- `updateZoomFocusLive`'s own identity test,@@ -824,18 +826,24 @@ export function useTimeline() {};historyBase = doc;}- return saveDocument(next, { history: true, historyBase });+ pending.save = saveDocument(next, { history: true, historyBase });+ return pending.save;});- if (outcome === false && rollback) {+ // A save out of time has left the chain, but it can still fail: its answer, whenever it+ // comes, decides the rollback, or the dragged focus stays on screen for a later save.+ const saved = outcome === "timeout" && pending.save ? await pending.save : outcome;+ if (saved === false && rollback) {useProjectStore.setState((state) =>- // Only while the dragged document is still the one on screen: anything else- // there was put by a write that landed. `dirty` is deliberately NOT cleared. The- // rollback target is the last document this drag started from, which is not the- // same as the last SAVED one: with two commits in flight the first one's unsaved- // document is what we restore. Saying "clean" there tells `beforeunload` and- // `setHasUnsavedChanges` there is nothing to save, and the window closes on real- // work without prompting.- state.document === live ? { document: rollback, revision: state.revision + 1 } : {},+ // Only while the dragged document is still the one on screen, in the epoch it was+ // committed in: anything else there was put by a write that landed, or by an undo.+ // `dirty` is deliberately NOT cleared. The rollback target is the last document+ // this drag started from, which is not the same as the last SAVED one: with two+ // commits in flight the first one's unsaved document is what we restore. Saying+ // "clean" there tells `beforeunload` and `setHasUnsavedChanges` there is nothing+ // to save, and the window closes on real work without prompting.+ state.document === live && currentWriteEpoch() === epoch+ ? { document: rollback, revision: state.revision + 1 }+ : {},);}}, [queueZoomWrite, saveDocument]);