Improve getBlockEditingMode() and useAppender() performance #51675
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
|
Size Change: +8.96 kB (+1%) Total Size: 1.42 MB
ℹ️ View Unchanged
|
apeatling
reviewed
Jun 20, 2023
andrewserong
approved these changes
Jun 21, 2023
There was a problem hiding this comment.
This is testing just as on trunk for me:
✅ Appender shows and hides when expected in post editor and site editor
✅ Custom appender for container blocks shows and hides as expected
Code change LGTM, I noticed that getBlockEditingMode is used in a few other places (list view, block toolbar, etc), but everything else appeared to be working correctly, too, as far as I can tell. I'll just ping @youknowriad for visibility since he's commented a few times recently on performance related concerns related to useSelect and selectors in general. Not a blocker, though, as this PR would be easy to revert if there are any concerns.
Nice work! ✨
|
It's very cool to see that the graphs in codevitals.io are back to their previous state approximatively. |
noisysocks
added
the
[Feature] Page Content Focus
sethrubenstein
pushed a commit
to pewresearch/gutenberg
that referenced
this pull request
Jul 13, 2023
…s#51675) * Don't memoize getBlockEditingMode() * useAppender(): Check block selection before other checks * Don't return JSX from useSelect()
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?
Fixes a performance regression introduced in #51148 (comment).
How?
There's two fixes / issues at play here:
useAppender()will only show a default appender in a container block when the container block is selected or at the document level when there is no selection. ButgetTemplateLock(),getBlockEditingMode(), and__unstableGetEditorMode()are called regardless of whether the appender is shown or not. This is a little wasteful. We can fix this by swapping the order of theisParentSelectedandisInserterHiddenchecksgetBlockEditingMode()is memoised usingcreateSelector()fromrememo. I did this becausegetBlockEditingMode()will recurse through the block's ancestors. This is problematic though becauserememowill iterate through every cached entry when the selector is called which in this case is significant as there will be one cache entry per block. The fix is to not usecreateSelector(). In most cases the depth of the block tree (number of ancestors) will be less than the number of blocks.Testing Instructions
Nothing specific. Check that the block appender still appears when expected at the document level and in container blocks.
Benchmark
trunkThis branch