From 6841982d0b85a6dd9706a972be00b62a250b1ada Mon Sep 17 00:00:00 2001
From: Kerry Liu <kerryliu@gmail.com>
Date: Wed, 22 Sep 2021 12:49:45 -0700
Subject: [PATCH] Navigation: Allow a label to be used for placeholder text.
 This makes for better looking navigation patterns.

---
 lib/block-patterns.php                        | 39 +++++++++++++++++++
 .../block-library/src/navigation-link/edit.js |  3 ++
 2 files changed, 42 insertions(+)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index f3586d3d7dcd9..cd0546a21ddfc 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -14,6 +14,10 @@ function register_gutenberg_patterns() {
 		register_block_pattern_category( 'query', array( 'label' => __( 'Query', 'gutenberg' ) ) );
 	}
 
+	if ( ! WP_Block_Pattern_Categories_Registry::get_instance()->is_registered( 'navigation' ) ) {
+		register_block_pattern_category( 'navigation', array( 'label' => __( 'Navigation', 'gutenberg' ) ) );
+	}
+
 	$patterns = array(
 		'query-standard-posts'                 => array(
 			'title'      => _x( 'Standard', 'Block pattern title', 'gutenberg' ),
@@ -157,6 +161,41 @@ function register_gutenberg_patterns() {
 								<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>
 								<!-- /wp:social-links -->',
 		),
+		'navigation-page-links'                => array(
+			'title'      => _x( 'All pages menu', 'Block pattern title', 'gutenberg' ),
+			'categories' => array( 'navigation' ),
+			'blockTypes' => array( 'core/navigation' ),
+			'content'    => '<!-- wp:navigation --><!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /--><!-- /wp:navigation -->',
+		),
+		'navigation-page-links-responsive'     => array(
+			'title'         => _x( 'All pages menu (responsive)', 'Block pattern title', 'gutenberg' ),
+			'viewportWidth' => 500,
+			'categories'    => array( 'navigation' ),
+			'blockTypes'    => array( 'core/navigation' ),
+			'content'       => '<!-- wp:navigation {"isResponsive":true} --><!-- wp:page-list {"isNavigationChild":true,"showSubmenuIcon":true,"openSubmenusOnClick":false} /--><!-- /wp:navigation -->',
+		),
+		'navigation-vertical'                  => array(
+			'title'      => _x( 'Vertical navigation menu', 'Block pattern title', 'gutenberg' ),
+			'categories' => array( 'navigation' ),
+			'blockTypes' => array( 'core/navigation' ),
+			'content'    => '<!-- wp:navigation {"orientation":"vertical","style":{"typography":{"fontFamily":"var:preset|font-family|system-fonts"}},"fontSize":"extra-large"} -->
+							<!-- wp:home-link {"label":"Home"} /-->
+							<!-- wp:navigation-link {"label":"About","type":"page","kind":"post-type","isTopLevelLink":true} /-->
+							<!-- wp:navigation-link {"label":"Contact","type":"page","kind":"post-type","isTopLevelLink":true} /-->
+							<!-- wp:navigation-link {"label":"Portfolio","type":"page","kind":"post-type","isTopLevelLink":true} /-->
+							<!-- /wp:navigation -->',
+		),
+		'navigation-horizontal'                => array(
+			'title'      => _x( 'Horizontal navigation menu', 'Block pattern title', 'gutenberg' ),
+			'categories' => array( 'navigation' ),
+			'blockTypes' => array( 'core/navigation' ),
+			'content'    => '<!-- wp:navigation {"style":{"typography":{"fontFamily":"var:preset|font-family|system-fonts"}},"fontSize":"extra-large"} -->
+							<!-- wp:home-link {"label":"Home"} /-->
+							<!-- wp:navigation-link {"label":"About","type":"page","kind":"post-type","isTopLevelLink":true} /-->
+							<!-- wp:navigation-link {"label":"Contact","type":"page","kind":"post-type","isTopLevelLink":true} /-->
+							<!-- wp:navigation-link {"label":"Portfolio","type":"page","kind":"post-type","isTopLevelLink":true} /-->
+							<!-- /wp:navigation -->',
+		),
 	);
 
 	foreach ( $patterns as $name => $pattern ) {
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 831bc5e9a1e00..45440695cb833 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -588,6 +588,9 @@ export default function NavigationLinkEdit( {
 			/* translators: label for missing values in navigation link block */
 			missingText = __( 'Add link' );
 	}
+	if ( label ) {
+		missingText = label;
+	}
 
 	return (
 		<Fragment>