PluginProbe
Gutenberg / 16.2.0
Gutenberg v16.2.0
24.0.0 23.9.1 23.9.0 23.8.0 23.7.2 23.7.1 23.7.0 23.6.1 23.6.2 23.6.0 23.5.3 23.5.2 23.5.1 23.5.0 23.4.0 23.3.2 23.3.1 23.3.0 23.2.0 23.2.1 23.2.2 23.1.1 23.1.0 23.0.1 12.6.0 All 403 releases
← All changes | lib/blocks.php +186 -172 23.2.216.2.0 View file →
@@ -9,71 +9,169 @@
9 9 * Substitutes the implementation of a core-registered block type, if exists,
10 10 * with the built result from the plugin.
11 11 */
12 12 function gutenberg_reregister_core_block_types() {
13 + // Blocks directory may not exist if working from a fresh clone.
13 14 $blocks_dirs = array(
14 - __DIR__ . '/../build/scripts/block-library/',
15 - __DIR__ . '/../build/scripts/edit-widgets/blocks/',
16 - __DIR__ . '/../build/scripts/widgets/blocks/',
15 + __DIR__ . '/../build/block-library/blocks/' => array(
16 + 'block_folders' => array(
17 + 'audio',
18 + 'button',
19 + 'buttons',
20 + 'freeform',
21 + 'code',
22 + 'column',
23 + 'columns',
24 + 'comments',
25 + 'details',
26 + 'group',
27 + 'footnotes',
28 + 'html',
29 + 'list',
30 + 'list-item',
31 + 'media-text',
32 + 'missing',
33 + 'more',
34 + 'nextpage',
35 + 'paragraph',
36 + 'preformatted',
37 + 'pullquote',
38 + 'quote',
39 + 'separator',
40 + 'social-links',
41 + 'spacer',
42 + 'table',
43 + 'table-of-contents',
44 + 'text-columns',
45 + 'verse',
46 + 'video',
47 + 'embed',
48 + ),
49 + 'block_names' => array(
50 + 'archives.php' => 'core/archives',
51 + 'avatar.php' => 'core/avatar',
52 + 'block.php' => 'core/block',
53 + 'calendar.php' => 'core/calendar',
54 + 'categories.php' => 'core/categories',
55 + 'cover.php' => 'core/cover',
56 + 'comment-author-avatar.php' => 'core/comment-author-avatar',
57 + 'comment-author-name.php' => 'core/comment-author-name',
58 + 'comment-content.php' => 'core/comment-content',
59 + 'comment-date.php' => 'core/comment-date',
60 + 'comment-edit-link.php' => 'core/comment-edit-link',
61 + 'comment-reply-link.php' => 'core/comment-reply-link',
62 + 'comment-template.php' => 'core/comment-template',
63 + 'comments-pagination.php' => 'core/comments-pagination',
64 + 'comments-pagination-next.php' => 'core/comments-pagination-next',
65 + 'comments-pagination-numbers.php' => 'core/comments-pagination-numbers',
66 + 'comments-pagination-previous.php' => 'core/comments-pagination-previous',
67 + 'comments-title.php' => 'core/comments-title',
68 + 'comments.php' => 'core/comments',
69 + 'footnotes.php' => 'core/footnotes',
70 + 'file.php' => 'core/file',
71 + 'home-link.php' => 'core/home-link',
72 + 'image.php' => 'core/image',
73 + 'gallery.php' => 'core/gallery',
74 + 'heading.php' => 'core/heading',
75 + 'latest-comments.php' => 'core/latest-comments',
76 + 'latest-posts.php' => 'core/latest-posts',
77 + 'loginout.php' => 'core/loginout',
78 + 'navigation.php' => 'core/navigation',
79 + 'navigation-link.php' => 'core/navigation-link',
80 + 'navigation-submenu.php' => 'core/navigation-submenu',
81 + 'page-list.php' => 'core/page-list',
82 + 'page-list-item.php' => 'core/page-list-item',
83 + 'pattern.php' => 'core/pattern',
84 + 'post-author.php' => 'core/post-author',
85 + 'post-author-name.php' => 'core/post-author-name',
86 + 'post-author-biography.php' => 'core/post-author-biography',
87 + 'post-comment.php' => 'core/post-comment',
88 + 'post-comments-count.php' => 'core/post-comments-count',
89 + 'post-comments-form.php' => 'core/post-comments-form',
90 + 'post-comments-link.php' => 'core/post-comments-link',
91 + 'post-content.php' => 'core/post-content',
92 + 'post-date.php' => 'core/post-date',
93 + 'post-excerpt.php' => 'core/post-excerpt',
94 + 'post-featured-image.php' => 'core/post-featured-image',
95 + 'post-navigation-link.php' => 'core/post-navigation-link',
96 + 'post-terms.php' => 'core/post-terms',
97 + 'post-time-to-read.php' => 'core/post-time-to-read',
98 + 'post-title.php' => 'core/post-title',
99 + 'query.php' => 'core/query',
100 + 'post-template.php' => 'core/post-template',
101 + 'query-no-results.php' => 'core/query-no-results',
102 + 'query-pagination.php' => 'core/query-pagination',
103 + 'query-pagination-next.php' => 'core/query-pagination-next',
104 + 'query-pagination-numbers.php' => 'core/query-pagination-numbers',
105 + 'query-pagination-previous.php' => 'core/query-pagination-previous',
106 + 'query-title.php' => 'core/query-title',
107 + 'read-more.php' => 'core/read-more',
108 + 'rss.php' => 'core/rss',
109 + 'search.php' => 'core/search',
110 + 'shortcode.php' => 'core/shortcode',
111 + 'social-link.php' => 'core/social-link',
112 + 'site-logo.php' => 'core/site-logo',
113 + 'site-tagline.php' => 'core/site-tagline',
114 + 'site-title.php' => 'core/site-title',
115 + 'tag-cloud.php' => 'core/tag-cloud',
116 + 'template-part.php' => 'core/template-part',
117 + 'term-description.php' => 'core/term-description',
118 + ),
119 + ),
120 + __DIR__ . '/../build/edit-widgets/blocks/' => array(
121 + 'block_folders' => array(
122 + 'widget-area',
123 + ),
124 + 'block_names' => array(),
125 + ),
126 + __DIR__ . '/../build/widgets/blocks/' => array(
127 + 'block_folders' => array(
128 + 'legacy-widget',
129 + 'widget-group',
130 + ),
131 + 'block_names' => array(
132 + 'legacy-widget.php' => 'core/legacy-widget',
133 + 'widget-group.php' => 'core/widget-group',
134 + ),
135 + ),
17 136 );
137 + foreach ( $blocks_dirs as $blocks_dir => $details ) {
138 + $block_folders = $details['block_folders'];
139 + $block_names = $details['block_names'];
18 140
19 - foreach ( $blocks_dirs as $blocks_dir ) {
20 - $manifest_path = $blocks_dir . 'blocks-manifest.php';
21 - $blocks = require $manifest_path;
141 + foreach ( $block_folders as $folder_name ) {
142 + $block_json_file = $blocks_dir . $folder_name . '/block.json';
22 143
23 - foreach ( $blocks as $block_name_folder => $metadata ) {
24 - if ( ! is_array( $metadata ) || ! isset( $metadata['name'] ) ) {
144 + // Ideally, all paths to block metadata files should be listed in
145 + // WordPress core. In this place we should rather use filter
146 + // to replace paths with overrides defined by the plugin.
147 + $metadata = json_decode( file_get_contents( $block_json_file ), true );
148 + if ( ! is_array( $metadata ) || ! $metadata['name'] ) {
25 149 continue;
26 150 }
27 151
28 152 gutenberg_deregister_core_block_and_assets( $metadata['name'] );
29 - gutenberg_register_core_block_assets( $block_name_folder );
153 + gutenberg_register_core_block_assets( $folder_name );
154 + register_block_type_from_metadata( $block_json_file );
155 + }
30 156
31 - $php_file = $blocks_dir . $block_name_folder . '.php';
32 - if ( file_exists( $php_file ) ) {
33 - require_once $php_file;
34 - } else {
35 - register_block_type_from_metadata( $blocks_dir . $block_name_folder );
157 + foreach ( $block_names as $file => $sub_block_names ) {
158 + if ( ! file_exists( $blocks_dir . $file ) ) {
159 + continue;
36 160 }
37 - }
38 - }
39 -}
40 161
41 -add_action( 'init', 'gutenberg_reregister_core_block_types' );
162 + $sub_block_names_normalized = is_string( $sub_block_names ) ? array( $sub_block_names ) : $sub_block_names;
163 + foreach ( $sub_block_names_normalized as $block_name ) {
164 + gutenberg_deregister_core_block_and_assets( $block_name );
165 + gutenberg_register_core_block_assets( $block_name );
166 + }
42 167
43 -/**
44 - * Adds the defer loading strategy to all registered blocks.
45 - *
46 - * This function would not be part of core merge. Instead, the register_block_script_handle() function would be patched
47 - * as follows.
48 - *
49 - * ```
50 - * --- a/wp-includes/blocks.php
51 - * +++ b/wp-includes/blocks.php
52 - * @ @ -153,7 +153,8 @ @ function register_block_script_handle( $metadata, $field_name, $index = 0 ) {
53 - * $script_handle,
54 - * $script_uri,
55 - * $script_dependencies,
56 - * - $script_asset['version'] ?? false
57 - * + $script_asset['version'] ?? false,
58 - * + array( 'strategy' => 'defer' )
59 - * );
60 - * if ( ! $result ) {
61 - * return false;
62 - * ```
63 - *
64 - * @see register_block_script_handle()
65 - */
66 -function gutenberg_defer_block_view_scripts() {
67 - $block_types = WP_Block_Type_Registry::get_instance()->get_all_registered();
68 - foreach ( $block_types as $block_type ) {
69 - foreach ( $block_type->view_script_handles as $view_script_handle ) {
70 - wp_script_add_data( $view_script_handle, 'strategy', 'defer' );
168 + require_once $blocks_dir . $file;
71 169 }
72 170 }
73 171 }
74 172
75 -add_action( 'init', 'gutenberg_defer_block_view_scripts', 100 );
173 +add_action( 'init', 'gutenberg_reregister_core_block_types' );
76 174
77 175 /**
78 176 * Deregisters the existing core block type and its assets.
79 177 *
@@ -103,17 +201,8 @@
103 201 *
104 202 * @return void
105 203 */
106 204 function gutenberg_register_core_block_assets( $block_name ) {
107 - static $gutenberg_url_root = null;
108 - // Running `gutenberg_url` inside of a loop can be expensive in systems with
109 - // many callbacks attached to the `plugins_url` hook.
110 - // Since all of the paths have the same root, we can instead retrieve the
111 - // corresponding URL root once, and manually concatenate the URL below.
112 - if ( is_null( $gutenberg_url_root ) ) {
113 - $gutenberg_url_root = gutenberg_url( '/' );
114 - }
115 -
116 205 if ( ! wp_should_load_separate_core_block_assets() ) {
117 206 return;
118 207 }
119 208
@@ -121,16 +210,14 @@
121 210
122 211 // When in production, use the plugin's version as the default asset version;
123 212 // else (for development or test) default to use the current time.
124 213 $default_version = defined( 'GUTENBERG_VERSION' ) && ! SCRIPT_DEBUG ? GUTENBERG_VERSION : time();
125 - $suffix = SCRIPT_DEBUG ? '' : '.min';
126 214
127 - $style_path = "build/styles/block-library/$block_name/";
128 - $stylesheet_url = $gutenberg_url_root . $style_path . 'style' . $suffix . '.css';
129 - $stylesheet_path = gutenberg_dir_path() . $style_path . ( is_rtl() ? 'style-rtl' . $suffix . '.css' : 'style' . $suffix . '.css' );
215 + $style_path = "build/block-library/blocks/$block_name/";
216 + $stylesheet_url = gutenberg_url( $style_path . 'style.css' );
217 + $stylesheet_path = gutenberg_dir_path() . $style_path . ( is_rtl() ? 'style-rtl.css' : 'style.css' );
130 218
131 219 if ( file_exists( $stylesheet_path ) ) {
132 -
133 220 wp_deregister_style( "wp-block-{$block_name}" );
134 221 wp_register_style(
135 222 "wp-block-{$block_name}",
136 223 $stylesheet_url,
@@ -137,9 +224,9 @@
137 224 array(),
138 225 $default_version
139 226 );
140 227 wp_style_add_data( "wp-block-{$block_name}", 'rtl', 'replace' );
141 - wp_style_add_data( "wp-block-{$block_name}", 'suffix', $suffix );
228 +
142 229 // Add a reference to the stylesheet's path to allow calculations for inlining styles in `wp_head`.
143 230 wp_style_add_data( "wp-block-{$block_name}", 'path', $stylesheet_path );
144 231 } else {
145 232 wp_register_style( "wp-block-{$block_name}", false, array() );
@@ -144,44 +231,62 @@
144 231 } else {
145 232 wp_register_style( "wp-block-{$block_name}", false, array() );
146 233 }
147 234
148 - /*
149 - * If the current theme supports wp-block-styles, dequeue the core styles
150 - * and enqueue the plugin ones instead.
151 - */
235 + // If the current theme supports wp-block-styles, dequeue the full stylesheet
236 + // and instead attach each block's theme-styles to their block styles stylesheet.
152 237 if ( current_theme_supports( 'wp-block-styles' ) ) {
153 238
239 + // Dequeue the full stylesheet.
240 + // Make sure this only runs once, it doesn't need to run for every block.
241 + static $stylesheet_removed;
242 + if ( ! $stylesheet_removed ) {
243 + add_action(
244 + 'wp_enqueue_scripts',
245 + static function() {
246 + wp_dequeue_style( 'wp-block-library-theme' );
247 + }
248 + );
249 + $stylesheet_removed = true;
250 + }
251 +
154 252 // Get the path to the block's stylesheet.
155 253 $theme_style_path = is_rtl()
156 - ? "build/styles/block-library/$block_name/theme-rtl{$suffix}.css"
157 - : "build/styles/block-library/$block_name/theme{$suffix}.css";
254 + ? "build/block-library/blocks/$block_name/theme-rtl.css"
255 + : "build/block-library/blocks/$block_name/theme.css";
158 256
159 257 // If the file exists, enqueue it.
160 258 if ( file_exists( gutenberg_dir_path() . $theme_style_path ) ) {
161 - wp_deregister_style( "wp-block-{$block_name}-theme" );
162 - wp_register_style(
163 - "wp-block-{$block_name}-theme",
164 - $gutenberg_url_root . $theme_style_path,
165 - array(),
166 - $default_version
167 - );
168 - wp_style_add_data( "wp-block-{$block_name}-theme", 'path', gutenberg_dir_path() . $theme_style_path );
169 - wp_style_add_data( "wp-block-{$block_name}-theme", 'suffix', $suffix );
259 +
260 + if ( file_exists( $stylesheet_path ) ) {
261 + // If there is a main stylesheet for this block, append the theme styles to main styles.
262 + wp_add_inline_style(
263 + "wp-block-{$block_name}",
264 + file_get_contents( gutenberg_dir_path() . $theme_style_path )
265 + );
266 + } else {
267 + // If there is no main stylesheet for this block, register theme style.
268 + wp_register_style(
269 + "wp-block-{$block_name}",
270 + gutenberg_url( $theme_style_path ),
271 + array(),
272 + $default_version
273 + );
274 + wp_style_add_data( "wp-block-{$block_name}", 'path', gutenberg_dir_path() . $theme_style_path );
275 + }
170 276 }
171 277 }
172 278
173 - $editor_style_path = "build/styles/block-library/$block_name/style-editor{$suffix}.css";
279 + $editor_style_path = "build/block-library/blocks/$block_name/style-editor.css";
174 280 if ( file_exists( gutenberg_dir_path() . $editor_style_path ) ) {
175 281 wp_deregister_style( "wp-block-{$block_name}-editor" );
176 282 wp_register_style(
177 283 "wp-block-{$block_name}-editor",
178 - $gutenberg_url_root . $editor_style_path,
284 + gutenberg_url( $editor_style_path ),
179 285 array(),
180 286 $default_version
181 287 );
182 288 wp_style_add_data( "wp-block-{$block_name}-editor", 'rtl', 'replace' );
183 - wp_style_add_data( "wp-block-{$block_name}-editor", 'suffix', $suffix );
184 289 } else {
185 290 wp_register_style( "wp-block-{$block_name}-editor", false );
186 291 }
187 292 }
@@ -197,9 +302,9 @@
197 302 *
198 303 * This shim is INTENTIONALLY left out of core, as Social Links have never
199 304 * landed there.
200 305 *
201 - * @link https://github.com/WordPress/gutenberg/pull/19887
306 + * @see https://github.com/WordPress/gutenberg/pull/19887
202 307 */
203 308 function gutenberg_register_legacy_social_link_blocks() {
204 309 $services = array(
205 310 'amazon',
@@ -293,96 +398,5 @@
293 398 }
294 399
295 400 return $value;
296 401 }
297 -
298 402 add_filter( 'default_post_metadata', 'gutenberg_legacy_wp_block_post_meta', 10, 4 );
299 -
300 -
301 -
302 -/**
303 - * Strips all HTML from the content of footnotes, and sanitizes the ID.
304 - *
305 - * This function expects slashed data on the footnotes content.
306 - *
307 - * @access private
308 - *
309 - * @param string $footnotes JSON encoded string of an array containing the content and ID of each footnote.
310 - * @return string Filtered content without any HTML on the footnote content and with the sanitized id.
311 - */
312 -function _gutenberg_filter_post_meta_footnotes( $footnotes ) {
313 - $footnotes_decoded = json_decode( $footnotes, true );
314 - if ( ! is_array( $footnotes_decoded ) ) {
315 - return '';
316 - }
317 - $footnotes_sanitized = array();
318 - foreach ( $footnotes_decoded as $footnote ) {
319 - if ( ! empty( $footnote['content'] ) && ! empty( $footnote['id'] ) ) {
320 - $footnotes_sanitized[] = array(
321 - 'id' => sanitize_key( $footnote['id'] ),
322 - 'content' => wp_unslash( wp_filter_post_kses( wp_slash( $footnote['content'] ) ) ),
323 - );
324 - }
325 - }
326 - return wp_json_encode( $footnotes_sanitized );
327 -}
328 -
329 -/**
330 - * Adds the filters to filter footnotes meta field.
331 - *
332 - * @access private
333 - */
334 -function _gutenberg_footnotes_kses_init_filters() {
335 - add_filter( 'sanitize_post_meta_footnotes', '_gutenberg_filter_post_meta_footnotes' );
336 -}
337 -
338 -/**
339 - * Removes the filters that filter footnotes meta field.
340 - *
341 - * @access private
342 - */
343 -function _gutenberg_footnotes_remove_filters() {
344 - remove_filter( 'sanitize_post_meta_footnotes', '_gutenberg_filter_post_meta_footnotes' );
345 -}
346 -
347 -/**
348 - * Registers the filter of footnotes meta field if the user does not have unfiltered_html capability.
349 - *
350 - * @access private
351 - */
352 -function _gutenberg_footnotes_kses_init() {
353 - if ( function_exists( '_wp_filter_post_meta_footnotes' ) ) {
354 - return;
355 - }
356 - _gutenberg_footnotes_remove_filters();
357 - if ( ! current_user_can( 'unfiltered_html' ) ) {
358 - _gutenberg_footnotes_kses_init_filters();
359 - }
360 -}
361 -
362 -/**
363 - * Initializes footnotes meta field filters when imported data should be filtered.
364 - *
365 - * This filter is the last being executed on force_filtered_html_on_import.
366 - * If the input of the filter is true it means we are in an import situation and should
367 - * enable kses, independently of the user capabilities.
368 - * So in that case we call _gutenberg_footnotes_kses_init_filters;
369 - *
370 - * @access private
371 - *
372 - * @param string $arg Input argument of the filter.
373 - * @return string Input argument of the filter.
374 - */
375 -function _gutenberg_footnotes_force_filtered_html_on_import_filter( $arg ) {
376 - if ( function_exists( '_wp_filter_post_meta_footnotes' ) ) {
377 - return;
378 - }
379 - // force_filtered_html_on_import is true we need to init the global styles kses filters.
380 - if ( $arg ) {
381 - _gutenberg_footnotes_kses_init_filters();
382 - }
383 - return $arg;
384 -}
385 -
386 -add_action( 'init', '_gutenberg_footnotes_kses_init' );
387 -add_action( 'set_current_user', '_gutenberg_footnotes_kses_init' );
388 -add_filter( 'force_filtered_html_on_import', '_gutenberg_footnotes_force_filtered_html_on_import_filter', 999 );