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

Add __experimentalFeatures data for the block editor #1262

Closed
wants to merge 17 commits into from
Closed

Add __experimentalFeatures data for the block editor #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1a84edb
Add __experimentalFeatures from theme.json
oandregal May 18, 2021
0113f88
Fix linting issue
oandregal May 21, 2021
8989a4e
Allow filtering settings and remove non stable ones
oandregal May 21, 2021
b6035e0
Follow naming schema
oandregal May 21, 2021
4691d19
Refactor theme_json_allowed_settings to theme_json_allowed_schema
oandregal May 21, 2021
7df635f
Only translate the stable settings for now
oandregal May 21, 2021
d1d805d
Only provide core defaults for the stable settings
oandregal May 21, 2021
f3f1157
Remove fallback for experimental-theme.json
oandregal May 21, 2021
7d8799f
Calculate the allowed block names only once
oandregal May 21, 2021
c671349
Calculate the allowed schema only once
oandregal May 21, 2021
fce4f70
Allow core data to be filtered
oandregal May 21, 2021
f02a359
Fix tests
oandregal May 21, 2021
f503e87
Fix linting issues
oandregal May 21, 2021
b71eaa3
Fix linting issues
oandregal May 21, 2021
d4a16a3
Unset features that are already part of the store
oandregal May 24, 2021
eb50ac5
Remove filters to hook into theme_json_* processing
oandregal May 24, 2021
665801c
Mark the classes as private
oandregal May 24, 2021
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
44 changes: 44 additions & 0 deletions src/wp-includes/block-editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,50 @@ function get_block_editor_settings( $editor_name, $custom_settings = array() ) {
$custom_settings
);

$editor_settings['__experimentalFeatures'] = WP_Theme_JSON_Resolver::get_merged_data( $editor_settings )->get_settings();
oandregal marked this conversation as resolved.
Show resolved Hide resolved

// These settings may need to be updated based on data coming from theme.json sources.
if ( isset( $editor_settings['__experimentalFeatures']['color']['palette'] ) ) {
oandregal marked this conversation as resolved.
Show resolved Hide resolved
$editor_settings['colors'] = $editor_settings['__experimentalFeatures']['color']['palette'];
unset( $editor_settings['__experimentalFeatures']['color']['palette'] );
}
if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) {
$editor_settings['gradients'] = $editor_settings['__experimentalFeatures']['color']['gradients'];
oandregal marked this conversation as resolved.
Show resolved Hide resolved
unset( $editor_settings['__experimentalFeatures']['color']['gradients'] );
}
if ( isset( $editor_settings['__experimentalFeatures']['color']['custom'] ) ) {
$editor_settings['disableCustomColors'] = $editor_settings['__experimentalFeatures']['color']['custom'];
unset( $editor_settings['__experimentalFeatures']['color']['custom'] );
}
if ( isset( $editor_settings['__experimentalFeatures']['color']['customGradient'] ) ) {
$editor_settings['disableCustomGradients'] = $editor_settings['__experimentalFeatures']['color']['customGradient'];
unset( $editor_settings['__experimentalFeatures']['color']['customGradient'] );
}
if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) {
$editor_settings['fontSizes'] = $editor_settings['__experimentalFeatures']['typography']['fontSizes'];
unset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] );
}
if ( isset( $editor_settings['__experimentalFeatures']['typography']['customFontSize'] ) ) {
$editor_settings['disableCustomFontSizes'] = $editor_settings['__experimentalFeatures']['typography']['customFontSize'];
unset( $editor_settings['__experimentalFeatures']['typography']['customFontSize'] );
}
if ( isset( $editor_settings['__experimentalFeatures']['typography']['customLineHeight'] ) ) {
$editor_settings['enableCustomLineHeight'] = $editor_settings['__experimentalFeatures']['typography']['customLineHeight'];
unset( $editor_settings['__experimentalFeatures']['typography']['customLineHeight'] );
}
if ( isset( $editor_settings['__experimentalFeatures']['spacing']['units'] ) ) {
if ( ! is_array( $editor_settings['__experimentalFeatures']['spacing']['units'] ) ) {
$editor_settings['enableCustomUnits'] = false;
} else {
$editor_settings['enableCustomUnits'] = count( $editor_settings['__experimentalFeatures']['spacing']['units'] ) > 0;
}
unset( $editor_settings['__experimentalFeatures']['spacing']['units'] );
}
if ( isset( $editor_settings['__experimentalFeatures']['spacing']['customPadding'] ) ) {
$editor_settings['enableCustomSpacing'] = $editor_settings['__experimentalFeatures']['spacing']['customPadding'];
unset( $editor_settings['__experimentalFeatures']['spacing']['customPadding'] );
}

/**
* Filters the settings to pass to the block editor for all editor type.
*
Expand Down
Loading