From 77e408b3d3ecc2072490cbe065344276e5904c16 Mon Sep 17 00:00:00 2001
From: shimotmk <shimotmk1104@gmail.com>
Date: Thu, 6 Feb 2025 07:52:39 +0900
Subject: [PATCH] fix #69065

---
 .../components/global-styles/border-panel.js  |  1 +
 .../border-box-control/README.md              |  8 ++++++
 .../border-box-control/component.tsx          |  3 ++
 .../src/border-box-control/types.ts           |  2 +-
 .../border-control-dropdown/component.tsx     | 28 ++++++++++++++++++-
 .../border-control-dropdown/hook.ts           |  5 ++++
 .../border-control/component.tsx              |  2 ++
 .../src/border-control/border-control/hook.ts |  2 ++
 .../components/src/border-control/styles.ts   |  6 ++++
 .../components/src/border-control/types.ts    | 10 +++++++
 10 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/global-styles/border-panel.js b/packages/block-editor/src/components/global-styles/border-panel.js
index aea8e67f5b594..e4c349024dae5 100644
--- a/packages/block-editor/src/components/global-styles/border-panel.js
+++ b/packages/block-editor/src/components/global-styles/border-panel.js
@@ -256,6 +256,7 @@ export default function BorderPanel( {
 					<BorderBoxControl
 						colors={ colors }
 						enableAlpha
+						showClearButton
 						enableStyle={ showBorderStyle }
 						onChange={ onBorderChange }
 						popoverOffset={ 40 }
diff --git a/packages/components/src/border-box-control/border-box-control/README.md b/packages/components/src/border-box-control/border-box-control/README.md
index 9d51be2901a2a..f16d3993a5033 100644
--- a/packages/components/src/border-box-control/border-box-control/README.md
+++ b/packages/components/src/border-box-control/border-box-control/README.md
@@ -48,6 +48,7 @@ const MyBorderBoxControl = () => {
 	return (
 		<BorderBoxControl
 			__next40pxDefaultSize
+			showClearButton
 			colors={ colors }
 			label={ __( 'Borders' ) }
 			onChange={ onChange }
@@ -89,6 +90,13 @@ custom colors.
 -   Required: No
 -   Default: `false`
 
+### `showClearButton`: `boolean`
+
+Select whether to display the Clear button.
+
+-   Required: No
+-   Default: `undefined`
+
 ### `enableStyle`: `boolean`
 
 This controls whether to support border style selections.
diff --git a/packages/components/src/border-box-control/border-box-control/component.tsx b/packages/components/src/border-box-control/border-box-control/component.tsx
index 0e84c7b56ee48..794e555ccdc82 100644
--- a/packages/components/src/border-box-control/border-box-control/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control/component.tsx
@@ -48,6 +48,7 @@ const UnconnectedBorderBoxControl = (
 		disableCustomColors,
 		disableUnits,
 		enableAlpha,
+		showClearButton,
 		enableStyle,
 		hasMixedBorders,
 		hideLabelFromVision,
@@ -103,6 +104,7 @@ const UnconnectedBorderBoxControl = (
 						disableUnits={ disableUnits }
 						disableCustomColors={ disableCustomColors }
 						enableAlpha={ enableAlpha }
+						showClearButton={ showClearButton }
 						enableStyle={ enableStyle }
 						onChange={ onLinkedChange }
 						placeholder={
@@ -177,6 +179,7 @@ const UnconnectedBorderBoxControl = (
  * 	return (
  * 		<BorderBoxControl
  * 			__next40pxDefaultSize
+ * 			showClearButton
  * 			colors={ colors }
  * 			label={ __( 'Borders' ) }
  * 			onChange={ onChange }
diff --git a/packages/components/src/border-box-control/types.ts b/packages/components/src/border-box-control/types.ts
index 283faf05014a0..69ecf5c48ce75 100644
--- a/packages/components/src/border-box-control/types.ts
+++ b/packages/components/src/border-box-control/types.ts
@@ -22,7 +22,7 @@ export type BorderSide = keyof Borders;
 
 export type BorderBoxControlProps = ColorProps &
 	LabelProps &
-	Pick< BorderControlProps, 'enableStyle' | 'size' > & {
+	Pick< BorderControlProps, 'showClearButton' | 'enableStyle' | 'size' > & {
 		/**
 		 * A callback function invoked when any border value is changed. The value
 		 * received may be a "flat" border object, one that has properties defining
diff --git a/packages/components/src/border-control/border-control-dropdown/component.tsx b/packages/components/src/border-control/border-control-dropdown/component.tsx
index 707497ae2993c..3be8e37efa9c4 100644
--- a/packages/components/src/border-control/border-control-dropdown/component.tsx
+++ b/packages/components/src/border-control/border-control-dropdown/component.tsx
@@ -7,6 +7,7 @@ import type { CSSProperties } from 'react';
  * WordPress dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -152,17 +153,27 @@ const BorderControlDropdown = (
 		indicatorClassName,
 		indicatorWrapperClassName,
 		isStyleSettable,
+		showClearButton,
 		onReset,
 		onColorChange,
 		onStyleChange,
 		popoverContentClassName,
 		popoverControlsClassName,
 		resetButtonClassName,
+		clearButtonClassName,
 		size,
 		__unstablePopoverProps,
 		...otherProps
 	} = useBorderControlDropdown( props );
 
+	if ( showClearButton === undefined ) {
+		deprecated( `Clear button styles for wp.components.BorderBoxControl`, {
+			since: '6.8',
+			version: '7.1',
+			hint: 'Set the `showClearButton` prop to true to start opting into the new styles, which will become the default in a future version.',
+		} );
+	}
+
 	const { color, style } = border || {};
 	const colorObject = getColorObject( color, colors );
 
@@ -224,8 +235,23 @@ const BorderControlDropdown = (
 						/>
 					) }
 				</VStack>
+				{ showClearButton && (
+					<div className={ clearButtonClassName }>
+						<Button
+							variant="tertiary"
+							onClick={ () => {
+								onReset();
+							} }
+							disabled={ ! showResetButton }
+							accessibleWhenDisabled
+							__next40pxDefaultSize
+						>
+							{ __( 'Clear' ) }
+						</Button>
+					</div>
+				) }
 			</DropdownContentWrapper>
-			{ showResetButton && (
+			{ ! showClearButton && showResetButton && (
 				<DropdownContentWrapper paddingSize="none">
 					<Button
 						className={ resetButtonClassName }
diff --git a/packages/components/src/border-control/border-control-dropdown/hook.ts b/packages/components/src/border-control/border-control-dropdown/hook.ts
index 5366babc266c6..8fb2729d817e0 100644
--- a/packages/components/src/border-control/border-control-dropdown/hook.ts
+++ b/packages/components/src/border-control/border-control-dropdown/hook.ts
@@ -76,6 +76,10 @@ export function useBorderControlDropdown(
 		return cx( styles.borderControlPopoverContent );
 	}, [ cx ] );
 
+	const clearButtonClassName = useMemo( () => {
+		return cx( styles.clearButton );
+	}, [ cx ] );
+
 	const resetButtonClassName = useMemo( () => {
 		return cx( styles.resetButton );
 	}, [ cx ] );
@@ -94,6 +98,7 @@ export function useBorderControlDropdown(
 		onReset,
 		popoverContentClassName,
 		popoverControlsClassName,
+		clearButtonClassName,
 		resetButtonClassName,
 		size,
 		__experimentalIsRenderedInSidebar,
diff --git a/packages/components/src/border-control/border-control/component.tsx b/packages/components/src/border-control/border-control/component.tsx
index f71599b274778..20000fd8a2792 100644
--- a/packages/components/src/border-control/border-control/component.tsx
+++ b/packages/components/src/border-control/border-control/component.tsx
@@ -49,6 +49,7 @@ const UnconnectedBorderControl = (
 		innerWrapperClassName,
 		inputWidth,
 		isStyleSettable,
+		showClearButton,
 		label,
 		onBorderChange,
 		onSliderChange,
@@ -89,6 +90,7 @@ const UnconnectedBorderControl = (
 								enableAlpha={ enableAlpha }
 								enableStyle={ enableStyle }
 								isStyleSettable={ isStyleSettable }
+								showClearButton={ showClearButton }
 								onChange={ onBorderChange }
 								previousStyleSelection={
 									previousStyleSelection
diff --git a/packages/components/src/border-control/border-control/hook.ts b/packages/components/src/border-control/border-control/hook.ts
index 9b0f064c51921..9b90b7ead2f9a 100644
--- a/packages/components/src/border-control/border-control/hook.ts
+++ b/packages/components/src/border-control/border-control/hook.ts
@@ -33,6 +33,7 @@ export function useBorderControl(
 		enableAlpha = true,
 		enableStyle = true,
 		shouldSanitizeBorder = true,
+		showClearButton,
 		size = 'default',
 		value: border,
 		width,
@@ -160,6 +161,7 @@ export function useBorderControl(
 		innerWrapperClassName,
 		inputWidth: wrapperWidth,
 		isStyleSettable,
+		showClearButton,
 		onBorderChange,
 		onSliderChange,
 		onWidthChange,
diff --git a/packages/components/src/border-control/styles.ts b/packages/components/src/border-control/styles.ts
index a678b6f362308..1e3db6944e725 100644
--- a/packages/components/src/border-control/styles.ts
+++ b/packages/components/src/border-control/styles.ts
@@ -147,6 +147,12 @@ export const borderControlPopoverControls = css`
 export const borderControlPopoverContent = css``;
 export const borderColorIndicator = css``;
 
+export const clearButton = css`
+	display: flex;
+	justify-content: flex-end;
+	margin-top: 12px;
+`;
+
 export const resetButton = css`
 	justify-content: center;
 	width: 100%;
diff --git a/packages/components/src/border-control/types.ts b/packages/components/src/border-control/types.ts
index ecd3f67c9be08..860084feea0f7 100644
--- a/packages/components/src/border-control/types.ts
+++ b/packages/components/src/border-control/types.ts
@@ -57,6 +57,12 @@ export type BorderControlProps = ColorProps &
 		 * @default true
 		 */
 		enableStyle?: boolean;
+		/**
+		 * ShowClearButton
+		 *
+		 * @default undefined
+		 */
+		showClearButton?: boolean | undefined;
 		/**
 		 * This flags the `BorderControl` to render with a more compact
 		 * appearance. It restricts the width of the control and prevents it
@@ -137,6 +143,10 @@ export type DropdownProps = ColorProps &
 		 * Whether a border style can be set, based on the border sanitization settings.
 		 */
 		isStyleSettable: boolean;
+		/**
+		 * Show Clear Button
+		 */
+		showClearButton?: boolean;
 		/**
 		 * An internal prop used to control the visibility of the dropdown.
 		 */