Fix non existent menu handling in nav block (#36507)

* Fix missing menu detection * Remove warning state, just fall back to placeholder
WordPress · Nov 28, 2021 · e634361 · e634361
1 parent 4191997
commit e634361
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
@@ -306,20 +306,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 }>

diff --git a/packages/block-library/src/navigation/use-navigation-menu.js b/packages/block-library/src/navigation/use-navigation-menu.js
@@ -8,6 +8,7 @@ export default function useNavigationMenu( navigationMenuId ) {
 	return useSelect(
 		( select ) => {
 			const {
+				getEntityRecord,
 				getEditedEntityRecord,
 				getEntityRecords,
 				hasFinishedResolution,
@@ -18,6 +19,9 @@ export default function useNavigationMenu( navigationMenuId ) {
 				'wp_navigation',
 				navigationMenuId,
 			];
+			const rawNavigationMenu = navigationMenuId
+				? getEntityRecord( ...navigationMenuSingleArgs )
+				: null;
 			const navigationMenu = navigationMenuId
 				? getEditedEntityRecord( ...navigationMenuSingleArgs )
 				: null;
@@ -45,7 +49,7 @@ export default function useNavigationMenu( navigationMenuId ) {
 				isNavigationMenuResolved: hasResolvedNavigationMenu,
 				isNavigationMenuMissing:
 					! navigationMenuId ||
-					( hasResolvedNavigationMenu && ! navigationMenu ),
+					( hasResolvedNavigationMenu && ! rawNavigationMenu ),
 				canSwitchNavigationMenu,
 				hasResolvedNavigationMenus: hasFinishedResolution(
 					'getEntityRecords',