- %2$s
- ';
+ $inner_blocks_html .= sprintf(
+ '
- ',
+ $container_attributes
+ );
}
if ( ! $is_list_item && $is_list_open ) {
@@ -728,6 +632,15 @@ function render_block_core_navigation( $attributes, $content, $block ) {
}
$inner_block_content = $inner_block->render();
+ $p = new WP_HTML_Tag_Processor( $inner_block_content );
+ if ( $p->next_tag(
+ array(
+ 'name' => 'LI',
+ 'class_name' => 'has-child',
+ )
+ ) ) {
+ $has_submenus = true;
+ }
if ( ! empty( $inner_block_content ) ) {
if ( in_array( $inner_block->name, $needs_list_item_wrapper, true ) ) {
$inner_blocks_html .= '';
@@ -741,22 +654,27 @@ function render_block_core_navigation( $attributes, $content, $block ) {
$inner_blocks_html .= '
+ '
+
-
-
+
+
@@ -816,13 +767,18 @@ function render_block_core_navigation( $attributes, $content, $block ) {
esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) ),
__( 'Menu' ),
$toggle_button_content,
- $toggle_close_button_content
+ $toggle_close_button_content,
+ $open_button_directives,
+ $responsive_container_directives,
+ $responsive_dialog_directives,
+ $close_button_directives
);
return sprintf(
- '',
+ '',
$wrapper_attributes,
- $responsive_container_markup
+ $responsive_container_markup,
+ $nav_element_directives
);
}
@@ -876,3 +832,212 @@ function block_core_navigation_typographic_presets_backcompatibility( $parsed_bl
}
add_filter( 'render_block_data', 'block_core_navigation_typographic_presets_backcompatibility' );
+
+/**
+ * Turns menu item data into a nested array of parsed blocks
+ *
+ * @param array $menu_items An array of menu items that represent
+ * an individual level of a menu.
+ * @param array $menu_items_by_parent_id An array keyed by the id of the
+ * parent menu where each element is an
+ * array of menu items that belong to
+ * that parent.
+ * @return array An array of parsed block data.
+ */
+function block_core_navigation_parse_blocks_from_menu_items( $menu_items, $menu_items_by_parent_id ) {
+
+ _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::parse_blocks_from_menu_items' );
+
+ if ( empty( $menu_items ) ) {
+ return array();
+ }
+
+ $blocks = array();
+
+ foreach ( $menu_items as $menu_item ) {
+ $class_name = ! empty( $menu_item->classes ) ? implode( ' ', (array) $menu_item->classes ) : null;
+ $id = ( null !== $menu_item->object_id && 'custom' !== $menu_item->object ) ? $menu_item->object_id : null;
+ $opens_in_new_tab = null !== $menu_item->target && '_blank' === $menu_item->target;
+ $rel = ( null !== $menu_item->xfn && '' !== $menu_item->xfn ) ? $menu_item->xfn : null;
+ $kind = null !== $menu_item->type ? str_replace( '_', '-', $menu_item->type ) : 'custom';
+
+ $block = array(
+ 'blockName' => isset( $menu_items_by_parent_id[ $menu_item->ID ] ) ? 'core/navigation-submenu' : 'core/navigation-link',
+ 'attrs' => array(
+ 'className' => $class_name,
+ 'description' => $menu_item->description,
+ 'id' => $id,
+ 'kind' => $kind,
+ 'label' => $menu_item->title,
+ 'opensInNewTab' => $opens_in_new_tab,
+ 'rel' => $rel,
+ 'title' => $menu_item->attr_title,
+ 'type' => $menu_item->object,
+ 'url' => $menu_item->url,
+ ),
+ );
+
+ $block['innerBlocks'] = isset( $menu_items_by_parent_id[ $menu_item->ID ] )
+ ? block_core_navigation_parse_blocks_from_menu_items( $menu_items_by_parent_id[ $menu_item->ID ], $menu_items_by_parent_id )
+ : array();
+ $block['innerContent'] = array_map( 'serialize_block', $block['innerBlocks'] );
+
+ $blocks[] = $block;
+ }
+
+ return $blocks;
+}
+
+/**
+ * Get the classic navigation menu to use as a fallback.
+ *
+ * @return object WP_Term The classic navigation.
+ */
+function block_core_navigation_get_classic_menu_fallback() {
+
+ _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::get_classic_menu_fallback' );
+
+ $classic_nav_menus = wp_get_nav_menus();
+
+ // If menus exist.
+ if ( $classic_nav_menus && ! is_wp_error( $classic_nav_menus ) ) {
+ // Handles simple use case where user has a classic menu and switches to a block theme.
+
+ // Returns the menu assigned to location `primary`.
+ $locations = get_nav_menu_locations();
+ if ( isset( $locations['primary'] ) ) {
+ $primary_menu = wp_get_nav_menu_object( $locations['primary'] );
+ if ( $primary_menu ) {
+ return $primary_menu;
+ }
+ }
+
+ // Returns a menu if `primary` is its slug.
+ foreach ( $classic_nav_menus as $classic_nav_menu ) {
+ if ( 'primary' === $classic_nav_menu->slug ) {
+ return $classic_nav_menu;
+ }
+ }
+
+ // Otherwise return the most recently created classic menu.
+ usort(
+ $classic_nav_menus,
+ static function( $a, $b ) {
+ return $b->term_id - $a->term_id;
+ }
+ );
+ return $classic_nav_menus[0];
+ }
+}
+
+/**
+ * Converts a classic navigation to blocks.
+ *
+ * @param object $classic_nav_menu WP_Term The classic navigation object to convert.
+ * @return array the normalized parsed blocks.
+ */
+function block_core_navigation_get_classic_menu_fallback_blocks( $classic_nav_menu ) {
+
+ _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::get_classic_menu_fallback_blocks' );
+
+ // BEGIN: Code that already exists in wp_nav_menu().
+ $menu_items = wp_get_nav_menu_items( $classic_nav_menu->term_id, array( 'update_post_term_cache' => false ) );
+
+ // Set up the $menu_item variables.
+ _wp_menu_item_classes_by_context( $menu_items );
+
+ $sorted_menu_items = array();
+ foreach ( (array) $menu_items as $menu_item ) {
+ $sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
+ }
+
+ unset( $menu_items, $menu_item );
+
+ // END: Code that already exists in wp_nav_menu().
+
+ $menu_items_by_parent_id = array();
+ foreach ( $sorted_menu_items as $menu_item ) {
+ $menu_items_by_parent_id[ $menu_item->menu_item_parent ][] = $menu_item;
+ }
+
+ $inner_blocks = block_core_navigation_parse_blocks_from_menu_items(
+ isset( $menu_items_by_parent_id[0] )
+ ? $menu_items_by_parent_id[0]
+ : array(),
+ $menu_items_by_parent_id
+ );
+
+ return serialize_blocks( $inner_blocks );
+}
+
+/**
+ * If there's a the classic menu then use it as a fallback.
+ *
+ * @return array the normalized parsed blocks.
+ */
+function block_core_navigation_maybe_use_classic_menu_fallback() {
+
+ _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::create_classic_menu_fallback' );
+
+ // See if we have a classic menu.
+ $classic_nav_menu = block_core_navigation_get_classic_menu_fallback();
+
+ if ( ! $classic_nav_menu ) {
+ return;
+ }
+
+ // If we have a classic menu then convert it to blocks.
+ $classic_nav_menu_blocks = block_core_navigation_get_classic_menu_fallback_blocks( $classic_nav_menu );
+
+ if ( empty( $classic_nav_menu_blocks ) ) {
+ return;
+ }
+
+ // Create a new navigation menu from the classic menu.
+ $wp_insert_post_result = wp_insert_post(
+ array(
+ 'post_content' => $classic_nav_menu_blocks,
+ 'post_title' => $classic_nav_menu->name,
+ 'post_name' => $classic_nav_menu->slug,
+ 'post_status' => 'publish',
+ 'post_type' => 'wp_navigation',
+ ),
+ true // So that we can check whether the result is an error.
+ );
+
+ if ( is_wp_error( $wp_insert_post_result ) ) {
+ return;
+ }
+
+ // Fetch the most recently published navigation which will be the classic one created above.
+ return block_core_navigation_get_most_recently_published_navigation();
+}
+
+/**
+ * Finds the most recently published `wp_navigation` Post.
+ *
+ * @return WP_Post|null the first non-empty Navigation or null.
+ */
+function block_core_navigation_get_most_recently_published_navigation() {
+
+ _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::get_most_recently_published_navigation' );
+
+ // Default to the most recently created menu.
+ $parsed_args = array(
+ 'post_type' => 'wp_navigation',
+ 'no_found_rows' => true,
+ 'update_post_meta_cache' => false,
+ 'update_post_term_cache' => false,
+ 'order' => 'DESC',
+ 'orderby' => 'date',
+ 'post_status' => 'publish',
+ 'posts_per_page' => 1, // get only the most recent.
+ );
+
+ $navigation_post = new WP_Query( $parsed_args );
+ if ( count( $navigation_post->posts ) > 0 ) {
+ return $navigation_post->posts[0];
+ }
+
+ return null;
+}
diff --git a/src/wp-includes/blocks/navigation/block.json b/src/wp-includes/blocks/navigation/block.json
index ee67381620..e45d053536 100644
--- a/src/wp-includes/blocks/navigation/block.json
+++ b/src/wp-includes/blocks/navigation/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/navigation",
"title": "Navigation",
"category": "theme",
@@ -87,7 +87,6 @@
"showSubmenuIcon": "showSubmenuIcon",
"openSubmenusOnClick": "openSubmenusOnClick",
"style": "style",
- "orientation": "orientation",
"maxNestingLevel": "maxNestingLevel"
},
"supports": {
@@ -115,7 +114,7 @@
"blockGap": true
}
},
- "__experimentalLayout": {
+ "layout": {
"allowSwitching": false,
"allowInheriting": false,
"allowVerticalAlignment": false,
diff --git a/src/wp-includes/blocks/navigation/view-modal.asset.php b/src/wp-includes/blocks/navigation/view-modal.asset.php
index 35bf91ef33..94385651cd 100644
--- a/src/wp-includes/blocks/navigation/view-modal.asset.php
+++ b/src/wp-includes/blocks/navigation/view-modal.asset.php
@@ -1 +1 @@
- array(), 'version' => 'd09326a9acd3f6992aae');
+ array(), 'version' => 'a145d0113e969f692877');
diff --git a/src/wp-includes/blocks/navigation/view-modal.min.asset.php b/src/wp-includes/blocks/navigation/view-modal.min.asset.php
index c6b1fdefa2..3bfd6f1641 100644
--- a/src/wp-includes/blocks/navigation/view-modal.min.asset.php
+++ b/src/wp-includes/blocks/navigation/view-modal.min.asset.php
@@ -1 +1 @@
- array(), 'version' => 'f51363b18f0497ec84da');
+ array(), 'version' => '4922697e0a5370a09f02');
diff --git a/src/wp-includes/blocks/navigation/view.asset.php b/src/wp-includes/blocks/navigation/view.asset.php
index 47c4cec85f..728ff5dd4d 100644
--- a/src/wp-includes/blocks/navigation/view.asset.php
+++ b/src/wp-includes/blocks/navigation/view.asset.php
@@ -1 +1 @@
- array(), 'version' => '4ab20ef60d94f9632256');
+ array(), 'version' => 'e0302ba06467706c7421');
diff --git a/src/wp-includes/blocks/navigation/view.min.asset.php b/src/wp-includes/blocks/navigation/view.min.asset.php
index a5cea71cb5..8372aaad5f 100644
--- a/src/wp-includes/blocks/navigation/view.min.asset.php
+++ b/src/wp-includes/blocks/navigation/view.min.asset.php
@@ -1 +1 @@
- array(), 'version' => 'c24330f635f5cb9d5e0e');
+ array(), 'version' => '886680af40b7521d60fc');
diff --git a/src/wp-includes/blocks/nextpage/block.json b/src/wp-includes/blocks/nextpage/block.json
index 6a133264d6..ab88d4a7be 100644
--- a/src/wp-includes/blocks/nextpage/block.json
+++ b/src/wp-includes/blocks/nextpage/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/nextpage",
"title": "Page Break",
"category": "design",
diff --git a/src/wp-includes/blocks/page-list-item.php b/src/wp-includes/blocks/page-list-item.php
new file mode 100644
index 0000000000..2955c795ae
--- /dev/null
+++ b/src/wp-includes/blocks/page-list-item.php
@@ -0,0 +1,14 @@
+post_parent ][ $page->ID ] = array(
'page_id' => $page->ID,
'title' => $page->post_title,
- 'link' => get_permalink( $page->ID ),
+ 'link' => get_permalink( $page ),
'is_active' => $is_active,
);
} else {
$top_level_pages[ $page->ID ] = array(
'page_id' => $page->ID,
'title' => $page->post_title,
- 'link' => get_permalink( $page->ID ),
+ 'link' => get_permalink( $page ),
'is_active' => $is_active,
);
diff --git a/src/wp-includes/blocks/page-list/block.json b/src/wp-includes/blocks/page-list/block.json
index 4f4f45c4bb..7f4f2ce86c 100644
--- a/src/wp-includes/blocks/page-list/block.json
+++ b/src/wp-includes/blocks/page-list/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/page-list",
"title": "Page List",
"category": "widgets",
diff --git a/src/wp-includes/blocks/paragraph/block.json b/src/wp-includes/blocks/paragraph/block.json
index 497a6b2c29..cbabc108ec 100644
--- a/src/wp-includes/blocks/paragraph/block.json
+++ b/src/wp-includes/blocks/paragraph/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/paragraph",
"title": "Paragraph",
"category": "text",
@@ -43,7 +43,11 @@
},
"spacing": {
"margin": true,
- "padding": true
+ "padding": true,
+ "__experimentalDefaultControls": {
+ "margin": false,
+ "padding": false
+ }
},
"typography": {
"fontSize": true,
diff --git a/src/wp-includes/blocks/pattern.php b/src/wp-includes/blocks/pattern.php
index 32a08601ca..a819cb6bd4 100644
--- a/src/wp-includes/blocks/pattern.php
+++ b/src/wp-includes/blocks/pattern.php
@@ -33,6 +33,7 @@ function render_block_core_pattern( $attributes ) {
$slug = $attributes['slug'];
$registry = WP_Block_Patterns_Registry::get_instance();
+
if ( ! $registry->is_registered( $slug ) ) {
return '';
}
diff --git a/src/wp-includes/blocks/pattern/block.json b/src/wp-includes/blocks/pattern/block.json
index da02314240..e9a85a9b2f 100644
--- a/src/wp-includes/blocks/pattern/block.json
+++ b/src/wp-includes/blocks/pattern/block.json
@@ -1,8 +1,8 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/pattern",
- "title": "Pattern",
+ "title": "Pattern placeholder",
"category": "theme",
"description": "Show a block pattern.",
"supports": {
diff --git a/src/wp-includes/blocks/post-author-biography/block.json b/src/wp-includes/blocks/post-author-biography/block.json
index 434b6b0965..6964da1969 100644
--- a/src/wp-includes/blocks/post-author-biography/block.json
+++ b/src/wp-includes/blocks/post-author-biography/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-author-biography",
"title": "Post Author Biography",
"category": "theme",
diff --git a/src/wp-includes/blocks/post-author-name/block.json b/src/wp-includes/blocks/post-author-name/block.json
index 29ad4b0d4d..3acb8c19bf 100644
--- a/src/wp-includes/blocks/post-author-name/block.json
+++ b/src/wp-includes/blocks/post-author-name/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-author-name",
"title": "Post Author Name",
"category": "theme",
diff --git a/src/wp-includes/blocks/post-author.php b/src/wp-includes/blocks/post-author.php
index 7e6a9e6a0b..898d947828 100644
--- a/src/wp-includes/blocks/post-author.php
+++ b/src/wp-includes/blocks/post-author.php
@@ -32,7 +32,7 @@ function render_block_core_post_author( $attributes, $content, $block ) {
$link = get_author_posts_url( $author_id );
$author_name = get_the_author_meta( 'display_name', $author_id );
if ( ! empty( $attributes['isLink'] && ! empty( $attributes['linkTarget'] ) ) ) {
- $author_name = sprintf( '%2s', esc_url( $link ), esc_attr( $attributes['linkTarget'] ), $author_name );
+ $author_name = sprintf( '%3$s', esc_url( $link ), esc_attr( $attributes['linkTarget'] ), $author_name );
}
$byline = ! empty( $attributes['byline'] ) ? $attributes['byline'] : false;
diff --git a/src/wp-includes/blocks/post-author/block.json b/src/wp-includes/blocks/post-author/block.json
index 7d7cd28225..ada3a77803 100644
--- a/src/wp-includes/blocks/post-author/block.json
+++ b/src/wp-includes/blocks/post-author/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-author",
"title": "Post Author",
"category": "theme",
@@ -63,6 +63,5 @@
}
}
},
- "editorStyle": "wp-block-post-author-editor",
"style": "wp-block-post-author"
}
diff --git a/src/wp-includes/blocks/post-comments-form/block.json b/src/wp-includes/blocks/post-comments-form/block.json
index 5ed4122d11..62f92b7581 100644
--- a/src/wp-includes/blocks/post-comments-form/block.json
+++ b/src/wp-includes/blocks/post-comments-form/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-comments-form",
"title": "Post Comments Form",
"category": "theme",
diff --git a/src/wp-includes/blocks/post-content/block.json b/src/wp-includes/blocks/post-content/block.json
index c6041e036d..044ca5768b 100644
--- a/src/wp-includes/blocks/post-content/block.json
+++ b/src/wp-includes/blocks/post-content/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-content",
"title": "Post Content",
"category": "theme",
@@ -10,7 +10,7 @@
"supports": {
"align": [ "wide", "full" ],
"html": false,
- "__experimentalLayout": true,
+ "layout": true,
"dimensions": {
"minHeight": true
},
diff --git a/src/wp-includes/blocks/post-date.php b/src/wp-includes/blocks/post-date.php
index 5c20ee30c2..b59db80b24 100644
--- a/src/wp-includes/blocks/post-date.php
+++ b/src/wp-includes/blocks/post-date.php
@@ -18,25 +18,34 @@ function render_block_core_post_date( $attributes, $content, $block ) {
return '';
}
- $post_ID = $block->context['postId'];
+ $post_ID = $block->context['postId'];
+ $formatted_date = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+ $unformatted_date = esc_attr( get_the_date( 'c', $post_ID ) );
+ $classes = array();
- $classes = array();
if ( isset( $attributes['textAlign'] ) ) {
$classes[] = 'has-text-align-' . $attributes['textAlign'];
}
if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
$classes[] = 'has-link-color';
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
+ /*
+ * If the "Display last modified date" setting is enabled,
+ * only display the modified date if it is later than the publishing date.
+ */
if ( isset( $attributes['displayType'] ) && 'modified' === $attributes['displayType'] ) {
- $formatted_date = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
- $unformatted_date = esc_attr( get_the_modified_date( 'c', $post_ID ) );
- } else {
- $formatted_date = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
- $unformatted_date = esc_attr( get_the_date( 'c', $post_ID ) );
+ if ( get_the_modified_date( 'Ymdhi', $post_ID ) > get_the_date( 'Ymdhi', $post_ID ) ) {
+ $formatted_date = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+ $unformatted_date = esc_attr( get_the_modified_date( 'c', $post_ID ) );
+ $classes[] = 'wp-block-post-date__modified-date';
+ } else {
+ return '';
+ }
}
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
+
if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
$formatted_date = sprintf( '%2s', get_the_permalink( $post_ID ), $formatted_date );
}
diff --git a/src/wp-includes/blocks/post-date/block.json b/src/wp-includes/blocks/post-date/block.json
index b469dbe87d..ed87259c3b 100644
--- a/src/wp-includes/blocks/post-date/block.json
+++ b/src/wp-includes/blocks/post-date/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-date",
"title": "Post Date",
"category": "theme",
diff --git a/src/wp-includes/blocks/post-excerpt.php b/src/wp-includes/blocks/post-excerpt.php
index 1380918fe1..4ed4edab95 100644
--- a/src/wp-includes/blocks/post-excerpt.php
+++ b/src/wp-includes/blocks/post-excerpt.php
@@ -18,14 +18,20 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
return '';
}
- $excerpt = get_the_excerpt();
-
- if ( empty( $excerpt ) ) {
- return '';
+ /*
+ * The purpose of the excerpt length setting is to limit the length of both
+ * automatically generated and user-created excerpts.
+ * Because the excerpt_length filter only applies to auto generated excerpts,
+ * wp_trim_words is used instead.
+ */
+ $excerpt_length = $attributes['excerptLength'];
+ $excerpt = get_the_excerpt( $block->context['postId'] );
+ if ( isset( $excerpt_length ) ) {
+ $excerpt = wp_trim_words( $excerpt, $excerpt_length );
}
$more_text = ! empty( $attributes['moreText'] ) ? '' . wp_kses_post( $attributes['moreText'] ) . '' : '';
- $filter_excerpt_more = function( $more ) use ( $more_text ) {
+ $filter_excerpt_more = static function( $more ) use ( $more_text ) {
return empty( $more_text ) ? $more : '';
};
/**
@@ -70,3 +76,20 @@ function register_block_core_post_excerpt() {
);
}
add_action( 'init', 'register_block_core_post_excerpt' );
+
+/**
+ * If themes or plugins filter the excerpt_length, we need to
+ * override the filter in the editor, otherwise
+ * the excerpt length block setting has no effect.
+ * Returns 100 because 100 is the max length in the setting.
+ */
+if ( is_admin() ||
+ defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+ add_filter(
+ 'excerpt_length',
+ static function() {
+ return 100;
+ },
+ PHP_INT_MAX
+ );
+}
diff --git a/src/wp-includes/blocks/post-excerpt/block.json b/src/wp-includes/blocks/post-excerpt/block.json
index 03107ff900..33b7818ebe 100644
--- a/src/wp-includes/blocks/post-excerpt/block.json
+++ b/src/wp-includes/blocks/post-excerpt/block.json
@@ -1,10 +1,10 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-excerpt",
- "title": "Post Excerpt",
+ "title": "Excerpt",
"category": "theme",
- "description": "Display a post's excerpt.",
+ "description": "Display the excerpt.",
"textdomain": "default",
"attributes": {
"textAlign": {
@@ -16,6 +16,10 @@
"showMoreOnNewLine": {
"type": "boolean",
"default": true
+ },
+ "excerptLength": {
+ "type": "number",
+ "default": 55
}
},
"usesContext": [ "postId", "postType", "queryId" ],
diff --git a/src/wp-includes/blocks/post-featured-image.php b/src/wp-includes/blocks/post-featured-image.php
index 8da66accd3..6cb4110ee0 100644
--- a/src/wp-includes/blocks/post-featured-image.php
+++ b/src/wp-includes/blocks/post-featured-image.php
@@ -42,11 +42,20 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
}
}
- if ( ! empty( $attributes['height'] ) ) {
- $extra_styles = "height:{$attributes['height']};";
- if ( ! empty( $attributes['scale'] ) ) {
- $extra_styles .= "object-fit:{$attributes['scale']};";
- }
+ $extra_styles = '';
+
+ // Aspect ratio with a height set needs to override the default width/height.
+ if ( ! empty( $attributes['aspectRatio'] ) ) {
+ $extra_styles .= 'width:100%;height:100%;';
+ } elseif ( ! empty( $attributes['height'] ) ) {
+ $extra_styles .= "height:{$attributes['height']};";
+ }
+
+ if ( ! empty( $attributes['scale'] ) ) {
+ $extra_styles .= "object-fit:{$attributes['scale']};";
+ }
+
+ if ( ! empty( $extra_styles ) ) {
$attr['style'] = empty( $attr['style'] ) ? $extra_styles : $attr['style'] . $extra_styles;
}
@@ -71,12 +80,19 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
$featured_image = $featured_image . $overlay_markup;
}
- $width = ! empty( $attributes['width'] ) ? esc_attr( safecss_filter_attr( 'width:' . $attributes['width'] ) ) . ';' : '';
- $height = ! empty( $attributes['height'] ) ? esc_attr( safecss_filter_attr( 'height:' . $attributes['height'] ) ) . ';' : '';
- if ( ! $height && ! $width ) {
+ $aspect_ratio = ! empty( $attributes['aspectRatio'] )
+ ? esc_attr( safecss_filter_attr( 'aspect-ratio:' . $attributes['aspectRatio'] ) ) . ';'
+ : '';
+ $width = ! empty( $attributes['width'] )
+ ? esc_attr( safecss_filter_attr( 'width:' . $attributes['width'] ) ) . ';'
+ : '';
+ $height = ! empty( $attributes['height'] )
+ ? esc_attr( safecss_filter_attr( 'height:' . $attributes['height'] ) ) . ';'
+ : '';
+ if ( ! $height && ! $width && ! $aspect_ratio ) {
$wrapper_attributes = get_block_wrapper_attributes();
} else {
- $wrapper_attributes = get_block_wrapper_attributes( array( 'style' => $width . $height ) );
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'style' => $aspect_ratio . $width . $height ) );
}
return "{$featured_image} ";
}
diff --git a/src/wp-includes/blocks/post-featured-image/block.json b/src/wp-includes/blocks/post-featured-image/block.json
index 40f51cffa0..aa6428cad0 100644
--- a/src/wp-includes/blocks/post-featured-image/block.json
+++ b/src/wp-includes/blocks/post-featured-image/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-featured-image",
"title": "Post Featured Image",
"category": "theme",
@@ -11,6 +11,9 @@
"type": "boolean",
"default": false
},
+ "aspectRatio": {
+ "type": "string"
+ },
"width": {
"type": "string"
},
diff --git a/src/wp-includes/blocks/post-navigation-link/block.json b/src/wp-includes/blocks/post-navigation-link/block.json
index 7b8d87fe26..4e7df560c6 100644
--- a/src/wp-includes/blocks/post-navigation-link/block.json
+++ b/src/wp-includes/blocks/post-navigation-link/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-navigation-link",
"title": "Post Navigation Link",
"category": "theme",
diff --git a/src/wp-includes/blocks/post-template.php b/src/wp-includes/blocks/post-template.php
index 3a3c207cf9..3c023c80ed 100644
--- a/src/wp-includes/blocks/post-template.php
+++ b/src/wp-includes/blocks/post-template.php
@@ -72,6 +72,11 @@ function render_block_core_post_template( $attributes, $content, $block ) {
$classnames .= ' has-link-color';
}
+ // Ensure backwards compatibility by flagging the number of columns via classname when using grid layout.
+ if ( isset( $attributes['layout']['type'] ) && 'grid' === $attributes['layout']['type'] && ! empty( $attributes['layout']['columnCount'] ) ) {
+ $classnames .= ' ' . sanitize_title( 'columns-' . $attributes['layout']['columnCount'] );
+ }
+
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classnames ) ) );
$content = '';
@@ -85,17 +90,18 @@ function render_block_core_post_template( $attributes, $content, $block ) {
// This ensures that for the inner instances of the Post Template block, we do not render any block supports.
$block_instance['blockName'] = 'core/null';
+ $post_id = get_the_ID();
+ $post_type = get_post_type();
+ $filter_block_context = static function( $context ) use ( $post_id, $post_type ) {
+ $context['postType'] = $post_type;
+ $context['postId'] = $post_id;
+ return $context;
+ };
+ add_filter( 'render_block_context', $filter_block_context );
// Render the inner blocks of the Post Template block with `dynamic` set to `false` to prevent calling
// `render_callback` and ensure that no wrapper markup is included.
- $block_content = (
- new WP_Block(
- $block_instance,
- array(
- 'postType' => get_post_type(),
- 'postId' => get_the_ID(),
- )
- )
- )->render( array( 'dynamic' => false ) );
+ $block_content = ( new WP_Block( $block_instance ) )->render( array( 'dynamic' => false ) );
+ remove_filter( 'render_block_context', $filter_block_context );
// Wrap the render inner blocks in a `li` element with the appropriate post classes.
$post_classes = implode( ' ', get_post_class( 'wp-block-post' ) );
diff --git a/src/wp-includes/blocks/post-template/block.json b/src/wp-includes/blocks/post-template/block.json
index bc9910b47d..1f0d4677e6 100644
--- a/src/wp-includes/blocks/post-template/block.json
+++ b/src/wp-includes/blocks/post-template/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-template",
"title": "Post Template",
"category": "theme",
@@ -18,10 +18,8 @@
"supports": {
"reusable": false,
"html": false,
- "align": true,
- "__experimentalLayout": {
- "allowEditing": false
- },
+ "align": [ "wide", "full" ],
+ "layout": true,
"color": {
"gradients": true,
"link": true,
@@ -42,6 +40,14 @@
"__experimentalDefaultControls": {
"fontSize": true
}
+ },
+ "spacing": {
+ "blockGap": {
+ "__experimentalDefault": "1.25em"
+ },
+ "__experimentalDefaultControls": {
+ "blockGap": true
+ }
}
},
"style": "wp-block-post-template",
diff --git a/src/wp-includes/blocks/post-terms.php b/src/wp-includes/blocks/post-terms.php
index 5511dd2f8e..96951a9e15 100644
--- a/src/wp-includes/blocks/post-terms.php
+++ b/src/wp-includes/blocks/post-terms.php
@@ -64,8 +64,8 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
function register_block_core_post_terms() {
$taxonomies = get_taxonomies(
array(
- 'public' => true,
- 'show_in_rest' => true,
+ 'publicly_queryable' => true,
+ 'show_in_rest' => true,
),
'objects'
);
@@ -87,6 +87,7 @@ function register_block_core_post_terms() {
'term' => $taxonomy->name,
),
'isActive' => array( 'term' ),
+ 'scope' => array( 'inserter', 'transform' ),
);
// Set the category variation as the default one.
if ( 'category' === $taxonomy->name ) {
diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json
index e14f96170c..0da7fb02f8 100644
--- a/src/wp-includes/blocks/post-terms/block.json
+++ b/src/wp-includes/blocks/post-terms/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-terms",
"title": "Post Terms",
"category": "theme",
diff --git a/src/wp-includes/blocks/post-title.php b/src/wp-includes/blocks/post-title.php
index 1f03b12fc2..e1d4b255c5 100644
--- a/src/wp-includes/blocks/post-title.php
+++ b/src/wp-includes/blocks/post-title.php
@@ -19,8 +19,8 @@ function render_block_core_post_title( $attributes, $content, $block ) {
return '';
}
- $post_ID = $block->context['postId'];
- $title = get_the_title();
+ $post = get_post( $block->context['postId'] );
+ $title = get_the_title( $post );
if ( ! $title ) {
return '';
@@ -28,12 +28,12 @@ function render_block_core_post_title( $attributes, $content, $block ) {
$tag_name = 'h2';
if ( isset( $attributes['level'] ) ) {
- $tag_name = 0 === $attributes['level'] ? 'p' : 'h' . $attributes['level'];
+ $tag_name = 'h' . $attributes['level'];
}
if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
$rel = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
- $title = sprintf( '%4$s', get_the_permalink( $post_ID ), esc_attr( $attributes['linkTarget'] ), $rel, $title );
+ $title = sprintf( '%4$s', get_the_permalink( $post ), esc_attr( $attributes['linkTarget'] ), $rel, $title );
}
$classes = array();
diff --git a/src/wp-includes/blocks/post-title/block.json b/src/wp-includes/blocks/post-title/block.json
index 015896ff1b..eda5332f24 100644
--- a/src/wp-includes/blocks/post-title/block.json
+++ b/src/wp-includes/blocks/post-title/block.json
@@ -1,8 +1,8 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/post-title",
- "title": "Post Title",
+ "title": "Title",
"category": "theme",
"description": "Displays the title of a post, page, or any other content-type.",
"textdomain": "default",
diff --git a/src/wp-includes/blocks/preformatted/block.json b/src/wp-includes/blocks/preformatted/block.json
index bab40b94a7..f781cb1125 100644
--- a/src/wp-includes/blocks/preformatted/block.json
+++ b/src/wp-includes/blocks/preformatted/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/preformatted",
"title": "Preformatted",
"category": "text",
diff --git a/src/wp-includes/blocks/pullquote/block.json b/src/wp-includes/blocks/pullquote/block.json
index 0732bb52f6..54c4175d31 100644
--- a/src/wp-includes/blocks/pullquote/block.json
+++ b/src/wp-includes/blocks/pullquote/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/pullquote",
"title": "Pullquote",
"category": "text",
diff --git a/src/wp-includes/blocks/query-no-results/block.json b/src/wp-includes/blocks/query-no-results/block.json
index f042223f36..32088752bb 100644
--- a/src/wp-includes/blocks/query-no-results/block.json
+++ b/src/wp-includes/blocks/query-no-results/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/query-no-results",
"title": "No results",
"category": "theme",
diff --git a/src/wp-includes/blocks/query-pagination-next.php b/src/wp-includes/blocks/query-pagination-next.php
index e92b58938d..f0ded727ee 100644
--- a/src/wp-includes/blocks/query-pagination-next.php
+++ b/src/wp-includes/blocks/query-pagination-next.php
@@ -20,10 +20,15 @@ function render_block_core_query_pagination_next( $attributes, $content, $block
$max_page = isset( $block->context['query']['pages'] ) ? (int) $block->context['query']['pages'] : 0;
$wrapper_attributes = get_block_wrapper_attributes();
+ $show_label = isset( $block->context['showLabel'] ) ? (bool) $block->context['showLabel'] : true;
$default_label = __( 'Next Page' );
- $label = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+ $label_text = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+ $label = $show_label ? $label_text : '';
$pagination_arrow = get_query_pagination_arrow( $block, true );
+ if ( ! $label ) {
+ $wrapper_attributes .= ' aria-label="' . $label_text . '"';
+ }
if ( $pagination_arrow ) {
$label .= $pagination_arrow;
}
@@ -31,7 +36,7 @@ function render_block_core_query_pagination_next( $attributes, $content, $block
// Check if the pagination is for Query that inherits the global context.
if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
- $filter_link_attributes = function() use ( $wrapper_attributes ) {
+ $filter_link_attributes = static function() use ( $wrapper_attributes ) {
return $wrapper_attributes;
};
add_filter( 'next_posts_link_attributes', $filter_link_attributes );
diff --git a/src/wp-includes/blocks/query-pagination-next/block.json b/src/wp-includes/blocks/query-pagination-next/block.json
index ad87d05b5e..60d44d7ca1 100644
--- a/src/wp-includes/blocks/query-pagination-next/block.json
+++ b/src/wp-includes/blocks/query-pagination-next/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/query-pagination-next",
"title": "Next Page",
"category": "theme",
@@ -12,7 +12,7 @@
"type": "string"
}
},
- "usesContext": [ "queryId", "query", "paginationArrow" ],
+ "usesContext": [ "queryId", "query", "paginationArrow", "showLabel" ],
"supports": {
"reusable": false,
"html": false,
diff --git a/src/wp-includes/blocks/query-pagination-numbers/block.json b/src/wp-includes/blocks/query-pagination-numbers/block.json
index fd28596581..f00b2993a7 100644
--- a/src/wp-includes/blocks/query-pagination-numbers/block.json
+++ b/src/wp-includes/blocks/query-pagination-numbers/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/query-pagination-numbers",
"title": "Page Numbers",
"category": "theme",
@@ -32,5 +32,5 @@
}
}
},
- "editorStyle": "query-pagination-numbers-editor"
+ "editorStyle": "wp-block-query-pagination-numbers-editor"
}
diff --git a/src/wp-includes/blocks/query-pagination-previous.php b/src/wp-includes/blocks/query-pagination-previous.php
index 9bb9f0d1f2..5665506598 100644
--- a/src/wp-includes/blocks/query-pagination-previous.php
+++ b/src/wp-includes/blocks/query-pagination-previous.php
@@ -19,9 +19,14 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl
$page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
$wrapper_attributes = get_block_wrapper_attributes();
+ $show_label = isset( $block->context['showLabel'] ) ? (bool) $block->context['showLabel'] : true;
$default_label = __( 'Previous Page' );
- $label = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+ $label_text = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+ $label = $show_label ? $label_text : '';
$pagination_arrow = get_query_pagination_arrow( $block, false );
+ if ( ! $label ) {
+ $wrapper_attributes .= ' aria-label="' . $label_text . '"';
+ }
if ( $pagination_arrow ) {
$label = $pagination_arrow . $label;
}
@@ -29,7 +34,7 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl
// Check if the pagination is for Query that inherits the global context
// and handle appropriately.
if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
- $filter_link_attributes = function() use ( $wrapper_attributes ) {
+ $filter_link_attributes = static function() use ( $wrapper_attributes ) {
return $wrapper_attributes;
};
diff --git a/src/wp-includes/blocks/query-pagination-previous/block.json b/src/wp-includes/blocks/query-pagination-previous/block.json
index 484cefe6bb..d13442f831 100644
--- a/src/wp-includes/blocks/query-pagination-previous/block.json
+++ b/src/wp-includes/blocks/query-pagination-previous/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/query-pagination-previous",
"title": "Previous Page",
"category": "theme",
@@ -12,7 +12,7 @@
"type": "string"
}
},
- "usesContext": [ "queryId", "query", "paginationArrow" ],
+ "usesContext": [ "queryId", "query", "paginationArrow", "showLabel" ],
"supports": {
"reusable": false,
"html": false,
diff --git a/src/wp-includes/blocks/query-pagination/block.json b/src/wp-includes/blocks/query-pagination/block.json
index f75f4077d4..e32a9ba9b4 100644
--- a/src/wp-includes/blocks/query-pagination/block.json
+++ b/src/wp-includes/blocks/query-pagination/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/query-pagination",
"title": "Pagination",
"category": "theme",
@@ -11,11 +11,16 @@
"paginationArrow": {
"type": "string",
"default": "none"
+ },
+ "showLabel": {
+ "type": "boolean",
+ "default": true
}
},
"usesContext": [ "queryId", "query" ],
"providesContext": {
- "paginationArrow": "paginationArrow"
+ "paginationArrow": "paginationArrow",
+ "showLabel": "showLabel"
},
"supports": {
"align": true,
@@ -30,7 +35,7 @@
"link": true
}
},
- "__experimentalLayout": {
+ "layout": {
"allowSwitching": false,
"allowInheriting": false,
"default": {
diff --git a/src/wp-includes/blocks/query-title.php b/src/wp-includes/blocks/query-title.php
index d781de3826..29793e5227 100644
--- a/src/wp-includes/blocks/query-title.php
+++ b/src/wp-includes/blocks/query-title.php
@@ -28,12 +28,9 @@ function render_block_core_query_title( $attributes ) {
if ( $is_archive ) {
$show_prefix = isset( $attributes['showPrefix'] ) ? $attributes['showPrefix'] : true;
if ( ! $show_prefix ) {
- $filter_title = function( $title, $original_title ) {
- return $original_title;
- };
- add_filter( 'get_the_archive_title', $filter_title, 10, 2 );
+ add_filter( 'get_the_archive_title_prefix', '__return_empty_string', 1 );
$title = get_the_archive_title();
- remove_filter( 'get_the_archive_title', $filter_title, 10, 2 );
+ remove_filter( 'get_the_archive_title_prefix', '__return_empty_string', 1 );
} else {
$title = get_the_archive_title();
}
diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json
index 33df75866b..2db349e55d 100644
--- a/src/wp-includes/blocks/query-title/block.json
+++ b/src/wp-includes/blocks/query-title/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/query-title",
"title": "Query Title",
"category": "theme",
diff --git a/src/wp-includes/blocks/query/block.json b/src/wp-includes/blocks/query/block.json
index 1974761962..e4b78b585b 100644
--- a/src/wp-includes/blocks/query/block.json
+++ b/src/wp-includes/blocks/query/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/query",
"title": "Query Loop",
"category": "theme",
@@ -32,12 +32,6 @@
"type": "string",
"default": "div"
},
- "displayLayout": {
- "type": "object",
- "default": {
- "type": "list"
- }
- },
"namespace": {
"type": "string"
}
@@ -50,7 +44,7 @@
"supports": {
"align": [ "wide", "full" ],
"html": false,
- "__experimentalLayout": true
+ "layout": true
},
"editorStyle": "wp-block-query-editor"
}
diff --git a/src/wp-includes/blocks/quote/block.json b/src/wp-includes/blocks/quote/block.json
index adb9fddca7..49ee925794 100644
--- a/src/wp-includes/blocks/quote/block.json
+++ b/src/wp-includes/blocks/quote/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/quote",
"title": "Quote",
"category": "text",
@@ -29,6 +29,7 @@
},
"supports": {
"anchor": true,
+ "html": false,
"__experimentalOnEnter": true,
"typography": {
"fontSize": true,
diff --git a/src/wp-includes/blocks/read-more/block.json b/src/wp-includes/blocks/read-more/block.json
index 61b0452c7c..d3386a49d6 100644
--- a/src/wp-includes/blocks/read-more/block.json
+++ b/src/wp-includes/blocks/read-more/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/read-more",
"title": "Read More",
"category": "theme",
diff --git a/src/wp-includes/blocks/require-dynamic-blocks.php b/src/wp-includes/blocks/require-dynamic-blocks.php
index 1f9bf0a16c..229a0311b8 100644
--- a/src/wp-includes/blocks/require-dynamic-blocks.php
+++ b/src/wp-includes/blocks/require-dynamic-blocks.php
@@ -21,6 +21,7 @@ require_once ABSPATH . WPINC . '/blocks/comments-pagination-previous.php';
require_once ABSPATH . WPINC . '/blocks/comments-title.php';
require_once ABSPATH . WPINC . '/blocks/cover.php';
require_once ABSPATH . WPINC . '/blocks/file.php';
+require_once ABSPATH . WPINC . '/blocks/footnotes.php';
require_once ABSPATH . WPINC . '/blocks/gallery.php';
require_once ABSPATH . WPINC . '/blocks/heading.php';
require_once ABSPATH . WPINC . '/blocks/home-link.php';
@@ -32,6 +33,7 @@ require_once ABSPATH . WPINC . '/blocks/navigation.php';
require_once ABSPATH . WPINC . '/blocks/navigation-link.php';
require_once ABSPATH . WPINC . '/blocks/navigation-submenu.php';
require_once ABSPATH . WPINC . '/blocks/page-list.php';
+require_once ABSPATH . WPINC . '/blocks/page-list-item.php';
require_once ABSPATH . WPINC . '/blocks/pattern.php';
require_once ABSPATH . WPINC . '/blocks/post-author.php';
require_once ABSPATH . WPINC . '/blocks/post-author-biography.php';
diff --git a/src/wp-includes/blocks/require-static-blocks.php b/src/wp-includes/blocks/require-static-blocks.php
index 44009bef5f..69f6d68410 100644
--- a/src/wp-includes/blocks/require-static-blocks.php
+++ b/src/wp-includes/blocks/require-static-blocks.php
@@ -9,6 +9,7 @@ return array(
'code',
'column',
'columns',
+ 'details',
'embed',
'freeform',
'group',
@@ -19,7 +20,6 @@ return array(
'missing',
'more',
'nextpage',
- 'page-list-item',
'paragraph',
'preformatted',
'pullquote',
diff --git a/src/wp-includes/blocks/rss/block.json b/src/wp-includes/blocks/rss/block.json
index 8a351d877a..2535eda594 100644
--- a/src/wp-includes/blocks/rss/block.json
+++ b/src/wp-includes/blocks/rss/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/rss",
"title": "RSS",
"category": "widgets",
diff --git a/src/wp-includes/blocks/search.php b/src/wp-includes/blocks/search.php
index c7461a8679..ce76587dbb 100644
--- a/src/wp-includes/blocks/search.php
+++ b/src/wp-includes/blocks/search.php
@@ -29,11 +29,11 @@ function render_block_core_search( $attributes ) {
$classnames = classnames_for_block_core_search( $attributes );
$show_label = ( ! empty( $attributes['showLabel'] ) ) ? true : false;
$use_icon_button = ( ! empty( $attributes['buttonUseIcon'] ) ) ? true : false;
- $show_input = ( ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'] ) ? false : true;
$show_button = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true;
+ $button_position = $show_button ? $attributes['buttonPosition'] : null;
$query_params = ( ! empty( $attributes['query'] ) ) ? $attributes['query'] : array();
- $input_markup = '';
- $button_markup = '';
+ $button_behavior = ( ! empty( $attributes['buttonBehavior'] ) ) ? $attributes['buttonBehavior'] : 'default';
+ $button = '';
$query_params_markup = '';
$inline_styles = styles_for_block_core_search( $attributes );
$color_classes = get_color_classes_for_block_core_search( $attributes );
@@ -44,42 +44,37 @@ function render_block_core_search( $attributes ) {
$border_color_classes = get_border_color_classes_for_block_core_search( $attributes );
$label_inner_html = empty( $attributes['label'] ) ? __( 'Search' ) : wp_kses_post( $attributes['label'] );
-
- $label_markup = sprintf(
- '',
- esc_attr( $input_id ),
- $label_inner_html
- );
- if ( $show_label && ! empty( $attributes['label'] ) ) {
- $label_classes = array( 'wp-block-search__label' );
- if ( ! empty( $typography_classes ) ) {
- $label_classes[] = $typography_classes;
+ $label = new WP_HTML_Tag_Processor( sprintf( '', $inline_styles['label'], $label_inner_html ) );
+ if ( $label->next_tag() ) {
+ $label->set_attribute( 'for', $input_id );
+ $label->add_class( 'wp-block-search__label' );
+ if ( $show_label && ! empty( $attributes['label'] ) ) {
+ if ( ! empty( $typography_classes ) ) {
+ $label->add_class( $typography_classes );
+ }
+ } else {
+ $label->add_class( 'screen-reader-text' );
}
- $label_markup = sprintf(
- '',
- esc_attr( $input_id ),
- esc_attr( implode( ' ', $label_classes ) ),
- $inline_styles['label'],
- $label_inner_html
- );
}
- if ( $show_input ) {
- $input_classes = array( 'wp-block-search__input' );
- if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
- $input_classes[] = $border_color_classes;
+ $input = new WP_HTML_Tag_Processor( sprintf( '', $inline_styles['input'] ) );
+ $input_classes = array( 'wp-block-search__input' );
+ if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
+ $input_classes[] = $border_color_classes;
+ }
+ if ( ! empty( $typography_classes ) ) {
+ $input_classes[] = $typography_classes;
+ }
+ if ( $input->next_tag() ) {
+ $input->add_class( implode( ' ', $input_classes ) );
+ $input->set_attribute( 'id', $input_id );
+ $input->set_attribute( 'value', get_search_query() );
+ $input->set_attribute( 'placeholder', $attributes['placeholder'] );
+ if ( 'button-only' === $button_position && 'expand-searchfield' === $button_behavior ) {
+ $input->set_attribute( 'aria-hidden', 'true' );
+ $input->set_attribute( 'tabindex', '-1' );
+ wp_enqueue_script( 'wp-block--search-view', plugins_url( 'search/view.min.js', __FILE__ ) );
}
- if ( ! empty( $typography_classes ) ) {
- $input_classes[] = $typography_classes;
- }
- $input_markup = sprintf(
- '',
- $input_id,
- esc_attr( implode( ' ', $input_classes ) ),
- get_search_query(),
- esc_attr( $attributes['placeholder'] ),
- $inline_styles['input']
- );
}
if ( count( $query_params ) > 0 ) {
@@ -101,7 +96,6 @@ function render_block_core_search( $attributes ) {
if ( ! empty( $typography_classes ) ) {
$button_classes[] = $typography_classes;
}
- $aria_label = '';
if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
$button_classes[] = $border_color_classes;
@@ -111,24 +105,27 @@ function render_block_core_search( $attributes ) {
$button_internal_markup = wp_kses_post( $attributes['buttonText'] );
}
} else {
- $aria_label = sprintf( 'aria-label="%s"', esc_attr( wp_strip_all_tags( $attributes['buttonText'] ) ) );
- $button_classes[] = 'has-icon';
-
+ $button_classes[] = 'has-icon';
$button_internal_markup =
'';
}
// Include the button element class.
$button_classes[] = wp_theme_get_element_class_name( 'button' );
- $button_markup = sprintf(
- '',
- esc_attr( implode( ' ', $button_classes ) ),
- $inline_styles['button'],
- $aria_label,
- $button_internal_markup
- );
+ $button = new WP_HTML_Tag_Processor( sprintf( '', $inline_styles['button'], $button_internal_markup ) );
+
+ if ( $button->next_tag() ) {
+ $button->add_class( implode( ' ', $button_classes ) );
+ if ( 'expand-searchfield' === $attributes['buttonBehavior'] && 'button-only' === $attributes['buttonPosition'] ) {
+ $button->set_attribute( 'aria-label', __( 'Expand search field' ) );
+ $button->set_attribute( 'aria-controls', 'wp-block-search__input-' . $input_id );
+ $button->set_attribute( 'aria-expanded', 'false' );
+ } else {
+ $button->set_attribute( 'aria-label', wp_strip_all_tags( $attributes['buttonText'] ) );
+ }
+ }
}
$field_markup_classes = $is_button_inside ? $border_color_classes : '';
@@ -136,7 +133,7 @@ function render_block_core_search( $attributes ) {
'
%s
',
esc_attr( $field_markup_classes ),
$inline_styles['wrapper'],
- $input_markup . $query_params_markup . $button_markup
+ $input . $query_params_markup . $button
);
$wrapper_attributes = get_block_wrapper_attributes(
array( 'class' => $classnames )
@@ -146,7 +143,7 @@ function render_block_core_search( $attributes ) {
'',
esc_url( home_url( '/' ) ),
$wrapper_attributes,
- $label_markup . $field_markup
+ $label . $field_markup
);
}
@@ -188,6 +185,9 @@ function classnames_for_block_core_search( $attributes ) {
if ( 'button-only' === $attributes['buttonPosition'] ) {
$classnames[] = 'wp-block-search__button-only';
+ if ( ! empty( $attributes['buttonBehavior'] ) && 'expand-searchfield' === $attributes['buttonBehavior'] ) {
+ $classnames[] = 'wp-block-search__button-behavior-expand wp-block-search__searchfield-hidden';
+ }
}
}
@@ -294,10 +294,9 @@ function styles_for_block_core_search( $attributes ) {
$show_label = ( isset( $attributes['showLabel'] ) ) && false !== $attributes['showLabel'];
// Add width styles.
- $has_width = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] );
- $button_only = ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'];
+ $has_width = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] );
- if ( $has_width && ! $button_only ) {
+ if ( $has_width ) {
$wrapper_styles[] = sprintf(
'width: %d%s;',
esc_attr( $attributes['width'] ),
diff --git a/src/wp-includes/blocks/search/block.json b/src/wp-includes/blocks/search/block.json
index fbd0fa874c..1a23590699 100644
--- a/src/wp-includes/blocks/search/block.json
+++ b/src/wp-includes/blocks/search/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/search",
"title": "Search",
"category": "widgets",
@@ -42,6 +42,14 @@
"query": {
"type": "object",
"default": {}
+ },
+ "buttonBehavior": {
+ "type": "string",
+ "default": "expand-searchfield"
+ },
+ "isSearchFieldHidden": {
+ "type": "boolean",
+ "default": false
}
},
"supports": {
diff --git a/src/wp-includes/blocks/separator/block.json b/src/wp-includes/blocks/separator/block.json
index bee358d208..970f6b5cbb 100644
--- a/src/wp-includes/blocks/separator/block.json
+++ b/src/wp-includes/blocks/separator/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/separator",
"title": "Separator",
"category": "design",
diff --git a/src/wp-includes/blocks/shortcode/block.json b/src/wp-includes/blocks/shortcode/block.json
index 5b36d141dd..22d838a719 100644
--- a/src/wp-includes/blocks/shortcode/block.json
+++ b/src/wp-includes/blocks/shortcode/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/shortcode",
"title": "Shortcode",
"category": "widgets",
@@ -9,7 +9,7 @@
"attributes": {
"text": {
"type": "string",
- "source": "html"
+ "source": "raw"
}
},
"supports": {
diff --git a/src/wp-includes/blocks/site-logo.php b/src/wp-includes/blocks/site-logo.php
index 35e199d59d..f1819fcaac 100644
--- a/src/wp-includes/blocks/site-logo.php
+++ b/src/wp-includes/blocks/site-logo.php
@@ -13,7 +13,7 @@
* @return string The render.
*/
function render_block_core_site_logo( $attributes ) {
- $adjust_width_height_filter = function ( $image ) use ( $attributes ) {
+ $adjust_width_height_filter = static function ( $image ) use ( $attributes ) {
if ( empty( $attributes['width'] ) || empty( $image ) || ! $image[1] || ! $image[2] ) {
return $image;
}
@@ -39,8 +39,13 @@ function render_block_core_site_logo( $attributes ) {
if ( $attributes['isLink'] && '_blank' === $attributes['linkTarget'] ) {
// Add the link target after the rel="home".
// Add an aria-label for informing that the page opens in a new tab.
- $aria_label = 'aria-label="' . esc_attr__( '(Home link, opens in a new tab)' ) . '"';
- $custom_logo = str_replace( 'rel="home"', 'rel="home" target="' . esc_attr( $attributes['linkTarget'] ) . '"' . $aria_label, $custom_logo );
+ $processor = new WP_HTML_Tag_Processor( $custom_logo );
+ $processor->next_tag( 'a' );
+ if ( 'home' === $processor->get_attribute( 'rel' ) ) {
+ $processor->set_attribute( 'aria-label', __( '(Home link, opens in a new tab)' ) );
+ $processor->set_attribute( 'target', $attributes['linkTarget'] );
+ }
+ $custom_logo = $processor->get_updated_html();
}
$classnames = array();
diff --git a/src/wp-includes/blocks/site-logo/block.json b/src/wp-includes/blocks/site-logo/block.json
index f7efcb7215..747f1ab94a 100644
--- a/src/wp-includes/blocks/site-logo/block.json
+++ b/src/wp-includes/blocks/site-logo/block.json
@@ -1,10 +1,10 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/site-logo",
"title": "Site Logo",
"category": "theme",
- "description": "Display a graphic to represent this site. Update the block, and the changes apply everywhere it’s used. This is different than the site icon, which is the smaller image visible in your dashboard, browser tabs, etc used to help others recognize this site.",
+ "description": "Display an image to represent this site. Update this block and the changes apply everywhere.",
"textdomain": "default",
"attributes": {
"width": {
diff --git a/src/wp-includes/blocks/site-tagline/block.json b/src/wp-includes/blocks/site-tagline/block.json
index 230bdd5fef..7382c084ee 100644
--- a/src/wp-includes/blocks/site-tagline/block.json
+++ b/src/wp-includes/blocks/site-tagline/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/site-tagline",
"title": "Site Tagline",
"category": "theme",
diff --git a/src/wp-includes/blocks/site-title/block.json b/src/wp-includes/blocks/site-title/block.json
index aeac5ee574..2c37258acb 100644
--- a/src/wp-includes/blocks/site-title/block.json
+++ b/src/wp-includes/blocks/site-title/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/site-title",
"title": "Site Title",
"category": "theme",
diff --git a/src/wp-includes/blocks/social-link.php b/src/wp-includes/blocks/social-link.php
index 7e669bf56d..51ed9374c9 100644
--- a/src/wp-includes/blocks/social-link.php
+++ b/src/wp-includes/blocks/social-link.php
@@ -47,7 +47,7 @@ function render_block_core_social_link( $attributes, $content, $block ) {
$icon = block_core_social_link_get_icon( $service );
$wrapper_attributes = get_block_wrapper_attributes(
array(
- 'class' => 'wp-social-link wp-social-link-' . $service,
+ 'class' => 'wp-social-link wp-social-link-' . $service . block_core_social_link_get_color_classes( $block->context ),
'style' => block_core_social_link_get_color_styles( $block->context ),
)
);
@@ -59,15 +59,15 @@ function render_block_core_social_link( $attributes, $content, $block ) {
$link .= esc_html( $label );
$link .= '';
- $w = new WP_HTML_Tag_Processor( $link );
- $w->next_tag( 'a' );
+ $processor = new WP_HTML_Tag_Processor( $link );
+ $processor->next_tag( 'a' );
if ( $open_in_new_tab ) {
- $w->set_attribute( 'rel', esc_attr( $rel ) . ' noopener nofollow' );
- $w->set_attribute( 'target', '_blank' );
+ $processor->set_attribute( 'rel', esc_attr( $rel ) . ' noopener nofollow' );
+ $processor->set_attribute( 'target', '_blank' );
} elseif ( '' !== $rel ) {
- $w->set_attribute( 'rel', esc_attr( $rel ) );
+ $processor->set_attribute( 'rel', esc_attr( $rel ) );
}
- return $w;
+ return $processor->get_updated_html();
}
/**
@@ -144,7 +144,7 @@ function block_core_social_link_services( $service = '', $field = '' ) {
),
'chain' => array(
'name' => 'Link',
- 'icon' => '',
+ 'icon' => '',
),
'codepen' => array(
'name' => 'CodePen',
@@ -208,7 +208,7 @@ function block_core_social_link_services( $service = '', $field = '' ) {
),
'mail' => array(
'name' => 'Mail',
- 'icon' => '',
+ 'icon' => '',
),
'mastodon' => array(
'name' => 'Mastodon',
@@ -337,3 +337,24 @@ function block_core_social_link_get_color_styles( $context ) {
return implode( '', $styles );
}
+
+/**
+ * Returns CSS classes for icon and icon background colors.
+ *
+ * @param array $context Block context passed to Social Sharing Link.
+ *
+ * @return string CSS classes for link's icon and background colors.
+ */
+function block_core_social_link_get_color_classes( $context ) {
+ $classes = array();
+
+ if ( array_key_exists( 'iconColor', $context ) ) {
+ $classes[] = 'has-' . $context['iconColor'] . '-color';
+ }
+
+ if ( array_key_exists( 'iconBackgroundColor', $context ) ) {
+ $classes[] = 'has-' . $context['iconBackgroundColor'] . '-background-color';
+ }
+
+ return ' ' . implode( ' ', $classes );
+}
diff --git a/src/wp-includes/blocks/social-link/block.json b/src/wp-includes/blocks/social-link/block.json
index 5f64b7dcf7..50e95efedb 100644
--- a/src/wp-includes/blocks/social-link/block.json
+++ b/src/wp-includes/blocks/social-link/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/social-link",
"title": "Social Icon",
"category": "widgets",
@@ -24,7 +24,9 @@
"usesContext": [
"openInNewTab",
"showLabels",
+ "iconColor",
"iconColorValue",
+ "iconBackgroundColor",
"iconBackgroundColorValue"
],
"supports": {
diff --git a/src/wp-includes/blocks/social-links/block.json b/src/wp-includes/blocks/social-links/block.json
index a7707cf195..064b077b5e 100644
--- a/src/wp-includes/blocks/social-links/block.json
+++ b/src/wp-includes/blocks/social-links/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/social-links",
"title": "Social Icons",
"category": "widgets",
@@ -41,14 +41,16 @@
"providesContext": {
"openInNewTab": "openInNewTab",
"showLabels": "showLabels",
+ "iconColor": "iconColor",
"iconColorValue": "iconColorValue",
+ "iconBackgroundColor": "iconBackgroundColor",
"iconBackgroundColorValue": "iconBackgroundColorValue"
},
"supports": {
"align": [ "left", "center", "right" ],
"anchor": true,
"__experimentalExposeControlsToChildren": true,
- "__experimentalLayout": {
+ "layout": {
"allowSwitching": false,
"allowInheriting": false,
"allowVerticalAlignment": false,
diff --git a/src/wp-includes/blocks/spacer/block.json b/src/wp-includes/blocks/spacer/block.json
index 021ff9f4a2..a9da8d537f 100644
--- a/src/wp-includes/blocks/spacer/block.json
+++ b/src/wp-includes/blocks/spacer/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/spacer",
"title": "Spacer",
"category": "design",
diff --git a/src/wp-includes/blocks/table/block.json b/src/wp-includes/blocks/table/block.json
index adac1e9c21..54e4bc26ca 100644
--- a/src/wp-includes/blocks/table/block.json
+++ b/src/wp-includes/blocks/table/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/table",
"title": "Table",
"category": "text",
diff --git a/src/wp-includes/blocks/tag-cloud/block.json b/src/wp-includes/blocks/tag-cloud/block.json
index c722227398..9481dc9456 100644
--- a/src/wp-includes/blocks/tag-cloud/block.json
+++ b/src/wp-includes/blocks/tag-cloud/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/tag-cloud",
"title": "Tag Cloud",
"category": "widgets",
diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php
index 6f41f2a793..84e3a985ec 100644
--- a/src/wp-includes/blocks/template-part.php
+++ b/src/wp-includes/blocks/template-part.php
@@ -18,27 +18,29 @@ function render_block_core_template_part( $attributes ) {
$template_part_id = null;
$content = null;
$area = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
+ $stylesheet = get_stylesheet();
if (
isset( $attributes['slug'] ) &&
isset( $attributes['theme'] ) &&
- get_stylesheet() === $attributes['theme']
+ $stylesheet === $attributes['theme']
) {
$template_part_id = $attributes['theme'] . '//' . $attributes['slug'];
$template_part_query = new WP_Query(
array(
- 'post_type' => 'wp_template_part',
- 'post_status' => 'publish',
- 'post_name__in' => array( $attributes['slug'] ),
- 'tax_query' => array(
+ 'post_type' => 'wp_template_part',
+ 'post_status' => 'publish',
+ 'post_name__in' => array( $attributes['slug'] ),
+ 'tax_query' => array(
array(
'taxonomy' => 'wp_theme',
'field' => 'name',
'terms' => $attributes['theme'],
),
),
- 'posts_per_page' => 1,
- 'no_found_rows' => true,
+ 'posts_per_page' => 1,
+ 'no_found_rows' => true,
+ 'lazy_load_term_meta' => false, // Do not lazy load term meta, as template parts only have one term.
)
);
$template_part_post = $template_part_query->have_posts() ? $template_part_query->next_post() : null;
@@ -64,16 +66,22 @@ function render_block_core_template_part( $attributes ) {
} else {
// Else, if the template part was provided by the active theme,
// render the corresponding file content.
- $parent_theme_folders = get_block_theme_folders( get_template() );
- $child_theme_folders = get_block_theme_folders( get_stylesheet() );
- $child_theme_part_file_path = get_theme_file_path( '/' . $child_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
- $parent_theme_part_file_path = get_theme_file_path( '/' . $parent_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
- $template_part_file_path = 0 === validate_file( $attributes['slug'] ) && file_exists( $child_theme_part_file_path ) ? $child_theme_part_file_path : $parent_theme_part_file_path;
- if ( 0 === validate_file( $attributes['slug'] ) && file_exists( $template_part_file_path ) ) {
- $content = file_get_contents( $template_part_file_path );
- $content = is_string( $content ) && '' !== $content
- ? _inject_theme_attribute_in_block_template_content( $content )
- : '';
+ if ( 0 === validate_file( $attributes['slug'] ) ) {
+ $themes = array( $stylesheet );
+ $template = get_template();
+ if ( $stylesheet !== $template ) {
+ $themes[] = $template;
+ }
+
+ foreach ( $themes as $theme ) {
+ $theme_folders = get_block_theme_folders( $theme );
+ $template_part_file_path = get_theme_file_path( '/' . $theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
+ if ( file_exists( $template_part_file_path ) ) {
+ $content = (string) file_get_contents( $template_part_file_path );
+ $content = '' !== $content ? _inject_theme_attribute_in_block_template_content( $content ) : '';
+ break;
+ }
+ }
}
if ( '' !== $content && null !== $content ) {
@@ -172,21 +180,34 @@ function render_block_core_template_part( $attributes ) {
/**
* Returns an array of area variation objects for the template part block.
*
+ * @param array $instance_variations The variations for instances.
+ *
* @return array Array containing the block variation objects.
*/
-function build_template_part_block_area_variations() {
+function build_template_part_block_area_variations( $instance_variations ) {
$variations = array();
$defined_areas = get_allowed_block_template_part_areas();
+
foreach ( $defined_areas as $area ) {
if ( 'uncategorized' !== $area['area'] ) {
+ $has_instance_for_area = false;
+ foreach ( $instance_variations as $variation ) {
+ if ( $variation['attributes']['area'] === $area['area'] ) {
+ $has_instance_for_area = true;
+ break;
+ }
+ }
+
+ $scope = $has_instance_for_area ? array() : array( 'inserter' );
+
$variations[] = array(
- 'name' => $area['area'],
+ 'name' => 'area_' . $area['area'],
'title' => $area['label'],
'description' => $area['description'],
'attributes' => array(
'area' => $area['area'],
),
- 'scope' => array( 'inserter' ),
+ 'scope' => $scope,
'icon' => $area['icon'],
);
}
@@ -222,7 +243,7 @@ function build_template_part_block_instance_variations() {
foreach ( $template_parts as $template_part ) {
$variations[] = array(
- 'name' => sanitize_title( $template_part->slug ),
+ 'name' => 'instance_' . sanitize_title( $template_part->slug ),
'title' => $template_part->title,
// If there's no description for the template part don't show the
// block description. This is a bit hacky, but prevent the fallback
@@ -254,7 +275,9 @@ function build_template_part_block_instance_variations() {
* @return array Array containing the block variation objects.
*/
function build_template_part_block_variations() {
- return array_merge( build_template_part_block_area_variations(), build_template_part_block_instance_variations() );
+ $instance_variations = build_template_part_block_instance_variations();
+ $area_variations = build_template_part_block_area_variations( $instance_variations );
+ return array_merge( $area_variations, $instance_variations );
}
/**
diff --git a/src/wp-includes/blocks/template-part/block.json b/src/wp-includes/blocks/template-part/block.json
index 3801eee941..9fe431150a 100644
--- a/src/wp-includes/blocks/template-part/block.json
+++ b/src/wp-includes/blocks/template-part/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/template-part",
"title": "Template Part",
"category": "theme",
diff --git a/src/wp-includes/blocks/term-description/block.json b/src/wp-includes/blocks/term-description/block.json
index 66eb9348a4..fc91a4aff4 100644
--- a/src/wp-includes/blocks/term-description/block.json
+++ b/src/wp-includes/blocks/term-description/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/term-description",
"title": "Term Description",
"category": "theme",
@@ -38,6 +38,5 @@
"fontSize": true
}
}
- },
- "editorStyle": "wp-block-term-description-editor"
+ }
}
diff --git a/src/wp-includes/blocks/text-columns/block.json b/src/wp-includes/blocks/text-columns/block.json
index 84d5ccece0..3af169fadb 100644
--- a/src/wp-includes/blocks/text-columns/block.json
+++ b/src/wp-includes/blocks/text-columns/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/text-columns",
"title": "Text Columns (deprecated)",
"icon": "columns",
diff --git a/src/wp-includes/blocks/verse/block.json b/src/wp-includes/blocks/verse/block.json
index dc0772cc9a..5fabf49ade 100644
--- a/src/wp-includes/blocks/verse/block.json
+++ b/src/wp-includes/blocks/verse/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/verse",
"title": "Verse",
"category": "text",
@@ -47,6 +47,12 @@
"spacing": {
"margin": true,
"padding": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "width": true,
+ "color": true,
+ "style": true
}
},
"style": "wp-block-verse",
diff --git a/src/wp-includes/blocks/video/block.json b/src/wp-includes/blocks/video/block.json
index 6f53246cc8..df2d207537 100644
--- a/src/wp-includes/blocks/video/block.json
+++ b/src/wp-includes/blocks/video/block.json
@@ -1,6 +1,6 @@
{
"$schema": "https://schemas.wp.org/trunk/block.json",
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/video",
"title": "Video",
"category": "media",
diff --git a/src/wp-includes/blocks/widget-group/block.json b/src/wp-includes/blocks/widget-group/block.json
index ec48d90eda..c29e811554 100644
--- a/src/wp-includes/blocks/widget-group/block.json
+++ b/src/wp-includes/blocks/widget-group/block.json
@@ -1,5 +1,5 @@
{
- "apiVersion": 2,
+ "apiVersion": 3,
"name": "core/widget-group",
"category": "widgets",
"attributes": {
diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php
index c0398cb4f9..fb5f98d261 100644
--- a/src/wp-includes/load.php
+++ b/src/wp-includes/load.php
@@ -73,12 +73,14 @@ function wp_fix_server_vars() {
}
// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests.
- if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && str_ends_with( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) ) {
+ if ( isset( $_SERVER['SCRIPT_FILENAME'] )
+ && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) === strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 )
+ ) {
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
}
// Fix for Dreamhost and other PHP as CGI hosts.
- if ( isset( $_SERVER['SCRIPT_NAME'] ) && str_contains( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) ) {
+ if ( isset( $_SERVER['SCRIPT_NAME'] ) && ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) ) {
unset( $_SERVER['PATH_INFO'] );
}
@@ -877,7 +879,7 @@ function wp_get_mu_plugins() {
return $mu_plugins;
}
while ( ( $plugin = readdir( $dh ) ) !== false ) {
- if ( str_ends_with( $plugin, '.php' ) ) {
+ if ( '.php' === substr( $plugin, -4 ) ) {
$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
}
}
@@ -919,7 +921,7 @@ function wp_get_active_and_valid_plugins() {
foreach ( $active_plugins as $plugin ) {
if ( ! validate_file( $plugin ) // $plugin must validate as file.
- && str_ends_with( $plugin, '.php' ) // $plugin must end with '.php'.
+ && '.php' === substr( $plugin, -4 ) // $plugin must end with '.php'.
&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
// Not already included as a network plugin.
&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins, true ) )
@@ -1549,11 +1551,11 @@ function wp_convert_hr_to_bytes( $value ) {
$value = strtolower( trim( $value ) );
$bytes = (int) $value;
- if ( str_contains( $value, 'g' ) ) {
+ if ( false !== strpos( $value, 'g' ) ) {
$bytes *= GB_IN_BYTES;
- } elseif ( str_contains( $value, 'm' ) ) {
+ } elseif ( false !== strpos( $value, 'm' ) ) {
$bytes *= MB_IN_BYTES;
- } elseif ( str_contains( $value, 'k' ) ) {
+ } elseif ( false !== strpos( $value, 'k' ) ) {
$bytes *= KB_IN_BYTES;
}
@@ -1832,7 +1834,7 @@ function wp_is_xml_request() {
if ( isset( $_SERVER['HTTP_ACCEPT'] ) ) {
foreach ( $accepted as $type ) {
- if ( str_contains( $_SERVER['HTTP_ACCEPT'], $type ) ) {
+ if ( false !== strpos( $_SERVER['HTTP_ACCEPT'], $type ) ) {
return true;
}
}
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover.html b/tests/phpunit/data/blocks/fixtures/core__cover.html
index ae26d922c2..34e8b7ad5e 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover.html
@@ -1,5 +1,5 @@
-
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover.json b/tests/phpunit/data/blocks/fixtures/core__cover.json
index dea09d92c1..6b3ec9c1c9 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover.json
@@ -12,6 +12,6 @@
"backgroundType": "image"
},
"innerBlocks": [],
- "originalContent": "
Guten Berg!
\n
"
+ "originalContent": "Guten Berg!
\n\n
"
}
]
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover.parsed.json b/tests/phpunit/data/blocks/fixtures/core__cover.parsed.json
index 14f37b6170..e4c901f253 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover.parsed.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover.parsed.json
@@ -6,9 +6,9 @@
"dimRatio": 40
},
"innerBlocks": [],
- "innerHTML": "\nGuten Berg!
\n\n
\n",
+ "innerHTML": "\nGuten Berg!
\n\n
\n",
"innerContent": [
- "\nGuten Berg!
\n\n
\n"
+ "\nGuten Berg!
\n\n
\n"
]
},
{
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover.server.html b/tests/phpunit/data/blocks/fixtures/core__cover.server.html
index 726c24a585..ba293cb7a9 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover.server.html
@@ -1,5 +1,5 @@
-Guten Berg!
\n
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.html b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.html
index 2a3530954f..5d3456e7c9 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.html
@@ -1,5 +1,5 @@
-
Guten Berg!
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.json b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.json
index 08f0de4eb4..ac81685188 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.json
@@ -13,6 +13,6 @@
"backgroundType": "video"
},
"innerBlocks": [],
- "originalContent": "
Guten Berg!
\n\t\n\t
"
+ "originalContent": "Guten Berg!
\n\n\t\n\t
"
}
]
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.parsed.json b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.parsed.json
index a2a3ccc94a..71700c25a9 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.parsed.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.parsed.json
@@ -8,9 +8,9 @@
"backgroundType": "video"
},
"innerBlocks": [],
- "innerHTML": "\nGuten Berg!
\n\n\t\n\t
\n",
+ "innerHTML": "\nGuten Berg!
\n\n\t\n\t
\n",
"innerContent": [
- "\nGuten Berg!
\n\n\t\n\t
\n"
+ "\nGuten Berg!
\n\n\t\n\t
\n"
]
},
{
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.server.html b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.server.html
index d8e1e40cac..aa2f0267ac 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.server.html
@@ -1,5 +1,5 @@
-Guten Berg!
\n
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video.html b/tests/phpunit/data/blocks/fixtures/core__cover__video.html
index 0ab2fd73cc..5408bbe933 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video.html
@@ -1,5 +1,5 @@
-
Guten Berg!
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video.json b/tests/phpunit/data/blocks/fixtures/core__cover__video.json
index 1fa4d25d66..673cd3b725 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video.json
@@ -12,6 +12,6 @@
"backgroundType": "video"
},
"innerBlocks": [],
- "originalContent": "
Guten Berg!
\n\t\n\t
"
+ "originalContent": "Guten Berg!
\n\n\t\n\t
"
}
]
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video.parsed.json b/tests/phpunit/data/blocks/fixtures/core__cover__video.parsed.json
index a864b5fea3..ad48e4fde4 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video.parsed.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video.parsed.json
@@ -7,9 +7,9 @@
"backgroundType": "video"
},
"innerBlocks": [],
- "innerHTML": "\nGuten Berg!
\n\n\t\n\t
\n",
+ "innerHTML": "\nGuten Berg!
\n\n\t\n\t
\n",
"innerContent": [
- "\nGuten Berg!
\n\n\t\n\t
\n"
+ "\nGuten Berg!
\n\n\t\n\t
\n"
]
},
{
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video.server.html b/tests/phpunit/data/blocks/fixtures/core__cover__video.server.html
index 50a924c054..20afe15696 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video.server.html
@@ -1,5 +1,5 @@
-Guten Berg!
\n
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html
index 69df4fd1bc..b522543d92 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html
@@ -1,15 +1,15 @@
- 
- This gallery has a caption
diff --git a/tests/phpunit/includes/unregister-blocks-hooks.php b/tests/phpunit/includes/unregister-blocks-hooks.php
index 5edeba1445..164c9c98db 100644
--- a/tests/phpunit/includes/unregister-blocks-hooks.php
+++ b/tests/phpunit/includes/unregister-blocks-hooks.php
@@ -20,6 +20,7 @@ remove_action( 'init', 'register_block_core_comments_pagination_previous' );
remove_action( 'init', 'register_block_core_comments_title' );
remove_action( 'init', 'register_block_core_cover' );
remove_action( 'init', 'register_block_core_file' );
+remove_action( 'init', 'register_block_core_footnotes' );
remove_action( 'init', 'register_block_core_gallery' );
remove_action( 'init', 'register_block_core_heading' );
remove_action( 'init', 'register_block_core_home_link' );
@@ -31,6 +32,7 @@ remove_action( 'init', 'register_block_core_navigation' );
remove_action( 'init', 'register_block_core_navigation_link' );
remove_action( 'init', 'register_block_core_navigation_submenu' );
remove_action( 'init', 'register_block_core_page_list' );
+remove_action( 'init', 'register_block_core_page_list_item' );
remove_action( 'init', 'register_block_core_pattern' );
remove_action( 'init', 'register_block_core_post_author' );
remove_action( 'init', 'register_block_core_post_author_biography' );
diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php
index d4ddad3e97..2fcbe2264f 100644
--- a/tests/phpunit/tests/media.php
+++ b/tests/phpunit/tests/media.php
@@ -4040,6 +4040,7 @@ EOF;
'post-thumbnail',
array(
'loading' => false,
+ 'style' => 'object-fit:cover;',
'fetchpriority' => 'high',
)
) . '';
diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index 3bda349254..ae6ea02e9c 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -416,7 +416,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
)
);
- $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-group{border-radius: 10px;margin: 1em;padding: 24px;}.wp-block-image{margin-bottom: 30px;padding-top: 15px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
+ $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-group{border-radius: 10px;margin: 1em;padding: 24px;}.wp-block-image{margin-bottom: 30px;padding-top: 15px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
$this->assertSame( $styles, $theme_json->get_stylesheet() );
$this->assertSame( $styles, $theme_json->get_stylesheet( array( 'styles' ) ) );
}
@@ -637,7 +637,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
);
$variables = "body{--wp--preset--color--grey: grey;--wp--preset--gradient--custom-gradient: linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%);--wp--preset--duotone--custom-duotone: url('#wp-duotone-custom-duotone');--wp--preset--font-family--small: 14px;--wp--preset--font-family--big: 41px;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}";
- $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-element-button, .wp-block-button__link{box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}.wp-block-group{background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}.wp-block-heading{color: #123456;}.wp-block-heading a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;color: #555;}.wp-block-post-excerpt{column-count: 2;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .components-placeholder{filter: var(--wp--preset--duotone--custom-duotone);}.wp-block-image img, .wp-block-image .wp-block-image__crop-area{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
+ $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-element-button, .wp-block-button__link{box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}.wp-block-group{background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}.wp-block-heading{color: #123456;}.wp-block-heading a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;color: #555;}.wp-block-post-excerpt{column-count: 2;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}.wp-block-image img, .wp-block-image .components-placeholder{filter: var(--wp--preset--duotone--custom-duotone);}';
$presets = '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-custom-gradient-gradient-background{background: var(--wp--preset--gradient--custom-gradient) !important;}.has-small-font-family{font-family: var(--wp--preset--font-family--small) !important;}.has-big-font-family{font-family: var(--wp--preset--font-family--big) !important;}';
$all = $variables . $styles . $presets;
$this->assertSame( $all, $theme_json->get_stylesheet() );
Guten Berg!