Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typography: Stabilize typography block supports within block processing #63401

Open
wants to merge 13 commits into
base: trunk
Choose a base branch
from

Conversation

andrewserong
Copy link
Contributor

@andrewserong andrewserong commented Jul 11, 2024

What?

Part of #63001, alternative to #63072.

Stabilize the following typography block supports by no longer requiring the __experimental prefix in block.json and when registering block types:

  1. __experimentalFontFamilyfontFamily
  2. __experimentalFontStylefontStyle
  3. __experimentalFontWeightfontWeight
  4. __experimentalLetterSpacingletterSpacing
  5. __experimentalTextDecorationtextDecoration
  6. __experimentalTextTransformtextTransform
  • __experimentalWritingModewritingMode (writingMode will be left as experimental for now, based on feedback)

The approach in this PR is to handle the transformation from the experimental properties at the point that blocks are processed. This happens during block registration. The idea proposed here is to do the transformation just before filters are applied so that the filters use the "real" block supports, not the experimental ones.

Note that this PR does not update any of the existing blocks to use the stable syntax. That can be worked on in follow-up PRs.

Why?

Stabilize the above typography block supports so that they can be used without the __experimental prefix. However, at the same time, support both the experimental and the non experimental syntaxes, so that blocks out in the wild do not have to be updated in order to continue to work with the typography support.

How?

A previous attempt was tried in #63072, however the approach in this PR is simpler:

  • Update the keys for each of the affected typography supports to no longer use the __experimental prefix
  • Update the block processing logic so that for the affected typography supports, we treat __experimental as opting in to the "real" support in both JS and PHP
  • Note that the PHP backport for this will propose moving the logic into one of the PHP classes for blocks, whereas this PR uses a filter to achieve a similar result.

Testing Instructions

Here is some block markup for a Title block and a Group block with a paragraph within it, with typography applied to both blocks:

Test markup
<!-- wp:post-title {"style":{"typography":{"fontStyle":"italic","fontWeight":"1000","lineHeight":"2","letterSpacing":"10px","textDecoration":"underline","textTransform":"uppercase"}},"fontSize":"xx-large","fontFamily":"system-sans-serif"} /-->

<!-- wp:group {"style":{"typography":{"fontStyle":"italic","fontWeight":"700","lineHeight":"2","letterSpacing":"15px","textDecoration":"underline","textTransform":"uppercase"}},"fontSize":"x-large","fontFamily":"heading","layout":{"type":"constrained"}} -->
<div class="wp-block-group has-heading-font-family has-x-large-font-size" style="font-style:italic;font-weight:700;letter-spacing:15px;line-height:2;text-decoration:underline;text-transform:uppercase"><!-- wp:paragraph -->
<p>A paragraph in a Group</p>
<!-- /wp:paragraph --></div>
<!-- /wp:group -->
  1. Add the above test markup to a post or template.
  2. Ensure that the applied typography supports render correctly in the editor and on the site frontend.
  3. Apply the below patch, or manually edit the Group or Post Title blocks' block.json files to use the non-experimental syntax for the typography supports. E.g. update supports.typography.__experimentalFontStyle to supports.typography.fontStyle and so on for the six typography supports covered in this PR.
  4. Test that each of the affected typography supports can be edited / updated at the block level in the editor, and render correctly in the editor and on the site frontend.
diff / patch to update Group and Post Title blocks to use stabilized typography supports
diff --git a/packages/block-library/src/group/block.json b/packages/block-library/src/group/block.json
index 3c7d8d3ce13..db6c10c5684 100644
--- a/packages/block-library/src/group/block.json
+++ b/packages/block-library/src/group/block.json
@@ -76,12 +76,12 @@
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
-			"__experimentalFontFamily": true,
-			"__experimentalFontWeight": true,
-			"__experimentalFontStyle": true,
-			"__experimentalTextTransform": true,
-			"__experimentalTextDecoration": true,
-			"__experimentalLetterSpacing": true,
+			"fontFamily": true,
+			"fontWeight": true,
+			"fontStyle": true,
+			"textTransform": true,
+			"textDecoration": true,
+			"letterSpacing": true,
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
diff --git a/packages/block-library/src/post-title/block.json b/packages/block-library/src/post-title/block.json
index 796da166710..0e5ff5f5aba 100644
--- a/packages/block-library/src/post-title/block.json
+++ b/packages/block-library/src/post-title/block.json
@@ -51,12 +51,12 @@
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
-			"__experimentalFontFamily": true,
-			"__experimentalFontWeight": true,
-			"__experimentalFontStyle": true,
-			"__experimentalTextTransform": true,
-			"__experimentalTextDecoration": true,
-			"__experimentalLetterSpacing": true,
+			"fontFamily": true,
+			"fontWeight": true,
+			"fontStyle": true,
+			"textTransform": true,
+			"textDecoration": true,
+			"letterSpacing": true,
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}

Finally, double check that plugins or themes can still filter out particular experimental typography block supports using the experimental syntax. For example, with the below snippet added to functions.php in TT4 theme, we can skip Font support on the Post Title block. With the snippet active, custom font family set on any Post Title block should not be output on the site frontend:

function disable_post_title_font_family( $args ) {
	if ( 'core/post-title' === $args['name'] ) {
		_wp_array_set( $args, array( 'supports', 'typography', '__experimentalFontFamily' ), false );
	}

	return $args;
}
add_filter( 'register_block_type_args', 'disable_post_title_font_family', 20 );

Screenshots or screencast

Note: while working on this I noticed that the Appearance controls are not at the correct height in the sidebar UI. That is unrelated to this change, but I've opened a separate issue for it over in #63886

All of these typography supports should work just as they do on trunk:

image

Related links

@andrewserong andrewserong added [Type] Enhancement A suggestion for improvement. [Status] In Progress Tracking issues with work in progress [Feature] Design Tools Tools that impact the appearance of blocks both to expand the number of tools and improve the experi labels Jul 11, 2024
Copy link

github-actions bot commented Jul 11, 2024

Size Change: +3.12 kB (+0.18%)

Total Size: 1.76 MB

Filename Size Change
build/block-editor/content-rtl.css 4.59 kB +9 B (+0.2%)
build/block-editor/content.css 4.59 kB +8 B (+0.17%)
build/block-editor/index.min.js 254 kB +15 B (+0.01%)
build/block-editor/style-rtl.css 16.1 kB -28 B (-0.17%)
build/block-editor/style.css 16.1 kB -29 B (-0.18%)
build/block-library/blocks/gallery/editor-rtl.css 955 B -3 B (-0.31%)
build/block-library/blocks/gallery/editor.css 958 B -4 B (-0.42%)
build/block-library/blocks/image/editor-rtl.css 862 B +17 B (+2.01%)
build/block-library/blocks/image/editor.css 861 B +18 B (+2.14%)
build/block-library/blocks/latest-posts/editor-rtl.css 186 B -18 B (-8.82%)
build/block-library/blocks/latest-posts/editor.css 183 B -21 B (-10.29%) 👏
build/block-library/blocks/video/editor-rtl.css 541 B -12 B (-2.17%)
build/block-library/blocks/video/editor.css 542 B -12 B (-2.17%)
build/block-library/editor-rtl.css 11.9 kB +25 B (+0.21%)
build/block-library/editor.css 11.9 kB +27 B (+0.23%)
build/block-library/index.min.js 217 kB +523 B (+0.24%)
build/block-library/style-rtl.css 14.7 kB +13 B (+0.09%)
build/block-library/style.css 14.7 kB +13 B (+0.09%)
build/blocks/index.min.js 52.4 kB +182 B (+0.35%)
build/components/index.min.js 222 kB +112 B (+0.05%)
build/components/style-rtl.css 12 kB +42 B (+0.35%)
build/components/style.css 12 kB +46 B (+0.38%)
build/core-commands/index.min.js 2.81 kB +24 B (+0.86%)
build/core-data/index.min.js 73.1 kB +287 B (+0.39%)
build/edit-site/index.min.js 214 kB +1.14 kB (+0.54%)
build/edit-site/posts-rtl.css 6.8 kB +17 B (+0.25%)
build/edit-site/posts.css 6.81 kB +13 B (+0.19%)
build/edit-site/style-rtl.css 12 kB +54 B (+0.45%)
build/edit-site/style.css 12 kB +51 B (+0.43%)
build/edit-widgets/index.min.js 17.6 kB +14 B (+0.08%)
build/editor/index.min.js 99.6 kB +323 B (+0.33%)
build/editor/style-rtl.css 9.32 kB +17 B (+0.18%)
build/editor/style.css 9.32 kB +15 B (+0.16%)
build/interactivity/image.min.js 1.78 kB -1 B (-0.06%)
build/preferences/style-rtl.css 554 B -24 B (-4.15%)
build/preferences/style.css 554 B -24 B (-4.15%)
build/block-library/blocks/table-of-contents/style-rtl.css 83 B +83 B (new file) 🆕
build/block-library/blocks/table-of-contents/style.css 83 B +83 B (new file) 🆕
build/block-library/blocks/tag-cloud/editor-rtl.css 63 B +63 B (new file) 🆕
build/block-library/blocks/tag-cloud/editor.css 63 B +63 B (new file) 🆕
ℹ️ View Unchanged
Filename Size
build/a11y/index.min.js 951 B
build/annotations/index.min.js 2.26 kB
build/api-fetch/index.min.js 2.31 kB
build/autop/index.min.js 2.12 kB
build/blob/index.min.js 579 B
build/block-directory/index.min.js 7.29 kB
build/block-directory/style-rtl.css 1.01 kB
build/block-directory/style.css 1.01 kB
build/block-editor/default-editor-styles-rtl.css 394 B
build/block-editor/default-editor-styles.css 394 B
build/block-library/blocks/archives/editor-rtl.css 61 B
build/block-library/blocks/archives/editor.css 60 B
build/block-library/blocks/archives/style-rtl.css 90 B
build/block-library/blocks/archives/style.css 90 B
build/block-library/blocks/audio/editor-rtl.css 149 B
build/block-library/blocks/audio/editor.css 151 B
build/block-library/blocks/audio/style-rtl.css 132 B
build/block-library/blocks/audio/style.css 132 B
build/block-library/blocks/audio/theme-rtl.css 134 B
build/block-library/blocks/audio/theme.css 134 B
build/block-library/blocks/avatar/editor-rtl.css 115 B
build/block-library/blocks/avatar/editor.css 115 B
build/block-library/blocks/avatar/style-rtl.css 104 B
build/block-library/blocks/avatar/style.css 104 B
build/block-library/blocks/button/editor-rtl.css 310 B
build/block-library/blocks/button/editor.css 310 B
build/block-library/blocks/button/style-rtl.css 538 B
build/block-library/blocks/button/style.css 538 B
build/block-library/blocks/buttons/editor-rtl.css 336 B
build/block-library/blocks/buttons/editor.css 336 B
build/block-library/blocks/buttons/style-rtl.css 328 B
build/block-library/blocks/buttons/style.css 328 B
build/block-library/blocks/calendar/style-rtl.css 240 B
build/block-library/blocks/calendar/style.css 240 B
build/block-library/blocks/categories/editor-rtl.css 132 B
build/block-library/blocks/categories/editor.css 131 B
build/block-library/blocks/categories/style-rtl.css 152 B
build/block-library/blocks/categories/style.css 152 B
build/block-library/blocks/code/editor-rtl.css 53 B
build/block-library/blocks/code/editor.css 53 B
build/block-library/blocks/code/style-rtl.css 121 B
build/block-library/blocks/code/style.css 121 B
build/block-library/blocks/code/theme-rtl.css 122 B
build/block-library/blocks/code/theme.css 122 B
build/block-library/blocks/columns/editor-rtl.css 108 B
build/block-library/blocks/columns/editor.css 108 B
build/block-library/blocks/columns/style-rtl.css 420 B
build/block-library/blocks/columns/style.css 420 B
build/block-library/blocks/comment-author-avatar/editor-rtl.css 124 B
build/block-library/blocks/comment-author-avatar/editor.css 124 B
build/block-library/blocks/comment-content/style-rtl.css 90 B
build/block-library/blocks/comment-content/style.css 90 B
build/block-library/blocks/comment-template/style-rtl.css 200 B
build/block-library/blocks/comment-template/style.css 199 B
build/block-library/blocks/comments-pagination-numbers/editor-rtl.css 122 B
build/block-library/blocks/comments-pagination-numbers/editor.css 121 B
build/block-library/blocks/comments-pagination/editor-rtl.css 221 B
build/block-library/blocks/comments-pagination/editor.css 211 B
build/block-library/blocks/comments-pagination/style-rtl.css 234 B
build/block-library/blocks/comments-pagination/style.css 231 B
build/block-library/blocks/comments-title/editor-rtl.css 75 B
build/block-library/blocks/comments-title/editor.css 75 B
build/block-library/blocks/comments/editor-rtl.css 832 B
build/block-library/blocks/comments/editor.css 832 B
build/block-library/blocks/comments/style-rtl.css 632 B
build/block-library/blocks/comments/style.css 631 B
build/block-library/blocks/cover/editor-rtl.css 668 B
build/block-library/blocks/cover/editor.css 669 B
build/block-library/blocks/cover/style-rtl.css 1.62 kB
build/block-library/blocks/cover/style.css 1.6 kB
build/block-library/blocks/details/editor-rtl.css 65 B
build/block-library/blocks/details/editor.css 65 B
build/block-library/blocks/details/style-rtl.css 86 B
build/block-library/blocks/details/style.css 86 B
build/block-library/blocks/embed/editor-rtl.css 314 B
build/block-library/blocks/embed/editor.css 314 B
build/block-library/blocks/embed/style-rtl.css 419 B
build/block-library/blocks/embed/style.css 419 B
build/block-library/blocks/embed/theme-rtl.css 133 B
build/block-library/blocks/embed/theme.css 133 B
build/block-library/blocks/file/editor-rtl.css 326 B
build/block-library/blocks/file/editor.css 326 B
build/block-library/blocks/file/style-rtl.css 278 B
build/block-library/blocks/file/style.css 279 B
build/block-library/blocks/file/view.min.js 324 B
build/block-library/blocks/footnotes/style-rtl.css 198 B
build/block-library/blocks/footnotes/style.css 197 B
build/block-library/blocks/form-input/editor-rtl.css 229 B
build/block-library/blocks/form-input/editor.css 229 B
build/block-library/blocks/form-input/style-rtl.css 342 B
build/block-library/blocks/form-input/style.css 342 B
build/block-library/blocks/form-submission-notification/editor-rtl.css 344 B
build/block-library/blocks/form-submission-notification/editor.css 341 B
build/block-library/blocks/form-submit-button/style-rtl.css 69 B
build/block-library/blocks/form-submit-button/style.css 69 B
build/block-library/blocks/form/view.min.js 470 B
build/block-library/blocks/freeform/editor-rtl.css 2.6 kB
build/block-library/blocks/freeform/editor.css 2.6 kB
build/block-library/blocks/gallery/style-rtl.css 1.71 kB
build/block-library/blocks/gallery/style.css 1.71 kB
build/block-library/blocks/gallery/theme-rtl.css 108 B
build/block-library/blocks/gallery/theme.css 108 B
build/block-library/blocks/group/editor-rtl.css 402 B
build/block-library/blocks/group/editor.css 402 B
build/block-library/blocks/group/style-rtl.css 103 B
build/block-library/blocks/group/style.css 103 B
build/block-library/blocks/group/theme-rtl.css 79 B
build/block-library/blocks/group/theme.css 79 B
build/block-library/blocks/heading/style-rtl.css 188 B
build/block-library/blocks/heading/style.css 188 B
build/block-library/blocks/html/editor-rtl.css 346 B
build/block-library/blocks/html/editor.css 347 B
build/block-library/blocks/image/style-rtl.css 1.59 kB
build/block-library/blocks/image/style.css 1.59 kB
build/block-library/blocks/image/theme-rtl.css 137 B
build/block-library/blocks/image/theme.css 137 B
build/block-library/blocks/image/view.min.js 1.65 kB
build/block-library/blocks/latest-comments/style-rtl.css 355 B
build/block-library/blocks/latest-comments/style.css 354 B
build/block-library/blocks/latest-posts/style-rtl.css 509 B
build/block-library/blocks/latest-posts/style.css 510 B
build/block-library/blocks/list/style-rtl.css 107 B
build/block-library/blocks/list/style.css 107 B
build/block-library/blocks/media-text/editor-rtl.css 304 B
build/block-library/blocks/media-text/editor.css 303 B
build/block-library/blocks/media-text/style-rtl.css 516 B
build/block-library/blocks/media-text/style.css 515 B
build/block-library/blocks/more/editor-rtl.css 427 B
build/block-library/blocks/more/editor.css 427 B
build/block-library/blocks/navigation-link/editor-rtl.css 663 B
build/block-library/blocks/navigation-link/editor.css 664 B
build/block-library/blocks/navigation-link/style-rtl.css 192 B
build/block-library/blocks/navigation-link/style.css 191 B
build/block-library/blocks/navigation-submenu/editor-rtl.css 295 B
build/block-library/blocks/navigation-submenu/editor.css 294 B
build/block-library/blocks/navigation/editor-rtl.css 2.2 kB
build/block-library/blocks/navigation/editor.css 2.21 kB
build/block-library/blocks/navigation/style-rtl.css 2.25 kB
build/block-library/blocks/navigation/style.css 2.23 kB
build/block-library/blocks/navigation/view.min.js 1.03 kB
build/block-library/blocks/nextpage/editor-rtl.css 392 B
build/block-library/blocks/nextpage/editor.css 392 B
build/block-library/blocks/page-list/editor-rtl.css 378 B
build/block-library/blocks/page-list/editor.css 378 B
build/block-library/blocks/page-list/style-rtl.css 175 B
build/block-library/blocks/page-list/style.css 175 B
build/block-library/blocks/paragraph/editor-rtl.css 236 B
build/block-library/blocks/paragraph/editor.css 236 B
build/block-library/blocks/paragraph/style-rtl.css 341 B
build/block-library/blocks/paragraph/style.css 340 B
build/block-library/blocks/post-author/style-rtl.css 175 B
build/block-library/blocks/post-author/style.css 176 B
build/block-library/blocks/post-comments-form/editor-rtl.css 96 B
build/block-library/blocks/post-comments-form/editor.css 96 B
build/block-library/blocks/post-comments-form/style-rtl.css 527 B
build/block-library/blocks/post-comments-form/style.css 528 B
build/block-library/blocks/post-content/editor-rtl.css 74 B
build/block-library/blocks/post-content/editor.css 74 B
build/block-library/blocks/post-date/style-rtl.css 62 B
build/block-library/blocks/post-date/style.css 62 B
build/block-library/blocks/post-excerpt/editor-rtl.css 71 B
build/block-library/blocks/post-excerpt/editor.css 71 B
build/block-library/blocks/post-excerpt/style-rtl.css 141 B
build/block-library/blocks/post-excerpt/style.css 141 B
build/block-library/blocks/post-featured-image/editor-rtl.css 729 B
build/block-library/blocks/post-featured-image/editor.css 726 B
build/block-library/blocks/post-featured-image/style-rtl.css 341 B
build/block-library/blocks/post-featured-image/style.css 341 B
build/block-library/blocks/post-navigation-link/style-rtl.css 215 B
build/block-library/blocks/post-navigation-link/style.css 214 B
build/block-library/blocks/post-template/editor-rtl.css 99 B
build/block-library/blocks/post-template/editor.css 98 B
build/block-library/blocks/post-template/style-rtl.css 399 B
build/block-library/blocks/post-template/style.css 398 B
build/block-library/blocks/post-terms/style-rtl.css 96 B
build/block-library/blocks/post-terms/style.css 96 B
build/block-library/blocks/post-time-to-read/style-rtl.css 70 B
build/block-library/blocks/post-time-to-read/style.css 70 B
build/block-library/blocks/post-title/style-rtl.css 100 B
build/block-library/blocks/post-title/style.css 100 B
build/block-library/blocks/preformatted/style-rtl.css 125 B
build/block-library/blocks/preformatted/style.css 125 B
build/block-library/blocks/pullquote/editor-rtl.css 134 B
build/block-library/blocks/pullquote/editor.css 134 B
build/block-library/blocks/pullquote/style-rtl.css 342 B
build/block-library/blocks/pullquote/style.css 342 B
build/block-library/blocks/pullquote/theme-rtl.css 167 B
build/block-library/blocks/pullquote/theme.css 167 B
build/block-library/blocks/query-pagination-numbers/editor-rtl.css 121 B
build/block-library/blocks/query-pagination-numbers/editor.css 118 B
build/block-library/blocks/query-pagination/editor-rtl.css 220 B
build/block-library/blocks/query-pagination/editor.css 208 B
build/block-library/blocks/query-pagination/style-rtl.css 287 B
build/block-library/blocks/query-pagination/style.css 283 B
build/block-library/blocks/query-title/style-rtl.css 64 B
build/block-library/blocks/query-title/style.css 64 B
build/block-library/blocks/query/editor-rtl.css 452 B
build/block-library/blocks/query/editor.css 451 B
build/block-library/blocks/query/view.min.js 958 B
build/block-library/blocks/quote/style-rtl.css 238 B
build/block-library/blocks/quote/style.css 238 B
build/block-library/blocks/quote/theme-rtl.css 221 B
build/block-library/blocks/quote/theme.css 225 B
build/block-library/blocks/read-more/style-rtl.css 138 B
build/block-library/blocks/read-more/style.css 138 B
build/block-library/blocks/rss/editor-rtl.css 101 B
build/block-library/blocks/rss/editor.css 101 B
build/block-library/blocks/rss/style-rtl.css 288 B
build/block-library/blocks/rss/style.css 287 B
build/block-library/blocks/search/editor-rtl.css 193 B
build/block-library/blocks/search/editor.css 193 B
build/block-library/blocks/search/style-rtl.css 672 B
build/block-library/blocks/search/style.css 671 B
build/block-library/blocks/search/theme-rtl.css 113 B
build/block-library/blocks/search/theme.css 113 B
build/block-library/blocks/search/view.min.js 475 B
build/block-library/blocks/separator/editor-rtl.css 100 B
build/block-library/blocks/separator/editor.css 100 B
build/block-library/blocks/separator/style-rtl.css 248 B
build/block-library/blocks/separator/style.css 248 B
build/block-library/blocks/separator/theme-rtl.css 195 B
build/block-library/blocks/separator/theme.css 195 B
build/block-library/blocks/shortcode/editor-rtl.css 286 B
build/block-library/blocks/shortcode/editor.css 286 B
build/block-library/blocks/site-logo/editor-rtl.css 806 B
build/block-library/blocks/site-logo/editor.css 803 B
build/block-library/blocks/site-logo/style-rtl.css 218 B
build/block-library/blocks/site-logo/style.css 218 B
build/block-library/blocks/site-tagline/editor-rtl.css 87 B
build/block-library/blocks/site-tagline/editor.css 87 B
build/block-library/blocks/site-title/editor-rtl.css 123 B
build/block-library/blocks/site-title/editor.css 123 B
build/block-library/blocks/site-title/style-rtl.css 71 B
build/block-library/blocks/site-title/style.css 71 B
build/block-library/blocks/social-link/editor-rtl.css 338 B
build/block-library/blocks/social-link/editor.css 338 B
build/block-library/blocks/social-links/editor-rtl.css 676 B
build/block-library/blocks/social-links/editor.css 675 B
build/block-library/blocks/social-links/style-rtl.css 1.51 kB
build/block-library/blocks/social-links/style.css 1.5 kB
build/block-library/blocks/spacer/editor-rtl.css 346 B
build/block-library/blocks/spacer/editor.css 346 B
build/block-library/blocks/spacer/style-rtl.css 48 B
build/block-library/blocks/spacer/style.css 48 B
build/block-library/blocks/table/editor-rtl.css 394 B
build/block-library/blocks/table/editor.css 394 B
build/block-library/blocks/table/style-rtl.css 640 B
build/block-library/blocks/table/style.css 639 B
build/block-library/blocks/table/theme-rtl.css 152 B
build/block-library/blocks/table/theme.css 152 B
build/block-library/blocks/tag-cloud/style-rtl.css 266 B
build/block-library/blocks/tag-cloud/style.css 265 B
build/block-library/blocks/template-part/editor-rtl.css 393 B
build/block-library/blocks/template-part/editor.css 393 B
build/block-library/blocks/template-part/theme-rtl.css 113 B
build/block-library/blocks/template-part/theme.css 113 B
build/block-library/blocks/term-description/style-rtl.css 126 B
build/block-library/blocks/term-description/style.css 126 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B
build/block-library/blocks/text-columns/editor.css 95 B
build/block-library/blocks/text-columns/style-rtl.css 165 B
build/block-library/blocks/text-columns/style.css 165 B
build/block-library/blocks/verse/style-rtl.css 98 B
build/block-library/blocks/verse/style.css 98 B
build/block-library/blocks/video/style-rtl.css 192 B
build/block-library/blocks/video/style.css 192 B
build/block-library/blocks/video/theme-rtl.css 134 B
build/block-library/blocks/video/theme.css 134 B
build/block-library/classic-rtl.css 179 B
build/block-library/classic.css 179 B
build/block-library/common-rtl.css 1.1 kB
build/block-library/common.css 1.1 kB
build/block-library/editor-elements-rtl.css 75 B
build/block-library/editor-elements.css 75 B
build/block-library/elements-rtl.css 54 B
build/block-library/elements.css 54 B
build/block-library/reset-rtl.css 472 B
build/block-library/reset.css 472 B
build/block-library/theme-rtl.css 702 B
build/block-library/theme.css 707 B
build/block-serialization-default-parser/index.min.js 1.12 kB
build/block-serialization-spec-parser/index.min.js 2.87 kB
build/commands/index.min.js 16.1 kB
build/commands/style-rtl.css 955 B
build/commands/style.css 952 B
build/compose/index.min.js 12.9 kB
build/customize-widgets/index.min.js 11 kB
build/customize-widgets/style-rtl.css 1.35 kB
build/customize-widgets/style.css 1.35 kB
build/data-controls/index.min.js 641 B
build/data/index.min.js 8.98 kB
build/date/index.min.js 18 kB
build/deprecated/index.min.js 458 B
build/dom-ready/index.min.js 325 B
build/dom/index.min.js 4.65 kB
build/edit-post/classic-rtl.css 578 B
build/edit-post/classic.css 580 B
build/edit-post/index.min.js 12.6 kB
build/edit-post/style-rtl.css 2.31 kB
build/edit-post/style.css 2.31 kB
build/edit-widgets/style-rtl.css 4.2 kB
build/edit-widgets/style.css 4.2 kB
build/element/index.min.js 4.83 kB
build/escape-html/index.min.js 537 B
build/format-library/index.min.js 8.07 kB
build/format-library/style-rtl.css 506 B
build/format-library/style.css 505 B
build/hooks/index.min.js 1.54 kB
build/html-entities/index.min.js 445 B
build/i18n/index.min.js 3.58 kB
build/interactivity/debug.min.js 16.5 kB
build/interactivity/file.min.js 447 B
build/interactivity/index.min.js 13.4 kB
build/interactivity/navigation.min.js 1.16 kB
build/interactivity/query.min.js 742 B
build/interactivity/router.min.js 2.8 kB
build/interactivity/search.min.js 615 B
build/is-shallow-equal/index.min.js 526 B
build/keyboard-shortcuts/index.min.js 1.31 kB
build/keycodes/index.min.js 1.46 kB
build/list-reusable-blocks/index.min.js 2.16 kB
build/list-reusable-blocks/style-rtl.css 846 B
build/list-reusable-blocks/style.css 846 B
build/media-utils/index.min.js 2.92 kB
build/modules/importmap-polyfill.min.js 12.3 kB
build/notices/index.min.js 946 B
build/nux/index.min.js 1.59 kB
build/nux/style-rtl.css 749 B
build/nux/style.css 745 B
build/patterns/index.min.js 7.36 kB
build/patterns/style-rtl.css 687 B
build/patterns/style.css 685 B
build/plugins/index.min.js 1.81 kB
build/preferences-persistence/index.min.js 2.06 kB
build/preferences/index.min.js 2.9 kB
build/primitives/index.min.js 829 B
build/priority-queue/index.min.js 1.54 kB
build/private-apis/index.min.js 1.01 kB
build/react-i18n/index.min.js 630 B
build/react-refresh-entry/index.min.js 9.47 kB
build/react-refresh-runtime/index.min.js 6.76 kB
build/redux-routine/index.min.js 2.69 kB
build/reusable-blocks/index.min.js 2.54 kB
build/reusable-blocks/style-rtl.css 256 B
build/reusable-blocks/style.css 256 B
build/rich-text/index.min.js 10.1 kB
build/router/index.min.js 1.96 kB
build/server-side-render/index.min.js 1.94 kB
build/shortcode/index.min.js 1.4 kB
build/style-engine/index.min.js 2.03 kB
build/token-list/index.min.js 581 B
build/url/index.min.js 3.85 kB
build/vendors/react-dom.min.js 41.7 kB
build/vendors/react-jsx-runtime.min.js 560 B
build/vendors/react.min.js 4.02 kB
build/viewport/index.min.js 965 B
build/warning/index.min.js 250 B
build/widgets/index.min.js 7.19 kB
build/widgets/style-rtl.css 1.16 kB
build/widgets/style.css 1.16 kB
build/wordcount/index.min.js 1.03 kB

compressed-size-action

@andrewserong andrewserong marked this pull request as ready for review July 24, 2024 06:25
Copy link

github-actions bot commented Jul 24, 2024

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: andrewserong <andrewserong@git.wordpress.org>
Co-authored-by: ramonjd <ramonopoly@git.wordpress.org>
Co-authored-by: aaronrobertshaw <aaronrobertshaw@git.wordpress.org>
Co-authored-by: youknowriad <youknowriad@git.wordpress.org>
Co-authored-by: gziolo <gziolo@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@andrewserong
Copy link
Contributor Author

Hi folks! I've pinged some of you for review who I think might be interested in this PR — it is not at all urgent for review, as I'm hoping this will make it in for WP 6.7, so please don't feel like you need to take a look at it immediately 🙂

This is just one particular way that stabilization could occur for these block supports, I'm very happy for ideas if anyone has other ideas for how to handle it. Also, please note that the sync PR for core takes a slightly different approach over in WordPress/wordpress-develop#7069 as in core we don't need to rely on filters for the PHP implementation.

@andrewserong andrewserong changed the title [WIP] Try stabilizing typography block supports within block processing Jul 24, 2024
@andrewserong andrewserong self-assigned this Jul 24, 2024
@andrewserong andrewserong removed the [Status] In Progress Tracking issues with work in progress label Jul 24, 2024
Copy link
Member

@ramonjd ramonjd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just ran through the test steps quickly - all working as intended. 🚀

I like the small footprint of this PR, and the fact that there's no disruption to existing block.json supports.

Also, it'll pad out the support docs too!

https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/#typography

Would we need to update the block.json schema as well?

https://github.com/WordPress/gutenberg/blob/trunk/schemas/json/block.json#L578

@@ -621,3 +621,41 @@ function gutenberg_get_typography_font_size_value( $preset, $settings = array()
remove_filter( 'render_block', 'wp_render_typography_support' );
}
add_filter( 'render_block', 'gutenberg_render_typography_support', 10, 2 );

/**
* Filters the block type arguments to stabilize experimental block supports.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you reckon this migration will be tied to 6.7, or a general deprecation?

I guess what I'm really asking is, should the filter be in a compat folder?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yes, a compat folder is a better idea since the idea is to remove this once 6.7+ is the required WP version for Gutenberg 👍

I'll move that around tomorrow. Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 71a0a96 👍

@andrewserong
Copy link
Contributor Author

andrewserong commented Jul 24, 2024

Thanks for taking this for a spin!

Also, it'll pad out the support docs too!

Totally! The overall goal with this work is so that we can better promote these block supports for folks to use 👍

Would we need to update the block.json schema as well?

Yes, but I'd like to leave that to a separate PR to try to keep this change as small as it can logically be, and since the __experimental prefix will still be allowed syntax. I've added it to the tasks list in #63001 (this PR covers the first two tasks in that list).

… removed once 6.7 is the required minimum version
Copy link
Contributor

@aaronrobertshaw aaronrobertshaw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for tackling this @andrewserong 👍

I haven't gotten to test deeply yet but I think there is a specific scenario we might need to consider when stabilizing block supports. It may be less of an issue with typography supports compared to those with less widespread adoption but an issue all the same.

For some blocks, third party extenders filter block type args to enable or disable different block supports. The approach in this PR currently uses the default priority for the filter. I think it might need to be forced to run last so any filters setting experimental flags can stabilized.

Try adding something like the following to the active theme's functions.php

function disable_some_stuff( $args ) {
	if ( 'core/paragraph' === $args['name'] ) {
		_wp_array_set( $args, array( 'supports', 'typography', '__experimentalFontFamily' ), false );
	}

	return $args;
}
add_filter( 'register_block_type_args', 'disable_some_stuff', 10 );

You'll see that the font family support under the stabilized key is still enabled. If you set the example to something like null for debugging purposes, the experiemental key will still be within the final filtered typography supports.

return $args;
}

add_filter( 'register_block_type_args', 'gutenberg_stabilize_experimental_block_supports', 10, 1 );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might need to be forced to run last so 3rd party filters modifying support flags have been applied first.

@andrewserong
Copy link
Contributor Author

Oh, thank you for flagging @aaronrobertshaw, I hadn't thought of that!

It sounds like setting a priority of something like 100 might work?

If this needs to run last, then it sounds like it'll also have implications for the backport in WordPress/wordpress-develop#7069 — in that case, I imagine we'll want to move the code that stabilizes the support to after the $args = apply_filters( 'register_block_type_args', $args, $this->name ); line 🤔. Or, alternately, in the core backport use a filter after all, though I prefer the idea of not using a filter as it keeps things more encapsulated.

@aaronrobertshaw
Copy link
Contributor

It sounds like setting a priority of something like 100 might work?

I'm not sure what the best value is. I could easily see extenders adding like 999 thinking they want their filter to run last.

Is PHP_INT_MAX an option?

it sounds like it'll also have implications for the backport

Yep 👍

Or, alternately, in the core backport use a filter after all, though I prefer the idea of not using a filter as it keeps things more encapsulated.

I think in core the preference would be to not incur the overhead of a filter. That was the feedback received on some block style variations stuff and the theme json resolver. Private functions were created and called directly before/after the filter as needed.

@andrewserong
Copy link
Contributor Author

andrewserong commented Jul 25, 2024

Is PHP_INT_MAX an option?

Ah, of course! Yes, I see we're using that in a couple of places, I'll use that here.

Private functions were created and called directly before/after the filter as needed.

Good idea. Actually a private function is a good idea for the backport anyway as it'll neaten up that function a bit. I'll follow-up there either tomorrow or next week if I run out of time.

@andrewserong
Copy link
Contributor Author

Updated, thanks again for the snippet. I wound up testing locally with the post title block as that gives us an immediate indication on the site frontend at render time:

function disable_post_title_font_family( $args ) {
	if ( 'core/post-title' === $args['name'] ) {
		_wp_array_set( $args, array( 'supports', 'typography', '__experimentalFontFamily' ), false );
	}

	return $args;
}
add_filter( 'register_block_type_args', 'disable_post_title_font_family', 20 );

The above is working now with the update the to PHP_INT_MAX in bd5de6b 👍

@aaronrobertshaw
Copy link
Contributor

Thanks for the quick iteration here 🚀

The code changes look good so far. I'll give it a thorough test with fresh eyes tomorrow.

I wound up testing locally with the post title block as that gives us an immediate indication on the site frontend at render time:

Bonus points to you for resharing the updated snippet. I was being lazy and dumping out the filtered data rather than locating an appropriate block to confirm with 😅

When I get to testing, do you have any objections to me updating the test instructions to include the filtering angle for others than might belatedly come to this?

@andrewserong
Copy link
Contributor Author

andrewserong commented Jul 25, 2024

When I get to testing, do you have any objections to me updating the test instructions to include the filtering angle for others than might belatedly come to this?

Not at all, feel free to update the description. Thanks!

Edit: I've updated the description to include the snippet 👍

Copy link
Contributor

@aaronrobertshaw aaronrobertshaw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking good so far @andrewserong 👍

I only have one real question and a few minor nits I've left as inline comments but this PR is pretty close.

Is it possible that plugins could be checking block support types at all to enhance capabilities?

My understanding of the current migration approach is that the experimental flags are removed entirely from the end result. Would it be worth keeping them for a couple of releases? It might by time to communicate their removal to plugin authors.

I haven't gone looking in the WP Directory though so maybe its a non-issue 🤷

P.S. Sorry for the delay in getting back to review this one 🙏

Comment on lines +127 to +129
// Stabilize any experimental supports before applying filters.
blockType.supports = stabilizeSupports( blockType.supports );

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Plugins and themes could filter the supports using experimental flags. Same as with the PHP filter. So maybe this should be moved to after the application of filters similar to using PHP_INT_MAX as the priority.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, good question. Unfortunately in this case I think we might need to apply it before the JS filters, because we have logic such as in addAttributes for font family that's registered against blocks.registerBlockType that will check against the stable name for the typography support.

I'll give this a bit more thought!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it could be done in both places. Hard to judge if it is worth the cost of doing so. Perhaps outreach could help get a feel for the possible impact of leaving it as only before the filters?

Comment on lines +148 to +150
deprecation.supports = stabilizeSupports(
deprecation.supports
);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. I was wondering if this PR would also be covering deprecations.

phpunit/block-supports/typography-test.php Outdated Show resolved Hide resolved
phpunit/block-supports/typography-test.php Outdated Show resolved Hide resolved
phpunit/block-supports/typography-test.php Outdated Show resolved Hide resolved
phpunit/block-supports/typography-test.php Outdated Show resolved Hide resolved
andrewserong and others added 4 commits July 30, 2024 15:28
Co-authored-by: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Co-authored-by: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Co-authored-by: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Co-authored-by: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
@andrewserong
Copy link
Contributor Author

Thanks for reviewing and thinking this feature through @aaronrobertshaw, I very much appreciate the discussions thus far! 🙇

My understanding of the current migration approach is that the experimental flags are removed entirely from the end result. Would it be worth keeping them for a couple of releases? It might by time to communicate their removal to plugin authors.

Good question. The approach in this PR right now is to migrate from the __experimental prefix to the stable one, so within Gutenberg we treat the stable one as the "real" version of the support. In the PHP code we've ensured this migration happens late in the process so that any plugins that attempt to mutate supports.typography.__experimentalFontFamily for example, are reflected in the final value for that support. In JS, however, we need to apply the migration earlier in the process so that the block.registerBlockType filter is run with the already applied migrated support, so that there's a match. The risk is whether plugins are also attempting to do JS filtering based on the __experimental prefix, and whether we need to account for that here.

Overall, I'm leaning a little toward the approach in this PR rather than having to keep the experimental versions of the support around. I explored that in the earlier PR #63072 which didn't feel as elegant as the approach here, but it did technically work.

Also, as discussed in our thread (#63401 (comment)) we could also look at running the migration twice in JS (once before running the filter, and once after), though that might be redundant.

At this stage, since I've gone down a particular rabbithole with this feature, I'll just ping @WordPress/gutenberg-core for visibility in case anyone else has further thoughts or ideas about how we can best handle stabilizing block supports. We'll need to re-use this again in the future when we stabilize other supports (e.g. border), so hopefully this PR will be a helpful exercise not just for Typography 🙂

Copy link
Contributor

@youknowriad youknowriad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is one of those PRs where it's very hard to judge the impact without actually shipping.

From my testing, reading of the code and the discussion. It seems a sane approach but we should highlight this change in the release post and keeping an eye on potential issues being raised (also during the WP beta period)

@@ -102,6 +124,9 @@ export const processBlockType =
),
};

// Stabilize any experimental supports before applying filters.
blockType.supports = stabilizeSupports( blockType.supports );

const settings = applyFilters(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about filters that update supports and inject their entries, which could be experimental? What about plugins that expect experimental support entries and make decisions based on them?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was raised earlier and I believe what prompted @andrewserong to ask for additional opinions on the best path forward.

In a nutshell, the scenario we flagged, requires the migration to occur after the JS filters have been applied. Andrew found however that the block support filters adding attributes might be cleaner, and a better example, if the migration occurred before.

To cover both bases we may need to either

  • migrate both, before, and after, filters
  • keep the block support filters checking both the experimental and stable flags, then migrate only once after filters are applied
Copy link
Member

@gziolo gziolo Jul 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’s also possible that 3rd party plugins run some checks based on the experimental block support syntax so the more I think about it the more it feels you should keep both for some time to let devs adjust or even forever. Best it would be to verify with some plugins that reference these experimental names. The approach shared by @youknowriad in #63401 (review) might be also a good first step if you want to exercise the current ecosystem.

Copy link
Contributor Author

@andrewserong andrewserong Aug 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the discussion here!

the more I think about it the more it feels you should keep both for some time to let devs adjust or even forever.

I think we definitely want to at least support the experimental syntax forever so that block plugins out in the wild continue to work without being updated.

In terms of support within the filters and in regards to keeping both, how might that look? I.e. would it be something like:

  • When __experimentalFontFamily is set, copy to fontFamily but leave __experimentalFontFamily intact
  • When fontFamily is set, copy to __experimentalFontFamily for back-compat?

If we do the latter as well as the former, after the filter is run, we might need to check if the value has changed (i.e. if the filter mutated one or the other values) and then resync them 🤔

I might not get a chance to update this PR this week, but I think a next step for me could be to add some tests that simulate possible use cases for plugins augmenting or inspecting the values. That might help illuminate possible cases for us to consider, or at the very least, help us limit the potential scope for affecting plugins out in the wild.

Copy link
Member

@gziolo gziolo Aug 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be technically feasible to convert the config objects in block supports that have experimental flags into proxy objects and handle the backward compatibility through augmented setters and getters? Let me share a similar case in PHP to better illustrate the idea:

https://github.com/WordPress/wordpress-develop/blob/74e03e3cbef2f2565028f446c76acb2dabf749bd/src/wp-includes/class-wp-block-type.php#L353L387

That allows to always use in core the new names but correctly match properties through legacy name when necessary.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I’m perfectly fine with trying as is in this PR to see what issues might pop up and react accordingly. As long is it’s communicated with plugin and theme authors early so they know how to migrate code, where to raise issues or seek for help 👍

Next time, it's going to be easier to repeat the same process based on experience gained this time.

Copy link
Contributor Author

@andrewserong andrewserong Aug 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good points! Yeah, I'm leaning toward going with something like the current state of this PR, and essentially committing to allowing plugins to opt-in to block supports, but not explicitly deal with the situation of plugins "reading" the support keys.

In terms of what it'll mean for plugins in the current state:

  1. 👍 They can still register blocks and opt-in to typography supports using the __experimental prefix.
  2. 👍 They can still filter register_block_type_args in PHP to opt existing blocks into typography supports that they might not have yet, as the filter in this PR will run last.
  3. 👎 They won't be able to filter in JS on blocks.registerBlockType to opt blocks in to __experimental prefix supports that they don't already have, as the stabilization in JS happens prior to applying the filter.

In order to deal with the potential of #3, do you think it'd be worth us running the stabilization a second time after the blocks.registerBlockType filter, so that if anything has been opted into, it'll get moved over to the stable key again?

It does mean running the stabilization twice instead of once for each call to process the block type. But it isn't a hugely complex function, so might not be too bad 🤔

I'll leave this PR as is over the weekend and revisit it sometime next week. Thanks again for all the discussion!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One final aside.

👎 They won't be able to filter in JS on blocks.registerBlockType to opt blocks in to __experimental prefix supports that they don't already have, as the stabilization in JS happens prior to applying the filter.

I have no real data to support my assumption but based on feedback I got at WordCamps and from GitHub reports, the most common scenario is removing UI controls for these features. I don’t know how that translates into code here though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing features is definitely a common scenario. It might be good to know whether folks doing that are not impacted that much.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good points, I think at the very least this PR should handle the basic ways that plugins might disable controls in both JS and PHP. I think this leans me toward applying the transformation twice in JS (once before running the filter, once after), so that we can capture it. Example test code:

function removeTypographySupports( settings, name ) {
	if ( name === 'core/paragraph' && settings.supports.typography ) {
		settings.supports.typography.__experimentalTextTransform = false;
	}
	return settings;
}

addFilter(
	'blocks.registerBlockType',
	'core/style/addAttribute',
	removeTypographySupports
);

In trunk that'll remove the Letter Case option from the Paragraph block, but not with this PR applied. Ideally it'd recognise if the value has changed after the above filter is run, and migrate it accordingly.

I'll have a play with it this week.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Design Tools Tools that impact the appearance of blocks both to expand the number of tools and improve the experi [Type] Enhancement A suggestion for improvement.
5 participants