Skip to content

Block.json: Refactor and stabilize selectors API #4655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ramonjd wants to merge 7 commits into from
Closed

Block.json: Refactor and stabilize selectors API #4655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0eb6aa
Changes from https://github.com/WordPress/gutenberg/pull/49427
ramonjd Jun 21, 2023
5132c5b
Changes from https://github.com/WordPress/gutenberg/pull/46496
ramonjd Jun 21, 2023
e2c1297
Updating classnames for wpGetBlockCssSelector.php tests
ramonjd Jun 21, 2023
90e3438
Remove theme setup script (we don't need theme-based functionality fo…
ramonjd Jun 21, 2023
8e6848f
Backport changes from https://github.com/WordPress/gutenberg/pull/49393
ramonjd Jun 21, 2023
045d224
Updating according to feedback in https://github.com/WordPress/wordpr…
ramonjd Jun 22, 2023
bc98e55
Fix multiline comment.
tellthemachines Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/wp-includes/block-supports/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ function _wp_add_block_level_presets_class( $block_content, $block ) {
* @internal
*
* @since 6.2.0
* @since 6.3.0 Updated preset styles to use Selectors API.
* @access private
*
* @param string|null $pre_render The pre-rendered content. Default null.
Expand Down Expand Up @@ -95,11 +96,16 @@ function _wp_add_block_level_preset_styles( $pre_render, $block ) {
$registry = WP_Block_Type_Registry::get_instance();
$blocks = $registry->get_all_registered();
foreach ( $blocks as $block_type ) {
if (
isset( $block_type->supports['__experimentalSelector'] ) &&
is_string( $block_type->supports['__experimentalSelector'] )
) {
$variables_root_selector .= ',' . $block_type->supports['__experimentalSelector'];
/*
* We only want to append selectors for block's using custom selectors
* i.e. not `wp-block-<name>`.
*/
$has_custom_selector =
( isset( $block_type->supports['__experimentalSelector'] ) && is_string( $block_type->supports['__experimentalSelector'] ) ) ||
( isset( $block_type->selectors['root'] ) && is_string( $block_type->selectors['root'] ) );

if ( $has_custom_selector ) {
$variables_root_selector .= ',' . wp_get_block_css_selector( $block_type );
}
}
$variables_root_selector = WP_Theme_JSON::scope_selector( $class_name, $variables_root_selector );
Expand Down
Loading