Cover the case in which the theme does not provide any color

WordPress · May 19, 2021 · b7050eb · b7050eb
1 parent 5d96f8b
commit b7050eb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/packages/block-editor/src/components/use-setting/index.js b/packages/block-editor/src/components/use-setting/index.js
@@ -49,16 +49,18 @@ const deprecatedFlags = {
 	'spacing.customPadding': ( settings ) => settings.enableCustomSpacing,
 };
 
-const filterColorsFromCoreOrigin = ( path, colors ) => {
+const filterColorsFromCoreOrigin = ( path, setting ) => {
 	if ( path !== 'color.palette' && path !== 'color.gradients' ) {
-		return colors;
+		return setting;
 	}
 
-	if ( ! Array.isArray( colors ) ) {
-		return colors;
+	if ( ! Array.isArray( setting ) ) {
+		return setting;
 	}
 
-	return colors.filter( ( color ) => color?.origin !== 'core' );
+	const colors = setting.filter( ( color ) => color?.origin !== 'core' );
+
+	return colors.length > 0 ? colors : setting;
 };
 
 /**

diff --git a/packages/edit-site/src/components/editor/utils.js b/packages/edit-site/src/components/editor/utils.js
@@ -103,16 +103,18 @@ function getPresetMetadataFromStyleProperty( styleProperty ) {
 export const LINK_COLOR = '--wp--style--color--link';
 export const LINK_COLOR_DECLARATION = `a { color: var(${ LINK_COLOR }, #00e); }`;
 
-const filterColorsFromCoreOrigin = ( path, colors ) => {
+const filterColorsFromCoreOrigin = ( path, setting ) => {
 	if ( path !== 'color.palette' && path !== 'color.gradients' ) {
-		return colors;
+		return setting;
 	}
 
-	if ( ! Array.isArray( colors ) ) {
-		return colors;
+	if ( ! Array.isArray( setting ) ) {
+		return setting;
 	}
 
-	return colors.filter( ( color ) => color?.origin !== 'core' );
+	const colors = setting.filter( ( color ) => color?.origin !== 'core' );
+
+	return colors.length > 0 ? colors : setting;
 };
 
 export function useSetting( path, blockName = '' ) {