Ensure fallback title by waiting on default title generation

WordPress · Mar 7, 2022 · 6985531 · 6985531
1 parent fa49a48
commit 6985531
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
@@ -614,7 +614,7 @@ function Navigation( {
 						isResolvingCanUserCreateNavigationMenu
 					}
 					onFinish={ handleSelectNavigation }
-					onCreateEmpty={ () => createNavigationMenu( [] ) }
+					onCreateEmpty={ () => createNavigationMenu( '', [] ) }
 				/>
 			</TagName>
 		);

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
@@ -27,13 +27,13 @@ export default function useCreateNavigationMenu( clientId ) {
 	// This callback uses data from the two placeholder steps and only creates
 	// a new navigation menu when the user completes the final step.
 	const create = useCallback(
-		( title = null, blocks = [] ) => {
+		async ( title = null, blocks = [] ) => {
 			setStatus( PENDING );
 			setValue( null );
 			setError( null );
 
 			if ( ! title ) {
-				title = generateDefaultTitle().catch( ( err ) => {
+				title = await generateDefaultTitle().catch( ( err ) => {
 					setError( err?.message );
 					setStatus( ERROR );
 					throw new Error(