SiteEditor: Refactor disable non page content blocks #56103
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
youknowriad
added
the
[Type] Code Quality
|
Size Change: -13 B (0%) Total Size: 1.7 MB
ℹ️ View Unchanged
|
kevin940726
reviewed
Nov 14, 2023
packages/edit-site/src/components/page-content-focus-manager/disable-non-page-content-blocks.js
Outdated
Show resolved
Hide resolved
Co-authored-by: Kai Hao <kevin830726@gmail.com>
andrewserong
approved these changes
Nov 15, 2023
There was a problem hiding this comment.
This is testing nicely for me:
✅ Content blocks are marked as locked as expected, and only content blocks are displayed
✅ Children of query loop blocks are not marked as contentOnly
✅ Switching between content and template mode updates the lock status correctly
LGTM! ✨
Comment on lines
+54
to
+56
| return clientIds.map( ( clientId ) => { | ||
| return <DisableBlock key={ clientId } clientId={ clientId } />; | ||
| } ); |
There was a problem hiding this comment.
Does it matter that this will perform a new map on each render (returning a new array), or is that mitigated by the use of key within <DisableBlock />?
There was a problem hiding this comment.
It doesn't matter. When React has an array of children, it compares one by one using arrays. Memoising the array is not expected.
There was a problem hiding this comment.
Great, thanks for confirming!
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.
Extracted from #56000
What?
This PR refactors the
DisableNonPageContentBlockscomponent to make it a bit more resilient to component remounts and also probably slightly more performant. The previous code used to filter all blocks rendered in the site editor to inject the right mode (lock/unlock content editing).In #56000 this broke because the component was being remounted which caused the filters to not run consistently. In the current PR, I avoid
editor.BlockEditfilters entirely and I just fetch the exact blocks that I want to lock/unlock and apply the logic.Testing Instructions
1- Open the site editor
2- Ensure that if you open a page in the site editor: only "content" blocks are editable until you switch to template mode.