Skip to content

Add checks for dynamic selectors #26991

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

Merged
oandregal merged 2 commits into from
Nov 16, 2020
Merged

Add checks for dynamic selectors #26991

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
5f51336
Add checks for dymanic selectors
oandregal Nov 16, 2020
5aa4433
Make linter happy
oandregal Nov 16, 2020
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
20 changes: 13 additions & 7 deletions lib/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,16 +452,22 @@ public static function get_blocks_metadata() {
isset( $block_type->supports['__experimentalSelector'] ) &&
is_array( $block_type->supports['__experimentalSelector'] )
) {
foreach ( $block_type->supports['__experimentalSelector'] as $key => $selector_data ) {
foreach ( $block_type->supports['__experimentalSelector'] as $key => $selector_metadata ) {
if (
! isset( $selector_metadata['selector'] ) ||
! isset( $selector_metadata['attributes'] ) ||
! isset( $selector_metadata['title'] )
) {
continue;
}

self::$blocks_metadata[ $key ] = array(
'selector' => $selector_data['selector'],
'selector' => $selector_metadata['selector'],
'title' => $selector_metadata['title'],
'supports' => $block_supports,
'blockName' => $block_name,
'attributes' => $selector_data['attributes'],
'attributes' => $selector_metadata['attributes'],
);
if ( isset( $selector_data['title'] ) ) {
self::$blocks_metadata[ $key ]['title'] = $selector_data['title'];
}
}
} else {
self::$blocks_metadata[ $block_name ] = array(
Expand Down Expand Up @@ -654,7 +660,7 @@ private static function compute_style_properties( &$declarations, $context ) {
$value = self::get_property_value( $context['styles'], $metadata['theme_json'] );
if ( ! empty( $value ) ) {
$kebabcased_name = strtolower( preg_replace( '/(?<!^)[A-Z]/', '-$0', $name ) );
$declarations[] = array(
$declarations[] = array(
'name' => $kebabcased_name,
'value' => $value,
);
Expand Down
2 changes: 1 addition & 1 deletion lib/global-styles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ function gutenberg_experimental_global_styles_settings( $settings ) {
$base = gutenberg_experimental_global_styles_get_core();
$base->merge( gutenberg_experimental_global_styles_get_theme() );

$all = gutenberg_experimental_global_styles_get_core();
$all = gutenberg_experimental_global_styles_get_core();
$all->merge( gutenberg_experimental_global_styles_get_theme() );
$all->merge( gutenberg_experimental_global_styles_get_user() );

Expand Down