Changeset 52049 for trunk/src/wp-includes/block-editor.php

Timestamp:

11/08/2021 07:18:39 PM (2 years ago)

Author:

jorgefilipecosta

Message:

Update theme.json classes for WordPress 5.9.

This commit ports to core the changes to the classes that deal with theme.json code.

See #54336.
Props oandregal, spacedmonkey, noisysocks, hellofromtonya, youknowriad.

File:

• trunk/src/wp-includes/block-editor.php (modified) (3 diffs)

trunk/src/wp-includes/block-editor.php

@@ -304 +304 @@
     );
 
-    $theme_json = WP_Theme_JSON_Resolver::get_merged_data( $editor_settings );
+    $theme_json = WP_Theme_JSON_Resolver::get_merged_data();
 
     if ( WP_Theme_JSON_Resolver::theme_has_support() ) {
         $editor_settings['styles'][] = array(
-            'css'            => $theme_json->get_stylesheet( 'block_styles' ),
+            'css'            => $theme_json->get_stylesheet( array( 'styles', 'presets' ) ),
             '__unstableType' => 'globalStyles',
         );
         $editor_settings['styles'][] = array(
-            'css'                     => $theme_json->get_stylesheet( 'css_variables' ),
+            'css'                     => $theme_json->get_stylesheet( array( 'variables' ) ),
             '__experimentalNoWrapper' => true,
             '__unstableType'          => 'globalStyles',
@@ -359 +359 @@
         unset( $editor_settings['__experimentalFeatures']['typography']['customFontSize'] );
     }
-    if ( isset( $editor_settings['__experimentalFeatures']['typography']['customLineHeight'] ) ) {
-        $editor_settings['enableCustomLineHeight'] = $editor_settings['__experimentalFeatures']['typography']['customLineHeight'];
-        unset( $editor_settings['__experimentalFeatures']['typography']['customLineHeight'] );
+    if ( isset( $editor_settings['__experimentalFeatures']['typography']['lineHeight'] ) ) {
+        $editor_settings['enableCustomLineHeight'] = $editor_settings['__experimentalFeatures']['typography']['lineHeight'];
+        unset( $editor_settings['__experimentalFeatures']['typography']['lineHeight'] );
     }
     if ( isset( $editor_settings['__experimentalFeatures']['spacing']['units'] ) ) {
@@ -367 +367 @@
         unset( $editor_settings['__experimentalFeatures']['spacing']['units'] );
     }
-    if ( isset( $editor_settings['__experimentalFeatures']['spacing']['customPadding'] ) ) {
-        $editor_settings['enableCustomSpacing'] = $editor_settings['__experimentalFeatures']['spacing']['customPadding'];
-        unset( $editor_settings['__experimentalFeatures']['spacing']['customPadding'] );
+    if ( isset( $editor_settings['__experimentalFeatures']['spacing']['padding'] ) ) {
+        $editor_settings['enableCustomSpacing'] = $editor_settings['__experimentalFeatures']['spacing']['padding'];
+        unset( $editor_settings['__experimentalFeatures']['spacing']['padding'] );
     }