Tidy up block patterns selectors #57913
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
jsnajdr
added
[Type] Code Quality
jsnajdr
commented
Jan 17, 2024
| @@ -2015,7 +2015,7 @@ export const getInserterItems = createSelector( | |||
| }, | |||
| ( state, rootClientId ) => [ | |||
| state.blockListSettings[ rootClientId ], | |||
| state.blocks.byClientId, | |||
| state.blocks.byClientId.get( rootClientId ), | |||
There was a problem hiding this comment.
This fixes an omission from #46204: that PR uses the rootClientId substate only in canInsertBlockType, but not in other selectors that call canInsertBlockType or canIncludeBlockTypeInInserter and therefore need to declare the same dependencies, too.
| ( state ) => { | ||
| const userPatterns = state.settings.__experimentalReusableBlocks ?? []; | ||
| const userPatternCategories = | ||
| state.settings.__experimentalUserPatternCategories ?? []; |
There was a problem hiding this comment.
These two arrays are never returned from the selector, so the static constant EMPTY_ARRAY is not really needed.
There was a problem hiding this comment.
Could be easy to accidentally slip in later though.
There was a problem hiding this comment.
Although we're anyway mapping below I see now.
|
Size Change: -56 B (0%) Total Size: 1.7 MB
ℹ️ View Unchanged
|
ellatrix
approved these changes
Jan 17, 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.
When retrieving the block patterns we repeatedly do this:
This PR extracts this into a new
getAllPatternsselector, which is also memoized so it doesn't have to construct the merged array on each call.Because this selector is memoized, we can use it when declaring selector dependencies. That's more straighforward than enumerating its low-level dependencies explicitly.