Skip to content

Commit

Permalink
Update: Improve performance of gutenberg_render_layout_support_flag. (#…
Browse files Browse the repository at this point in the history
…46074)

* Update: Improve performance of gutenberg_render_layout_support_flag.

* Update lib/block-supports/layout.php

Co-authored-by: Andrew Serong <14988353+andrewserong@users.noreply.github.com>

* Update lib/block-supports/layout.php

Co-authored-by: Andrew Serong <14988353+andrewserong@users.noreply.github.com>

* Update lib/block-supports/layout.php

Co-authored-by: Andrew Serong <14988353+andrewserong@users.noreply.github.com>

* Fix indentation

Co-authored-by: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Co-authored-by: Ari Stathopoulos <aristath@gmail.com>
  • Loading branch information
3 people committed Dec 6, 2022
1 parent ae8714b commit a41ea81
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions lib/block-supports/layout.php
Expand Up @@ -370,16 +370,17 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
return (string) $content;
}

$block_gap = gutenberg_get_global_settings( array( 'spacing', 'blockGap' ) );
$global_layout_settings = gutenberg_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 = gutenberg_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;
}

$class_names = array();
Expand All @@ -393,7 +394,7 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
}

if (
gutenberg_get_global_settings( array( 'useRootPaddingAwareAlignments' ) ) &&
$root_padding_aware_alignments &&
isset( $used_layout['type'] ) &&
'constrained' === $used_layout['type']
) {
Expand Down

0 comments on commit a41ea81

Please sign in to comment.