2021-04-21 01:12:05 -04:00
|
|
|
<?php
|
|
|
|
/**
|
|
|
|
* Block Editor API.
|
|
|
|
*
|
|
|
|
* @package WordPress
|
|
|
|
* @subpackage Editor
|
|
|
|
* @since 5.8.0
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the list of default categories for block types.
|
|
|
|
*
|
2021-06-23 15:05:57 -04:00
|
|
|
* @since 5.8.0
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
|
|
|
* @return array[] Array of categories for block types.
|
|
|
|
*/
|
|
|
|
function get_default_block_categories() {
|
|
|
|
return array(
|
|
|
|
array(
|
|
|
|
'slug' => 'text',
|
|
|
|
'title' => _x( 'Text', 'block category' ),
|
|
|
|
'icon' => null,
|
|
|
|
),
|
|
|
|
array(
|
|
|
|
'slug' => 'media',
|
|
|
|
'title' => _x( 'Media', 'block category' ),
|
|
|
|
'icon' => null,
|
|
|
|
),
|
|
|
|
array(
|
|
|
|
'slug' => 'design',
|
|
|
|
'title' => _x( 'Design', 'block category' ),
|
|
|
|
'icon' => null,
|
|
|
|
),
|
|
|
|
array(
|
|
|
|
'slug' => 'widgets',
|
|
|
|
'title' => _x( 'Widgets', 'block category' ),
|
|
|
|
'icon' => null,
|
|
|
|
),
|
|
|
|
array(
|
|
|
|
'slug' => 'theme',
|
|
|
|
'title' => _x( 'Theme', 'block category' ),
|
|
|
|
'icon' => null,
|
|
|
|
),
|
|
|
|
array(
|
|
|
|
'slug' => 'embed',
|
|
|
|
'title' => _x( 'Embeds', 'block category' ),
|
|
|
|
'icon' => null,
|
|
|
|
),
|
|
|
|
array(
|
|
|
|
'slug' => 'reusable',
|
|
|
|
'title' => _x( 'Reusable Blocks', 'block category' ),
|
|
|
|
'icon' => null,
|
|
|
|
),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns all the categories for block types that will be shown in the block editor.
|
|
|
|
*
|
|
|
|
* @since 5.0.0
|
2021-05-24 17:21:57 -04:00
|
|
|
* @since 5.8.0 It is possible to pass the block editor context as param.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
2021-05-24 17:21:57 -04:00
|
|
|
* @param WP_Post|WP_Block_Editor_Context $post_or_block_editor_context The current post object or
|
|
|
|
* the block editor context.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
|
|
|
* @return array[] Array of categories for block types.
|
|
|
|
*/
|
2021-05-24 17:21:57 -04:00
|
|
|
function get_block_categories( $post_or_block_editor_context ) {
|
|
|
|
$block_categories = get_default_block_categories();
|
|
|
|
$block_editor_context = $post_or_block_editor_context instanceof WP_Post ?
|
|
|
|
new WP_Block_Editor_Context(
|
|
|
|
array(
|
|
|
|
'post' => $post_or_block_editor_context,
|
|
|
|
)
|
|
|
|
) : $post_or_block_editor_context;
|
2021-04-21 01:12:05 -04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Filters the default array of categories for block types.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
2021-05-24 17:21:57 -04:00
|
|
|
* @param array[] $block_categories Array of categories for block types.
|
|
|
|
* @param WP_Block_Editor_Context $block_editor_context The current block editor context.
|
2021-04-21 01:12:05 -04:00
|
|
|
*/
|
2021-05-24 17:21:57 -04:00
|
|
|
$block_categories = apply_filters( 'block_categories_all', $block_categories, $block_editor_context );
|
2021-12-04 12:20:00 -05:00
|
|
|
|
2021-05-24 17:21:57 -04:00
|
|
|
if ( ! empty( $block_editor_context->post ) ) {
|
|
|
|
$post = $block_editor_context->post;
|
2021-04-21 01:12:05 -04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Filters the default array of categories for block types.
|
|
|
|
*
|
|
|
|
* @since 5.0.0
|
2021-06-25 10:40:57 -04:00
|
|
|
* @deprecated 5.8.0 Use the {@see 'block_categories_all'} filter instead.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
|
|
|
* @param array[] $block_categories Array of categories for block types.
|
|
|
|
* @param WP_Post $post Post being loaded.
|
|
|
|
*/
|
2021-04-21 05:32:06 -04:00
|
|
|
$block_categories = apply_filters_deprecated( 'block_categories', array( $block_categories, $post ), '5.8.0', 'block_categories_all' );
|
2021-04-21 01:12:05 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return $block_categories;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Gets the list of allowed block types to use in the block editor.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
2021-05-24 17:21:57 -04:00
|
|
|
* @param WP_Block_Editor_Context $block_editor_context The current block editor context.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
2022-04-28 05:46:21 -04:00
|
|
|
* @return bool|string[] Array of block type slugs, or boolean to enable/disable all.
|
2021-04-21 01:12:05 -04:00
|
|
|
*/
|
2021-05-24 17:21:57 -04:00
|
|
|
function get_allowed_block_types( $block_editor_context ) {
|
2021-04-21 01:12:05 -04:00
|
|
|
$allowed_block_types = true;
|
|
|
|
|
|
|
|
/**
|
2021-06-25 10:40:57 -04:00
|
|
|
* Filters the allowed block types for all editor types.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
2022-04-28 05:46:21 -04:00
|
|
|
* @param bool|string[] $allowed_block_types Array of block type slugs, or boolean to enable/disable all.
|
2021-06-25 10:40:57 -04:00
|
|
|
* Default true (all registered block types supported).
|
2021-05-24 17:21:57 -04:00
|
|
|
* @param WP_Block_Editor_Context $block_editor_context The current block editor context.
|
2021-04-21 01:12:05 -04:00
|
|
|
*/
|
2021-05-24 17:21:57 -04:00
|
|
|
$allowed_block_types = apply_filters( 'allowed_block_types_all', $allowed_block_types, $block_editor_context );
|
2021-12-04 12:20:00 -05:00
|
|
|
|
2021-05-24 17:21:57 -04:00
|
|
|
if ( ! empty( $block_editor_context->post ) ) {
|
|
|
|
$post = $block_editor_context->post;
|
2021-04-21 01:12:05 -04:00
|
|
|
|
|
|
|
/**
|
2021-06-25 10:40:57 -04:00
|
|
|
* Filters the allowed block types for the editor.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
|
|
|
* @since 5.0.0
|
2021-06-25 10:40:57 -04:00
|
|
|
* @deprecated 5.8.0 Use the {@see 'allowed_block_types_all'} filter instead.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
2022-04-28 05:46:21 -04:00
|
|
|
* @param bool|string[] $allowed_block_types Array of block type slugs, or boolean to enable/disable all.
|
|
|
|
* Default true (all registered block types supported)
|
|
|
|
* @param WP_Post $post The post resource data.
|
2021-04-21 01:12:05 -04:00
|
|
|
*/
|
2021-04-21 05:32:06 -04:00
|
|
|
$allowed_block_types = apply_filters_deprecated( 'allowed_block_types', array( $allowed_block_types, $post ), '5.8.0', 'allowed_block_types_all' );
|
2021-04-21 01:12:05 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return $allowed_block_types;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the default block editor settings.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
|
|
|
* @return array The default block editor settings.
|
|
|
|
*/
|
|
|
|
function get_default_block_editor_settings() {
|
|
|
|
// Media settings.
|
2022-11-08 19:30:10 -05:00
|
|
|
|
|
|
|
// wp_max_upload_size() can be expensive, so only call it when relevant for the current user.
|
|
|
|
$max_upload_size = 0;
|
|
|
|
if ( current_user_can( 'upload_files' ) ) {
|
|
|
|
$max_upload_size = wp_max_upload_size();
|
|
|
|
if ( ! $max_upload_size ) {
|
|
|
|
$max_upload_size = 0;
|
|
|
|
}
|
2021-04-21 01:12:05 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/** This filter is documented in wp-admin/includes/media.php */
|
|
|
|
$image_size_names = apply_filters(
|
|
|
|
'image_size_names_choose',
|
|
|
|
array(
|
|
|
|
'thumbnail' => __( 'Thumbnail' ),
|
|
|
|
'medium' => __( 'Medium' ),
|
|
|
|
'large' => __( 'Large' ),
|
|
|
|
'full' => __( 'Full Size' ),
|
|
|
|
)
|
|
|
|
);
|
|
|
|
|
|
|
|
$available_image_sizes = array();
|
|
|
|
foreach ( $image_size_names as $image_size_slug => $image_size_name ) {
|
|
|
|
$available_image_sizes[] = array(
|
|
|
|
'slug' => $image_size_slug,
|
|
|
|
'name' => $image_size_name,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
$default_size = get_option( 'image_default_size', 'large' );
|
2021-04-29 06:12:05 -04:00
|
|
|
$image_default_size = in_array( $default_size, array_keys( $image_size_names ), true ) ? $default_size : 'large';
|
2021-04-21 01:12:05 -04:00
|
|
|
|
|
|
|
$image_dimensions = array();
|
|
|
|
$all_sizes = wp_get_registered_image_subsizes();
|
|
|
|
foreach ( $available_image_sizes as $size ) {
|
|
|
|
$key = $size['slug'];
|
|
|
|
if ( isset( $all_sizes[ $key ] ) ) {
|
|
|
|
$image_dimensions[ $key ] = $all_sizes[ $key ];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-11-08 09:29:21 -05:00
|
|
|
// These styles are used if the "no theme styles" options is triggered or on
|
|
|
|
// themes without their own editor styles.
|
|
|
|
$default_editor_styles_file = ABSPATH . WPINC . '/css/dist/block-editor/default-editor-styles.css';
|
2022-09-23 10:00:09 -04:00
|
|
|
|
|
|
|
static $default_editor_styles_file_contents = false;
|
|
|
|
if ( ! $default_editor_styles_file_contents && file_exists( $default_editor_styles_file ) ) {
|
|
|
|
$default_editor_styles_file_contents = file_get_contents( $default_editor_styles_file );
|
|
|
|
}
|
|
|
|
|
|
|
|
$default_editor_styles = array();
|
|
|
|
if ( $default_editor_styles_file_contents ) {
|
2021-11-08 09:29:21 -05:00
|
|
|
$default_editor_styles = array(
|
2022-09-23 10:00:09 -04:00
|
|
|
array( 'css' => $default_editor_styles_file_contents ),
|
2021-11-08 09:29:21 -05:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2021-04-21 01:12:05 -04:00
|
|
|
$editor_settings = array(
|
2021-12-09 10:25:01 -05:00
|
|
|
'alignWide' => get_theme_support( 'align-wide' ),
|
|
|
|
'allowedBlockTypes' => true,
|
|
|
|
'allowedMimeTypes' => get_allowed_mime_types(),
|
|
|
|
'defaultEditorStyles' => $default_editor_styles,
|
|
|
|
'blockCategories' => get_default_block_categories(),
|
|
|
|
'isRTL' => is_rtl(),
|
|
|
|
'imageDefaultSize' => $image_default_size,
|
|
|
|
'imageDimensions' => $image_dimensions,
|
|
|
|
'imageEditing' => true,
|
|
|
|
'imageSizes' => $available_image_sizes,
|
|
|
|
'maxUploadFileSize' => $max_upload_size,
|
|
|
|
// The following flag is required to enable the new Gallery block format on the mobile apps in 5.9.
|
|
|
|
'__unstableGalleryWithImageBlocks' => true,
|
2021-04-21 01:12:05 -04:00
|
|
|
);
|
|
|
|
|
2023-01-26 13:39:13 -05:00
|
|
|
$theme_settings = get_classic_theme_supports_block_editor_settings();
|
|
|
|
foreach ( $theme_settings as $key => $value ) {
|
|
|
|
$editor_settings[ $key ] = $value;
|
2021-04-21 01:12:05 -04:00
|
|
|
}
|
|
|
|
|
2021-06-15 04:52:30 -04:00
|
|
|
return $editor_settings;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the block editor settings needed to use the Legacy Widget block which
|
|
|
|
* is not registered by default.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
|
|
|
* @return array Settings to be used with get_block_editor_settings().
|
|
|
|
*/
|
|
|
|
function get_legacy_widget_block_editor_settings() {
|
|
|
|
$editor_settings = array();
|
|
|
|
|
2021-05-25 04:40:25 -04:00
|
|
|
/**
|
|
|
|
* Filters the list of widget-type IDs that should **not** be offered by the
|
|
|
|
* Legacy Widget block.
|
|
|
|
*
|
|
|
|
* Returning an empty array will make all widgets available.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
2021-07-01 17:02:57 -04:00
|
|
|
* @param string[] $widgets An array of excluded widget-type IDs.
|
2021-05-25 04:40:25 -04:00
|
|
|
*/
|
|
|
|
$editor_settings['widgetTypesToHideFromLegacyWidgetBlock'] = apply_filters(
|
|
|
|
'widget_types_to_hide_from_legacy_widget_block',
|
|
|
|
array(
|
|
|
|
'pages',
|
|
|
|
'calendar',
|
|
|
|
'archives',
|
|
|
|
'media_audio',
|
|
|
|
'media_image',
|
|
|
|
'media_gallery',
|
|
|
|
'media_video',
|
|
|
|
'search',
|
|
|
|
'text',
|
|
|
|
'categories',
|
|
|
|
'recent-posts',
|
|
|
|
'recent-comments',
|
|
|
|
'rss',
|
|
|
|
'tag_cloud',
|
|
|
|
'custom_html',
|
|
|
|
'block',
|
|
|
|
)
|
|
|
|
);
|
|
|
|
|
2021-04-21 01:12:05 -04:00
|
|
|
return $editor_settings;
|
|
|
|
}
|
|
|
|
|
2022-04-12 12:02:19 -04:00
|
|
|
/**
|
|
|
|
* Collect the block editor assets that need to be loaded into the editor's iframe.
|
|
|
|
*
|
|
|
|
* @since 6.0.0
|
|
|
|
* @access private
|
|
|
|
*
|
|
|
|
* @global string $pagenow The filename of the current screen.
|
|
|
|
*
|
2022-04-28 05:59:13 -04:00
|
|
|
* @return array {
|
|
|
|
* The block editor assets.
|
|
|
|
*
|
|
|
|
* @type string|false $styles String containing the HTML for styles.
|
|
|
|
* @type string|false $scripts String containing the HTML for scripts.
|
|
|
|
* }
|
2022-04-12 12:02:19 -04:00
|
|
|
*/
|
|
|
|
function _wp_get_iframed_editor_assets() {
|
Editor: Fix 'wp-block-library-theme' style enqueue conditions.
Fixes the conditions for when to enqueue the opinionated block styles (i.e. `'wp-block-library-theme'` stylesheet):
* the theme adds `'wp-block-styles'` theme support;
* and no editor styles are declared.
This resolves an issue with themes that do not add the `'wp-block-styles'` theme support while not impacting themes that do.
Follow-up to [53419], [52069], [50761], [44157].
Props mikachan, costdev, glendaviesnz, hellofromTonya, jffng, mamaduka, ndiego, poena, sannevndrmeulen, scruffian.
Fixes #57561.
Built from https://develop.svn.wordpress.org/trunk@55368
git-svn-id: http://core.svn.wordpress.org/trunk@54901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-20 16:13:27 -05:00
|
|
|
global $pagenow, $editor_styles;
|
2022-04-12 12:02:19 -04:00
|
|
|
|
2023-02-01 15:44:11 -05:00
|
|
|
$script_handles = array(
|
|
|
|
'wp-polyfill',
|
|
|
|
);
|
2022-04-12 12:02:19 -04:00
|
|
|
$style_handles = array(
|
|
|
|
'wp-edit-blocks',
|
|
|
|
);
|
|
|
|
|
Editor: Fix 'wp-block-library-theme' style enqueue conditions.
Fixes the conditions for when to enqueue the opinionated block styles (i.e. `'wp-block-library-theme'` stylesheet):
* the theme adds `'wp-block-styles'` theme support;
* and no editor styles are declared.
This resolves an issue with themes that do not add the `'wp-block-styles'` theme support while not impacting themes that do.
Follow-up to [53419], [52069], [50761], [44157].
Props mikachan, costdev, glendaviesnz, hellofromTonya, jffng, mamaduka, ndiego, poena, sannevndrmeulen, scruffian.
Fixes #57561.
Built from https://develop.svn.wordpress.org/trunk@55368
git-svn-id: http://core.svn.wordpress.org/trunk@54901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-20 16:13:27 -05:00
|
|
|
if (
|
|
|
|
current_theme_supports( 'wp-block-styles' ) &&
|
|
|
|
( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
|
|
|
|
) {
|
2022-05-20 07:42:19 -04:00
|
|
|
$style_handles[] = 'wp-block-library-theme';
|
|
|
|
}
|
|
|
|
|
2022-04-12 12:02:19 -04:00
|
|
|
if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) {
|
|
|
|
$style_handles[] = 'wp-widgets';
|
|
|
|
$style_handles[] = 'wp-edit-widgets';
|
|
|
|
}
|
|
|
|
|
|
|
|
$block_registry = WP_Block_Type_Registry::get_instance();
|
|
|
|
|
|
|
|
foreach ( $block_registry->get_all_registered() as $block_type ) {
|
2022-09-14 06:52:08 -04:00
|
|
|
$style_handles = array_merge(
|
|
|
|
$style_handles,
|
|
|
|
$block_type->style_handles,
|
|
|
|
$block_type->editor_style_handles
|
|
|
|
);
|
2022-04-12 12:02:19 -04:00
|
|
|
|
2022-09-14 06:52:08 -04:00
|
|
|
$script_handles = array_merge(
|
|
|
|
$script_handles,
|
|
|
|
$block_type->script_handles
|
|
|
|
);
|
2022-04-12 12:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
$style_handles = array_unique( $style_handles );
|
|
|
|
$done = wp_styles()->done;
|
|
|
|
|
|
|
|
ob_start();
|
|
|
|
|
|
|
|
// 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;
|
|
|
|
|
|
|
|
$styles = ob_get_clean();
|
|
|
|
|
|
|
|
$script_handles = array_unique( $script_handles );
|
|
|
|
$done = wp_scripts()->done;
|
|
|
|
|
|
|
|
ob_start();
|
|
|
|
|
|
|
|
wp_scripts()->done = array();
|
|
|
|
wp_scripts()->do_items( $script_handles );
|
|
|
|
wp_scripts()->done = $done;
|
|
|
|
|
|
|
|
$scripts = ob_get_clean();
|
|
|
|
|
|
|
|
return array(
|
|
|
|
'styles' => $styles,
|
|
|
|
'scripts' => $scripts,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2021-04-21 01:12:05 -04:00
|
|
|
/**
|
2021-08-15 08:45:59 -04:00
|
|
|
* Returns the contextualized block editor settings for a selected editor context.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
2021-05-24 17:21:57 -04:00
|
|
|
* @param array $custom_settings Custom settings to use with the given editor type.
|
|
|
|
* @param WP_Block_Editor_Context $block_editor_context The current block editor context.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
|
|
|
* @return array The contextualized block editor settings.
|
|
|
|
*/
|
2021-05-24 17:21:57 -04:00
|
|
|
function get_block_editor_settings( array $custom_settings, $block_editor_context ) {
|
2021-04-21 01:12:05 -04:00
|
|
|
$editor_settings = array_merge(
|
2021-05-24 06:23:56 -04:00
|
|
|
get_default_block_editor_settings(),
|
2021-04-21 01:12:05 -04:00
|
|
|
array(
|
2021-05-24 17:21:57 -04:00
|
|
|
'allowedBlockTypes' => get_allowed_block_types( $block_editor_context ),
|
|
|
|
'blockCategories' => get_block_categories( $block_editor_context ),
|
2021-04-21 01:12:05 -04:00
|
|
|
),
|
|
|
|
$custom_settings
|
|
|
|
);
|
|
|
|
|
2022-02-17 09:14:01 -05:00
|
|
|
$global_styles = array();
|
|
|
|
$presets = array(
|
2021-11-08 16:45:58 -05:00
|
|
|
array(
|
2022-01-09 20:56:02 -05:00
|
|
|
'css' => 'variables',
|
|
|
|
'__unstableType' => 'presets',
|
2022-04-18 13:12:07 -04:00
|
|
|
'isGlobalStyles' => true,
|
2021-11-08 16:45:58 -05:00
|
|
|
),
|
|
|
|
array(
|
|
|
|
'css' => 'presets',
|
|
|
|
'__unstableType' => 'presets',
|
2022-04-18 13:12:07 -04:00
|
|
|
'isGlobalStyles' => true,
|
2021-11-08 16:45:58 -05:00
|
|
|
),
|
|
|
|
);
|
|
|
|
foreach ( $presets as $preset_style ) {
|
|
|
|
$actual_css = wp_get_global_stylesheet( array( $preset_style['css'] ) );
|
|
|
|
if ( '' !== $actual_css ) {
|
2022-02-17 09:14:01 -05:00
|
|
|
$preset_style['css'] = $actual_css;
|
|
|
|
$global_styles[] = $preset_style;
|
2021-11-08 16:45:58 -05:00
|
|
|
}
|
|
|
|
}
|
2021-05-24 04:37:55 -04:00
|
|
|
|
Themes: Introduce wp_theme_has_theme_json() for public consumption.
Adds `wp_theme_has_theme_json()` for public consumption, to replace the private internal Core-only `WP_Theme_JSON_Resolver::theme_has_support()` method. This new global function checks if a theme or its parent has a `theme.json` file.
For performance, results are cached as an integer `1` or `0` in the `'theme_json'` group with `'wp_theme_has_theme_json'` key. This is a non-persistent cache. Why? To make the derived data from `theme.json` is always fresh from the potential modifications done via hooks that can use dynamic data (modify the stylesheet depending on some option, settings depending on user permissions, etc.).
Also adds a new public function `wp_clean_theme_json_cache()` to clear the cache on `'switch_theme'` and `start_previewing_theme'`.
References:
* [https://github.com/WordPress/gutenberg/pull/45168 Gutenberg PR 45168] Add `wp_theme_has_theme_json` as a public API to know whether a theme has a `theme.json`.
* [https://github.com/WordPress/gutenberg/pull/45380 Gutenberg PR 45380] Deprecate `WP_Theme_JSON_Resolver:theme_has_support()`.
* [https://github.com/WordPress/gutenberg/pull/46150 Gutenberg PR 46150] Make `theme.json` object caches non-persistent.
* [https://github.com/WordPress/gutenberg/pull/45979 Gutenberg PR 45979] Don't check if constants set by `wp_initial_constants()` are defined.
* [https://github.com/WordPress/gutenberg/pull/45950 Gutenberg PR 45950] Cleaner logic in `wp_theme_has_theme_json`.
Follow-up to [54493], [53282], [52744], [52049], [50959].
Props oandregal, afragen, alexstine, aristath, azaozz, costdev, flixos90, hellofromTonya, mamaduka, mcsf, ocean90, spacedmonkey.
Fixes #56975.
Built from https://develop.svn.wordpress.org/trunk@55086
git-svn-id: http://core.svn.wordpress.org/trunk@54619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-01-18 06:40:10 -05:00
|
|
|
if ( wp_theme_has_theme_json() ) {
|
2021-11-08 16:45:58 -05:00
|
|
|
$block_classes = array(
|
|
|
|
'css' => 'styles',
|
|
|
|
'__unstableType' => 'theme',
|
2022-04-18 13:12:07 -04:00
|
|
|
'isGlobalStyles' => true,
|
2021-05-24 13:39:57 -04:00
|
|
|
);
|
2021-11-08 16:45:58 -05:00
|
|
|
$actual_css = wp_get_global_stylesheet( array( $block_classes['css'] ) );
|
|
|
|
if ( '' !== $actual_css ) {
|
2022-02-17 09:14:01 -05:00
|
|
|
$block_classes['css'] = $actual_css;
|
|
|
|
$global_styles[] = $block_classes;
|
2021-11-08 16:45:58 -05:00
|
|
|
}
|
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 13:52:17 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Add the custom CSS as a separate stylesheet so any invalid CSS
|
|
|
|
* entered by users does not break other global styles.
|
|
|
|
*/
|
2023-03-01 06:43:20 -05:00
|
|
|
$global_styles[] = array(
|
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 13:52:17 -05:00
|
|
|
'css' => wp_get_global_styles_custom_css(),
|
|
|
|
'__unstableType' => 'user',
|
|
|
|
'isGlobalStyles' => true,
|
|
|
|
);
|
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 14:44:09 -04:00
|
|
|
} else {
|
|
|
|
// If there is no `theme.json` file, ensure base layout styles are still available.
|
|
|
|
$block_classes = array(
|
|
|
|
'css' => 'base-layout-styles',
|
|
|
|
'__unstableType' => 'base-layout',
|
|
|
|
'isGlobalStyles' => true,
|
|
|
|
);
|
|
|
|
$actual_css = wp_get_global_stylesheet( array( $block_classes['css'] ) );
|
|
|
|
if ( '' !== $actual_css ) {
|
|
|
|
$block_classes['css'] = $actual_css;
|
Coding Standards: Various alignment fixes from `composer format`.
Follow up to [53874], [54097], [54110], [54155], [54162], [54184].
See #39210, #55443, #56288, #56092, #56408, #56467, #55881.
Built from https://develop.svn.wordpress.org/trunk@54210
git-svn-id: http://core.svn.wordpress.org/trunk@53769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-19 15:51:09 -04:00
|
|
|
$global_styles[] = $block_classes;
|
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 14:44:09 -04:00
|
|
|
}
|
2021-05-24 13:39:57 -04:00
|
|
|
}
|
|
|
|
|
2022-02-17 09:14:01 -05:00
|
|
|
$editor_settings['styles'] = array_merge( $global_styles, get_block_editor_theme_styles() );
|
|
|
|
|
2021-11-08 16:45:58 -05:00
|
|
|
$editor_settings['__experimentalFeatures'] = wp_get_global_settings();
|
2021-05-24 04:37:55 -04:00
|
|
|
// These settings may need to be updated based on data coming from theme.json sources.
|
2021-06-22 20:26:58 -04:00
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['color']['palette'] ) ) {
|
|
|
|
$colors_by_origin = $editor_settings['__experimentalFeatures']['color']['palette'];
|
2021-11-29 19:24:27 -05:00
|
|
|
$editor_settings['colors'] = isset( $colors_by_origin['custom'] ) ?
|
|
|
|
$colors_by_origin['custom'] : (
|
2021-06-15 04:52:30 -04:00
|
|
|
isset( $colors_by_origin['theme'] ) ?
|
|
|
|
$colors_by_origin['theme'] :
|
2021-11-23 00:40:38 -05:00
|
|
|
$colors_by_origin['default']
|
2021-06-15 04:52:30 -04:00
|
|
|
);
|
2021-05-24 04:37:55 -04:00
|
|
|
}
|
2021-06-22 20:26:58 -04:00
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) {
|
|
|
|
$gradients_by_origin = $editor_settings['__experimentalFeatures']['color']['gradients'];
|
2021-11-29 19:24:27 -05:00
|
|
|
$editor_settings['gradients'] = isset( $gradients_by_origin['custom'] ) ?
|
|
|
|
$gradients_by_origin['custom'] : (
|
2021-06-15 04:52:30 -04:00
|
|
|
isset( $gradients_by_origin['theme'] ) ?
|
|
|
|
$gradients_by_origin['theme'] :
|
2021-11-23 00:40:38 -05:00
|
|
|
$gradients_by_origin['default']
|
2021-06-15 04:52:30 -04:00
|
|
|
);
|
|
|
|
}
|
2021-06-22 20:26:58 -04:00
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) {
|
|
|
|
$font_sizes_by_origin = $editor_settings['__experimentalFeatures']['typography']['fontSizes'];
|
2021-11-29 19:24:27 -05:00
|
|
|
$editor_settings['fontSizes'] = isset( $font_sizes_by_origin['custom'] ) ?
|
|
|
|
$font_sizes_by_origin['custom'] : (
|
2021-06-15 04:52:30 -04:00
|
|
|
isset( $font_sizes_by_origin['theme'] ) ?
|
|
|
|
$font_sizes_by_origin['theme'] :
|
2021-11-23 00:40:38 -05:00
|
|
|
$font_sizes_by_origin['default']
|
2021-06-15 04:52:30 -04:00
|
|
|
);
|
2021-05-24 04:37:55 -04:00
|
|
|
}
|
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['color']['custom'] ) ) {
|
2021-05-26 10:25:59 -04:00
|
|
|
$editor_settings['disableCustomColors'] = ! $editor_settings['__experimentalFeatures']['color']['custom'];
|
2021-05-24 04:37:55 -04:00
|
|
|
unset( $editor_settings['__experimentalFeatures']['color']['custom'] );
|
|
|
|
}
|
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['color']['customGradient'] ) ) {
|
2021-05-26 10:25:59 -04:00
|
|
|
$editor_settings['disableCustomGradients'] = ! $editor_settings['__experimentalFeatures']['color']['customGradient'];
|
2021-05-24 04:37:55 -04:00
|
|
|
unset( $editor_settings['__experimentalFeatures']['color']['customGradient'] );
|
|
|
|
}
|
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['typography']['customFontSize'] ) ) {
|
2021-05-26 10:25:59 -04:00
|
|
|
$editor_settings['disableCustomFontSizes'] = ! $editor_settings['__experimentalFeatures']['typography']['customFontSize'];
|
2021-05-24 04:37:55 -04:00
|
|
|
unset( $editor_settings['__experimentalFeatures']['typography']['customFontSize'] );
|
|
|
|
}
|
2021-11-08 14:19:58 -05:00
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['typography']['lineHeight'] ) ) {
|
|
|
|
$editor_settings['enableCustomLineHeight'] = $editor_settings['__experimentalFeatures']['typography']['lineHeight'];
|
|
|
|
unset( $editor_settings['__experimentalFeatures']['typography']['lineHeight'] );
|
2021-05-24 04:37:55 -04:00
|
|
|
}
|
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['spacing']['units'] ) ) {
|
2021-06-22 13:16:58 -04:00
|
|
|
$editor_settings['enableCustomUnits'] = $editor_settings['__experimentalFeatures']['spacing']['units'];
|
2021-05-24 04:37:55 -04:00
|
|
|
unset( $editor_settings['__experimentalFeatures']['spacing']['units'] );
|
|
|
|
}
|
2021-11-08 14:19:58 -05:00
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['spacing']['padding'] ) ) {
|
|
|
|
$editor_settings['enableCustomSpacing'] = $editor_settings['__experimentalFeatures']['spacing']['padding'];
|
|
|
|
unset( $editor_settings['__experimentalFeatures']['spacing']['padding'] );
|
2021-05-24 04:37:55 -04:00
|
|
|
}
|
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 14:44:09 -04:00
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['spacing']['customSpacingSize'] ) ) {
|
2022-09-21 07:43:13 -04:00
|
|
|
$editor_settings['disableCustomSpacingSizes'] = ! $editor_settings['__experimentalFeatures']['spacing']['customSpacingSize'];
|
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 14:44:09 -04:00
|
|
|
unset( $editor_settings['__experimentalFeatures']['spacing']['customSpacingSize'] );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( isset( $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'] ) ) {
|
Coding Standards: Various alignment fixes from `composer format`.
Follow up to [53874], [54097], [54110], [54155], [54162], [54184].
See #39210, #55443, #56288, #56092, #56408, #56467, #55881.
Built from https://develop.svn.wordpress.org/trunk@54210
git-svn-id: http://core.svn.wordpress.org/trunk@53769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-19 15:51:09 -04:00
|
|
|
$spacing_sizes_by_origin = $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'];
|
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 14:44:09 -04:00
|
|
|
$editor_settings['spacingSizes'] = isset( $spacing_sizes_by_origin['custom'] ) ?
|
|
|
|
$spacing_sizes_by_origin['custom'] : (
|
|
|
|
isset( $spacing_sizes_by_origin['theme'] ) ?
|
|
|
|
$spacing_sizes_by_origin['theme'] :
|
|
|
|
$spacing_sizes_by_origin['default']
|
|
|
|
);
|
|
|
|
}
|
2021-05-24 04:37:55 -04:00
|
|
|
|
2022-04-12 12:02:19 -04:00
|
|
|
$editor_settings['__unstableResolvedAssets'] = _wp_get_iframed_editor_assets();
|
2023-01-26 15:01:12 -05:00
|
|
|
$editor_settings['__unstableIsBlockBasedTheme'] = wp_is_block_theme();
|
2022-04-12 12:02:19 -04:00
|
|
|
$editor_settings['localAutosaveInterval'] = 15;
|
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 14:44:09 -04:00
|
|
|
$editor_settings['disableLayoutStyles'] = current_theme_supports( 'disable-layout-styles' );
|
2022-04-11 11:22:09 -04:00
|
|
|
$editor_settings['__experimentalDiscussionSettings'] = array(
|
2022-04-25 12:16:10 -04:00
|
|
|
'commentOrder' => get_option( 'comment_order' ),
|
|
|
|
'commentsPerPage' => get_option( 'comments_per_page' ),
|
|
|
|
'defaultCommentsPage' => get_option( 'default_comments_page' ),
|
|
|
|
'pageComments' => get_option( 'page_comments' ),
|
|
|
|
'threadComments' => get_option( 'thread_comments' ),
|
|
|
|
'threadCommentsDepth' => get_option( 'thread_comments_depth' ),
|
|
|
|
'defaultCommentStatus' => get_option( 'default_comment_status' ),
|
|
|
|
'avatarURL' => get_avatar_url(
|
2022-04-11 11:22:09 -04:00
|
|
|
'',
|
|
|
|
array(
|
|
|
|
'size' => 96,
|
|
|
|
'force_default' => true,
|
|
|
|
'default' => get_option( 'avatar_default' ),
|
|
|
|
)
|
|
|
|
),
|
|
|
|
);
|
|
|
|
|
2021-04-21 05:32:06 -04:00
|
|
|
/**
|
|
|
|
* Filters the settings to pass to the block editor for all editor type.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
2021-05-24 17:21:57 -04:00
|
|
|
* @param array $editor_settings Default editor settings.
|
|
|
|
* @param WP_Block_Editor_Context $block_editor_context The current block editor context.
|
2021-04-21 05:32:06 -04:00
|
|
|
*/
|
2021-05-24 17:21:57 -04:00
|
|
|
$editor_settings = apply_filters( 'block_editor_settings_all', $editor_settings, $block_editor_context );
|
2021-12-04 12:20:00 -05:00
|
|
|
|
2021-05-24 17:21:57 -04:00
|
|
|
if ( ! empty( $block_editor_context->post ) ) {
|
|
|
|
$post = $block_editor_context->post;
|
2021-04-21 01:12:05 -04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Filters the settings to pass to the block editor.
|
|
|
|
*
|
|
|
|
* @since 5.0.0
|
2021-06-25 10:40:57 -04:00
|
|
|
* @deprecated 5.8.0 Use the {@see 'block_editor_settings_all'} filter instead.
|
2021-04-21 01:12:05 -04:00
|
|
|
*
|
|
|
|
* @param array $editor_settings Default editor settings.
|
|
|
|
* @param WP_Post $post Post being edited.
|
|
|
|
*/
|
2021-04-21 05:32:06 -04:00
|
|
|
$editor_settings = apply_filters_deprecated( 'block_editor_settings', array( $editor_settings, $post ), '5.8.0', 'block_editor_settings_all' );
|
2021-04-21 01:12:05 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return $editor_settings;
|
|
|
|
}
|
2021-05-24 03:32:55 -04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Preloads common data used with the block editor by specifying an array of
|
|
|
|
* REST API paths that will be preloaded for a given block editor context.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
2022-02-15 12:30:02 -05:00
|
|
|
* @global WP_Post $post Global post object.
|
|
|
|
* @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
|
|
|
|
* @global WP_Styles $wp_styles The WP_Styles object for printing styles.
|
2021-05-24 03:32:55 -04:00
|
|
|
*
|
2022-11-09 04:51:14 -05:00
|
|
|
* @param (string|string[])[] $preload_paths List of paths to preload.
|
2021-05-24 03:32:55 -04:00
|
|
|
* @param WP_Block_Editor_Context $block_editor_context The current block editor context.
|
|
|
|
*/
|
|
|
|
function block_editor_rest_api_preload( array $preload_paths, $block_editor_context ) {
|
2022-02-15 12:30:02 -05:00
|
|
|
global $post, $wp_scripts, $wp_styles;
|
2021-05-24 03:32:55 -04:00
|
|
|
|
|
|
|
/**
|
2021-06-25 10:40:57 -04:00
|
|
|
* Filters the array of REST API paths that will be used to preloaded common data for the block editor.
|
2021-05-24 03:32:55 -04:00
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
2022-11-09 04:51:14 -05:00
|
|
|
* @param (string|string[])[] $preload_paths Array of paths to preload.
|
2021-11-09 08:00:00 -05:00
|
|
|
* @param WP_Block_Editor_Context $block_editor_context The current block editor context.
|
2021-05-24 03:32:55 -04:00
|
|
|
*/
|
|
|
|
$preload_paths = apply_filters( 'block_editor_rest_api_preload_paths', $preload_paths, $block_editor_context );
|
2021-12-04 12:20:00 -05:00
|
|
|
|
2021-05-24 03:32:55 -04:00
|
|
|
if ( ! empty( $block_editor_context->post ) ) {
|
|
|
|
$selected_post = $block_editor_context->post;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Filters the array of paths that will be preloaded.
|
|
|
|
*
|
2021-06-25 10:40:57 -04:00
|
|
|
* Preload common data by specifying an array of REST API paths that will be preloaded.
|
|
|
|
*
|
2021-05-24 03:32:55 -04:00
|
|
|
* @since 5.0.0
|
2021-06-25 10:40:57 -04:00
|
|
|
* @deprecated 5.8.0 Use the {@see 'block_editor_rest_api_preload_paths'} filter instead.
|
2021-05-24 03:32:55 -04:00
|
|
|
*
|
2022-11-09 04:51:14 -05:00
|
|
|
* @param (string|string[])[] $preload_paths Array of paths to preload.
|
|
|
|
* @param WP_Post $selected_post Post being edited.
|
2021-05-24 03:32:55 -04:00
|
|
|
*/
|
|
|
|
$preload_paths = apply_filters_deprecated( 'block_editor_preload_paths', array( $preload_paths, $selected_post ), '5.8.0', 'block_editor_rest_api_preload_paths' );
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( empty( $preload_paths ) ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2022-02-15 12:30:02 -05:00
|
|
|
* Ensure the global $post, $wp_scripts, and $wp_styles remain the same after
|
|
|
|
* API data is preloaded.
|
2021-05-24 03:32:55 -04:00
|
|
|
* Because API preloading can call the_content and other filters, plugins
|
2022-02-15 12:30:02 -05:00
|
|
|
* can unexpectedly modify the global $post or enqueue assets which are not
|
|
|
|
* intended for the block editor.
|
2021-05-24 03:32:55 -04:00
|
|
|
*/
|
|
|
|
$backup_global_post = ! empty( $post ) ? clone $post : $post;
|
2022-02-15 12:30:02 -05:00
|
|
|
$backup_wp_scripts = ! empty( $wp_scripts ) ? clone $wp_scripts : $wp_scripts;
|
|
|
|
$backup_wp_styles = ! empty( $wp_styles ) ? clone $wp_styles : $wp_styles;
|
2021-05-24 03:32:55 -04:00
|
|
|
|
2021-12-03 10:30:08 -05:00
|
|
|
foreach ( $preload_paths as &$path ) {
|
|
|
|
if ( is_string( $path ) && ! str_starts_with( $path, '/' ) ) {
|
|
|
|
$path = '/' . $path;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( is_array( $path ) && is_string( $path[0] ) && ! str_starts_with( $path[0], '/' ) ) {
|
2022-02-15 12:30:02 -05:00
|
|
|
$path[0] = '/' . $path[0];
|
2021-12-03 10:30:08 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-04 12:20:00 -05:00
|
|
|
unset( $path );
|
|
|
|
|
2021-05-24 03:32:55 -04:00
|
|
|
$preload_data = array_reduce(
|
|
|
|
$preload_paths,
|
|
|
|
'rest_preload_api_request',
|
|
|
|
array()
|
|
|
|
);
|
|
|
|
|
2022-02-15 12:30:02 -05:00
|
|
|
// Restore the global $post, $wp_scripts, and $wp_styles as they were before API preloading.
|
|
|
|
$post = $backup_global_post;
|
|
|
|
$wp_scripts = $backup_wp_scripts;
|
|
|
|
$wp_styles = $backup_wp_styles;
|
2021-05-24 03:32:55 -04:00
|
|
|
|
|
|
|
wp_add_inline_script(
|
|
|
|
'wp-api-fetch',
|
|
|
|
sprintf(
|
|
|
|
'wp.apiFetch.use( wp.apiFetch.createPreloadingMiddleware( %s ) );',
|
|
|
|
wp_json_encode( $preload_data )
|
|
|
|
),
|
|
|
|
'after'
|
|
|
|
);
|
|
|
|
}
|
2021-06-22 09:33:58 -04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Creates an array of theme styles to load into the block editor.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
*
|
|
|
|
* @global array $editor_styles
|
|
|
|
*
|
2021-11-08 09:29:21 -05:00
|
|
|
* @return array An array of theme styles for the block editor.
|
2021-06-22 09:33:58 -04:00
|
|
|
*/
|
|
|
|
function get_block_editor_theme_styles() {
|
|
|
|
global $editor_styles;
|
|
|
|
|
2021-11-08 09:29:21 -05:00
|
|
|
$styles = array();
|
2021-06-25 11:32:58 -04:00
|
|
|
|
2021-06-22 09:33:58 -04:00
|
|
|
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',
|
2022-04-18 13:12:07 -04:00
|
|
|
'isGlobalStyles' => false,
|
2021-06-22 09:33:58 -04:00
|
|
|
);
|
|
|
|
}
|
|
|
|
} 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',
|
2022-04-18 13:12:07 -04:00
|
|
|
'isGlobalStyles' => false,
|
2021-06-22 09:33:58 -04:00
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return $styles;
|
|
|
|
}
|
2023-01-26 13:39:13 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the classic theme supports settings for block editor.
|
|
|
|
*
|
|
|
|
* @since 6.2.0
|
|
|
|
*
|
|
|
|
* @return array The classic theme supports settings.
|
|
|
|
*/
|
|
|
|
function get_classic_theme_supports_block_editor_settings() {
|
|
|
|
$theme_settings = array(
|
|
|
|
'disableCustomColors' => get_theme_support( 'disable-custom-colors' ),
|
|
|
|
'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ),
|
|
|
|
'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ),
|
|
|
|
'disableLayoutStyles' => get_theme_support( 'disable-layout-styles' ),
|
|
|
|
'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ),
|
|
|
|
'enableCustomSpacing' => get_theme_support( 'custom-spacing' ),
|
|
|
|
'enableCustomUnits' => get_theme_support( 'custom-units' ),
|
|
|
|
);
|
|
|
|
|
|
|
|
// Theme settings.
|
|
|
|
$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
|
|
|
|
if ( false !== $color_palette ) {
|
|
|
|
$theme_settings['colors'] = $color_palette;
|
|
|
|
}
|
|
|
|
|
|
|
|
$font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
|
|
|
|
if ( false !== $font_sizes ) {
|
|
|
|
$theme_settings['fontSizes'] = $font_sizes;
|
|
|
|
}
|
|
|
|
|
|
|
|
$gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
|
|
|
|
if ( false !== $gradient_presets ) {
|
|
|
|
$theme_settings['gradients'] = $gradient_presets;
|
|
|
|
}
|
|
|
|
|
|
|
|
return $theme_settings;
|
|
|
|
}
|