From e87b6c5fcb28027e6c2ed6fc214ad62d06c10e5a Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Thu, 25 Nov 2021 23:31:35 +0000
Subject: [PATCH 1/3] Use WP_Query

---
 .../block-library/src/navigation/index.php    | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 5e58ff198a7a5a..8a23f0ca9b7a16 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -145,17 +145,22 @@ function block_core_navigation_get_first_non_empty_navigation() {
 	// see:
 	// - https://github.com/WordPress/wordpress-develop/blob/ba943e113d3b31b121f77a2d30aebe14b047c69d/src/wp-includes/nav-menu.php#L613-L619.
 	// - https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters.
-	$navigation_posts = get_posts(
-		array(
-			'post_type'      => 'wp_navigation',
-			'order'          => 'ASC',
-			'orderby'        => 'name',
-			'posts_per_page' => 1, // only the first post.
-			's'              => '<!-- wp:', // look for block indicators to ensure we only include non-empty Navigations.
-		)
+	$parsed_args = array(
+		'post_type'      => 'wp_navigation',
+		'no_found_rows'  => true,
+		'order'          => 'ASC',
+		'orderby'        => 'name',
+		'posts_per_page' => 20, // Try the first 20 posts
 	);
-	return count( $navigation_posts ) ? $navigation_posts[0] : null;
 
+	$navigation_posts = new WP_Query( $parsed_args );
+	foreach ( $navigation_posts->posts as $navigation_post ) {
+		if ( has_blocks( $navigation_post ) ) {
+			return $navigation_post;
+		}
+	}
+
+	return null;
 }
 
 /**

From e14275581a793974bdef9834a06871a4ce059b6b Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Fri, 26 Nov 2021 15:51:10 +0000
Subject: [PATCH 2/3] Only published posts.

---
 packages/block-library/src/navigation/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 8a23f0ca9b7a16..94e2f009e0aa5d 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -150,6 +150,7 @@ function block_core_navigation_get_first_non_empty_navigation() {
 		'no_found_rows'  => true,
 		'order'          => 'ASC',
 		'orderby'        => 'name',
+		'post_status'    => 'publish',
 		'posts_per_page' => 20, // Try the first 20 posts
 	);
 

From 5f70726ee4199ad2c4695c1561a9ed68d744e754 Mon Sep 17 00:00:00 2001
From: Jonny Harris <jon@spacedmonkey.co.uk>
Date: Mon, 29 Nov 2021 10:49:34 +0000
Subject: [PATCH 3/3] Fix lint error

---
 packages/block-library/src/navigation/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 94e2f009e0aa5d..7527d45478ef7b 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -151,7 +151,7 @@ function block_core_navigation_get_first_non_empty_navigation() {
 		'order'          => 'ASC',
 		'orderby'        => 'name',
 		'post_status'    => 'publish',
-		'posts_per_page' => 20, // Try the first 20 posts
+		'posts_per_page' => 20, // Try the first 20 posts.
 	);
 
 	$navigation_posts = new WP_Query( $parsed_args );