Refactor color panel and color palette components

WordPress · Feb 12, 2025 · 0ac8c96 · 0ac8c96
1 parent 208c842
commit 0ac8c96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/block-editor/src/components/global-styles/color-panel.js b/packages/block-editor/src/components/global-styles/color-panel.js
@@ -177,7 +177,6 @@ const LabeledColorIndicators = ( { indicators, label } ) => (
 function ColorPanelTab( {
 	isGradient,
 	inheritedValue,
-	userValue,
 	setValue,
 	colorGradientControlSettings,
 } ) {
@@ -191,7 +190,6 @@ function ColorPanelTab( {
 			gradientValue={ isGradient ? inheritedValue : undefined }
 			onColorChange={ isGradient ? undefined : setValue }
 			onGradientChange={ isGradient ? setValue : undefined }
-			clearable={ inheritedValue === userValue }
 			headingLevel={ 3 }
 		/>
 	);

diff --git a/packages/components/src/color-palette/index.tsx b/packages/components/src/color-palette/index.tsx
@@ -241,11 +241,11 @@ function UnforwardedColorPalette(
 		value,
 	};
 
-	const actions = (
+	const actions = !! clearable && (
 		<CircularOptionPicker.ButtonAction
 			onClick={ clearColor }
 			accessibleWhenDisabled
-			disabled={ ! value || ! clearable }
+			disabled={ ! value }
 		>
 			{ __( 'Clear' ) }
 		</CircularOptionPicker.ButtonAction>