fix(ui): stale data modal shown when onChange starts while save is in-flight#15960
Merged
PatrikKozak merged 4 commits intomainfrom Mar 17, 2026
Merged
Conversation
…hile a save is in-flight
Contributor
📦 esbuild Bundle Analysis for payloadThis analysis was generated by esbuild-bundle-analyzer. 🤖
Largest pathsThese visualization shows top 20 largest paths in the bundle.Meta file: packages/next/meta_index.json, Out file: esbuild/index.js
Meta file: packages/payload/meta_index.json, Out file: esbuild/index.js
Meta file: packages/payload/meta_shared.json, Out file: esbuild/exports/shared.js
Meta file: packages/richtext-lexical/meta_client.json, Out file: esbuild/exports/client_optimized/index.js
Meta file: packages/ui/meta_client.json, Out file: esbuild/exports/client_optimized/index.js
Meta file: packages/ui/meta_shared.json, Out file: esbuild/exports/shared_optimized/index.js
DetailsNext to the size is how much the size has increased or decreased compared with the base branch of this PR.
|
…ata-modal-shown-while-save-in-flight
AlessioGr
reviewed
Mar 16, 2026
AlessioGr
approved these changes
Mar 16, 2026
Contributor
|
🚀 This is included in version v3.80.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
Fixes a race condition where the "Document Modified" modal incorrectly appears
after a user types and saves their own document.
Key Changes
saveCounterRef(incremented inonSubmit) andisSavingRef(set inonSubmit, cleared inonSave) to the Edit viewonChangeand used to suppress the stale data modal when the newerupdatedAtthe server sees came from our own saveDesign Decisions
saveCounterRefhandles form-state requests that start beforeonSubmit— the counteradvances mid-flight, so
saveCounterAtStartdiverges and the modal is suppressed.isSavingRefhandles the complementary case where a queuedonChangestarts afteronSubmit(so the counter already matches) but beforeonSavehas updatedoriginalUpdatedAtRefwith the new timestamp. Capturing it before the async call meansthe guard fires correctly even if the save completes before the response arrives.
The two-user scenario is unaffected — both refs are per-instance, so another user's
save doesn't influence the local state and the modal still appears correctly.