--- a/wp/wp-includes/blocks/search.php Thu Sep 29 08:06:27 2022 +0200
+++ b/wp/wp-includes/blocks/search.php Fri Sep 05 18:40:08 2025 +0200
@@ -8,13 +8,15 @@
/**
* Dynamically renders the `core/search` block.
*
- * @param array $attributes The block attributes.
+ * @since 6.3.0 Using block.json `viewScript` to register script, and update `view_script_handles()` only when needed.
+ *
+ * @param array $attributes The block attributes.
+ * @param string $content The saved content.
+ * @param WP_Block $block The parsed block.
*
* @return string The search block markup.
*/
function render_block_core_search( $attributes ) {
- static $instance_id = 0;
-
// Older versions of the Search block defaulted the label and buttonText
// attributes to `__( 'Search' )` meaning that many posts contain `<!--
// wp:search /-->`. Support these by defaulting an undefined label and
@@ -27,77 +29,138 @@
)
);
- $input_id = 'wp-block-search__input-' . ++$instance_id;
- $classnames = classnames_for_block_core_search( $attributes );
- $show_label = ( ! empty( $attributes['showLabel'] ) ) ? true : false;
- $use_icon_button = ( ! empty( $attributes['buttonUseIcon'] ) ) ? true : false;
- $show_input = ( ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'] ) ? false : true;
- $show_button = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true;
- $input_markup = '';
- $button_markup = '';
- $inline_styles = styles_for_block_core_search( $attributes );
- $color_classes = get_color_classes_for_block_core_search( $attributes );
- $is_button_inside = ! empty( $attributes['buttonPosition'] ) &&
+ $input_id = wp_unique_id( 'wp-block-search__input-' );
+ $classnames = classnames_for_block_core_search( $attributes );
+ $show_label = ( ! empty( $attributes['showLabel'] ) ) ? true : false;
+ $use_icon_button = ( ! empty( $attributes['buttonUseIcon'] ) ) ? true : false;
+ $show_button = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true;
+ $button_position = $show_button ? $attributes['buttonPosition'] : null;
+ $query_params = ( ! empty( $attributes['query'] ) ) ? $attributes['query'] : array();
+ $button = '';
+ $query_params_markup = '';
+ $inline_styles = styles_for_block_core_search( $attributes );
+ $color_classes = get_color_classes_for_block_core_search( $attributes );
+ $typography_classes = get_typography_classes_for_block_core_search( $attributes );
+ $is_button_inside = ! empty( $attributes['buttonPosition'] ) &&
'button-inside' === $attributes['buttonPosition'];
// Border color classes need to be applied to the elements that have a border color.
$border_color_classes = get_border_color_classes_for_block_core_search( $attributes );
+ // This variable is a constant and its value is always false at this moment.
+ // It is defined this way because some values depend on it, in case it changes in the future.
+ $open_by_default = false;
$label_inner_html = empty( $attributes['label'] ) ? __( 'Search' ) : wp_kses_post( $attributes['label'] );
-
- $label_markup = sprintf(
- '<label for="%1$s" class="wp-block-search__label screen-reader-text">%2$s</label>',
- esc_attr( $input_id ),
- $label_inner_html
- );
- if ( $show_label && ! empty( $attributes['label'] ) ) {
- $label_markup = sprintf(
- '<label for="%1$s" class="wp-block-search__label">%2$s</label>',
- $input_id,
- $label_inner_html
- );
+ $label = new WP_HTML_Tag_Processor( sprintf( '<label %1$s>%2$s</label>', $inline_styles['label'], $label_inner_html ) );
+ if ( $label->next_tag() ) {
+ $label->set_attribute( 'for', $input_id );
+ $label->add_class( 'wp-block-search__label' );
+ if ( $show_label && ! empty( $attributes['label'] ) ) {
+ if ( ! empty( $typography_classes ) ) {
+ $label->add_class( $typography_classes );
+ }
+ } else {
+ $label->add_class( 'screen-reader-text' );
+ }
}
- if ( $show_input ) {
- $input_classes = ! $is_button_inside ? $border_color_classes : '';
- $input_markup = sprintf(
- '<input type="search" id="%s" class="wp-block-search__input %s" name="s" value="%s" placeholder="%s" %s required />',
- $input_id,
- esc_attr( $input_classes ),
- esc_attr( get_search_query() ),
- esc_attr( $attributes['placeholder'] ),
- $inline_styles['input']
- );
+ $input = new WP_HTML_Tag_Processor( sprintf( '<input type="search" name="s" required %s/>', $inline_styles['input'] ) );
+ $input_classes = array( 'wp-block-search__input' );
+ if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
+ $input_classes[] = $border_color_classes;
+ }
+ if ( ! empty( $typography_classes ) ) {
+ $input_classes[] = $typography_classes;
+ }
+ if ( $input->next_tag() ) {
+ $input->add_class( implode( ' ', $input_classes ) );
+ $input->set_attribute( 'id', $input_id );
+ $input->set_attribute( 'value', get_search_query() );
+ $input->set_attribute( 'placeholder', $attributes['placeholder'] );
+
+ // If it's interactive, enqueue the script module and add the directives.
+ $is_expandable_searchfield = 'button-only' === $button_position;
+ if ( $is_expandable_searchfield ) {
+ $suffix = wp_scripts_get_suffix();
+ if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+ $module_url = gutenberg_url( '/build/interactivity/search.min.js' );
+ }
+
+ wp_register_script_module(
+ '@wordpress/block-library/search',
+ isset( $module_url ) ? $module_url : includes_url( "blocks/search/view{$suffix}.js" ),
+ array( '@wordpress/interactivity' ),
+ defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+ );
+ wp_enqueue_script_module( '@wordpress/block-library/search' );
+
+ $input->set_attribute( 'data-wp-bind--aria-hidden', '!context.isSearchInputVisible' );
+ $input->set_attribute( 'data-wp-bind--tabindex', 'state.tabindex' );
+
+ // Adding these attributes manually is needed until the Interactivity API
+ // SSR logic is added to core.
+ $input->set_attribute( 'aria-hidden', 'true' );
+ $input->set_attribute( 'tabindex', '-1' );
+ }
+ }
+
+ if ( count( $query_params ) > 0 ) {
+ foreach ( $query_params as $param => $value ) {
+ $query_params_markup .= sprintf(
+ '<input type="hidden" name="%s" value="%s" />',
+ esc_attr( $param ),
+ esc_attr( $value )
+ );
+ }
}
if ( $show_button ) {
+ $button_classes = array( 'wp-block-search__button' );
$button_internal_markup = '';
- $button_classes = $color_classes;
- $aria_label = '';
+ if ( ! empty( $color_classes ) ) {
+ $button_classes[] = $color_classes;
+ }
+ if ( ! empty( $typography_classes ) ) {
+ $button_classes[] = $typography_classes;
+ }
- if ( ! $is_button_inside ) {
- $button_classes .= ' ' . $border_color_classes;
+ if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
+ $button_classes[] = $border_color_classes;
}
if ( ! $use_icon_button ) {
if ( ! empty( $attributes['buttonText'] ) ) {
$button_internal_markup = wp_kses_post( $attributes['buttonText'] );
}
} else {
- $aria_label = sprintf( 'aria-label="%s"', esc_attr( wp_strip_all_tags( $attributes['buttonText'] ) ) );
- $button_classes .= ' has-icon';
-
+ $button_classes[] = 'has-icon';
$button_internal_markup =
- '<svg id="search-icon" class="search-icon" viewBox="0 0 24 24" width="24" height="24">
- <path d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"></path>
+ '<svg class="search-icon" viewBox="0 0 24 24" width="24" height="24">
+ <path d="M13 5c-3.3 0-6 2.7-6 6 0 1.4.5 2.7 1.3 3.7l-3.8 3.8 1.1 1.1 3.8-3.8c1 .8 2.3 1.3 3.7 1.3 3.3 0 6-2.7 6-6S16.3 5 13 5zm0 10.5c-2.5 0-4.5-2-4.5-4.5s2-4.5 4.5-4.5 4.5 2 4.5 4.5-2 4.5-4.5 4.5z"></path>
</svg>';
}
- $button_markup = sprintf(
- '<button type="submit" class="wp-block-search__button %s" %s %s>%s</button>',
- esc_attr( $button_classes ),
- $inline_styles['button'],
- $aria_label,
- $button_internal_markup
- );
+ // Include the button element class.
+ $button_classes[] = wp_theme_get_element_class_name( 'button' );
+ $button = new WP_HTML_Tag_Processor( sprintf( '<button type="submit" %s>%s</button>', $inline_styles['button'], $button_internal_markup ) );
+
+ if ( $button->next_tag() ) {
+ $button->add_class( implode( ' ', $button_classes ) );
+ if ( 'button-only' === $attributes['buttonPosition'] ) {
+ $button->set_attribute( 'data-wp-bind--aria-label', 'state.ariaLabel' );
+ $button->set_attribute( 'data-wp-bind--aria-controls', 'state.ariaControls' );
+ $button->set_attribute( 'data-wp-bind--aria-expanded', 'context.isSearchInputVisible' );
+ $button->set_attribute( 'data-wp-bind--type', 'state.type' );
+ $button->set_attribute( 'data-wp-on--click', 'actions.openSearchInput' );
+
+ // Adding these attributes manually is needed until the Interactivity
+ // API SSR logic is added to core.
+ $button->set_attribute( 'aria-label', __( 'Expand search field' ) );
+ $button->set_attribute( 'aria-controls', 'wp-block-search__input-' . $input_id );
+ $button->set_attribute( 'aria-expanded', 'false' );
+ $button->set_attribute( 'type', 'button' );
+ } else {
+ $button->set_attribute( 'aria-label', wp_strip_all_tags( $attributes['buttonText'] ) );
+ }
+ }
}
$field_markup_classes = $is_button_inside ? $border_color_classes : '';
@@ -105,20 +168,47 @@
'<div class="wp-block-search__inside-wrapper %s" %s>%s</div>',
esc_attr( $field_markup_classes ),
$inline_styles['wrapper'],
- $input_markup . $button_markup
+ $input . $query_params_markup . $button
+ );
+ $wrapper_attributes = get_block_wrapper_attributes(
+ array( 'class' => $classnames )
);
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
+ $form_directives = '';
+
+ // If it's interactive, add the directives.
+ if ( $is_expandable_searchfield ) {
+ $aria_label_expanded = __( 'Submit Search' );
+ $aria_label_collapsed = __( 'Expand search field' );
+ $form_context = wp_interactivity_data_wp_context(
+ array(
+ 'isSearchInputVisible' => $open_by_default,
+ 'inputId' => $input_id,
+ 'ariaLabelExpanded' => $aria_label_expanded,
+ 'ariaLabelCollapsed' => $aria_label_collapsed,
+ )
+ );
+ $form_directives = '
+ data-wp-interactive="core/search"'
+ . $form_context .
+ 'data-wp-class--wp-block-search__searchfield-hidden="!context.isSearchInputVisible"
+ data-wp-on-async--keydown="actions.handleSearchKeydown"
+ data-wp-on-async--focusout="actions.handleSearchFocusout"
+ ';
+ }
return sprintf(
- '<form role="search" method="get" action="%s" %s>%s</form>',
+ '<form role="search" method="get" action="%1s" %2s %3s>%4s</form>',
esc_url( home_url( '/' ) ),
$wrapper_attributes,
- $label_markup . $field_markup
+ $form_directives,
+ $label . $field_markup
);
}
/**
* Registers the `core/search` block on the server.
+ *
+ * @since 5.2.0
*/
function register_block_core_search() {
register_block_type_from_metadata(
@@ -133,6 +223,8 @@
/**
* Builds the correct top level classnames for the 'core/search' block.
*
+ * @since 5.6.0
+ *
* @param array $attributes The block attributes.
*
* @return string The classnames used in the block.
@@ -154,7 +246,7 @@
}
if ( 'button-only' === $attributes['buttonPosition'] ) {
- $classnames[] = 'wp-block-search__button-only';
+ $classnames[] = 'wp-block-search__button-only wp-block-search__searchfield-hidden';
}
}
@@ -172,12 +264,83 @@
}
/**
+ * This generates a CSS rule for the given border property and side if provided.
+ * Based on whether the Search block is configured to display the button inside
+ * or not, the generated rule is injected into the appropriate collection of
+ * styles for later application in the block's markup.
+ *
+ * @since 6.1.0
+ *
+ * @param array $attributes The block attributes.
+ * @param string $property Border property to generate rule for e.g. width or color.
+ * @param string $side Optional side border. The dictates the value retrieved and final CSS property.
+ * @param array $wrapper_styles Current collection of wrapper styles.
+ * @param array $button_styles Current collection of button styles.
+ * @param array $input_styles Current collection of input styles.
+ */
+function apply_block_core_search_border_style( $attributes, $property, $side, &$wrapper_styles, &$button_styles, &$input_styles ) {
+ $is_button_inside = isset( $attributes['buttonPosition'] ) && 'button-inside' === $attributes['buttonPosition'];
+
+ $path = array( 'style', 'border', $property );
+
+ if ( $side ) {
+ array_splice( $path, 2, 0, $side );
+ }
+
+ $value = _wp_array_get( $attributes, $path, false );
+
+ if ( empty( $value ) ) {
+ return;
+ }
+
+ if ( 'color' === $property && $side ) {
+ $has_color_preset = str_contains( $value, 'var:preset|color|' );
+ if ( $has_color_preset ) {
+ $named_color_value = substr( $value, strrpos( $value, '|' ) + 1 );
+ $value = sprintf( 'var(--wp--preset--color--%s)', $named_color_value );
+ }
+ }
+
+ $property_suffix = $side ? sprintf( '%s-%s', $side, $property ) : $property;
+
+ if ( $is_button_inside ) {
+ $wrapper_styles[] = sprintf( 'border-%s: %s;', $property_suffix, esc_attr( $value ) );
+ } else {
+ $button_styles[] = sprintf( 'border-%s: %s;', $property_suffix, esc_attr( $value ) );
+ $input_styles[] = sprintf( 'border-%s: %s;', $property_suffix, esc_attr( $value ) );
+ }
+}
+
+/**
+ * This adds CSS rules for a given border property e.g. width or color. It
+ * injects rules into the provided wrapper, button and input style arrays for
+ * uniform "flat" borders or those with individual sides configured.
+ *
+ * @since 6.1.0
+ *
+ * @param array $attributes The block attributes.
+ * @param string $property Border property to generate rule for e.g. width or color.
+ * @param array $wrapper_styles Current collection of wrapper styles.
+ * @param array $button_styles Current collection of button styles.
+ * @param array $input_styles Current collection of input styles.
+ */
+function apply_block_core_search_border_styles( $attributes, $property, &$wrapper_styles, &$button_styles, &$input_styles ) {
+ apply_block_core_search_border_style( $attributes, $property, null, $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_style( $attributes, $property, 'top', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_style( $attributes, $property, 'right', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_style( $attributes, $property, 'bottom', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_style( $attributes, $property, 'left', $wrapper_styles, $button_styles, $input_styles );
+}
+
+/**
* Builds an array of inline styles for the search block.
*
* The result will contain one entry for shared styles such as those for the
* inner input or button and a second for the inner wrapper should the block
* be positioning the button "inside".
*
+ * @since 5.8.0
+ *
* @param array $attributes The block attributes.
*
* @return array Style HTML attribute.
@@ -186,14 +349,15 @@
$wrapper_styles = array();
$button_styles = array();
$input_styles = array();
+ $label_styles = array();
$is_button_inside = ! empty( $attributes['buttonPosition'] ) &&
'button-inside' === $attributes['buttonPosition'];
+ $show_label = ( isset( $attributes['showLabel'] ) ) && false !== $attributes['showLabel'];
// Add width styles.
- $has_width = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] );
- $button_only = ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'];
+ $has_width = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] );
- if ( $has_width && ! $button_only ) {
+ if ( $has_width ) {
$wrapper_styles[] = sprintf(
'width: %d%s;',
esc_attr( $attributes['width'] ),
@@ -201,19 +365,10 @@
);
}
- // Add border width styles.
- $has_border_width = ! empty( $attributes['style']['border']['width'] );
-
- if ( $has_border_width ) {
- $border_width = $attributes['style']['border']['width'];
-
- if ( $is_button_inside ) {
- $wrapper_styles[] = sprintf( 'border-width: %s;', esc_attr( $border_width ) );
- } else {
- $button_styles[] = sprintf( 'border-width: %s;', esc_attr( $border_width ) );
- $input_styles[] = sprintf( 'border-width: %s;', esc_attr( $border_width ) );
- }
- }
+ // Add border width and color styles.
+ apply_block_core_search_border_styles( $attributes, 'width', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_styles( $attributes, 'color', $wrapper_styles, $button_styles, $input_styles );
+ apply_block_core_search_border_styles( $attributes, 'style', $wrapper_styles, $button_styles, $input_styles );
// Add border radius styles.
$has_border_radius = ! empty( $attributes['style']['border']['radius'] );
@@ -269,30 +424,15 @@
}
}
- // Add border color styles.
- $has_border_color = ! empty( $attributes['style']['border']['color'] );
-
- if ( $has_border_color ) {
- $border_color = $attributes['style']['border']['color'];
-
- // Apply wrapper border color if button placed inside.
- if ( $is_button_inside ) {
- $wrapper_styles[] = sprintf( 'border-color: %s;', esc_attr( $border_color ) );
- } else {
- $button_styles[] = sprintf( 'border-color: %s;', esc_attr( $border_color ) );
- $input_styles[] = sprintf( 'border-color: %s;', esc_attr( $border_color ) );
- }
- }
-
// Add color styles.
$has_text_color = ! empty( $attributes['style']['color']['text'] );
if ( $has_text_color ) {
- $button_styles[] = sprintf( 'color: %s;', esc_attr( $attributes['style']['color']['text'] ) );
+ $button_styles[] = sprintf( 'color: %s;', $attributes['style']['color']['text'] );
}
$has_background_color = ! empty( $attributes['style']['color']['background'] );
if ( $has_background_color ) {
- $button_styles[] = sprintf( 'background-color: %s;', esc_attr( $attributes['style']['color']['background'] ) );
+ $button_styles[] = sprintf( 'background-color: %s;', $attributes['style']['color']['background'] );
}
$has_custom_gradient = ! empty( $attributes['style']['color']['gradient'] );
@@ -300,33 +440,140 @@
$button_styles[] = sprintf( 'background: %s;', $attributes['style']['color']['gradient'] );
}
+ // Get typography styles to be shared across inner elements.
+ $typography_styles = esc_attr( get_typography_styles_for_block_core_search( $attributes ) );
+ if ( ! empty( $typography_styles ) ) {
+ $label_styles [] = $typography_styles;
+ $button_styles[] = $typography_styles;
+ $input_styles [] = $typography_styles;
+ }
+
+ // Typography text-decoration is only applied to the label and button.
+ if ( ! empty( $attributes['style']['typography']['textDecoration'] ) ) {
+ $text_decoration_value = sprintf( 'text-decoration: %s;', esc_attr( $attributes['style']['typography']['textDecoration'] ) );
+ $button_styles[] = $text_decoration_value;
+ // Input opts out of text decoration.
+ if ( $show_label ) {
+ $label_styles[] = $text_decoration_value;
+ }
+ }
+
return array(
- 'input' => ! empty( $input_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $input_styles ) ) ) : '',
- 'button' => ! empty( $button_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $button_styles ) ) ) : '',
- 'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $wrapper_styles ) ) ) : '',
+ 'input' => ! empty( $input_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $input_styles ) ) ) ) : '',
+ 'button' => ! empty( $button_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $button_styles ) ) ) ) : '',
+ 'wrapper' => ! empty( $wrapper_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $wrapper_styles ) ) ) ) : '',
+ 'label' => ! empty( $label_styles ) ? sprintf( ' style="%s"', esc_attr( safecss_filter_attr( implode( ' ', $label_styles ) ) ) ) : '',
);
}
/**
+ * Returns typography classnames depending on whether there are named font sizes/families.
+ *
+ * @since 6.1.0
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string The typography color classnames to be applied to the block elements.
+ */
+function get_typography_classes_for_block_core_search( $attributes ) {
+ $typography_classes = array();
+ $has_named_font_family = ! empty( $attributes['fontFamily'] );
+ $has_named_font_size = ! empty( $attributes['fontSize'] );
+
+ if ( $has_named_font_size ) {
+ $typography_classes[] = sprintf( 'has-%s-font-size', esc_attr( $attributes['fontSize'] ) );
+ }
+
+ if ( $has_named_font_family ) {
+ $typography_classes[] = sprintf( 'has-%s-font-family', esc_attr( $attributes['fontFamily'] ) );
+ }
+
+ return implode( ' ', $typography_classes );
+}
+
+/**
+ * Returns typography styles to be included in an HTML style tag.
+ * This excludes text-decoration, which is applied only to the label and button elements of the search block.
+ *
+ * @since 6.1.0
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string A string of typography CSS declarations.
+ */
+function get_typography_styles_for_block_core_search( $attributes ) {
+ $typography_styles = array();
+
+ // Add typography styles.
+ if ( ! empty( $attributes['style']['typography']['fontSize'] ) ) {
+ $typography_styles[] = sprintf(
+ 'font-size: %s;',
+ wp_get_typography_font_size_value(
+ array(
+ 'size' => $attributes['style']['typography']['fontSize'],
+ )
+ )
+ );
+
+ }
+
+ if ( ! empty( $attributes['style']['typography']['fontFamily'] ) ) {
+ $typography_styles[] = sprintf( 'font-family: %s;', $attributes['style']['typography']['fontFamily'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['letterSpacing'] ) ) {
+ $typography_styles[] = sprintf( 'letter-spacing: %s;', $attributes['style']['typography']['letterSpacing'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['fontWeight'] ) ) {
+ $typography_styles[] = sprintf( 'font-weight: %s;', $attributes['style']['typography']['fontWeight'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['fontStyle'] ) ) {
+ $typography_styles[] = sprintf( 'font-style: %s;', $attributes['style']['typography']['fontStyle'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['lineHeight'] ) ) {
+ $typography_styles[] = sprintf( 'line-height: %s;', $attributes['style']['typography']['lineHeight'] );
+ }
+
+ if ( ! empty( $attributes['style']['typography']['textTransform'] ) ) {
+ $typography_styles[] = sprintf( 'text-transform: %s;', $attributes['style']['typography']['textTransform'] );
+ }
+
+ return implode( '', $typography_styles );
+}
+
+/**
* Returns border color classnames depending on whether there are named or custom border colors.
*
+ * @since 5.9.0
+ *
* @param array $attributes The block attributes.
*
* @return string The border color classnames to be applied to the block elements.
*/
function get_border_color_classes_for_block_core_search( $attributes ) {
+ $border_color_classes = array();
$has_custom_border_color = ! empty( $attributes['style']['border']['color'] );
- $border_color_classes = ! empty( $attributes['borderColor'] ) ? sprintf( 'has-border-color has-%s-border-color', $attributes['borderColor'] ) : '';
- // If there's a border color style and no `borderColor` text string, we still want to add the generic `has-border-color` class name to the element.
- if ( $has_custom_border_color && empty( $attributes['borderColor'] ) ) {
- $border_color_classes = 'has-border-color';
+ $has_named_border_color = ! empty( $attributes['borderColor'] );
+
+ if ( $has_custom_border_color || $has_named_border_color ) {
+ $border_color_classes[] = 'has-border-color';
}
- return $border_color_classes;
+
+ if ( $has_named_border_color ) {
+ $border_color_classes[] = sprintf( 'has-%s-border-color', esc_attr( $attributes['borderColor'] ) );
+ }
+
+ return implode( ' ', $border_color_classes );
}
/**
* Returns color classnames depending on whether there are named or custom text and background colors.
*
+ * @since 5.9.0
+ *
* @param array $attributes The block attributes.
*
* @return string The color classnames to be applied to the block elements.