Changeset 50959

Timestamp:

05/24/2021 08:36:11 AM (4 months ago)

Author:

youknowriad

Message:

Block Editor: Add Global Settings support using theme.json file.

This is the first piece of landing the theme.json processing in WordPress core.
It allows themes to configure the different editor settings, allow cusomizations and define presets in theme.json file.

Props jorgefilipecosta, nosolosw.
See #53175.

Location:

trunk

Files:

• src/wp-includes/block-editor.php (modified) (1 diff)
• src/wp-includes/class-wp-theme-json-resolver.php (added)
• src/wp-includes/class-wp-theme-json.php (added)
• src/wp-includes/theme-i18n.json (added)
• src/wp-includes/theme.json (added)
• src/wp-settings.php (modified) (1 diff)
• tests/phpunit/tests/blocks/class-wp-theme-json-resolver-test.php (added)
• tests/phpunit/tests/blocks/class-wp-theme-json-test.php (added)
• tests/phpunit/tests/blocks/data (added)
• tests/phpunit/tests/blocks/data/languages (added)
• tests/phpunit/tests/blocks/data/languages/themes (added)
• tests/phpunit/tests/blocks/data/languages/themes/fse-pl_PL.po (added)
• tests/phpunit/tests/blocks/data/themedir1 (added)
• tests/phpunit/tests/blocks/data/themedir1/fse (added)
• tests/phpunit/tests/blocks/data/themedir1/fse/style.css (added)
• tests/phpunit/tests/blocks/data/themedir1/fse/theme.json (added)

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

@@ -244 +244 @@
     );
 
+    $editor_settings['__experimentalFeatures'] = WP_Theme_JSON_Resolver::get_merged_data( $editor_settings )->get_settings();
+
+    // These settings may need to be updated based on data coming from theme.json sources.
+    if ( isset( $editor_settings['__experimentalFeatures']['color']['palette'] ) ) {
+        $editor_settings['colors'] = $editor_settings['__experimentalFeatures']['color']['palette'];
+        unset( $editor_settings['__experimentalFeatures']['color']['palette'] );
+    }
+    if ( isset( $editor_settings['__experimentalFeatures']['color']['gradients'] ) ) {
+        $editor_settings['gradients'] = $editor_settings['__experimentalFeatures']['color']['gradients'];
+        unset( $editor_settings['__experimentalFeatures']['color']['gradients'] );
+    }
+    if ( isset( $editor_settings['__experimentalFeatures']['color']['custom'] ) ) {
+        $editor_settings['disableCustomColors'] = $editor_settings['__experimentalFeatures']['color']['custom'];
+        unset( $editor_settings['__experimentalFeatures']['color']['custom'] );
+    }
+    if ( isset( $editor_settings['__experimentalFeatures']['color']['customGradient'] ) ) {
+        $editor_settings['disableCustomGradients'] = $editor_settings['__experimentalFeatures']['color']['customGradient'];
+        unset( $editor_settings['__experimentalFeatures']['color']['customGradient'] );
+    }
+    if ( isset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] ) ) {
+        $editor_settings['fontSizes'] = $editor_settings['__experimentalFeatures']['typography']['fontSizes'];
+        unset( $editor_settings['__experimentalFeatures']['typography']['fontSizes'] );
+    }
+    if ( isset( $editor_settings['__experimentalFeatures']['typography']['customFontSize'] ) ) {
+        $editor_settings['disableCustomFontSizes'] = $editor_settings['__experimentalFeatures']['typography']['customFontSize'];
+        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']['spacing']['units'] ) ) {
+        if ( ! is_array( $editor_settings['__experimentalFeatures']['spacing']['units'] ) ) {
+            $editor_settings['enableCustomUnits'] = false;
+        } else {
+            $editor_settings['enableCustomUnits'] = count( $editor_settings['__experimentalFeatures']['spacing']['units'] ) > 0;
+        }
+        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'] );
+    }
+
     /**
      * Filters the settings to pass to the block editor for all editor type.

trunk/src/wp-settings.php

@@ -296 +296 @@
 require ABSPATH . WPINC . '/blocks.php';
 require ABSPATH . WPINC . '/blocks/index.php';
+require ABSPATH . WPINC . '/class-wp-theme-json.php';
+require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
 require ABSPATH . WPINC . '/block-editor.php';
 require ABSPATH . WPINC . '/block-patterns.php';