Skip to content

Fix flex child fixed width and introduce max width option #12172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tellthemachines wants to merge 1 commit into from
+191 −3
Closed

Fix flex child fixed width and introduce max width option #12172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions src/wp-includes/block-supports/layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,45 @@ function wp_get_child_layout_style_rules( $selector, $child_layout, $parent_layo
return array_key_exists( $property, $viewport_overrides );
};

$self_stretch = $child_layout['selfStretch'] ?? null;
$self_stretch = $child_layout['selfStretch'] ?? null;
$base_self_stretch = $base_child_layout['selfStretch'] ?? null;

/*
* These are the serialized `selfStretch` values. `max` used to be called
* "Fixed" in the UI, but was renamed and replaced by `fixedNoShrink`.
*/
$flex_child_layout_values = array(
'fit' => 'fit',
'grow' => 'fill',
'max' => 'fixed',
'fixed' => 'fixedNoShrink',
);
$flex_size_values = array(
$flex_child_layout_values['max'],
$flex_child_layout_values['fixed'],
);

if ( null === $viewport_overrides || $has_viewport_property_override( 'selfStretch' ) || $has_viewport_property_override( 'flexSize' ) ) {
if ( 'fixed' === $self_stretch && isset( $child_layout['flexSize'] ) ) {
if (
null !== $viewport_overrides &&
( $flex_child_layout_values['fit'] === $self_stretch || $flex_child_layout_values['grow'] === $self_stretch ) &&
in_array( $base_self_stretch, $flex_size_values, true ) &&
isset( $base_child_layout['flexSize'] )
) {
$child_layout_declarations['flex-basis'] = 'unset';
if ( $flex_child_layout_values['fixed'] === $base_self_stretch ) {
$child_layout_declarations['flex-shrink'] = 'unset';
}
}
if ( in_array( $self_stretch, $flex_size_values, true ) && isset( $child_layout['flexSize'] ) ) {
$child_layout_declarations['flex-basis'] = $child_layout['flexSize'];
if ( $flex_child_layout_values['fixed'] === $self_stretch ) {
$child_layout_declarations['flex-shrink'] = '0';
} elseif ( null !== $viewport_overrides && $flex_child_layout_values['fixed'] === $base_self_stretch ) {
$child_layout_declarations['flex-shrink'] = 'unset';
}
$child_layout_declarations['box-sizing'] = 'border-box';
} elseif ( 'fill' === $self_stretch ) {
} elseif ( $flex_child_layout_values['grow'] === $self_stretch ) {
$child_layout_declarations['flex-grow'] = '1';
}
}
Expand Down
156 changes: 156 additions & 0 deletions tests/phpunit/tests/block-supports/layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,162 @@ public function data_restore_group_inner_container() {
);
}

/**
* Check that wp_get_child_layout_style_rules() renders flex child sizing styles.
*
* @dataProvider data_wp_get_child_layout_style_rules
*
* @covers ::wp_get_child_layout_style_rules
*
* @param array $child_layout Child layout values.
* @param array|null $viewport_overrides Optional child viewport layout overrides.
* @param array $expected_output The expected output.
*/
public function test_wp_get_child_layout_style_rules( $child_layout, $viewport_overrides, $expected_output ) {
$actual_output = wp_get_child_layout_style_rules(
'.wp-container-content-test',
$child_layout,
array(),
$viewport_overrides
);

$this->assertSame( $expected_output, $actual_output );
}

/**
* Data provider for test_wp_get_child_layout_style_rules().
*
* @return array
*/
public function data_wp_get_child_layout_style_rules() {
return array(
'legacy fixed sizing remains shrinkable' => array(
'child_layout' => array(
'selfStretch' => 'fixed',
'flexSize' => '320px',
),
'viewport_overrides' => null,
'expected_output' => array(
array(
'selector' => '.wp-container-content-test',
'declarations' => array(
'flex-basis' => '320px',
'box-sizing' => 'border-box',
),
),
),
),
'fixed sizing can opt out of shrinking' => array(
'child_layout' => array(
'selfStretch' => 'fixedNoShrink',
'flexSize' => '320px',
),
'viewport_overrides' => null,
'expected_output' => array(
array(
'selector' => '.wp-container-content-test',
'declarations' => array(
'flex-basis' => '320px',
'flex-shrink' => '0',
'box-sizing' => 'border-box',
),
),
),
),
'viewport overrides can switch fixedNoShrink to max' => array(
'child_layout' => array(
'selfStretch' => 'fixedNoShrink',
'flexSize' => '320px',
),
'viewport_overrides' => array(
'selfStretch' => 'fixed',
),
'expected_output' => array(
array(
'selector' => '.wp-container-content-test',
'declarations' => array(
'flex-basis' => '320px',
'flex-shrink' => 'unset',
'box-sizing' => 'border-box',
),
),
),
),
'viewport overrides can switch fixedNoShrink to fit' => array(
'child_layout' => array(
'selfStretch' => 'fixedNoShrink',
'flexSize' => '320px',
),
'viewport_overrides' => array(
'selfStretch' => 'fit',
),
'expected_output' => array(
array(
'selector' => '.wp-container-content-test',
'declarations' => array(
'flex-basis' => 'unset',
'flex-shrink' => 'unset',
),
),
),
),
'viewport overrides can switch fixed to fit' => array(
'child_layout' => array(
'selfStretch' => 'fixed',
'flexSize' => '320px',
),
'viewport_overrides' => array(
'selfStretch' => 'fit',
),
'expected_output' => array(
array(
'selector' => '.wp-container-content-test',
'declarations' => array(
'flex-basis' => 'unset',
),
),
),
),
'viewport overrides can switch fixedNoShrink to grow' => array(
'child_layout' => array(
'selfStretch' => 'fixedNoShrink',
'flexSize' => '320px',
),
'viewport_overrides' => array(
'selfStretch' => 'fill',
),
'expected_output' => array(
array(
'selector' => '.wp-container-content-test',
'declarations' => array(
'flex-basis' => 'unset',
'flex-shrink' => 'unset',
'flex-grow' => '1',
),
),
),
),
'viewport overrides can switch fixed to grow' => array(
'child_layout' => array(
'selfStretch' => 'fixed',
'flexSize' => '320px',
),
'viewport_overrides' => array(
'selfStretch' => 'fill',
),
'expected_output' => array(
array(
'selector' => '.wp-container-content-test',
'declarations' => array(
'flex-basis' => 'unset',
'flex-grow' => '1',
),
),
),
),
);
}

/**
* Checks that `wp_add_parent_layout_to_parsed_block` adds the parent layout attribute to the block object.
*
Expand Down
Loading