Merge pull request #2138 from WordPress/fix/2137-default-column

Fix: Moved `column_count` context from `column` block to `columns` block to ensure it is available to ancestor blocks

Author: mukeshpanchal27

plugins/auto-sizes/includes/improve-calculate-sizes.php

@@ -306,8 +306,8 @@ function auto_sizes_filter_uses_context( array $uses_context, WP_Block_Type $blo
 		'core/image'               => array( 'max_alignment', 'container_relative_width' ),
 		'core/post-featured-image' => array( 'max_alignment', 'container_relative_width' ),
 		'core/group'               => array( 'max_alignment' ),
-		'core/columns'             => array( 'max_alignment', 'container_relative_width' ),
-		'core/column'              => array( 'max_alignment', 'column_count' ),
+		'core/columns'             => array( 'max_alignment', 'column_count', 'container_relative_width' ),
+		'core/column'              => array( 'max_alignment' ),
 	);
 
 	if ( isset( $block_specific_context[ $block_type->name ] ) ) {

plugins/auto-sizes/tests/test-improve-calculate-sizes.php

@@ -1272,6 +1272,63 @@ public static function data_image_block_with_parent_columns_and_its_parent_group
 		);
 	}
 
+	/**
+	 * Test that the image block in a two-column layout renders the correct sizes attribute.
+	 *
+	 * @cover ::auto_sizes_filter_image_tag
+	 */
+	public function test_image_block_in_two_column_layout_renders_correct_sizes_attribute(): void {
+		// Skip test for WordPress versions below 6.8.
+		if ( version_compare( get_bloginfo( 'version' ), '6.8', '<' ) ) {
+			$this->markTestSkipped( 'This test requires WordPress 6.8 or higher.' );
+		}
+
+		$block_content = '<!-- wp:columns -->
+			<div class="wp-block-columns"><!-- wp:column -->
+			<div class="wp-block-column">
+			' . $this->get_image_block_markup( self::$image_id, 'large' ) . '
+			</div>
+			<!-- /wp:column -->
+			<!-- wp:column -->
+			<div class="wp-block-column"></div>
+			<!-- /wp:column --></div>
+			<!-- /wp:columns -->';
+
+		$result = apply_filters( 'the_content', $block_content );
+
+		$this->assertStringContainsString( 'sizes="(max-width: 310px) 100vw, 310px" ', $result );
+	}
+
+	/**
+	 * Test that the image block in a three-column layout renders the correct sizes attribute.
+	 *
+	 * @cover ::auto_sizes_filter_image_tag
+	 */
+	public function test_image_block_in_three_column_layout_renders_correct_sizes_attribute(): void {
+		// Skip test for WordPress versions below 6.8.
+		if ( version_compare( get_bloginfo( 'version' ), '6.8', '<' ) ) {
+			$this->markTestSkipped( 'This test requires WordPress 6.8 or higher.' );
+		}
+
+		$block_content = '<!-- wp:columns -->
+			<div class="wp-block-columns"><!-- wp:column -->
+			<div class="wp-block-column">
+			' . $this->get_image_block_markup( self::$image_id, 'large' ) . '
+			</div>
+			<!-- /wp:column -->
+			<!-- wp:column -->
+			<div class="wp-block-column"></div>
+			<!-- /wp:column -->
+			<!-- wp:column -->
+			<div class="wp-block-column"></div>
+			<!-- /wp:column --></div>
+			<!-- /wp:columns -->';
+
+		$result = apply_filters( 'the_content', $block_content );
+
+		$this->assertStringContainsString( 'sizes="(max-width: 206px) 100vw, 206px" ', $result );
+	}
+
 	/**
 	 * Verifies that the post featured image block does not render when no featured image is set for the post.
 	 */