From 5d42239a18f08304a79410a8a9b5940668edc7e1 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 5 Apr 2021 11:08:28 -0400
Subject: [PATCH 1/4] Add group wrappers to Query block patterns.

---
 lib/block-patterns.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index da42a0b25f8aec..acef0950df124d 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -16,13 +16,15 @@
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
 						<!-- wp:query-loop -->
-						<!-- wp:post-title {"isLink":true} /-->
+						<!-- wp:group {"align":"full","layout":{"inherit":true}} -->
+						<div class="wp-block-group alignfull"><!-- wp:post-title {"isLink":true} /-->
 						<!-- wp:post-featured-image  {"isLink":true,"align":"wide"} /-->
 						<!-- wp:post-excerpt /-->
 						<!-- wp:separator -->
 						<hr class="wp-block-separator"/>
 						<!-- /wp:separator -->
-						<!-- wp:post-date /-->
+						<!-- wp:post-date /--></div>
+						<!-- /wp:group -->
 						<!-- /wp:query-loop -->
 						<!-- /wp:query -->',
 	)
@@ -36,6 +38,8 @@
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
 						<!-- wp:query-loop -->
+						<!-- wp:group {"align":"full","layout":{"inherit":true}} -->
+						<div class="wp-block-group alignfull">
 						<!-- wp:columns {"align":"wide"} -->
 						<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} -->
 						<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>
@@ -44,7 +48,8 @@
 						<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:post-title {"isLink":true} /-->
 						<!-- wp:post-excerpt /--></div>
 						<!-- /wp:column --></div>
-						<!-- /wp:columns -->
+						<!-- /wp:columns --></div>
+						<!-- /wp:group -->
 						<!-- /wp:query-loop -->
 						<!-- /wp:query -->',
 	)
@@ -58,6 +63,8 @@
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
 						<!-- wp:query-loop -->
+						<!-- wp:group {"align":"full","layout":{"inherit":true}} -->
+						<div class="wp-block-group alignfull">
 						<!-- wp:columns {"verticalAlignment":"center"} -->
 						<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"25%"} -->
 						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:25%"><!-- wp:post-featured-image {"isLink":true} /--></div>
@@ -65,7 +72,8 @@
 						<!-- wp:column {"verticalAlignment":"center","width":"75%"} -->
 						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:75%"><!-- wp:post-title {"isLink":true} /--></div>
 						<!-- /wp:column --></div>
-						<!-- /wp:columns -->
+						<!-- /wp:columns --></div>
+						<!-- /wp:group -->
 						<!-- /wp:query-loop -->
 						<!-- /wp:query -->',
 	)

From d1d5817ac858cc1b5b60d9803f7e56980ac6df2d Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Wed, 7 Jul 2021 14:58:19 -0400
Subject: [PATCH 2/4] Update patterns to use layout controls as needed.

---
 lib/block-patterns.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 9baf799859fcfb..812ed3274ff4e3 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -22,13 +22,16 @@ function register_gutenberg_patterns() {
 			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 							<div class="wp-block-query">
 							<!-- wp:post-template -->
+							<!-- wp:group {"align":"wide","layout":{"inherit":true}} -->
+							<div class="wp-block-group alignwide">
 							<!-- wp:post-title {"isLink":true} /-->
 							<!-- wp:post-featured-image  {"isLink":true,"align":"wide"} /-->
 							<!-- wp:post-excerpt /-->
 							<!-- wp:separator -->
 							<hr class="wp-block-separator"/>
 							<!-- /wp:separator -->
-							<!-- wp:post-date /-->
+							<!-- wp:post-date /--></div>
+							<!-- /wp:group -->
 							<!-- /wp:post-template -->
 							</div>
 							<!-- /wp:query -->',
@@ -40,6 +43,8 @@ function register_gutenberg_patterns() {
 			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
 							<div class="wp-block-query">
 							<!-- wp:post-template -->
+							<!-- wp:group {"align":"wide","layout":{"inherit":true}} -->
+							<div class="wp-block-group alignwide">
 							<!-- wp:columns {"align":"wide"} -->
 							<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} -->
 							<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>
@@ -48,7 +53,8 @@ function register_gutenberg_patterns() {
 							<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:post-title {"isLink":true} /-->
 							<!-- wp:post-excerpt /--></div>
 							<!-- /wp:column --></div>
-							<!-- /wp:columns -->
+							<!-- /wp:columns --></div>
+							<!-- /wp:group -->
 							<!-- /wp:post-template -->
 							</div>
 							<!-- /wp:query -->',
@@ -57,7 +63,7 @@ function register_gutenberg_patterns() {
 			'title'      => __( 'Small image and title', 'gutenberg' ),
 			'blockTypes' => array( 'core/query' ),
 			'categories' => array( 'query' ),
-			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
+			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"layout":{"inherit":true}} -->
 							<div class="wp-block-query">
 							<!-- wp:post-template -->
 							<!-- wp:columns {"verticalAlignment":"center"} -->

From 5d83e3776ebe1b54a0508a972ee082e14945069e Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Wed, 7 Jul 2021 15:06:20 -0400
Subject: [PATCH 3/4] Remove unnecessary group wrapper.

---
 lib/block-patterns.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 812ed3274ff4e3..d072a805a67d3d 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -40,21 +40,18 @@ function register_gutenberg_patterns() {
 			'title'      => __( 'Image at left', 'gutenberg' ),
 			'blockTypes' => array( 'core/query' ),
 			'categories' => array( 'query' ),
-			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
+			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"layout":{"inherit":true}} -->
 							<div class="wp-block-query">
-							<!-- wp:post-template -->
-							<!-- wp:group {"align":"wide","layout":{"inherit":true}} -->
-							<div class="wp-block-group alignwide">
-							<!-- wp:columns {"align":"wide"} -->
-							<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} -->
+							<!-- wp:post-template {"align":"wide"} -->
+							<!-- wp:columns -->
+							<div class="wp-block-columns"><!-- wp:column {"width":"66.66%"} -->
 							<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>
 							<!-- /wp:column -->
 							<!-- wp:column {"width":"33.33%"} -->
 							<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:post-title {"isLink":true} /-->
 							<!-- wp:post-excerpt /--></div>
 							<!-- /wp:column --></div>
-							<!-- /wp:columns --></div>
-							<!-- /wp:group -->
+							<!-- /wp:columns -->
 							<!-- /wp:post-template -->
 							</div>
 							<!-- /wp:query -->',

From 2006567bf96dd4204d7a88eaab2d5c41f661c7d1 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 12 Jul 2021 14:43:52 -0400
Subject: [PATCH 4/4] Set alignfull on the parent containers as necessary.

---
 lib/block-patterns.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index d072a805a67d3d..2502fc1f878f64 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -19,8 +19,8 @@ function register_gutenberg_patterns() {
 			'title'      => __( 'Standard', 'gutenberg' ),
 			'blockTypes' => array( 'core/query' ),
 			'categories' => array( 'query' ),
-			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->
-							<div class="wp-block-query">
+			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"align":"full"} -->
+							<div class="wp-block-query alignfull">
 							<!-- wp:post-template -->
 							<!-- wp:group {"align":"wide","layout":{"inherit":true}} -->
 							<div class="wp-block-group alignwide">
@@ -40,8 +40,8 @@ function register_gutenberg_patterns() {
 			'title'      => __( 'Image at left', 'gutenberg' ),
 			'blockTypes' => array( 'core/query' ),
 			'categories' => array( 'query' ),
-			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"layout":{"inherit":true}} -->
-							<div class="wp-block-query">
+			'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"layout":{"inherit":true},"align":"wide"} -->
+							<div class="wp-block-query alignwide">
 							<!-- wp:post-template {"align":"wide"} -->
 							<!-- wp:columns -->
 							<div class="wp-block-columns"><!-- wp:column {"width":"66.66%"} -->
@@ -79,8 +79,8 @@ function register_gutenberg_patterns() {
 			'title'      => __( 'Grid', 'gutenberg' ),
 			'blockTypes' => array( 'core/query' ),
 			'categories' => array( 'query' ),
-			'content'    => '<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"flex","columns":3}} -->
-							<div class="wp-block-query">
+			'content'    => '<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"flex","columns":3},"align":"full"} -->
+							<div class="wp-block-query alignfull">
 							<!-- wp:post-template -->
 							<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
 							<div class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:post-title {"isLink":true} /-->
@@ -119,8 +119,8 @@ function register_gutenberg_patterns() {
 			'title'      => __( 'Offset', 'gutenberg' ),
 			'blockTypes' => array( 'core/query' ),
 			'categories' => array( 'query' ),
-			'content'    => '<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
-							<div class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->
+			'content'    => '<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false},"align":"full"} -->
+							<div class="wp-block-group alignfull" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->
 							<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->
 							<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->
 							<div class="wp-block-query"><!-- wp:post-template -->