Skip to content

Try using createElement for renderAppender render prop #15259

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

Merged
talldan merged 2 commits into from
May 3, 2019
Merged

Try using createElement for renderAppender render prop #15259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e32a5b
Use createElement for renderAppender render prop
talldan Apr 30, 2019
3958071
Use JSX instead of createElement
talldan Apr 30, 2019
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
6 changes: 3 additions & 3 deletions packages/block-editor/src/components/block-list-appender/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ function BlockListAppender( {
rootClientId,
canInsertDefaultBlock,
isLocked,
renderAppender,
renderAppender: CustomAppender,
} ) {
if ( isLocked ) {
return null;
}

// A render prop has been provided, use it to render the appender.
if ( renderAppender ) {
if ( CustomAppender ) {
return (
<div className="block-list-appender">
{ renderAppender() }
<CustomAppender />
Copy link
Contributor Author

@talldan talldan Apr 30, 2019

Choose a reason for hiding this comment

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

@aduth - this is another alternative since JSX desugars to createElement.

Copy link
Member

@aduth aduth May 2, 2019

Choose a reason for hiding this comment

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

@aduth - this is another alternative since JSX desugars to createElement.

I hadn't thought about that, but yes, I think that'd make for a fine (preferred) alternative.

</div>
);
}
Expand Down
4 changes: 1 addition & 3 deletions packages/block-library/src/group/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import {
withColors,
} from '@wordpress/block-editor';

const renderAppender = () => <InnerBlocks.ButtonBlockAppender />;

function GroupEdit( {
className,
setBackgroundColor,
Expand Down Expand Up @@ -49,7 +47,7 @@ function GroupEdit( {
</InspectorControls>
<div className={ classes } style={ styles }>
<InnerBlocks
renderAppender={ ! hasInnerBlocks && renderAppender }
renderAppender={ ! hasInnerBlocks && InnerBlocks.ButtonBlockAppender }
/>
</div>
</Fragment>
Expand Down