Skip to content

Backport: Duotone: Use HTML API class list for wrapper class handling #12324

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

Open
sirreal wants to merge 1 commit into
base: trunk
Choose a base branch
from
+13 −2
Open

Backport: Duotone: Use HTML API class list for wrapper class handling #12324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/wp-includes/class-wp-duotone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,8 +1191,7 @@ public static function restore_image_outer_container( $block_content ) {
$tags->set_bookmark( 'wrapper-div' );
$tags->next_tag();

$inner_classnames = explode( ' ', $tags->get_attribute( 'class' ) );
foreach ( $inner_classnames as $classname ) {
foreach ( $tags->class_list() as $classname ) {
if ( str_starts_with( $classname, 'wp-duotone' ) ) {
$tags->remove_class( $classname );
$tags->seek( 'wrapper-div' );
Expand Down
12 changes: 12 additions & 0 deletions tests/phpunit/tests/block-supports/duotone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ public function test_render_duotone_support_custom() {
$this->assertMatchesRegularExpression( $expected, WP_Duotone::render_duotone_support( $block_content, $block, $wp_block ) );
}

/**
* @covers ::restore_image_outer_container
*/
public function test_restore_image_outer_container_moves_duotone_class_to_wrapper_in_classic_theme() {
switch_theme( 'default' );

$block_content = '<div class="wp-block-image"><figure class="alignright wp-duotone-blue-orange size-full"><img src="/my-image.jpg"></figure></div>';
$expected = '<div class="wp-block-image wp-duotone-blue-orange"><figure class="alignright size-full"><img src="/my-image.jpg"></figure></div>';

$this->assertEqualHTML( $expected, WP_Duotone::restore_image_outer_container( $block_content ) );
}

/**
* Tests whether the slug is extracted from the attribute.
*
Expand Down
Loading