Changeset 56044 for trunk/src/wp-includes/blocks.php

Timestamp:

06/26/2023 09:15:21 PM (3 years ago)

Author:

spacedmonkey

Message:

Editor: Register core block styles in one place.

Register all core blocks in a new function called register_core_block_style_handles. This mirrors the function wp_default_styles where all core styles are registered in one place. This improves block registration performance, as it avoids expensive file lookups, like realpath in register_block_style_handle. The new function register_core_block_style_handles uses glob to get all css files in the blocks directory. This glob is cached in a transient to save lookups on subsequent requests. The function register_block_style_handle now checks to see if the style handle is already registered before trying to register it again.

Props mukesh27, westonruter, flixos90, joemcgill, spacedmonkey.
Fixes #58528.

File:

• trunk/src/wp-includes/blocks.php (modified) (6 diffs)

trunk/src/wp-includes/blocks.php

@@ -187 +187 @@
     }
 
+    $style_handle = $metadata[ $field_name ];
+    if ( is_array( $style_handle ) ) {
+        if ( empty( $style_handle[ $index ] ) ) {
+            return false;
+        }
+        $style_handle = $style_handle[ $index ];
+    }
+
+    $style_handle_name = generate_block_asset_handle( $metadata['name'], $field_name, $index );
+    // If the style handle is already registered, skip re-registering.
+    if ( wp_style_is( $style_handle_name, 'registered' ) ) {
+        return $style_handle_name;
+    }
+
     static $wpinc_path_norm = '';
     if ( ! $wpinc_path_norm ) {
@@ -196 +210 @@
     if ( $is_core_block && ! wp_should_load_separate_core_block_assets() ) {
         return false;
-    }
-
-    $style_handle = $metadata[ $field_name ];
-    if ( is_array( $style_handle ) ) {
-        if ( empty( $style_handle[ $index ] ) ) {
-            return false;
-        }
-        $style_handle = $style_handle[ $index ];
     }
 
@@ -247 +253 @@
     }
 
-    $style_handle = generate_block_asset_handle( $metadata['name'], $field_name, $index );
-    $version      = ! $is_core_block && isset( $metadata['version'] ) ? $metadata['version'] : false;
-    $result       = wp_register_style(
-        $style_handle,
+    $version = ! $is_core_block && isset( $metadata['version'] ) ? $metadata['version'] : false;
+    $result  = wp_register_style(
+        $style_handle_name,
         $style_uri,
         array(),
@@ -260 +265 @@
 
     if ( $has_style_file ) {
-        wp_style_add_data( $style_handle, 'path', $style_path_norm );
+        wp_style_add_data( $style_handle_name, 'path', $style_path_norm );
 
         if ( $is_core_block ) {
@@ -269 +274 @@
 
         if ( is_rtl() && file_exists( $rtl_file ) ) {
-            wp_style_add_data( $style_handle, 'rtl', 'replace' );
-            wp_style_add_data( $style_handle, 'suffix', $suffix );
-            wp_style_add_data( $style_handle, 'path', $rtl_file );
-        }
-    }
-
-    return $style_handle;
+            wp_style_add_data( $style_handle_name, 'rtl', 'replace' );
+            wp_style_add_data( $style_handle_name, 'suffix', $suffix );
+            wp_style_add_data( $style_handle_name, 'path', $rtl_file );
+        }
+    }
+
+    return $style_handle_name;
 }
 
@@ -321 +326 @@
     static $core_blocks_meta;
     if ( ! $core_blocks_meta ) {
-        $core_blocks_meta = require_once ABSPATH . WPINC . '/blocks/blocks-json.php';
+        $core_blocks_meta = require ABSPATH . WPINC . '/blocks/blocks-json.php';
     }