Core Data: Support reading revision data in useEntityProp (fixes footnotes in revisions UI)#76106
Open
Core Data: Support reading revision data in useEntityProp (fixes footnotes in revisions UI)#76106
Conversation
github-actions
bot
added
[Package] Core data
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
|
Size Change: +151 B (0%) Total Size: 6.87 MB
ℹ️ View Unchanged
|
The footnotes block always showed the current post's footnotes when viewing a revision, instead of the revision's footnotes. Fix this by adding a `revisionId` prop to `EntityProvider` that causes `useEntityProp` to read from the cached revision record instead of the current entity record. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
ellatrix
force-pushed
the
fix/footnotes-revisions-wrong-content
branch
from
5a74be0 to
ae81cce
Compare
ellatrix
changed the title
ellatrix
added
[Feature] History
ellatrix
changed the title
|
Flaky tests detected in ae81cce. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/22641108049
|
Mamaduka
reviewed
Mar 4, 2026
Member
There was a problem hiding this comment.
Still need to do proper testing (working on it now), but wanted to share some questions/thoughts.
Update
Experience looks better. I was expecting diff view, until I remembered it only works for RichText fields. Users might have the same expectations.
It would be helpful to get more opinions before we commit to this. cc @WordPress/gutenberg-core
Screencasts
Before
CleanShot.2026-03-04.at.15.33.38.mp4
After
CleanShot.2026-03-04.at.15.32.37.mp4
| kind, | ||
| name | ||
| ); | ||
| const revKey = entityConfig?.revisionKey || 'id'; |
Member
There was a problem hiding this comment.
Nit (non-blocking): It's probably better to use DEFAULT_ENTITY_KEY for consistency.
| <CanvasContent showDiff={ showDiff } /> | ||
| </div> | ||
| </ExperimentalBlockEditorProvider> | ||
| <EntityProvider revisionId={ currentRevisionId }> |
Member
There was a problem hiding this comment.
It took me a moment to realize that kind, name and id will be inherited from the parent context. It might be worth documenting this in a separate issue. This is mostly a note for myself.
| revision: getCurrentRevision(), | ||
| previousRevision: getPreviousRevision(), | ||
| postType: getCurrentPostType(), | ||
| currentRevisionId: getRevisionId(), |
Member
There was a problem hiding this comment.
I think we already have this data as part of the revision object.
Member
Author
I had commented on this in the PR description, I'll look into this as a follow up so the there's no distraction to this fix |
… access - Use `DEFAULT_ENTITY_KEY` instead of hardcoded `'id'` in useEntityProp - Use `revision.id` from the already-fetched revision object instead of a separate `getCurrentRevisionId` selector call - Add comment clarifying EntityProvider inherits kind/type/id from parent Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
2 participants
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.
Summary
core/footnotesblock always showed the current post's footnotes when viewing a revision in the revisions UI, instead of the revision's footnotesrevisionIdprop toEntityProviderthat gets stored inEntityContextuseEntityPropdetectsrevisionIdin context, it reads from the cached revision record (viagetRevisions()) instead of the current entity, and makes the setter a no-opRevisionsCanvaswith<EntityProvider revisionId={currentRevisionId}>so blocks inside the preview read revision-specific dataTest plan
npm run test:e2e -- test/e2e/specs/editor/various/footnotes-revisions.spec.js🤖 Generated with Claude Code