Switch to useGenerateDefaultNavigationTitle

WordPress · Nov 24, 2021 · 1885a87 · 1885a87
1 parent 4808aaf
commit 1885a87
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 45 deletions.
diff --git a/packages/block-library/src/navigation/edit/use-create-navigation-menu.js b/packages/block-library/src/navigation/edit/use-create-navigation-menu.js
@@ -9,18 +9,21 @@ import { useCallback } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import useDefaultNavigationTitle from './use-default-navigation-title';
+import useGenerateDefaultNavigationTitle from './use-generate-default-navigation-title';
 
 export default function useCreateNavigationMenu( clientId ) {
 	const { saveEntityRecord } = useDispatch( coreStore );
-	const defaultTitle = useDefaultNavigationTitle( clientId );
+	const generateDefaultTitle = useGenerateDefaultNavigationTitle( clientId );
 
 	// This callback uses data from the two placeholder steps and only creates
 	// a new navigation menu when the user completes the final step.
 	return useCallback(
 		async ( title = null, blocks = [] ) => {
+			if ( ! title ) {
+				title = await generateDefaultTitle();
+			}
 			const record = {
-				title: title || defaultTitle,
+				title,
 				content: serialize( blocks ),
 				status: 'publish',
 			};

diff --git a/...tion/edit/use-default-navigation-title.js → .../use-generate-default-navigation-title.js b/...tion/edit/use-default-navigation-title.js → .../use-generate-default-navigation-title.js
@@ -3,66 +3,50 @@
  */
 import { Disabled } from '@wordpress/components';
 import { store as coreStore } from '@wordpress/core-data';
-import { useSelect } from '@wordpress/data';
-import { useContext, useMemo } from '@wordpress/element';
+import { useRegistry } from '@wordpress/data';
+import { useContext, useCallback } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
-import useNavigationMenu from '../use-navigation-menu';
 import useTemplatePartAreaLabel from '../use-template-part-area-label';
 
-const EMPTY_OBJECT = {};
 const DRAFT_MENU_PARAMS = [
 	'postType',
 	'wp_navigation',
 	{ status: 'draft', per_page: -1 },
 ];
 
-export default function useDefaultNavigationTitle( clientId ) {
+const PUBLISHED_MENU_PARAMS = [
+	'postType',
+	'wp_navigation',
+	{ per_page: -1, status: 'publish' },
+];
+
+export default function useGenerateDefaultNavigationTitle( clientId ) {
 	// The block will be disabled in a block preview, use this as a way of
 	// avoiding the side-effects of this component for block previews.
 	const isDisabled = useContext( Disabled.Context );
 
-	const { draftNavigationMenus, hasResolvedDraftNavigationMenus } = useSelect(
-		( select ) => {
-			if ( isDisabled ) {
-				return EMPTY_OBJECT;
-			}
-
-			const { getEntityRecords, hasFinishedResolution } = select(
-				coreStore
-			);
-
-			return {
-				draftNavigationMenus: getEntityRecords( ...DRAFT_MENU_PARAMS ),
-				hasResolvedDraftNavigationMenus: hasFinishedResolution(
-					'getEntityRecords',
-					DRAFT_MENU_PARAMS
-				),
-			};
-		},
-		[ isDisabled ]
-	);
-
-	const { hasResolvedNavigationMenus, navigationMenus } = useNavigationMenu();
-
 	// Because we can't conditionally call hooks, pass an undefined client id
 	// arg to bypass the expensive `useTemplateArea` code. The hook will return
 	// early.
 	const area = useTemplatePartAreaLabel( isDisabled ? undefined : clientId );
 
-	return useMemo( () => {
+	const registry = useRegistry();
+	return useCallback( async () => {
 		// Ensure other navigation menus have loaded so an
 		// accurate name can be created.
-		if (
-			isDisabled ||
-			! hasResolvedDraftNavigationMenus ||
-			! hasResolvedNavigationMenus
-		) {
+		if ( isDisabled ) {
 			return '';
 		}
+		const { getEntityRecords } = registry.resolveSelect( coreStore );
+
+		const [ draftNavigationMenus, navigationMenus ] = await Promise.all( [
+			getEntityRecords( ...DRAFT_MENU_PARAMS ),
+			getEntityRecords( ...PUBLISHED_MENU_PARAMS ),
+		] );
 
 		const title = area
 			? sprintf(
@@ -91,12 +75,5 @@ export default function useDefaultNavigationTitle( clientId ) {
 				: title;
 
 		return titleWithCount || '';
-	}, [
-		isDisabled,
-		hasResolvedDraftNavigationMenus,
-		hasResolvedNavigationMenus,
-		draftNavigationMenus,
-		navigationMenus,
-		area,
-	] );
+	}, [ isDisabled, area ] );
 }