Changeset 61655 for trunk/tests/phpunit/tests/block-supports/layout.php

Timestamp:

02/16/2026 11:50:37 PM (7 months ago)

Author:

isabel_brison

Message:

Editor: fix grid layout for style variations defining blockGap.

Ensures the grid block columns computation takes into account any blockGap value output by an active block style variation.

Props isabel_brison, mukesh27, westonruter, andrewserong.
Fixes #64624.

File:

• trunk/tests/phpunit/tests/block-supports/layout.php (modified) (3 diffs)

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

@@ -43 +43 @@
                 wp_clean_themes_cache();
                 unset( $GLOBALS['wp_themes'] );
+
+                /*
+                 * Register a style variation with a custom blockGap value for testing.
+                 */
+                register_block_style(
+                        'core/group',
+                        array(
+                                'name'       => 'custom-gap',
+                                'label'      => 'Custom Gap',
+                                'style_data' => array(
+                                        'spacing' => array(
+                                                'blockGap' => '99px',
+                                        ),
+                                ),
+                        )
+                );
         }
 
@@ -55 +71 @@
                 wp_clean_themes_cache();
                 unset( $GLOBALS['wp_themes'] );
+
+                // Clean up variation test data.
+                unregister_block_style( 'core/group', 'custom-gap' );
+                WP_Theme_JSON_Resolver::clean_cached_data();
+
                 parent::tear_down();
         }
@@ -728 +749 @@
                 );
         }
+
+        /**
+         * Tests that block style variations with blockGap values are applied to layout styles.
+         *
+         * @ticket 64624
+         * @covers ::wp_render_layout_support_flag
+         */
+        public function test_layout_support_flag_uses_variation_block_gap_value() {
+                switch_theme( 'block-theme' );
+
+                $block_content = '<div class="wp-block-group is-style-custom-gap"></div>';
+                $block         = array(
+                        'blockName'    => 'core/group',
+                        'attrs'        => array(
+                                'className' => 'is-style-custom-gap',
+                                'layout'    => array(
+                                        'type'               => 'grid',
+                                        'columnCount'        => 3,
+                                        'minimumColumnWidth' => '12rem',
+                                ),
+                        ),
+                        'innerBlocks'  => array(),
+                        'innerHTML'    => '<div class="wp-block-group is-style-custom-gap"></div>',
+                        'innerContent' => array(
+                                '<div class="wp-block-group is-style-custom-gap"></div>',
+                        ),
+                );
+
+                wp_render_layout_support_flag( $block_content, $block );
+
+                // Get the generated CSS from the style engine.
+                $actual_stylesheet = wp_style_engine_get_stylesheet_from_context( 'block-supports', array( 'prettify' => false ) );
+
+                // The CSS grid declaration should contain the variation's blockGap value of 99px.
+                $this->assertStringContainsString(
+                        'grid-template-columns:repeat(auto-fill, minmax(max(min(12rem, 100%), (100% - (99px * (3 - 1))) /3), 1fr))',
+                        $actual_stylesheet,
+                        'Generated CSS should contain the variation blockGap value of 99px.'
+                );
+        }
+
+        /**
+         * Tests that wp_get_block_style_variation_name_from_registered_style correctly extracts variation names from class strings.
+         *
+         * @ticket 64624
+         * @covers ::wp_get_block_style_variation_name_from_registered_style
+         *
+         * @dataProvider data_get_block_style_variation_name_from_registered_style
+         *
+         * @param string      $class_name        CSS class string to test.
+         * @param array       $registered_styles Registered block styles.
+         * @param string|null $expected_result   Expected variation name or null.
+         */
+        public function test_get_block_style_variation_name_from_registered_style( $class_name, $registered_styles, $expected_result ) {
+                $result = wp_get_block_style_variation_name_from_registered_style( $class_name, $registered_styles );
+                $this->assertSame( $expected_result, $result );
+        }
+
+        /**
+         * Data provider for test_get_block_style_variation_name_from_registered_style.
+         *
+         * @return array
+         */
+        public function data_get_block_style_variation_name_from_registered_style() {
+                return array(
+                        'empty class name'                             => array(
+                                'class_name'        => '',
+                                'registered_styles' => array(),
+                                'expected_result'   => null,
+                        ),
+                        'no matching registered styles'                => array(
+                                'class_name'        => 'is-style-shadowed wp-block-button',
+                                'registered_styles' => array(
+                                        array( 'name' => 'rounded' ),
+                                        array( 'name' => 'outlined' ),
+                                ),
+                                'expected_result'   => null,
+                        ),
+                        'single matching variation found'              => array(
+                                'class_name'        => 'wp-block-button is-style-rounded',
+                                'registered_styles' => array(
+                                        array( 'name' => 'rounded' ),
+                                        array( 'name' => 'outlined' ),
+                                ),
+                                'expected_result'   => 'rounded',
+                        ),
+                        'ignores default style only'                   => array(
+                                'class_name'        => 'is-style-default wp-block-button',
+                                'registered_styles' => array(
+                                        array( 'name' => 'default' ),
+                                        array( 'name' => 'rounded' ),
+                                ),
+                                'expected_result'   => null,
+                        ),
+                        'ignores default and returns next variation'   => array(
+                                'class_name'        => 'is-style-default is-style-rounded wp-block-button',
+                                'registered_styles' => array(
+                                        array( 'name' => 'default' ),
+                                        array( 'name' => 'rounded' ),
+                                        array( 'name' => 'outlined' ),
+                                ),
+                                'expected_result'   => 'rounded',
+                        ),
+                        'returns first matching variation when multiple present' => array(
+                                'class_name'        => 'is-style-shadowed is-style-rounded',
+                                'registered_styles' => array(
+                                        array( 'name' => 'rounded' ),
+                                        array( 'name' => 'outlined' ),
+                                        array( 'name' => 'shadowed' ),
+                                ),
+                                'expected_result'   => 'shadowed',
+                        ),
+                        'empty registered styles array'                => array(
+                                'class_name'        => 'is-style-rounded',
+                                'registered_styles' => array(),
+                                'expected_result'   => null,
+                        ),
+                        'registered styles with missing name property' => array(
+                                'class_name'        => 'is-style-outlined wp-block-button',
+                                'registered_styles' => array(
+                                        array( 'label' => 'Rounded' ),
+                                        array( 'name' => 'outlined' ),
+                                ),
+                                'expected_result'   => 'outlined',
+                        ),
+                );
+        }
 }