%2$s%3$s
',
diff --git a/src/wp-includes/blocks/comment-content/block.json b/src/wp-includes/blocks/comment-content/block.json
index 0c28c25f330ca..69917ccce6aea 100644
--- a/src/wp-includes/blocks/comment-content/block.json
+++ b/src/wp-includes/blocks/comment-content/block.json
@@ -14,6 +14,7 @@
}
},
"supports": {
+ "anchor": true,
"color": {
"gradients": true,
"link": true,
diff --git a/src/wp-includes/blocks/comment-date.php b/src/wp-includes/blocks/comment-date.php
index 9bff9f2f6cbbf..0f9c18bf2c006 100644
--- a/src/wp-includes/blocks/comment-date.php
+++ b/src/wp-includes/blocks/comment-date.php
@@ -23,7 +23,7 @@ function render_block_core_comment_date( $attributes, $content, $block ) {
return '';
}
- $classes = '';
+ $classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
$formatted_date = get_comment_date(
diff --git a/src/wp-includes/blocks/comment-date/block.json b/src/wp-includes/blocks/comment-date/block.json
index e90cb0b0d8c4d..ea1e263338139 100644
--- a/src/wp-includes/blocks/comment-date/block.json
+++ b/src/wp-includes/blocks/comment-date/block.json
@@ -18,6 +18,7 @@
},
"usesContext": [ "commentId" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/comment-edit-link.php b/src/wp-includes/blocks/comment-edit-link.php
index 39727ea5aed10..ce7ad9bf207d4 100644
--- a/src/wp-includes/blocks/comment-edit-link.php
+++ b/src/wp-includes/blocks/comment-edit-link.php
@@ -27,12 +27,15 @@ function render_block_core_comment_edit_link( $attributes, $content, $block ) {
$link_atts .= sprintf( 'target="%s"', esc_attr( $attributes['linkTarget'] ) );
}
- $classes = '';
+ $classes = array();
if ( isset( $attributes['textAlign'] ) ) {
- $classes .= 'has-text-align-' . $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' => $classes ) );
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
return sprintf(
'',
diff --git a/src/wp-includes/blocks/comment-edit-link/block.json b/src/wp-includes/blocks/comment-edit-link/block.json
index 14795c83e1c53..e695ddc3801f7 100644
--- a/src/wp-includes/blocks/comment-edit-link/block.json
+++ b/src/wp-includes/blocks/comment-edit-link/block.json
@@ -18,6 +18,7 @@
}
},
"supports": {
+ "anchor": true,
"html": false,
"color": {
"link": true,
diff --git a/src/wp-includes/blocks/comment-reply-link.php b/src/wp-includes/blocks/comment-reply-link.php
index 169b62ac24bdf..3f7b6e48b617c 100644
--- a/src/wp-includes/blocks/comment-reply-link.php
+++ b/src/wp-includes/blocks/comment-reply-link.php
@@ -34,7 +34,7 @@ function render_block_core_comment_reply_link( $attributes, $content, $block ) {
// Compute comment's depth iterating over its ancestors.
while ( ! empty( $parent_id ) ) {
- $depth++;
+ ++$depth;
$parent_id = get_comment( $parent_id )->comment_parent;
}
@@ -51,12 +51,15 @@ function render_block_core_comment_reply_link( $attributes, $content, $block ) {
return;
}
- $classes = '';
+ $classes = array();
if ( isset( $attributes['textAlign'] ) ) {
- $classes .= 'has-text-align-' . $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' => $classes ) );
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
return sprintf(
'%2$s
',
diff --git a/src/wp-includes/blocks/comment-reply-link/block.json b/src/wp-includes/blocks/comment-reply-link/block.json
index 9d4a1d8668acc..7ed60f34f581f 100644
--- a/src/wp-includes/blocks/comment-reply-link/block.json
+++ b/src/wp-includes/blocks/comment-reply-link/block.json
@@ -14,6 +14,7 @@
}
},
"supports": {
+ "anchor": true,
"color": {
"gradients": true,
"link": true,
diff --git a/src/wp-includes/blocks/comment-template.php b/src/wp-includes/blocks/comment-template.php
index 770959854b58a..08620a3ea695f 100644
--- a/src/wp-includes/blocks/comment-template.php
+++ b/src/wp-includes/blocks/comment-template.php
@@ -50,13 +50,13 @@ function block_core_comment_template_render_comments( $comments, $block ) {
// comments.
if ( ! empty( $children ) && ! empty( $thread_comments ) ) {
if ( $comment_depth < $thread_comments_depth ) {
- $comment_depth += 1;
+ ++$comment_depth;
$inner_content = block_core_comment_template_render_comments(
$children,
$block
);
$block_content .= sprintf( '- %1$s
%2$s
',
- get_block_wrapper_attributes(),
+ $wrapper_attributes,
$content
);
}
diff --git a/src/wp-includes/blocks/comments-pagination/block.json b/src/wp-includes/blocks/comments-pagination/block.json
index ffa2828912f26..d7c8be4b8eaa2 100644
--- a/src/wp-includes/blocks/comments-pagination/block.json
+++ b/src/wp-includes/blocks/comments-pagination/block.json
@@ -17,6 +17,7 @@
"comments/paginationArrow": "paginationArrow"
},
"supports": {
+ "anchor": true,
"align": true,
"reusable": false,
"html": false,
diff --git a/src/wp-includes/blocks/comments.php b/src/wp-includes/blocks/comments.php
index 69044c081c74e..a5e51cfbf4e79 100644
--- a/src/wp-includes/blocks/comments.php
+++ b/src/wp-includes/blocks/comments.php
@@ -202,7 +202,6 @@ function register_legacy_post_comments_block() {
'wp-block-buttons',
'wp-block-button',
),
- 'editorStyle' => 'wp-block-post-comments-editor',
'render_callback' => 'render_block_core_comments',
'skip_inner_blocks' => true,
);
diff --git a/src/wp-includes/blocks/comments/block.json b/src/wp-includes/blocks/comments/block.json
index 59d315b5fcb83..19490f6e99eb4 100644
--- a/src/wp-includes/blocks/comments/block.json
+++ b/src/wp-includes/blocks/comments/block.json
@@ -18,6 +18,7 @@
},
"supports": {
"align": [ "wide", "full" ],
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
@@ -28,6 +29,10 @@
"link": true
}
},
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
diff --git a/src/wp-includes/blocks/cover.php b/src/wp-includes/blocks/cover.php
index 4168d267671f7..e5a497fd76889 100644
--- a/src/wp-includes/blocks/cover.php
+++ b/src/wp-includes/blocks/cover.php
@@ -25,7 +25,7 @@ function render_block_core_cover( $attributes, $content ) {
);
if ( isset( $attributes['focalPoint'] ) ) {
- $object_position = round( $attributes['focalPoint']['x'] * 100 ) . '%' . ' ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
+ $object_position = round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
$attr['data-object-position'] = $object_position;
$attr['style'] = 'object-position: ' . $object_position;
}
diff --git a/src/wp-includes/blocks/cover/block.json b/src/wp-includes/blocks/cover/block.json
index 1982ecc44853e..3bcc779a0f127 100644
--- a/src/wp-includes/blocks/cover/block.json
+++ b/src/wp-includes/blocks/cover/block.json
@@ -74,6 +74,10 @@
"templateLock": {
"type": [ "string", "boolean" ],
"enum": [ "all", "insert", "contentOnly", false ]
+ },
+ "tagName": {
+ "type": "string",
+ "default": "div"
}
},
"usesContext": [ "postId", "postType" ],
diff --git a/src/wp-includes/blocks/embed/block.json b/src/wp-includes/blocks/embed/block.json
index 7257b54cf20fa..e36768cd72780 100644
--- a/src/wp-includes/blocks/embed/block.json
+++ b/src/wp-includes/blocks/embed/block.json
@@ -8,18 +8,22 @@
"textdomain": "default",
"attributes": {
"url": {
- "type": "string"
+ "type": "string",
+ "__experimentalRole": "content"
},
"caption": {
"type": "string",
"source": "html",
- "selector": "figcaption"
+ "selector": "figcaption",
+ "__experimentalRole": "content"
},
"type": {
- "type": "string"
+ "type": "string",
+ "__experimentalRole": "content"
},
"providerNameSlug": {
- "type": "string"
+ "type": "string",
+ "__experimentalRole": "content"
},
"allowResponsive": {
"type": "boolean",
@@ -27,11 +31,13 @@
},
"responsive": {
"type": "boolean",
- "default": false
+ "default": false,
+ "__experimentalRole": "content"
},
"previewable": {
"type": "boolean",
- "default": true
+ "default": true,
+ "__experimentalRole": "content"
}
},
"supports": {
diff --git a/src/wp-includes/blocks/gallery.php b/src/wp-includes/blocks/gallery.php
index 7bc5e2821b796..2affdd236f798 100644
--- a/src/wp-includes/blocks/gallery.php
+++ b/src/wp-includes/blocks/gallery.php
@@ -76,13 +76,10 @@ function block_core_gallery_render( $attributes, $content ) {
}
}
- $class = wp_unique_id( 'wp-block-gallery-' );
- $content = preg_replace(
- '/' . preg_quote( 'class="', '/' ) . '/',
- 'class="' . $class . ' ',
- $content,
- 1
- );
+ $unique_gallery_classname = wp_unique_id( 'wp-block-gallery-' );
+ $processed_content = new WP_HTML_Tag_Processor( $content );
+ $processed_content->next_tag();
+ $processed_content->add_class( $unique_gallery_classname );
// --gallery-block--gutter-size is deprecated. --wp--style--gallery-gap-default should be used by themes that want to set a default
// gap on the gallery.
@@ -102,10 +99,22 @@ function block_core_gallery_render( $attributes, $content ) {
}
// Set the CSS variable to the column value, and the `gap` property to the combined gap value.
- $style = '.wp-block-gallery.' . $class . '{ --wp--style--unstable-gallery-gap: ' . $gap_column . '; gap: ' . $gap_value . '}';
+ $gallery_styles = array();
+ $gallery_styles[] = array(
+ 'selector' => ".wp-block-gallery.{$unique_gallery_classname}",
+ 'declarations' => array(
+ '--wp--style--unstable-gallery-gap' => $gap_column,
+ 'gap' => $gap_value,
+ ),
+ );
- wp_enqueue_block_support_styles( $style, 11 );
- return $content;
+ wp_style_engine_get_stylesheet_from_css_rules(
+ $gallery_styles,
+ array(
+ 'context' => 'block-supports',
+ )
+ );
+ return (string) $processed_content;
}
/**
* Registers the `core/gallery` block on server.
diff --git a/src/wp-includes/blocks/group/block.json b/src/wp-includes/blocks/group/block.json
index 968f00cb1c5cb..2b227a15847a2 100644
--- a/src/wp-includes/blocks/group/block.json
+++ b/src/wp-includes/blocks/group/block.json
@@ -41,6 +41,9 @@
"blockGap": true
}
},
+ "dimensions": {
+ "minHeight": true
+ },
"__experimentalBorder": {
"color": true,
"radius": true,
@@ -53,6 +56,9 @@
"width": true
}
},
+ "position": {
+ "sticky": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
@@ -66,7 +72,9 @@
"fontSize": true
}
},
- "__experimentalLayout": true
+ "__experimentalLayout": {
+ "allowSizingOnChildren": true
+ }
},
"editorStyle": "wp-block-group-editor",
"style": "wp-block-group"
diff --git a/src/wp-includes/blocks/heading.php b/src/wp-includes/blocks/heading.php
new file mode 100644
index 0000000000000..5a7e8dbaab43c
--- /dev/null
+++ b/src/wp-includes/blocks/heading.php
@@ -0,0 +1,52 @@
+Hello World
+ *
+ * Would be transformed to:
+ * Hello World
+ * + * @param array $attributes Attributes of the block being rendered. + * @param string $content Content of the block being rendered. + * + * @return string The content of the block being rendered. + */ +function block_core_heading_render( $attributes, $content ) { + if ( ! $content ) { + return $content; + } + + $p = new WP_HTML_Tag_Processor( $content ); + + $header_tags = array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ); + while ( $p->next_tag() ) { + if ( in_array( $p->get_tag(), $header_tags, true ) ) { + $p->add_class( 'wp-block-heading' ); + break; + } + } + + return $p->get_updated_html(); +} + +/** + * Registers the `core/heading` block on server. + */ +function register_block_core_heading() { + register_block_type_from_metadata( + __DIR__ . '/heading', + array( + 'render_callback' => 'block_core_heading_render', + ) + ); +} + +add_action( 'init', 'register_block_core_heading' ); diff --git a/src/wp-includes/blocks/heading/block.json b/src/wp-includes/blocks/heading/block.json index 89c1514808911..f9d701eace964 100644 --- a/src/wp-includes/blocks/heading/block.json +++ b/src/wp-includes/blocks/heading/block.json @@ -29,7 +29,7 @@ "supports": { "align": [ "wide", "full" ], "anchor": true, - "className": false, + "className": true, "color": { "gradients": true, "link": true, @@ -57,7 +57,6 @@ "textTransform": true } }, - "__experimentalSelector": "h1,h2,h3,h4,h5,h6", "__unstablePasteTextInline": true, "__experimentalSlashInserter": true }, diff --git a/src/wp-includes/blocks/home-link.php b/src/wp-includes/blocks/home-link.php index 5bf7aeda5505d..33f41057c936b 100644 --- a/src/wp-includes/blocks/home-link.php +++ b/src/wp-includes/blocks/home-link.php @@ -128,7 +128,7 @@ function render_block_core_home_link( $attributes, $content, $block ) { $aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : ''; return sprintf( - '- %2$s
- %2$s
- %2$s
%2$s
', $wrapper_attributes, $author_name );
+}
+
+/**
+ * Registers the `core/post-author-name` block on the server.
+ */
+function register_block_core_post_author_name() {
+ register_block_type_from_metadata(
+ __DIR__ . '/post-author-name',
+ array(
+ 'render_callback' => 'render_block_core_post_author_name',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_post_author_name' );
diff --git a/src/wp-includes/blocks/post-author-name/block.json b/src/wp-includes/blocks/post-author-name/block.json
new file mode 100644
index 0000000000000..2340636e0c63a
--- /dev/null
+++ b/src/wp-includes/blocks/post-author-name/block.json
@@ -0,0 +1,53 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 2,
+ "name": "core/post-author-name",
+ "title": "Post Author Name",
+ "category": "theme",
+ "description": "The author name.",
+ "textdomain": "default",
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": false
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self"
+ }
+ },
+ "usesContext": [ "postType", "postId" ],
+ "supports": {
+ "anchor": true,
+ "html": false,
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ }
+ }
+}
diff --git a/src/wp-includes/blocks/post-author.php b/src/wp-includes/blocks/post-author.php
index 325aa43607d22..7e6a9e6a0bd85 100644
--- a/src/wp-includes/blocks/post-author.php
+++ b/src/wp-includes/blocks/post-author.php
@@ -29,11 +29,23 @@ function render_block_core_post_author( $attributes, $content, $block ) {
$attributes['avatarSize']
) : null;
+ $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 );
+ }
+
$byline = ! empty( $attributes['byline'] ) ? $attributes['byline'] : false;
- $classes = array_merge(
- isset( $attributes['itemsJustification'] ) ? array( 'items-justified-' . $attributes['itemsJustification'] ) : array(),
- isset( $attributes['textAlign'] ) ? array( 'has-text-align-' . $attributes['textAlign'] ) : array()
- );
+ $classes = array();
+ if ( isset( $attributes['itemsJustification'] ) ) {
+ $classes[] = 'items-justified-' . $attributes['itemsJustification'];
+ }
+ 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 ) ) );
@@ -41,7 +53,7 @@ function render_block_core_post_author( $attributes, $content, $block ) {
( ! empty( $attributes['showAvatar'] ) ? '' : '' ) .
'' .
'';
diff --git a/src/wp-includes/blocks/post-author/block.json b/src/wp-includes/blocks/post-author/block.json
index 232e20dbd0a8d..bb9f69ade07e6 100644
--- a/src/wp-includes/blocks/post-author/block.json
+++ b/src/wp-includes/blocks/post-author/block.json
@@ -23,10 +23,19 @@
},
"byline": {
"type": "string"
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": false
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self"
}
},
"usesContext": [ "postType", "postId", "queryId" ],
"supports": {
+ "anchor": true,
"html": false,
"spacing": {
"margin": true,
diff --git a/src/wp-includes/blocks/post-comments-form.php b/src/wp-includes/blocks/post-comments-form.php
index 53a6f8b5242a9..644b02ae0f149 100644
--- a/src/wp-includes/blocks/post-comments-form.php
+++ b/src/wp-includes/blocks/post-comments-form.php
@@ -22,12 +22,14 @@ function render_block_core_post_comments_form( $attributes, $content, $block ) {
return;
}
- $classes = 'comment-respond'; // See comment further below.
+ $classes = array( 'comment-respond' ); // See comment further below.
if ( isset( $attributes['textAlign'] ) ) {
- $classes .= ' has-text-align-' . $attributes['textAlign'];
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
}
-
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
+ }
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
add_filter( 'comment_form_defaults', 'post_comments_form_block_form_defaults' );
diff --git a/src/wp-includes/blocks/post-comments-form/block.json b/src/wp-includes/blocks/post-comments-form/block.json
index 47cc0a443baee..793d14d74ba7b 100644
--- a/src/wp-includes/blocks/post-comments-form/block.json
+++ b/src/wp-includes/blocks/post-comments-form/block.json
@@ -13,6 +13,7 @@
},
"usesContext": [ "postId", "postType" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
@@ -22,6 +23,10 @@
"text": true
}
},
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-content.php b/src/wp-includes/blocks/post-content.php
index 228a0d52f4069..2be1ef77b3b85 100644
--- a/src/wp-includes/blocks/post-content.php
+++ b/src/wp-includes/blocks/post-content.php
@@ -25,8 +25,7 @@ function render_block_core_post_content( $attributes, $content, $block ) {
if ( isset( $seen_ids[ $post_id ] ) ) {
// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
// is set in `wp_debug_mode()`.
- $is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
- defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
+ $is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
return $is_debug ?
// translators: Visible only in the front end, this warning takes the place of a faulty block.
diff --git a/src/wp-includes/blocks/post-content/block.json b/src/wp-includes/blocks/post-content/block.json
index c330f624ee142..56834a980baed 100644
--- a/src/wp-includes/blocks/post-content/block.json
+++ b/src/wp-includes/blocks/post-content/block.json
@@ -8,9 +8,13 @@
"textdomain": "default",
"usesContext": [ "postId", "postType", "queryId" ],
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"__experimentalLayout": true,
+ "dimensions": {
+ "minHeight": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-date.php b/src/wp-includes/blocks/post-date.php
index fc1537d156689..5c20ee30c2b39 100644
--- a/src/wp-includes/blocks/post-date.php
+++ b/src/wp-includes/blocks/post-date.php
@@ -18,9 +18,16 @@ function render_block_core_post_date( $attributes, $content, $block ) {
return '';
}
- $post_ID = $block->context['postId'];
- $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+ $post_ID = $block->context['postId'];
+
+ $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 ( isset( $attributes['displayType'] ) && 'modified' === $attributes['displayType'] ) {
$formatted_date = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
diff --git a/src/wp-includes/blocks/post-date/block.json b/src/wp-includes/blocks/post-date/block.json
index b469dbe87d7e0..41c45a4a57e26 100644
--- a/src/wp-includes/blocks/post-date/block.json
+++ b/src/wp-includes/blocks/post-date/block.json
@@ -24,6 +24,7 @@
},
"usesContext": [ "postId", "postType", "queryId" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/post-excerpt.php b/src/wp-includes/blocks/post-excerpt.php
index 79cc959cd86d7..1380918fe1058 100644
--- a/src/wp-includes/blocks/post-excerpt.php
+++ b/src/wp-includes/blocks/post-excerpt.php
@@ -38,11 +38,14 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
* result in showing only one `read more` link at a time.
*/
add_filter( 'excerpt_more', $filter_excerpt_more );
- $classes = '';
+ $classes = array();
if ( isset( $attributes['textAlign'] ) ) {
- $classes .= "has-text-align-{$attributes['textAlign']}";
+ $classes[] = 'has-text-align-' . $attributes['textAlign'];
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes[] = 'has-link-color';
+ }
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
$content = '' . $excerpt;
$show_more_on_new_line = ! isset( $attributes['showMoreOnNewLine'] ) || $attributes['showMoreOnNewLine'];
diff --git a/src/wp-includes/blocks/post-excerpt/block.json b/src/wp-includes/blocks/post-excerpt/block.json
index 03107ff900e06..223b4c68bde0e 100644
--- a/src/wp-includes/blocks/post-excerpt/block.json
+++ b/src/wp-includes/blocks/post-excerpt/block.json
@@ -20,6 +20,7 @@
},
"usesContext": [ "postId", "postType", "queryId" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/post-featured-image.php b/src/wp-includes/blocks/post-featured-image.php
index 068b7eeac6899..8da66accd3032 100644
--- a/src/wp-includes/blocks/post-featured-image.php
+++ b/src/wp-includes/blocks/post-featured-image.php
@@ -27,12 +27,19 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
$is_link = isset( $attributes['isLink'] ) && $attributes['isLink'];
$size_slug = isset( $attributes['sizeSlug'] ) ? $attributes['sizeSlug'] : 'post-thumbnail';
- $post_title = trim( strip_tags( get_the_title( $post_ID ) ) );
$attr = get_block_core_post_featured_image_border_attributes( $attributes );
$overlay_markup = get_block_core_post_featured_image_overlay_element_markup( $attributes );
if ( $is_link ) {
- $attr['alt'] = $post_title;
+ if ( get_the_title( $post_ID ) ) {
+ $attr['alt'] = trim( strip_tags( get_the_title( $post_ID ) ) );
+ } else {
+ $attr['alt'] = sprintf(
+ // translators: %d is the post ID.
+ __( 'Untitled post %d' ),
+ $post_ID
+ );
+ }
}
if ( ! empty( $attributes['height'] ) ) {
@@ -50,11 +57,13 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
if ( $is_link ) {
$link_target = $attributes['linkTarget'];
$rel = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
+ $height = ! empty( $attributes['height'] ) ? 'style="' . esc_attr( safecss_filter_attr( 'height:' . $attributes['height'] ) ) . '"' : '';
$featured_image = sprintf(
- '%4$s%5$s',
+ '%5$s%6$s',
get_the_permalink( $post_ID ),
esc_attr( $link_target ),
$rel,
+ $height,
$featured_image,
$overlay_markup
);
@@ -62,10 +71,13 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
$featured_image = $featured_image . $overlay_markup;
}
- $wrapper_attributes = empty( $attributes['width'] )
- ? get_block_wrapper_attributes()
- : get_block_wrapper_attributes( array( 'style' => "width:{$attributes['width']};" ) );
-
+ $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 ) {
+ $wrapper_attributes = get_block_wrapper_attributes();
+ } else {
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'style' => $width . $height ) );
+ }
return "
";
if ( isset( $attributes['prefix'] ) && $attributes['prefix'] ) {
diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json
index 26f3915d5b0e0..1633c7c01b82c 100644
--- a/src/wp-includes/blocks/post-terms/block.json
+++ b/src/wp-includes/blocks/post-terms/block.json
@@ -28,6 +28,7 @@
},
"usesContext": [ "postId", "postType" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
@@ -38,6 +39,10 @@
"link": true
}
},
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-title.php b/src/wp-includes/blocks/post-title.php
index 125a2d81ddcbe..1f03b12fc2b46 100644
--- a/src/wp-includes/blocks/post-title.php
+++ b/src/wp-includes/blocks/post-title.php
@@ -26,9 +26,7 @@ function render_block_core_post_title( $attributes, $content, $block ) {
return '';
}
- $tag_name = 'h2';
- $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
-
+ $tag_name = 'h2';
if ( isset( $attributes['level'] ) ) {
$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . $attributes['level'];
}
@@ -37,7 +35,15 @@ function render_block_core_post_title( $attributes, $content, $block ) {
$rel = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
$title = sprintf( '%4$s', get_the_permalink( $post_ID ), esc_attr( $attributes['linkTarget'] ), $rel, $title );
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+
+ $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 ) ) );
return sprintf(
'<%1$s %2$s>%3$s',
diff --git a/src/wp-includes/blocks/post-title/block.json b/src/wp-includes/blocks/post-title/block.json
index 015896ff1bad0..4a56a6f37b779 100644
--- a/src/wp-includes/blocks/post-title/block.json
+++ b/src/wp-includes/blocks/post-title/block.json
@@ -31,6 +31,7 @@
},
"supports": {
"align": [ "wide", "full" ],
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/query-no-results.php b/src/wp-includes/blocks/query-no-results.php
index 6d4dad48f49e0..4342ba57cccbd 100644
--- a/src/wp-includes/blocks/query-no-results.php
+++ b/src/wp-includes/blocks/query-no-results.php
@@ -40,9 +40,11 @@ function render_block_core_query_no_results( $attributes, $content, $block ) {
wp_reset_postdata();
}
+ $classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
return sprintf(
'';
- $link .= '';
+ $link .= '';
$link .= $icon;
$link .= ' ';
- return $link;
+ $w = new WP_HTML_Tag_Processor( $link );
+ $w->next_tag( 'a' );
+ if ( $open_in_new_tab ) {
+ $w->set_attribute( 'rel', esc_attr( $rel ) . ' noopener nofollow' );
+ $w->set_attribute( 'target', '_blank' );
+ } elseif ( '' !== $rel ) {
+ $w->set_attribute( 'rel', esc_attr( $rel ) );
+ }
+ return $w;
}
/**
diff --git a/src/wp-includes/blocks/social-link/block.json b/src/wp-includes/blocks/social-link/block.json
index 90a3f270d738d..e81894591b4b3 100644
--- a/src/wp-includes/blocks/social-link/block.json
+++ b/src/wp-includes/blocks/social-link/block.json
@@ -16,6 +16,9 @@
},
"label": {
"type": "string"
+ },
+ "rel": {
+ "type": "string"
}
},
"usesContext": [
@@ -25,6 +28,7 @@
"iconBackgroundColorValue"
],
"supports": {
+ "anchor": true,
"reusable": false,
"html": false
},
diff --git a/src/wp-includes/blocks/table/block.json b/src/wp-includes/blocks/table/block.json
index 3de088e0879b7..adac1e9c2130e 100644
--- a/src/wp-includes/blocks/table/block.json
+++ b/src/wp-includes/blocks/table/block.json
@@ -47,6 +47,16 @@
"type": "string",
"source": "attribute",
"attribute": "data-align"
+ },
+ "colspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "colspan"
+ },
+ "rowspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "rowspan"
}
}
}
@@ -82,6 +92,16 @@
"type": "string",
"source": "attribute",
"attribute": "data-align"
+ },
+ "colspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "colspan"
+ },
+ "rowspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "rowspan"
}
}
}
@@ -117,6 +137,16 @@
"type": "string",
"source": "attribute",
"attribute": "data-align"
+ },
+ "colspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "colspan"
+ },
+ "rowspan": {
+ "type": "string",
+ "source": "attribute",
+ "attribute": "rowspan"
}
}
}
diff --git a/src/wp-includes/blocks/tag-cloud.php b/src/wp-includes/blocks/tag-cloud.php
index a7d121f7ca632..7ff5f78400db6 100644
--- a/src/wp-includes/blocks/tag-cloud.php
+++ b/src/wp-includes/blocks/tag-cloud.php
@@ -28,14 +28,7 @@ function render_block_core_tag_cloud( $attributes ) {
$tag_cloud = wp_tag_cloud( $args );
if ( ! $tag_cloud ) {
- $labels = get_taxonomy_labels( get_taxonomy( $attributes['taxonomy'] ) );
- $tag_cloud = esc_html(
- sprintf(
- /* translators: %s: taxonomy name */
- __( 'Your site doesn’t have any %s, so there’s nothing to display here at the moment.' ),
- strtolower( $labels->name )
- )
- );
+ $tag_cloud = __( 'There’s no content to show here yet.' );
}
$wrapper_attributes = get_block_wrapper_attributes();
diff --git a/src/wp-includes/blocks/tag-cloud/block.json b/src/wp-includes/blocks/tag-cloud/block.json
index 69e14223f70fb..ec1e333512719 100644
--- a/src/wp-includes/blocks/tag-cloud/block.json
+++ b/src/wp-includes/blocks/tag-cloud/block.json
@@ -36,10 +36,19 @@
],
"supports": {
"html": false,
+ "anchor": true,
"align": true,
"spacing": {
"margin": true,
"padding": true
+ },
+ "typography": {
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalLetterSpacing": true
}
},
"editorStyle": "wp-block-tag-cloud-editor"
diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php
index bef49341d7bb5..7c4cb693fde54 100644
--- a/src/wp-includes/blocks/template-part.php
+++ b/src/wp-includes/blocks/template-part.php
@@ -105,8 +105,7 @@ function render_block_core_template_part( $attributes ) {
// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
// is set in `wp_debug_mode()`.
- $is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
- defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
+ $is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
if ( is_null( $content ) && $is_debug ) {
if ( ! isset( $attributes['slug'] ) ) {
@@ -127,6 +126,21 @@ function render_block_core_template_part( $attributes ) {
'';
}
+ // Look up area definition.
+ $area_definition = null;
+ $defined_areas = get_allowed_block_template_part_areas();
+ foreach ( $defined_areas as $defined_area ) {
+ if ( $defined_area['area'] === $area ) {
+ $area_definition = $defined_area;
+ break;
+ }
+ }
+
+ // If $area is not allowed, set it back to the uncategorized default.
+ if ( ! $area_definition ) {
+ $area = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
+ }
+
// Run through the actions that are typically taken on the_content.
$seen_ids[ $template_part_id ] = true;
$content = do_blocks( $content );
@@ -134,7 +148,7 @@ function render_block_core_template_part( $attributes ) {
$content = wptexturize( $content );
$content = convert_smilies( $content );
$content = shortcode_unautop( $content );
- $content = wp_filter_content_tags( $content );
+ $content = wp_filter_content_tags( $content, "template_part_{$area}" );
$content = do_shortcode( $content );
// Handle embeds for block template parts.
@@ -142,12 +156,9 @@ function render_block_core_template_part( $attributes ) {
$content = $wp_embed->autoembed( $content );
if ( empty( $attributes['tagName'] ) ) {
- $defined_areas = get_allowed_block_template_part_areas();
- $area_tag = 'div';
- foreach ( $defined_areas as $defined_area ) {
- if ( $defined_area['area'] === $area && isset( $defined_area['area_tag'] ) ) {
- $area_tag = $defined_area['area_tag'];
- }
+ $area_tag = 'div';
+ if ( $area_definition && isset( $area_definition['area_tag'] ) ) {
+ $area_tag = $area_definition['area_tag'];
}
$html_tag = $area_tag;
} else {
diff --git a/src/wp-includes/blocks/template-part/block.json b/src/wp-includes/blocks/template-part/block.json
index 3801eee941bc9..282ac2ca22127 100644
--- a/src/wp-includes/blocks/template-part/block.json
+++ b/src/wp-includes/blocks/template-part/block.json
@@ -21,6 +21,7 @@
}
},
"supports": {
+ "anchor": true,
"align": true,
"html": false,
"reusable": false
diff --git a/src/wp-includes/blocks/term-description.php b/src/wp-includes/blocks/term-description.php
index 4f1cd7e518d11..011ec28f2e5e6 100644
--- a/src/wp-includes/blocks/term-description.php
+++ b/src/wp-includes/blocks/term-description.php
@@ -23,10 +23,14 @@ function render_block_core_term_description( $attributes ) {
return '';
}
- $extra_attributes = ( isset( $attributes['textAlign'] ) )
- ? array( 'class' => 'has-text-align-' . $attributes['textAlign'] )
- : array();
- $wrapper_attributes = get_block_wrapper_attributes( $extra_attributes );
+ $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 ) ) );
return '
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
index 2970d60ced4f7..26696ef084ce3 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
@@ -1,5 +1,5 @@
-
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html b/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
index b67b8225a5aa2..1b47cd7b0bca6 100644
--- a/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
@@ -1,3 +1,3 @@
-
%2$s
',
- get_block_wrapper_attributes(),
+ $wrapper_attributes,
$content
);
}
diff --git a/src/wp-includes/blocks/query-no-results/block.json b/src/wp-includes/blocks/query-no-results/block.json
index f042223f36aec..789dcc8e66f60 100644
--- a/src/wp-includes/blocks/query-no-results/block.json
+++ b/src/wp-includes/blocks/query-no-results/block.json
@@ -9,6 +9,7 @@
"textdomain": "default",
"usesContext": [ "queryId", "query" ],
"supports": {
+ "anchor": true,
"align": true,
"reusable": false,
"html": false,
diff --git a/src/wp-includes/blocks/query-pagination-next/block.json b/src/wp-includes/blocks/query-pagination-next/block.json
index ad87d05b5ed99..d4861519f149e 100644
--- a/src/wp-includes/blocks/query-pagination-next/block.json
+++ b/src/wp-includes/blocks/query-pagination-next/block.json
@@ -14,6 +14,7 @@
},
"usesContext": [ "queryId", "query", "paginationArrow" ],
"supports": {
+ "anchor": true,
"reusable": false,
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/query-pagination-numbers/block.json b/src/wp-includes/blocks/query-pagination-numbers/block.json
index fd28596581961..a05faff5f1b52 100644
--- a/src/wp-includes/blocks/query-pagination-numbers/block.json
+++ b/src/wp-includes/blocks/query-pagination-numbers/block.json
@@ -9,6 +9,7 @@
"textdomain": "default",
"usesContext": [ "queryId", "query" ],
"supports": {
+ "anchor": true,
"reusable": false,
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/query-pagination-previous/block.json b/src/wp-includes/blocks/query-pagination-previous/block.json
index 484cefe6bbd82..823808b0fb054 100644
--- a/src/wp-includes/blocks/query-pagination-previous/block.json
+++ b/src/wp-includes/blocks/query-pagination-previous/block.json
@@ -14,6 +14,7 @@
},
"usesContext": [ "queryId", "query", "paginationArrow" ],
"supports": {
+ "anchor": true,
"reusable": false,
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/query-pagination.php b/src/wp-includes/blocks/query-pagination.php
index eaa784be08e7d..9b7289ec22e0f 100644
--- a/src/wp-includes/blocks/query-pagination.php
+++ b/src/wp-includes/blocks/query-pagination.php
@@ -18,9 +18,11 @@ function render_block_core_query_pagination( $attributes, $content ) {
return '';
}
+ $classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
$wrapper_attributes = get_block_wrapper_attributes(
array(
'aria-label' => __( 'Pagination' ),
+ 'class' => $classes,
)
);
diff --git a/src/wp-includes/blocks/query-pagination/block.json b/src/wp-includes/blocks/query-pagination/block.json
index f75f4077d4e13..fa980575ec969 100644
--- a/src/wp-includes/blocks/query-pagination/block.json
+++ b/src/wp-includes/blocks/query-pagination/block.json
@@ -18,6 +18,7 @@
"paginationArrow": "paginationArrow"
},
"supports": {
+ "anchor": true,
"align": true,
"reusable": false,
"html": false,
diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json
index 33df75866bce0..029762c321e39 100644
--- a/src/wp-includes/blocks/query-title/block.json
+++ b/src/wp-includes/blocks/query-title/block.json
@@ -27,6 +27,7 @@
}
},
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/query/block.json b/src/wp-includes/blocks/query/block.json
index cd09e22ee57f7..bcff0e3ac63b1 100644
--- a/src/wp-includes/blocks/query/block.json
+++ b/src/wp-includes/blocks/query/block.json
@@ -49,15 +49,8 @@
},
"supports": {
"align": [ "wide", "full" ],
+ "anchor": true,
"html": false,
- "color": {
- "gradients": true,
- "link": true,
- "__experimentalDefaultControls": {
- "background": true,
- "text": true
- }
- },
"__experimentalLayout": true
},
"editorStyle": "wp-block-query-editor"
diff --git a/src/wp-includes/blocks/read-more.php b/src/wp-includes/blocks/read-more.php
index 93013b2517d14..7bfd22e6d4c4d 100644
--- a/src/wp-includes/blocks/read-more.php
+++ b/src/wp-includes/blocks/read-more.php
@@ -19,15 +19,22 @@ function render_block_core_read_more( $attributes, $content, $block ) {
}
$post_ID = $block->context['postId'];
+ $post_title = get_the_title( $post_ID );
+ $screen_reader_text = sprintf(
+ /* translators: %s is either the post title or post ID to describe the link for screen readers. */
+ __( ': %s' ),
+ '' !== $post_title ? $post_title : __( 'untitled post ' ) . $post_ID
+ );
$justify_class_name = empty( $attributes['justifyContent'] ) ? '' : "is-justified-{$attributes['justifyContent']}";
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $justify_class_name ) );
$more_text = ! empty( $attributes['content'] ) ? wp_kses_post( $attributes['content'] ) : __( 'Read more' );
return sprintf(
- '%4s',
+ '%4s%5s',
$wrapper_attributes,
get_the_permalink( $post_ID ),
esc_attr( $attributes['linkTarget'] ),
- $more_text
+ $more_text,
+ $screen_reader_text
);
}
diff --git a/src/wp-includes/blocks/read-more/block.json b/src/wp-includes/blocks/read-more/block.json
index 61b0452c7c80e..ed2b23c3b7f0f 100644
--- a/src/wp-includes/blocks/read-more/block.json
+++ b/src/wp-includes/blocks/read-more/block.json
@@ -17,6 +17,7 @@
},
"usesContext": [ "postId" ],
"supports": {
+ "anchor": true,
"html": false,
"color": {
"gradients": true,
diff --git a/src/wp-includes/blocks/require-dynamic-blocks.php b/src/wp-includes/blocks/require-dynamic-blocks.php
index 4841d214c84ce..1f9bf0a16c802 100644
--- a/src/wp-includes/blocks/require-dynamic-blocks.php
+++ b/src/wp-includes/blocks/require-dynamic-blocks.php
@@ -22,6 +22,7 @@
require_once ABSPATH . WPINC . '/blocks/cover.php';
require_once ABSPATH . WPINC . '/blocks/file.php';
require_once ABSPATH . WPINC . '/blocks/gallery.php';
+require_once ABSPATH . WPINC . '/blocks/heading.php';
require_once ABSPATH . WPINC . '/blocks/home-link.php';
require_once ABSPATH . WPINC . '/blocks/image.php';
require_once ABSPATH . WPINC . '/blocks/latest-comments.php';
@@ -34,6 +35,7 @@
require_once ABSPATH . WPINC . '/blocks/pattern.php';
require_once ABSPATH . WPINC . '/blocks/post-author.php';
require_once ABSPATH . WPINC . '/blocks/post-author-biography.php';
+require_once ABSPATH . WPINC . '/blocks/post-author-name.php';
require_once ABSPATH . WPINC . '/blocks/post-comments-form.php';
require_once ABSPATH . WPINC . '/blocks/post-content.php';
require_once ABSPATH . WPINC . '/blocks/post-date.php';
diff --git a/src/wp-includes/blocks/require-static-blocks.php b/src/wp-includes/blocks/require-static-blocks.php
index 9a1884e9cf09b..44009bef5fff0 100644
--- a/src/wp-includes/blocks/require-static-blocks.php
+++ b/src/wp-includes/blocks/require-static-blocks.php
@@ -12,7 +12,6 @@
'embed',
'freeform',
'group',
- 'heading',
'html',
'list',
'list-item',
@@ -20,6 +19,7 @@
'missing',
'more',
'nextpage',
+ 'page-list-item',
'paragraph',
'preformatted',
'pullquote',
diff --git a/src/wp-includes/blocks/rss.php b/src/wp-includes/blocks/rss.php
index e32155195af1d..91cdab3f589e0 100644
--- a/src/wp-includes/blocks/rss.php
+++ b/src/wp-includes/blocks/rss.php
@@ -48,7 +48,7 @@ function render_block_core_rss( $attributes ) {
if ( $date ) {
$date = sprintf(
' ',
- esc_attr( date_i18n( get_option( 'c' ), $date ) ),
+ esc_attr( date_i18n( 'c', $date ) ),
esc_attr( date_i18n( get_option( 'date_format' ), $date ) )
);
}
diff --git a/src/wp-includes/blocks/rss/block.json b/src/wp-includes/blocks/rss/block.json
index 8a351d877a751..2e3fd4b2d385e 100644
--- a/src/wp-includes/blocks/rss/block.json
+++ b/src/wp-includes/blocks/rss/block.json
@@ -43,6 +43,7 @@
},
"supports": {
"align": true,
+ "anchor": true,
"html": false
},
"editorStyle": "wp-block-rss-editor",
diff --git a/src/wp-includes/blocks/search.php b/src/wp-includes/blocks/search.php
index 26b6a7585ccc7..c7461a86795b5 100644
--- a/src/wp-includes/blocks/search.php
+++ b/src/wp-includes/blocks/search.php
@@ -66,14 +66,14 @@ function render_block_core_search( $attributes ) {
if ( $show_input ) {
$input_classes = array( 'wp-block-search__input' );
- if ( $is_button_inside ) {
+ if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
$input_classes[] = $border_color_classes;
}
if ( ! empty( $typography_classes ) ) {
$input_classes[] = $typography_classes;
}
$input_markup = sprintf(
- '',
+ '',
$input_id,
esc_attr( implode( ' ', $input_classes ) ),
get_search_query(),
diff --git a/src/wp-includes/blocks/search/block.json b/src/wp-includes/blocks/search/block.json
index fbd0fa874c408..387295ebb36de 100644
--- a/src/wp-includes/blocks/search/block.json
+++ b/src/wp-includes/blocks/search/block.json
@@ -46,6 +46,7 @@
},
"supports": {
"align": [ "left", "center", "right" ],
+ "anchor": true,
"color": {
"gradients": true,
"__experimentalSkipSerialization": true,
diff --git a/src/wp-includes/blocks/site-logo/block.json b/src/wp-includes/blocks/site-logo/block.json
index f7efcb72159ff..f5eab1de304bc 100644
--- a/src/wp-includes/blocks/site-logo/block.json
+++ b/src/wp-includes/blocks/site-logo/block.json
@@ -31,6 +31,7 @@
},
"supports": {
"html": false,
+ "anchor": true,
"align": true,
"alignWide": false,
"color": {
diff --git a/src/wp-includes/blocks/site-tagline/block.json b/src/wp-includes/blocks/site-tagline/block.json
index 7a69e6b1e22a9..c7da7ebf3fdde 100644
--- a/src/wp-includes/blocks/site-tagline/block.json
+++ b/src/wp-includes/blocks/site-tagline/block.json
@@ -4,7 +4,7 @@
"name": "core/site-tagline",
"title": "Site Tagline",
"category": "theme",
- "description": "Describe in a few words what the site is about. The tagline can be used in search results or when sharing on social networks even if it's not displayed in the theme design.",
+ "description": "Describe in a few words what the site is about. The tagline can be used in search results or when sharing on social networks even if it’s not displayed in the theme design.",
"keywords": [ "description" ],
"textdomain": "default",
"attributes": {
@@ -13,6 +13,7 @@
}
},
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"color": {
diff --git a/src/wp-includes/blocks/site-title.php b/src/wp-includes/blocks/site-title.php
index 3c3e4d8669238..255615b3a4e45 100644
--- a/src/wp-includes/blocks/site-title.php
+++ b/src/wp-includes/blocks/site-title.php
@@ -18,8 +18,11 @@ function render_block_core_site_title( $attributes ) {
return;
}
- $tag_name = 'h1';
- $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+ $tag_name = 'h1';
+ $classes = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classes .= ' has-link-color';
+ }
if ( isset( $attributes['level'] ) ) {
$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
@@ -37,7 +40,7 @@ function render_block_core_site_title( $attributes ) {
esc_html( $site_title )
);
}
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classes ) ) );
return sprintf(
'<%1$s %2$s>%3$s',
diff --git a/src/wp-includes/blocks/site-title/block.json b/src/wp-includes/blocks/site-title/block.json
index 717db27747d7f..b69acda934fda 100644
--- a/src/wp-includes/blocks/site-title/block.json
+++ b/src/wp-includes/blocks/site-title/block.json
@@ -27,6 +27,7 @@
"viewportWidth": 500
},
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"color": {
@@ -60,5 +61,6 @@
}
}
},
- "editorStyle": "wp-block-site-title-editor"
+ "editorStyle": "wp-block-site-title-editor",
+ "style": "wp-block-site-title"
}
diff --git a/src/wp-includes/blocks/social-link.php b/src/wp-includes/blocks/social-link.php
index 3aabd2a9a8430..7e669bf56d6da 100644
--- a/src/wp-includes/blocks/social-link.php
+++ b/src/wp-includes/blocks/social-link.php
@@ -20,6 +20,7 @@ function render_block_core_social_link( $attributes, $content, $block ) {
$service = ( isset( $attributes['service'] ) ) ? $attributes['service'] : 'Icon';
$url = ( isset( $attributes['url'] ) ) ? $attributes['url'] : false;
$label = ( isset( $attributes['label'] ) ) ? $attributes['label'] : block_core_social_link_get_name( $service );
+ $rel = ( isset( $attributes['rel'] ) ) ? $attributes['rel'] : '';
$show_labels = array_key_exists( 'showLabels', $block->context ) ? $block->context['showLabels'] : false;
// Don't render a link if there is no URL set.
@@ -43,11 +44,6 @@ function render_block_core_social_link( $attributes, $content, $block ) {
$url = 'https://' . $url;
}
- $rel_target_attributes = '';
- if ( $open_in_new_tab ) {
- $rel_target_attributes = 'rel="noopener nofollow" target="_blank"';
- }
-
$icon = block_core_social_link_get_icon( $service );
$wrapper_attributes = get_block_wrapper_attributes(
array(
@@ -57,13 +53,21 @@ function render_block_core_social_link( $attributes, $content, $block ) {
);
$link = '' . $term_description . '
';
}
diff --git a/src/wp-includes/blocks/term-description/block.json b/src/wp-includes/blocks/term-description/block.json
index 66eb9348a4709..5e945b2d0f637 100644
--- a/src/wp-includes/blocks/term-description/block.json
+++ b/src/wp-includes/blocks/term-description/block.json
@@ -12,6 +12,7 @@
}
},
"supports": {
+ "anchor": true,
"align": [ "wide", "full" ],
"html": false,
"color": {
diff --git a/src/wp-includes/class-wp-block-parser.php b/src/wp-includes/class-wp-block-parser.php
index 95add35cbfb6f..50337b588a37b 100644
--- a/src/wp-includes/class-wp-block-parser.php
+++ b/src/wp-includes/class-wp-block-parser.php
@@ -80,7 +80,7 @@ class WP_Block_Parser_Block {
* @param string $innerHTML Resultant HTML from inside block comment delimiters after removing inner blocks.
* @param array $innerContent List of string fragments and null markers where inner blocks were found.
*/
- function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
+ public function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
$this->blockName = $name;
$this->attrs = $attrs;
$this->innerBlocks = $innerBlocks;
@@ -152,7 +152,7 @@ class WP_Block_Parser_Frame {
* @param int $prev_offset Byte offset into document for after parse token ends.
* @param int $leading_html_start Byte offset into document where leading HTML before token starts.
*/
- function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
+ public function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
$this->block = $block;
$this->token_start = $token_start;
$this->token_length = $token_length;
@@ -224,16 +224,16 @@ class WP_Block_Parser {
* @param string $document Input document being parsed.
* @return array[]
*/
- function parse( $document ) {
+ public function parse( $document ) {
$this->document = $document;
$this->offset = 0;
$this->output = array();
$this->stack = array();
$this->empty_attrs = json_decode( '{}', true );
- do {
- // twiddle our thumbs.
- } while ( $this->proceed() );
+ while ( $this->proceed() ) {
+ continue;
+ }
return $this->output;
}
@@ -252,7 +252,7 @@ function parse( $document ) {
* @since 5.0.0
* @return bool
*/
- function proceed() {
+ public function proceed() {
$next_token = $this->next_token();
list( $token_type, $block_name, $attrs, $start_offset, $token_length ) = $next_token;
$stack_depth = count( $this->stack );
@@ -398,7 +398,7 @@ function proceed() {
* @since 4.6.1 fixed a bug in attribute parsing which caused catastrophic backtracking on invalid block comments
* @return array
*/
- function next_token() {
+ public function next_token() {
$matches = null;
/*
@@ -473,7 +473,7 @@ function next_token() {
* @param string $innerHTML HTML content of block.
* @return WP_Block_Parser_Block freeform block object.
*/
- function freeform( $innerHTML ) {
+ public function freeform( $innerHTML ) {
return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $innerHTML, array( $innerHTML ) );
}
@@ -485,7 +485,7 @@ function freeform( $innerHTML ) {
* @since 5.0.0
* @param null $length how many bytes of document text to output.
*/
- function add_freeform( $length = null ) {
+ public function add_freeform( $length = null ) {
$length = $length ? $length : strlen( $this->document ) - $this->offset;
if ( 0 === $length ) {
@@ -506,7 +506,7 @@ function add_freeform( $length = null ) {
* @param int $token_length Byte length of entire block from start of opening token to end of closing token.
* @param int|null $last_offset Last byte offset into document if continuing form earlier output.
*/
- function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
+ public function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
$parent = $this->stack[ count( $this->stack ) - 1 ];
$parent->block->innerBlocks[] = (array) $block;
$html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
@@ -527,7 +527,7 @@ function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_len
* @since 5.0.0
* @param int|null $end_offset byte offset into document for where we should stop sending text output as HTML.
*/
- function add_block_from_stack( $end_offset = null ) {
+ public function add_block_from_stack( $end_offset = null ) {
$stack_top = array_pop( $this->stack );
$prev_offset = $stack_top->prev_offset;
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index eceeeb88a3b44..1cd1eef3c34cc 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -104,8 +104,8 @@ function wp_default_packages_vendor( $scripts ) {
);
$vendor_scripts_versions = array(
- 'react' => '17.0.1',
- 'react-dom' => '17.0.1',
+ 'react' => '18.2.0',
+ 'react-dom' => '18.2.0',
'regenerator-runtime' => '0.13.9',
'moment' => '2.29.4',
'lodash' => '4.17.19',
diff --git a/tests/e2e/specs/edit-posts.test.js b/tests/e2e/specs/edit-posts.test.js
index 51d8824bb5638..8fa93e9e0bd28 100644
--- a/tests/e2e/specs/edit-posts.test.js
+++ b/tests/e2e/specs/edit-posts.test.js
@@ -4,6 +4,7 @@ import {
publishPost,
trashAllPosts,
visitAdminPage,
+ canvas,
} from '@wordpress/e2e-test-utils';
describe( 'Edit Posts', () => {
@@ -58,10 +59,11 @@ describe( 'Edit Posts', () => {
await page.waitForNavigation();
// Wait for title field to render onscreen.
- await page.waitForSelector( '.editor-post-title__input' );
+ await page.waitForSelector( 'iframe[name="editor-canvas"]' );
+ await canvas().waitForSelector( '.editor-post-title__input' );
// Expect to now be in the editor with the correct post title shown.
- const editorPostTitleInput = await page.$x(
+ const editorPostTitleInput = await canvas().$x(
`//h1[contains(@class, "editor-post-title__input")][contains(text(), "${ title }")]`
);
expect( editorPostTitleInput.length ).toBe( 1 );
diff --git a/tests/phpunit/data/blocks/fixtures/core__archives.server.html b/tests/phpunit/data/blocks/fixtures/core__archives.server.html
index 9191cc5b0380a..19e64659ef9c2 100644
--- a/tests/phpunit/data/blocks/fixtures/core__archives.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__archives.server.html
@@ -1 +1 @@
-No archives to show.
\ No newline at end of file
+No archives to show.
\ No newline at end of file
diff --git a/tests/phpunit/data/blocks/fixtures/core__archives__showPostCounts.server.html b/tests/phpunit/data/blocks/fixtures/core__archives__showPostCounts.server.html
index 9191cc5b0380a..19e64659ef9c2 100644
--- a/tests/phpunit/data/blocks/fixtures/core__archives__showPostCounts.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__archives__showPostCounts.server.html
@@ -1 +1 @@
-No archives to show.
\ No newline at end of file
+No archives to show.
\ No newline at end of file
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery.server.html
index c7a5d3bb44aa8..d4d99cfc6ee84 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery.server.html
@@ -1,5 +1,5 @@
-
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
index 2970d60ced4f7..26696ef084ce3 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
@@ -1,5 +1,5 @@
-
diff --git a/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html b/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
index b67b8225a5aa2..1b47cd7b0bca6 100644
--- a/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
@@ -1,3 +1,3 @@
-