refactor button color component into element

WordPress · Oct 19, 2022 · cba3235 · cba3235
1 parent 498f64f
commit cba3235
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 105 deletions.
diff --git a/packages/edit-site/src/components/global-styles/screen-button-color.js b/packages/edit-site/src/components/global-styles/screen-button-color.js
diff --git a/packages/edit-site/src/components/global-styles/screen-color-element.js b/packages/edit-site/src/components/global-styles/screen-color-element.js
@@ -44,15 +44,24 @@ function ScreenColorElement( { name, element } ) {
 	const colorsPerOrigin = useColorsPerOrigin( name );
 	const [ solids ] = useSetting( 'color.palette', name );
 	const [ areCustomSolidsEnabled ] = useSetting( 'color.custom', name );
+	const [ isBackgroundEnabled ] = useSetting( 'color.background', name );
 
-	const hasElementColor =
+	let hasElementColor =
 		supports.includes( 'color' ) &&
 		( solids.length > 0 || areCustomSolidsEnabled );
 
+	if ( supports.includes( 'buttonColor' ) ) {
+		hasElementColor =
+			supports.includes( 'buttonColor' ) &&
+			isBackgroundEnabled &&
+			( solids.length > 0 || areCustomSolidsEnabled );
+	}
+
 	const [ elementTextColor, setElementTextColor ] = useStyle(
 		'elements.' + element + '.color.text',
 		name
 	);
+
 	const [ userElementTextColor ] = useStyle(
 		'elements.' + element + '.color.text',
 		name,

diff --git a/packages/edit-site/src/components/global-styles/ui.js b/packages/edit-site/src/components/global-styles/ui.js
@@ -22,7 +22,6 @@ import ScreenColorElement from './screen-color-element';
 import ScreenTextColor from './screen-text-color';
 import ScreenLinkColor from './screen-link-color';
 import ScreenHeadingColor from './screen-heading-color';
-import ScreenButtonColor from './screen-button-color';
 import ScreenLayout from './screen-layout';
 import ScreenStyleVariations from './screen-style-variations';
 
@@ -118,7 +117,7 @@ function ContextScreens( { name } ) {
 			<GlobalStylesNavigationScreen
 				path={ parentMenu + '/colors/button' }
 			>
-				<ScreenButtonColor name={ name } />
+				<ScreenColorElement name={ name } element="button" />
 			</GlobalStylesNavigationScreen>
 
 			<GlobalStylesNavigationScreen path={ parentMenu + '/layout' }>