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

Jump to bottom

Block Supports: Add link hover color to individual blocks #4643

Closed
wants to merge 3 commits into from
Closed

Block Supports: Add link hover color to individual blocks #4643

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8227ff6
Block Supports: Add link hover color to individual blocks
youknowriad Jun 19, 2023
e5e1aa9
Fix unit tests
youknowriad Jun 20, 2023
a9cc95a
Fix typo
youknowriad Jun 21, 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
19 changes: 17 additions & 2 deletions src/wp-includes/block-supports/elements.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,18 @@ function wp_render_elements_support( $block_content, $block ) {
$link_color = _wp_array_get( $block['attrs'], array( 'style', 'elements', 'link', 'color', 'text' ), null );
}

$hover_link_color = null;
if ( ! empty( $block['attrs'] ) ) {
$hover_link_color = _wp_array_get( $block['attrs'], array( 'style', 'elements', 'link', ':hover', 'color', 'text' ), null );
}

/*
* For now we only care about link color.
* For now we only care about link colors.
* This code in the future when we have a public API
* should take advantage of WP_Theme_JSON::compute_style_properties
* and work for any element and style.
*/
if ( null === $link_color ) {
if ( null === $link_color && null === $hover_link_color ) {
return $block_content;
}

Expand Down Expand Up @@ -104,6 +109,16 @@ function wp_render_elements_support_styles( $pre_render, $block ) {
)
);

if ( isset( $link_block_styles[':hover'] ) ) {
gutenberg_style_engine_get_styles(
youknowriad marked this conversation as resolved.
Show resolved Hide resolved
$link_block_styles[':hover'],
array(
'selector' => ".$class_name a:hover",
'context' => 'block-supports',
)
);
}

return null;
}

Expand Down
6 changes: 6 additions & 0 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 @@ -356,6 +356,9 @@ class WP_Theme_JSON {
'duotone' => null,
'gradients' => null,
'link' => null,
'heading' => null,
'button' => null,
'caption' => null,
'palette' => null,
'text' => null,
),
Expand Down Expand Up @@ -555,6 +558,9 @@ public static function get_element_class_name( $element ) {
array( 'border', 'style' ),
array( 'border', 'width' ),
array( 'color', 'link' ),
array( 'color', 'heading' ),
array( 'color', 'button' ),
array( 'color', 'caption' ),
array( 'dimensions', 'minHeight' ),
array( 'position', 'sticky' ),
array( 'spacing', 'blockGap' ),
Expand Down
3 changes: 3 additions & 0 deletions src/wp-includes/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
},
"color": {
"background": true,
"button": true,
"caption": true,
"custom": true,
"customDuotone": true,
"customGradient": true,
Expand Down Expand Up @@ -121,6 +123,7 @@
"slug": "midnight"
}
],
"heading": true,
"link": false,
"palette": [
{
Expand Down
10 changes: 8 additions & 2 deletions tests/phpunit/tests/theme/wpThemeJson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,10 @@ public function test_get_settings_appearance_true_opts_in() {
'color' => true,
),
'color' => array(
'link' => true,
'link' => true,
'heading' => true,
'button' => true,
'caption' => true,
),
'dimensions' => array(
'minHeight' => true,
Expand Down Expand Up @@ -299,7 +302,10 @@ public function test_get_settings_appearance_true_opts_in() {
'color' => true,
),
'color' => array(
'link' => true,
'link' => true,
'heading' => true,
'button' => true,
'caption' => true,
),
'dimensions' => array(
'minHeight' => true,
Expand Down