Changeset 57885

Timestamp:

03/27/2024 03:58:46 PM (8 months ago)

Author:

swissspidy

Message:

Editor: disable shadow.defaultPresets for classic themes.

With this change default shadow presets are never shown for classic themes, and classic themes have no options for adding custom ones.
This essentially reverts [57717] and [57827] / [57828], which had unintended consequences.

Props ajlende, oandregal, madhudollu, swissspidy, get_dave, andrewserong, desrosj.
Fixes #60815.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme-json-resolver.php (modified) (1 diff)
• src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)
• src/wp-includes/theme.json (modified) (1 diff)
• tests/phpunit/data/themedir1/block-theme/theme.json (modified) (1 diff)
• tests/phpunit/tests/theme/wpThemeJson.php (modified) (2 diffs)
• tests/phpunit/tests/theme/wpThemeJsonResolver.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-theme-json-resolver.php

@@ -312 +312 @@
             }
             $theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;
+
+            if ( ! isset( $theme_support_data['settings']['shadow'] ) ) {
+                $theme_support_data['settings']['shadow'] = array();
+            }
+            /*
+             * Shadow presets are explicitly disabled for classic themes until a
+             * decision is made for whether the default presets should match the
+             * other presets or if they should be disabled by default in classic
+             * themes. See https://github.com/WordPress/gutenberg/issues/59989.
+             */
+            $theme_support_data['settings']['shadow']['defaultPresets'] = false;
 
             // Allow themes to enable link color setting via theme_support.

trunk/src/wp-includes/class-wp-theme-json.php

@@ -659 +659 @@
      * @since 6.2.0 Added `dimensions.minHeight` and `position.sticky`.
      * @since 6.4.0 Added `background.backgroundImage`.
-     * @since 6.5.0 Added `background.backgroundSize`, `dimensions.aspectRatio`, and `shadow.defaultPresets`.
+     * @since 6.5.0 Added `background.backgroundSize` and `dimensions.aspectRatio`.
      * @var array
      */
@@ -680 +680 @@
         array( 'spacing', 'padding' ),
         array( 'typography', 'lineHeight' ),
-        array( 'shadow', 'defaultPresets' ),
     );
 

trunk/src/wp-includes/theme.json

@@ -192 +192 @@
         },
         "shadow": {
-            "defaultPresets": false,
+            "defaultPresets": true,
             "presets": [
                 {

trunk/tests/phpunit/data/themedir1/block-theme/theme.json

@@ -49 +49 @@
             "padding": true,
             "blockGap": true
+        },
+        "shadow": {
+            "presets": [
+                {
+                    "name": "Natural",
+                    "slug": "natural",
+                    "shadow": "2px 2px 3px #000"
+                },
+                {
+                    "name": "Test",
+                    "slug": "test",
+                    "shadow": "2px 2px 3px #000"
+                }
+            ]
         },
         "blocks": {

trunk/tests/phpunit/tests/theme/wpThemeJson.php

@@ -294 +294 @@
                 'lineHeight' => true,
             ),
-            'shadow'     => array(
-                'defaultPresets' => true,
-            ),
             'blocks'     => array(
                 'core/paragraph' => array(
@@ -334 +331 @@
                     'typography' => array(
                         'lineHeight' => false,
-                    ),
-                    'shadow'     => array(
-                        'defaultPresets' => true,
                     ),
                 ),

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -202 +202 @@
                     'blockGap' => true,
                 ),
+                'shadow'     => array(
+                    'presets' => array(
+                        'theme' => array(
+                            array(
+                                'name'   => 'Natural',
+                                'slug'   => 'natural',
+                                'shadow' => '2px 2px 3px #000',
+                            ),
+                            array(
+                                'name'   => 'Test',
+                                'slug'   => 'test',
+                                'shadow' => '2px 2px 3px #000',
+                            ),
+                        ),
+                    ),
+                ),
                 'blocks'     => array(
                     'core/paragraph' => array(
@@ -556 +572 @@
                             'slug' => 'custom',
                             'size' => '100px',
+                        ),
+                    ),
+                ),
+            ),
+            'shadow'     => array(
+                'presets' => array(
+                    'theme' => array(
+                        array(
+                            'name'   => 'Natural',
+                            'slug'   => 'natural',
+                            'shadow' => '2px 2px 3px #000',
+                        ),
+                        array(
+                            'name'   => 'Test',
+                            'slug'   => 'test',
+                            'shadow' => '2px 2px 3px #000',
                         ),
                     ),
@@ -1071 +1103 @@
         );
     }
+
+    /**
+     * @ticket 60815
+     */
+    public function test_theme_shadow_presets_do_not_override_default_shadow_presets() {
+        switch_theme( 'block-theme' );
+
+        $theme_json_resolver = new WP_Theme_JSON_Resolver();
+        $theme_json          = $theme_json_resolver->get_merged_data();
+        $actual_settings     = $theme_json->get_settings()['shadow']['presets'];
+
+        $expected_settings = array(
+            'default' => array(
+                array(
+                    'name'   => 'Natural',
+                    'shadow' => '6px 6px 9px rgba(0, 0, 0, 0.2)',
+                    'slug'   => 'natural',
+                ),
+                array(
+                    'name'   => 'Deep',
+                    'shadow' => '12px 12px 50px rgba(0, 0, 0, 0.4)',
+                    'slug'   => 'deep',
+                ),
+                array(
+                    'name'   => 'Sharp',
+                    'shadow' => '6px 6px 0px rgba(0, 0, 0, 0.2)',
+                    'slug'   => 'sharp',
+                ),
+                array(
+                    'name'   => 'Outlined',
+                    'shadow' => '6px 6px 0px -3px rgba(255, 255, 255, 1), 6px 6px rgba(0, 0, 0, 1)',
+                    'slug'   => 'outlined',
+                ),
+                array(
+                    'name'   => 'Crisp',
+                    'shadow' => '6px 6px 0px rgba(0, 0, 0, 1)',
+                    'slug'   => 'crisp',
+                ),
+            ),
+            'theme'   => array(
+                array(
+                    'name'   => 'Test',
+                    'shadow' => '2px 2px 3px #000',
+                    'slug'   => 'test',
+                ),
+            ),
+        );
+
+        wp_recursive_ksort( $actual_settings );
+        wp_recursive_ksort( $expected_settings );
+
+        $this->assertSame(
+            $expected_settings,
+            $actual_settings
+        );
+    }
+
+    /**
+     * @ticket 60815
+     */
+    public function test_shadow_default_presets_value_for_block_and_classic_themes() {
+        $theme_json_resolver = new WP_Theme_JSON_Resolver();
+        $theme_json          = $theme_json_resolver->get_merged_data();
+
+        $default_presets_for_classic = $theme_json->get_settings()['shadow']['defaultPresets'];
+        $this->assertFalse( $default_presets_for_classic );
+
+        switch_theme( 'block-theme' );
+        $theme_json_resolver = new WP_Theme_JSON_Resolver();
+        $theme_json          = $theme_json_resolver->get_merged_data();
+
+        $default_presets_for_block = $theme_json->get_settings()['shadow']['defaultPresets'];
+        $this->assertTrue( $default_presets_for_block );
+    }
 }