Skip to content

Polish duotone rendering code #49706

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
scruffian merged 8 commits into from
Apr 20, 2023
Merged

Polish duotone rendering code #49706

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
199f9f3
Rename gutenberg_get_slug_from_attr for clarity
Apr 11, 2023
3b6ddfe
Use double quotes for string concatination
Apr 11, 2023
6a01fe1
Correct WP_Duotone_Gutenberg class comment
Apr 11, 2023
20ceda0
Match example filter slugs used throughout the file
Apr 11, 2023
97969cd
Update comments to clarify methods and variables
Apr 11, 2023
f837e4d
Fix @since declarations on public methods
Apr 11, 2023
91e26e8
Reorder methods for better readablity
Apr 11, 2023
498a2b0
Add existance check for core versions of actions/filters
Apr 19, 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
Prev Previous commit
Next Next commit
Match example filter slugs used throughout the file
  • Loading branch information
@scruffian
Alex Lende authored and scruffian committed Apr 20, 2023
commit 20ceda0aa33f413a3466599260a091dbab458cca
18 changes: 9 additions & 9 deletions lib/class-wp-duotone-gutenberg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ public static function set_global_style_block_names() {
continue;
}

// Value looks like this: 'var(--wp--preset--duotone--blue-orange)' or 'var:preset|duotone|default-filter'.
// Value looks like this: 'var(--wp--preset--duotone--blue-orange)' or 'var:preset|duotone|blue-orange'.
$duotone_attr_path = array_merge( $block_node['path'], array( 'filter', 'duotone' ) );
$duotone_attr = _wp_array_get( $theme_json, $duotone_attr_path, array() );

Expand All @@ -495,7 +495,7 @@ public static function set_global_style_block_names() {

/**
* Take the inline CSS duotone variable from a block and return the slug. Handles styles slugs like:
* var:preset|duotone|default-filter
* var:preset|duotone|blue-orange
* var(--wp--preset--duotone--blue-orange)
*
* @param string $duotone_attr The duotone attribute from a block.
Expand Down Expand Up @@ -892,7 +892,7 @@ public static function render_duotone_support( $block_content, $block ) {

// Possible values for duotone attribute:
// 1. Array of colors - e.g. array('#000000', '#ffffff').
// 2. Variable for an existing Duotone preset - e.g. 'var:preset|duotone|green-blue' or 'var(--wp--preset--duotone--green-blue)''
// 2. Variable for an existing Duotone preset - e.g. 'var:preset|duotone|blue-orange' or 'var(--wp--preset--duotone--blue-orange)''
// 3. A CSS string - e.g. 'unset' to remove globally applied duotone.

$duotone_attr = $block['attrs']['style']['color']['duotone'];
Expand All @@ -901,9 +901,9 @@ public static function render_duotone_support( $block_content, $block ) {
$is_custom = is_array( $duotone_attr );

if ( $is_preset ) {
$slug = self::get_slug_from_attribute( $duotone_attr ); // e.g. 'green-blue'.
$filter_id = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-green-blue'.
$filter_value = self::get_css_var( $slug ); // e.g. 'var(--wp--preset--duotone--green-blue)'.
$slug = self::get_slug_from_attribute( $duotone_attr ); // e.g. 'blue-orange'.
$filter_id = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-blue-orange'.
$filter_value = self::get_css_var( $slug ); // e.g. 'var(--wp--preset--duotone--blue-orange)'.

// CSS custom property, SVG filter, and block CSS.
self::enqueue_global_styles_preset( $filter_id, $duotone_selector, $filter_value );
Expand All @@ -928,9 +928,9 @@ public static function render_duotone_support( $block_content, $block ) {
self::enqueue_custom_filter( $filter_id, $duotone_selector, $filter_value, $filter_data );
}
} elseif ( $has_global_styles_duotone ) {
$slug = self::$global_styles_block_names[ $block['blockName'] ]; // e.g. 'green-blue'.
$filter_id = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-green-blue'.
$filter_value = self::get_css_var( $slug ); // e.g. 'var(--wp--preset--duotone--green-blue)'.
$slug = self::$global_styles_block_names[ $block['blockName'] ]; // e.g. 'blue-orange'.
$filter_id = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-blue-orange'.
$filter_value = self::get_css_var( $slug ); // e.g. 'var(--wp--preset--duotone--blue-orange)'.

// CSS custom property, SVG filter, and block CSS.
self::enqueue_global_styles_preset( $filter_id, $duotone_selector, $filter_value );
Expand Down