Lodash: Remove more _.isEmpty() from block editor
#51098
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
tyxla
added
[Type] Performance
tyxla
requested review from
Mamaduka,
sgomes,
aristath,
jsnajdr,
swissspidy,
flootr,
chad1008,
ntsekouras and
fabiankaegy
|
Size Change: -5 B (0%) Total Size: 1.39 MB
ℹ️ View Unchanged
|
tyxla
commented
May 30, 2023
| @@ -23,7 +18,8 @@ export default createHigherOrderComponent( ( WrappedComponent ) => { | |||
| props.disableCustomColors === undefined | |||
| ? disableCustomColorsFeature | |||
| : props.disableCustomColors; | |||
| const hasColorsToChoose = ! isEmpty( colors ) || ! disableCustomColors; | |||
| const hasColorsToChoose = | |||
| ( colors && colors.length > 0 ) || ! disableCustomColors; | |||
There was a problem hiding this comment.
The colors argument is expected to be an array:
| @@ -43,14 +42,14 @@ export const PanelColorGradientSettingsInner = ( { | |||
| const panelId = useInstanceId( PanelColorGradientSettingsInner ); | |||
| const { batch } = useRegistry(); | |||
| if ( | |||
| isEmpty( colors ) && | |||
| isEmpty( gradients ) && | |||
| ( ! colors || colors.length === 0 ) && | |||
There was a problem hiding this comment.
Colors are expected to be an array in both tests and theme.json:
https://developer.wordpress.org/themes/advanced-topics/theme-json/#color-palette
| disableCustomColors && | ||
| disableCustomGradients && | ||
| settings?.every( | ||
| ( setting ) => | ||
| isEmpty( setting.colors ) && | ||
| isEmpty( setting.gradients ) && | ||
| ( ! setting.colors || setting.colors.length === 0 ) && |
There was a problem hiding this comment.
Colors are expected to be an array in both tests and theme.json:
https://developer.wordpress.org/themes/advanced-topics/theme-json/#color-palette
| isEmpty( colors ) && | ||
| isEmpty( gradients ) && | ||
| ( ! colors || colors.length === 0 ) && | ||
| ( ! gradients || gradients.length === 0 ) && |
There was a problem hiding this comment.
Gradients are expected to be an array in both tests and theme.json:
https://developer.wordpress.org/themes/advanced-topics/theme-json/#color-palette
| isEmpty( setting.colors ) && | ||
| isEmpty( setting.gradients ) && | ||
| ( ! setting.colors || setting.colors.length === 0 ) && | ||
| ( ! setting.gradients || setting.gradients.length === 0 ) && |
There was a problem hiding this comment.
Gradients are expected to be an array in both tests and theme.json:
https://developer.wordpress.org/themes/advanced-topics/theme-json/#color-palette
| @@ -58,10 +57,11 @@ function ColorGradientControlInner( { | |||
| headingLevel, | |||
| } ) { | |||
| const canChooseAColor = | |||
| onColorChange && ( ! isEmpty( colors ) || ! disableCustomColors ); | |||
| onColorChange && | |||
| ( ( colors && colors.length > 0 ) || ! disableCustomColors ); | |||
There was a problem hiding this comment.
Colors are expected to be an array in both tests and theme.json:
https://developer.wordpress.org/themes/advanced-topics/theme-json/#color-palette
| @@ -685,7 +685,7 @@ export const getNodesWithSettings = ( tree, blockSelectors ) => { | |||
| // Top-level. | |||
| const presets = pickPresets( tree.settings ); | |||
| const custom = tree.settings?.custom; | |||
| if ( ! isEmpty( presets ) || custom ) { | |||
| if ( Object.keys( presets ).length > 0 || custom ) { | |||
There was a problem hiding this comment.
| @@ -698,7 +698,7 @@ export const getNodesWithSettings = ( tree, blockSelectors ) => { | |||
| ( [ blockName, node ] ) => { | |||
| const blockPresets = pickPresets( node ); | |||
| const blockCustom = node.custom; | |||
| if ( ! isEmpty( blockPresets ) || blockCustom ) { | |||
| if ( Object.keys( blockPresets ).length > 0 || blockCustom ) { | |||
There was a problem hiding this comment.
| @@ -964,7 +964,7 @@ export const toStyles = ( | |||
| } | |||
|
|
|||
| const classes = getPresetsClasses( selector, presets ); | |||
| if ( ! isEmpty( classes ) ) { | |||
| if ( classes.length > 0 ) { | |||
There was a problem hiding this comment.
Comment on lines
984
to
985
| blockType?.selectors && | ||
| Object.keys( blockType?.selectors ).length > 0 |
There was a problem hiding this comment.
Selectors, if defined, will be an object:
https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#selectors
There was a problem hiding this comment.
Super nit: ? in blockType?.selector at the second check is not needed.
There was a problem hiding this comment.
Indeed, good find!
Cleaned it up in 262c8db
ntsekouras
approved these changes
Jun 1, 2023
Comment on lines
984
to
985
| blockType?.selectors && | ||
| Object.keys( blockType?.selectors ).length > 0 |
There was a problem hiding this comment.
Super nit: ? in blockType?.selector at the second check is not needed.
tyxla
force-pushed
the
remove/more-is-empty-block-editor
branch
from
dd0de89
to
262c8db
Compare
|
Flaky tests detected in 262c8db. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/5143262280
|
sethrubenstein
pushed a commit
to pewresearch/gutenberg
that referenced
this pull request
Jul 13, 2023
* Lodash: Remove more _.isEmpty() from block editor * Remove unnecessary boolean check * Remove unnecessary optional chaining
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?
This PR removes Lodash's
_.isEmpty()from the block editor package.Why?
Lodash is known to unnecessarily inflate the bundle size of packages, and in most cases, it can be replaced with native language functionality. See these for more information and rationale:
@wordpress/api-fetchpackage haslodashas a dependency #39495How?
We're checking if the props are truthy, and if they are, we verify that it's not an empty object by using
Object.keys().length.Testing Instructions