From 75ad7d242cb42eaa08bffc5538f3f9ecc99df8f0 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Tue, 23 Aug 2022 17:14:54 +1000
Subject: [PATCH] Try adding layout support to Cover block.

---
 lib/block-supports/layout.php               | 60 +++++++++++++++++----
 packages/block-library/src/cover/block.json |  7 +++
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/lib/block-supports/layout.php b/lib/block-supports/layout.php
index 15a7a131f8a9b0..63ae1303ade182 100644
--- a/lib/block-supports/layout.php
+++ b/lib/block-supports/layout.php
@@ -291,6 +291,29 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
 	return '';
 }
 
+/**
+ * Adds an identifying classname to the inner block wrapper.
+ *
+ * @param array $parsed_block A parsed block object.
+ * @return array              The updated block object.
+ */
+function gutenberg_identify_inner_block_wrapper( $parsed_block ) {
+
+	if ( ! isset( $parsed_block['innerContent'][0] ) ) {
+		return $parsed_block;
+	}
+
+	$inner_class_position = strrpos( $parsed_block['innerContent'][0], 'class="' );
+
+	if ( ! $inner_class_position ) {
+		return $parsed_block;
+	}
+
+	$parsed_block['innerContent'][0] = substr_replace( $parsed_block['innerContent'][0], 'class="is-inner-block-wrapper ', $inner_class_position, strlen( 'class="' ) );
+
+	return $parsed_block;
+}
+
 /**
  * Renders the layout config to the block wrapper.
  *
@@ -413,15 +436,28 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 	}
 
 	/*
-	 * This assumes the hook only applies to blocks with a single wrapper.
-	 * A limitation of this hook is that nested inner blocks wrappers are not yet supported.
-	 */
-	$content = preg_replace(
-		'/' . preg_quote( 'class="', '/' ) . '/',
-		'class="' . esc_attr( implode( ' ', $class_names ) ) . ' ',
-		$block_content,
-		1
-	);
+	* Ideally we'll be able to attach this class to all inner block wrappers and
+	* we won't need the condition or the fallback.
+	*/
+	if ( strpos( $block_content, 'is-inner-block-wrapper' ) ) {
+		$content = preg_replace(
+			'/' . preg_quote( 'is-inner-block-wrapper', '/' ) . '/',
+			esc_attr( implode( ' ', $class_names ) ),
+			$block_content,
+			1
+		);
+	} else {
+		/*
+		* This assumes the hook only applies to blocks with a single wrapper.
+		* A limitation of this hook is that nested inner blocks wrappers are not yet supported.
+		*/
+		$content = preg_replace(
+			'/' . preg_quote( 'class="', '/' ) . '/',
+			'class="' . esc_attr( implode( ' ', $class_names ) ) . ' ',
+			$block_content,
+			1
+		);
+	}
 
 	return $content;
 }
@@ -433,6 +469,12 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		'register_attribute' => 'gutenberg_register_layout_support',
 	)
 );
+
+if ( function_exists( 'wp_identify_inner_block_wrapper' ) ) {
+	remove_filter( 'render_block', 'wp_identify_inner_block_wrapper' );
+}
+add_filter( 'render_block_data', 'gutenberg_identify_inner_block_wrapper' );
+
 if ( function_exists( 'wp_render_layout_support_flag' ) ) {
 	remove_filter( 'render_block', 'wp_render_layout_support_flag' );
 }
diff --git a/packages/block-library/src/cover/block.json b/packages/block-library/src/cover/block.json
index 1982ecc44853ea..d7dd4d48e57b41 100644
--- a/packages/block-library/src/cover/block.json
+++ b/packages/block-library/src/cover/block.json
@@ -105,6 +105,13 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"__experimentalLayout": {
+			"allowSwitching": true,
+			"allowInheriting": false,
+			"default": {
+				"type": "flow"
+			}
 		}
 	},
 	"editorStyle": "wp-block-cover-editor",