From 36782a3557e0f536d7dfb2082d8186ae3508d1f0 Mon Sep 17 00:00:00 2001
From: Alex Lende <alex@lende.xyz>
Date: Thu, 10 Feb 2022 12:58:44 -0600
Subject: [PATCH] Prevent generating other default presets

---
 .../wordpress-5.9/class-wp-theme-json-5-9.php | 86 ++++++++++---------
 1 file changed, 47 insertions(+), 39 deletions(-)

diff --git a/lib/compat/wordpress-5.9/class-wp-theme-json-5-9.php b/lib/compat/wordpress-5.9/class-wp-theme-json-5-9.php
index 3557cd7b4f3b31..dd304fe5b7ee21 100644
--- a/lib/compat/wordpress-5.9/class-wp-theme-json-5-9.php
+++ b/lib/compat/wordpress-5.9/class-wp-theme-json-5-9.php
@@ -104,53 +104,58 @@ class WP_Theme_JSON_5_9 {
 	 */
 	const PRESETS_METADATA = array(
 		array(
-			'path'              => array( 'color', 'palette' ),
-			'prevent_override'  => array( 'color', 'defaultPalette' ),
-			'use_default_names' => false,
-			'value_key'         => 'color',
-			'css_vars'          => '--wp--preset--color--$slug',
-			'classes'           => array(
+			'path'                => array( 'color', 'palette' ),
+			'prevent_override'    => array( 'color', 'defaultPalette' ),
+			'use_default_presets' => array( 'color', 'defaultPalette' ),
+			'use_default_names'   => false,
+			'value_key'           => 'color',
+			'css_vars'            => '--wp--preset--color--$slug',
+			'classes'             => array(
 				'.has-$slug-color'            => 'color',
 				'.has-$slug-background-color' => 'background-color',
 				'.has-$slug-border-color'     => 'border-color',
 			),
-			'properties'        => array( 'color', 'background-color', 'border-color' ),
+			'properties'          => array( 'color', 'background-color', 'border-color' ),
 		),
 		array(
-			'path'              => array( 'color', 'gradients' ),
-			'prevent_override'  => array( 'color', 'defaultGradients' ),
-			'use_default_names' => false,
-			'value_key'         => 'gradient',
-			'css_vars'          => '--wp--preset--gradient--$slug',
-			'classes'           => array( '.has-$slug-gradient-background' => 'background' ),
-			'properties'        => array( 'background' ),
+			'path'                => array( 'color', 'gradients' ),
+			'prevent_override'    => array( 'color', 'defaultGradients' ),
+			'use_default_presets' => array( 'color', 'defaultGradients' ),
+			'use_default_names'   => false,
+			'value_key'           => 'gradient',
+			'css_vars'            => '--wp--preset--gradient--$slug',
+			'classes'             => array( '.has-$slug-gradient-background' => 'background' ),
+			'properties'          => array( 'background' ),
 		),
 		array(
-			'path'              => array( 'color', 'duotone' ),
-			'prevent_override'  => array( 'color', 'defaultDuotone' ),
-			'use_default_names' => false,
-			'value_func'        => 'gutenberg_get_duotone_filter_property',
-			'css_vars'          => '--wp--preset--duotone--$slug',
-			'classes'           => array(),
-			'properties'        => array( 'filter' ),
+			'path'                => array( 'color', 'duotone' ),
+			'prevent_override'    => array( 'color', 'defaultDuotone' ),
+			'use_default_presets' => array( 'color', 'defaultDuotone' ),
+			'use_default_names'   => false,
+			'value_func'          => 'gutenberg_get_duotone_filter_property',
+			'css_vars'            => '--wp--preset--duotone--$slug',
+			'classes'             => array(),
+			'properties'          => array( 'filter' ),
 		),
 		array(
-			'path'              => array( 'typography', 'fontSizes' ),
-			'prevent_override'  => false,
-			'use_default_names' => true,
-			'value_key'         => 'size',
-			'css_vars'          => '--wp--preset--font-size--$slug',
-			'classes'           => array( '.has-$slug-font-size' => 'font-size' ),
-			'properties'        => array( 'font-size' ),
+			'path'                => array( 'typography', 'fontSizes' ),
+			'prevent_override'    => false,
+			'use_default_presets' => true,
+			'use_default_names'   => true,
+			'value_key'           => 'size',
+			'css_vars'            => '--wp--preset--font-size--$slug',
+			'classes'             => array( '.has-$slug-font-size' => 'font-size' ),
+			'properties'          => array( 'font-size' ),
 		),
 		array(
-			'path'              => array( 'typography', 'fontFamilies' ),
-			'prevent_override'  => false,
-			'use_default_names' => false,
-			'value_key'         => 'fontFamily',
-			'css_vars'          => '--wp--preset--font-family--$slug',
-			'classes'           => array( '.has-$slug-font-family' => 'font-family' ),
-			'properties'        => array( 'font-family' ),
+			'path'                => array( 'typography', 'fontFamilies' ),
+			'prevent_override'    => false,
+			'use_default_presets' => true,
+			'use_default_names'   => false,
+			'value_key'           => 'fontFamily',
+			'css_vars'            => '--wp--preset--font-family--$slug',
+			'classes'             => array( '.has-$slug-font-family' => 'font-family' ),
+			'properties'          => array( 'font-family' ),
 		),
 	);
 
@@ -1027,9 +1032,7 @@ private static function scope_selector( $scope, $selector ) {
 	private static function get_settings_values_by_slug( $settings, $preset_metadata, $origins ) {
 		$preset_per_origin = _wp_array_get( $settings, $preset_metadata['path'], array() );
 
-		$skip_default_presets =
-			array( 'color', 'duotone' ) === $preset_metadata['path'] &&
-			! _wp_array_get( $settings, array( 'color', 'defaultDuotone' ), true );
+		$skip_default_presets = ! self::get_metadata_boolean( $settings, $preset_metadata['use_default_presets'], true );
 
 		$result = array();
 		foreach ( $origins as $origin ) {
@@ -1074,9 +1077,14 @@ private static function get_settings_values_by_slug( $settings, $preset_metadata
 	private static function get_settings_slugs( $settings, $preset_metadata, $origins = self::VALID_ORIGINS ) {
 		$preset_per_origin = _wp_array_get( $settings, $preset_metadata['path'], array() );
 
+		$skip_default_presets = ! self::get_metadata_boolean( $settings, $preset_metadata['use_default_presets'], true );
+
 		$result = array();
 		foreach ( $origins as $origin ) {
-			if ( ! isset( $preset_per_origin[ $origin ] ) ) {
+			if (
+				! isset( $preset_per_origin[ $origin ] ) ||
+				( 'default' === $origin && $skip_default_presets )
+			) {
 				continue;
 			}
 			foreach ( $preset_per_origin[ $origin ] as $preset ) {