Fix: allow themes to opt out from core color palette (#36492)

WordPress · Nov 15, 2021 · ad47f05 · ad47f05
1 parent 73e6f60
commit ad47f05
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/docs/how-to-guides/themes/theme-json.md b/docs/how-to-guides/themes/theme-json.md
@@ -226,9 +226,13 @@ The settings section has the following structure:
 		},
 		"color": {
 			"background": true,
+			"corePalette": true,
+			"coreGradients": true,
 			"custom": true,
 			"customDuotone": true,
 			"customGradient": true,
+			"corePalette": true,
+			"coreGradients": true,
 			"duotone": [],
 			"gradients": [],
 			"link": false,

diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
@@ -89,6 +89,8 @@ class WP_Theme_JSON_Gutenberg {
 		),
 		'color'      => array(
 			'background'     => null,
+			'corePalette'    => null,
+			'coreGradients'  => null,
 			'custom'         => null,
 			'customDuotone'  => null,
 			'customGradient' => null,

diff --git a/lib/theme.json b/lib/theme.json
@@ -170,6 +170,8 @@
 				}
 			],
 			"custom": true,
+			"corePalette": true,
+			"coreGradients": true,
 			"customDuotone": true,
 			"customGradient": true,
 			"link": false,

diff --git a/packages/block-editor/src/components/colors-gradients/panel-color-gradient-settings.js b/packages/block-editor/src/components/colors-gradients/panel-color-gradient-settings.js
@@ -175,9 +175,11 @@ const PanelColorGradientSettingsMultipleSelect = ( props ) => {
 	const userColors = useSetting( 'color.palette.user' );
 	const themeColors = useSetting( 'color.palette.theme' );
 	const coreColors = useSetting( 'color.palette.core' );
+	const shouldDisplayCoreColors = useSetting( 'color.corePalette' );
+
 	colorGradientSettings.colors = useMemo( () => {
 		const result = [];
-		if ( coreColors && coreColors.length ) {
+		if ( shouldDisplayCoreColors && coreColors && coreColors.length ) {
 			result.push( {
 				name: __( 'Core' ),
 				colors: coreColors,
@@ -201,9 +203,14 @@ const PanelColorGradientSettingsMultipleSelect = ( props ) => {
 	const userGradients = useSetting( 'color.gradients.user' );
 	const themeGradients = useSetting( 'color.gradients.theme' );
 	const coreGradients = useSetting( 'color.gradients.core' );
+	const shouldDisplayCoreGradients = useSetting( 'color.coreGradients' );
 	colorGradientSettings.gradients = useMemo( () => {
 		const result = [];
-		if ( coreGradients && coreGradients.length ) {
+		if (
+			shouldDisplayCoreGradients &&
+			coreGradients &&
+			coreGradients.length
+		) {
 			result.push( {
 				name: __( 'Core' ),
 				gradients: coreGradients,

diff --git a/schemas/json/theme.json b/schemas/json/theme.json
@@ -45,6 +45,16 @@
 							"type": "boolean",
 							"default": true
 						},
+						"corePalette": {
+							"description": "Allow users to choose colors from the Core palette. \nGutenberg plugin required.",
+							"type": "boolean",
+							"default": true
+						},
+						"coreGradients": {
+							"description": "Allow users to choose colors from the Core gradients. \nGutenberg plugin required.",
+							"type": "boolean",
+							"default": true
+						},
 						"custom": {
 							"description": "Allow users to select custom colors.\nSince 5.8.",
 							"type": "boolean",