$kind );
- if ( is_post_type_archive() ) {
+ if ( is_post_type_archive() && ! empty( $attributes['url'] ) ) {
$queried_archive_link = get_post_type_archive_link( get_queried_object()->name );
if ( $attributes['url'] === $queried_archive_link ) {
$is_active = true;
diff --git a/src/wp-includes/blocks/navigation-link/block.json b/src/wp-includes/blocks/navigation-link/block.json
index 2762bd24e446a..5f2d10b97dabe 100644
--- a/src/wp-includes/blocks/navigation-link/block.json
+++ b/src/wp-includes/blocks/navigation-link/block.json
@@ -14,7 +14,8 @@
"textdomain": "default",
"attributes": {
"label": {
- "type": "string"
+ "type": "string",
+ "role": "content"
},
"type": {
"type": "string"
diff --git a/src/wp-includes/blocks/navigation-submenu.php b/src/wp-includes/blocks/navigation-submenu.php
index 016e708c3256e..77f2c1fa635fc 100644
--- a/src/wp-includes/blocks/navigation-submenu.php
+++ b/src/wp-includes/blocks/navigation-submenu.php
@@ -86,7 +86,7 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
$kind = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
$is_active = ! empty( $attributes['id'] ) && get_queried_object_id() === (int) $attributes['id'] && ! empty( get_queried_object()->$kind );
- if ( is_post_type_archive() ) {
+ if ( is_post_type_archive() && ! empty( $attributes['url'] ) ) {
$queried_archive_link = get_post_type_archive_link( get_queried_object()->name );
if ( $attributes['url'] === $queried_archive_link ) {
$is_active = true;
diff --git a/src/wp-includes/blocks/navigation-submenu/block.json b/src/wp-includes/blocks/navigation-submenu/block.json
index e767b60aec3a6..be56628e6142e 100644
--- a/src/wp-includes/blocks/navigation-submenu/block.json
+++ b/src/wp-includes/blocks/navigation-submenu/block.json
@@ -9,7 +9,8 @@
"textdomain": "default",
"attributes": {
"label": {
- "type": "string"
+ "type": "string",
+ "role": "content"
},
"type": {
"type": "string"
diff --git a/src/wp-includes/blocks/navigation.php b/src/wp-includes/blocks/navigation.php
index d52b67b7e1958..5e8b2b492e172 100644
--- a/src/wp-includes/blocks/navigation.php
+++ b/src/wp-includes/blocks/navigation.php
@@ -133,7 +133,6 @@ private static function does_block_need_a_list_item_wrapper( $block ) {
* @since 6.5.0
*
* @param array $needs_list_item_wrapper The list of blocks that need a list item wrapper.
- * @return array The list of blocks that need a list item wrapper.
*/
$needs_list_item_wrapper = apply_filters( 'block_core_navigation_listable_blocks', static::$needs_list_item_wrapper );
@@ -479,10 +478,10 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
);
$should_display_icon_label = isset( $attributes['hasIcon'] ) && true === $attributes['hasIcon'];
- $toggle_button_icon = '
';
+ $toggle_button_icon = '
';
if ( isset( $attributes['icon'] ) ) {
if ( 'menu' === $attributes['icon'] ) {
- $toggle_button_icon = '
';
+ $toggle_button_icon = '
';
}
}
$toggle_button_content = $should_display_icon_label ? $toggle_button_icon : __( 'Menu' );
@@ -819,7 +818,7 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
) ) {
// Add directives to the parent `
`.
$tags->set_attribute( 'data-wp-interactive', 'core/navigation' );
- $tags->set_attribute( 'data-wp-context', '{ "submenuOpenedBy": { "click": false, "hover": false, "focus": false }, "type": "submenu", "modal": null }' );
+ $tags->set_attribute( 'data-wp-context', '{ "submenuOpenedBy": { "click": false, "hover": false, "focus": false }, "type": "submenu", "modal": null, "previousFocus": null }' );
$tags->set_attribute( 'data-wp-watch', 'callbacks.initMenu' );
$tags->set_attribute( 'data-wp-on--focusout', 'actions.handleMenuFocusout' );
$tags->set_attribute( 'data-wp-on--keydown', 'actions.handleMenuKeydown' );
diff --git a/src/wp-includes/blocks/navigation/block.json b/src/wp-includes/blocks/navigation/block.json
index c65e0c6224616..249193e1cc234 100644
--- a/src/wp-includes/blocks/navigation/block.json
+++ b/src/wp-includes/blocks/navigation/block.json
@@ -138,7 +138,8 @@
}
},
"interactivity": true,
- "renaming": false
+ "renaming": false,
+ "contentRole": true
},
"editorStyle": "wp-block-navigation-editor",
"style": "wp-block-navigation"
diff --git a/src/wp-includes/blocks/page-list/block.json b/src/wp-includes/blocks/page-list/block.json
index 8802022382241..317502b1200b4 100644
--- a/src/wp-includes/blocks/page-list/block.json
+++ b/src/wp-includes/blocks/page-list/block.json
@@ -76,7 +76,8 @@
"padding": false,
"margin": false
}
- }
+ },
+ "contentRole": true
},
"editorStyle": "wp-block-page-list-editor",
"style": "wp-block-page-list"
diff --git a/src/wp-includes/blocks/paragraph/block.json b/src/wp-includes/blocks/paragraph/block.json
index 7e004019cbf28..9617627ef5d0d 100644
--- a/src/wp-includes/blocks/paragraph/block.json
+++ b/src/wp-includes/blocks/paragraph/block.json
@@ -65,6 +65,7 @@
"__experimentalLetterSpacing": true,
"__experimentalTextTransform": true,
"__experimentalWritingMode": true,
+ "fitText": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/pattern/block.json b/src/wp-includes/blocks/pattern/block.json
index c30be8458e636..2a761dfd643ba 100644
--- a/src/wp-includes/blocks/pattern/block.json
+++ b/src/wp-includes/blocks/pattern/block.json
@@ -9,6 +9,7 @@
"html": false,
"inserter": false,
"renaming": false,
+ "blockVisibility": false,
"interactivity": {
"clientNavigation": true
}
diff --git a/src/wp-includes/blocks/post-author/block.json b/src/wp-includes/blocks/post-author/block.json
index c7f2f01550a61..a83bb48bd840a 100644
--- a/src/wp-includes/blocks/post-author/block.json
+++ b/src/wp-includes/blocks/post-author/block.json
@@ -58,7 +58,6 @@
"color": {
"gradients": true,
"link": true,
- "__experimentalDuotone": ".wp-block-post-author__avatar img",
"__experimentalDefaultControls": {
"background": true,
"text": true
@@ -78,6 +77,14 @@
"width": true,
"style": true
}
+ },
+ "filter": {
+ "duotone": true
+ }
+ },
+ "selectors": {
+ "filter": {
+ "duotone": ".wp-block-post-author .wp-block-post-author__avatar img"
}
},
"editorStyle": "wp-block-post-author-editor",
diff --git a/src/wp-includes/blocks/post-comments-count.php b/src/wp-includes/blocks/post-comments-count.php
new file mode 100644
index 0000000000000..bf12d6f0f9c4c
--- /dev/null
+++ b/src/wp-includes/blocks/post-comments-count.php
@@ -0,0 +1,49 @@
+context['postId'] ) ) {
+ return '';
+ }
+
+ $classes = '';
+ if ( isset( $attributes['textAlign'] ) ) {
+ $classes .= 'has-text-align-' . $attributes['textAlign'];
+ }
+
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ return sprintf(
+ '%2$s
',
+ $wrapper_attributes,
+ get_comments_number( $block->context['postId'] )
+ );
+}
+
+/**
+ * Registers the `core/post-comments-count` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_post_comments_count() {
+ register_block_type_from_metadata(
+ __DIR__ . '/post-comments-count',
+ array(
+ 'render_callback' => 'render_block_core_post_comments_count',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_post_comments_count' );
diff --git a/src/wp-includes/blocks/post-comments-count/block.json b/src/wp-includes/blocks/post-comments-count/block.json
new file mode 100644
index 0000000000000..fa8ade2f2c12f
--- /dev/null
+++ b/src/wp-includes/blocks/post-comments-count/block.json
@@ -0,0 +1,55 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/post-comments-count",
+ "title": "Comments Count",
+ "category": "theme",
+ "description": "Display a post's comments count.",
+ "textdomain": "default",
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ }
+ },
+ "usesContext": [ "postId" ],
+ "example": {
+ "viewportWidth": 350
+ },
+ "supports": {
+ "html": false,
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ },
+ "interactivity": {
+ "clientNavigation": true
+ }
+ },
+ "style": "wp-block-post-comments-count"
+}
diff --git a/src/wp-includes/blocks/post-comments-link.php b/src/wp-includes/blocks/post-comments-link.php
new file mode 100644
index 0000000000000..c6d33eb0cd65c
--- /dev/null
+++ b/src/wp-includes/blocks/post-comments-link.php
@@ -0,0 +1,75 @@
+context['postId'] ) ||
+ isset( $block->context['postId'] ) &&
+ ! comments_open( $block->context['postId'] )
+ ) {
+ return '';
+ }
+
+ $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 ) ) );
+ $comments_number = (int) get_comments_number( $block->context['postId'] );
+ $comments_link = get_comments_link( $block->context['postId'] );
+ $post_title = get_the_title( $block->context['postId'] );
+ $comment_html = '';
+
+ if ( 0 === $comments_number ) {
+ $comment_html = sprintf(
+ /* translators: %s post title */
+ __( 'No comments on %s' ),
+ $post_title
+ );
+ } else {
+ $comment_html = sprintf(
+ /* translators: 1: Number of comments, 2: post title */
+ _n(
+ '%1$s comment on %2$s',
+ '%1$s comments on %2$s',
+ $comments_number
+ ),
+ esc_html( number_format_i18n( $comments_number ) ),
+ $post_title
+ );
+ }
+
+ return '';
+}
+
+/**
+ * Registers the `core/post-comments-link` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_post_comments_link() {
+ register_block_type_from_metadata(
+ __DIR__ . '/post-comments-link',
+ array(
+ 'render_callback' => 'render_block_core_post_comments_link',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_post_comments_link' );
diff --git a/src/wp-includes/blocks/post-comments-link/block.json b/src/wp-includes/blocks/post-comments-link/block.json
new file mode 100644
index 0000000000000..e0dcdb9afa03d
--- /dev/null
+++ b/src/wp-includes/blocks/post-comments-link/block.json
@@ -0,0 +1,62 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/post-comments-link",
+ "title": "Comments Link",
+ "category": "theme",
+ "description": "Displays the link to the current post comments.",
+ "textdomain": "default",
+ "usesContext": [ "postType", "postId" ],
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ }
+ },
+ "example": {
+ "viewportWidth": 350
+ },
+ "supports": {
+ "html": false,
+ "color": {
+ "link": true,
+ "text": false,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "link": true
+ }
+ },
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-post-comments-link"
+}
diff --git a/src/wp-includes/blocks/post-content.php b/src/wp-includes/blocks/post-content.php
index 25be880cc4788..0be1a8730f605 100644
--- a/src/wp-includes/blocks/post-content.php
+++ b/src/wp-includes/blocks/post-content.php
@@ -54,12 +54,19 @@ function render_block_core_post_content( $attributes, $content, $block ) {
return '';
}
+ $tag_name = 'div';
+
+ if ( ! empty( $attributes['tagName'] ) && tag_escape( $attributes['tagName'] ) === $attributes['tagName'] ) {
+ $tag_name = $attributes['tagName'];
+ }
+
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => 'entry-content' ) );
- return (
- '' .
- $content .
- '
'
+ return sprintf(
+ '<%1$s %2$s>%3$s',
+ $tag_name,
+ $wrapper_attributes,
+ $content
);
}
diff --git a/src/wp-includes/blocks/post-content/block.json b/src/wp-includes/blocks/post-content/block.json
index 1348cb296af08..264f6959304fe 100644
--- a/src/wp-includes/blocks/post-content/block.json
+++ b/src/wp-includes/blocks/post-content/block.json
@@ -7,6 +7,12 @@
"description": "Displays the contents of a post or page.",
"textdomain": "default",
"usesContext": [ "postId", "postType", "queryId" ],
+ "attributes": {
+ "tagName": {
+ "type": "string",
+ "default": "div"
+ }
+ },
"example": {
"viewportWidth": 350
},
@@ -55,6 +61,9 @@
"fontSize": true
}
},
+ "interactivity": {
+ "clientNavigation": true
+ },
"__experimentalBorder": {
"radius": true,
"color": true,
diff --git a/src/wp-includes/blocks/post-date.php b/src/wp-includes/blocks/post-date.php
index 79aa81e7f9c11..e12a26eda7c12 100644
--- a/src/wp-includes/blocks/post-date.php
+++ b/src/wp-includes/blocks/post-date.php
@@ -9,6 +9,7 @@
* Renders the `core/post-date` block on the server.
*
* @since 5.8.0
+ * @since 6.9.0 Added `datetime` attribute and Block Bindings support.
*
* @param array $attributes Block attributes.
* @param string $content Block default content.
@@ -16,14 +17,49 @@
* @return string Returns the filtered post date for the current post wrapped inside "time" tags.
*/
function render_block_core_post_date( $attributes, $content, $block ) {
- if ( ! isset( $block->context['postId'] ) ) {
+ $classes = array();
+
+ if (
+ ! isset( $attributes['datetime'] ) && ! (
+ isset( $attributes['metadata']['bindings']['datetime']['source'] ) &&
+ isset( $attributes['metadata']['bindings']['datetime']['args'] )
+ )
+ ) {
+ /*
+ * This is the legacy version of the block that didn't have the `datetime` attribute.
+ * This branch needs to be kept for backward compatibility.
+ */
+ $source = get_block_bindings_source( 'core/post-data' );
+ if ( isset( $attributes['displayType'] ) && 'modified' === $attributes['displayType'] ) {
+ $source_args = array(
+ 'field' => 'modified',
+ );
+ } else {
+ $source_args = array(
+ 'field' => 'date',
+ );
+ }
+ $attributes['datetime'] = $source->get_value( $source_args, $block, 'datetime' );
+ }
+
+ if ( isset( $source_args['field'] ) && 'modified' === $source_args['field'] ) {
+ $classes[] = 'wp-block-post-date__modified-date';
+ }
+
+ if ( empty( $attributes['datetime'] ) ) {
+ // If the `datetime` attribute is set but empty, it could be because Block Bindings
+ // set it that way. This can happen e.g. if the block is bound to the
+ // post's last modified date, and the latter lies before the publish date.
+ // (See https://github.com/WordPress/gutenberg/pull/46839 where this logic was originally
+ // implemented.)
+ // In this case, we have to respect and return the empty value.
return '';
}
- $post_ID = $block->context['postId'];
+ $unformatted_date = $attributes['datetime'];
+ $post_timestamp = strtotime( $unformatted_date );
if ( isset( $attributes['format'] ) && 'human-diff' === $attributes['format'] ) {
- $post_timestamp = get_post_timestamp( $post_ID );
if ( $post_timestamp > time() ) {
// translators: %s: human-readable time difference.
$formatted_date = sprintf( __( '%s from now' ), human_time_diff( $post_timestamp ) );
@@ -32,10 +68,9 @@ function render_block_core_post_date( $attributes, $content, $block ) {
$formatted_date = sprintf( __( '%s ago' ), human_time_diff( $post_timestamp ) );
}
} else {
- $formatted_date = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+ $format = empty( $attributes['format'] ) ? get_option( 'date_format' ) : $attributes['format'];
+ $formatted_date = wp_date( $format, $post_timestamp );
}
- $unformatted_date = esc_attr( get_the_date( 'c', $post_ID ) );
- $classes = array();
if ( isset( $attributes['textAlign'] ) ) {
$classes[] = 'has-text-align-' . $attributes['textAlign'];
@@ -44,29 +79,10 @@ function render_block_core_post_date( $attributes, $content, $block ) {
$classes[] = 'has-link-color';
}
- /*
- * 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'] ) {
- if ( get_the_modified_date( 'Ymdhi', $post_ID ) > get_the_date( 'Ymdhi', $post_ID ) ) {
- if ( isset( $attributes['format'] ) && 'human-diff' === $attributes['format'] ) {
- // translators: %s: human-readable time difference.
- $formatted_date = sprintf( __( '%s ago' ), human_time_diff( get_post_timestamp( $post_ID, 'modified' ) ) );
- } else {
- $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 );
+ if ( isset( $attributes['isLink'] ) && $attributes['isLink'] && isset( $block->context['postId'] ) ) {
+ $formatted_date = sprintf( '%2s', get_the_permalink( $block->context['postId'] ), $formatted_date );
}
return sprintf(
diff --git a/src/wp-includes/blocks/post-date/block.json b/src/wp-includes/blocks/post-date/block.json
index dadc0d2f489fe..0a3be0a00b33d 100644
--- a/src/wp-includes/blocks/post-date/block.json
+++ b/src/wp-includes/blocks/post-date/block.json
@@ -7,6 +7,10 @@
"description": "Display the publish date for an entry such as a post or page.",
"textdomain": "default",
"attributes": {
+ "datetime": {
+ "type": "string",
+ "role": "content"
+ },
"textAlign": {
"type": "string"
},
@@ -17,10 +21,6 @@
"type": "boolean",
"default": false,
"role": "content"
- },
- "displayType": {
- "type": "string",
- "default": "date"
}
},
"usesContext": [ "postId", "postType", "queryId" ],
diff --git a/src/wp-includes/blocks/post-excerpt.php b/src/wp-includes/blocks/post-excerpt.php
index c8882b4062ac0..28aab46a01294 100644
--- a/src/wp-includes/blocks/post-excerpt.php
+++ b/src/wp-includes/blocks/post-excerpt.php
@@ -20,18 +20,6 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
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 = static function ( $more ) use ( $more_text ) {
return empty( $more_text ) ? $more : '';
@@ -44,8 +32,24 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
* So if the block's attribute is not empty override the
* `excerpt_more` filter and return nothing. This will
* result in showing only one `read more` link at a time.
+ *
+ * This hook needs to be applied before the excerpt is retrieved with get_the_excerpt.
+ * Otherwise, the read more link filter from the theme is not removed.
*/
add_filter( 'excerpt_more', $filter_excerpt_more );
+
+ /*
+ * 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 );
+ }
+
$classes = array();
if ( isset( $attributes['textAlign'] ) ) {
$classes[] = 'has-text-align-' . $attributes['textAlign'];
diff --git a/src/wp-includes/blocks/post-excerpt/block.json b/src/wp-includes/blocks/post-excerpt/block.json
index 61888ced43e67..c0037b0e5b39c 100644
--- a/src/wp-includes/blocks/post-excerpt/block.json
+++ b/src/wp-includes/blocks/post-excerpt/block.json
@@ -11,7 +11,8 @@
"type": "string"
},
"moreText": {
- "type": "string"
+ "type": "string",
+ "role": "content"
},
"showMoreOnNewLine": {
"type": "boolean",
diff --git a/src/wp-includes/blocks/post-featured-image.php b/src/wp-includes/blocks/post-featured-image.php
index 815da4ee63fe1..dc8bcba194a79 100644
--- a/src/wp-includes/blocks/post-featured-image.php
+++ b/src/wp-includes/blocks/post-featured-image.php
@@ -27,8 +27,9 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
$overlay_markup = get_block_core_post_featured_image_overlay_element_markup( $attributes );
if ( $is_link ) {
- if ( get_the_title( $post_ID ) ) {
- $attr['alt'] = trim( strip_tags( get_the_title( $post_ID ) ) );
+ $title = get_the_title( $post_ID );
+ if ( $title ) {
+ $attr['alt'] = trim( strip_tags( $title ) );
} else {
$attr['alt'] = sprintf(
// translators: %d is the post ID.
diff --git a/src/wp-includes/blocks/post-navigation-link/block.json b/src/wp-includes/blocks/post-navigation-link/block.json
index ce733759846fe..2fda6a01cf516 100644
--- a/src/wp-includes/blocks/post-navigation-link/block.json
+++ b/src/wp-includes/blocks/post-navigation-link/block.json
@@ -15,7 +15,8 @@
"default": "next"
},
"label": {
- "type": "string"
+ "type": "string",
+ "role": "content"
},
"showTitle": {
"type": "boolean",
diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json
index 165f50109616e..e7567ba657c3b 100644
--- a/src/wp-includes/blocks/post-terms/block.json
+++ b/src/wp-includes/blocks/post-terms/block.json
@@ -19,11 +19,13 @@
},
"prefix": {
"type": "string",
- "default": ""
+ "default": "",
+ "role": "content"
},
"suffix": {
"type": "string",
- "default": ""
+ "default": "",
+ "role": "content"
}
},
"usesContext": [ "postId", "postType" ],
diff --git a/src/wp-includes/blocks/post-time-to-read.php b/src/wp-includes/blocks/post-time-to-read.php
new file mode 100644
index 0000000000000..bce545a2927d2
--- /dev/null
+++ b/src/wp-includes/blocks/post-time-to-read.php
@@ -0,0 +1,185 @@
+ '/<\/?[a-z][^>]*?>/i',
+ 'html_comment_regexp' => '//',
+ 'space_regexp' => '/ | /i',
+ 'html_entity_regexp' => '/&\S+?;/',
+ 'connector_regexp' => "/--|\x{2014}/u",
+ 'remove_regexp' => "/[\x{0021}-\x{0040}\x{005B}-\x{0060}\x{007B}-\x{007E}\x{0080}-\x{00BF}\x{00D7}\x{00F7}\x{2000}-\x{2BFF}\x{2E00}-\x{2E7F}]/u",
+ 'astral_regexp' => "/[\x{010000}-\x{10FFFF}]/u",
+ 'words_regexp' => '/\S\s+/u',
+ 'characters_excluding_spaces_regexp' => '/\S/u',
+ 'characters_including_spaces_regexp' => "/[^\f\n\r\t\v\x{00AD}\x{2028}\x{2029}]/u",
+ );
+
+ $count = 0;
+
+ if ( '' === trim( $text ) ) {
+ return $count;
+ }
+
+ // Sanitize type to one of three possibilities: 'words', 'characters_excluding_spaces' or 'characters_including_spaces'.
+ if ( 'characters_excluding_spaces' !== $type && 'characters_including_spaces' !== $type ) {
+ $type = 'words';
+ }
+
+ $text .= "\n";
+
+ // Replace all HTML with a new-line.
+ $text = preg_replace( $settings['html_regexp'], "\n", $text );
+
+ // Remove all HTML comments.
+ $text = preg_replace( $settings['html_comment_regexp'], '', $text );
+
+ // If a shortcode regular expression has been provided use it to remove shortcodes.
+ if ( ! empty( $settings['shortcodes_regexp'] ) ) {
+ $text = preg_replace( $settings['shortcodes_regexp'], "\n", $text );
+ }
+
+ // Normalize non-breaking space to a normal space.
+ $text = preg_replace( $settings['space_regexp'], ' ', $text );
+
+ if ( 'words' === $type ) {
+ // Remove HTML Entities.
+ $text = preg_replace( $settings['html_entity_regexp'], '', $text );
+
+ // Convert connectors to spaces to count attached text as words.
+ $text = preg_replace( $settings['connector_regexp'], ' ', $text );
+
+ // Remove unwanted characters.
+ $text = preg_replace( $settings['remove_regexp'], '', $text );
+ } else {
+ // Convert HTML Entities to "a".
+ $text = preg_replace( $settings['html_entity_regexp'], 'a', $text );
+
+ // Remove surrogate points.
+ $text = preg_replace( $settings['astral_regexp'], 'a', $text );
+ }
+
+ // Match with the selected type regular expression to count the items.
+ return (int) preg_match_all( $settings[ $type . '_regexp' ], $text );
+}
+
+/**
+ * Renders the `core/post-time-to-read` block on the server.
+ *
+ * @since 6.9.0
+ *
+ * @param array $attributes Block attributes.
+ * @param string $content Block default content.
+ * @param WP_Block $block Block instance.
+ * @return string Returns the rendered post author name block.
+ */
+function render_block_core_post_time_to_read( $attributes, $content, $block ) {
+ if ( ! isset( $block->context['postId'] ) ) {
+ return '';
+ }
+
+ $content = get_the_content();
+ $average_reading_rate = isset( $attributes['averageReadingSpeed'] ) ? $attributes['averageReadingSpeed'] : 189;
+
+ $display_mode = isset( $attributes['displayMode'] ) ? $attributes['displayMode'] : 'time';
+
+ $word_count_type = wp_get_word_count_type();
+ $total_words = block_core_post_time_to_read_word_count( $content, $word_count_type );
+
+ $parts = array();
+
+ // Add "time to read" part, if enabled.
+ if ( 'time' === $display_mode ) {
+ if ( ! empty( $attributes['displayAsRange'] ) ) {
+ // Calculate faster reading rate with 20% speed = lower minutes,
+ // and slower reading rate with 20% speed = higher minutes.
+ $min_minutes = max( 1, (int) round( $total_words / $average_reading_rate * 0.8 ) );
+ $max_minutes = max( 1, (int) round( $total_words / $average_reading_rate * 1.2 ) );
+ if ( $min_minutes === $max_minutes ) {
+ $max_minutes = $min_minutes + 1;
+ }
+ /* translators: 1: minimum minutes, 2: maximum minutes to read the post. */
+ $time_string = sprintf(
+ /* translators: 1: minimum minutes, 2: maximum minutes to read the post. */
+ _x( '%1$s–%2$s minutes', 'Range of minutes to read' ),
+ $min_minutes,
+ $max_minutes
+ );
+ } else {
+ $minutes_to_read = max( 1, (int) round( $total_words / $average_reading_rate ) );
+ $time_string = sprintf(
+ /* translators: %s: the number of minutes to read the post. */
+ _n( '%s minute', '%s minutes', $minutes_to_read ),
+ $minutes_to_read
+ );
+ }
+ $parts[] = $time_string;
+ }
+
+ // Add "word count" part, if enabled.
+ if ( 'words' === $display_mode ) {
+ $word_count_string = 'words' === $word_count_type ? sprintf(
+ /* translators: %s: the number of words in the post. */
+ _n( '%s word', '%s words', $total_words ),
+ number_format_i18n( $total_words )
+ ) : sprintf(
+ /* translators: %s: the number of characters in the post. */
+ _n( '%s character', '%s characters', $total_words ),
+ number_format_i18n( $total_words )
+ );
+ $parts[] = $word_count_string;
+ }
+
+ $display_string = implode( '
', $parts );
+
+ $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+
+ return sprintf(
+ '%2$s
',
+ $wrapper_attributes,
+ $display_string
+ );
+}
+
+
+/**
+ * Registers the `core/post-time-to-read` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_post_time_to_read() {
+ register_block_type_from_metadata(
+ __DIR__ . '/post-time-to-read',
+ array(
+ 'render_callback' => 'render_block_core_post_time_to_read',
+ )
+ );
+}
+
+add_action( 'init', 'register_block_core_post_time_to_read' );
diff --git a/src/wp-includes/blocks/post-time-to-read/block.json b/src/wp-includes/blocks/post-time-to-read/block.json
new file mode 100644
index 0000000000000..386312e00434e
--- /dev/null
+++ b/src/wp-includes/blocks/post-time-to-read/block.json
@@ -0,0 +1,67 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/post-time-to-read",
+ "title": "Time to Read",
+ "category": "theme",
+ "description": "Show minutes required to finish reading the post. Can also show a word count.",
+ "textdomain": "default",
+ "usesContext": [ "postId", "postType" ],
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ },
+ "displayAsRange": {
+ "type": "boolean",
+ "default": true
+ },
+ "displayMode": {
+ "type": "string",
+ "default": "time"
+ },
+ "averageReadingSpeed": {
+ "type": "number",
+ "default": 189
+ }
+ },
+ "supports": {
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "html": false,
+ "spacing": {
+ "margin": true,
+ "padding": true,
+ "__experimentalDefaultControls": {
+ "margin": false,
+ "padding": false
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+}
diff --git a/src/wp-includes/blocks/query-title.php b/src/wp-includes/blocks/query-title.php
index 88a945535a22d..980e1c5f58f44 100644
--- a/src/wp-includes/blocks/query-title.php
+++ b/src/wp-includes/blocks/query-title.php
@@ -7,23 +7,28 @@
/**
* Renders the `core/query-title` block on the server.
- * For now it only supports Archive title,
+ * For now it supports Archive title, Search title, and Post Type Label,
* using queried object information
*
* @since 5.8.0
*
- * @param array $attributes Block attributes.
+ * @param array $attributes Block attributes.
+ * @param array $_content Block content.
+ * @param object $block Block instance.
*
* @return string Returns the query title based on the queried object.
*/
-function render_block_core_query_title( $attributes ) {
+function render_block_core_query_title( $attributes, $content, $block ) {
$type = isset( $attributes['type'] ) ? $attributes['type'] : null;
$is_archive = is_archive();
$is_search = is_search();
+ $post_type = isset( $block->context['query']['postType'] ) ? $block->context['query']['postType'] : get_post_type();
+
if ( ! $type ||
( 'archive' === $type && ! $is_archive ) ||
- ( 'search' === $type && ! $is_search )
- ) {
+ ( 'search' === $type && ! $is_search ) ||
+ ( 'post-type' === $type && ! $post_type )
+ ) {
return '';
}
$title = '';
@@ -48,8 +53,30 @@ function render_block_core_query_title( $attributes ) {
);
}
}
+ if ( 'post-type' === $type ) {
+ $post_type_object = get_post_type_object( $post_type );
+
+ if ( ! $post_type_object ) {
+ return '';
+ }
+
+ $post_type_name = $post_type_object->labels->singular_name;
+ $show_prefix = isset( $attributes['showPrefix'] ) ? $attributes['showPrefix'] : true;
+
+ if ( $show_prefix ) {
+ $title = sprintf(
+ /* translators: %s is the post type name. */
+ __( 'Post Type: "%s"' ),
+ $post_type_name
+ );
+ } else {
+ $title = $post_type_name;
+ }
+ }
+
+ $level = isset( $attributes['level'] ) ? (int) $attributes['level'] : 1;
+ $tag_name = 0 === $level ? 'p' : 'h' . (int) $attributes['level'];
- $tag_name = isset( $attributes['level'] ) ? 'h' . (int) $attributes['level'] : 'h1';
$align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
return sprintf(
diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json
index 5d5c9113bda08..549451bbfc67b 100644
--- a/src/wp-includes/blocks/query-title/block.json
+++ b/src/wp-includes/blocks/query-title/block.json
@@ -34,6 +34,7 @@
"type": "search"
}
},
+ "usesContext": [ "query" ],
"supports": {
"align": [ "wide", "full" ],
"html": false,
diff --git a/src/wp-includes/blocks/query/block.json b/src/wp-includes/blocks/query/block.json
index 6ccafc50c8201..33ba8bfd925ca 100644
--- a/src/wp-includes/blocks/query/block.json
+++ b/src/wp-includes/blocks/query/block.json
@@ -53,7 +53,8 @@
"align": [ "wide", "full" ],
"html": false,
"layout": true,
- "interactivity": true
+ "interactivity": true,
+ "contentRole": 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 2ae37f9f36f76..52609ee57d12a 100644
--- a/src/wp-includes/blocks/quote/block.json
+++ b/src/wp-includes/blocks/quote/block.json
@@ -89,7 +89,8 @@
},
"interactivity": {
"clientNavigation": true
- }
+ },
+ "allowedBlocks": true
},
"styles": [
{
diff --git a/src/wp-includes/blocks/read-more/block.json b/src/wp-includes/blocks/read-more/block.json
index 9e4fc84d193f7..eabc7acf3e3a3 100644
--- a/src/wp-includes/blocks/read-more/block.json
+++ b/src/wp-includes/blocks/read-more/block.json
@@ -8,7 +8,8 @@
"textdomain": "default",
"attributes": {
"content": {
- "type": "string"
+ "type": "string",
+ "role": "content"
},
"linkTarget": {
"type": "string",
diff --git a/src/wp-includes/blocks/require-dynamic-blocks.php b/src/wp-includes/blocks/require-dynamic-blocks.php
index bd1f11608d601..df5be6face017 100644
--- a/src/wp-includes/blocks/require-dynamic-blocks.php
+++ b/src/wp-includes/blocks/require-dynamic-blocks.php
@@ -2,6 +2,8 @@
// This file was autogenerated by tools/release/sync-stable-blocks.js, do not change manually!
// Requires files for dynamic blocks necessary for core blocks registration.
+require_once ABSPATH . WPINC . '/blocks/accordion.php';
+require_once ABSPATH . WPINC . '/blocks/accordion-item.php';
require_once ABSPATH . WPINC . '/blocks/archives.php';
require_once ABSPATH . WPINC . '/blocks/avatar.php';
require_once ABSPATH . WPINC . '/blocks/block.php';
@@ -41,7 +43,9 @@
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-count.php';
require_once ABSPATH . WPINC . '/blocks/post-comments-form.php';
+require_once ABSPATH . WPINC . '/blocks/post-comments-link.php';
require_once ABSPATH . WPINC . '/blocks/post-content.php';
require_once ABSPATH . WPINC . '/blocks/post-date.php';
require_once ABSPATH . WPINC . '/blocks/post-excerpt.php';
@@ -49,6 +53,7 @@
require_once ABSPATH . WPINC . '/blocks/post-navigation-link.php';
require_once ABSPATH . WPINC . '/blocks/post-template.php';
require_once ABSPATH . WPINC . '/blocks/post-terms.php';
+require_once ABSPATH . WPINC . '/blocks/post-time-to-read.php';
require_once ABSPATH . WPINC . '/blocks/post-title.php';
require_once ABSPATH . WPINC . '/blocks/query.php';
require_once ABSPATH . WPINC . '/blocks/query-no-results.php';
@@ -68,4 +73,8 @@
require_once ABSPATH . WPINC . '/blocks/social-link.php';
require_once ABSPATH . WPINC . '/blocks/tag-cloud.php';
require_once ABSPATH . WPINC . '/blocks/template-part.php';
+require_once ABSPATH . WPINC . '/blocks/term-count.php';
require_once ABSPATH . WPINC . '/blocks/term-description.php';
+require_once ABSPATH . WPINC . '/blocks/term-name.php';
+require_once ABSPATH . WPINC . '/blocks/term-template.php';
+require_once ABSPATH . WPINC . '/blocks/video.php';
diff --git a/src/wp-includes/blocks/require-static-blocks.php b/src/wp-includes/blocks/require-static-blocks.php
index 7f83010605ed6..0a9d6a9fe4d7a 100644
--- a/src/wp-includes/blocks/require-static-blocks.php
+++ b/src/wp-includes/blocks/require-static-blocks.php
@@ -3,6 +3,8 @@
// This file was autogenerated by tools/release/sync-stable-blocks.js, do not change manually!
// Returns folder names for static blocks necessary for core blocks registration.
return array(
+ 'accordion-heading',
+ 'accordion-panel',
'audio',
'buttons',
'code',
@@ -14,6 +16,7 @@
'group',
'html',
'list-item',
+ 'math',
'missing',
'more',
'nextpage',
@@ -25,7 +28,7 @@
'social-links',
'spacer',
'table',
+ 'terms-query',
'text-columns',
'verse',
- 'video',
);
diff --git a/src/wp-includes/blocks/rss.php b/src/wp-includes/blocks/rss.php
index 85e4e63c9dbf7..5ab990bbcbcee 100644
--- a/src/wp-includes/blocks/rss.php
+++ b/src/wp-includes/blocks/rss.php
@@ -31,27 +31,46 @@ function render_block_core_rss( $attributes ) {
$rss_items = $rss->get_items( 0, $attributes['itemsToShow'] );
$list_items = '';
+
+ $open_in_new_tab = ! empty( $attributes['openInNewTab'] );
+ $rel = ! empty( $attributes['rel'] ) ? trim( $attributes['rel'] ) : '';
+
+ $link_attributes = '';
+
+ if ( $open_in_new_tab ) {
+ $link_attributes .= ' target="_blank"';
+ }
+
+ if ( '' !== $rel ) {
+ $link_attributes .= ' rel="' . esc_attr( $rel ) . '"';
+ }
+
foreach ( $rss_items as $item ) {
- $title = esc_html( trim( strip_tags( $item->get_title() ) ) );
+ $title = esc_html( trim( strip_tags( html_entity_decode( $item->get_title() ) ) ) );
+
if ( empty( $title ) ) {
$title = __( '(no title)' );
}
$link = $item->get_link();
$link = esc_url( $link );
+
if ( $link ) {
- $title = "{$title}";
+ $title = "{$title}";
}
$title = "";
- $date = '';
- if ( $attributes['displayDate'] ) {
- $date = $item->get_date( 'U' );
+ $date_markup = '';
+ if ( ! empty( $attributes['displayDate'] ) ) {
+ $timestamp = $item->get_date( 'U' );
+
+ if ( $timestamp ) {
+ $gmt_offset = get_option( 'gmt_offset' );
+ $timestamp += (int) ( (float) $gmt_offset * HOUR_IN_SECONDS );
- if ( $date ) {
- $date = sprintf(
+ $date_markup = sprintf(
' ',
- esc_attr( date_i18n( 'c', $date ) ),
- esc_attr( date_i18n( get_option( 'date_format' ), $date ) )
+ esc_attr( date_i18n( 'c', $timestamp ) ),
+ esc_html( date_i18n( get_option( 'date_format' ), $timestamp ) )
);
}
}
@@ -85,7 +104,7 @@ function render_block_core_rss( $attributes ) {
$excerpt = '';
}
- $list_items .= "";
+ $list_items .= "";
}
$classnames = array();
diff --git a/src/wp-includes/blocks/rss/block.json b/src/wp-includes/blocks/rss/block.json
index 112dec4a32c78..fc49e1d858e89 100644
--- a/src/wp-includes/blocks/rss/block.json
+++ b/src/wp-includes/blocks/rss/block.json
@@ -18,7 +18,8 @@
},
"feedURL": {
"type": "string",
- "default": ""
+ "default": "",
+ "role": "content"
},
"itemsToShow": {
"type": "number",
@@ -39,6 +40,13 @@
"excerptLength": {
"type": "number",
"default": 55
+ },
+ "openInNewTab": {
+ "type": "boolean",
+ "default": false
+ },
+ "rel": {
+ "type": "string"
}
},
"supports": {
diff --git a/src/wp-includes/blocks/search.php b/src/wp-includes/blocks/search.php
index 87e12f5d33d07..200529d8eeb69 100644
--- a/src/wp-includes/blocks/search.php
+++ b/src/wp-includes/blocks/search.php
@@ -10,9 +10,7 @@
*
* @since 6.3.0 Using block.json `viewScript` to register script, and update `view_script_handles()` only when needed.
*
- * @param array $attributes The block attributes.
- * @param string $content The saved content.
- * @param WP_Block $block The parsed block.
+ * @param array $attributes The block attributes.
*
* @return string The search block markup.
*/
@@ -152,17 +150,22 @@ function render_block_core_search( $attributes ) {
}
}
- $field_markup_classes = $is_button_inside ? $border_color_classes : '';
- $field_markup = sprintf(
- '
%s
',
- esc_attr( $field_markup_classes ),
+ $field_markup_classes = array(
+ 'wp-block-search__inside-wrapper',
+ );
+ if ( $is_button_inside && ! empty( $border_color_classes ) ) {
+ $field_markup_classes[] = $border_color_classes;
+ }
+ $field_markup = sprintf(
+ '
%s
',
+ esc_attr( implode( ' ', $field_markup_classes ) ),
$inline_styles['wrapper'],
$input . $query_params_markup . $button
);
- $wrapper_attributes = get_block_wrapper_attributes(
+ $wrapper_attributes = get_block_wrapper_attributes(
array( 'class' => $classnames )
);
- $form_directives = '';
+ $form_directives = '';
// If it's interactive, add the directives.
if ( $is_expandable_searchfield ) {
@@ -369,6 +372,13 @@ function styles_for_block_core_search( $attributes ) {
if ( is_array( $border_radius ) ) {
// Apply styles for individual corner border radii.
foreach ( $border_radius as $key => $value ) {
+ // Get border-radius CSS variable from preset value if provided.
+ if ( is_string( $value ) && str_contains( $value, 'var:preset|border-radius|' ) ) {
+ $index_to_splice = strrpos( $value, '|' ) + 1;
+ $slug = _wp_to_kebab_case( substr( $value, $index_to_splice ) );
+ $value = "var(--wp--preset--border-radius--$slug)";
+ }
+
if ( null !== $value ) {
// Convert camelCase key to kebab-case.
$name = strtolower( preg_replace( '/(? array(
- 'name' => '500px',
+ 'name' => _x( '500px', 'social link block variation name' ),
'icon' => '
',
),
'amazon' => array(
- 'name' => 'Amazon',
+ 'name' => _x( 'Amazon', 'social link block variation name' ),
'icon' => '
',
),
'bandcamp' => array(
- 'name' => 'Bandcamp',
+ 'name' => _x( 'Bandcamp', 'social link block variation name' ),
'icon' => '
',
),
'behance' => array(
- 'name' => 'Behance',
+ 'name' => _x( 'Behance', 'social link block variation name' ),
'icon' => '
',
),
'bluesky' => array(
- 'name' => 'Bluesky',
+ 'name' => _x( 'Bluesky', 'social link block variation name' ),
'icon' => '
',
),
'chain' => array(
- 'name' => 'Link',
+ 'name' => _x( 'Link', 'social link block variation name' ),
'icon' => '
',
),
'codepen' => array(
- 'name' => 'CodePen',
+ 'name' => _x( 'CodePen', 'social link block variation name' ),
'icon' => '
',
),
'deviantart' => array(
- 'name' => 'DeviantArt',
+ 'name' => _x( 'DeviantArt', 'social link block variation name' ),
'icon' => '
',
),
'discord' => array(
- 'name' => 'Discord',
+ 'name' => _x( 'Discord', 'social link block variation name' ),
'icon' => '
',
),
'dribbble' => array(
- 'name' => 'Dribbble',
+ 'name' => _x( 'Dribbble', 'social link block variation name' ),
'icon' => '
',
),
'dropbox' => array(
- 'name' => 'Dropbox',
+ 'name' => _x( 'Dropbox', 'social link block variation name' ),
'icon' => '
',
),
'etsy' => array(
- 'name' => 'Etsy',
+ 'name' => _x( 'Etsy', 'social link block variation name' ),
'icon' => '
',
),
'facebook' => array(
- 'name' => 'Facebook',
+ 'name' => _x( 'Facebook', 'social link block variation name' ),
'icon' => '
',
),
'feed' => array(
- 'name' => 'RSS Feed',
+ 'name' => _x( 'RSS Feed', 'social link block variation name' ),
'icon' => '
',
),
'flickr' => array(
- 'name' => 'Flickr',
+ 'name' => _x( 'Flickr', 'social link block variation name' ),
'icon' => '
',
),
'foursquare' => array(
- 'name' => 'Foursquare',
+ 'name' => _x( 'Foursquare', 'social link block variation name' ),
'icon' => '
',
),
'goodreads' => array(
- 'name' => 'Goodreads',
+ 'name' => _x( 'Goodreads', 'social link block variation name' ),
'icon' => '
',
),
'google' => array(
- 'name' => 'Google',
+ 'name' => _x( 'Google', 'social link block variation name' ),
'icon' => '
',
),
'github' => array(
- 'name' => 'GitHub',
+ 'name' => _x( 'GitHub', 'social link block variation name' ),
'icon' => '
',
),
'gravatar' => array(
- 'name' => 'Gravatar',
+ 'name' => _x( 'Gravatar', 'social link block variation name' ),
'icon' => '
',
),
'instagram' => array(
- 'name' => 'Instagram',
+ 'name' => _x( 'Instagram', 'social link block variation name' ),
'icon' => '
',
),
'lastfm' => array(
- 'name' => 'Last.fm',
+ 'name' => _x( 'Last.fm', 'social link block variation name' ),
'icon' => '
',
),
'linkedin' => array(
- 'name' => 'LinkedIn',
+ 'name' => _x( 'LinkedIn', 'social link block variation name' ),
'icon' => '
',
),
'mail' => array(
- 'name' => 'Mail',
+ 'name' => _x( 'Mail', 'social link block variation name' ),
'icon' => '
',
),
'mastodon' => array(
- 'name' => 'Mastodon',
+ 'name' => _x( 'Mastodon', 'social link block variation name' ),
'icon' => '
',
),
'meetup' => array(
- 'name' => 'Meetup',
+ 'name' => _x( 'Meetup', 'social link block variation name' ),
'icon' => '
',
),
'medium' => array(
- 'name' => 'Medium',
+ 'name' => _x( 'Medium', 'social link block variation name' ),
'icon' => '
',
),
'patreon' => array(
- 'name' => 'Patreon',
+ 'name' => _x( 'Patreon', 'social link block variation name' ),
'icon' => '
',
),
'pinterest' => array(
- 'name' => 'Pinterest',
+ 'name' => _x( 'Pinterest', 'social link block variation name' ),
'icon' => '
',
),
'pocket' => array(
- 'name' => 'Pocket',
+ 'name' => _x( 'Pocket', 'social link block variation name' ),
'icon' => '
',
),
'reddit' => array(
- 'name' => 'Reddit',
+ 'name' => _x( 'Reddit', 'social link block variation name' ),
'icon' => '
',
),
'share' => array(
- 'name' => 'Share Icon',
+ 'name' => _x( 'Share Icon', 'social link block variation name' ),
'icon' => '
',
),
'skype' => array(
- 'name' => 'Skype',
+ 'name' => _x( 'Skype', 'social link block variation name' ),
'icon' => '
',
),
'snapchat' => array(
- 'name' => 'Snapchat',
+ 'name' => _x( 'Snapchat', 'social link block variation name' ),
'icon' => '
',
),
'soundcloud' => array(
- 'name' => 'Soundcloud',
+ 'name' => _x( 'SoundCloud', 'social link block variation name' ),
'icon' => '
',
),
'spotify' => array(
- 'name' => 'Spotify',
+ 'name' => _x( 'Spotify', 'social link block variation name' ),
'icon' => '
',
),
'telegram' => array(
- 'name' => 'Telegram',
+ 'name' => _x( 'Telegram', 'social link block variation name' ),
'icon' => '
',
),
'threads' => array(
- 'name' => 'Threads',
+ 'name' => _x( 'Threads', 'social link block variation name' ),
'icon' => '
',
),
'tiktok' => array(
- 'name' => 'TikTok',
+ 'name' => _x( 'TikTok', 'social link block variation name' ),
'icon' => '
',
),
'tumblr' => array(
- 'name' => 'Tumblr',
+ 'name' => _x( 'Tumblr', 'social link block variation name' ),
'icon' => '
',
),
'twitch' => array(
- 'name' => 'Twitch',
+ 'name' => _x( 'Twitch', 'social link block variation name' ),
'icon' => '
',
),
'twitter' => array(
- 'name' => 'Twitter',
+ 'name' => _x( 'Twitter', 'social link block variation name' ),
'icon' => '
',
),
'vimeo' => array(
- 'name' => 'Vimeo',
+ 'name' => _x( 'Vimeo', 'social link block variation name' ),
'icon' => '
',
),
'vk' => array(
- 'name' => 'VK',
+ 'name' => _x( 'VK', 'social link block variation name' ),
'icon' => '
',
),
'wordpress' => array(
- 'name' => 'WordPress',
+ 'name' => _x( 'WordPress', 'social link block variation name' ),
'icon' => '
',
),
'whatsapp' => array(
- 'name' => 'WhatsApp',
+ 'name' => _x( 'WhatsApp', 'social link block variation name' ),
'icon' => '
',
),
'x' => array(
- 'name' => 'X',
+ 'name' => _x( 'X', 'social link block variation name' ),
'icon' => '
',
),
'yelp' => array(
- 'name' => 'Yelp',
+ 'name' => _x( 'Yelp', 'social link block variation name' ),
'icon' => '
',
),
'youtube' => array(
- 'name' => 'YouTube',
+ 'name' => _x( 'YouTube', 'social link block variation name' ),
'icon' => '
',
),
);
+ /**
+ * Filter the list of available social service.
+ *
+ * This can be used to change icons or add custom icons (additionally to variations in the editor).
+ * Icons should be directly renderable - therefore SVGs work best.
+ *
+ * @since 6.9.0
+ *
+ * @param array $services_data The list of services. Each item is an array containing a 'name' and 'icon' key.
+ * @return array The list of social services.
+ */
+ $services_data = apply_filters( 'block_core_social_link_get_services', $services_data );
+
if ( ! empty( $service )
&& ! empty( $field )
&& isset( $services_data[ $service ] )
@@ -361,11 +374,11 @@ function block_core_social_link_get_color_styles( $context ) {
$styles = array();
if ( array_key_exists( 'iconColorValue', $context ) ) {
- $styles[] = 'color: ' . $context['iconColorValue'] . '; ';
+ $styles[] = 'color:' . $context['iconColorValue'] . ';';
}
if ( array_key_exists( 'iconBackgroundColorValue', $context ) ) {
- $styles[] = 'background-color: ' . $context['iconBackgroundColorValue'] . '; ';
+ $styles[] = 'background-color:' . $context['iconBackgroundColorValue'] . ';';
}
return implode( '', $styles );
diff --git a/src/wp-includes/blocks/social-links/block.json b/src/wp-includes/blocks/social-links/block.json
index bd750f26b3960..8caa8f5bf8abb 100644
--- a/src/wp-includes/blocks/social-links/block.json
+++ b/src/wp-includes/blocks/social-links/block.json
@@ -50,6 +50,7 @@
"supports": {
"align": [ "left", "center", "right" ],
"anchor": true,
+ "html": false,
"__experimentalExposeControlsToChildren": true,
"layout": {
"allowSwitching": false,
@@ -93,7 +94,8 @@
"width": true,
"style": true
}
- }
+ },
+ "contentRole": true
},
"styles": [
{ "name": "default", "label": "Default", "isDefault": true },
diff --git a/src/wp-includes/blocks/table/block.json b/src/wp-includes/blocks/table/block.json
index 2f0ea753f6f8d..84f2783d3ff8c 100644
--- a/src/wp-includes/blocks/table/block.json
+++ b/src/wp-includes/blocks/table/block.json
@@ -14,7 +14,8 @@
"caption": {
"type": "rich-text",
"source": "rich-text",
- "selector": "figcaption"
+ "selector": "figcaption",
+ "role": "content"
},
"head": {
"type": "array",
@@ -30,7 +31,8 @@
"query": {
"content": {
"type": "rich-text",
- "source": "rich-text"
+ "source": "rich-text",
+ "role": "content"
},
"tag": {
"type": "string",
@@ -75,7 +77,8 @@
"query": {
"content": {
"type": "rich-text",
- "source": "rich-text"
+ "source": "rich-text",
+ "role": "content"
},
"tag": {
"type": "string",
@@ -120,7 +123,8 @@
"query": {
"content": {
"type": "rich-text",
- "source": "rich-text"
+ "source": "rich-text",
+ "role": "content"
},
"tag": {
"type": "string",
diff --git a/src/wp-includes/blocks/term-count.php b/src/wp-includes/blocks/term-count.php
new file mode 100644
index 0000000000000..9794896524eb4
--- /dev/null
+++ b/src/wp-includes/blocks/term-count.php
@@ -0,0 +1,80 @@
+context['termId'] ) && isset( $block->context['taxonomy'] ) ) {
+ $term = get_term( $block->context['termId'], $block->context['taxonomy'] );
+ } else {
+ $term = get_queried_object();
+ if ( ! $term instanceof WP_Term ) {
+ $term = null;
+ }
+ }
+
+ if ( ! $term || is_wp_error( $term ) ) {
+ return '';
+ }
+
+ $term_count = $term->count;
+
+ // Format the term count based on bracket type.
+ switch ( $attributes['bracketType'] ) {
+ case 'none':
+ // No formatting needed.
+ break;
+ case 'round':
+ $term_count = "({$term_count})";
+ break;
+ case 'square':
+ $term_count = "[{$term_count}]";
+ break;
+ case 'curly':
+ $term_count = "{{$term_count}}";
+ break;
+ case 'angle':
+ $term_count = "<{$term_count}>";
+ break;
+ default:
+ // Default to no formatting for unknown types.
+ break;
+ }
+
+ $wrapper_attributes = get_block_wrapper_attributes();
+
+ return sprintf(
+ '
%2$s
',
+ $wrapper_attributes,
+ $term_count
+ );
+}
+
+/**
+ * Registers the `core/term-count` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_term_count() {
+ register_block_type_from_metadata(
+ __DIR__ . '/term-count',
+ array(
+ 'render_callback' => 'render_block_core_term_count',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_term_count' );
diff --git a/src/wp-includes/blocks/term-count/block.json b/src/wp-includes/blocks/term-count/block.json
new file mode 100644
index 0000000000000..c4de1e61f8d1f
--- /dev/null
+++ b/src/wp-includes/blocks/term-count/block.json
@@ -0,0 +1,58 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/term-count",
+ "title": "Term Count",
+ "category": "theme",
+ "description": "Displays the post count of a taxonomy term.",
+ "textdomain": "default",
+ "usesContext": [ "termId", "taxonomy" ],
+ "attributes": {
+ "bracketType": {
+ "type": "string",
+ "enum": [ "none", "round", "square", "curly", "angle" ],
+ "default": "round"
+ }
+ },
+ "supports": {
+ "html": false,
+ "color": {
+ "gradients": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "spacing": {
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-term-count"
+}
diff --git a/src/wp-includes/blocks/term-description.php b/src/wp-includes/blocks/term-description.php
index 925b37f34f98a..9f61dbba07fbc 100644
--- a/src/wp-includes/blocks/term-description.php
+++ b/src/wp-includes/blocks/term-description.php
@@ -10,14 +10,22 @@
*
* @since 5.9.0
*
- * @param array $attributes Block attributes.
+ * @param array $attributes Block attributes.
+ * @param string $content Block default content.
+ * @param WP_Block $block Block instance.
*
* @return string Returns the description of the current taxonomy term, if available
*/
-function render_block_core_term_description( $attributes ) {
+function render_block_core_term_description( $attributes, $content, $block ) {
$term_description = '';
- if ( is_category() || is_tag() || is_tax() ) {
+ // Get term from context or from the current query.
+ if ( isset( $block->context['termId'] ) && isset( $block->context['taxonomy'] ) ) {
+ $term = get_term( $block->context['termId'], $block->context['taxonomy'] );
+ if ( $term && ! is_wp_error( $term ) ) {
+ $term_description = $term->description;
+ }
+ } elseif ( is_category() || is_tag() || is_tax() ) {
$term_description = term_description();
}
diff --git a/src/wp-includes/blocks/term-description/block.json b/src/wp-includes/blocks/term-description/block.json
index dc27fc17df789..a882625ad6f50 100644
--- a/src/wp-includes/blocks/term-description/block.json
+++ b/src/wp-includes/blocks/term-description/block.json
@@ -6,6 +6,7 @@
"category": "theme",
"description": "Display the description of categories, tags and custom taxonomies when viewing an archive.",
"textdomain": "default",
+ "usesContext": [ "termId", "taxonomy" ],
"attributes": {
"textAlign": {
"type": "string"
diff --git a/src/wp-includes/blocks/term-name.php b/src/wp-includes/blocks/term-name.php
new file mode 100644
index 0000000000000..3a2bf18bb5f21
--- /dev/null
+++ b/src/wp-includes/blocks/term-name.php
@@ -0,0 +1,81 @@
+context['termId'] ) && isset( $block->context['taxonomy'] ) ) {
+ $term = get_term( $block->context['termId'], $block->context['taxonomy'] );
+ } else {
+ $term = get_queried_object();
+ if ( ! $term instanceof WP_Term ) {
+ $term = null;
+ }
+ }
+
+ if ( ! $term || is_wp_error( $term ) ) {
+ return '';
+ }
+
+ $term_name = $term->name;
+ $level = isset( $attributes['level'] ) ? $attributes['level'] : 0;
+ $tag_name = 0 === $level ? 'p' : 'h' . (int) $level;
+
+ if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
+ $term_link = get_term_link( $term );
+ if ( ! is_wp_error( $term_link ) ) {
+ $term_name = sprintf(
+ '
%2$s',
+ esc_url( $term_link ),
+ $term_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',
+ $tag_name,
+ $wrapper_attributes,
+ $term_name
+ );
+}
+
+/**
+ * Registers the `core/term-name` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_term_name() {
+ register_block_type_from_metadata(
+ __DIR__ . '/term-name',
+ array(
+ 'render_callback' => 'render_block_core_term_name',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_term_name' );
diff --git a/src/wp-includes/blocks/term-name/block.json b/src/wp-includes/blocks/term-name/block.json
new file mode 100644
index 0000000000000..29b0cbe22b77e
--- /dev/null
+++ b/src/wp-includes/blocks/term-name/block.json
@@ -0,0 +1,68 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/term-name",
+ "title": "Term Name",
+ "category": "theme",
+ "description": "Displays the name of a taxonomy term.",
+ "keywords": [ "term title" ],
+ "textdomain": "default",
+ "usesContext": [ "termId", "taxonomy" ],
+ "attributes": {
+ "textAlign": {
+ "type": "string"
+ },
+ "level": {
+ "type": "number",
+ "default": 0
+ },
+ "isLink": {
+ "type": "boolean",
+ "default": false
+ }
+ },
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true,
+ "link": true
+ }
+ },
+ "spacing": {
+ "padding": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ }
+ },
+ "style": "wp-block-term-name"
+}
diff --git a/src/wp-includes/blocks/term-template.php b/src/wp-includes/blocks/term-template.php
new file mode 100644
index 0000000000000..e68899532de4d
--- /dev/null
+++ b/src/wp-includes/blocks/term-template.php
@@ -0,0 +1,131 @@
+context ) || empty( $block->context['termQuery'] ) ) {
+ return '';
+ }
+
+ $query = $block->context['termQuery'];
+
+ $query_args = array(
+ 'number' => $query['perPage'],
+ 'order' => $query['order'],
+ 'orderby' => $query['orderBy'],
+ 'hide_empty' => $query['hideEmpty'],
+ );
+
+ $inherit_query = isset( $query['inherit'] )
+ && $query['inherit']
+ && ( is_tax() || is_category() || is_tag() );
+
+ if ( $inherit_query ) {
+ // Get the current term and taxonomy from the queried object.
+ $queried_object = get_queried_object();
+
+ // For hierarchical taxonomies, show direct children of the current term.
+ // For non-hierarchical taxonomies, show all terms (don't set parent).
+ if ( is_taxonomy_hierarchical( $queried_object->taxonomy ) ) {
+ $query_args['parent'] = $queried_object->term_id;
+ }
+ $query_args['taxonomy'] = $queried_object->taxonomy;
+ } else {
+ // If not inheriting set `taxonomy` from the block attribute.
+ $query_args['taxonomy'] = $query['taxonomy'];
+
+ // If we are including specific terms we ignore `showNested` argument.
+ if ( ! empty( $query['include'] ) ) {
+ $query_args['include'] = array_unique( array_map( 'intval', $query['include'] ) );
+ $query_args['orderby'] = 'include';
+ $query_args['order'] = 'asc';
+ } elseif ( empty( $query['showNested'] ) ) {
+ // We set parent only when inheriting from the taxonomy archive context or not
+ // showing nested terms, otherwise nested terms are not displayed.
+ $query_args['parent'] = 0;
+ }
+ }
+
+ $terms_query = new WP_Term_Query( $query_args );
+ $terms = $terms_query->get_terms();
+
+ if ( ! $terms || is_wp_error( $terms ) ) {
+ return '';
+ }
+
+ $content = '';
+ foreach ( $terms as $term ) {
+ // Get an instance of the current Term Template block.
+ $block_instance = $block->parsed_block;
+
+ // Set the block name to one that does not correspond to an existing registered block.
+ // This ensures that for the inner instances of the Term Template block, we do not render any block supports.
+ $block_instance['blockName'] = 'core/null';
+
+ $term_id = $term->term_id;
+ $taxonomy = $term->taxonomy;
+
+ $filter_block_context = static function ( $context ) use ( $term_id, $taxonomy ) {
+ $context['termId'] = $term_id;
+ $context['taxonomy'] = $taxonomy;
+ return $context;
+ };
+
+ // Use an early priority to so that other 'render_block_context' filters have access to the values.
+ add_filter( 'render_block_context', $filter_block_context, 1 );
+
+ // Render the inner blocks of the Term 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 ) )->render( array( 'dynamic' => false ) );
+
+ remove_filter( 'render_block_context', $filter_block_context, 1 );
+
+ // Wrap the render inner blocks in a `li` element with the appropriate term classes.
+ $term_classes = "wp-block-term term-{$term->term_id} {$term->taxonomy} taxonomy-{$term->taxonomy}";
+
+ $content .= '
' . $block_content . '';
+ }
+
+ $classnames = '';
+
+ if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+ $classnames .= 'has-link-color';
+ }
+
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classnames ) ) );
+
+ return sprintf(
+ '
',
+ $wrapper_attributes,
+ $content
+ );
+}
+
+/**
+ * Registers the `core/term-template` block on the server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_term_template() {
+ register_block_type_from_metadata(
+ __DIR__ . '/term-template',
+ array(
+ 'render_callback' => 'render_block_core_term_template',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_term_template' );
diff --git a/src/wp-includes/blocks/term-template/block.json b/src/wp-includes/blocks/term-template/block.json
new file mode 100644
index 0000000000000..2f4b9838c71bd
--- /dev/null
+++ b/src/wp-includes/blocks/term-template/block.json
@@ -0,0 +1,61 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/term-template",
+ "title": "Term Template",
+ "category": "theme",
+ "ancestor": [ "core/terms-query" ],
+ "description": "Contains the block elements used to render a taxonomy term, like the name, description, and more.",
+ "textdomain": "default",
+ "usesContext": [ "termQuery" ],
+ "supports": {
+ "reusable": false,
+ "html": false,
+ "align": [ "wide", "full" ],
+ "layout": true,
+ "color": {
+ "gradients": true,
+ "link": true,
+ "__experimentalDefaultControls": {
+ "background": true,
+ "text": true
+ }
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ },
+ "spacing": {
+ "margin": true,
+ "padding": true,
+ "blockGap": {
+ "__experimentalDefault": "1.25em"
+ },
+ "__experimentalDefaultControls": {
+ "blockGap": true,
+ "padding": false,
+ "margin": false
+ }
+ },
+ "interactivity": {
+ "clientNavigation": true
+ },
+ "__experimentalBorder": {
+ "radius": true,
+ "color": true,
+ "width": true,
+ "style": true
+ }
+ },
+ "style": "wp-block-term-template",
+ "editorStyle": "wp-block-term-template-editor"
+}
diff --git a/src/wp-includes/blocks/terms-query/block.json b/src/wp-includes/blocks/terms-query/block.json
new file mode 100644
index 0000000000000..05b7a2c12e22f
--- /dev/null
+++ b/src/wp-includes/blocks/terms-query/block.json
@@ -0,0 +1,39 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 3,
+ "name": "core/terms-query",
+ "title": "Terms Query",
+ "category": "theme",
+ "description": "An advanced block that allows displaying taxonomy terms based on different query parameters and visual configurations.",
+ "keywords": [ "terms", "taxonomy", "categories", "tags", "list" ],
+ "textdomain": "default",
+ "attributes": {
+ "termQuery": {
+ "type": "object",
+ "default": {
+ "perPage": 10,
+ "taxonomy": "category",
+ "order": "asc",
+ "orderBy": "name",
+ "include": [],
+ "hideEmpty": true,
+ "showNested": false,
+ "inherit": false
+ }
+ },
+ "tagName": {
+ "type": "string",
+ "default": "div"
+ }
+ },
+ "usesContext": [ "templateSlug" ],
+ "providesContext": {
+ "termQuery": "termQuery"
+ },
+ "supports": {
+ "align": [ "wide", "full" ],
+ "html": false,
+ "layout": true,
+ "interactivity": true
+ }
+}
diff --git a/src/wp-includes/blocks/video.php b/src/wp-includes/blocks/video.php
new file mode 100644
index 0000000000000..3696bdca3b2e8
--- /dev/null
+++ b/src/wp-includes/blocks/video.php
@@ -0,0 +1,91 @@
+ 0 && $metadata['height'] > 0 )
+ ) {
+ return $content;
+ }
+
+ // Locate the VIDEO tag to add the dimensions.
+ $p = new WP_HTML_Tag_Processor( $content );
+ if ( ! $p->next_tag( array( 'tag_name' => 'VIDEO' ) ) ) {
+ return $content;
+ }
+
+ $p->set_attribute( 'width', (string) $metadata['width'] );
+ $p->set_attribute( 'height', (string) $metadata['height'] );
+
+ /*
+ * The aspect-ratio style is needed due to an issue with the CSS spec:
.
+ * Note that a style rule using attr() like the following cannot currently be used:
+ *
+ * .wp-block-video video[width][height] {
+ * aspect-ratio: attr(width type()) / attr(height type());
+ * }
+ *
+ * This is because this attr() is yet only implemented in Chromium: .
+ */
+ $style = $p->get_attribute( 'style' );
+ if ( ! is_string( $style ) ) {
+ $style = '';
+ }
+ $aspect_ratio_style = sprintf( 'aspect-ratio: %d / %d;', $metadata['width'], $metadata['height'] );
+ $p->set_attribute( 'style', $aspect_ratio_style . $style );
+
+ return $p->get_updated_html();
+}
+
+/**
+ * Registers the `core/video` block on server.
+ *
+ * @since 6.9.0
+ */
+function register_block_core_video(): void {
+ register_block_type_from_metadata(
+ __DIR__ . '/video',
+ array(
+ 'render_callback' => 'render_block_core_video',
+ )
+ );
+}
+add_action( 'init', 'register_block_core_video' );
diff --git a/src/wp-includes/class-wp-block-parser-block.php b/src/wp-includes/class-wp-block-parser-block.php
index 28377d3ede32b..97dd687c1ffe1 100644
--- a/src/wp-includes/class-wp-block-parser-block.php
+++ b/src/wp-includes/class-wp-block-parser-block.php
@@ -62,7 +62,7 @@ class WP_Block_Parser_Block {
* 'innerContent' => array( 'Before', null, 'Inner', null, 'After' ),
* )
*
- * @since 4.2.0
+ * @since 5.0.0
* @var array
*/
public $innerContent; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
diff --git a/src/wp-includes/class-wp-block-parser.php b/src/wp-includes/class-wp-block-parser.php
index 543f53691ccb1..bf8a59249d99d 100644
--- a/src/wp-includes/class-wp-block-parser.php
+++ b/src/wp-includes/class-wp-block-parser.php
@@ -36,7 +36,7 @@ class WP_Block_Parser {
* List of parsed blocks
*
* @since 5.0.0
- * @var WP_Block_Parser_Block[]
+ * @var array[]
*/
public $output;
@@ -303,7 +303,7 @@ public function next_token() {
* Returns a new block object for freeform HTML
*
* @internal
- * @since 3.9.0
+ * @since 5.0.0
*
* @param string $inner_html HTML content of block.
* @return WP_Block_Parser_Block freeform block object.
diff --git a/tests/phpunit/includes/unregister-blocks-hooks.php b/tests/phpunit/includes/unregister-blocks-hooks.php
index 827b827d04d23..b67936a103c81 100644
--- a/tests/phpunit/includes/unregister-blocks-hooks.php
+++ b/tests/phpunit/includes/unregister-blocks-hooks.php
@@ -1,6 +1,8 @@
get_registered( 'core/block' );
- $output = $block_type->render( array( 'ref' => self::$block_id ) );
+ $parsed_block = array(
+ 'blockName' => 'core/block',
+ 'attrs' => array( 'ref' => self::$block_id ),
+ );
+ $block = new WP_Block( $parsed_block );
+ $output = $block->render();
$this->assertSame( 'Hello world!
', $output );
}
@@ -88,21 +92,33 @@ public function test_render() {
* @ticket 52364
*/
public function test_render_subsequent() {
- $block_type = WP_Block_Type_Registry::get_instance()->get_registered( 'core/block' );
- $output = $block_type->render( array( 'ref' => self::$block_id ) );
- $output .= $block_type->render( array( 'ref' => self::$block_id ) );
+ $parsed_block = array(
+ 'blockName' => 'core/block',
+ 'attrs' => array( 'ref' => self::$block_id ),
+ );
+ $block = new WP_Block( $parsed_block );
+ $output = $block->render();
+ $output .= $block->render();
$this->assertSame( 'Hello world!
Hello world!
', $output );
}
public function test_ref_empty() {
- $block_type = WP_Block_Type_Registry::get_instance()->get_registered( 'core/block' );
- $output = $block_type->render( array() );
+ $parsed_block = array(
+ 'blockName' => 'core/block',
+ 'attrs' => array(),
+ );
+ $block = new WP_Block( $parsed_block );
+ $output = $block->render();
$this->assertSame( '', $output );
}
public function test_ref_wrong_post_type() {
- $block_type = WP_Block_Type_Registry::get_instance()->get_registered( 'core/block' );
- $output = $block_type->render( array( 'ref' => self::$post_id ) );
+ $parsed_block = array(
+ 'blockName' => 'core/block',
+ 'attrs' => array( 'ref' => self::$post_id ),
+ );
+ $block = new WP_Block( $parsed_block );
+ $output = $block->render();
$this->assertSame( '', $output );
}
}
diff --git a/tools/release/sync-gutenberg-packages.js b/tools/release/sync-gutenberg-packages.js
index f5c8fbcdf7222..a8ea545e18514 100644
--- a/tools/release/sync-gutenberg-packages.js
+++ b/tools/release/sync-gutenberg-packages.js
@@ -107,7 +107,7 @@ function getMismatchedNonWordPressDependencies() {
const currentPackages = getWordPressPackages( currentPackageJSON );
const packageLock = readJSONFile( "package-lock.json" );
- const versionConflicts = Object.entries( packageLock.dependencies )
+ const versionConflicts = Object.entries( packageLock.packages[''].dependencies )
.filter( ( [packageName] ) => currentPackages.includes( packageName ) )
.flatMap( ( [, { dependencies }] ) => Object.entries( dependencies || {} ) )
.filter( identity )