Changeset 54118 for trunk/src/wp-includes/script-loader.php

Timestamp:

09/10/2022 12:37:00 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Editor: Backport Elements API updates.

This commit backports the original PRs from Gutenberg repository:

• ​#40260 Add support for button elements to theme.json
• ​#40889 Theme Json: Don't output double selectors for elements inside blocks
• ​#41140 Global Styles: Add support for caption elements
• ​#41160 Global Styles: Load block CSS conditionally
• ​#41240 Global Styles: Button Element: update button element selector
• ​#41335 Duotone: Fix CSS Selectors rendered by theme.json duotone/filter settings for blocks on public pages
• ​#41446 Block styles: Account for style block nodes that have no name
• ​#41696 Global Styles: Allow references to values in other locations in the tree
• ​#41753 Elements: Add an API make it easier to get class names
• ​#41786 Support pseudo selectors on elements in theme json
• ​#41822 Elements: Button - Fix element selectors
• ​#41981 Global Styles: Add support for heading elements
• ​#42072 Fix link element hover bleeding into button element default styles
• ​#42096 Add visited to link element allowed pseudo selector list
• ​#42669 Link elements: Add a :where selector to the :not to lower specificity
• ​#42776 Theme JSON: Add a static $blocks_metadata data definition to the Gutenberg instance of WP_Theme_JSON
• ​#43088 Pseudo elements supports on button elements
• ​#43167 Theme_JSON: Use existing append_to_selector for pseudo elements
• ​#43988 Styles API: Fixed selectors for nested elements

Props onemaggie, bernhard-reiter, cbravobernal, mmaattiiaass, scruffian, andraganescu, dpcalhoun, get_dave, Mamaduka, SergeyBiryukov.
See #56467.

File:

• trunk/src/wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-includes/script-loader.php

@@ -2355 +2355 @@
 
 /**
+ * Applies a filter to the list of style nodes that comes from WP_Theme_JSON::get_style_nodes().
+ *
+ * This particular filter removes all of the blocks from the array.
+ *
+ * We want WP_Theme_JSON to be ignorant of the implementation details of how the CSS is being used.
+ * This filter allows us to modify the output of WP_Theme_JSON depending on whether or not we are
+ * loading separate assets, without making the class aware of that detail.
+ *
+ * @since 6.1.0
+ *
+ * @param array $nodes The nodes to filter.
+ * @return array A filtered array of style nodes.
+ */
+function wp_filter_out_block_nodes( $nodes ) {
+    return array_filter(
+        $nodes,
+        function( $node ) {
+            return ! in_array( 'blocks', $node['path'], true );
+        },
+        ARRAY_FILTER_USE_BOTH
+    );
+}
+
+/**
  * Enqueues the global styles defined via theme.json.
  *
@@ -2376 +2400 @@
     ) {
         return;
+    }
+
+    /*
+     * If we are loading CSS for each block separately, then we can load the theme.json CSS conditionally.
+     * This removes the CSS from the global-styles stylesheet and adds it to the inline CSS for each block.
+     */
+    if ( $separate_assets ) {
+        add_filter( 'get_style_nodes', 'wp_filter_out_block_nodes' );
+        // Add each block as an inline css.
+        wp_add_global_styles_for_blocks();
     }