Skip to content

Theme JSON: Fix handling of default presets at block level #10460

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
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Theme JSON: Fix handling of default presets at block level #10460

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
dfb65fb
Theme JSON: Fix handling of default presets at block level
aaronrobertshaw Nov 4, 2025
3b3d7de
Add test doc blocks
aaronrobertshaw Nov 4, 2025
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
6 changes: 5 additions & 1 deletion 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 @@ -3250,7 +3250,11 @@ public function merge( $incoming ) {
foreach ( static::PRESETS_METADATA as $preset_metadata ) {
$prevent_override = $preset_metadata['prevent_override'];
if ( is_array( $prevent_override ) ) {
$prevent_override = _wp_array_get( $this->theme_json['settings'], $preset_metadata['prevent_override'] );
$global_path = array_merge( array( 'settings' ), $prevent_override );
$global_value = _wp_array_get( $this->theme_json, $global_path, null );

$node_level_path = array_merge( $node['path'], $prevent_override );
$prevent_override = _wp_array_get( $this->theme_json, $node_level_path, $global_value );
}

foreach ( static::VALID_ORIGINS as $origin ) {
Expand Down
212 changes: 212 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 @@ -6411,4 +6411,216 @@ public function test_opt_in_to_block_style_variations() {

$this->assertSame( $expected, $button_variations );
}

/**
* Tests that block-level settings inherit global default settings when not explicitly set.
*
* When a block doesn't have its own default presets setting, it should inherit
* the global setting from the theme. This affects whether default presets
* are filtered out during merging.
*
* @ticket 64195
*/
public function test_merge_incoming_data_block_level_inherits_global_default_setting() {
$defaults = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
'color' => array(
'defaultDuotone' => true,
'duotone' => array(
array(
'slug' => 'dark-grayscale',
'colors' => array( '#000000', '#7f7f7f' ),
'name' => 'Default Dark grayscale',
),
),
),
),
),
'default'
);
$theme = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
'color' => array(
'defaultDuotone' => false,
),
'blocks' => array(
'core/image' => array(
'color' => array(
// No defaultDuotone setting - should inherit global (false) set by theme.
'duotone' => array(
array(
'slug' => 'dark-grayscale',
'colors' => array( '#000000', '#7f7f7f' ),
'name' => 'Theme Dark grayscale',
),
),
),
),
'core/cover' => array(
'color' => array(
'defaultDuotone' => true, // Explicitly enabled at block level
'duotone' => array(
array(
'slug' => 'dark-grayscale',
'colors' => array( '#000000', '#7f7f7f' ),
'name' => 'Cover Dark grayscale',
),
),
),
),
),
),
)
);

$expected = array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
'color' => array(
'defaultDuotone' => false,
'duotone' => array(
'default' => array(
array(
'slug' => 'dark-grayscale',
'colors' => array( '#000000', '#7f7f7f' ),
'name' => 'Default Dark grayscale',
),
),
),
),
'blocks' => array(
'core/image' => array(
'color' => array(
'duotone' => array(
'theme' => array(
array(
'slug' => 'dark-grayscale',
'colors' => array( '#000000', '#7f7f7f' ),
'name' => 'Theme Dark grayscale',
),
),
),
),
),
'core/cover' => array(
'color' => array(
'defaultDuotone' => true,
'duotone' => array(
'theme' => array(
// Should be filtered out because block-level defaults are enabled
// and slug matches default
),
),
),
),
),
),
);

$defaults->merge( $theme );
$actual = $defaults->get_raw_data();

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

/**
* Tests that presets with unique slugs are preserved during merging.
*
* When merging theme presets, any preset with a slug that doesn't match
* a default preset should always be preserved, regardless of default
* preset settings. Only presets with matching slugs should be filtered out
* when defaults are enabled.
*
* @ticket 64195
*/
public function test_merge_incoming_data_unique_slugs_always_preserved() {
$defaults = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
'color' => array(
'defaultDuotone' => true, // Defaults enabled
'duotone' => array(
array(
'slug' => 'dark-grayscale',
'colors' => array( '#000000', '#7f7f7f' ),
'name' => 'Default Dark grayscale',
),
),
),
),
),
'default'
);
$theme = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
'blocks' => array(
'core/image' => array(
'color' => array(
'defaultDuotone' => true, // Block-level defaults enabled
'duotone' => array(
array(
'slug' => 'custom-unique',
'colors' => array( '#ff0000', '#00ff00' ),
'name' => 'Custom Unique',
),
array(
'slug' => 'dark-grayscale', // Matches default slug
'colors' => array( '#111111', '#888888' ),
'name' => 'Theme Dark grayscale',
),
),
),
),
),
),
)
);

$expected = array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
'color' => array(
'defaultDuotone' => true,
'duotone' => array(
'default' => array(
array(
'slug' => 'dark-grayscale',
'colors' => array( '#000000', '#7f7f7f' ),
'name' => 'Default Dark grayscale',
),
),
),
),
'blocks' => array(
'core/image' => array(
'color' => array(
'defaultDuotone' => true,
'duotone' => array(
'theme' => array(
array(
'slug' => 'custom-unique', // Should always be preserved
'colors' => array( '#ff0000', '#00ff00' ),
'name' => 'Custom Unique',
),
// 'dark-grayscale' should be filtered out due to slug match
),
),
),
),
),
),
);

$defaults->merge( $theme );
$actual = $defaults->get_raw_data();

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