Try adding block classname to the container class to deal with specif…

…icity, remove fallback gap

lib/block-supports/layout.php

@@ -70,9 +70,11 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
 			if ( is_array( $gap_value ) ) {
 				$gap_value = isset( $gap_value['top'] ) ? $gap_value['top'] : null;
 			}
-			$gap_style = $gap_value && ! $should_skip_gap_serialization ? $gap_value : 'var( --wp--style--block-gap )';
-			$style    .= "$selector > * { margin-block-start: 0; margin-block-end: 0; }";
-			$style    .= "$selector > * + * { margin-block-start: $gap_style; margin-block-end: 0; }";
+			// TODO: Ensure that theme.json is outputting the default gap that used to be rendered via: var( --wp--style--block-gap, 0.5em )
+			if ( $gap_value && ! $should_skip_gap_serialization ) {
+				$style .= "$selector > * { margin-block-start: 0; margin-block-end: 0; }";
+				$style .= "$selector > * + * { margin-block-start: $gap_style; margin-block-end: 0; }";
+			}
 		}
 	} elseif ( 'flex' === $layout_type ) {
 		$layout_orientation = isset( $layout['orientation'] ) ? $layout['orientation'] : 'horizontal';
@@ -106,8 +108,10 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
 				$gap_column = isset( $gap_value['left'] ) ? $gap_value['left'] : '0.5em';
 				$gap_value  = $gap_row === $gap_column ? $gap_row : $gap_row . ' ' . $gap_column;
 			}
-			$gap_style = $gap_value && ! $should_skip_gap_serialization ? $gap_value : 'var( --wp--style--block-gap, 0.5em )';  // TODO: If there's a value set at the block level in theme.json, how do we ensure this value doesn't override that?
-			$style    .= "gap: $gap_style;";
+			// TODO: Ensure that theme.json is outputting the default gap that used to be rendered via: var( --wp--style--block-gap, 0.5em )
+			if ( $gap_value && ! $should_skip_gap_serialization ) {
+				$style .= "gap: $gap_value;";
+			}
 		} else {
 			$style .= 'gap: 0.5em;';
 		}
@@ -172,8 +176,10 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		$used_layout = $default_layout;
 	}
 
+	// TODO: Should we handle the case where a block has opted out of using a classname? (e.g. how paragraph disables classnames)
+	$block_classname = wp_get_block_default_classname( $block['blockName'] );
 	$container_class = wp_unique_id( 'wp-container-' );
-	$class_names     = array( $container_class );
+	$class_names     = array( $block_classname, $container_class );
 
 	if ( isset( $used_layout['type'] ) ) {
 		$class_names[] = 'is-layout-' . sanitize_title( $used_layout['type'] );
@@ -196,7 +202,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 	// If a block's block.json skips serialization for spacing or spacing.blockGap,
 	// don't apply the user-defined value to the styles.
 	$should_skip_gap_serialization = gutenberg_should_skip_block_supports_serialization( $block_type, 'spacing', 'blockGap' );
-	$style                         = gutenberg_get_layout_style( ".$container_class", $used_layout, $has_block_gap_support, $gap_value, $should_skip_gap_serialization );
+	$style                         = gutenberg_get_layout_style( ".$block_classname.$container_class", $used_layout, $has_block_gap_support, $gap_value, $should_skip_gap_serialization );
 	// This assumes the hook only applies to blocks with a single wrapper.
 	// I think this is a reasonable limitation for that particular hook.
 	$content = preg_replace(