Don't render undefined classname in useBlockProps hook #56923
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
t-hamano
added
[Type] Code Quality
t-hamano
changed the title
|
Size Change: +2 B (0%) Total Size: 1.71 MB
ℹ️ View Unchanged
|
|
Flaky tests detected in 19de0f9. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/7157651594
|
youknowriad
approved these changes
Dec 10, 2023
ellatrix
reviewed
Dec 10, 2023
| @@ -191,7 +191,8 @@ export function useBlockProps( props = {}, { __unstableIsHtml } = {} ) { | |||
| getBlockName( movingClientId ), | |||
| getBlockRootClientId( clientId ) | |||
| ), | |||
| [ attributes.className ]: hasLightBlockWrapper, | |||
| [ attributes.className ]: | |||
| attributes.className && hasLightBlockWrapper, | |||
| [ getBlockDefaultClassName( blockName ) ]: | |||
There was a problem hiding this comment.
Could this also be undefined or null? Maybe we shouldn't add either one through an object, and add hasLightBlockWrapper ? attributes.className : undefined after it.
There was a problem hiding this comment.
Could this also be undefined or null?
This can happen. This is because the blocks.getBlockDefaultClassName hook allows consumers to intentionally return undefined.
wp.hooks.addFilter(
'blocks.getBlockDefaultClassName',
'my-plugin/remove-block-class-name',
function( className, blockName ) {
return undefined;
}
);I've updated the PR to take this case into account as well.
ellatrix
approved these changes
Dec 10, 2023
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.
Related to #56847
What?
This PR removes
undefinedclass that is rendered when a block has no additional CSS classes.Why?
We need to check that
attributes.classNamedoes not appear undefined. This existed before #56847 refactored the useBlockProps hook.Testing Instructions