%1$s',
@@ -169,6 +193,26 @@ function register_block_core_latest_posts() {
'type' => 'string',
'default' => 'date',
),
+ 'displayFeaturedImage' => array(
+ 'type' => 'boolean',
+ 'default' => false,
+ ),
+ 'featuredImageAlign' => array(
+ 'type' => 'string',
+ 'enum' => array( 'left', 'center', 'right' ),
+ ),
+ 'featuredImageSizeSlug' => array(
+ 'type' => 'string',
+ 'default' => 'thumbnail',
+ ),
+ 'featuredImageSizeWidth' => array(
+ 'type' => 'number',
+ 'default' => null,
+ ),
+ 'featuredImageSizeHeight' => array(
+ 'type' => 'number',
+ 'default' => null,
+ ),
),
'render_callback' => 'render_block_core_latest_posts',
)
diff --git a/src/wp-includes/blocks/navigation.php b/src/wp-includes/blocks/navigation.php
deleted file mode 100644
index 6270db2d86..0000000000
--- a/src/wp-includes/blocks/navigation.php
+++ /dev/null
@@ -1,303 +0,0 @@
- array(),
- 'inline_styles' => '',
- );
-
- // Text color.
- $has_named_text_color = array_key_exists( 'textColor', $attributes );
- $has_custom_text_color = array_key_exists( 'customTextColor', $attributes );
-
- // If has text color.
- if ( $has_custom_text_color || $has_named_text_color ) {
- // Add has-text-color class.
- $colors['css_classes'][] = 'has-text-color';
- }
-
- if ( $has_named_text_color ) {
- // Add the color class.
- $colors['css_classes'][] = sprintf( 'has-%s-color', $attributes['textColor'] );
- } elseif ( $has_custom_text_color ) {
- // Add the custom color inline style.
- $colors['inline_styles'] .= sprintf( 'color: %s;', $attributes['customTextColor'] );
- }
-
- // Background color.
- $has_named_background_color = array_key_exists( 'backgroundColor', $attributes );
- $has_custom_background_color = array_key_exists( 'customBackgroundColor', $attributes );
-
- // If has background color.
- if ( $has_custom_background_color || $has_named_background_color ) {
- // Add has-background-color class.
- $colors['css_classes'][] = 'has-background-color';
- }
-
- if ( $has_named_background_color ) {
- // Add the background-color class.
- $colors['css_classes'][] = sprintf( 'has-%s-background-color', $attributes['backgroundColor'] );
- } elseif ( $has_custom_background_color ) {
- // Add the custom background-color inline style.
- $colors['inline_styles'] .= sprintf( 'background-color: %s;', $attributes['customBackgroundColor'] );
- }
-
- return $colors;
-}
-
-/**
- * Build an array with CSS classes and inline styles defining the font sizes
- * which will be applied to the navigation markup in the front-end.
- *
- * @param array $attributes Navigation block attributes.
- * @return array Font size CSS classes and inline styles.
- */
-function build_css_font_sizes( $attributes ) {
- // CSS classes.
- $font_sizes = array(
- 'css_classes' => array(),
- 'inline_styles' => '',
- );
-
- $has_named_font_size = array_key_exists( 'fontSize', $attributes );
- $has_custom_font_size = array_key_exists( 'customFontSize', $attributes );
-
- if ( $has_named_font_size ) {
- // Add the font size class.
- $font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $attributes['fontSize'] );
- } elseif ( $has_custom_font_size ) {
- // Add the custom font size inline style.
- $font_sizes['inline_styles'] = sprintf( 'font-size: %spx;', $attributes['customFontSize'] );
- }
-
- return $font_sizes;
-}
-
-/**
- * Recursively filters out links with no labels to build a clean navigation block structure.
- *
- * @param array $blocks Navigation link inner blocks from the Navigation block.
- * @return array Blocks that had valid labels
- */
-function gutenberg_remove_empty_navigation_links_recursive( $blocks ) {
- $blocks = array_filter(
- $blocks,
- function( $block ) {
- return ! empty( $block['attrs']['label'] );
- }
- );
-
- if ( ! empty( $blocks ) ) {
- foreach ( $blocks as $key => $block ) {
- if ( ! empty( $block['innerBlocks'] ) ) {
- $blocks[ $key ]['innerBlocks'] = gutenberg_remove_empty_navigation_links_recursive( $block['innerBlocks'] );
- }
- }
- }
-
- return $blocks;
-}
-
-/**
- * Returns the top-level submenu SVG chevron icon.
- *
- * @return string
- */
-function render_submenu_icon() {
- return '
';
-}
-
-/**
- * Renders the `core/navigation` block on server.
- *
- * @param array $content The saved content.
- * @param array $block The parsed block.
- *
- * @return string Returns the post content with the legacy widget added.
- */
-function render_block_navigation( $content, $block ) {
-
- if ( 'core/navigation' !== $block['blockName'] ) {
- return $content;
- }
-
- $attributes = $block['attrs'];
- $block['innerBlocks'] = gutenberg_remove_empty_navigation_links_recursive( $block['innerBlocks'] );
-
- if ( empty( $block['innerBlocks'] ) ) {
- return '';
- }
-
- $colors = build_css_colors( $attributes );
- $font_sizes = build_css_font_sizes( $attributes );
- $classes = array_merge(
- $colors['css_classes'],
- $font_sizes['css_classes'],
- array( 'wp-block-navigation' ),
- isset( $attributes['className'] ) ? array( $attributes['className'] ) : array(),
- isset( $attributes['itemsJustification'] ) ? array( 'items-justified-' . $attributes['itemsJustification'] ) : array(),
- isset( $attributes['align'] ) ? array( 'align' . $attributes['align'] ) : array()
- );
- $class_attribute = sprintf( ' class="%s"', esc_attr( implode( ' ', $classes ) ) );
- $style_attribute = ( $colors['inline_styles'] || $font_sizes['inline_styles'] )
- ? sprintf( ' style="%s"', esc_attr( $colors['inline_styles'] ) . esc_attr( $font_sizes['inline_styles'] ) )
- : '';
-
- return sprintf(
- '
',
- $class_attribute,
- $style_attribute,
- build_navigation_html( $attributes, $block, $colors, $font_sizes, true )
- );
-}
-
-/**
- * Walks the inner block structure and returns an HTML list for it.
- *
- * @param array $attributes The Navigation block attributes.
- * @param array $block The NavigationItem block.
- * @param array $colors Contains inline styles and CSS classes to apply to navigation item.
- * @param array $font_sizes Contains inline styles and CSS classes to apply to navigation item.
- * @param bool $is_level_zero True whether is main menu (level zero). Otherwise, False.
- *
- * @return string Returns an HTML list from innerBlocks.
- */
-function build_navigation_html( $attributes, $block, $colors, $font_sizes, $is_level_zero = true ) {
- $html = '';
- $classes = array_merge(
- $colors['css_classes'],
- $font_sizes['css_classes']
- );
- $css_classes = implode( ' ', $classes );
- $class_attribute = sprintf( ' class="wp-block-navigation-link__content %s"', esc_attr( trim( $css_classes ) ) );
- $style_attribute = ( $colors['inline_styles'] || $font_sizes['inline_styles'] )
- ? sprintf( ' style="%s"', esc_attr( $colors['inline_styles'] ) . esc_attr( $font_sizes['inline_styles'] ) )
- : '';
-
- foreach ( (array) $block['innerBlocks'] as $key => $block ) {
- $has_submenu = count( (array) $block['innerBlocks'] ) > 0;
-
- $html .= '';
- }
- return '
';
-}
-
-/**
- * Register the navigation block.
- *
- * @uses render_block_navigation()
- * @throws WP_Error An WP_Error exception parsing the block definition.
- */
-function register_block_core_navigation() {
-
- register_block_type(
- 'core/navigation',
- array(
- 'attributes' => array(
- 'className' => array(
- 'type' => 'string',
- ),
- 'textColor' => array(
- 'type' => 'string',
- ),
- 'customTextColor' => array(
- 'type' => 'string',
- ),
- 'backgroundColor' => array(
- 'type' => 'string',
- ),
- 'customBackgroundColor' => array(
- 'type' => 'string',
- ),
- 'fontSize' => array(
- 'type' => 'string',
- ),
- 'customFontSize' => array(
- 'type' => 'number',
- ),
- 'itemsJustification' => array(
- 'type' => 'string',
- ),
- 'showSubmenuIcon' => array(
- 'type' => 'boolean',
- 'default' => false,
- ),
- ),
- )
- );
-}
-add_action( 'init', 'register_block_core_navigation' );
-add_filter( 'render_block', 'render_block_navigation', 10, 2 );
diff --git a/src/wp-includes/blocks/social-link.php b/src/wp-includes/blocks/social-link.php
new file mode 100644
index 0000000000..a414cb6c27
--- /dev/null
+++ b/src/wp-includes/blocks/social-link.php
@@ -0,0 +1,264 @@
+
' . $icon . '';
+}
+
+/**
+ * Registers the `core/social-link` blocks.
+ */
+function register_block_core_social_link() {
+ $path = __DIR__ . '/social-link/block.json';
+ $metadata = json_decode( file_get_contents( $path ), true );
+
+ register_block_type(
+ $metadata['name'],
+ array_merge(
+ $metadata,
+ array(
+ 'render_callback' => 'render_block_core_social_link',
+ )
+ )
+ );
+}
+add_action( 'init', 'register_block_core_social_link' );
+
+
+/**
+ * Returns the SVG for social link.
+ *
+ * @param string $service The service icon.
+ *
+ * @return string SVG Element for service icon.
+ */
+function block_core_social_link_get_icon( $service ) {
+ $services = block_core_social_link_services();
+ if ( isset( $services[ $service ] ) && isset( $services[ $service ]['icon'] ) ) {
+ return $services[ $service ]['icon'];
+ }
+
+ return $services['share']['icon'];
+}
+
+/**
+ * Returns the brand name for social link.
+ *
+ * @param string $service The service icon.
+ *
+ * @return string Brand label.
+ */
+function block_core_social_link_get_name( $service ) {
+ $services = block_core_social_link_services();
+ if ( isset( $services[ $service ] ) && isset( $services[ $service ]['name'] ) ) {
+ return $services[ $service ]['name'];
+ }
+
+ return $services['share']['name'];
+}
+
+/**
+ * Returns the SVG for social link.
+ *
+ * @param string $service The service slug to extract data from.
+ * @param string $field The field ('name', 'icon', etc) to extract for a service.
+ *
+ * @return array|string
+ */
+function block_core_social_link_services( $service = '', $field = '' ) {
+ $services_data = array(
+ 'fivehundredpx' => array(
+ 'name' => '500px',
+ 'icon' => '
',
+ ),
+ 'amazon' => array(
+ 'name' => 'Amazon',
+ 'icon' => '
',
+ ),
+ 'bandcamp' => array(
+ 'name' => 'Bandcamp',
+ 'icon' => '
',
+ ),
+ 'behance' => array(
+ 'name' => 'Behance',
+ 'icon' => '
',
+ ),
+ 'chain' => array(
+ 'name' => 'Link',
+ 'icon' => '
',
+ ),
+ 'codepen' => array(
+ 'name' => 'CodePen',
+ 'icon' => '
',
+ ),
+ 'deviantart' => array(
+ 'name' => 'DeviantArt',
+ 'icon' => '
',
+ ),
+ 'dribbble' => array(
+ 'name' => 'Dribbble',
+ 'icon' => '
',
+ ),
+ 'dropbox' => array(
+ 'name' => 'Dropbox',
+ 'icon' => '
',
+ ),
+ 'etsy' => array(
+ 'name' => 'Etsy',
+ 'icon' => '
',
+ ),
+ 'facebook' => array(
+ 'name' => 'Facebook',
+ 'icon' => '
',
+ ),
+ 'feed' => array(
+ 'name' => 'RSS Feed',
+ 'icon' => '
',
+ ),
+ 'flickr' => array(
+ 'name' => 'Flickr',
+ 'icon' => '
',
+ ),
+ 'foursquare' => array(
+ 'name' => 'Foursquare',
+ 'icon' => '
',
+ ),
+ 'goodreads' => array(
+ 'name' => 'Goodreads',
+ 'icon' => '
',
+ ),
+ 'google' => array(
+ 'name' => 'Google',
+ 'icon' => '
',
+ ),
+ 'github' => array(
+ 'name' => 'GitHub',
+ 'icon' => '
',
+ ),
+ 'instagram' => array(
+ 'name' => 'Instagram',
+ 'icon' => '
',
+ ),
+ 'lastfm' => array(
+ 'name' => 'Last.fm',
+ 'icon' => '
',
+ ),
+ 'linkedin' => array(
+ 'name' => 'LinkedIn',
+ 'icon' => '
',
+ ),
+ 'mail' => array(
+ 'name' => 'Mail',
+ 'icon' => '
',
+ ),
+ 'mastodon' => array(
+ 'name' => 'Mastodon',
+ 'icon' => '
',
+ ),
+ 'meetup' => array(
+ 'name' => 'Meetup',
+ 'icon' => '
',
+ ),
+ 'medium' => array(
+ 'name' => 'Medium',
+ 'icon' => '
',
+ ),
+ 'pinterest' => array(
+ 'name' => 'Pinterest',
+ 'icon' => '
',
+ ),
+ 'pocket' => array(
+ 'name' => 'Pocket',
+ 'icon' => '
',
+ ),
+ 'reddit' => array(
+ 'name' => 'Reddit',
+ 'icon' => '
',
+ ),
+ 'skype' => array(
+ 'name' => 'Skype',
+ 'icon' => '
',
+ ),
+ 'snapchat' => array(
+ 'name' => 'Snapchat',
+ 'icon' => '
',
+ ),
+ 'soundcloud' => array(
+ 'name' => 'Soundcloud',
+ 'icon' => '
',
+ ),
+ 'spotify' => array(
+ 'name' => 'Spotify',
+ 'icon' => '
',
+ ),
+ 'tumblr' => array(
+ 'name' => 'Tumblr',
+ 'icon' => '
',
+ ),
+ 'twitch' => array(
+ 'name' => 'Twitch',
+ 'icon' => '
',
+ ),
+ 'twitter' => array(
+ 'name' => 'Twitter',
+ 'icon' => '
',
+ ),
+ 'vimeo' => array(
+ 'name' => 'Vimeo',
+ 'icon' => '
',
+ ),
+ 'vk' => array(
+ 'name' => 'VK',
+ 'icon' => '
',
+ ),
+ 'wordpress' => array(
+ 'name' => 'WordPress',
+ 'icon' => '
',
+ ),
+ 'yelp' => array(
+ 'name' => 'Yelp',
+ 'icon' => '
',
+ ),
+ 'youtube' => array(
+ 'name' => 'YouTube',
+ 'icon' => '
',
+ ),
+ 'share' => array(
+ 'name' => 'Share Icon',
+ 'icon' => '
',
+ ),
+ );
+
+ if ( ! empty( $service )
+ && ! empty( $field )
+ && isset( $services_data[ $service ] )
+ && ( 'icon' === $field || 'name' === $field )
+ ) {
+ return $services_data[ $service ][ $field ];
+ } elseif ( ! empty( $service ) && isset( $services_data[ $service ] ) ) {
+ return $services_data[ $service ];
+ }
+
+ return $services_data;
+}
diff --git a/src/wp-includes/blocks/social-link/block.json b/src/wp-includes/blocks/social-link/block.json
new file mode 100644
index 0000000000..4d4c0cb68d
--- /dev/null
+++ b/src/wp-includes/blocks/social-link/block.json
@@ -0,0 +1,15 @@
+{
+ "name": "core/social-link",
+ "category": "widgets",
+ "attributes": {
+ "url": {
+ "type": "string"
+ },
+ "service": {
+ "type": "string"
+ },
+ "label": {
+ "type": "number"
+ }
+ }
+}
diff --git a/src/wp-settings.php b/src/wp-settings.php
index a8f96ec0aa..a7b9251e88 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -276,10 +276,10 @@ require ABSPATH . WPINC . '/blocks/calendar.php';
require ABSPATH . WPINC . '/blocks/categories.php';
require ABSPATH . WPINC . '/blocks/latest-comments.php';
require ABSPATH . WPINC . '/blocks/latest-posts.php';
-require ABSPATH . WPINC . '/blocks/navigation.php';
require ABSPATH . WPINC . '/blocks/rss.php';
require ABSPATH . WPINC . '/blocks/search.php';
require ABSPATH . WPINC . '/blocks/shortcode.php';
+require ABSPATH . WPINC . '/blocks/social-link.php';
require ABSPATH . WPINC . '/blocks/tag-cloud.php';
$GLOBALS['wp_embed'] = new WP_Embed();
diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php
index a69354d9b7..e20114386a 100644
--- a/tests/phpunit/includes/functions.php
+++ b/tests/phpunit/includes/functions.php
@@ -301,11 +301,11 @@ function _unhook_block_registration() {
remove_action( 'init', 'register_block_core_categories' );
remove_action( 'init', 'register_block_core_latest_comments' );
remove_action( 'init', 'register_block_core_latest_posts' );
- remove_action( 'init', 'register_block_core_navigation' );
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_social_link' );
+ remove_action( 'init', 'register_block_core_social_link' );
remove_action( 'init', 'register_block_core_tag_cloud' );
}
tests_add_filter( 'init', '_unhook_block_registration', 1000 );
diff --git a/tests/phpunit/tests/rest-api/rest-schema-setup.php b/tests/phpunit/tests/rest-api/rest-schema-setup.php
index 0aeebb4352..c60170d45a 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-setup.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-setup.php
@@ -129,6 +129,7 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase {
'/wp/v2/block-renderer/(?P
core/rss)',
'/wp/v2/block-renderer/(?Pcore/search)',
'/wp/v2/block-renderer/(?Pcore/shortcode)',
+ '/wp/v2/block-renderer/(?Pcore/social-link)',
'/wp/v2/block-renderer/(?Pcore/tag-cloud)',
'/wp/v2/settings',
'/wp/v2/themes',
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index 3465aeae8e..eb3b1d49e7 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -4752,6 +4752,46 @@ mockedApiResponse.Schema = {
}
]
},
+ "/wp/v2/block-renderer/(?Pcore/social-link)": {
+ "namespace": "wp/v2",
+ "methods": [
+ "GET"
+ ],
+ "endpoints": [
+ {
+ "methods": [
+ "GET"
+ ],
+ "args": {
+ "name": {
+ "required": false,
+ "description": "Unique registered name for the block.",
+ "type": "string"
+ },
+ "context": {
+ "required": false,
+ "default": "view",
+ "enum": [
+ "edit"
+ ],
+ "description": "Scope under which the request is made; determines fields present in response.",
+ "type": "string"
+ },
+ "attributes": {
+ "required": false,
+ "default": [],
+ "description": "Attributes for core/social-link block",
+ "type": "object"
+ },
+ "post_id": {
+ "required": false,
+ "description": "ID of the post context.",
+ "type": "integer"
+ }
+ }
+ }
+ ]
+ },
"/wp/v2/block-renderer/(?Pcore/tag-cloud)": {
"namespace": "wp/v2",
"methods": [
diff --git a/tools/webpack/packages.js b/tools/webpack/packages.js
index 0da0fe0af4..bf05904e61 100644
--- a/tools/webpack/packages.js
+++ b/tools/webpack/packages.js
@@ -109,10 +109,10 @@ module.exports = function( env = { environment: 'production', watch: false, buil
'categories',
'latest-comments',
'latest-posts',
- 'navigation',
'rss',
'search',
'shortcode',
+ 'social-link',
'tag-cloud',
];
const phpFiles = {