<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[51200] trunk: Widgets: Add editor styles to the widgets block editor.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/51200">51200</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/51200","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-06-22 13:32:42 +0000 (Tue, 22 Jun 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Widgets: Add editor styles to the widgets block editor.
This updates the widgets screen to load the editor styles in the same way as the post editor. This combined with the package updates in <a href="https://core.trac.wordpress.org/changeset/51198">[51198]</a> and <a href="https://core.trac.wordpress.org/changeset/51199">[51199]</a> ensures that the blocks added to sidebars more accurately reflect what will be displayed on the front end of the site.
Props isabel_brison, noisysocks, andraganescu, audrasjb, jorbin, caseymilne, desrosj.
Fixes <a href="https://core.trac.wordpress.org/ticket/53344">#53344</a>. See <a href="https://core.trac.wordpress.org/ticket/53388">#53388</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformblocksphp">trunk/src/wp-admin/edit-form-blocks.php</a></li>
<li><a href="#trunksrcwpadminwidgetsformblocksphp">trunk/src/wp-admin/widgets-form-blocks.php</a></li>
<li><a href="#trunksrcwpincludesblockeditorphp">trunk/src/wp-includes/block-editor.php</a></li>
<li><a href="#trunktestsphpunittestsblocksblockeditorphp">trunk/tests/phpunit/tests/blocks/block-editor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-blocks.php 2021-06-22 09:58:32 UTC (rev 51199)
+++ trunk/src/wp-admin/edit-form-blocks.php 2021-06-22 13:32:42 UTC (rev 51200)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,10 +18,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Post_Type $post_type_object
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Post $post Global post object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $title
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global array $editor_styles
</del><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_meta_boxes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-global $post_type, $post_type_object, $post, $title, $editor_styles, $wp_meta_boxes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+global $post_type, $post_type_object, $post, $title, $wp_meta_boxes;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $block_editor_context = new WP_Block_Editor_Context( array( 'post' => $post ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,36 +127,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $available_templates
</span><span class="cx" style="display: block; padding: 0 10px"> ) : $available_templates;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Editor Styles.
-$styles = array(
- array(
- 'css' => 'body { font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif }',
- '__unstableType' => 'core',
- ),
-);
-if ( $editor_styles && current_theme_supports( 'editor-styles' ) ) {
- foreach ( $editor_styles as $style ) {
- if ( preg_match( '~^(https?:)?//~', $style ) ) {
- $response = wp_remote_get( $style );
- if ( ! is_wp_error( $response ) ) {
- $styles[] = array(
- 'css' => wp_remote_retrieve_body( $response ),
- '__unstableType' => 'theme',
- );
- }
- } else {
- $file = get_theme_file_path( $style );
- if ( is_file( $file ) ) {
- $styles[] = array(
- 'css' => file_get_contents( $file ),
- 'baseURL' => get_theme_file_uri( $style ),
- '__unstableType' => 'theme',
- );
- }
- }
- }
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Lock settings.
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_check_post_lock( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'titlePlaceholder' => apply_filters( 'enter_title_here', __( 'Add title' ), $post ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'bodyPlaceholder' => $body_placeholder,
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosaveInterval' => AUTOSAVE_INTERVAL,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'styles' => $styles,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'styles' => get_block_editor_theme_styles(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'richEditingEnabled' => user_can_richedit(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'postLock' => $lock_details,
</span><span class="cx" style="display: block; padding: 0 10px"> 'postLockUtils' => array(
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsformblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/widgets-form-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets-form-blocks.php 2021-06-22 09:58:32 UTC (rev 51199)
+++ trunk/src/wp-admin/widgets-form-blocks.php 2021-06-22 13:32:42 UTC (rev 51200)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> block_editor_rest_api_preload( $preload_paths, $block_editor_context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor_settings = get_block_editor_settings(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_legacy_widget_block_editor_settings(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_merge( get_legacy_widget_block_editor_settings(), array( 'styles' => get_block_editor_theme_styles() ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_editor_context
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesblockeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-editor.php 2021-06-22 09:58:32 UTC (rev 51199)
+++ trunk/src/wp-includes/block-editor.php 2021-06-22 13:32:42 UTC (rev 51200)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,3 +464,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'after'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Creates an array of theme styles to load into the block editor.
+ *
+ * @since 5.8.0
+ *
+ * @global array $editor_styles
+ *
+ * @return array An array of theme styles for the block editor. Includes default font family
+ * style and theme stylesheets.
+ */
+function get_block_editor_theme_styles() {
+ global $editor_styles;
+
+ $styles = array(
+ array(
+ 'css' => 'body { font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif }',
+ '__unstableType' => 'core',
+ ),
+ );
+ if ( $editor_styles && current_theme_supports( 'editor-styles' ) ) {
+ foreach ( $editor_styles as $style ) {
+ if ( preg_match( '~^(https?:)?//~', $style ) ) {
+ $response = wp_remote_get( $style );
+ if ( ! is_wp_error( $response ) ) {
+ $styles[] = array(
+ 'css' => wp_remote_retrieve_body( $response ),
+ '__unstableType' => 'theme',
+ );
+ }
+ } else {
+ $file = get_theme_file_path( $style );
+ if ( is_file( $file ) ) {
+ $styles[] = array(
+ 'css' => file_get_contents( $file ),
+ 'baseURL' => get_theme_file_uri( $style ),
+ '__unstableType' => 'theme',
+ );
+ }
+ }
+ }
+ }
+
+ return $styles;
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsblocksblockeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/blocks/block-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/block-editor.php 2021-06-22 09:58:32 UTC (rev 51199)
+++ trunk/tests/phpunit/tests/blocks/block-editor.php 2021-06-22 13:32:42 UTC (rev 51200)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,4 +429,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '"\/wp\/v2\/blocks"', $after );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '"\/wp\/v2\/types"', $after );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 53344
+ */
+ function test_get_block_editor_theme_styles() {
+ $theme_styles = get_block_editor_theme_styles();
+ $this->assertCount( 1, $theme_styles );
+ $this->assertSameSets(
+ array(
+ 'css' => 'body { font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif }',
+ '__unstableType' => 'core',
+ ),
+ $theme_styles[0]
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>