Changeset 56997 for branches/6.4

Timestamp:

10/24/2023 11:06:59 AM (2 years ago)

Author:

hellofromTonya

Message:

Editor: Fix render_duotone_support() to be compatible with enhanced pagination.

Some blocks do not have content. For duotone support, blocks without content still need to run through the render_duotone_support() to render their duotone CSS.

This fix makes the duotone compatible with the enhanced pagination (introduced in 6.4.0) by making sure that the CSS is always on the page, even when the posts have no featured image. It also prevents the duotone from interfering with other blocks using wp_unique_id().

References:

• ​Gutenberg PR 55415

Follow-up to [56226].

Props cbravobernal, luisherranz, hellofromTonya, isabel_brison, jorbin.
Reviewed by costdev.
Merges [56991] and [56996] to the 6.4 branch.
Fixes #59694.

Location:

branches/6.4

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-duotone.php (modified) (1 diff)
• tests/phpunit/tests/block-supports/duotone.php (modified) (1 diff)

branches/6.4/src/wp-includes/class-wp-duotone.php

@@ -1075 +1075 @@
      */
     public static function render_duotone_support( $block_content, $block, $wp_block ) {
-        if ( empty( $block_content ) || ! $block['blockName'] ) {
+        if ( ! $block['blockName'] ) {
             return $block_content;
         }

branches/6.4/tests/phpunit/tests/block-supports/duotone.php

@@ -102 +102 @@
 
     /**
+     * Tests whether the CSS declarations are generated even if the block content is
+     * empty. This is needed to make the CSS output stable across paginations for
+     * features like the enhanced pagination of the Query block.
+     *
+     * @ticket 59694
+     *
+     * @covers ::render_duotone_support
+     */
+    public function test_css_declarations_are_generated_even_with_empty_block_content() {
+        $block    = array(
+            'blockName' => 'core/image',
+            'attrs'     => array( 'style' => array( 'color' => array( 'duotone' => 'var:preset|duotone|blue-orange' ) ) ),
+        );
+        $wp_block = new WP_Block( $block );
+
+        /*
+         * Handling to access the static WP_Duotone::$block_css_declarations property.
+         *
+         * Why is an instance needed?
+         * WP_Duotone is a static class by design, meaning it only contains static properties and methods.
+         * In production, it should not be instantiated. However, as of PHP 8.3, ReflectionProperty::setValue()
+         * needs an object.
+         */
+        $wp_duotone                      = new WP_Duotone();
+        $block_css_declarations_property = new ReflectionProperty( 'WP_Duotone', 'block_css_declarations' );
+        $block_css_declarations_property->setAccessible( true );
+        $previous_value = $block_css_declarations_property->getValue();
+        $block_css_declarations_property->setValue( $wp_duotone, array() );
+
+        WP_Duotone::render_duotone_support( '', $block, $wp_block );
+        $actual = $block_css_declarations_property->getValue();
+
+        // Reset the property.
+        $block_css_declarations_property->setValue( $wp_duotone, $previous_value );
+        $block_css_declarations_property->setAccessible( false );
+
+        $this->assertNotEmpty( $actual );
+    }
+
+    /**
      * @dataProvider data_is_preset
      */