Refactor the block inspector component to avoid getSelectedBlock #11842
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
commented
Nov 14, 2018
|
|
||
| /* | ||
| * If the selected block is of an unregistered type, avoid showing it as an actual selection | ||
| * because we want the user to focus on the unregistered block warning, not block settings. | ||
| */ | ||
| if ( ! selectedBlock || isSelectedBlockUnregistered ) { | ||
| if ( ! blockType || ! selectedBlockClientId || isSelectedBlockUnregistered ) { |
There was a problem hiding this comment.
If I don't add blockType check it fails the e2e test, not sure why.
jorgefilipecosta
approved these changes
Nov 14, 2018
| @@ -79,15 +78,17 @@ const BlockInspector = ( { selectedBlock, blockType, count, hasBlockStyles } ) = | |||
|
|
|||
| export default withSelect( | |||
| ( select ) => { | |||
| const { getSelectedBlock, getSelectedBlockCount } = select( 'core/editor' ); | |||
| const { getSelectedBlockClientId, getSelectedBlockCount, getBlockName } = select( 'core/editor' ); | |||
| const { getBlockStyles } = select( 'core/blocks' ); | |||
There was a problem hiding this comment.
I think we should use getBlockType from select ( 'core/blocks' ); instead of the wp.blocks one, otherwise when there are updates to the blocks our withSelect function may not be executed.
This may be related to the reason end 2 end tests were failing without the blockType check.
There was a problem hiding this comment.
I agree. I think we should avoid relying on getBlockType (the global) entirely but I didn't want to create inconsistency between components now. This should be done as a dedicated PR at some point.
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 #11811
This PR refactors the block inspector component to use
getSelectedBlockClientIdandgetBlockNameinstead ofgetSelectedBlockwhich is not very performant.