Skip to content

Blocks/refactor twentytwentyone block processor (take 2) #10291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Blocks/refactor twentytwentyone block processor (take 2) #10291

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e801a2a
Refactor twentwentyone to use Block_Processor
dmsnell Aug 13, 2025
2a328ce
Update twentytwentyone code based on changes in earlier work.
dmsnell Oct 15, 2025
eae6bbc
Fixup: 2021
dmsnell Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 16 additions & 30 deletions src/wp-content/themes/twentytwentyone/inc/template-functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,46 +361,32 @@ function twenty_twenty_one_get_non_latin_css( $type = 'front-end' ) {
* @return bool Returns true if a block was located & printed, otherwise false.
*/
function twenty_twenty_one_print_first_instance_of_block( $block_name, $content = null, $instances = 1 ) {
$instances_count = 0;
$blocks_content = '';

if ( ! $content ) {
$content = get_the_content();
}

// Parse blocks in the content.
$blocks = parse_blocks( $content );
$processor = new WP_Block_Processor( $content );
$instance_count = 0;

// Loop blocks.
foreach ( $blocks as $block ) {
if ( str_ends_with( $block_name, '*' ) ) {
// Scan for blocks whose block type matches the prefix.
$prefix = rtrim( $block_name, '*' );

// Confidence check.
if ( ! isset( $block['blockName'] ) ) {
continue;
}

// Check if this the block matches the $block_name.
$is_matching_block = false;

// If the block ends with *, try to match the first portion.
if ( '*' === $block_name[-1] ) {
$is_matching_block = 0 === strpos( $block['blockName'], rtrim( $block_name, '*' ) );
} else {
$is_matching_block = $block_name === $block['blockName'];
}

if ( $is_matching_block ) {
// Increment count.
++$instances_count;

// Add the block HTML.
$blocks_content .= render_block( $block );

// Break the loop if the $instances count was reached.
if ( $instances_count >= $instances ) {
break;
while ( $instance_count < $instances && $processor->next_block() ) {
$matched_block_type = $processor->get_printable_block_type();
if ( str_starts_with( $matched_block_type, $prefix ) ) {
$blocks_content .= render_block( $processor->extract_block() );
++$instance_count;
}
}
} else {
// Scan for blocks of the exact block type.
while ( $instance_count < $instances && $processor->next_block( $block_name ) ) {
$blocks_content .= render_block( $processor->extract_block() );
++$instance_count;
}
}

if ( $blocks_content ) {
Expand Down
Loading