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.

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

Show menus selection in placeholder only if available #37980

Merged
merged 5 commits into from
Jan 14, 2022
Merged
Changes from 1 commit
Commits
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
Next Next commit
Don't show either Menu section if there are no menus
  • Loading branch information
getdave committed Jan 14, 2022
commit 80973bcc9450ae6bba1c872cff5aa613a2419567
44 changes: 23 additions & 21 deletions packages/block-library/src/navigation/edit/placeholder/index.js
Original file line number Diff line number Diff line change
@@ -47,28 +47,30 @@ const ExistingMenusDropdown = ( {
>
{ ( { onClose } ) => (
<>
<MenuGroup label={ __( 'Menus' ) }>
{ canSwitchNavigationMenu &&
navigationMenus?.map( ( menu ) => {
return (
<MenuItem
onClick={ () => {
setSelectedMenu( menu.id );
onFinish( menu );
} }
onClose={ onClose }
key={ menu.id }
>
{ decodeEntities(
menu.title.rendered
) }
</MenuItem>
);
} ) }
</MenuGroup>
{ showClassicMenus && (
{ canSwitchNavigationMenu &&
navigationMenus?.length(
<MenuGroup label={ __( 'Menus' ) }>
{ navigationMenus.map( ( menu ) => {
return (
<MenuItem
onClick={ () => {
setSelectedMenu( menu.id );
onFinish( menu );
} }
onClose={ onClose }
key={ menu.id }
>
{ decodeEntities(
menu.title.rendered
) }
</MenuItem>
);
} ) }
</MenuGroup>
) }
{ showClassicMenus && menus?.length && (
<MenuGroup label={ __( 'Classic Menus' ) }>
{ menus?.map( ( menu ) => {
{ menus.map( ( menu ) => {
return (
<MenuItem
onClick={ () => {