From cba150ada6f377ac072961f7dd67093385582503 Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Fri, 29 Apr 2022 17:24:02 +1000
Subject: [PATCH] Try new approach to handling cover borders in editor

---
 packages/block-library/src/cover/block.json  |   1 -
 packages/block-library/src/cover/edit.js     | 129 +++++++++----------
 packages/block-library/src/cover/editor.scss |  20 ++-
 3 files changed, 73 insertions(+), 77 deletions(-)

diff --git a/packages/block-library/src/cover/block.json b/packages/block-library/src/cover/block.json
index d42232dd0f277..0450b736b2f75 100644
--- a/packages/block-library/src/cover/block.json
+++ b/packages/block-library/src/cover/block.json
@@ -92,7 +92,6 @@
 			"radius": true,
 			"style": true,
 			"width": true,
-			"__experimentalSkipSerialization": true,
 			"__experimentalDefaultControls": {
 				"color": true,
 				"radius": true,
diff --git a/packages/block-library/src/cover/edit.js b/packages/block-library/src/cover/edit.js
index 0ca295ddbb145..2e39a1f186943 100644
--- a/packages/block-library/src/cover/edit.js
+++ b/packages/block-library/src/cover/edit.js
@@ -51,7 +51,6 @@ import {
 	__experimentalPanelColorGradientSettings as PanelColorGradientSettings,
 	__experimentalBlockAlignmentMatrixControl as BlockAlignmentMatrixControl,
 	__experimentalBlockFullHeightAligmentControl as FullHeightAlignmentControl,
-	__experimentalUseBorderProps as useBorderProps,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
@@ -74,7 +73,6 @@ import {
 	isContentPositionCenter,
 	getPositionClassName,
 } from './shared';
-import cleanEmptyObject from '../utils/clean-empty-object';
 
 extend( [ namesPlugin ] );
 
@@ -302,6 +300,7 @@ function CoverEdit( {
 	context: { postId, postType },
 } ) {
 	const {
+		align,
 		contentPosition,
 		id,
 		useFeaturedImage,
@@ -653,14 +652,6 @@ function CoverEdit( {
 
 	const ref = useRef();
 	const blockProps = useBlockProps( { ref } );
-	const borderProps = useBorderProps( attributes );
-	const borderRadiusStyles = cleanEmptyObject( {
-		borderTopLeftRadius: borderProps.style.borderTopLeftRadius,
-		borderTopRightRadius: borderProps.style.borderTopRightRadius,
-		borderBottomLeftRadius: borderProps.style.borderBottomLeftRadius,
-		borderBottomRightRadius: borderProps.style.borderBottomRightRadius,
-		borderRadius: borderProps.style.borderRadius,
-	} );
 
 	// Check for fontSize support before we pass a fontSize attribute to the innerBlocks.
 	const hasFontSizes = !! useSetting( 'typography.fontSizes' )?.length;
@@ -745,10 +736,10 @@ function CoverEdit( {
 		<>
 			{ controls }
 			<div
-				{ ...blockProps }
-				className={ classnames( classes, blockProps.className ) }
-				style={ { ...style, ...blockProps.style } }
-				data-url={ url }
+				className={ classnames( 'block-library-cover__outer-wrapper', {
+					[ `align${ align }` ]: align,
+					'is-selected': isSelected,
+				} ) }
 			>
 				<ResizableCover
 					className="block-library-cover__resize-container"
@@ -765,63 +756,63 @@ function CoverEdit( {
 					} }
 					showHandle={ isSelected }
 				/>
-				<span
-					aria-hidden="true"
-					className={ 'block-library-cover__border-visualizer' }
-					style={ borderProps.style }
-				/>
-				<span
-					aria-hidden="true"
-					className={ classnames(
-						'wp-block-cover__background',
-						dimRatioToClass( dimRatio ),
-						borderProps.className,
-						{
-							[ overlayColor.class ]: overlayColor.class,
-							'has-background-dim': dimRatio !== undefined,
-							// For backwards compatibility. Former versions of the Cover Block applied
-							// `.wp-block-cover__gradient-background` in the presence of
-							// media, a gradient and a dim.
-							'wp-block-cover__gradient-background':
-								url && gradientValue && dimRatio !== 0,
-							'has-background-gradient': gradientValue,
-							[ gradientClass ]: gradientClass,
-						}
-					) }
-					style={ {
-						backgroundImage: gradientValue,
-						...bgStyle,
-						...borderProps.style,
-					} }
-				/>
-
-				{ url && isImageBackground && isImgElement && (
-					<img
-						ref={ isDarkElement }
-						className="wp-block-cover__image-background"
-						alt={ alt }
-						src={ url }
-						style={ { ...mediaStyle, ...borderRadiusStyles } }
+				<div
+					{ ...blockProps }
+					className={ classnames( classes, blockProps.className ) }
+					style={ { ...style, ...blockProps.style } }
+					data-url={ url }
+				>
+					<span
+						aria-hidden="true"
+						className={ classnames(
+							'wp-block-cover__background',
+							dimRatioToClass( dimRatio ),
+							{
+								[ overlayColor.class ]: overlayColor.class,
+								'has-background-dim': dimRatio !== undefined,
+								// For backwards compatibility. Former versions of the Cover Block applied
+								// `.wp-block-cover__gradient-background` in the presence of
+								// media, a gradient and a dim.
+								'wp-block-cover__gradient-background':
+									url && gradientValue && dimRatio !== 0,
+								'has-background-gradient': gradientValue,
+								[ gradientClass ]: gradientClass,
+							}
+						) }
+						style={ {
+							backgroundImage: gradientValue,
+							...bgStyle,
+						} }
 					/>
-				) }
-				{ url && isVideoBackground && (
-					<video
-						ref={ isDarkElement }
-						className="wp-block-cover__video-background"
-						autoPlay
-						muted
-						loop
-						src={ url }
-						style={ { ...mediaStyle, ...borderRadiusStyles } }
+
+					{ url && isImageBackground && isImgElement && (
+						<img
+							ref={ isDarkElement }
+							className="wp-block-cover__image-background"
+							alt={ alt }
+							src={ url }
+							style={ mediaStyle }
+						/>
+					) }
+					{ url && isVideoBackground && (
+						<video
+							ref={ isDarkElement }
+							className="wp-block-cover__video-background"
+							autoPlay
+							muted
+							loop
+							src={ url }
+							style={ mediaStyle }
+						/>
+					) }
+					{ isUploadingMedia && <Spinner /> }
+					<CoverPlaceholder
+						disableMediaButtons
+						onSelectMedia={ onSelectMedia }
+						onError={ onUploadError }
 					/>
-				) }
-				{ isUploadingMedia && <Spinner /> }
-				<CoverPlaceholder
-					disableMediaButtons
-					onSelectMedia={ onSelectMedia }
-					onError={ onUploadError }
-				/>
-				<div { ...innerBlocksProps } />
+					<div { ...innerBlocksProps } />
+				</div>
 			</div>
 		</>
 	);
diff --git a/packages/block-library/src/cover/editor.scss b/packages/block-library/src/cover/editor.scss
index cc292eb8a9cb1..d297bc13e5c63 100644
--- a/packages/block-library/src/cover/editor.scss
+++ b/packages/block-library/src/cover/editor.scss
@@ -2,7 +2,6 @@
 	/* Extra specificity needed because the reset.css applied in the editor context is overriding this rule. */
 	.editor-styles-wrapper & {
 		box-sizing: border-box;
-		overflow: initial;
 	}
 
 	// Override default cover styles
@@ -75,8 +74,7 @@
 	margin-left: auto;
 }
 
-.block-library-cover__resize-container,
-.block-library-cover__border-visualizer {
+.block-library-cover__resize-container {
 	position: absolute !important;
 	top: 0;
 	left: 0;
@@ -85,10 +83,6 @@
 	min-height: 50px;
 }
 
-.block-library-cover__border-visualizer {
-	z-index: z-index(".wp-block-cover.has-background-dim::before");
-}
-
 .block-library-cover__resize-container:not(.is-resizing) {
 	// Important is used to have higher specificity than the inline style set by re-resizable library.
 	height: auto !important;
@@ -104,3 +98,15 @@
 .block-editor-block-patterns-list__list-item .has-parallax.wp-block-cover {
 	background-attachment: scroll;
 }
+
+.block-library-cover__outer-wrapper {
+	position: relative;
+
+	&.is-selected {
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+
+		> .wp-block-cover::after {
+			display: none;
+		}
+	}
+}