Changeset 57328

Timestamp:

01/23/2024 05:36:40 AM (8 months ago)

Author:

isabel_brison

Message:

Editor: fix classname output on blocks without layout.

Prevents layout classnames from being output on blocks with no layout support and no child layout classnames by returning early from wp_render_layout_support_flag.

Props andrewserong.
Fixes #60292.

Location:

trunk

Files:

• src/wp-includes/block-supports/layout.php (modified) (1 diff)
• tests/phpunit/tests/block-supports/layout.php (modified) (2 diffs)

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

@@ -616 +616 @@
         }
         return $processor->get_updated_html();
+    } elseif ( ! $block_supports_layout ) {
+        // Ensure layout classnames are not injected if there is no layout support.
+        return $block_content;
     }
 

trunk/tests/phpunit/tests/block-supports/layout.php

@@ -172 +172 @@
      * @ticket 57584
      * @ticket 58548
+     * @ticket 60292
      *
      * @dataProvider data_layout_support_flag_renders_classnames_on_wrapper
@@ -251 +252 @@
                 'expected_output' => '<div class="wp-block-group"><div class="wp-block-group__inner-wrapper is-layout-flow wp-block-group-is-layout-flow"></div></div>',
             ),
+            'skip classname output if block does not support layout and there are no child layout classes to be output' => array(
+                'args'            => array(
+                    'block_content' => '<p>A paragraph</p>',
+                    'block'         => array(
+                        'blockName'    => 'core/paragraph',
+                        'attrs'        => array(
+                            'style' => array(
+                                'layout' => array(
+                                    'selfStretch' => 'fit',
+                                ),
+                            ),
+                        ),
+                        'innerBlocks'  => array(),
+                        'innerHTML'    => '<p>A paragraph</p>',
+                        'innerContent' => array( '<p>A paragraph</p>' ),
+                    ),
+                ),
+                'expected_output' => '<p>A paragraph</p>',
+            ),
         );
     }