<!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>[56047] trunk/src/wp-includes: Editor: add iframe around post 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/56047">56047</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/56047","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>isabel_brison</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-27 00:21:12 +0000 (Tue, 27 Jun 2023)</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'>Editor: add iframe around post editor.
Adds an iframe around the post editor only if all registered blocks are v3 or higher.
Props ellatrix, mukesh27, costdev, oandregal, ramonopoly.
Fixes <a href="https://core.trac.wordpress.org/ticket/58626">#58626</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblockeditorphp">trunk/src/wp-includes/block-editor.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2023-06-26 23:42:16 UTC (rev 56046)
+++ trunk/src/wp-includes/block-editor.php 2023-06-27 00:21:12 UTC (rev 56047)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +287,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</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 string $pagenow The filename of the current screen.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $pagenow The filename of the current screen.
+ * @global WP_Styles $wp_styles The WP_Styles current instance.
+ * @global WP_Scripts $wp_scripts The WP_Scripts current instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array {
</span><span class="cx" style="display: block; padding: 0 10px"> * The block editor assets.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,65 +299,79 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_get_iframed_editor_assets() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $pagenow, $editor_styles;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_styles, $wp_scripts, $pagenow;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $script_handles = array(
- 'wp-polyfill',
- );
- $style_handles = array(
- 'wp-edit-blocks',
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Keep track of the styles and scripts instance to restore later.
+ $current_wp_styles = $wp_styles;
+ $current_wp_scripts = $wp_scripts;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (
- current_theme_supports( 'wp-block-styles' ) &&
- ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
- ) {
- $style_handles[] = 'wp-block-library-theme';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create new instances to collect the assets.
+ $wp_styles = new WP_Styles();
+ $wp_scripts = new WP_Scripts();
+
+ /*
+ * Register all currently registered styles and scripts. The actions that
+ * follow enqueue assets, but don't necessarily register them.
+ */
+ $wp_styles->registered = $current_wp_styles->registered;
+ $wp_scripts->registered = $current_wp_scripts->registered;
+
+ /*
+ * We generally do not need reset styles for the iframed editor.
+ * However, if it's a classic theme, margins will be added to every block,
+ * which is reset specifically for list items, so classic themes rely on
+ * these reset styles.
+ */
+ $wp_styles->done =
+ wp_theme_has_theme_json() ? array( 'wp-reset-editor-styles' ) : array();
+
+ wp_enqueue_script( 'wp-polyfill' );
+ // Enqueue the `editorStyle` handles for all core block, and dependencies.
+ wp_enqueue_style( 'wp-edit-blocks' );
+
+ if ( 'site-editor.php' === $pagenow ) {
+ wp_enqueue_style( 'wp-edit-site' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) {
- $style_handles[] = 'wp-widgets';
- $style_handles[] = 'wp-edit-widgets';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_theme_supports( 'wp-block-styles' ) ) {
+ wp_enqueue_style( 'wp-block-library-theme' );
</ins><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">+ /*
+ * We don't want to load EDITOR scripts in the iframe, only enqueue
+ * front-end assets for the content.
+ */
+ add_filter( 'should_load_block_editor_scripts_and_styles', '__return_false' );
+ do_action( 'enqueue_block_assets' );
+ remove_filter( 'should_load_block_editor_scripts_and_styles', '__return_false' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_registry = WP_Block_Type_Registry::get_instance();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Additionally, do enqueue `editorStyle` assets for all blocks, which
+ * contains editor-only styling for blocks (editor content).
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $block_registry->get_all_registered() as $block_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style_handles = array_merge(
- $style_handles,
- $block_type->style_handles,
- $block_type->editor_style_handles
- );
-
- $script_handles = array_merge(
- $script_handles,
- $block_type->script_handles
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $block_type->editor_style_handles ) && is_array( $block_type->editor_style_handles ) ) {
+ foreach ( $block_type->editor_style_handles as $style_handle ) {
+ wp_enqueue_style( $style_handle );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $style_handles = array_unique( $style_handles );
- $done = wp_styles()->done;
-
</del><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // We do not need reset styles for the iframed editor.
- wp_styles()->done = array( 'wp-reset-editor-styles' );
- wp_styles()->do_items( $style_handles );
- wp_styles()->done = $done;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_print_styles();
</ins><span class="cx" style="display: block; padding: 0 10px"> $styles = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $script_handles = array_unique( $script_handles );
- $done = wp_scripts()->done;
-
</del><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_print_head_scripts();
+ wp_print_footer_scripts();
+ $scripts = ob_get_clean();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_scripts()->done = array();
- wp_scripts()->do_items( $script_handles );
- wp_scripts()->done = $done;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Restore the original instances.
+ $wp_styles = $current_wp_styles;
+ $wp_scripts = $current_wp_scripts;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts = ob_get_clean();
-
</del><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'styles' => $styles,
</span><span class="cx" style="display: block; padding: 0 10px"> 'scripts' => $scripts,
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2023-06-26 23:42:16 UTC (rev 56046)
+++ trunk/src/wp-includes/script-loader.php 2023-06-27 00:21:12 UTC (rev 56047)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1629,7 +1629,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $styles->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-block-editor-content',
</span><span class="cx" style="display: block; padding: 0 10px"> "/wp-includes/css/dist/block-editor/content$suffix.css",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'wp-components' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_edit_blocks_dependencies = array(
</span></span></pre>
</div>
</div>
</body>
</html>