Remove class in favor of a new approach checking the children

WordPress · Oct 23, 2024 · c108205 · c108205
1 parent 3369f0f
commit c108205
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/packages/block-library/src/cover/edit/index.js b/packages/block-library/src/cover/edit/index.js
@@ -511,8 +511,7 @@ function CoverEdit( {
 			'has-custom-content-position':
 				! isContentPositionCenter( contentPosition ),
 		},
-		getPositionClassName( contentPosition ),
-		'has-no-zindex-in-inner-blocks'
+		getPositionClassName( contentPosition )
 	);
 
 	const showOverlay =

diff --git a/packages/block-library/src/cover/save.js b/packages/block-library/src/cover/save.js
@@ -89,8 +89,7 @@ export default function save( { attributes } ) {
 			'has-custom-content-position':
 				! isContentPositionCenter( contentPosition ),
 		},
-		getPositionClassName( contentPosition ),
-		'has-no-zindex-in-inner-blocks'
+		getPositionClassName( contentPosition )
 	);
 
 	const imgClasses = clsx(

diff --git a/packages/block-library/src/cover/style.scss b/packages/block-library/src/cover/style.scss
@@ -294,7 +294,15 @@ section.wp-block-cover-image > h2,
 }
 
 // Backward compatibility for v14 deprecation.
-.wp-block-cover:not(.has-no-zindex-in-inner-blocks) {
+// This wrapper selector is used to identify when the
+// .wp-block-cover__background comes after the other elements (new HTML
+// structure after the deprecation).
+.wp-block-cover:not(
+.wp-block-cover:has(
+	.wp-block-cover__image-background + .wp-block-cover__background,
+	.wp-block-cover__video-background + .wp-block-cover__background
+)
+) {
 	.wp-block-cover__video-background {
 		z-index: z-index(".wp-block-cover__video-background");
 	}