Core data: useEntityBlockEditor: fix parsed blocks cache #58841
Merged
Conversation
This file contains 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
ellatrix
added
[Type] Bug
ellatrix
requested review from
kevin940726,
Mamaduka and
nerrad
as code owners
|
Size Change: +27 B (0%) Total Size: 1.71 MB
ℹ️ View Unchanged
|
youknowriad
reviewed
Feb 8, 2024
|
|
||
| if ( ! _blocks ) { | ||
| _blocks = parse( content ); | ||
| parsedBlocksCache.set( entityRecord, _blocks ); | ||
| parsedBlocksCache.set( cackeKey, _blocks ); |
There was a problem hiding this comment.
This might leave in memory two block lists unnecessarily. (one of entity record, one for the latest edits object). So there's a tiny memory impact, probably ok though.
There was a problem hiding this comment.
I think that's fine. Parts of this block list will be reused for edited block lists I think?
|
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. |
youknowriad
reviewed
Feb 8, 2024
| } ); | ||
|
|
||
| // Change content by typing. | ||
| await textbox.fill( '' ); |
There was a problem hiding this comment.
There's a beforeEach that fills in content
youknowriad
approved these changes
Feb 8, 2024
SantosGuillamot
approved these changes
Feb 9, 2024
|
Can we rebase and merge this PR? |
getdave
force-pushed
the
fix/entity-blocks-cache
branch
from
8d82c07 to
be998ef
Compare
ellatrix
added
Backport to WP 6.7 Beta/RC
adamziel
reviewed
Mar 5, 2024
|
|
||
| if ( ! _blocks ) { | ||
| _blocks = parse( content ); | ||
| parsedBlocksCache.set( entityRecord, _blocks ); | ||
| parsedBlocksCache.set( cackeKey, _blocks ); |
There was a problem hiding this comment.
Suggested change
| parsedBlocksCache.set( cackeKey, _blocks ); | |
| parsedBlocksCache.set( cacheKey, _blocks ); |
Mamaduka
reviewed
May 7, 2024
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.
What?
In #58146, I didn't account for editing being made without the blocks key. This can happen when you change the content in the code editor, in which case the content needs to be parsed. Currently the cache will return the unedited blocks.
The solution is to change the cache key when edits are made. We can use the unedited record as a cache key when
getEntityRecordEditsreturns undefined or an empty object. I'm not sure why it sometimes returns an empty object. That sounds like a bug that needs to be fixed.Why?
How?
Testing Instructions
Testing Instructions for Keyboard
Screenshots or screencast