Skip to content
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

Remove get_default_block_editor_settings from theme JSON resolver #3902

Closed
wants to merge 6 commits into from
Closed

Remove get_default_block_editor_settings from theme JSON resolver #3902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e471b9
Remove get_default_block_editor_settings from theme JSON resolver
Mamaduka Jan 24, 2023
ed9a1b4
Rename function and avoid using array_merge
Mamaduka Jan 25, 2023
57453de
Add simple unit tests
Mamaduka Jan 25, 2023
e9a9640
Remove theme support before assertions
Mamaduka Jan 26, 2023
df8b4cc
Feedback
Mamaduka Jan 26, 2023
b056613
Merge branch 'trunk' into backport/legacy-theme-supports-settings
felixarntz Jan 26, 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
61 changes: 40 additions & 21 deletions src/wp-includes/block-editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,6 @@ function get_default_block_editor_settings() {
'allowedMimeTypes' => get_allowed_mime_types(),
'defaultEditorStyles' => $default_editor_styles,
'blockCategories' => get_default_block_categories(),
'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' ),
'isRTL' => is_rtl(),
'imageDefaultSize' => $image_default_size,
'imageDimensions' => $image_dimensions,
Expand All @@ -233,20 +226,9 @@ function get_default_block_editor_settings() {
'__unstableGalleryWithImageBlocks' => true,
);

// Theme settings.
$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
if ( false !== $color_palette ) {
$editor_settings['colors'] = $color_palette;
}

$font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
if ( false !== $font_sizes ) {
$editor_settings['fontSizes'] = $font_sizes;
}

$gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
if ( false !== $gradient_presets ) {
$editor_settings['gradients'] = $gradient_presets;
$theme_settings = get_classic_theme_supports_block_editor_settings();
foreach ( $theme_settings as $key => $value ) {
$editor_settings[ $key ] = $value;
}

return $editor_settings;
Expand Down Expand Up @@ -694,3 +676,40 @@ function get_block_editor_theme_styles() {

return $styles;
}

/**
* 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;
}
2 changes: 1 addition & 1 deletion src/wp-includes/class-wp-theme-json-resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public static function get_theme_data( $deprecated = array(), $options = array()
* So we take theme supports, transform it to theme.json shape
* and merge the static::$theme upon that.
*/
$theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
$theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
if ( ! wp_theme_has_theme_json() ) {
if ( ! isset( $theme_support_data['settings']['color'] ) ) {
$theme_support_data['settings']['color'] = array();
Expand Down
38 changes: 38 additions & 0 deletions tests/phpunit/tests/blocks/editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,44 @@ public function test_block_editor_rest_api_preload_adds_missing_leading_slash( a
$this->assertStringContainsString( $expected, $haystack );
}

/**
* @ticket 57547
*
* @covers ::get_classic_theme_supports_block_editor_settings
*/
public function test_get_classic_theme_supports_block_editor_settings() {
$font_sizes = array(
array(
'name' => 'Small',
'size' => 12,
'slug' => 'small',
),
array(
'name' => 'Regular',
'size' => 16,
'slug' => 'regular',
),
);

add_theme_support( 'editor-font-sizes', $font_sizes );
$settings = get_classic_theme_supports_block_editor_settings();
remove_theme_support( 'editor-font-sizes' );

$this->assertFalse( $settings['disableCustomColors'], 'Value for array key "disableCustomColors" does not match expectations' );
$this->assertFalse( $settings['disableCustomFontSizes'], 'Value for array key "disableCustomFontSizes" does not match expectations' );
$this->assertFalse( $settings['disableCustomGradients'], 'Value for array key "disableCustomGradients" does not match expectations' );
$this->assertFalse( $settings['disableLayoutStyles'], 'Value for array key "disableLayoutStyles" does not match expectations' );
$this->assertFalse( $settings['enableCustomLineHeight'], 'Value for array key "enableCustomLineHeight" does not match expectations' );
$this->assertFalse( $settings['enableCustomSpacing'], 'Value for array key "enableCustomSpacing" does not match expectations' );
$this->assertFalse( $settings['enableCustomUnits'], 'Value for array key "enableCustomUnits" does not match expectations' );

$this->assertSame(
$font_sizes,
$settings['fontSizes'],
'Value for array key "fontSizes" does not match expectations'
);
}

/**
* Data provider.
*
Expand Down
6 changes: 3 additions & 3 deletions tests/phpunit/tests/theme/wpThemeJson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2645,7 +2645,7 @@ public function test_get_editor_settings_blank() {
*/
public function test_get_editor_settings_custom_units_can_be_disabled() {
add_theme_support( 'custom-units', array() );
$actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
$actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
remove_theme_support( 'custom-units' );

$expected = array(
Expand All @@ -2662,7 +2662,7 @@ public function test_get_editor_settings_custom_units_can_be_disabled() {
*/
public function test_get_editor_settings_custom_units_can_be_enabled() {
add_theme_support( 'custom-units' );
$actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
$actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
remove_theme_support( 'custom-units' );

$expected = array(
Expand All @@ -2679,7 +2679,7 @@ public function test_get_editor_settings_custom_units_can_be_enabled() {
*/
public function test_get_editor_settings_custom_units_can_be_filtered() {
add_theme_support( 'custom-units', 'rem', 'em' );
$actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
$actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
remove_theme_support( 'custom-units' );

$expected = array(
Expand Down