From a22c3cd8509f8601783f2801cd121d6552d35a4a Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Thu, 27 May 2021 15:32:10 +0300 Subject: [PATCH 1/7] register empty styles for blocks that don't have any --- lib/blocks.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/blocks.php b/lib/blocks.php index 470148668e8921..713152b130ba1d 100644 --- a/lib/blocks.php +++ b/lib/blocks.php @@ -187,6 +187,7 @@ function gutenberg_register_core_block_styles( $block_name ) { $style_path = "build/block-library/blocks/$block_name/style.css"; $editor_style_path = "build/block-library/blocks/$block_name/style-editor.css"; + wp_register_style( "wp-block-{$block_name}", false ); if ( file_exists( gutenberg_dir_path() . $style_path ) ) { wp_deregister_style( "wp-block-{$block_name}" ); wp_register_style( @@ -201,6 +202,7 @@ function gutenberg_register_core_block_styles( $block_name ) { wp_style_add_data( "wp-block-{$block_name}", 'path', gutenberg_dir_path() . $style_path ); } + wp_register_style( "wp-block-{$block_name}-editor" ); if ( file_exists( gutenberg_dir_path() . $editor_style_path ) ) { wp_deregister_style( "wp-block-{$block_name}-editor" ); wp_register_style( From 9c1df1b6b1844771692b89848f981dd38a9347af Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Thu, 27 May 2021 16:00:07 +0300 Subject: [PATCH 2/7] add style & editorStyle in block.json where missing --- packages/block-library/src/archives/block.json | 3 ++- packages/block-library/src/block/block.json | 3 ++- packages/block-library/src/calendar/block.json | 1 + packages/block-library/src/code/block.json | 1 + packages/block-library/src/column/block.json | 4 +++- packages/block-library/src/freeform/block.json | 3 ++- packages/block-library/src/html/block.json | 3 ++- packages/block-library/src/legacy-widget/block.json | 3 ++- packages/block-library/src/loginout/block.json | 4 +++- packages/block-library/src/more/block.json | 3 ++- packages/block-library/src/nextpage/block.json | 3 ++- packages/block-library/src/post-comment-author/block.json | 4 +++- packages/block-library/src/post-comment-content/block.json | 4 +++- packages/block-library/src/post-comment-date/block.json | 4 +++- packages/block-library/src/post-comment/block.json | 4 +++- packages/block-library/src/post-comments-count/block.json | 4 +++- packages/block-library/src/post-comments-form/block.json | 1 + packages/block-library/src/post-comments-link/block.json | 4 +++- packages/block-library/src/post-comments/block.json | 1 + packages/block-library/src/post-content/block.json | 3 ++- packages/block-library/src/post-date/block.json | 4 +++- packages/block-library/src/post-navigation-link/block.json | 4 +++- packages/block-library/src/post-terms/block.json | 4 +++- packages/block-library/src/post-title/block.json | 1 + packages/block-library/src/preformatted/block.json | 1 + packages/block-library/src/query-pagination-next/block.json | 4 +++- .../block-library/src/query-pagination-numbers/block.json | 3 ++- .../block-library/src/query-pagination-previous/block.json | 4 +++- packages/block-library/src/query-title/block.json | 3 ++- packages/block-library/src/query/block.json | 3 ++- packages/block-library/src/shortcode/block.json | 3 ++- packages/block-library/src/site-tagline/block.json | 4 +++- packages/block-library/src/site-title/block.json | 4 +++- packages/block-library/src/social-link/block.json | 3 ++- packages/block-library/src/table-of-contents/block.json | 4 +++- packages/block-library/src/tag-cloud/block.json | 3 ++- packages/block-library/src/template-part/block.json | 3 ++- packages/block-library/src/term-description/block.json | 3 ++- packages/block-library/src/verse/block.json | 4 ++-- 39 files changed, 88 insertions(+), 34 deletions(-) diff --git a/packages/block-library/src/archives/block.json b/packages/block-library/src/archives/block.json index 799d050354c5f2..4069ab6c27de7a 100644 --- a/packages/block-library/src/archives/block.json +++ b/packages/block-library/src/archives/block.json @@ -19,5 +19,6 @@ "align": true, "html": false }, - "editorStyle": "wp-block-archives-editor" + "editorStyle": "wp-block-archives-editor", + "style": "wp-block-archives" } diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json index 006c85c0b5db67..dbf1544f5968f8 100644 --- a/packages/block-library/src/block/block.json +++ b/packages/block-library/src/block/block.json @@ -15,5 +15,6 @@ "html": false, "inserter": false }, - "editorStyle": "wp-block-editor" + "editorStyle": "wp-block-editor", + "style": "wp-block" } diff --git a/packages/block-library/src/calendar/block.json b/packages/block-library/src/calendar/block.json index 07938927f5ebab..79c4dd0689fc9b 100644 --- a/packages/block-library/src/calendar/block.json +++ b/packages/block-library/src/calendar/block.json @@ -17,5 +17,6 @@ "supports": { "align": true }, + "editorStyle": "wp-block-calendar-editor", "style": "wp-block-calendar" } diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json index 8ea75ed6dacb98..3a744417889093 100644 --- a/packages/block-library/src/code/block.json +++ b/packages/block-library/src/code/block.json @@ -18,5 +18,6 @@ "fontSize": true } }, + "editorStyle": "wp-block-code-editor", "style": "wp-block-code" } diff --git a/packages/block-library/src/column/block.json b/packages/block-library/src/column/block.json index 00e443b0ec0aff..a74bd6da59f056 100644 --- a/packages/block-library/src/column/block.json +++ b/packages/block-library/src/column/block.json @@ -28,5 +28,7 @@ "spacing": { "padding": true } - } + }, + "editorStyle": "wp-block-column-editor", + "style": "wp-block-column" } diff --git a/packages/block-library/src/freeform/block.json b/packages/block-library/src/freeform/block.json index f3b2d45b00c489..418bbd2a80dd87 100644 --- a/packages/block-library/src/freeform/block.json +++ b/packages/block-library/src/freeform/block.json @@ -16,5 +16,6 @@ "customClassName": false, "reusable": false }, - "editorStyle": "wp-block-freeform-editor" + "editorStyle": "wp-block-freeform-editor", + "style": "wp-block-freeform" } diff --git a/packages/block-library/src/html/block.json b/packages/block-library/src/html/block.json index 962db3f3684d3b..0bd7f751abf673 100644 --- a/packages/block-library/src/html/block.json +++ b/packages/block-library/src/html/block.json @@ -17,5 +17,6 @@ "className": false, "html": false }, - "editorStyle": "wp-block-html-editor" + "editorStyle": "wp-block-html-editor", + "style": "wp-block-html" } diff --git a/packages/block-library/src/legacy-widget/block.json b/packages/block-library/src/legacy-widget/block.json index 30b60c6448835e..b350befe529142 100644 --- a/packages/block-library/src/legacy-widget/block.json +++ b/packages/block-library/src/legacy-widget/block.json @@ -24,5 +24,6 @@ "customClassName": false, "reusable": false }, - "editorStyle": "wp-block-legacy-widget-editor" + "editorStyle": "wp-block-legacy-widget-editor", + "style": "wp-block-legacy-widget" } diff --git a/packages/block-library/src/loginout/block.json b/packages/block-library/src/loginout/block.json index dfb40f7a066378..0749bcb6e42933 100644 --- a/packages/block-library/src/loginout/block.json +++ b/packages/block-library/src/loginout/block.json @@ -21,5 +21,7 @@ "typography": { "fontSize": false } - } + }, + "editorStyle": "wp-block-loginout-editor", + "style": "wp-block-loginout" } diff --git a/packages/block-library/src/more/block.json b/packages/block-library/src/more/block.json index 8b839c806a526f..1919cf5b887f9f 100644 --- a/packages/block-library/src/more/block.json +++ b/packages/block-library/src/more/block.json @@ -21,5 +21,6 @@ "html": false, "multiple": false }, - "editorStyle": "wp-block-more-editor" + "editorStyle": "wp-block-more-editor", + "style": "wp-block-more" } diff --git a/packages/block-library/src/nextpage/block.json b/packages/block-library/src/nextpage/block.json index 2314c322b1a8b3..a043883700f642 100644 --- a/packages/block-library/src/nextpage/block.json +++ b/packages/block-library/src/nextpage/block.json @@ -12,5 +12,6 @@ "className": false, "html": false }, - "editorStyle": "wp-block-nextpage-editor" + "editorStyle": "wp-block-nextpage-editor", + "style": "wp-block-nextpage" } diff --git a/packages/block-library/src/post-comment-author/block.json b/packages/block-library/src/post-comment-author/block.json index c3a2231cc5d10b..5d383c18f80df5 100644 --- a/packages/block-library/src/post-comment-author/block.json +++ b/packages/block-library/src/post-comment-author/block.json @@ -9,5 +9,7 @@ "usesContext": [ "commentId" ], "supports": { "html": false - } + }, + "editorStyle": "wp-block-post-comment-author-editor", + "style": "wp-block-post-comment-author" } diff --git a/packages/block-library/src/post-comment-content/block.json b/packages/block-library/src/post-comment-content/block.json index 53cb97d855fd5e..5c68a443bd8b51 100644 --- a/packages/block-library/src/post-comment-content/block.json +++ b/packages/block-library/src/post-comment-content/block.json @@ -9,5 +9,7 @@ "usesContext": [ "commentId" ], "supports": { "html": false - } + }, + "editorStyle": "wp-block-post-comment-content-editor", + "style": "wp-block-post-comment-content" } diff --git a/packages/block-library/src/post-comment-date/block.json b/packages/block-library/src/post-comment-date/block.json index 246711340a60e7..4e0a7ea5763982 100644 --- a/packages/block-library/src/post-comment-date/block.json +++ b/packages/block-library/src/post-comment-date/block.json @@ -14,5 +14,7 @@ "usesContext": [ "commentId" ], "supports": { "html": false - } + }, + "editorStyle": "wp-block-post-comment-date-editor", + "style": "wp-block-post-comment-date" } diff --git a/packages/block-library/src/post-comment/block.json b/packages/block-library/src/post-comment/block.json index 12b1c6a484b1eb..78a98e9708e9eb 100644 --- a/packages/block-library/src/post-comment/block.json +++ b/packages/block-library/src/post-comment/block.json @@ -15,5 +15,7 @@ }, "supports": { "html": false - } + }, + "editorStyle": "wp-block-post-comment-editor", + "style": "wp-block-post-comment" } diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json index 90e7b30bedc6b9..3c7de06ccacbdc 100644 --- a/packages/block-library/src/post-comments-count/block.json +++ b/packages/block-library/src/post-comments-count/block.json @@ -20,5 +20,7 @@ "fontSize": true, "lineHeight": true } - } + }, + "editorStyle": "wp-block-post-comments-count-editor", + "style": "wp-block-post-comments-count" } diff --git a/packages/block-library/src/post-comments-form/block.json b/packages/block-library/src/post-comments-form/block.json index f0e20a32841d82..06c58df9f3a958 100644 --- a/packages/block-library/src/post-comments-form/block.json +++ b/packages/block-library/src/post-comments-form/block.json @@ -22,5 +22,6 @@ "lineHeight": true } }, + "editorStyle": "wp-block-post-comments-form-editor", "style": "wp-block-post-comments-form" } diff --git a/packages/block-library/src/post-comments-link/block.json b/packages/block-library/src/post-comments-link/block.json index cbabeda389c935..0b758d830efeee 100644 --- a/packages/block-library/src/post-comments-link/block.json +++ b/packages/block-library/src/post-comments-link/block.json @@ -21,5 +21,7 @@ "fontSize": true, "lineHeight": true } - } + }, + "editorStyle": "wp-block-post-comments-link-editor", + "style": "wp-block-post-comments-link" } diff --git a/packages/block-library/src/post-comments/block.json b/packages/block-library/src/post-comments/block.json index 4853bbf750ce1d..63c003e12dc803 100644 --- a/packages/block-library/src/post-comments/block.json +++ b/packages/block-library/src/post-comments/block.json @@ -23,5 +23,6 @@ "link": true } }, + "editorStyle": "wp-block-post-comments-editor", "style": "wp-block-post-comments" } diff --git a/packages/block-library/src/post-content/block.json b/packages/block-library/src/post-content/block.json index 171a0a7eaceea6..bbbe2e6a5a7f20 100644 --- a/packages/block-library/src/post-content/block.json +++ b/packages/block-library/src/post-content/block.json @@ -11,5 +11,6 @@ "html": false, "__experimentalLayout": true }, - "editorStyle": "wp-block-post-content-editor" + "editorStyle": "wp-block-post-content-editor", + "style": "wp-block-post-content" } diff --git a/packages/block-library/src/post-date/block.json b/packages/block-library/src/post-date/block.json index ca03fce4ad2a39..f3331c3eb9d53e 100644 --- a/packages/block-library/src/post-date/block.json +++ b/packages/block-library/src/post-date/block.json @@ -28,5 +28,7 @@ "fontSize": true, "lineHeight": true } - } + }, + "editorStyle": "wp-block-post-date-editor", + "style": "wp-block-post-date" } diff --git a/packages/block-library/src/post-navigation-link/block.json b/packages/block-library/src/post-navigation-link/block.json index ce6240c839f89a..1ab26413d4b83e 100644 --- a/packages/block-library/src/post-navigation-link/block.json +++ b/packages/block-library/src/post-navigation-link/block.json @@ -24,5 +24,7 @@ "supports": { "reusable": false, "html": false - } + }, + "editorStyle": "wp-block-post-navigation-link-editor", + "style": "wp-block-post-navigation-link" } diff --git a/packages/block-library/src/post-terms/block.json b/packages/block-library/src/post-terms/block.json index 1f9f61738eb599..e4fee56a76b47f 100644 --- a/packages/block-library/src/post-terms/block.json +++ b/packages/block-library/src/post-terms/block.json @@ -24,5 +24,7 @@ "lineHeight": true, "fontSize": true } - } + }, + "editorStyle": "wp-block-post-terms-editor", + "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 803d1d5a1690f6..3b7fc230f58ffe 100644 --- a/packages/block-library/src/post-title/block.json +++ b/packages/block-library/src/post-title/block.json @@ -41,5 +41,6 @@ "__experimentalFontFamily": true } }, + "editorStyle": "wp-block-post-title-editor", "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..8c0dd4f1ef6659 100644 --- a/packages/block-library/src/preformatted/block.json +++ b/packages/block-library/src/preformatted/block.json @@ -24,5 +24,6 @@ "fontSize": true } }, + "editorStyle": "wp-block-preformatted-editor", "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 afc69d6e14a3bd..52578ae211a9a7 100644 --- a/packages/block-library/src/query-pagination-next/block.json +++ b/packages/block-library/src/query-pagination-next/block.json @@ -23,5 +23,7 @@ "fontSize": true, "lineHeight": true } - } + }, + "editorStyle": "wp-block-query-pagination-next-editor", + "style": "wp-block-query-pagination-next" } diff --git a/packages/block-library/src/query-pagination-numbers/block.json b/packages/block-library/src/query-pagination-numbers/block.json index d9142de147f84a..0a57a57415668e 100644 --- a/packages/block-library/src/query-pagination-numbers/block.json +++ b/packages/block-library/src/query-pagination-numbers/block.json @@ -11,5 +11,6 @@ "reusable": false, "html": false }, - "editorStyle": "query-pagination-numbers-editor" + "editorStyle": "wp-block-query-pagination-numbers-editor", + "style": "wp-block-query-pagination-numbers" } diff --git a/packages/block-library/src/query-pagination-previous/block.json b/packages/block-library/src/query-pagination-previous/block.json index 78a53867d0b7a5..e3b866eac2370f 100644 --- a/packages/block-library/src/query-pagination-previous/block.json +++ b/packages/block-library/src/query-pagination-previous/block.json @@ -23,5 +23,7 @@ "fontSize": true, "lineHeight": true } - } + }, + "editorStyle": "wp-block-query-pagination-previous-editor", + "style": "wp-block-query-pagination-previous" } diff --git a/packages/block-library/src/query-title/block.json b/packages/block-library/src/query-title/block.json index 3e5d43fc50846d..3924ab51e8ef5d 100644 --- a/packages/block-library/src/query-title/block.json +++ b/packages/block-library/src/query-title/block.json @@ -29,5 +29,6 @@ "__experimentalFontFamily": true } }, - "editorStyle": "wp-block-query-title-editor" + "editorStyle": "wp-block-query-title-editor", + "style": "wp-block-query-title" } diff --git a/packages/block-library/src/query/block.json b/packages/block-library/src/query/block.json index b54713a75aac60..89d5c38efe59c5 100644 --- a/packages/block-library/src/query/block.json +++ b/packages/block-library/src/query/block.json @@ -52,5 +52,6 @@ }, "__experimentalLayout": true }, - "editorStyle": "wp-block-query-editor" + "editorStyle": "wp-block-query-editor", + "style": "wp-block-query" } diff --git a/packages/block-library/src/shortcode/block.json b/packages/block-library/src/shortcode/block.json index 5def641768bbdd..17b9c98902e180 100644 --- a/packages/block-library/src/shortcode/block.json +++ b/packages/block-library/src/shortcode/block.json @@ -16,5 +16,6 @@ "customClassName": false, "html": false }, - "editorStyle": "wp-block-shortcode-editor" + "editorStyle": "wp-block-shortcode-editor", + "style": "wp-block-shortcode" } diff --git a/packages/block-library/src/site-tagline/block.json b/packages/block-library/src/site-tagline/block.json index 3da59d8c07a4aa..1dc4d3357f63f2 100644 --- a/packages/block-library/src/site-tagline/block.json +++ b/packages/block-library/src/site-tagline/block.json @@ -27,5 +27,7 @@ "__experimentalTextTransform": true, "__experimentalLetterSpacing": true } - } + }, + "editorStyle": "wp-block-site-tagline-editor", + "style": "wp-block-site-tagline" } diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json index 97577eefbd0827..02b7d51e403d10 100644 --- a/packages/block-library/src/site-title/block.json +++ b/packages/block-library/src/site-title/block.json @@ -35,5 +35,7 @@ "__experimentalFontWeight": true, "__experimentalLetterSpacing": true } - } + }, + "editorStyle": "wp-block-site-title-editor", + "style": "wp-block-site-title" } diff --git a/packages/block-library/src/social-link/block.json b/packages/block-library/src/social-link/block.json index a477d3e413072a..266ceec234f31a 100644 --- a/packages/block-library/src/social-link/block.json +++ b/packages/block-library/src/social-link/block.json @@ -26,5 +26,6 @@ "reusable": false, "html": false }, - "editorStyle": "wp-block-social-link-editor" + "editorStyle": "wp-block-social-link-editor", + "style": "wp-block-social-link" } diff --git a/packages/block-library/src/table-of-contents/block.json b/packages/block-library/src/table-of-contents/block.json index d99791b085af33..d2e4cda36e31db 100644 --- a/packages/block-library/src/table-of-contents/block.json +++ b/packages/block-library/src/table-of-contents/block.json @@ -15,5 +15,7 @@ "usesContext": [ "postId" ], "supports": { "html": false - } + }, + "editorStyle": "wp-block-table-of-contents-editor", + "style": "wp-block-table-of-contents" } diff --git a/packages/block-library/src/tag-cloud/block.json b/packages/block-library/src/tag-cloud/block.json index e394a53223ce88..ffc669bf27ae8b 100644 --- a/packages/block-library/src/tag-cloud/block.json +++ b/packages/block-library/src/tag-cloud/block.json @@ -19,5 +19,6 @@ "html": false, "align": true }, - "editorStyle": "wp-block-tag-cloud-editor" + "editorStyle": "wp-block-tag-cloud-editor", + "style": "wp-block-tag-cloud" } diff --git a/packages/block-library/src/template-part/block.json b/packages/block-library/src/template-part/block.json index 7e85b0f6aa8bd0..a60fec16cafc43 100644 --- a/packages/block-library/src/template-part/block.json +++ b/packages/block-library/src/template-part/block.json @@ -31,5 +31,6 @@ }, "__experimentalLayout": true }, - "editorStyle": "wp-block-template-part-editor" + "editorStyle": "wp-block-template-part-editor", + "style": "wp-block-template-part" } diff --git a/packages/block-library/src/term-description/block.json b/packages/block-library/src/term-description/block.json index e54b59978a395f..d5f684e98e53b0 100644 --- a/packages/block-library/src/term-description/block.json +++ b/packages/block-library/src/term-description/block.json @@ -21,5 +21,6 @@ "lineHeight": true } }, - "editorStyle": "wp-block-term-description-editor" + "editorStyle": "wp-block-term-description-editor", + "style": "wp-block-term-description" } diff --git a/packages/block-library/src/verse/block.json b/packages/block-library/src/verse/block.json index ec080e7c1ed13c..6d4f28d9169409 100644 --- a/packages/block-library/src/verse/block.json +++ b/packages/block-library/src/verse/block.json @@ -33,6 +33,6 @@ "padding": true } }, - "style": "wp-block-verse", - "editorStyle": "wp-block-verse-editor" + "editorStyle": "wp-block-verse-editor", + "style": "wp-block-verse" } From ba3946ba0a6f54652ee69ec594c9bde229fb6086 Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Thu, 27 May 2021 16:06:58 +0300 Subject: [PATCH 3/7] only do this if the file doesn't exist --- lib/blocks.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/blocks.php b/lib/blocks.php index 713152b130ba1d..b499c160a285d4 100644 --- a/lib/blocks.php +++ b/lib/blocks.php @@ -187,7 +187,6 @@ function gutenberg_register_core_block_styles( $block_name ) { $style_path = "build/block-library/blocks/$block_name/style.css"; $editor_style_path = "build/block-library/blocks/$block_name/style-editor.css"; - wp_register_style( "wp-block-{$block_name}", false ); if ( file_exists( gutenberg_dir_path() . $style_path ) ) { wp_deregister_style( "wp-block-{$block_name}" ); wp_register_style( @@ -200,9 +199,10 @@ function gutenberg_register_core_block_styles( $block_name ) { // Add a reference to the stylesheet's path to allow calculations for inlining styles in `wp_head`. wp_style_add_data( "wp-block-{$block_name}", 'path', gutenberg_dir_path() . $style_path ); + } else { + wp_register_style( "wp-block-{$block_name}", false ); } - wp_register_style( "wp-block-{$block_name}-editor" ); if ( file_exists( gutenberg_dir_path() . $editor_style_path ) ) { wp_deregister_style( "wp-block-{$block_name}-editor" ); wp_register_style( @@ -212,6 +212,8 @@ function gutenberg_register_core_block_styles( $block_name ) { filemtime( gutenberg_dir_path() . $editor_style_path ) ); wp_style_add_data( "wp-block-{$block_name}-editor", 'rtl', 'replace' ); + } else { + wp_register_style( "wp-block-{$block_name}-editor" ); } } From dbf2621c6910f1e3b8774aca37fbbc235babddfa Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Thu, 27 May 2021 16:20:32 +0300 Subject: [PATCH 4/7] meh, missed the 2nd arg here --- lib/blocks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/blocks.php b/lib/blocks.php index b499c160a285d4..de0e10b75d1f29 100644 --- a/lib/blocks.php +++ b/lib/blocks.php @@ -213,7 +213,7 @@ function gutenberg_register_core_block_styles( $block_name ) { ); wp_style_add_data( "wp-block-{$block_name}-editor", 'rtl', 'replace' ); } else { - wp_register_style( "wp-block-{$block_name}-editor" ); + wp_register_style( "wp-block-{$block_name}-editor", false ); } } From d3b95b825e9d1084c9cc883aebd61b4b6ec277c2 Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Mon, 7 Jun 2021 16:24:15 +0300 Subject: [PATCH 5/7] Use a filter instead of modifying each block.json file. --- lib/blocks.php | 23 ++++++++++++++++++- .../block-library/src/archives/block.json | 3 +-- packages/block-library/src/block/block.json | 3 +-- .../block-library/src/calendar/block.json | 1 - packages/block-library/src/code/block.json | 1 - packages/block-library/src/column/block.json | 4 +--- .../block-library/src/freeform/block.json | 3 +-- packages/block-library/src/html/block.json | 3 +-- .../src/legacy-widget/block.json | 3 +-- .../block-library/src/loginout/block.json | 4 +--- packages/block-library/src/more/block.json | 3 +-- .../block-library/src/nextpage/block.json | 3 +-- .../src/post-comment-author/block.json | 4 +--- .../src/post-comment-content/block.json | 4 +--- .../src/post-comment-date/block.json | 4 +--- .../block-library/src/post-comment/block.json | 4 +--- .../src/post-comments-count/block.json | 4 +--- .../src/post-comments-form/block.json | 1 - .../src/post-comments-link/block.json | 4 +--- .../src/post-comments/block.json | 1 - .../block-library/src/post-content/block.json | 3 +-- .../block-library/src/post-date/block.json | 4 +--- .../src/post-navigation-link/block.json | 4 +--- .../block-library/src/post-terms/block.json | 4 +--- .../block-library/src/post-title/block.json | 1 - .../block-library/src/preformatted/block.json | 1 - .../src/query-pagination-next/block.json | 4 +--- .../src/query-pagination-numbers/block.json | 3 +-- .../src/query-pagination-previous/block.json | 4 +--- .../block-library/src/query-title/block.json | 3 +-- packages/block-library/src/query/block.json | 3 +-- .../block-library/src/shortcode/block.json | 3 +-- .../block-library/src/site-tagline/block.json | 4 +--- .../block-library/src/site-title/block.json | 4 +--- .../block-library/src/social-link/block.json | 3 +-- .../src/table-of-contents/block.json | 4 +--- .../block-library/src/tag-cloud/block.json | 3 +-- .../src/template-part/block.json | 3 +-- .../src/term-description/block.json | 3 +-- packages/block-library/src/verse/block.json | 4 ++-- 40 files changed, 56 insertions(+), 89 deletions(-) diff --git a/lib/blocks.php b/lib/blocks.php index de0e10b75d1f29..01cc19740a8587 100644 --- a/lib/blocks.php +++ b/lib/blocks.php @@ -470,5 +470,26 @@ function gutenberg_migrate_old_typography_shape( $metadata ) { return $metadata; } - add_filter( 'block_type_metadata', 'gutenberg_migrate_old_typography_shape' ); + +/** + * Filters the content of a single block. + * + * @param array $metadata Metadata for registering a block type. + * + * @return array Returns the $metadata with any missing `style` and `editorStyle` added. + */ +function gutenberg_add_missing_styles_to_core_block_json( $metadata ) { + if ( ! empty( $metadata['name'] ) && 0 === strpos( $metadata['name'], 'core/' ) ) { + $block_name = str_replace( 'core/', '', $metadata['name'] ); + + if ( ! isset( $metadata['style'] ) ) { + $metadata['style'] = "wp-block-$block_name"; + } + if ( ! isset( $metadata['editorStyle'] ) ) { + $metadata['editorStyle'] = "wp-block-$block_name-editor"; + } + } + return $metadata; +} +add_filter( 'block_type_metadata', 'gutenberg_add_missing_styles_to_core_block_json' ); diff --git a/packages/block-library/src/archives/block.json b/packages/block-library/src/archives/block.json index 4069ab6c27de7a..799d050354c5f2 100644 --- a/packages/block-library/src/archives/block.json +++ b/packages/block-library/src/archives/block.json @@ -19,6 +19,5 @@ "align": true, "html": false }, - "editorStyle": "wp-block-archives-editor", - "style": "wp-block-archives" + "editorStyle": "wp-block-archives-editor" } diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json index dbf1544f5968f8..006c85c0b5db67 100644 --- a/packages/block-library/src/block/block.json +++ b/packages/block-library/src/block/block.json @@ -15,6 +15,5 @@ "html": false, "inserter": false }, - "editorStyle": "wp-block-editor", - "style": "wp-block" + "editorStyle": "wp-block-editor" } diff --git a/packages/block-library/src/calendar/block.json b/packages/block-library/src/calendar/block.json index 79c4dd0689fc9b..07938927f5ebab 100644 --- a/packages/block-library/src/calendar/block.json +++ b/packages/block-library/src/calendar/block.json @@ -17,6 +17,5 @@ "supports": { "align": true }, - "editorStyle": "wp-block-calendar-editor", "style": "wp-block-calendar" } diff --git a/packages/block-library/src/code/block.json b/packages/block-library/src/code/block.json index 3a744417889093..8ea75ed6dacb98 100644 --- a/packages/block-library/src/code/block.json +++ b/packages/block-library/src/code/block.json @@ -18,6 +18,5 @@ "fontSize": true } }, - "editorStyle": "wp-block-code-editor", "style": "wp-block-code" } diff --git a/packages/block-library/src/column/block.json b/packages/block-library/src/column/block.json index a74bd6da59f056..00e443b0ec0aff 100644 --- a/packages/block-library/src/column/block.json +++ b/packages/block-library/src/column/block.json @@ -28,7 +28,5 @@ "spacing": { "padding": true } - }, - "editorStyle": "wp-block-column-editor", - "style": "wp-block-column" + } } diff --git a/packages/block-library/src/freeform/block.json b/packages/block-library/src/freeform/block.json index 418bbd2a80dd87..f3b2d45b00c489 100644 --- a/packages/block-library/src/freeform/block.json +++ b/packages/block-library/src/freeform/block.json @@ -16,6 +16,5 @@ "customClassName": false, "reusable": false }, - "editorStyle": "wp-block-freeform-editor", - "style": "wp-block-freeform" + "editorStyle": "wp-block-freeform-editor" } diff --git a/packages/block-library/src/html/block.json b/packages/block-library/src/html/block.json index 0bd7f751abf673..962db3f3684d3b 100644 --- a/packages/block-library/src/html/block.json +++ b/packages/block-library/src/html/block.json @@ -17,6 +17,5 @@ "className": false, "html": false }, - "editorStyle": "wp-block-html-editor", - "style": "wp-block-html" + "editorStyle": "wp-block-html-editor" } diff --git a/packages/block-library/src/legacy-widget/block.json b/packages/block-library/src/legacy-widget/block.json index b350befe529142..30b60c6448835e 100644 --- a/packages/block-library/src/legacy-widget/block.json +++ b/packages/block-library/src/legacy-widget/block.json @@ -24,6 +24,5 @@ "customClassName": false, "reusable": false }, - "editorStyle": "wp-block-legacy-widget-editor", - "style": "wp-block-legacy-widget" + "editorStyle": "wp-block-legacy-widget-editor" } diff --git a/packages/block-library/src/loginout/block.json b/packages/block-library/src/loginout/block.json index 0749bcb6e42933..dfb40f7a066378 100644 --- a/packages/block-library/src/loginout/block.json +++ b/packages/block-library/src/loginout/block.json @@ -21,7 +21,5 @@ "typography": { "fontSize": false } - }, - "editorStyle": "wp-block-loginout-editor", - "style": "wp-block-loginout" + } } diff --git a/packages/block-library/src/more/block.json b/packages/block-library/src/more/block.json index 1919cf5b887f9f..8b839c806a526f 100644 --- a/packages/block-library/src/more/block.json +++ b/packages/block-library/src/more/block.json @@ -21,6 +21,5 @@ "html": false, "multiple": false }, - "editorStyle": "wp-block-more-editor", - "style": "wp-block-more" + "editorStyle": "wp-block-more-editor" } diff --git a/packages/block-library/src/nextpage/block.json b/packages/block-library/src/nextpage/block.json index a043883700f642..2314c322b1a8b3 100644 --- a/packages/block-library/src/nextpage/block.json +++ b/packages/block-library/src/nextpage/block.json @@ -12,6 +12,5 @@ "className": false, "html": false }, - "editorStyle": "wp-block-nextpage-editor", - "style": "wp-block-nextpage" + "editorStyle": "wp-block-nextpage-editor" } diff --git a/packages/block-library/src/post-comment-author/block.json b/packages/block-library/src/post-comment-author/block.json index 5d383c18f80df5..c3a2231cc5d10b 100644 --- a/packages/block-library/src/post-comment-author/block.json +++ b/packages/block-library/src/post-comment-author/block.json @@ -9,7 +9,5 @@ "usesContext": [ "commentId" ], "supports": { "html": false - }, - "editorStyle": "wp-block-post-comment-author-editor", - "style": "wp-block-post-comment-author" + } } diff --git a/packages/block-library/src/post-comment-content/block.json b/packages/block-library/src/post-comment-content/block.json index 5c68a443bd8b51..53cb97d855fd5e 100644 --- a/packages/block-library/src/post-comment-content/block.json +++ b/packages/block-library/src/post-comment-content/block.json @@ -9,7 +9,5 @@ "usesContext": [ "commentId" ], "supports": { "html": false - }, - "editorStyle": "wp-block-post-comment-content-editor", - "style": "wp-block-post-comment-content" + } } diff --git a/packages/block-library/src/post-comment-date/block.json b/packages/block-library/src/post-comment-date/block.json index 4e0a7ea5763982..246711340a60e7 100644 --- a/packages/block-library/src/post-comment-date/block.json +++ b/packages/block-library/src/post-comment-date/block.json @@ -14,7 +14,5 @@ "usesContext": [ "commentId" ], "supports": { "html": false - }, - "editorStyle": "wp-block-post-comment-date-editor", - "style": "wp-block-post-comment-date" + } } diff --git a/packages/block-library/src/post-comment/block.json b/packages/block-library/src/post-comment/block.json index 78a98e9708e9eb..12b1c6a484b1eb 100644 --- a/packages/block-library/src/post-comment/block.json +++ b/packages/block-library/src/post-comment/block.json @@ -15,7 +15,5 @@ }, "supports": { "html": false - }, - "editorStyle": "wp-block-post-comment-editor", - "style": "wp-block-post-comment" + } } diff --git a/packages/block-library/src/post-comments-count/block.json b/packages/block-library/src/post-comments-count/block.json index 3c7de06ccacbdc..90e7b30bedc6b9 100644 --- a/packages/block-library/src/post-comments-count/block.json +++ b/packages/block-library/src/post-comments-count/block.json @@ -20,7 +20,5 @@ "fontSize": true, "lineHeight": true } - }, - "editorStyle": "wp-block-post-comments-count-editor", - "style": "wp-block-post-comments-count" + } } diff --git a/packages/block-library/src/post-comments-form/block.json b/packages/block-library/src/post-comments-form/block.json index 06c58df9f3a958..f0e20a32841d82 100644 --- a/packages/block-library/src/post-comments-form/block.json +++ b/packages/block-library/src/post-comments-form/block.json @@ -22,6 +22,5 @@ "lineHeight": true } }, - "editorStyle": "wp-block-post-comments-form-editor", "style": "wp-block-post-comments-form" } diff --git a/packages/block-library/src/post-comments-link/block.json b/packages/block-library/src/post-comments-link/block.json index 0b758d830efeee..cbabeda389c935 100644 --- a/packages/block-library/src/post-comments-link/block.json +++ b/packages/block-library/src/post-comments-link/block.json @@ -21,7 +21,5 @@ "fontSize": true, "lineHeight": true } - }, - "editorStyle": "wp-block-post-comments-link-editor", - "style": "wp-block-post-comments-link" + } } diff --git a/packages/block-library/src/post-comments/block.json b/packages/block-library/src/post-comments/block.json index 63c003e12dc803..4853bbf750ce1d 100644 --- a/packages/block-library/src/post-comments/block.json +++ b/packages/block-library/src/post-comments/block.json @@ -23,6 +23,5 @@ "link": true } }, - "editorStyle": "wp-block-post-comments-editor", "style": "wp-block-post-comments" } diff --git a/packages/block-library/src/post-content/block.json b/packages/block-library/src/post-content/block.json index bbbe2e6a5a7f20..171a0a7eaceea6 100644 --- a/packages/block-library/src/post-content/block.json +++ b/packages/block-library/src/post-content/block.json @@ -11,6 +11,5 @@ "html": false, "__experimentalLayout": true }, - "editorStyle": "wp-block-post-content-editor", - "style": "wp-block-post-content" + "editorStyle": "wp-block-post-content-editor" } diff --git a/packages/block-library/src/post-date/block.json b/packages/block-library/src/post-date/block.json index f3331c3eb9d53e..ca03fce4ad2a39 100644 --- a/packages/block-library/src/post-date/block.json +++ b/packages/block-library/src/post-date/block.json @@ -28,7 +28,5 @@ "fontSize": true, "lineHeight": true } - }, - "editorStyle": "wp-block-post-date-editor", - "style": "wp-block-post-date" + } } diff --git a/packages/block-library/src/post-navigation-link/block.json b/packages/block-library/src/post-navigation-link/block.json index 1ab26413d4b83e..ce6240c839f89a 100644 --- a/packages/block-library/src/post-navigation-link/block.json +++ b/packages/block-library/src/post-navigation-link/block.json @@ -24,7 +24,5 @@ "supports": { "reusable": false, "html": false - }, - "editorStyle": "wp-block-post-navigation-link-editor", - "style": "wp-block-post-navigation-link" + } } diff --git a/packages/block-library/src/post-terms/block.json b/packages/block-library/src/post-terms/block.json index e4fee56a76b47f..1f9f61738eb599 100644 --- a/packages/block-library/src/post-terms/block.json +++ b/packages/block-library/src/post-terms/block.json @@ -24,7 +24,5 @@ "lineHeight": true, "fontSize": true } - }, - "editorStyle": "wp-block-post-terms-editor", - "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 3b7fc230f58ffe..803d1d5a1690f6 100644 --- a/packages/block-library/src/post-title/block.json +++ b/packages/block-library/src/post-title/block.json @@ -41,6 +41,5 @@ "__experimentalFontFamily": true } }, - "editorStyle": "wp-block-post-title-editor", "style": "wp-block-post-title" } diff --git a/packages/block-library/src/preformatted/block.json b/packages/block-library/src/preformatted/block.json index 8c0dd4f1ef6659..6deb40540b6c0a 100644 --- a/packages/block-library/src/preformatted/block.json +++ b/packages/block-library/src/preformatted/block.json @@ -24,6 +24,5 @@ "fontSize": true } }, - "editorStyle": "wp-block-preformatted-editor", "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 52578ae211a9a7..afc69d6e14a3bd 100644 --- a/packages/block-library/src/query-pagination-next/block.json +++ b/packages/block-library/src/query-pagination-next/block.json @@ -23,7 +23,5 @@ "fontSize": true, "lineHeight": true } - }, - "editorStyle": "wp-block-query-pagination-next-editor", - "style": "wp-block-query-pagination-next" + } } diff --git a/packages/block-library/src/query-pagination-numbers/block.json b/packages/block-library/src/query-pagination-numbers/block.json index 0a57a57415668e..d9142de147f84a 100644 --- a/packages/block-library/src/query-pagination-numbers/block.json +++ b/packages/block-library/src/query-pagination-numbers/block.json @@ -11,6 +11,5 @@ "reusable": false, "html": false }, - "editorStyle": "wp-block-query-pagination-numbers-editor", - "style": "wp-block-query-pagination-numbers" + "editorStyle": "query-pagination-numbers-editor" } diff --git a/packages/block-library/src/query-pagination-previous/block.json b/packages/block-library/src/query-pagination-previous/block.json index e3b866eac2370f..78a53867d0b7a5 100644 --- a/packages/block-library/src/query-pagination-previous/block.json +++ b/packages/block-library/src/query-pagination-previous/block.json @@ -23,7 +23,5 @@ "fontSize": true, "lineHeight": true } - }, - "editorStyle": "wp-block-query-pagination-previous-editor", - "style": "wp-block-query-pagination-previous" + } } diff --git a/packages/block-library/src/query-title/block.json b/packages/block-library/src/query-title/block.json index 3924ab51e8ef5d..3e5d43fc50846d 100644 --- a/packages/block-library/src/query-title/block.json +++ b/packages/block-library/src/query-title/block.json @@ -29,6 +29,5 @@ "__experimentalFontFamily": true } }, - "editorStyle": "wp-block-query-title-editor", - "style": "wp-block-query-title" + "editorStyle": "wp-block-query-title-editor" } diff --git a/packages/block-library/src/query/block.json b/packages/block-library/src/query/block.json index 89d5c38efe59c5..b54713a75aac60 100644 --- a/packages/block-library/src/query/block.json +++ b/packages/block-library/src/query/block.json @@ -52,6 +52,5 @@ }, "__experimentalLayout": true }, - "editorStyle": "wp-block-query-editor", - "style": "wp-block-query" + "editorStyle": "wp-block-query-editor" } diff --git a/packages/block-library/src/shortcode/block.json b/packages/block-library/src/shortcode/block.json index 17b9c98902e180..5def641768bbdd 100644 --- a/packages/block-library/src/shortcode/block.json +++ b/packages/block-library/src/shortcode/block.json @@ -16,6 +16,5 @@ "customClassName": false, "html": false }, - "editorStyle": "wp-block-shortcode-editor", - "style": "wp-block-shortcode" + "editorStyle": "wp-block-shortcode-editor" } diff --git a/packages/block-library/src/site-tagline/block.json b/packages/block-library/src/site-tagline/block.json index 1dc4d3357f63f2..3da59d8c07a4aa 100644 --- a/packages/block-library/src/site-tagline/block.json +++ b/packages/block-library/src/site-tagline/block.json @@ -27,7 +27,5 @@ "__experimentalTextTransform": true, "__experimentalLetterSpacing": true } - }, - "editorStyle": "wp-block-site-tagline-editor", - "style": "wp-block-site-tagline" + } } diff --git a/packages/block-library/src/site-title/block.json b/packages/block-library/src/site-title/block.json index 02b7d51e403d10..97577eefbd0827 100644 --- a/packages/block-library/src/site-title/block.json +++ b/packages/block-library/src/site-title/block.json @@ -35,7 +35,5 @@ "__experimentalFontWeight": true, "__experimentalLetterSpacing": true } - }, - "editorStyle": "wp-block-site-title-editor", - "style": "wp-block-site-title" + } } diff --git a/packages/block-library/src/social-link/block.json b/packages/block-library/src/social-link/block.json index 266ceec234f31a..a477d3e413072a 100644 --- a/packages/block-library/src/social-link/block.json +++ b/packages/block-library/src/social-link/block.json @@ -26,6 +26,5 @@ "reusable": false, "html": false }, - "editorStyle": "wp-block-social-link-editor", - "style": "wp-block-social-link" + "editorStyle": "wp-block-social-link-editor" } diff --git a/packages/block-library/src/table-of-contents/block.json b/packages/block-library/src/table-of-contents/block.json index d2e4cda36e31db..d99791b085af33 100644 --- a/packages/block-library/src/table-of-contents/block.json +++ b/packages/block-library/src/table-of-contents/block.json @@ -15,7 +15,5 @@ "usesContext": [ "postId" ], "supports": { "html": false - }, - "editorStyle": "wp-block-table-of-contents-editor", - "style": "wp-block-table-of-contents" + } } diff --git a/packages/block-library/src/tag-cloud/block.json b/packages/block-library/src/tag-cloud/block.json index ffc669bf27ae8b..e394a53223ce88 100644 --- a/packages/block-library/src/tag-cloud/block.json +++ b/packages/block-library/src/tag-cloud/block.json @@ -19,6 +19,5 @@ "html": false, "align": true }, - "editorStyle": "wp-block-tag-cloud-editor", - "style": "wp-block-tag-cloud" + "editorStyle": "wp-block-tag-cloud-editor" } diff --git a/packages/block-library/src/template-part/block.json b/packages/block-library/src/template-part/block.json index a60fec16cafc43..7e85b0f6aa8bd0 100644 --- a/packages/block-library/src/template-part/block.json +++ b/packages/block-library/src/template-part/block.json @@ -31,6 +31,5 @@ }, "__experimentalLayout": true }, - "editorStyle": "wp-block-template-part-editor", - "style": "wp-block-template-part" + "editorStyle": "wp-block-template-part-editor" } diff --git a/packages/block-library/src/term-description/block.json b/packages/block-library/src/term-description/block.json index d5f684e98e53b0..e54b59978a395f 100644 --- a/packages/block-library/src/term-description/block.json +++ b/packages/block-library/src/term-description/block.json @@ -21,6 +21,5 @@ "lineHeight": true } }, - "editorStyle": "wp-block-term-description-editor", - "style": "wp-block-term-description" + "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 6d4f28d9169409..ec080e7c1ed13c 100644 --- a/packages/block-library/src/verse/block.json +++ b/packages/block-library/src/verse/block.json @@ -33,6 +33,6 @@ "padding": true } }, - "editorStyle": "wp-block-verse-editor", - "style": "wp-block-verse" + "style": "wp-block-verse", + "editorStyle": "wp-block-verse-editor" } From 67582a8ec73e3087a745764b2ae22d74078e2420 Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Tue, 8 Jun 2021 12:50:20 +0300 Subject: [PATCH 6/7] Use the register_block_type_args filter --- lib/blocks.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/blocks.php b/lib/blocks.php index 01cc19740a8587..34e357e3bb38a6 100644 --- a/lib/blocks.php +++ b/lib/blocks.php @@ -475,21 +475,21 @@ function gutenberg_migrate_old_typography_shape( $metadata ) { /** * Filters the content of a single block. * - * @param array $metadata Metadata for registering a block type. + * @param array $args Array of arguments for registering a block type. * * @return array Returns the $metadata with any missing `style` and `editorStyle` added. */ -function gutenberg_add_missing_styles_to_core_block_json( $metadata ) { - if ( ! empty( $metadata['name'] ) && 0 === strpos( $metadata['name'], 'core/' ) ) { - $block_name = str_replace( 'core/', '', $metadata['name'] ); +function gutenberg_add_missing_styles_to_core_block_json( $args ) { + if ( ! empty( $args['name'] ) && 0 === strpos( $args['name'], 'core/' ) ) { + $block_name = str_replace( 'core/', '', $args['name'] ); - if ( ! isset( $metadata['style'] ) ) { - $metadata['style'] = "wp-block-$block_name"; + if ( ! isset( $args['style'] ) ) { + $args['style'] = "wp-block-$block_name"; } - if ( ! isset( $metadata['editorStyle'] ) ) { - $metadata['editorStyle'] = "wp-block-$block_name-editor"; + if ( ! isset( $args['editor_style'] ) ) { + $args['editor_style'] = "wp-block-$block_name-editor"; } } - return $metadata; + return $args; } -add_filter( 'block_type_metadata', 'gutenberg_add_missing_styles_to_core_block_json' ); +add_filter( 'register_block_type_args', 'gutenberg_add_missing_styles_to_core_block_json' ); From de5b3c33789ac57f025ac65d3a29b3a328352b28 Mon Sep 17 00:00:00 2001 From: Ari Stathopoulos Date: Tue, 8 Jun 2021 13:02:45 +0300 Subject: [PATCH 7/7] Move filter to compat files --- lib/blocks.php | 22 --------------------- lib/compat/wordpress-5.8/block-editor.php | 24 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/lib/blocks.php b/lib/blocks.php index 34e357e3bb38a6..68d3404a589e9c 100644 --- a/lib/blocks.php +++ b/lib/blocks.php @@ -471,25 +471,3 @@ function gutenberg_migrate_old_typography_shape( $metadata ) { } add_filter( 'block_type_metadata', 'gutenberg_migrate_old_typography_shape' ); - -/** - * Filters the content of a single block. - * - * @param array $args Array of arguments for registering a block type. - * - * @return array Returns the $metadata with any missing `style` and `editorStyle` added. - */ -function gutenberg_add_missing_styles_to_core_block_json( $args ) { - if ( ! empty( $args['name'] ) && 0 === strpos( $args['name'], 'core/' ) ) { - $block_name = str_replace( 'core/', '', $args['name'] ); - - if ( ! isset( $args['style'] ) ) { - $args['style'] = "wp-block-$block_name"; - } - if ( ! isset( $args['editor_style'] ) ) { - $args['editor_style'] = "wp-block-$block_name-editor"; - } - } - return $args; -} -add_filter( 'register_block_type_args', 'gutenberg_add_missing_styles_to_core_block_json' ); diff --git a/lib/compat/wordpress-5.8/block-editor.php b/lib/compat/wordpress-5.8/block-editor.php index f7efc7f1ebf6d5..983889dd3fbcf4 100644 --- a/lib/compat/wordpress-5.8/block-editor.php +++ b/lib/compat/wordpress-5.8/block-editor.php @@ -371,3 +371,27 @@ function gutenberg_block_editor_rest_api_preload( array $preload_paths, $block_e 'after' ); } + +/** + * Filters the arguments for registering a block type. + * + * @todo Remove from the Gutenberg plugin when WordPress 5.8 is the minimum required version. + * + * @param array $args Array of arguments for registering a block type. + * + * @return array Returns the $metadata with any missing `style` and `editorStyle` added. + */ +function gutenberg_add_missing_styles_to_core_block_json( $args ) { + if ( ! empty( $args['name'] ) && 0 === strpos( $args['name'], 'core/' ) ) { + $block_name = str_replace( 'core/', '', $args['name'] ); + + if ( ! isset( $args['style'] ) ) { + $args['style'] = "wp-block-$block_name"; + } + if ( ! isset( $args['editor_style'] ) ) { + $args['editor_style'] = "wp-block-$block_name-editor"; + } + } + return $args; +} +add_filter( 'register_block_type_args', 'gutenberg_add_missing_styles_to_core_block_json' );