Changeset 55167

Timestamp:

01/31/2023 03:22:33 PM (2 years ago)

Author:

jorgefilipecosta

Message:

Update: Improve performance of gutenberg_render_layout_support_flag.

Backports ​https://github.com/WordPress/gutenberg/pull/46074 into the core.
render_layout_support_flag is run per block, and inside we called get_global_settings three times. get_global_settings calls get_merged_data, which is costly. render_layout_support_flag is a filter called during the block render. When the blocks start rendering, there is no expectation that the theme.json settings change during the block render, so the settings and their derived information should all be static information of this function.
This simple change removes 3*NUMBER_OF_BLOCKS calls of get_merged_data to just one call.

Props oandregal, aristath, felixarntz, tellthemachines, andrewserong, aaronrobertshaw, aaronrobertshaw.

File:

• trunk/src/wp-includes/block-supports/layout.php (modified) (2 diffs)

trunk/src/wp-includes/block-supports/layout.php

@@ -317 +317 @@
     }
 
-    $block_gap              = wp_get_global_settings( array( 'spacing', 'blockGap' ) );
-    $global_layout_settings = wp_get_global_settings( array( 'layout' ) );
-    $has_block_gap_support  = isset( $block_gap ) ? null !== $block_gap : false;
-    $default_block_layout   = _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
-    $used_layout            = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $default_block_layout;
-
-    if ( isset( $used_layout['inherit'] ) && $used_layout['inherit'] ) {
-        if ( ! $global_layout_settings ) {
-            return $block_content;
-        }
+    $global_settings               = wp_get_global_settings();
+    $block_gap                     = _wp_array_get( $global_settings, array( 'spacing', 'blockGap' ), null );
+    $has_block_gap_support         = isset( $block_gap );
+    $global_layout_settings        = _wp_array_get( $global_settings, array( 'layout' ), null );
+    $root_padding_aware_alignments = _wp_array_get( $global_settings, array( 'useRootPaddingAwareAlignments' ), false );
+
+    $default_block_layout = _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
+    $used_layout          = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $default_block_layout;
+
+    if ( isset( $used_layout['inherit'] ) && $used_layout['inherit'] && ! $global_layout_settings ) {
+        return $block_content;
     }
 
@@ -341 +342 @@
 
     if (
-        wp_get_global_settings( array( 'useRootPaddingAwareAlignments' ) ) &&
+        $root_padding_aware_alignments &&
         isset( $used_layout['type'] ) &&
         'constrained' === $used_layout['type']