still check for draft menus

WordPress · Feb 9, 2023 · 586ecf4 · 586ecf4
1 parent cd2b54f
commit 586ecf4
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/packages/block-library/src/navigation/edit/unsaved-inner-blocks.js b/packages/block-library/src/navigation/edit/unsaved-inner-blocks.js
@@ -97,11 +97,18 @@ export default function UnsavedInnerBlocks( {
 				return EMPTY_OBJECT;
 			}
 
-			const { hasFinishedResolution, isSavingEntityRecord } =
-				select( coreStore );
+			const {
+				getEntityRecords,
+				hasFinishedResolution,
+				isSavingEntityRecord,
+			} = select( coreStore );
 
 			return {
 				isSaving: isSavingEntityRecord( 'postType', 'wp_navigation' ),
+				draftNavigationMenus: getEntityRecords(
+					// This is needed so that hasResolvedDraftNavigationMenus gives the correct status.
+					...DRAFT_MENU_PARAMS
+				),
 				hasResolvedDraftNavigationMenus: hasFinishedResolution(
 					'getEntityRecords',
 					DRAFT_MENU_PARAMS
@@ -144,8 +151,8 @@ export default function UnsavedInnerBlocks( {
 		isSaving,
 		hasResolvedDraftNavigationMenus,
 		hasResolvedNavigationMenus,
-		hasSelection,
 		innerBlocksAreDirty,
+		hasSelection,
 	] );
 
 	const Wrapper = isSaving ? Disabled : 'div';