Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lodash: Remove _.isEmpty() from Fill props #51096

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Lodash: Remove _.isEmpty() from Fill props #51096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions packages/block-editor/src/components/block-controls/fill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/**
* External dependencies
*/
import { isEmpty } from 'lodash';

/**
* WordPress dependencies
*/
Expand Down Expand Up @@ -38,7 +33,10 @@ export default function BlockControlsFill( {
// Children passed to BlockControlsFill will not have access to any
// React Context whose Provider is part of the BlockControlsSlot tree.
// So we re-create the Provider in this subtree.
const value = ! isEmpty( fillProps ) ? fillProps : null;
const value =
fillProps && Object.keys( fillProps ).length > 0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fillProps should be an object since it's coming from component props:

gutenberg/packages/components/src/slot-fill/index.js

Line 49 in b4887bf

const FillComponent = ( props ) => <Fill name={ key } { ...props } />;

? fillProps
: null;
return (
<ToolbarContext.Provider value={ value }>
{ group === 'default' && (
Expand Down
8 changes: 2 additions & 6 deletions packages/block-editor/src/components/inspector-controls/fill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/**
* External dependencies
*/
import { isEmpty } from 'lodash';

/**
* WordPress dependencies
*/
Expand Down Expand Up @@ -82,7 +77,8 @@ function ToolsPanelInspectorControl( { children, resetAllFilter, fillProps } ) {
// access to any React Context whose Provider is part of
// the InspectorControlsSlot tree. So we re-create the
// Provider in this subtree.
const value = ! isEmpty( fillProps ) ? fillProps : null;
const value =
fillProps && Object.keys( fillProps ).length > 0 ? fillProps : null;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fillProps should be an object since it's coming from component props:

gutenberg/packages/components/src/slot-fill/index.js

Line 49 in b4887bf

const FillComponent = ( props ) => <Fill name={ key } { ...props } />;

return (
<ToolsPanelContext.Provider value={ value }>
{ children }
Expand Down