Changeset 58313

Timestamp:

06/04/2024 01:46:03 AM (2 years ago)

Author:

isabel_brison

Message:

Editor: fix duotone filter for aligned images on classic themes.

Adds a filter to move the duotone classname to the outer wrapper on aligned images.

Props scruffian, isabel_brison, ajlende.
Fixes #61271.

Location:

trunk/src

Files:

• wp-includes/block-supports/duotone.php (modified) (1 diff)
• wp-includes/class-wp-duotone.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/block-supports/duotone.php

@@ -43 +43 @@
 // Add classnames to blocks using duotone support.
 add_filter( 'render_block', array( 'WP_Duotone', 'render_duotone_support' ), 10, 3 );
+add_filter( 'render_block_core/image', array( 'WP_Duotone', 'restore_image_outer_container' ), 10, 1 );
 
 // Enqueue styles.

trunk/src/wp-includes/class-wp-duotone.php

@@ -1156 +1156 @@
 
         /**
+         * Fixes the issue with our generated class name not being added to the block's outer container
+         * in classic themes due to gutenberg_restore_image_outer_container from layout block supports.
+         *
+         * @since 6.6.0
+         *
+         * @param  string $block_content Rendered block content.
+         * @return string                Filtered block content.
+         */
+        public static function restore_image_outer_container( $block_content ) {
+                if ( wp_theme_has_theme_json() ) {
+                        return $block_content;
+                }
+
+                $tags          = new WP_HTML_Tag_Processor( $block_content );
+                $wrapper_query = array(
+                        'tag_name'   => 'div',
+                        'class_name' => 'wp-block-image',
+                );
+                if ( ! $tags->next_tag( $wrapper_query ) ) {
+                        return $block_content;
+                }
+
+                $tags->set_bookmark( 'wrapper-div' );
+                $tags->next_tag();
+
+                $inner_classnames = explode( ' ', $tags->get_attribute( 'class' ) );
+                foreach ( $inner_classnames as $classname ) {
+                        if ( 0 === strpos( $classname, 'wp-duotone' ) ) {
+                                $tags->remove_class( $classname );
+                                $tags->seek( 'wrapper-div' );
+                                $tags->add_class( $classname );
+                                break;
+                        }
+                }
+
+                return $tags->get_updated_html();
+        }
+
+        /**
          * Appends the used block duotone filter declarations to the inline block supports CSS.
          *

trunk/src/wp-settings.php

@@ -368 +368 @@
 require ABSPATH . WPINC . '/block-supports/utils.php';
 require ABSPATH . WPINC . '/block-supports/align.php';
-require ABSPATH . WPINC . '/block-supports/background.php';
-require ABSPATH . WPINC . '/block-supports/block-style-variations.php';
+require ABSPATH . WPINC . '/block-supports/custom-classname.php';
+require ABSPATH . WPINC . '/block-supports/generated-classname.php';
+require ABSPATH . WPINC . '/block-supports/settings.php';
+require ABSPATH . WPINC . '/block-supports/elements.php';
+require ABSPATH . WPINC . '/block-supports/colors.php';
+require ABSPATH . WPINC . '/block-supports/typography.php';
 require ABSPATH . WPINC . '/block-supports/border.php';
-require ABSPATH . WPINC . '/block-supports/colors.php';
-require ABSPATH . WPINC . '/block-supports/custom-classname.php';
+require ABSPATH . WPINC . '/block-supports/layout.php';
+require ABSPATH . WPINC . '/block-supports/position.php';
+require ABSPATH . WPINC . '/block-supports/spacing.php';
 require ABSPATH . WPINC . '/block-supports/dimensions.php';
 require ABSPATH . WPINC . '/block-supports/duotone.php';
 require ABSPATH . WPINC . '/block-supports/shadow.php';
-require ABSPATH . WPINC . '/block-supports/elements.php';
-require ABSPATH . WPINC . '/block-supports/generated-classname.php';
-require ABSPATH . WPINC . '/block-supports/layout.php';
-require ABSPATH . WPINC . '/block-supports/position.php';
-require ABSPATH . WPINC . '/block-supports/spacing.php';
-require ABSPATH . WPINC . '/block-supports/typography.php';
-require ABSPATH . WPINC . '/block-supports/settings.php';
+require ABSPATH . WPINC . '/block-supports/background.php';
+require ABSPATH . WPINC . '/block-supports/block-style-variations.php';
 require ABSPATH . WPINC . '/style-engine.php';
 require ABSPATH . WPINC . '/style-engine/class-wp-style-engine.php';