TemplateContentPanel: Don't show content blocks that are in a Query Loop#63732
Merged
noisysocks merged 6 commits intotrunkfrom Jul 25, 2024
Merged
TemplateContentPanel: Don't show content blocks that are in a Query Loop#63732noisysocks merged 6 commits intotrunkfrom
noisysocks merged 6 commits intotrunkfrom
Conversation
Mamaduka
reviewed
Jul 19, 2024
|
Size Change: +115 B (+0.01%) Total Size: 1.76 MB
ℹ️ View Unchanged
|
Mamaduka
reviewed
Jul 19, 2024
Comment on lines
+1809
to
+1810
| export const getPostBlocksByName = createRegistrySelector( | ||
| ( select ) => ( state, blockNames ) => { |
Member
There was a problem hiding this comment.
I agree that making this a private selector makes sense for now.
We should also memoize the selector, but blockNames being an array might make that more challenging. Example: https://github.com/WordPress/gutenberg/pull/63732/files#diff-cf33f4589314d4a81e5a821d1433b83521dca9ad19d58a4b5ba1687e314b9558R35-R37
Member
Author
There was a problem hiding this comment.
Hmm yeah this is tricky to get right. Please double check f2fea66 for me 😅
Member
There was a problem hiding this comment.
I wonder if making a selector variadic function would work here.
Something like:
export const getPostBlocksByName = ( state, ...blockNames );
getPostBlocksByName( ...contentOnlyBlockTypes );
Member
Author
There was a problem hiding this comment.
I don't want to stray far from getBlocksByName though.
Member
There was a problem hiding this comment.
It's not a block for this PR. It's just an idea; I'm happy to give it a try separately.
Memoizing similar selector is always a plain 😅
ba5175e to
4ef7332
Compare
|
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. |
Mamaduka
reviewed
Jul 24, 2024
| 'editor.postContentBlockTypes', | ||
| POST_CONTENT_BLOCK_TYPES | ||
| ), | ||
| 'core/template-part', |
Member
There was a problem hiding this comment.
The core/template-part was removed from the const because we don't want extenders to remove it, correct?
Member
Author
There was a problem hiding this comment.
I was thinking along the lines of:
editor.postContentBlockTypeallows extenders to control which block types we consider to be "post content".- We're enabling selecting template parts via the same mechanism but it's not "post content".
Mamaduka
approved these changes
Jul 24, 2024
Member
Mamaduka
left a comment
There was a problem hiding this comment.
Thanks, @noisysocks!
The changes test well for me and fix the issue ✅
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.
Fixes #63613.
When editing a page in the site editor, we populate the Content panel in the sidebar with links to the content blocks that are editable.
Currently we blindly look for any content blocks: Post Title, Featured Image, Post Content.
This has the downside of catching blocks that appear nested within Post Content or within a Query Loop.
For example, you should only see Content once here:
There was already logic for fixing exactly this in
DisableNonPageContentBlocks, so I've moved that logic into a selector that we can use in multiple places.Now we correctly only show the top-level content blocks:
Testing