%s. Block cannot be rendered inside itself.' ),
+ $post_id
+ ),
+ E_USER_WARNING
+ );
+ }
+
+ $is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
+ defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
+ return $is_debug ?
+ // translators: Visible only in the front end, this warning takes the place of a faulty block.
+ __( '[block rendering halted]' ) :
+ '';
+ }
+
+ $seen_ids[ $post_id ] = true;
+
+ if ( ! in_the_loop() ) {
+ the_post();
+ }
+
+ $content = get_the_content( null, false, $post_id );
+
+ if ( empty( $content ) ) {
+ unset( $seen_ids[ $post_id ] );
+ return '';
+ }
+
+ $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => 'entry-content' ) );
+ /** This filter is documented in wp-includes/post-template.php */
+ $content = apply_filters( 'the_content', str_replace( ']]>', ']]>', $content ) );
+ unset( $seen_ids[ $post_id ] );
+
+ return (
+ '' . get_the_excerpt( $block->context['postId'] ); + if ( ! isset( $attributes['showMoreOnNewLine'] ) || $attributes['showMoreOnNewLine'] ) { + $content .= '
' . $more_text . '
'; + } else { + $content .= " $more_text"; + } + + remove_filter( + 'excerpt_length', + $filter_excerpt_length + ); + + return sprintf( '' . $featured_image . '
'; +} + +/** + * Registers the `core/post-featured-image` block on the server. + */ +function register_block_core_post_featured_image() { + register_block_type_from_metadata( + __DIR__ . '/post-featured-image', + array( + 'render_callback' => 'render_block_core_post_featured_image', + ) + ); +} +add_action( 'init', 'register_block_core_post_featured_image' ); diff --git a/src/wp-includes/blocks/post-featured-image/block.json b/src/wp-includes/blocks/post-featured-image/block.json new file mode 100644 index 0000000000000..6d22b03b12963 --- /dev/null +++ b/src/wp-includes/blocks/post-featured-image/block.json @@ -0,0 +1,21 @@ +{ + "apiVersion": 2, + "name": "core/post-featured-image", + "title": "Post Featured Image", + "category": "design", + "description": "Display a post's featured image.", + "textdomain": "default", + "attributes": { + "isLink": { + "type": "boolean", + "default": false + } + }, + "usesContext": [ "postId", "postType" ], + "supports": { + "align": [ "left", "right", "center", "wide", "full" ], + "html": false + }, + "editorStyle": "wp-block-post-featured-image-editor", + "style": "wp-block-post-featured-image" +} diff --git a/src/wp-includes/blocks/post-terms.php b/src/wp-includes/blocks/post-terms.php new file mode 100644 index 0000000000000..f5c4e5781e2a7 --- /dev/null +++ b/src/wp-includes/blocks/post-terms.php @@ -0,0 +1,60 @@ +context['postId'] ) || ! isset( $attributes['term'] ) ) { + return ''; + } + + $post_terms = get_the_terms( $block->context['postId'], $attributes['term'] ); + if ( is_wp_error( $post_terms ) ) { + return ''; + } + if ( empty( $post_terms ) ) { + return ''; + } + + $align_class_name = empty( $attributes['textAlign'] ) ? '' : ' ' . "has-text-align-{$attributes['textAlign']}"; + + $terms_links = ''; + foreach ( $post_terms as $term ) { + $terms_links .= sprintf( + '%2$s | ', + get_term_link( $term->term_id ), + esc_html( $term->name ) + ); + } + $terms_links = trim( $terms_links, ' | ' ); + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) ); + + return sprintf( + '%2$s
', + $wrapper_attributes, + get_bloginfo( 'description' ) + ); +} + +/** + * Registers the `core/site-tagline` block on the server. + */ +function register_block_core_site_tagline() { + register_block_type_from_metadata( + __DIR__ . '/site-tagline', + array( + 'render_callback' => 'render_block_core_site_tagline', + ) + ); +} +add_action( 'init', 'register_block_core_site_tagline' ); diff --git a/src/wp-includes/blocks/site-tagline/block.json b/src/wp-includes/blocks/site-tagline/block.json new file mode 100644 index 0000000000000..1ba1803d8e2bd --- /dev/null +++ b/src/wp-includes/blocks/site-tagline/block.json @@ -0,0 +1,27 @@ +{ + "apiVersion": 2, + "name": "core/site-tagline", + "title": "Site Tagline", + "category": "design", + "description": "In a few words, what this site is about.", + "keywords": [ "description" ], + "textdomain": "default", + "attributes": { + "textAlign": { + "type": "string" + } + }, + "supports": { + "html": false, + "color": { + "gradients": true + }, + "spacing": { + "padding": true + }, + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalTextTransform": true + } +} diff --git a/src/wp-includes/blocks/site-title.php b/src/wp-includes/blocks/site-title.php new file mode 100644 index 0000000000000..6cbd6988f9c10 --- /dev/null +++ b/src/wp-includes/blocks/site-title.php @@ -0,0 +1,45 @@ +%2$s', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ); + $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) ); + + return sprintf( + '<%1$s %2$s>%3$s', + $tag_name, + $wrapper_attributes, + $link + ); +} + +/** + * Registers the `core/site-title` block on the server. + */ +function register_block_core_site_title() { + register_block_type_from_metadata( + __DIR__ . '/site-title', + array( + 'render_callback' => 'render_block_core_site_title', + ) + ); +} +add_action( 'init', 'register_block_core_site_title' ); diff --git a/src/wp-includes/blocks/site-title/block.json b/src/wp-includes/blocks/site-title/block.json new file mode 100644 index 0000000000000..cd4a8fa28f2cf --- /dev/null +++ b/src/wp-includes/blocks/site-title/block.json @@ -0,0 +1,33 @@ +{ + "apiVersion": 2, + "name": "core/site-title", + "title": "Site Title", + "category": "design", + "description": "Displays and allows editing the name of the site. The site title usually appears in the browser title bar, in search results, and more. Also available in Settings > General.", + "textdomain": "default", + "attributes": { + "level": { + "type": "number", + "default": 1 + }, + "textAlign": { + "type": "string" + } + }, + "supports": { + "align": [ "wide", "full" ], + "html": false, + "color": { + "gradients": true, + "text": false, + "link": true + }, + "spacing": { + "padding": true + }, + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalTextTransform": true + } +} diff --git a/src/wp-includes/blocks/social-link/block.json b/src/wp-includes/blocks/social-link/block.json index 32f01cf45be79..a477d3e413072 100644 --- a/src/wp-includes/blocks/social-link/block.json +++ b/src/wp-includes/blocks/social-link/block.json @@ -1,8 +1,11 @@ { "apiVersion": 2, "name": "core/social-link", + "title": "Social Icon", "category": "widgets", "parent": [ "core/social-links" ], + "description": "Display an icon linking to a social media profile or website.", + "textdomain": "default", "attributes": { "url": { "type": "string" diff --git a/src/wp-includes/blocks/social-links/block.json b/src/wp-includes/blocks/social-links/block.json index 7646cc1f76ce3..b559ae04fa8a5 100644 --- a/src/wp-includes/blocks/social-links/block.json +++ b/src/wp-includes/blocks/social-links/block.json @@ -1,7 +1,11 @@ { "apiVersion": 2, "name": "core/social-links", + "title": "Social Icons", "category": "widgets", + "description": "Display icons linking to your social media profiles or websites.", + "keywords": [ "links" ], + "textdomain": "default", "attributes": { "iconColor": { "type": "string" @@ -38,6 +42,11 @@ "align": [ "left", "center", "right" ], "anchor": true }, + "styles": [ + { "name": "default", "label": "Default", "isDefault": true }, + { "name": "logos-only", "label": "Logos Only" }, + { "name": "pill-shape", "label": "Pill Shape" } + ], "editorStyle": "wp-block-social-links-editor", "style": "wp-block-social-links" } diff --git a/src/wp-includes/blocks/spacer/block.json b/src/wp-includes/blocks/spacer/block.json index 55e9586cd8c71..b85de6e4ab630 100644 --- a/src/wp-includes/blocks/spacer/block.json +++ b/src/wp-includes/blocks/spacer/block.json @@ -1,7 +1,10 @@ { "apiVersion": 2, "name": "core/spacer", + "title": "Spacer", "category": "design", + "description": "Add white space between blocks and customize its height.", + "textdomain": "default", "attributes": { "height": { "type": "number", diff --git a/src/wp-includes/blocks/table/block.json b/src/wp-includes/blocks/table/block.json index 65e907620afb5..01e5c58520d55 100644 --- a/src/wp-includes/blocks/table/block.json +++ b/src/wp-includes/blocks/table/block.json @@ -1,15 +1,15 @@ { "apiVersion": 2, "name": "core/table", + "title": "Table", "category": "text", + "description": "Insert a table — perfect for sharing charts and data.", + "textdomain": "default", "attributes": { "hasFixedLayout": { "type": "boolean", "default": false }, - "backgroundColor": { - "type": "string" - }, "caption": { "type": "string", "source": "html", @@ -125,8 +125,26 @@ "supports": { "anchor": true, "align": true, + "color": { + "__experimentalSkipSerialization": true, + "gradients": true + }, + "__experimentalBorder": { + "__experimentalSkipSerialization": true, + "color": true, + "style": true, + "width": true + }, "__experimentalSelector": ".wp-block-table > table" }, + "styles": [ + { + "name": "regular", + "label": "Default", + "isDefault": true + }, + { "name": "stripes", "label": "Stripes" } + ], "editorStyle": "wp-block-table-editor", "style": "wp-block-table" } diff --git a/src/wp-includes/blocks/tag-cloud/block.json b/src/wp-includes/blocks/tag-cloud/block.json index de4b9b9714f66..e394a53223ce8 100644 --- a/src/wp-includes/blocks/tag-cloud/block.json +++ b/src/wp-includes/blocks/tag-cloud/block.json @@ -1,7 +1,10 @@ { "apiVersion": 2, "name": "core/tag-cloud", + "title": "Tag Cloud", "category": "widgets", + "description": "A cloud of your most used tags.", + "textdomain": "default", "attributes": { "taxonomy": { "type": "string", diff --git a/src/wp-includes/blocks/text-columns/block.json b/src/wp-includes/blocks/text-columns/block.json index deaf86d93002f..ae6598f581cef 100644 --- a/src/wp-includes/blocks/text-columns/block.json +++ b/src/wp-includes/blocks/text-columns/block.json @@ -1,8 +1,11 @@ { "apiVersion": 2, "name": "core/text-columns", + "title": "Text Columns (deprecated)", "icon": "columns", "category": "design", + "description": "This block is deprecated. Please use the Columns block instead.", + "textdomain": "default", "attributes": { "content": { "type": "array", diff --git a/src/wp-includes/blocks/verse/block.json b/src/wp-includes/blocks/verse/block.json index 490d6a6ea30b4..5e86c1518083d 100644 --- a/src/wp-includes/blocks/verse/block.json +++ b/src/wp-includes/blocks/verse/block.json @@ -1,7 +1,11 @@ { "apiVersion": 2, "name": "core/verse", + "title": "Verse", "category": "text", + "description": "Insert poetry. Use special spacing formats. Or quote song lyrics.", + "keywords": [ "poetry", "poem" ], + "textdomain": "default", "attributes": { "content": { "type": "string", diff --git a/src/wp-includes/blocks/video/block.json b/src/wp-includes/blocks/video/block.json index 9f8b569d239b2..06df163e94143 100644 --- a/src/wp-includes/blocks/video/block.json +++ b/src/wp-includes/blocks/video/block.json @@ -1,7 +1,11 @@ { "apiVersion": 2, "name": "core/video", + "title": "Video", "category": "media", + "description": "Embed a video from your media library or upload a new one.", + "keywords": [ "movie" ], + "textdomain": "default", "attributes": { "autoplay": { "type": "boolean", diff --git a/src/wp-settings.php b/src/wp-settings.php index 69057406a2409..d937cb4fa23c5 100644 --- a/src/wp-settings.php +++ b/src/wp-settings.php @@ -301,6 +301,7 @@ require ABSPATH . WPINC . '/block-supports/border.php'; require ABSPATH . WPINC . '/block-supports/colors.php'; require ABSPATH . WPINC . '/block-supports/custom-classname.php'; +require ABSPATH . WPINC . '/block-supports/duotone.php'; require ABSPATH . WPINC . '/block-supports/generated-classname.php'; require ABSPATH . WPINC . '/block-supports/layout.php'; require ABSPATH . WPINC . '/block-supports/padding.php'; diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php index ea0938250ea41..9a6e70414cf81 100644 --- a/tests/phpunit/includes/functions.php +++ b/tests/phpunit/includes/functions.php @@ -307,11 +307,28 @@ function _unhook_block_registration() { remove_action( 'init', 'register_block_core_calendar' ); remove_action( 'init', 'register_block_core_categories' ); remove_action( 'init', 'register_block_core_file' ); + remove_action( 'init', 'register_block_core_loginout' ); remove_action( 'init', 'register_block_core_latest_comments' ); remove_action( 'init', 'register_block_core_latest_posts' ); + remove_action( 'init', 'register_block_core_post_author' ); + remove_action( 'init', 'register_block_core_post_content' ); + remove_action( 'init', 'register_block_core_post_date' ); + remove_action( 'init', 'register_block_core_post_excerpt' ); + remove_action( 'init', 'register_block_core_post_featured_image' ); + remove_action( 'init', 'register_block_core_post_terms' ); + remove_action( 'init', 'register_block_core_post_title' ); + remove_action( 'init', 'register_block_core_query' ); + remove_action( 'init', 'register_block_core_query_loop' ); + remove_action( 'init', 'register_block_core_query_pagination' ); + remove_action( 'init', 'register_block_core_query_pagination_next' ); + remove_action( 'init', 'register_block_core_query_pagination_numbers' ); + remove_action( 'init', 'register_block_core_query_pagination_previous' ); + remove_action( 'init', 'register_block_core_query_title' ); remove_action( 'init', 'register_block_core_rss' ); remove_action( 'init', 'register_block_core_search' ); remove_action( 'init', 'register_block_core_shortcode' ); + remove_action( 'init', 'register_block_core_site_tagline' ); + remove_action( 'init', 'register_block_core_site_title' ); remove_action( 'init', 'register_block_core_social_link' ); remove_action( 'init', 'register_block_core_social_link' ); remove_action( 'init', 'register_block_core_tag_cloud' ); diff --git a/tools/webpack/packages.js b/tools/webpack/packages.js index db08bafdd630c..52bf9c2012ce0 100644 --- a/tools/webpack/packages.js +++ b/tools/webpack/packages.js @@ -112,9 +112,26 @@ module.exports = function( env = { environment: 'production', watch: false, buil 'file', 'latest-comments', 'latest-posts', + 'loginout', + 'post-author', + 'post-content', + 'post-date', + 'post-excerpt', + 'post-featured-image', + 'post-terms', + 'post-title', + 'query', + 'query-loop', + 'query-pagination', + 'query-pagination-next', + 'query-pagination-numbers', + 'query-pagination-previous', + 'query-title', 'rss', 'search', 'shortcode', + 'site-tagline', + 'site-title', 'social-link', 'tag-cloud', ];