Skip to content

Fix non existent menu handling in nav block #36507

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
aristath merged 2 commits into from
Nov 24, 2021
Merged

Fix non existent menu handling in nav block #36507

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
be02746
Fix missing menu detection
talldan Nov 16, 2021
2e62380
Remove warning state, just fall back to placeholder
talldan Nov 16, 2021
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
14 changes: 0 additions & 14 deletions packages/block-library/src/navigation/edit/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,20 +283,6 @@ function Navigation( {
);
}

// Show a warning if the selected menu is no longer available.
// TODO - the user should be able to select a new one?
if ( navigationMenuId && isNavigationMenuMissing ) {
return (
<div { ...blockProps }>
<Warning>
{ __(
'Navigation menu has been deleted or is unavailable'
) }
</Warning>
</div>
);
}

if ( isEntityAvailable && hasAlreadyRendered ) {
return (
<div { ...blockProps }>
Expand Down
6 changes: 5 additions & 1 deletion packages/block-library/src/navigation/use-navigation-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default function useNavigationMenu( navigationMenuId ) {
return useSelect(
( select ) => {
const {
getEntityRecord,
getEditedEntityRecord,
getEntityRecords,
hasFinishedResolution,
Expand All @@ -18,6 +19,9 @@ export default function useNavigationMenu( navigationMenuId ) {
'wp_navigation',
navigationMenuId,
];
const rawNavigationMenu = navigationMenuId
? getEntityRecord( ...navigationMenuSingleArgs )
: null;
const navigationMenu = navigationMenuId
? getEditedEntityRecord( ...navigationMenuSingleArgs )
: null;
Expand Down Expand Up @@ -45,7 +49,7 @@ export default function useNavigationMenu( navigationMenuId ) {
isNavigationMenuResolved: hasResolvedNavigationMenu,
isNavigationMenuMissing:
! navigationMenuId ||
( hasResolvedNavigationMenu && ! navigationMenu ),
( hasResolvedNavigationMenu && ! rawNavigationMenu ),
canSwitchNavigationMenu,
hasResolvedNavigationMenus: hasFinishedResolution(
'getEntityRecords',
Expand Down