From 4a4a46bd2c179c87f024119b9c69c5e2e94abb98 Mon Sep 17 00:00:00 2001 From: ramonjd Date: Fri, 27 Aug 2021 20:39:49 +1000 Subject: [PATCH 1/6] Initial commit. Adding typography fontSize and lineHeight supports defaults in block.json where the block supports each. --- packages/block-library/src/button/block.json | 5 ++++- packages/block-library/src/code/block.json | 5 ++++- packages/block-library/src/heading/block.json | 6 +++++- packages/block-library/src/list/block.json | 5 ++++- packages/block-library/src/navigation/block.json | 5 ++++- packages/block-library/src/post-author/block.json | 6 +++++- packages/block-library/src/post-comments-count/block.json | 6 +++++- packages/block-library/src/post-comments-form/block.json | 6 +++++- packages/block-library/src/post-comments-link/block.json | 6 +++++- packages/block-library/src/post-comments/block.json | 6 +++++- packages/block-library/src/post-date/block.json | 5 ++++- packages/block-library/src/post-excerpt/block.json | 6 +++++- packages/block-library/src/post-terms/block.json | 6 +++++- packages/block-library/src/post-title/block.json | 6 +++++- packages/block-library/src/preformatted/block.json | 5 ++++- packages/block-library/src/query-pagination-next/block.json | 6 +++++- .../block-library/src/query-pagination-previous/block.json | 6 +++++- packages/block-library/src/query-title/block.json | 6 +++++- packages/block-library/src/site-tagline/block.json | 5 ++++- packages/block-library/src/site-title/block.json | 6 +++++- packages/block-library/src/term-description/block.json | 6 +++++- packages/block-library/src/verse/block.json | 5 ++++- 22 files changed, 102 insertions(+), 22 deletions(-) diff --git a/packages/block-library/src/button/block.json b/packages/block-library/src/button/block.json index 569ecc47fd0e72..99119b6d1d6852 100644 --- a/packages/block-library/src/button/block.json +++ b/packages/block-library/src/button/block.json @@ -63,7 +63,10 @@ }, "typography": { "fontSize": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "reusable": false, "spacing": { diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json index cf3ae6c984010a..dd24f296e1c407 100644 --- a/packages/block-library/src/code/block.json +++ b/packages/block-library/src/code/block.json @@ -16,7 +16,10 @@ "anchor": true, "__experimentalSelector": ".wp-block-code > code", "typography": { - "fontSize": true + "fontSize": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "spacing": { "margin": [ "top", "bottom" ], diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json index c35c20e8f514a4..c428890ad6e044 100644 --- a/packages/block-library/src/heading/block.json +++ b/packages/block-library/src/heading/block.json @@ -38,7 +38,11 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontWeight": true + "__experimentalFontWeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } }, "__experimentalSelector": "h1,h2,h3,h4,h5,h6", "__unstablePasteTextInline": true, diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json index 8fb02a021c6cd4..18b5c7e6844508 100644 --- a/packages/block-library/src/list/block.json +++ b/packages/block-library/src/list/block.json @@ -39,7 +39,10 @@ "className": false, "typography": { "fontSize": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "color": { "gradients": true, diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json index 26212ce6313d49..42c6c51e83d84f 100644 --- a/packages/block-library/src/navigation/block.json +++ b/packages/block-library/src/navigation/block.json @@ -98,7 +98,10 @@ "__experimentalFontWeight": true, "__experimentalTextTransform": true, "__experimentalFontFamily": true, - "__experimentalTextDecoration": true + "__experimentalTextDecoration": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "spacing": { "blockGap": true, diff --git a/packages/block-library/src/post-author/block.json b/packages/block-library/src/post-author/block.json index ac9ecaed8f4d58..8fbe48d2aceb14 100644 --- a/packages/block-library/src/post-author/block.json +++ b/packages/block-library/src/post-author/block.json @@ -33,7 +33,11 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } }, "color": { "gradients": true, diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json index 7aded93b0fad06..6435eca17e689f 100644 --- a/packages/block-library/src/post-comments-count/block.json +++ b/packages/block-library/src/post-comments-count/block.json @@ -18,7 +18,11 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } } } diff --git a/packages/block-library/src/post-comments-form/block.json b/packages/block-library/src/post-comments-form/block.json index 53ad6a1d42956d..ae05f9c19efadd 100644 --- a/packages/block-library/src/post-comments-form/block.json +++ b/packages/block-library/src/post-comments-form/block.json @@ -19,7 +19,11 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } }, "style": [ "wp-block-post-comments-form", "wp-block-buttons", "wp-block-button" ] diff --git a/packages/block-library/src/post-comments-link/block.json b/packages/block-library/src/post-comments-link/block.json index b1b82647251822..3f5739a48fcf16 100644 --- a/packages/block-library/src/post-comments-link/block.json +++ b/packages/block-library/src/post-comments-link/block.json @@ -19,7 +19,11 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } } } diff --git a/packages/block-library/src/post-comments/block.json b/packages/block-library/src/post-comments/block.json index 733c64c67189f8..289bf152a78e9d 100644 --- a/packages/block-library/src/post-comments/block.json +++ b/packages/block-library/src/post-comments/block.json @@ -16,7 +16,11 @@ "align": [ "wide", "full" ], "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } }, "color": { "gradients": true, diff --git a/packages/block-library/src/post-date/block.json b/packages/block-library/src/post-date/block.json index 390ef39a699aff..4698801f06e878 100644 --- a/packages/block-library/src/post-date/block.json +++ b/packages/block-library/src/post-date/block.json @@ -31,7 +31,10 @@ "__experimentalFontWeight": true, "__experimentalFontStyle": true, "__experimentalTextTransform": true, - "__experimentalLetterSpacing": true + "__experimentalLetterSpacing": true, + "__experimentalDefaultControls": { + "fontSize": true + } } } } diff --git a/packages/block-library/src/post-excerpt/block.json b/packages/block-library/src/post-excerpt/block.json index 269dcc13e66528..c2fa7d7dc77481 100644 --- a/packages/block-library/src/post-excerpt/block.json +++ b/packages/block-library/src/post-excerpt/block.json @@ -30,7 +30,11 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } }, "editorStyle": "wp-block-post-excerpt-editor", diff --git a/packages/block-library/src/post-terms/block.json b/packages/block-library/src/post-terms/block.json index 660dada007884e..b182a0d13540b2 100644 --- a/packages/block-library/src/post-terms/block.json +++ b/packages/block-library/src/post-terms/block.json @@ -27,7 +27,11 @@ "typography": { "lineHeight": true, "fontSize": true, - "__experimentalFontWeight": true + "__experimentalFontWeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } }, "style": "wp-block-post-terms" diff --git a/packages/block-library/src/post-title/block.json b/packages/block-library/src/post-title/block.json index c9bfc1ce38f300..9e190931db21e6 100644 --- a/packages/block-library/src/post-title/block.json +++ b/packages/block-library/src/post-title/block.json @@ -44,7 +44,11 @@ "__experimentalFontFamily": true, "__experimentalFontWeight": true, "__experimentalFontStyle": true, - "__experimentalTextTransform": true + "__experimentalTextTransform": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } }, "style": "wp-block-post-title" diff --git a/packages/block-library/src/preformatted/block.json b/packages/block-library/src/preformatted/block.json index 6deb40540b6c0a..21e5f9a58917ad 100644 --- a/packages/block-library/src/preformatted/block.json +++ b/packages/block-library/src/preformatted/block.json @@ -21,7 +21,10 @@ "gradients": true }, "typography": { - "fontSize": true + "fontSize": true, + "__experimentalDefaultControls": { + "fontSize": true + } } }, "style": "wp-block-preformatted" diff --git a/packages/block-library/src/query-pagination-next/block.json b/packages/block-library/src/query-pagination-next/block.json index f7d48504132220..3a8c538d06a128 100644 --- a/packages/block-library/src/query-pagination-next/block.json +++ b/packages/block-library/src/query-pagination-next/block.json @@ -21,7 +21,11 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } } } diff --git a/packages/block-library/src/query-pagination-previous/block.json b/packages/block-library/src/query-pagination-previous/block.json index c3a05cc202d30e..4f2c2177296237 100644 --- a/packages/block-library/src/query-pagination-previous/block.json +++ b/packages/block-library/src/query-pagination-previous/block.json @@ -21,7 +21,11 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } } } diff --git a/packages/block-library/src/query-title/block.json b/packages/block-library/src/query-title/block.json index 352280417c9909..d811bceeb97b1c 100644 --- a/packages/block-library/src/query-title/block.json +++ b/packages/block-library/src/query-title/block.json @@ -29,7 +29,11 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } }, "editorStyle": "wp-block-query-title-editor" diff --git a/packages/block-library/src/site-tagline/block.json b/packages/block-library/src/site-tagline/block.json index 3f93904d297d43..b048b873ef14f7 100644 --- a/packages/block-library/src/site-tagline/block.json +++ b/packages/block-library/src/site-tagline/block.json @@ -28,7 +28,10 @@ "__experimentalTextTransform": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, - "__experimentalLetterSpacing": true + "__experimentalLetterSpacing": true, + "__experimentalDefaultControls": { + "fontSize": true + } } }, "editorStyle": "wp-block-site-tagline-editor" diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json index 4d4afc75afa98a..24cbb1e342e44c 100644 --- a/packages/block-library/src/site-title/block.json +++ b/packages/block-library/src/site-title/block.json @@ -43,7 +43,11 @@ "__experimentalTextTransform": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, - "__experimentalLetterSpacing": true + "__experimentalLetterSpacing": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } }, "editorStyle": "wp-block-site-title-editor" diff --git a/packages/block-library/src/term-description/block.json b/packages/block-library/src/term-description/block.json index 1f2da2be430574..807b9ac98a208a 100644 --- a/packages/block-library/src/term-description/block.json +++ b/packages/block-library/src/term-description/block.json @@ -18,7 +18,11 @@ }, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalDefaultControls": { + "fontSize": true, + "lineHeight": true + } } }, "editorStyle": "wp-block-term-description-editor" diff --git a/packages/block-library/src/verse/block.json b/packages/block-library/src/verse/block.json index ec080e7c1ed13c..b71c4042e78412 100644 --- a/packages/block-library/src/verse/block.json +++ b/packages/block-library/src/verse/block.json @@ -27,7 +27,10 @@ }, "typography": { "fontSize": true, - "__experimentalFontFamily": true + "__experimentalFontFamily": true, + "__experimentalDefaultControls": { + "fontSize": true + } }, "spacing": { "padding": true From 7ef3284f70ba819e52ab0c5e5f4c72c6bf1850a1 Mon Sep 17 00:00:00 2001 From: ramonjd Date: Thu, 14 Oct 2021 11:36:49 +1100 Subject: [PATCH 2/6] Removing line height typography default support Opting-in to all typography supports for text blocks (except font-family for code block) Site title: toggle all typography options as default Other titles (heading, post title, query title): add weight and style, and text-transform defaults --- packages/block-library/src/code/block.json | 6 ++++++ packages/block-library/src/heading/block.json | 9 ++++++++- packages/block-library/src/list/block.json | 6 ++++++ packages/block-library/src/paragraph/block.json | 9 +++++++-- .../block-library/src/post-author/block.json | 9 +++++++-- .../src/post-comment-date/block.json | 8 ++++++-- .../src/post-comments-count/block.json | 9 +++++++-- .../src/post-comments-form/block.json | 9 +++++++-- .../src/post-comments-link/block.json | 9 +++++++-- .../block-library/src/post-comments/block.json | 9 +++++++-- .../block-library/src/post-excerpt/block.json | 9 +++++++-- .../src/post-navigation-link/block.json | 11 ++++++++++- packages/block-library/src/post-terms/block.json | 3 +-- packages/block-library/src/post-title/block.json | 8 ++++++-- .../block-library/src/preformatted/block.json | 7 +++++++ packages/block-library/src/pullquote/block.json | 14 ++++++++++++++ .../src/query-pagination-next/block.json | 9 +++++++-- .../src/query-pagination-previous/block.json | 9 +++++++-- .../block-library/src/query-title/block.json | 9 ++++++++- packages/block-library/src/quote/block.json | 16 +++++++++++++++- packages/block-library/src/site-title/block.json | 11 +++++++++-- packages/block-library/src/table/block.json | 13 +++++++++++++ .../src/term-description/block.json | 3 +-- packages/block-library/src/verse/block.json | 9 ++++++++- 24 files changed, 181 insertions(+), 33 deletions(-) diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json index dd24f296e1c407..1faf79c3a74246 100644 --- a/packages/block-library/src/code/block.json +++ b/packages/block-library/src/code/block.json @@ -17,6 +17,12 @@ "__experimentalSelector": ".wp-block-code > code", "typography": { "fontSize": true, + "lineHeight": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json index c428890ad6e044..13cf58e39e5d32 100644 --- a/packages/block-library/src/heading/block.json +++ b/packages/block-library/src/heading/block.json @@ -38,10 +38,17 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "lineHeight": true + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalTextTransform": true } }, "__experimentalSelector": "h1,h2,h3,h4,h5,h6", diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json index 18b5c7e6844508..073d998ae61992 100644 --- a/packages/block-library/src/list/block.json +++ b/packages/block-library/src/list/block.json @@ -39,7 +39,13 @@ "className": false, "typography": { "fontSize": true, + "lineHeight": true, "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json index d024ee2a8fce15..84eb14f094f453 100644 --- a/packages/block-library/src/paragraph/block.json +++ b/packages/block-library/src/paragraph/block.json @@ -38,9 +38,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } }, "__experimentalSelector": "p", diff --git a/packages/block-library/src/post-author/block.json b/packages/block-library/src/post-author/block.json index 8fbe48d2aceb14..2ddf907dee4f11 100644 --- a/packages/block-library/src/post-author/block.json +++ b/packages/block-library/src/post-author/block.json @@ -34,9 +34,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } }, "color": { diff --git a/packages/block-library/src/post-comment-date/block.json b/packages/block-library/src/post-comment-date/block.json index c162fbf901ff4b..6c4a1ee9a7e051 100644 --- a/packages/block-library/src/post-comment-date/block.json +++ b/packages/block-library/src/post-comment-date/block.json @@ -26,10 +26,14 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, - "__experimentalFontWeight": true, "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalLetterSpacing": true + "__experimentalTextDecoration": true, + "__experimentalDefaultControls": { + "fontSize": true + } } } } diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json index 6435eca17e689f..4ece97de8cf41b 100644 --- a/packages/block-library/src/post-comments-count/block.json +++ b/packages/block-library/src/post-comments-count/block.json @@ -19,9 +19,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } } } diff --git a/packages/block-library/src/post-comments-form/block.json b/packages/block-library/src/post-comments-form/block.json index ae05f9c19efadd..a16933acbbb563 100644 --- a/packages/block-library/src/post-comments-form/block.json +++ b/packages/block-library/src/post-comments-form/block.json @@ -20,9 +20,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } } }, diff --git a/packages/block-library/src/post-comments-link/block.json b/packages/block-library/src/post-comments-link/block.json index 3f5739a48fcf16..e141e95e80e392 100644 --- a/packages/block-library/src/post-comments-link/block.json +++ b/packages/block-library/src/post-comments-link/block.json @@ -20,9 +20,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } } } diff --git a/packages/block-library/src/post-comments/block.json b/packages/block-library/src/post-comments/block.json index 289bf152a78e9d..a6dc7f013e6a22 100644 --- a/packages/block-library/src/post-comments/block.json +++ b/packages/block-library/src/post-comments/block.json @@ -17,9 +17,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } }, "color": { diff --git a/packages/block-library/src/post-excerpt/block.json b/packages/block-library/src/post-excerpt/block.json index c2fa7d7dc77481..976905dccd27e9 100644 --- a/packages/block-library/src/post-excerpt/block.json +++ b/packages/block-library/src/post-excerpt/block.json @@ -31,9 +31,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } } }, diff --git a/packages/block-library/src/post-navigation-link/block.json b/packages/block-library/src/post-navigation-link/block.json index 2adf660f7df4ea..e5357fba9451c4 100644 --- a/packages/block-library/src/post-navigation-link/block.json +++ b/packages/block-library/src/post-navigation-link/block.json @@ -30,7 +30,16 @@ "html": false, "typography": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, + "__experimentalDefaultControls": { + "fontSize": true + } } } } diff --git a/packages/block-library/src/post-terms/block.json b/packages/block-library/src/post-terms/block.json index b182a0d13540b2..ca8618959e8bac 100644 --- a/packages/block-library/src/post-terms/block.json +++ b/packages/block-library/src/post-terms/block.json @@ -29,8 +29,7 @@ "fontSize": true, "__experimentalFontWeight": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } } }, diff --git a/packages/block-library/src/post-title/block.json b/packages/block-library/src/post-title/block.json index 9e190931db21e6..ed0c1141691ea0 100644 --- a/packages/block-library/src/post-title/block.json +++ b/packages/block-library/src/post-title/block.json @@ -42,12 +42,16 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, - "__experimentalFontWeight": true, "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "lineHeight": true + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalTextTransform": true } } }, diff --git a/packages/block-library/src/preformatted/block.json b/packages/block-library/src/preformatted/block.json index 21e5f9a58917ad..7fda73997e51c7 100644 --- a/packages/block-library/src/preformatted/block.json +++ b/packages/block-library/src/preformatted/block.json @@ -22,6 +22,13 @@ }, "typography": { "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/pullquote/block.json b/packages/block-library/src/pullquote/block.json index ad0288f878e674..4f7f9f247014f7 100644 --- a/packages/block-library/src/pullquote/block.json +++ b/packages/block-library/src/pullquote/block.json @@ -32,6 +32,20 @@ "background": true, "link": true }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, + "__experimentalDefaultControls": { + "fontSize": true, + "__experimentalFontStyle": true + } + }, "__experimentalBorder": { "color": true, "radius": true, diff --git a/packages/block-library/src/query-pagination-next/block.json b/packages/block-library/src/query-pagination-next/block.json index 3a8c538d06a128..c8c31510d4befc 100644 --- a/packages/block-library/src/query-pagination-next/block.json +++ b/packages/block-library/src/query-pagination-next/block.json @@ -22,9 +22,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } } } diff --git a/packages/block-library/src/query-pagination-previous/block.json b/packages/block-library/src/query-pagination-previous/block.json index 4f2c2177296237..6de0703adc525a 100644 --- a/packages/block-library/src/query-pagination-previous/block.json +++ b/packages/block-library/src/query-pagination-previous/block.json @@ -22,9 +22,14 @@ "typography": { "fontSize": true, "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } } } diff --git a/packages/block-library/src/query-title/block.json b/packages/block-library/src/query-title/block.json index d811bceeb97b1c..a5a8b34e4b2118 100644 --- a/packages/block-library/src/query-title/block.json +++ b/packages/block-library/src/query-title/block.json @@ -30,9 +30,16 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "lineHeight": true + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalTextTransform": true } } }, diff --git a/packages/block-library/src/quote/block.json b/packages/block-library/src/quote/block.json index 6a9ed9a5400d53..110878cdfa508e 100644 --- a/packages/block-library/src/quote/block.json +++ b/packages/block-library/src/quote/block.json @@ -28,7 +28,21 @@ }, "supports": { "anchor": true, - "__experimentalSlashInserter": true + "__experimentalSlashInserter": true, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, + "__experimentalDefaultControls": { + "fontSize": true, + "__experimentalFontStyle": true + } + } }, "styles": [ { diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json index 24cbb1e342e44c..e5644b97fe41c5 100644 --- a/packages/block-library/src/site-title/block.json +++ b/packages/block-library/src/site-title/block.json @@ -40,13 +40,20 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, - "__experimentalTextTransform": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "lineHeight": true + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true } } }, diff --git a/packages/block-library/src/table/block.json b/packages/block-library/src/table/block.json index f4723331098bc9..d53adc8fcecb10 100644 --- a/packages/block-library/src/table/block.json +++ b/packages/block-library/src/table/block.json @@ -129,6 +129,19 @@ "__experimentalSkipSerialization": true, "gradients": true }, + "typography": { + "fontSize": true, + "lineHeight": true, + "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, + "__experimentalDefaultControls": { + "fontSize": true + } + }, "__experimentalBorder": { "__experimentalSkipSerialization": true, "color": true, diff --git a/packages/block-library/src/term-description/block.json b/packages/block-library/src/term-description/block.json index 807b9ac98a208a..608ae1a2423494 100644 --- a/packages/block-library/src/term-description/block.json +++ b/packages/block-library/src/term-description/block.json @@ -20,8 +20,7 @@ "fontSize": true, "lineHeight": true, "__experimentalDefaultControls": { - "fontSize": true, - "lineHeight": true + "fontSize": true } } }, diff --git a/packages/block-library/src/verse/block.json b/packages/block-library/src/verse/block.json index b71c4042e78412..e03a6298348db0 100644 --- a/packages/block-library/src/verse/block.json +++ b/packages/block-library/src/verse/block.json @@ -27,9 +27,16 @@ }, "typography": { "fontSize": true, + "lineHeight": true, "__experimentalFontFamily": true, + "__experimentalFontStyle": true, + "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": true, + "__experimentalTextDecoration": true, "__experimentalDefaultControls": { - "fontSize": true + "fontSize": true, + "__experimentalFontStyle": true } }, "spacing": { From 89a2f5346a3b716983962f4d99f3595e9bbdac7c Mon Sep 17 00:00:00 2001 From: ramonjd Date: Thu, 14 Oct 2021 14:02:02 +1100 Subject: [PATCH 3/6] Using `fontAppearance` in __experimentalDefaultControls to flag that the fontStyle/fontWeight support control should show as default. --- packages/block-library/src/heading/block.json | 3 +-- packages/block-library/src/post-title/block.json | 3 +-- packages/block-library/src/pullquote/block.json | 2 +- packages/block-library/src/query-title/block.json | 3 +-- packages/block-library/src/quote/block.json | 2 +- packages/block-library/src/site-title/block.json | 3 +-- packages/block-library/src/verse/block.json | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json index 13cf58e39e5d32..dee58dbdae4146 100644 --- a/packages/block-library/src/heading/block.json +++ b/packages/block-library/src/heading/block.json @@ -46,8 +46,7 @@ "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "__experimentalFontStyle": true, - "__experimentalFontWeight": true, + "fontAppearance": true, "__experimentalTextTransform": true } }, diff --git a/packages/block-library/src/post-title/block.json b/packages/block-library/src/post-title/block.json index ed0c1141691ea0..34f4f3838b38cd 100644 --- a/packages/block-library/src/post-title/block.json +++ b/packages/block-library/src/post-title/block.json @@ -49,8 +49,7 @@ "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "__experimentalFontStyle": true, - "__experimentalFontWeight": true, + "fontAppearance": true, "__experimentalTextTransform": true } } diff --git a/packages/block-library/src/pullquote/block.json b/packages/block-library/src/pullquote/block.json index 4f7f9f247014f7..c956eee31c4963 100644 --- a/packages/block-library/src/pullquote/block.json +++ b/packages/block-library/src/pullquote/block.json @@ -43,7 +43,7 @@ "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "__experimentalFontStyle": true + "fontAppearance": true } }, "__experimentalBorder": { diff --git a/packages/block-library/src/query-title/block.json b/packages/block-library/src/query-title/block.json index a5a8b34e4b2118..7cb35de777427b 100644 --- a/packages/block-library/src/query-title/block.json +++ b/packages/block-library/src/query-title/block.json @@ -37,8 +37,7 @@ "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "__experimentalFontStyle": true, - "__experimentalFontWeight": true, + "fontAppearance": true, "__experimentalTextTransform": true } } diff --git a/packages/block-library/src/quote/block.json b/packages/block-library/src/quote/block.json index 110878cdfa508e..746e156197de38 100644 --- a/packages/block-library/src/quote/block.json +++ b/packages/block-library/src/quote/block.json @@ -40,7 +40,7 @@ "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "__experimentalFontStyle": true + "fontAppearance": true } } }, diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json index e5644b97fe41c5..92f83c230c2edf 100644 --- a/packages/block-library/src/site-title/block.json +++ b/packages/block-library/src/site-title/block.json @@ -49,8 +49,7 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, - "__experimentalFontStyle": true, - "__experimentalFontWeight": true, + "fontAppearance": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, "__experimentalTextDecoration": true diff --git a/packages/block-library/src/verse/block.json b/packages/block-library/src/verse/block.json index e03a6298348db0..96d1fba7d76ccf 100644 --- a/packages/block-library/src/verse/block.json +++ b/packages/block-library/src/verse/block.json @@ -36,7 +36,7 @@ "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, - "__experimentalFontStyle": true + "fontAppearance": true } }, "spacing": { From b1bd8eaec08284d598f778532633316605090f6e Mon Sep 17 00:00:00 2001 From: ramonjd Date: Mon, 18 Oct 2021 14:59:32 +1100 Subject: [PATCH 4/6] Removing Font family and Text decoration opt-in until a second pass. Apply suggestions from code review Co-authored-by: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com> Reinstating typography opt-ins pending further advice --- packages/block-library/src/code/block.json | 1 - packages/block-library/src/heading/block.json | 4 +--- packages/block-library/src/list/block.json | 2 -- packages/block-library/src/paragraph/block.json | 2 -- packages/block-library/src/post-author/block.json | 2 -- packages/block-library/src/post-comment-date/block.json | 5 ++--- .../block-library/src/post-comments-count/block.json | 2 -- packages/block-library/src/post-comments-form/block.json | 2 -- packages/block-library/src/post-comments-link/block.json | 2 -- packages/block-library/src/post-comments/block.json | 2 -- packages/block-library/src/post-excerpt/block.json | 2 -- .../block-library/src/post-navigation-link/block.json | 2 -- packages/block-library/src/post-terms/block.json | 3 +++ packages/block-library/src/post-title/block.json | 7 +++---- packages/block-library/src/preformatted/block.json | 2 -- packages/block-library/src/pullquote/block.json | 2 -- .../block-library/src/query-pagination-next/block.json | 2 -- .../src/query-pagination-previous/block.json | 2 -- packages/block-library/src/query-title/block.json | 3 +-- packages/block-library/src/quote/block.json | 2 -- packages/block-library/src/site-title/block.json | 9 +++------ packages/block-library/src/table/block.json | 2 -- packages/block-library/src/verse/block.json | 3 +-- 23 files changed, 14 insertions(+), 51 deletions(-) diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json index 1faf79c3a74246..992058d12fe9f4 100644 --- a/packages/block-library/src/code/block.json +++ b/packages/block-library/src/code/block.json @@ -22,7 +22,6 @@ "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json index dee58dbdae4146..b09baa78d442af 100644 --- a/packages/block-library/src/heading/block.json +++ b/packages/block-library/src/heading/block.json @@ -38,16 +38,14 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, "fontAppearance": true, - "__experimentalTextTransform": true + "textTransform": true } }, "__experimentalSelector": "h1,h2,h3,h4,h5,h6", diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json index 073d998ae61992..30045265c8488b 100644 --- a/packages/block-library/src/list/block.json +++ b/packages/block-library/src/list/block.json @@ -40,12 +40,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json index 84eb14f094f453..80bc900ff4b18b 100644 --- a/packages/block-library/src/paragraph/block.json +++ b/packages/block-library/src/paragraph/block.json @@ -38,12 +38,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-author/block.json b/packages/block-library/src/post-author/block.json index 2ddf907dee4f11..d46c8df69da299 100644 --- a/packages/block-library/src/post-author/block.json +++ b/packages/block-library/src/post-author/block.json @@ -34,12 +34,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-comment-date/block.json b/packages/block-library/src/post-comment-date/block.json index 6c4a1ee9a7e051..b947847ebac0c4 100644 --- a/packages/block-library/src/post-comment-date/block.json +++ b/packages/block-library/src/post-comment-date/block.json @@ -26,11 +26,10 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, - "__experimentalFontStyle": true, "__experimentalFontWeight": true, - "__experimentalLetterSpacing": true, + "__experimentalFontStyle": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, + "__experimentalLetterSpacing": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json index 4ece97de8cf41b..a53fd9d16c933e 100644 --- a/packages/block-library/src/post-comments-count/block.json +++ b/packages/block-library/src/post-comments-count/block.json @@ -19,12 +19,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-comments-form/block.json b/packages/block-library/src/post-comments-form/block.json index a16933acbbb563..58fa1191f191af 100644 --- a/packages/block-library/src/post-comments-form/block.json +++ b/packages/block-library/src/post-comments-form/block.json @@ -20,12 +20,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-comments-link/block.json b/packages/block-library/src/post-comments-link/block.json index e141e95e80e392..35190461093fcc 100644 --- a/packages/block-library/src/post-comments-link/block.json +++ b/packages/block-library/src/post-comments-link/block.json @@ -20,12 +20,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-comments/block.json b/packages/block-library/src/post-comments/block.json index a6dc7f013e6a22..2aab1d09f99029 100644 --- a/packages/block-library/src/post-comments/block.json +++ b/packages/block-library/src/post-comments/block.json @@ -17,12 +17,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-excerpt/block.json b/packages/block-library/src/post-excerpt/block.json index 976905dccd27e9..c3b15ad5ec7c37 100644 --- a/packages/block-library/src/post-excerpt/block.json +++ b/packages/block-library/src/post-excerpt/block.json @@ -31,12 +31,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-navigation-link/block.json b/packages/block-library/src/post-navigation-link/block.json index e5357fba9451c4..ec983b6b57a6f7 100644 --- a/packages/block-library/src/post-navigation-link/block.json +++ b/packages/block-library/src/post-navigation-link/block.json @@ -31,12 +31,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/post-terms/block.json b/packages/block-library/src/post-terms/block.json index ca8618959e8bac..08820d0c5526a1 100644 --- a/packages/block-library/src/post-terms/block.json +++ b/packages/block-library/src/post-terms/block.json @@ -27,7 +27,10 @@ "typography": { "lineHeight": true, "fontSize": true, + "__experimentalFontStyle": true, "__experimentalFontWeight": true, + "__experimentalLetterSpacing": true, + "__experimentalTextTransform": 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 34f4f3838b38cd..ce0b04384b8192 100644 --- a/packages/block-library/src/post-title/block.json +++ b/packages/block-library/src/post-title/block.json @@ -42,15 +42,14 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, - "__experimentalFontStyle": true, "__experimentalFontWeight": true, - "__experimentalLetterSpacing": true, + "__experimentalFontStyle": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, + "__experimentalLetterSpacing": true, "__experimentalDefaultControls": { "fontSize": true, "fontAppearance": true, - "__experimentalTextTransform": true + "textTransform": true } } }, diff --git a/packages/block-library/src/preformatted/block.json b/packages/block-library/src/preformatted/block.json index 7fda73997e51c7..53e32bdf5decda 100644 --- a/packages/block-library/src/preformatted/block.json +++ b/packages/block-library/src/preformatted/block.json @@ -23,12 +23,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/pullquote/block.json b/packages/block-library/src/pullquote/block.json index c956eee31c4963..3411ce072eb201 100644 --- a/packages/block-library/src/pullquote/block.json +++ b/packages/block-library/src/pullquote/block.json @@ -35,12 +35,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, "fontAppearance": true diff --git a/packages/block-library/src/query-pagination-next/block.json b/packages/block-library/src/query-pagination-next/block.json index c8c31510d4befc..0c8437c02da092 100644 --- a/packages/block-library/src/query-pagination-next/block.json +++ b/packages/block-library/src/query-pagination-next/block.json @@ -22,12 +22,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/query-pagination-previous/block.json b/packages/block-library/src/query-pagination-previous/block.json index 6de0703adc525a..c7d7b106f02d66 100644 --- a/packages/block-library/src/query-pagination-previous/block.json +++ b/packages/block-library/src/query-pagination-previous/block.json @@ -22,12 +22,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/query-title/block.json b/packages/block-library/src/query-title/block.json index 7cb35de777427b..04190056c787df 100644 --- a/packages/block-library/src/query-title/block.json +++ b/packages/block-library/src/query-title/block.json @@ -34,11 +34,10 @@ "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, "fontAppearance": true, - "__experimentalTextTransform": true + "textTransform": true } } }, diff --git a/packages/block-library/src/quote/block.json b/packages/block-library/src/quote/block.json index 746e156197de38..ad3f199e0fa6bb 100644 --- a/packages/block-library/src/quote/block.json +++ b/packages/block-library/src/quote/block.json @@ -32,12 +32,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, "fontAppearance": true diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json index 92f83c230c2edf..a16d1c9f3b6449 100644 --- a/packages/block-library/src/site-title/block.json +++ b/packages/block-library/src/site-title/block.json @@ -40,19 +40,16 @@ "fontSize": true, "lineHeight": true, "__experimentalFontFamily": true, + "__experimentalTextTransform": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, - "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "fontAppearance": true, - "__experimentalLetterSpacing": true, - "__experimentalTextTransform": true, - "__experimentalTextDecoration": true + "letterSpacing": true, + "textTransform": true } } }, diff --git a/packages/block-library/src/table/block.json b/packages/block-library/src/table/block.json index d53adc8fcecb10..2890d09545e57c 100644 --- a/packages/block-library/src/table/block.json +++ b/packages/block-library/src/table/block.json @@ -132,12 +132,10 @@ "typography": { "fontSize": true, "lineHeight": true, - "__experimentalFontFamily": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true } diff --git a/packages/block-library/src/verse/block.json b/packages/block-library/src/verse/block.json index 96d1fba7d76ccf..4260fb8e77c2b2 100644 --- a/packages/block-library/src/verse/block.json +++ b/packages/block-library/src/verse/block.json @@ -27,13 +27,12 @@ }, "typography": { "fontSize": true, - "lineHeight": true, "__experimentalFontFamily": true, + "lineHeight": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, "__experimentalTextTransform": true, - "__experimentalTextDecoration": true, "__experimentalDefaultControls": { "fontSize": true, "fontAppearance": true From 4a3987ecf131e33c00b7799f5ff9ad8da060197d Mon Sep 17 00:00:00 2001 From: ramonjd Date: Mon, 25 Oct 2021 08:20:27 +1100 Subject: [PATCH 5/6] Reinstating typography opt-ins pending further advice --- packages/block-library/src/list/block.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/block-library/src/list/block.json b/packages/block-library/src/list/block.json index 30045265c8488b..c82710f08d6542 100644 --- a/packages/block-library/src/list/block.json +++ b/packages/block-library/src/list/block.json @@ -39,6 +39,7 @@ "className": false, "typography": { "fontSize": true, + "__experimentalFontFamily": true, "lineHeight": true, "__experimentalFontStyle": true, "__experimentalFontWeight": true, From ed59d7ca3d9f255a50e3ecf60293d772d341eb7c Mon Sep 17 00:00:00 2001 From: Ramon Date: Wed, 3 Nov 2021 20:44:17 +1100 Subject: [PATCH 6/6] Remove __experimentalTextTransform since the rendered output is a number --- packages/block-library/src/post-comments-count/block.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json index a53fd9d16c933e..9a100a4a1758ab 100644 --- a/packages/block-library/src/post-comments-count/block.json +++ b/packages/block-library/src/post-comments-count/block.json @@ -22,7 +22,6 @@ "__experimentalFontStyle": true, "__experimentalFontWeight": true, "__experimentalLetterSpacing": true, - "__experimentalTextTransform": true, "__experimentalDefaultControls": { "fontSize": true }