From 37c250bbb981b5d4566a1137db67c7a6f6b5273a Mon Sep 17 00:00:00 2001
From: Adam Wood <1017872+adamwoodnz@users.noreply.github.com>
Date: Fri, 25 Oct 2024 08:57:44 +1300
Subject: [PATCH] Revert "Revert "Fix rendering callout blocks as notice blocks
 (#662)" (#663)"

This reverts commit b2dea2b58c3defcb17920d0be40d8fd4901f8ef2.
---
 mu-plugins/blocks/notice/index.php          | 41 +++++++++++++++++----
 mu-plugins/blocks/notice/postcss/style.pcss | 31 ++++++++++------
 2 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/mu-plugins/blocks/notice/index.php b/mu-plugins/blocks/notice/index.php
index ebc9fb755..5181b8fc5 100644
--- a/mu-plugins/blocks/notice/index.php
+++ b/mu-plugins/blocks/notice/index.php
@@ -9,6 +9,8 @@
 // Run after `WPorg_Handbook_Callout_Boxes` registers the shortcodes.
 add_action( 'init', __NAMESPACE__ . '\init', 11 );
 
+add_filter( 'pre_render_block', __NAMESPACE__ . '\render_callout_block_as_notice', 11, 2 );
+
 /**
  * Registers the block using the metadata loaded from the `block.json` file.
  * Behind the scenes, it registers also all assets so they can be enqueued
@@ -21,20 +23,20 @@ function init() {
 
 	foreach ( [ 'info', 'tip', 'alert', 'tutorial', 'warning' ] as $shortcode ) {
 		remove_shortcode( $shortcode );
-		add_shortcode( $shortcode, __NAMESPACE__ . '\render_shortcode' );
+		add_shortcode( $shortcode, __NAMESPACE__ . '\render_callout_as_notice' );
 	}
 }
 
 /**
- * Display the callout shortcodes using the notice block.
+ * Display a callout using the notice block.
  *
- * @param array|string $attr    Shortcode attributes array or empty string.
- * @param string       $content Shortcode content.
- * @param string       $tag     Shortcode name.
+ * @param array|string $attr    Callout shortcode attributes array or empty string.
+ * @param string       $content Callout content.
+ * @param string       $tag     Callout type.
  *
- * @return string Shortcode output as HTML markup.
+ * @return string Callout output as HTML markup.
  */
-function render_shortcode( $attr, $content, $tag ) {
+function render_callout_as_notice( $attr, $content, $tag ) {
 	$shortcode_mapping = array(
 		'info'     => 'info',
 		'tip'      => 'tip',
@@ -70,3 +72,28 @@ function render_shortcode( $attr, $content, $tag ) {
 
 	return $final_markup;
 }
+
+/**
+ * Renders a callout block as a notice.
+ *
+ * @param string|null $pre_render The pre-rendered content or null.
+ * @param array       $parsed_block The parsed block array.
+ * @return string|null The rendered notice or the original pre-render value.
+ */
+function render_callout_block_as_notice( $pre_render, $parsed_block ) {
+	if ( is_admin() || 'wporg/callout' !== $parsed_block['blockName'] ) {
+		return $pre_render;
+	}
+
+	$callout_wrapper = $parsed_block['innerHTML'];
+	// Extract the specific "callout-*" class and remove the "callout-" prefix
+	preg_match( '/\bcallout-([\w-]+)\b/', $callout_wrapper, $matches );
+	$tag = $matches[1] ?? 'tip';
+
+	$content = '';
+	foreach ( $parsed_block['innerBlocks'] as $inner_block ) {
+		$content .= render_block( $inner_block );
+	}
+
+	return render_callout_as_notice( '', $content, $tag );
+}
diff --git a/mu-plugins/blocks/notice/postcss/style.pcss b/mu-plugins/blocks/notice/postcss/style.pcss
index 77bc89f65..4527ddee2 100644
--- a/mu-plugins/blocks/notice/postcss/style.pcss
+++ b/mu-plugins/blocks/notice/postcss/style.pcss
@@ -27,18 +27,6 @@
 		align-self: start;
 	}
 
-	& p:first-child {
-		margin-block-start: 0;
-	}
-
-	& p:last-child {
-		margin-block-end: 0;
-	}
-
-	& br:first-child {
-		display: none;
-	}
-
 	&.alignleft,
 	&.alignright {
 		max-width: calc(var(--wp--style--global--content-size, 680px) * 0.66);
@@ -78,4 +66,23 @@
 
 .wp-block-wporg-notice__content {
 	align-self: center;
+
+	& :empty:not(br),
+	& br:first-child {
+		display: none;
+	}
+
+	& :first-child,
+	&:has(:first-child:empty) :nth-child(2) {
+		margin-block-start: 0;
+	}
+
+	& :last-child,
+	&:has(:last-child:empty) :nth-last-child(2),
+	/* o2 adds a data script tag to the notice content on some Make blogs.
+	 * In this case we need to remove bottom margin from the second to last element instead.
+	 */
+	&:has(.o2-data) :nth-last-child(2) {
+		margin-block-end: 0;
+	}
 }