From 0ef99821045733e5aba1a566acb143be151fba77 Mon Sep 17 00:00:00 2001
From: Jorge <jorge.costa@developer.pt>
Date: Wed, 18 Nov 2020 18:54:45 +0000
Subject: [PATCH] Global Styles: Keep core and theme preset classes and
 variables even if they are overwritten.

---
 lib/class-wp-theme-json.php | 78 ++++++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 10 deletions(-)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index d662532739e280..20ca9a13b9098c 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -171,7 +171,7 @@ class WP_Theme_JSON {
 	 */
 	const PRESETS_METADATA = array(
 		array(
-			'path'          => array( 'settings', 'color', 'palette' ),
+			'path'          => array( 'color', 'palette' ),
 			'value_key'     => 'color',
 			'css_var_infix' => 'color',
 			'classes'       => array(
@@ -186,7 +186,7 @@ class WP_Theme_JSON {
 			),
 		),
 		array(
-			'path'          => array( 'settings', 'color', 'gradients' ),
+			'path'          => array( 'color', 'gradients' ),
 			'value_key'     => 'gradient',
 			'css_var_infix' => 'gradient',
 			'classes'       => array(
@@ -197,7 +197,7 @@ class WP_Theme_JSON {
 			),
 		),
 		array(
-			'path'          => array( 'settings', 'typography', 'fontSizes' ),
+			'path'          => array( 'typography', 'fontSizes' ),
 			'value_key'     => 'size',
 			'css_var_infix' => 'font-size',
 			'classes'       => array(
@@ -208,13 +208,13 @@ class WP_Theme_JSON {
 			),
 		),
 		array(
-			'path'          => array( 'settings', 'typography', 'fontFamilies' ),
+			'path'          => array( 'typography', 'fontFamilies' ),
 			'value_key'     => 'fontFamily',
 			'css_var_infix' => 'font-family',
 			'classes'       => array(),
 		),
 		array(
-			'path'          => array( 'settings', 'typography', 'fontStyles' ),
+			'path'          => array( 'typography', 'fontStyles' ),
 			'value_key'     => 'slug',
 			'css_var_infix' => 'font-style',
 			'classes'       => array(
@@ -225,7 +225,7 @@ class WP_Theme_JSON {
 			),
 		),
 		array(
-			'path'          => array( 'settings', 'typography', 'fontWeights' ),
+			'path'          => array( 'typography', 'fontWeights' ),
 			'value_key'     => 'slug',
 			'css_var_infix' => 'font-weight',
 			'classes'       => array(
@@ -236,7 +236,7 @@ class WP_Theme_JSON {
 			),
 		),
 		array(
-			'path'          => array( 'settings', 'typography', 'textDecorations' ),
+			'path'          => array( 'typography', 'textDecorations' ),
 			'value_key'     => 'value',
 			'css_var_infix' => 'text-decoration',
 			'classes'       => array(
@@ -247,7 +247,7 @@ class WP_Theme_JSON {
 			),
 		),
 		array(
-			'path'          => array( 'settings', 'typography', 'textTransforms' ),
+			'path'          => array( 'typography', 'textTransforms' ),
 			'value_key'     => 'slug',
 			'css_var_infix' => 'text-transform',
 			'classes'       => array(
@@ -684,9 +684,19 @@ private static function compute_preset_classes( &$stylesheet, $context ) {
 			// and we don't want to increase its specificity.
 			$selector = '';
 		}
+		if ( empty( $context['settings'] ) ) {
+			return;
+		}
 
 		foreach ( self::PRESETS_METADATA as $preset ) {
-			$values = gutenberg_experimental_get( $context, $preset['path'], array() );
+			$values = gutenberg_experimental_get( $context['settings'], $preset['path'], array() );
+			if ( isset( $context['deactivatedSettings'] ) ) {
+				$values = array_merge(
+					gutenberg_experimental_get( $context['deactivatedSettings'], $preset['path'], array() ),
+					$values
+				);
+			}
+
 			foreach ( $values as $value ) {
 				foreach ( $preset['classes'] as $class ) {
 					$stylesheet .= self::to_ruleset(
@@ -721,8 +731,17 @@ private static function compute_preset_classes( &$stylesheet, $context ) {
 	 * @param array $context Input context to process.
 	 */
 	private static function compute_preset_vars( &$declarations, $context ) {
+		if ( empty( $context['settings'] ) ) {
+			return;
+		}
 		foreach ( self::PRESETS_METADATA as $preset ) {
-			$values = gutenberg_experimental_get( $context, $preset['path'], array() );
+			$values = gutenberg_experimental_get( $context['settings'], $preset['path'], array() );
+			if ( isset( $context['deactivatedSettings'] ) ) {
+				$values = array_merge(
+					gutenberg_experimental_get( $context['deactivatedSettings'], $preset['path'], array() ),
+					$values
+				);
+			}
 			foreach ( $values as $value ) {
 				$declarations[] = array(
 					'name'  => '--wp--preset--' . $preset['css_var_infix'] . '--' . $value['slug'],
@@ -916,6 +935,45 @@ public function merge( $theme_json ) {
 			$this->contexts[ $context ]['selector'] = $metadata[ $context ]['selector'];
 			$this->contexts[ $context ]['supports'] = $metadata[ $context ]['supports'];
 
+			// Add the presets to the deactivated settings if they will be overwritten.
+			if (
+				! empty( $incoming_data[ $context ]['settings'] ) &&
+				! empty( $this->contexts[ $context ]['settings'] )
+			) {
+				foreach ( self::PRESETS_METADATA as $preset ) {
+					$incoming_preset = gutenberg_experimental_get(
+						$incoming_data[ $context ]['settings'],
+						$preset['path'],
+						null
+					);
+					$current_preset  = gutenberg_experimental_get(
+						$this->contexts[ $context ]['settings'],
+						$preset['path'],
+						null
+					);
+					// If the preset will be overwritten.
+					if (
+						! empty( $current_preset ) &&
+						! empty( $incoming_preset )
+					) {
+						if ( ! isset( $this->contexts[ $context ]['deactivatedSettings'] ) ) {
+							$this->contexts[ $context ]['deactivatedSettings'] = array();
+						}
+						// Append the presets that will be overwritten to the set of deactivated presets that already exist.
+						$inactive_preset = gutenberg_experimental_get(
+							$this->contexts[ $context ]['deactivatedSettings'],
+							$preset['path'],
+							array()
+						);
+						gutenberg_experimental_set(
+							$this->contexts[ $context ]['deactivatedSettings'],
+							$preset['path'],
+							array_merge( $inactive_preset, $current_preset )
+						);
+					}
+				}
+			}
+
 			foreach ( array( 'settings', 'styles' ) as $subtree ) {
 				if ( ! array_key_exists( $subtree, $incoming_data[ $context ] ) ) {
 					continue;