Changeset 52434 for trunk/src/wp-includes/class-wp-theme-json.php

Timestamp:

01/04/2022 05:37:25 AM (4 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• Site Logo: Add option to set site icon from Site Logo block
• Navigation: Enable even more compact setup state.
• Remove template parts from post content inserter an unstable filter
• Template Editor Mode: Hide editor mode switcher
• Avoid using CSS variables for block gap styles
• Try to fix auto resizing in template part focus mode
• Lower the specificity of font size CSS Custom Properties in the editor
• Site icon: Fix site icon styling to display non-square site icons within a square button
• [Site Editor]: Register block editor shortcuts
• Update regex to handle 404 template slug
• Site Editor: Remove dead code
• [Block Editor]: Restrict delete multi selected blocks shortcut
• Fix: Gradients are not being applied by class
• Update: Make the global styles subtitles font smaller
• Post Content/Title: Reflect changes when previewing post
• ServerSideRender: Fix loading state
• [Block Library]: Fix editable post blocks in Query Loop with zero queryId
• Post Excerpt: Fix previews
• WP59: Contextualize "Export" string to differentiate it from other occurrences in WP Core
• Tools Panel: Fix race conditions caused by conditionally displayed ToolsPanelItems
• ToolsPanel: Allow items to register when panelId is null
• Font Size Picker: Allow non-integers as simple CSS values and in hints
• [Components - FontSizePicker]: Use incremental sequence of numbers as labels for the available font-sizes at the segmented control (conditionally)

See #54487.

File:

• trunk/src/wp-includes/class-wp-theme-json.php (modified) (3 diffs)

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

@@ -318 +318 @@
             'margin'   => null,
             'padding'  => null,
-            'blockGap' => null,
+            'blockGap' => 'top',
         ),
         'typography' => array(
@@ -473 +473 @@
         $output = array_intersect_key( $input, array_flip( self::VALID_TOP_LEVEL_KEYS ) );
 
+        // Some styles are only meant to be available at the top-level (e.g.: blockGap),
+        // hence, the schema for blocks & elements should not have them.
+        $styles_non_top_level = self::VALID_STYLES;
+        foreach ( array_keys( $styles_non_top_level ) as $section ) {
+            foreach ( array_keys( $styles_non_top_level[ $section ] ) as $prop ) {
+                if ( 'top' === $styles_non_top_level[ $section ][ $prop ] ) {
+                    unset( $styles_non_top_level[ $section ][ $prop ] );
+                }
+            }
+        }
+
         // Build the schema based on valid block & element names.
         $schema                 = array();
         $schema_styles_elements = array();
         foreach ( $valid_element_names as $element ) {
-            $schema_styles_elements[ $element ] = self::VALID_STYLES;
+            $schema_styles_elements[ $element ] = $styles_non_top_level;
         }
         $schema_styles_blocks   = array();
@@ -483 +494 @@
         foreach ( $valid_block_names as $block ) {
             $schema_settings_blocks[ $block ]           = self::VALID_SETTINGS;
-            $schema_styles_blocks[ $block ]             = self::VALID_STYLES;
+            $schema_styles_blocks[ $block ]             = $styles_non_top_level;
             $schema_styles_blocks[ $block ]['elements'] = $schema_styles_elements;
         }