Skip to content

Theme JSON: Avoid rebuilding identical block schemas during sanitization #13337

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

Open
mreishus wants to merge 2 commits into
base: trunk
Choose a base branch
from
+114 −12
Open

Theme JSON: Avoid rebuilding identical block schemas during sanitization #13337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733837f
Theme JSON: Avoid rebuilding identical block schemas during sanitization
mreishus Aug 31, 2026
bb8f45d
Pull out $common_block_settings from loop
mreishus Sep 3, 2026
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
38 changes: 26 additions & 12 deletions src/wp-includes/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,6 +1330,14 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n

$schema_styles_blocks = array();
$schema_settings_blocks = array();
$breakpoint_states = array_keys( $responsive_media_queries );

$common_block_settings = static::VALID_SETTINGS;
// `viewport` and `blockVisibility` are global-only settings and cannot be set per block for now.
unset(
$common_block_settings['viewport'],
$common_block_settings['blockVisibility']
);

/*
* Generate a schema for blocks.
Expand All @@ -1340,21 +1348,27 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n
*
* As each variation needs both a `blocks` schema and responsive `blocks` schemas
* for further nested inner `blocks`, the overall schema is generated in multiple passes.
*
* All blocks start with the same style schema. Build that common schema
* once, then add block-specific pseudo and custom states below.
*/
$responsive_block_schema = $styles_non_top_level;
$responsive_block_schema['elements'] = $schema_styles_elements;

$common_block_schema = $styles_non_top_level;
$common_block_schema['elements'] = $schema_styles_elements;

foreach ( $breakpoint_states as $breakpoint_state ) {
$common_block_schema[ $breakpoint_state ] = $responsive_block_schema;
}

foreach ( $valid_block_names as $block ) {
$schema_settings_blocks[ $block ] = static::VALID_SETTINGS;
// `viewport` and `blockVisibility` are global-only settings and cannot be set per block for now.
unset( $schema_settings_blocks[ $block ]['viewport'] );
unset( $schema_settings_blocks[ $block ]['blockVisibility'] );
$schema_styles_blocks[ $block ] = $styles_non_top_level;
$schema_styles_blocks[ $block ]['elements'] = $schema_styles_elements;

// Add responsive breakpoint states for all blocks.
foreach ( array_keys( $responsive_media_queries ) as $breakpoint_state ) {
$schema_styles_blocks[ $block ][ $breakpoint_state ] = $styles_non_top_level;
$schema_styles_blocks[ $block ][ $breakpoint_state ]['elements'] = $schema_styles_elements;
$schema_settings_blocks[ $block ] = $common_block_settings;
$schema_styles_blocks[ $block ] = $common_block_schema;

if ( isset( static::VALID_BLOCK_PSEUDO_SELECTORS[ $block ] ) ) {
// Add responsive pseudo-selectors only to blocks that support them.
if ( isset( static::VALID_BLOCK_PSEUDO_SELECTORS[ $block ] ) ) {
foreach ( $breakpoint_states as $breakpoint_state ) {
foreach ( static::VALID_BLOCK_PSEUDO_SELECTORS[ $block ] as $pseudo_selector ) {
$schema_styles_blocks[ $block ][ $breakpoint_state ][ $pseudo_selector ] = $styles_non_top_level;
}
Expand Down
88 changes: 88 additions & 0 deletions tests/phpunit/tests/theme/wpThemeJson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8242,6 +8242,94 @@ public function test_blocks_without_pseudo_support_ignore_pseudo_selectors() {
$this->assertStringNotContainsString( 'p:hover{', $theme_json->get_stylesheet( array( 'styles' ) ) );
}

/**
* Tests that responsive pseudo-states are kept only for supported blocks.
*
* @covers WP_Theme_JSON::sanitize
*
* @ticket 66003
*/
public function test_sanitize_keeps_responsive_pseudo_states_on_supported_blocks_only() {
$theme_json = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'styles' => array(
'blocks' => array(
'core/button' => array(
'@mobile' => array(
':hover' => array(
'color' => array(
'text' => 'blue',
),
),
),
),
'core/paragraph' => array(
'color' => array(
'text' => 'black',
),
'@mobile' => array(
'color' => array(
'text' => 'green',
),
':hover' => array(
'color' => array(
'text' => 'red',
),
),
),
),
'core/navigation-link' => array(
'-current' => array(
'color' => array(
'text' => 'purple',
),
),
),
),
),
)
);

$actual = $theme_json->get_raw_data();

$expected = array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'styles' => array(
'blocks' => array(
'core/button' => array(
'@mobile' => array(
':hover' => array(
'color' => array(
'text' => 'blue',
),
),
),
),
'core/paragraph' => array(
'color' => array(
'text' => 'black',
),
'@mobile' => array(
'color' => array(
'text' => 'green',
),
),
),
'core/navigation-link' => array(
'-current' => array(
'color' => array(
'text' => 'purple',
),
),
),
),
),
);

$this->assertEqualSetsWithIndex( $expected, $actual );
}

/**
* Test that block pseudo selectors work with elements within blocks.
*/
Expand Down
Loading