2021-04-15 17:19:43 +02:00
|
|
|
<?php
|
|
|
|
/**
|
|
|
|
* Border block support flag.
|
|
|
|
*
|
|
|
|
* @package WordPress
|
|
|
|
* @since 5.8.0
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
2021-05-07 13:48:27 +02:00
|
|
|
* Registers the style attribute used by the border feature if needed for block
|
|
|
|
* types that support borders.
|
2021-04-15 17:19:43 +02:00
|
|
|
*
|
2021-05-07 13:48:27 +02:00
|
|
|
* @since 5.8.0
|
2022-09-19 22:14:10 +02:00
|
|
|
* @since 6.1.0 Improved conditional blocks optimization.
|
2021-05-07 13:48:27 +02:00
|
|
|
* @access private
|
2021-04-15 17:19:43 +02:00
|
|
|
*
|
|
|
|
* @param WP_Block_Type $block_type Block Type.
|
|
|
|
*/
|
|
|
|
function wp_register_border_support( $block_type ) {
|
|
|
|
// Setup attributes and styles within that if needed.
|
|
|
|
if ( ! $block_type->attributes ) {
|
|
|
|
$block_type->attributes = array();
|
|
|
|
}
|
|
|
|
|
2023-08-10 18:48:19 +02:00
|
|
|
if ( block_has_support( $block_type, '__experimentalBorder' ) && ! array_key_exists( 'style', $block_type->attributes ) ) {
|
2021-04-15 17:19:43 +02:00
|
|
|
$block_type->attributes['style'] = array(
|
|
|
|
'type' => 'object',
|
|
|
|
);
|
|
|
|
}
|
2021-05-07 13:48:27 +02:00
|
|
|
|
2022-09-19 22:14:10 +02:00
|
|
|
if ( wp_has_border_feature_support( $block_type, 'color' ) && ! array_key_exists( 'borderColor', $block_type->attributes ) ) {
|
2021-05-07 13:48:27 +02:00
|
|
|
$block_type->attributes['borderColor'] = array(
|
|
|
|
'type' => 'string',
|
|
|
|
);
|
|
|
|
}
|
2021-04-15 17:19:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds CSS classes and inline styles for border styles to the incoming
|
|
|
|
* attributes array. This will be applied to the block markup in the front-end.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
2022-09-19 22:14:10 +02:00
|
|
|
* @since 6.1.0 Implemented the style engine to generate CSS and classnames.
|
2021-04-15 17:19:43 +02:00
|
|
|
* @access private
|
|
|
|
*
|
2021-06-23 21:05:57 +02:00
|
|
|
* @param WP_Block_Type $block_type Block type.
|
2021-04-15 17:19:43 +02:00
|
|
|
* @param array $block_attributes Block attributes.
|
|
|
|
* @return array Border CSS classes and inline styles.
|
|
|
|
*/
|
|
|
|
function wp_apply_border_support( $block_type, $block_attributes ) {
|
2022-04-05 14:08:02 +02:00
|
|
|
if ( wp_should_skip_block_supports_serialization( $block_type, 'border' ) ) {
|
2021-05-07 13:48:27 +02:00
|
|
|
return array();
|
|
|
|
}
|
|
|
|
|
2022-09-19 22:14:10 +02:00
|
|
|
$border_block_styles = array();
|
|
|
|
$has_border_color_support = wp_has_border_feature_support( $block_type, 'color' );
|
|
|
|
$has_border_width_support = wp_has_border_feature_support( $block_type, 'width' );
|
2021-04-15 17:19:43 +02:00
|
|
|
|
2021-05-07 13:48:27 +02:00
|
|
|
// Border radius.
|
2021-04-15 17:19:43 +02:00
|
|
|
if (
|
2021-05-19 17:09:27 +02:00
|
|
|
wp_has_border_feature_support( $block_type, 'radius' ) &&
|
2022-04-05 14:08:02 +02:00
|
|
|
isset( $block_attributes['style']['border']['radius'] ) &&
|
|
|
|
! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'radius' )
|
2021-04-15 17:19:43 +02:00
|
|
|
) {
|
2021-11-09 03:17:17 +01:00
|
|
|
$border_radius = $block_attributes['style']['border']['radius'];
|
|
|
|
|
2022-09-19 22:14:10 +02:00
|
|
|
if ( is_numeric( $border_radius ) ) {
|
|
|
|
$border_radius .= 'px';
|
2021-11-09 03:17:17 +01:00
|
|
|
}
|
2022-09-19 22:14:10 +02:00
|
|
|
|
|
|
|
$border_block_styles['radius'] = $border_radius;
|
2021-04-15 17:19:43 +02:00
|
|
|
}
|
|
|
|
|
2021-05-07 13:48:27 +02:00
|
|
|
// Border style.
|
|
|
|
if (
|
2021-05-19 17:09:27 +02:00
|
|
|
wp_has_border_feature_support( $block_type, 'style' ) &&
|
2022-04-05 14:08:02 +02:00
|
|
|
isset( $block_attributes['style']['border']['style'] ) &&
|
|
|
|
! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'style' )
|
2021-05-07 13:48:27 +02:00
|
|
|
) {
|
2022-09-19 22:14:10 +02:00
|
|
|
$border_block_styles['style'] = $block_attributes['style']['border']['style'];
|
2021-05-07 13:48:27 +02:00
|
|
|
}
|
2021-04-15 17:19:43 +02:00
|
|
|
|
2021-05-07 13:48:27 +02:00
|
|
|
// Border width.
|
|
|
|
if (
|
2022-09-19 22:14:10 +02:00
|
|
|
$has_border_width_support &&
|
2022-04-05 14:08:02 +02:00
|
|
|
isset( $block_attributes['style']['border']['width'] ) &&
|
|
|
|
! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'width' )
|
2021-05-07 13:48:27 +02:00
|
|
|
) {
|
2021-11-09 03:17:17 +01:00
|
|
|
$border_width = $block_attributes['style']['border']['width'];
|
|
|
|
|
|
|
|
// This check handles original unitless implementation.
|
|
|
|
if ( is_numeric( $border_width ) ) {
|
|
|
|
$border_width .= 'px';
|
|
|
|
}
|
|
|
|
|
2022-09-19 22:14:10 +02:00
|
|
|
$border_block_styles['width'] = $border_width;
|
2021-04-15 17:19:43 +02:00
|
|
|
}
|
|
|
|
|
2021-05-07 13:48:27 +02:00
|
|
|
// Border color.
|
2022-04-05 14:08:02 +02:00
|
|
|
if (
|
2022-09-19 22:14:10 +02:00
|
|
|
$has_border_color_support &&
|
2022-04-05 14:08:02 +02:00
|
|
|
! wp_should_skip_block_supports_serialization( $block_type, '__experimentalBorder', 'color' )
|
|
|
|
) {
|
2022-09-19 22:14:10 +02:00
|
|
|
$preset_border_color = array_key_exists( 'borderColor', $block_attributes ) ? "var:preset|color|{$block_attributes['borderColor']}" : null;
|
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
|
|
|
$custom_border_color = isset( $block_attributes['style']['border']['color'] ) ? $block_attributes['style']['border']['color'] : null;
|
2022-09-19 22:14:10 +02:00
|
|
|
$border_block_styles['color'] = $preset_border_color ? $preset_border_color : $custom_border_color;
|
|
|
|
}
|
2021-05-07 13:48:27 +02:00
|
|
|
|
2022-09-19 22:14:10 +02:00
|
|
|
// Generates styles for individual border sides.
|
|
|
|
if ( $has_border_color_support || $has_border_width_support ) {
|
|
|
|
foreach ( array( 'top', 'right', 'bottom', 'left' ) as $side ) {
|
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
|
|
|
$border = isset( $block_attributes['style']['border'][ $side ] ) ? $block_attributes['style']['border'][ $side ] : null;
|
2022-09-19 22:14:10 +02:00
|
|
|
$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,
|
|
|
|
);
|
|
|
|
$border_block_styles[ $side ] = $border_side_values;
|
2021-05-07 13:48:27 +02:00
|
|
|
}
|
|
|
|
}
|
2021-04-15 17:19:43 +02:00
|
|
|
|
|
|
|
// Collect classes and styles.
|
|
|
|
$attributes = array();
|
2022-09-19 22:14:10 +02:00
|
|
|
$styles = wp_style_engine_get_styles( array( 'border' => $border_block_styles ) );
|
2021-04-15 17:19:43 +02:00
|
|
|
|
2022-09-19 22:14:10 +02:00
|
|
|
if ( ! empty( $styles['classnames'] ) ) {
|
|
|
|
$attributes['class'] = $styles['classnames'];
|
2021-05-07 13:48:27 +02:00
|
|
|
}
|
|
|
|
|
2022-09-19 22:14:10 +02:00
|
|
|
if ( ! empty( $styles['css'] ) ) {
|
|
|
|
$attributes['style'] = $styles['css'];
|
2021-04-15 17:19:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return $attributes;
|
|
|
|
}
|
|
|
|
|
2021-05-19 17:09:27 +02:00
|
|
|
/**
|
|
|
|
* Checks whether the current block type supports the border feature requested.
|
|
|
|
*
|
|
|
|
* If the `__experimentalBorder` support flag is a boolean `true` all border
|
|
|
|
* support features are available. Otherwise, the specific feature's support
|
|
|
|
* flag nested under `experimentalBorder` must be enabled for the feature
|
|
|
|
* to be opted into.
|
|
|
|
*
|
|
|
|
* @since 5.8.0
|
|
|
|
* @access private
|
|
|
|
*
|
Code Modernization: Rename parameters that use reserved keywords in `wp-includes/block-supports/border.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit renames the `$default` parameter to `$default_value` in `wp_has_border_feature_support()`.
Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239].
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.
Built from https://develop.svn.wordpress.org/trunk@53240
git-svn-id: http://core.svn.wordpress.org/trunk@52829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-04-21 23:05:11 +02:00
|
|
|
* @param WP_Block_Type $block_type Block type to check for support.
|
|
|
|
* @param string $feature Name of the feature to check support for.
|
|
|
|
* @param mixed $default_value Fallback value for feature support, defaults to false.
|
2021-07-01 23:02:57 +02:00
|
|
|
* @return bool Whether the feature is supported.
|
2021-05-19 17:09:27 +02:00
|
|
|
*/
|
Code Modernization: Rename parameters that use reserved keywords in `wp-includes/block-supports/border.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit renames the `$default` parameter to `$default_value` in `wp_has_border_feature_support()`.
Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239].
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.
Built from https://develop.svn.wordpress.org/trunk@53240
git-svn-id: http://core.svn.wordpress.org/trunk@52829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-04-21 23:05:11 +02:00
|
|
|
function wp_has_border_feature_support( $block_type, $feature, $default_value = false ) {
|
2021-05-19 17:09:27 +02:00
|
|
|
// Check if all border support features have been opted into via `"__experimentalBorder": true`.
|
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
|
|
|
if ( property_exists( $block_type, 'supports' ) ) {
|
|
|
|
$block_type_supports_border = isset( $block_type->supports['__experimentalBorder'] )
|
|
|
|
? $block_type->supports['__experimentalBorder']
|
|
|
|
: $default_value;
|
|
|
|
if ( true === $block_type_supports_border ) {
|
|
|
|
return true;
|
|
|
|
}
|
2021-05-19 17:09:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Check if the specific feature has been opted into individually
|
|
|
|
// via nested flag under `__experimentalBorder`.
|
Code Modernization: Rename parameters that use reserved keywords in `wp-includes/block-supports/border.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit renames the `$default` parameter to `$default_value` in `wp_has_border_feature_support()`.
Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239].
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.
Built from https://develop.svn.wordpress.org/trunk@53240
git-svn-id: http://core.svn.wordpress.org/trunk@52829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-04-21 23:05:11 +02:00
|
|
|
return block_has_support( $block_type, array( '__experimentalBorder', $feature ), $default_value );
|
2021-05-19 17:09:27 +02:00
|
|
|
}
|
|
|
|
|
2021-04-15 17:19:43 +02:00
|
|
|
// Register the block support.
|
|
|
|
WP_Block_Supports::get_instance()->register(
|
|
|
|
'border',
|
|
|
|
array(
|
|
|
|
'register_attribute' => 'wp_register_border_support',
|
|
|
|
'apply' => 'wp_apply_border_support',
|
|
|
|
)
|
|
|
|
);
|