Skip to content

Commit

Permalink
stabilize-experimentalBorder php file changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@benazeer-ben
benazeer-ben committed Oct 30, 2024
1 parent 695476e commit 1f74443
Showing 1 changed file with 30 additions and 12 deletions.
42 changes: 30 additions & 12 deletions src/wp-includes/block-supports/border.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ function wp_register_border_support( $block_type ) {
$block_type->attributes = array();
}

if ( block_has_support( $block_type, '__experimentalBorder' ) && ! array_key_exists( 'style', $block_type->attributes ) ) {
if ( ( block_has_support( $block_type, 'border' ) || block_has_support( $block_type, '__experimentalBorder' ) ) &&
! array_key_exists( 'style', $block_type->attributes ) ) {
$block_type->attributes['style'] = array(
'type' => 'object',
);
Expand Down Expand Up @@ -60,7 +61,8 @@ function wp_apply_border_support( $block_type, $block_attributes ) {
if (
wp_has_border_feature_support( $block_type, 'radius' ) &&
isset( $block_attributes['style']['border']['radius'] ) &&
! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'radius' )
( ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'radius' ) ||
! wp_should_skip_block_supports_serialization( $block_type, 'border', 'radius' ) )
) {
$border_radius = $block_attributes['style']['border']['radius'];

Expand All @@ -75,7 +77,8 @@ function wp_apply_border_support( $block_type, $block_attributes ) {
if (
wp_has_border_feature_support( $block_type, 'style' ) &&
isset( $block_attributes['style']['border']['style'] ) &&
! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'style' )
( ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'style' ) ||
! wp_should_skip_block_supports_serialization( $block_type, 'border', 'style' ) )
) {
$border_block_styles['style'] = $block_attributes['style']['border']['style'];
}
Expand All @@ -84,7 +87,8 @@ function wp_apply_border_support( $block_type, $block_attributes ) {
if (
$has_border_width_support &&
isset( $block_attributes['style']['border']['width'] ) &&
! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'width' )
( ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'width' ) ||
! wp_should_skip_block_supports_serialization( $block_type, 'border', 'width' ) )
) {
$border_width = $block_attributes['style']['border']['width'];

Expand All @@ -99,7 +103,8 @@ function wp_apply_border_support( $block_type, $block_attributes ) {
// Border color.
if (
$has_border_color_support &&
! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'color' )
( ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'color' ) ||
! wp_should_skip_block_supports_serialization( $block_type, 'border', 'color' ) )
) {
$preset_border_color = array_key_exists( 'borderColor', $block_attributes ) ? "var:preset|color|{$block_attributes['borderColor']}" : null;
$custom_border_color = isset( $block_attributes['style']['border']['color'] ) ? $block_attributes['style']['border']['color'] : null;
Expand All @@ -111,9 +116,23 @@ function wp_apply_border_support( $block_type, $block_attributes ) {
foreach ( array( 'top', 'right', 'bottom', 'left' ) as $side ) {
$border = isset( $block_attributes['style']['border'][ $side ] ) ? $block_attributes['style']['border'][ $side ] : null;
$border_side_values = array(
'width' => isset( $border['width'] ) && ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'width' ) ? $border['width'] : null,
'color' => isset( $border['color'] ) && ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'color' ) ? $border['color'] : null,
'style' => isset( $border['style'] ) && ! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'style' ) ? $border['style'] : null,
'width' => isset( $border['width'] ) &&
! ( wp_should_skip_block_supports_serialization( $block_type, 'border', 'width' ) ||
wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'width' ) )
? $border['width']
: null,

'color' => isset( $border['color'] ) &&
! ( wp_should_skip_block_supports_serialization( $block_type, 'border', 'color' ) ||
wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'color' ) )
? $border['color']
: null,

'style' => isset( $border['style'] ) &&
! ( wp_should_skip_block_supports_serialization( $block_type, 'border', 'style' ) ||
wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'style' ) )
? $border['style']
: null,
);
$border_block_styles[ $side ] = $border_side_values;
}
Expand Down Expand Up @@ -153,17 +172,16 @@ function wp_apply_border_support( $block_type, $block_attributes ) {
function wp_has_border_feature_support( $block_type, $feature, $default_value = false ) {
// Check if all border support features have been opted into via `"__experimentalBorder": true`.
if ( $block_type instanceof WP_Block_Type ) {
$block_type_supports_border = isset( $block_type->supports['__experimentalBorder'] )
? $block_type->supports['__experimentalBorder']
: $default_value;
$block_type_supports_border = $block_type->supports['border'] ?? $block_type->supports['__experimentalBorder'] ?? $default_value;
if ( true === $block_type_supports_border ) {
return true;
}
}

// Check if the specific feature has been opted into individually
// via nested flag under `__experimentalBorder`.
return block_has_support( $block_type, array( '__experimentalBorder', $feature ), $default_value );
return block_has_support( $block_type, array( '__experimentalBorder', $feature ), $default_value )
|| block_has_support( $block_type, array( 'border', $feature ), $default_value );
}

// Register the block support.
Expand Down

0 comments on commit 1f74443

Please sign in to comment.