From c9aaaa10045073d1ec3d2c69009694528cb9a122 Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Thu, 23 Jul 2020 10:59:37 -0700 Subject: [PATCH 1/9] Add comment to check post_tag taxonomy --- packages/block-library/src/post-tags/edit.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/block-library/src/post-tags/edit.js b/packages/block-library/src/post-tags/edit.js index faa14e437da4a..9ce2b11323e79 100644 --- a/packages/block-library/src/post-tags/edit.js +++ b/packages/block-library/src/post-tags/edit.js @@ -47,6 +47,15 @@ export default function PostTagsEdit( { context } ) { { __( 'Post tags block: No post found for this block.' ) } ); + + /** + * Do not render the block when viewing a page (as opposed to a post) + * + * @todo By default, only posts can be grouped by tags. Therefore, without any configuration, + * the post tags block will have no tags for pages. Plugins, however, can modify this behavior. + * In the future, instead of only evaluating posts, we should check whether the + * post_tag taxonomy is registered for the page post type. + */ } else if ( context.postType !== 'post' ) { /** * Do not render the block when viewing a page (as opposed to a post) From 45783343e29a90eb375ac9ba07882af0d7c73900 Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Thu, 23 Jul 2020 12:54:13 -0700 Subject: [PATCH 2/9] Update comment phrasing to account for custom post types --- packages/block-library/src/post-tags/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/post-tags/edit.js b/packages/block-library/src/post-tags/edit.js index 9ce2b11323e79..991f54235de1c 100644 --- a/packages/block-library/src/post-tags/edit.js +++ b/packages/block-library/src/post-tags/edit.js @@ -54,7 +54,7 @@ export default function PostTagsEdit( { context } ) { * @todo By default, only posts can be grouped by tags. Therefore, without any configuration, * the post tags block will have no tags for pages. Plugins, however, can modify this behavior. * In the future, instead of only evaluating posts, we should check whether the - * post_tag taxonomy is registered for the page post type. + * post_tag taxonomy is registered for the current post type. */ } else if ( context.postType !== 'post' ) { /** From f04224a29ac8e1381c05a80fc705858fc84f9074 Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Thu, 23 Jul 2020 14:19:27 -0700 Subject: [PATCH 3/9] Undo changes to server side rendered post tags blocks --- packages/block-library/src/post-tags/index.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/block-library/src/post-tags/index.php b/packages/block-library/src/post-tags/index.php index c7b90fede2651..7bedaa013c581 100644 --- a/packages/block-library/src/post-tags/index.php +++ b/packages/block-library/src/post-tags/index.php @@ -26,11 +26,7 @@ function render_block_core_post_tags( $attributes, $content, $block ) { foreach ( $post_tags as $tag ) { $output .= '' . $tag->name . '' . ' | '; } - - $output = trim( $output, ' | ' ); - $output .= ''; - - return $output; + return trim( $output, ' | ' ); } } From 31d362b8ee0b8f7aa47da9f4cee92ead99e6210b Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Tue, 28 Jul 2020 12:16:58 -0700 Subject: [PATCH 4/9] Add light block wrapper to post tags --- packages/block-library/src/post-tags/edit.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/block-library/src/post-tags/edit.js b/packages/block-library/src/post-tags/edit.js index 991f54235de1c..faa14e437da4a 100644 --- a/packages/block-library/src/post-tags/edit.js +++ b/packages/block-library/src/post-tags/edit.js @@ -47,15 +47,6 @@ export default function PostTagsEdit( { context } ) { { __( 'Post tags block: No post found for this block.' ) } ); - - /** - * Do not render the block when viewing a page (as opposed to a post) - * - * @todo By default, only posts can be grouped by tags. Therefore, without any configuration, - * the post tags block will have no tags for pages. Plugins, however, can modify this behavior. - * In the future, instead of only evaluating posts, we should check whether the - * post_tag taxonomy is registered for the current post type. - */ } else if ( context.postType !== 'post' ) { /** * Do not render the block when viewing a page (as opposed to a post) From df1191bb15ee2e8ad516ff8c84febc406499310d Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Tue, 28 Jul 2020 12:18:02 -0700 Subject: [PATCH 5/9] Reintroduce wrapping div to server side rendered block --- packages/block-library/src/post-tags/index.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/post-tags/index.php b/packages/block-library/src/post-tags/index.php index 7bedaa013c581..c7b90fede2651 100644 --- a/packages/block-library/src/post-tags/index.php +++ b/packages/block-library/src/post-tags/index.php @@ -26,7 +26,11 @@ function render_block_core_post_tags( $attributes, $content, $block ) { foreach ( $post_tags as $tag ) { $output .= '' . $tag->name . '' . ' | '; } - return trim( $output, ' | ' ); + + $output = trim( $output, ' | ' ); + $output .= ''; + + return $output; } } From 50dcf2e540c6e72e3c357b807e9f87d78e979718 Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Mon, 20 Jul 2020 10:47:09 -0700 Subject: [PATCH 6/9] Add color support to post tag block --- packages/block-library/src/post-tags/block.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/post-tags/block.json b/packages/block-library/src/post-tags/block.json index cf33f797bb687..ea4174299845f 100644 --- a/packages/block-library/src/post-tags/block.json +++ b/packages/block-library/src/post-tags/block.json @@ -4,6 +4,10 @@ "usesContext": [ "postId", "postType" ], "supports": { "html": false, - "lightBlockWrapper": true + "lightBlockWrapper": true, + "__experimentalColor": { + "gradients": true, + "linkColor": true + } } } From 3af770a5597363b731d14cab806a17fa40ddc42e Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Wed, 29 Jul 2020 12:28:45 -0700 Subject: [PATCH 7/9] Add font size and line height controls --- packages/block-library/src/post-tags/block.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/post-tags/block.json b/packages/block-library/src/post-tags/block.json index ea4174299845f..1aa28a59052a6 100644 --- a/packages/block-library/src/post-tags/block.json +++ b/packages/block-library/src/post-tags/block.json @@ -5,9 +5,11 @@ "supports": { "html": false, "lightBlockWrapper": true, + "__experimentalFontSize": true, "__experimentalColor": { "gradients": true, "linkColor": true - } + }, + "__experimentalLineHeight": true } } From 136f87f96a1ea2d0394f609d0b87521848be432d Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Wed, 29 Jul 2020 13:05:52 -0700 Subject: [PATCH 8/9] Add editor post tags text alignment --- .../block-library/src/post-tags/block.json | 5 +++ packages/block-library/src/post-tags/edit.js | 36 +++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/packages/block-library/src/post-tags/block.json b/packages/block-library/src/post-tags/block.json index 1aa28a59052a6..4b4c95c0b351d 100644 --- a/packages/block-library/src/post-tags/block.json +++ b/packages/block-library/src/post-tags/block.json @@ -1,6 +1,11 @@ { "name": "core/post-tags", "category": "design", + "attributes": { + "textAlign": { + "type": "string" + } + }, "usesContext": [ "postId", "postType" ], "supports": { "html": false, diff --git a/packages/block-library/src/post-tags/edit.js b/packages/block-library/src/post-tags/edit.js index faa14e437da4a..1ade286dc7db3 100644 --- a/packages/block-library/src/post-tags/edit.js +++ b/packages/block-library/src/post-tags/edit.js @@ -1,12 +1,24 @@ +/** + * External dependencies + */ +import classnames from 'classnames'; + /** * WordPress dependencies */ import { useEntityProp } from '@wordpress/core-data'; -import { Warning, __experimentalBlock as Block } from '@wordpress/block-editor'; +import { + BlockControls, + Warning, + __experimentalBlock as Block, + AlignmentToolbar, +} from '@wordpress/block-editor'; import { useSelect } from '@wordpress/data'; import { __ } from '@wordpress/i18n'; -export default function PostTagsEdit( { context } ) { +export default function PostTagsEdit( { context, attributes, setAttributes } ) { + const { textAlign } = attributes; + const [ tags ] = useEntityProp( 'postType', context.postType, @@ -65,5 +77,23 @@ export default function PostTagsEdit( { context } ) { ); } - return { display }; + return ( + <> + + { + setAttributes( { textAlign: nextAlign } ); + } } + /> + + + { display } + + + ); } From c4a94df3c2b60b0a689b203814631626a46f7a8f Mon Sep 17 00:00:00 2001 From: Jeremy Yip Date: Mon, 3 Aug 2020 15:17:50 -0700 Subject: [PATCH 9/9] Add post tags text alignment to frontend --- packages/block-library/src/post-tags/index.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/post-tags/index.php b/packages/block-library/src/post-tags/index.php index c7b90fede2651..f6ff4b075ae21 100644 --- a/packages/block-library/src/post-tags/index.php +++ b/packages/block-library/src/post-tags/index.php @@ -21,7 +21,11 @@ function render_block_core_post_tags( $attributes, $content, $block ) { $post_tags = get_the_tags( $block->context['postId'] ); if ( ! empty( $post_tags ) ) { $classes = 'wp-block-post-tags'; - $output = sprintf( '
', esc_attr( $classes ) ); + if ( isset( $attributes['textAlign'] ) ) { + $classes .= ' has-text-align-' . $attributes['textAlign']; + } + + $output = sprintf( '
', esc_attr( $classes ) ); foreach ( $post_tags as $tag ) { $output .= '' . $tag->name . '' . ' | ';