Changeset 61190

Timestamp:

11/10/2025 06:41:03 AM (3 months ago)

Author:

wildworks

Message:

Editor: Fix handling of default presets at block level in theme.json

Fix an issue where block-level presets do not work correctly when default presets are disabled and the slug matches a default preset.

Props aaronrobertshaw, bph, ramonopoly, wildworks.
Fixes #64195.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme-json.php (modified) (1 diff)
• tests/phpunit/tests/theme/wpThemeJson.php (modified) (1 diff)

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

@@ -3251 +3251 @@
                 $prevent_override = $preset_metadata['prevent_override'];
                 if ( is_array( $prevent_override ) ) {
-                    $prevent_override = _wp_array_get( $this->theme_json['settings'], $preset_metadata['prevent_override'] );
+                    $global_path  = array_merge( array( 'settings' ), $prevent_override );
+                    $global_value = _wp_array_get( $this->theme_json, $global_path, null );
+
+                    $node_level_path  = array_merge( $node['path'], $prevent_override );
+                    $prevent_override = _wp_array_get( $this->theme_json, $node_level_path, $global_value );
                 }
 

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

@@ -6412 +6412 @@
         $this->assertSame( $expected, $button_variations );
     }
+
+    /**
+     * Tests that block-level settings inherit global default settings when not explicitly set.
+     *
+     * When a block doesn't have its own default presets setting, it should inherit
+     * the global setting from the theme. This affects whether default presets
+     * are filtered out during merging.
+     *
+     * @ticket 64195
+     */
+    public function test_merge_incoming_data_block_level_inherits_global_default_setting() {
+        $defaults = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'color' => array(
+                        'defaultDuotone' => true,
+                        'duotone'        => array(
+                            array(
+                                'slug'   => 'dark-grayscale',
+                                'colors' => array( '#000000', '#7f7f7f' ),
+                                'name'   => 'Default Dark grayscale',
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+            'default'
+        );
+        $theme    = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'color'  => array(
+                        'defaultDuotone' => false,
+                    ),
+                    'blocks' => array(
+                        'core/image' => array(
+                            'color' => array(
+                                // No defaultDuotone setting - should inherit global (false) set by theme.
+                                'duotone' => array(
+                                    array(
+                                        'slug'   => 'dark-grayscale',
+                                        'colors' => array( '#000000', '#7f7f7f' ),
+                                        'name'   => 'Theme Dark grayscale',
+                                    ),
+                                ),
+                            ),
+                        ),
+                        'core/cover' => array(
+                            'color' => array(
+                                'defaultDuotone' => true, // Explicitly enabled at block level
+                                'duotone'        => array(
+                                    array(
+                                        'slug'   => 'dark-grayscale',
+                                        'colors' => array( '#000000', '#7f7f7f' ),
+                                        'name'   => 'Cover Dark grayscale',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            )
+        );
+
+        $expected = array(
+            'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+            'settings' => array(
+                'color'  => array(
+                    'defaultDuotone' => false,
+                    'duotone'        => array(
+                        'default' => array(
+                            array(
+                                'slug'   => 'dark-grayscale',
+                                'colors' => array( '#000000', '#7f7f7f' ),
+                                'name'   => 'Default Dark grayscale',
+                            ),
+                        ),
+                    ),
+                ),
+                'blocks' => array(
+                    'core/image' => array(
+                        'color' => array(
+                            'duotone' => array(
+                                'theme' => array(
+                                    array(
+                                        'slug'   => 'dark-grayscale',
+                                        'colors' => array( '#000000', '#7f7f7f' ),
+                                        'name'   => 'Theme Dark grayscale',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                    'core/cover' => array(
+                        'color' => array(
+                            'defaultDuotone' => true,
+                            'duotone'        => array(
+                                'theme' => array(
+                                    // Should be filtered out because block-level defaults are enabled
+                                    // and slug matches default
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+        );
+
+        $defaults->merge( $theme );
+        $actual = $defaults->get_raw_data();
+
+        $this->assertEqualSetsWithIndex( $expected, $actual );
+    }
+
+    /**
+     * Tests that presets with unique slugs are preserved during merging.
+     *
+     * When merging theme presets, any preset with a slug that doesn't match
+     * a default preset should always be preserved, regardless of default
+     * preset settings. Only presets with matching slugs should be filtered out
+     * when defaults are enabled.
+     *
+     * @ticket 64195
+     */
+    public function test_merge_incoming_data_unique_slugs_always_preserved() {
+        $defaults = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'color' => array(
+                        'defaultDuotone' => true, // Defaults enabled
+                        'duotone'        => array(
+                            array(
+                                'slug'   => 'dark-grayscale',
+                                'colors' => array( '#000000', '#7f7f7f' ),
+                                'name'   => 'Default Dark grayscale',
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+            'default'
+        );
+        $theme    = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'blocks' => array(
+                        'core/image' => array(
+                            'color' => array(
+                                'defaultDuotone' => true, // Block-level defaults enabled
+                                'duotone'        => array(
+                                    array(
+                                        'slug'   => 'custom-unique',
+                                        'colors' => array( '#ff0000', '#00ff00' ),
+                                        'name'   => 'Custom Unique',
+                                    ),
+                                    array(
+                                        'slug'   => 'dark-grayscale', // Matches default slug
+                                        'colors' => array( '#111111', '#888888' ),
+                                        'name'   => 'Theme Dark grayscale',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            )
+        );
+
+        $expected = array(
+            'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+            'settings' => array(
+                'color'  => array(
+                    'defaultDuotone' => true,
+                    'duotone'        => array(
+                        'default' => array(
+                            array(
+                                'slug'   => 'dark-grayscale',
+                                'colors' => array( '#000000', '#7f7f7f' ),
+                                'name'   => 'Default Dark grayscale',
+                            ),
+                        ),
+                    ),
+                ),
+                'blocks' => array(
+                    'core/image' => array(
+                        'color' => array(
+                            'defaultDuotone' => true,
+                            'duotone'        => array(
+                                'theme' => array(
+                                    array(
+                                        'slug'   => 'custom-unique', // Should always be preserved
+                                        'colors' => array( '#ff0000', '#00ff00' ),
+                                        'name'   => 'Custom Unique',
+                                    ),
+                                    // 'dark-grayscale' should be filtered out due to slug match
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+        );
+
+        $defaults->merge( $theme );
+        $actual = $defaults->get_raw_data();
+
+        $this->assertEqualSetsWithIndex( $expected, $actual );
+    }
 }