-
+
%2$s
@@ -622,13 +645,14 @@ function render_block_core_navigation( $attributes, $content, $block ) {
',
esc_attr( $modal_unique_id ),
$inner_blocks_html,
- __( 'Open menu' ), // Open button label.
- __( 'Close menu' ), // Close button label.
+ $toggle_aria_label_open,
+ $toggle_aria_label_close,
esc_attr( implode( ' ', $responsive_container_classes ) ),
esc_attr( implode( ' ', $open_button_classes ) ),
safecss_filter_attr( $colors['overlay_inline_styles'] ),
__( 'Menu' ),
- $toggle_button_content
+ $toggle_button_content,
+ $toggle_close_button_content
);
return sprintf(
diff --git a/src/wp-includes/blocks/navigation/block.json b/src/wp-includes/blocks/navigation/block.json
index b2fefcdbe5a22..a8c65b5a88b75 100644
--- a/src/wp-includes/blocks/navigation/block.json
+++ b/src/wp-includes/blocks/navigation/block.json
@@ -41,6 +41,10 @@
"type": "string",
"default": "mobile"
},
+ "icon": {
+ "type": "string",
+ "default": "handle"
+ },
"hasIcon": {
"type": "boolean",
"default": true
@@ -94,6 +98,7 @@
"__experimentalFontWeight": true,
"__experimentalTextTransform": true,
"__experimentalFontFamily": true,
+ "__experimentalLetterSpacing": true,
"__experimentalTextDecoration": true,
"__experimentalSkipSerialization": [ "textDecoration" ],
"__experimentalDefaultControls": {
@@ -114,9 +119,18 @@
"default": {
"type": "flex"
}
+ },
+ "__experimentalStyle": {
+ "elements": {
+ "link": {
+ "color": {
+ "text": "inherit"
+ }
+ }
+ }
}
},
- "viewScript": "file:./view.min.js",
+ "viewScript": [ "file:./view.min.js", "file:./view-modal.min.js" ],
"editorStyle": "wp-block-navigation-editor",
"style": "wp-block-navigation"
}
diff --git a/src/wp-includes/blocks/navigation/view-modal.asset.php b/src/wp-includes/blocks/navigation/view-modal.asset.php
new file mode 100644
index 0000000000000..a4d19fb3ca75c
--- /dev/null
+++ b/src/wp-includes/blocks/navigation/view-modal.asset.php
@@ -0,0 +1 @@
+ array(), 'version' => '6d574d0390bc333487cb');
diff --git a/src/wp-includes/blocks/navigation/view-modal.min.asset.php b/src/wp-includes/blocks/navigation/view-modal.min.asset.php
new file mode 100644
index 0000000000000..97565b80d692d
--- /dev/null
+++ b/src/wp-includes/blocks/navigation/view-modal.min.asset.php
@@ -0,0 +1 @@
+ array(), 'version' => '45f05135277abf0b0408');
diff --git a/src/wp-includes/blocks/navigation/view.asset.php b/src/wp-includes/blocks/navigation/view.asset.php
index 1e64ce08dc0c4..47c4cec85f97f 100644
--- a/src/wp-includes/blocks/navigation/view.asset.php
+++ b/src/wp-includes/blocks/navigation/view.asset.php
@@ -1 +1 @@
- array(), 'version' => '3bc2957a58e1f08fa9309e91ffeef792');
\ No newline at end of file
+ array(), 'version' => '4ab20ef60d94f9632256');
diff --git a/src/wp-includes/blocks/navigation/view.min.asset.php b/src/wp-includes/blocks/navigation/view.min.asset.php
index 39101e3e79a4c..a5cea71cb5991 100644
--- a/src/wp-includes/blocks/navigation/view.min.asset.php
+++ b/src/wp-includes/blocks/navigation/view.min.asset.php
@@ -1 +1 @@
- array(), 'version' => '009e29110e016c14bac4ba0ecc809fcd');
\ No newline at end of file
+ array(), 'version' => 'c24330f635f5cb9d5e0e');
diff --git a/src/wp-includes/blocks/page-list.php b/src/wp-includes/blocks/page-list.php
index 561c8008eaa7d..89a8ea1b071be 100644
--- a/src/wp-includes/blocks/page-list.php
+++ b/src/wp-includes/blocks/page-list.php
@@ -328,9 +328,9 @@ function render_block_core_page_list( $attributes, $content, $block ) {
);
}
- /**
- * Registers the `core/pages` block on server.
- */
+/**
+ * Registers the `core/pages` block on server.
+ */
function register_block_core_page_list() {
register_block_type_from_metadata(
__DIR__ . '/page-list',
@@ -339,4 +339,4 @@ function register_block_core_page_list() {
)
);
}
- add_action( 'init', 'register_block_core_page_list' );
+add_action( 'init', 'register_block_core_page_list' );
diff --git a/src/wp-includes/blocks/paragraph/block.json b/src/wp-includes/blocks/paragraph/block.json
index 2323beff7ae59..497a6b2c29a66 100644
--- a/src/wp-includes/blocks/paragraph/block.json
+++ b/src/wp-includes/blocks/paragraph/block.json
@@ -34,15 +34,22 @@
"anchor": true,
"className": false,
"color": {
+ "gradients": true,
"link": true,
"__experimentalDefaultControls": {
"background": true,
"text": true
}
},
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalTextDecoration": true,
"__experimentalFontStyle": true,
"__experimentalFontWeight": true,
"__experimentalLetterSpacing": true,
diff --git a/src/wp-includes/blocks/post-author-biography/block.json b/src/wp-includes/blocks/post-author-biography/block.json
index a74c32d0cc391..434b6b0965880 100644
--- a/src/wp-includes/blocks/post-author-biography/block.json
+++ b/src/wp-includes/blocks/post-author-biography/block.json
@@ -32,6 +32,7 @@
"__experimentalFontWeight": true,
"__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
"__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
diff --git a/src/wp-includes/blocks/post-author.php b/src/wp-includes/blocks/post-author.php
index 7e25d390689c1..325aa43607d22 100644
--- a/src/wp-includes/blocks/post-author.php
+++ b/src/wp-includes/blocks/post-author.php
@@ -15,10 +15,11 @@
*/
function render_block_core_post_author( $attributes, $content, $block ) {
if ( ! isset( $block->context['postId'] ) ) {
- return '';
+ $author_id = get_query_var( 'author' );
+ } else {
+ $author_id = get_post_field( 'post_author', $block->context['postId'] );
}
- $author_id = get_post_field( 'post_author', $block->context['postId'] );
if ( empty( $author_id ) ) {
return '';
}
diff --git a/src/wp-includes/blocks/post-author/block.json b/src/wp-includes/blocks/post-author/block.json
index 602810213932b..232e20dbd0a8d 100644
--- a/src/wp-includes/blocks/post-author/block.json
+++ b/src/wp-includes/blocks/post-author/block.json
@@ -35,10 +35,12 @@
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/post-comments-form.php b/src/wp-includes/blocks/post-comments-form.php
index accceace3cdb9..53a6f8b5242a9 100644
--- a/src/wp-includes/blocks/post-comments-form.php
+++ b/src/wp-includes/blocks/post-comments-form.php
@@ -72,7 +72,7 @@ function register_block_core_post_comments_form() {
*/
function post_comments_form_block_form_defaults( $fields ) {
if ( wp_is_block_theme() ) {
- $fields['submit_button'] = '
';
+ $fields['submit_button'] = '
';
$fields['submit_field'] = '
%1$s %2$s
';
}
diff --git a/src/wp-includes/blocks/post-comments.php b/src/wp-includes/blocks/post-comments.php
deleted file mode 100644
index 8ddb0e6f74565..0000000000000
--- a/src/wp-includes/blocks/post-comments.php
+++ /dev/null
@@ -1,85 +0,0 @@
-context['postId'];
- if ( ! isset( $post_id ) ) {
- return '';
- }
-
- $comment_args = array(
- 'post_id' => $post_id,
- 'count' => true,
- );
- // Return early if there are no comments and comments are closed.
- if ( ! comments_open( $post_id ) && get_comments( $comment_args ) === 0 ) {
- return '';
- }
-
- $post_before = $post;
- $post = get_post( $post_id );
- setup_postdata( $post );
-
- ob_start();
- // There's a deprecation warning generated by WP Core.
- // Ideally this deprecation is removed from Core.
- // In the meantime, this removes it from the output.
- add_filter( 'deprecated_file_trigger_error', '__return_false' );
- comments_template();
- remove_filter( 'deprecated_file_trigger_error', '__return_false' );
- $post = $post_before;
-
- $classes = '';
- if ( isset( $attributes['textAlign'] ) ) {
- $classes .= 'has-text-align-' . $attributes['textAlign'];
- }
-
- $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
- $output = ob_get_clean();
-
- return sprintf( '
%2$s
', $wrapper_attributes, $output );
-}
-
-/**
- * Registers the `core/post-comments` block on the server.
- */
-function register_block_core_post_comments() {
- register_block_type_from_metadata(
- __DIR__ . '/post-comments',
- array(
- 'render_callback' => 'render_block_core_post_comments',
- )
- );
-}
-add_action( 'init', 'register_block_core_post_comments' );
-
-/**
- * Use the button block classes for the form-submit button.
- *
- * @param array $fields The default comment form arguments.
- *
- * @return array Returns the modified fields.
- */
-function post_comments_block_form_defaults( $fields ) {
- if ( wp_is_block_theme() ) {
- $fields['submit_button'] = '
';
- $fields['submit_field'] = '
%1$s %2$s
';
- }
-
- return $fields;
-}
-add_filter( 'comment_form_defaults', 'post_comments_block_form_defaults' );
diff --git a/src/wp-includes/blocks/post-content/block.json b/src/wp-includes/blocks/post-content/block.json
index 8a62ad83124f2..c330f624ee142 100644
--- a/src/wp-includes/blocks/post-content/block.json
+++ b/src/wp-includes/blocks/post-content/block.json
@@ -10,7 +10,20 @@
"supports": {
"align": [ "wide", "full" ],
"html": false,
- "__experimentalLayout": true
+ "__experimentalLayout": true,
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
+ }
},
"editorStyle": "wp-block-post-content-editor"
}
diff --git a/src/wp-includes/blocks/post-date.php b/src/wp-includes/blocks/post-date.php
index 902a6f7bff970..fc1537d156689 100644
--- a/src/wp-includes/blocks/post-date.php
+++ b/src/wp-includes/blocks/post-date.php
@@ -21,7 +21,15 @@ function render_block_core_post_date( $attributes, $content, $block ) {
$post_ID = $block->context['postId'];
$align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
- $formatted_date = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+
+ if ( isset( $attributes['displayType'] ) && 'modified' === $attributes['displayType'] ) {
+ $formatted_date = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+ $unformatted_date = esc_attr( get_the_modified_date( 'c', $post_ID ) );
+ } else {
+ $formatted_date = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+ $unformatted_date = esc_attr( get_the_date( 'c', $post_ID ) );
+ }
+
if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
$formatted_date = sprintf( '
%2s', get_the_permalink( $post_ID ), $formatted_date );
}
@@ -29,7 +37,7 @@ function render_block_core_post_date( $attributes, $content, $block ) {
return sprintf(
'
',
$wrapper_attributes,
- esc_attr( get_the_date( 'c', $post_ID ) ),
+ $unformatted_date,
$formatted_date
);
}
diff --git a/src/wp-includes/blocks/post-date/block.json b/src/wp-includes/blocks/post-date/block.json
index fa36e553a4284..b469dbe87d7e0 100644
--- a/src/wp-includes/blocks/post-date/block.json
+++ b/src/wp-includes/blocks/post-date/block.json
@@ -16,6 +16,10 @@
"isLink": {
"type": "boolean",
"default": false
+ },
+ "displayType": {
+ "type": "string",
+ "default": "date"
}
},
"usesContext": [ "postId", "postType", "queryId" ],
@@ -30,6 +34,10 @@
"link": true
}
},
+ "spacing": {
+ "margin": true,
+ "padding": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
@@ -37,6 +45,7 @@
"__experimentalFontWeight": true,
"__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
"__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
diff --git a/src/wp-includes/blocks/post-excerpt/block.json b/src/wp-includes/blocks/post-excerpt/block.json
index 2fef4f20cf8af..03107ff900e06 100644
--- a/src/wp-includes/blocks/post-excerpt/block.json
+++ b/src/wp-includes/blocks/post-excerpt/block.json
@@ -37,10 +37,12 @@
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/post-featured-image.php b/src/wp-includes/blocks/post-featured-image.php
index 6ac274c4cadbf..595f58cbfe95e 100644
--- a/src/wp-includes/blocks/post-featured-image.php
+++ b/src/wp-includes/blocks/post-featured-image.php
@@ -19,21 +19,40 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
}
$post_ID = $block->context['postId'];
+ $is_link = isset( $attributes['isLink'] ) && $attributes['isLink'];
$size_slug = isset( $attributes['sizeSlug'] ) ? $attributes['sizeSlug'] : 'post-thumbnail';
$post_title = trim( strip_tags( get_the_title( $post_ID ) ) );
- $featured_image = get_the_post_thumbnail( $post_ID, $size_slug, array( 'alt' => $post_title ) );
+ $attr = get_block_core_post_featured_image_border_attributes( $attributes );
+ $overlay_markup = get_block_core_post_featured_image_overlay_element_markup( $attributes );
+
+ if ( $is_link ) {
+ $attr['alt'] = $post_title;
+ }
+
+ $featured_image = get_the_post_thumbnail( $post_ID, $size_slug, $attr );
if ( ! $featured_image ) {
return '';
}
$wrapper_attributes = get_block_wrapper_attributes();
- if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
- $featured_image = sprintf( '
%2s', get_the_permalink( $post_ID ), $featured_image );
+ if ( $is_link ) {
+ $link_target = $attributes['linkTarget'];
+ $rel = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
+ $featured_image = sprintf(
+ '
%4$s%5$s',
+ get_the_permalink( $post_ID ),
+ esc_attr( $link_target ),
+ $rel,
+ $featured_image,
+ $overlay_markup
+ );
+ } else {
+ $featured_image = $featured_image . $overlay_markup;
}
$has_width = ! empty( $attributes['width'] );
$has_height = ! empty( $attributes['height'] );
if ( ! $has_height && ! $has_width ) {
- return "
$featured_image";
+ return "
{$featured_image}";
}
if ( $has_width ) {
@@ -48,7 +67,130 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
$featured_image = str_replace( 'src=', 'style="' . esc_attr( $image_styles ) . '" src=', $featured_image );
}
- return "
$featured_image";
+ return "
{$featured_image}";
+}
+
+/**
+ * Generate markup for the HTML element that will be used for the overlay.
+ *
+ * @param array $attributes Block attributes.
+ *
+ * @return string HTML markup in string format.
+ */
+function get_block_core_post_featured_image_overlay_element_markup( $attributes ) {
+ $has_dim_background = isset( $attributes['dimRatio'] ) && $attributes['dimRatio'];
+ $has_gradient = isset( $attributes['gradient'] ) && $attributes['gradient'];
+ $has_custom_gradient = isset( $attributes['customGradient'] ) && $attributes['customGradient'];
+ $has_solid_overlay = isset( $attributes['overlayColor'] ) && $attributes['overlayColor'];
+ $has_custom_overlay = isset( $attributes['customOverlayColor'] ) && $attributes['customOverlayColor'];
+ $class_names = array(
+ 'wp-block-post-featured-image__overlay',
+ );
+ $styles_properties = array();
+
+ if ( ! $has_dim_background ) {
+ return '';
+ }
+
+ // Generate required classes for the element.
+ if ( $has_dim_background ) {
+ $class_names[] = 'has-background-dim';
+ $class_names[] = "has-background-dim-{$attributes['dimRatio']}";
+ }
+
+ if ( $has_solid_overlay ) {
+ $class_names[] = "has-{$attributes['overlayColor']}-background-color";
+ }
+
+ if ( $has_gradient || $has_custom_gradient ) {
+ $class_names[] = 'has-background-gradient';
+ }
+
+ if ( $has_gradient ) {
+ $class_names[] = "has-{$attributes['gradient']}-gradient-background";
+ }
+
+ // Generate required CSS properties and their values.
+ if ( ! empty( $attributes['style']['border']['radius'] ) ) {
+ $styles_properties['border-radius'] = $attributes['style']['border']['radius'];
+ }
+
+ if ( ! empty( $attributes['style']['border']['width'] ) ) {
+ $styles_properties['border-width'] = $attributes['style']['border']['width'];
+ }
+
+ if ( $has_custom_gradient ) {
+ $styles_properties['background-image'] = $attributes['customGradient'];
+ }
+
+ if ( $has_custom_overlay ) {
+ $styles_properties['background-color'] = $attributes['customOverlayColor'];
+ }
+
+ $styles = '';
+
+ foreach ( $styles_properties as $style_attribute => $style_attribute_value ) {
+ $styles .= "{$style_attribute}: $style_attribute_value; ";
+ }
+
+ return sprintf(
+ '
',
+ esc_attr( implode( ' ', $class_names ) ),
+ esc_attr( trim( $styles ) )
+ );
+
+}
+
+/**
+ * Generates class names and styles to apply the border support styles for
+ * the Post Featured Image block.
+ *
+ * @param array $attributes The block attributes.
+ * @return array The border-related classnames and styles for the block.
+ */
+function get_block_core_post_featured_image_border_attributes( $attributes ) {
+ $border_styles = array();
+ $sides = array( 'top', 'right', 'bottom', 'left' );
+
+ // Border radius.
+ if ( isset( $attributes['style']['border']['radius'] ) ) {
+ $border_styles['radius'] = $attributes['style']['border']['radius'];
+ }
+
+ // Border style.
+ if ( isset( $attributes['style']['border']['style'] ) ) {
+ $border_styles['style'] = $attributes['style']['border']['style'];
+ }
+
+ // Border width.
+ if ( isset( $attributes['style']['border']['width'] ) ) {
+ $border_styles['width'] = $attributes['style']['border']['width'];
+ }
+
+ // Border color.
+ $preset_color = array_key_exists( 'borderColor', $attributes ) ? "var:preset|color|{$attributes['borderColor']}" : null;
+ $custom_color = _wp_array_get( $attributes, array( 'style', 'border', 'color' ), null );
+ $border_styles['color'] = $preset_color ? $preset_color : $custom_color;
+
+ // Individual border styles e.g. top, left etc.
+ foreach ( $sides as $side ) {
+ $border = _wp_array_get( $attributes, array( 'style', 'border', $side ), null );
+ $border_styles[ $side ] = array(
+ 'color' => isset( $border['color'] ) ? $border['color'] : null,
+ 'style' => isset( $border['style'] ) ? $border['style'] : null,
+ 'width' => isset( $border['width'] ) ? $border['width'] : null,
+ );
+ }
+
+ $styles = wp_style_engine_get_styles( array( 'border' => $border_styles ) );
+ $attributes = array();
+ if ( ! empty( $styles['classnames'] ) ) {
+ $attributes['class'] = $styles['classnames'];
+ }
+ if ( ! empty( $styles['css'] ) ) {
+ $attributes['style'] = $styles['css'];
+ }
+ return $attributes;
}
/**
diff --git a/src/wp-includes/blocks/post-featured-image/block.json b/src/wp-includes/blocks/post-featured-image/block.json
index 4ca11f519545b..1072c7576d645 100644
--- a/src/wp-includes/blocks/post-featured-image/block.json
+++ b/src/wp-includes/blocks/post-featured-image/block.json
@@ -23,6 +23,31 @@
},
"sizeSlug": {
"type": "string"
+ },
+ "rel": {
+ "type": "string",
+ "attribute": "rel",
+ "default": ""
+ },
+ "linkTarget": {
+ "type": "string",
+ "default": "_self"
+ },
+ "overlayColor": {
+ "type": "string"
+ },
+ "customOverlayColor": {
+ "type": "string"
+ },
+ "dimRatio": {
+ "type": "number",
+ "default": 0
+ },
+ "gradient": {
+ "type": "string"
+ },
+ "customGradient": {
+ "type": "string"
}
},
"usesContext": [ "postId", "postType", "queryId" ],
@@ -33,6 +58,18 @@
"text": false,
"background": false
},
+ "__experimentalBorder": {
+ "color": true,
+ "radius": true,
+ "width": true,
+ "__experimentalSelector": "img, .block-editor-media-placeholder",
+ "__experimentalSkipSerialization": true,
+ "__experimentalDefaultControls": {
+ "color": true,
+ "radius": true,
+ "width": true
+ }
+ },
"html": false,
"spacing": {
"margin": true,
diff --git a/src/wp-includes/blocks/post-navigation-link/block.json b/src/wp-includes/blocks/post-navigation-link/block.json
index 166c0c3b12c33..c7e53bdce0af3 100644
--- a/src/wp-includes/blocks/post-navigation-link/block.json
+++ b/src/wp-includes/blocks/post-navigation-link/block.json
@@ -29,13 +29,18 @@
"supports": {
"reusable": false,
"html": false,
+ "color": {
+ "link": true
+ },
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/post-template/block.json b/src/wp-includes/blocks/post-template/block.json
index b830e3ba57727..380b6d55f71fa 100644
--- a/src/wp-includes/blocks/post-template/block.json
+++ b/src/wp-includes/blocks/post-template/block.json
@@ -12,7 +12,8 @@
"query",
"queryContext",
"displayLayout",
- "templateSlug"
+ "templateSlug",
+ "previewPostType"
],
"supports": {
"reusable": false,
@@ -20,6 +21,19 @@
"align": true,
"__experimentalLayout": {
"allowEditing": false
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
}
},
"style": "wp-block-post-template",
diff --git a/src/wp-includes/blocks/post-terms.php b/src/wp-includes/blocks/post-terms.php
index d1902b93a82f9..f98baba65ec63 100644
--- a/src/wp-includes/blocks/post-terms.php
+++ b/src/wp-includes/blocks/post-terms.php
@@ -36,12 +36,22 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+ $prefix = "
";
+ if ( isset( $attributes['prefix'] ) && $attributes['prefix'] ) {
+ $prefix .= '' . $attributes['prefix'] . '';
+ }
+
+ $suffix = '
';
+ if ( isset( $attributes['suffix'] ) && $attributes['suffix'] ) {
+ $suffix = '
' . $attributes['suffix'] . '' . $suffix;
+ }
+
return get_the_term_list(
$block->context['postId'],
$attributes['term'],
- "
",
+ wp_kses_post( $prefix ),
'' . esc_html( $separator ) . '',
- '
'
+ wp_kses_post( $suffix )
);
}
@@ -49,10 +59,48 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
* Registers the `core/post-terms` block on the server.
*/
function register_block_core_post_terms() {
+ $taxonomies = get_taxonomies(
+ array(
+ 'public' => true,
+ 'show_in_rest' => true,
+ ),
+ 'objects'
+ );
+
+ // Split the available taxonomies to `built_in` and custom ones,
+ // in order to prioritize the `built_in` taxonomies at the
+ // search results.
+ $built_ins = array();
+ $custom_variations = array();
+
+ // Create and register the eligible taxonomies variations.
+ foreach ( $taxonomies as $taxonomy ) {
+ $variation = array(
+ 'name' => $taxonomy->name,
+ 'title' => $taxonomy->label,
+ /* translators: %s: taxonomy's label */
+ 'description' => sprintf( __( 'Display the assigned taxonomy: %s' ), $taxonomy->label ),
+ 'attributes' => array(
+ 'term' => $taxonomy->name,
+ ),
+ 'isActive' => array( 'term' ),
+ );
+ // Set the category variation as the default one.
+ if ( 'category' === $taxonomy->name ) {
+ $variation['isDefault'] = true;
+ }
+ if ( $taxonomy->_builtin ) {
+ $built_ins[] = $variation;
+ } else {
+ $custom_variations[] = $variation;
+ }
+ }
+
register_block_type_from_metadata(
__DIR__ . '/post-terms',
array(
'render_callback' => 'render_block_core_post_terms',
+ 'variations' => array_merge( $built_ins, $custom_variations ),
)
);
}
diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json
index 2541796a522a5..26f3915d5b0e0 100644
--- a/src/wp-includes/blocks/post-terms/block.json
+++ b/src/wp-includes/blocks/post-terms/block.json
@@ -16,6 +16,14 @@
"separator": {
"type": "string",
"default": ", "
+ },
+ "prefix": {
+ "type": "string",
+ "default": ""
+ },
+ "suffix": {
+ "type": "string",
+ "default": ""
}
},
"usesContext": [ "postId", "postType" ],
@@ -31,12 +39,14 @@
}
},
"typography": {
- "lineHeight": true,
"fontSize": true,
- "__experimentalFontStyle": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/post-title.php b/src/wp-includes/blocks/post-title.php
index 78f1e859fbffa..125a2d81ddcbe 100644
--- a/src/wp-includes/blocks/post-title.php
+++ b/src/wp-includes/blocks/post-title.php
@@ -34,7 +34,8 @@ function render_block_core_post_title( $attributes, $content, $block ) {
}
if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
- $title = sprintf( '
%4$s', get_the_permalink( $post_ID ), esc_attr( $attributes['linkTarget'] ), esc_attr( $attributes['rel'] ), $title );
+ $rel = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
+ $title = sprintf( '
%4$s', get_the_permalink( $post_ID ), esc_attr( $attributes['linkTarget'] ), $rel, $title );
}
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
diff --git a/src/wp-includes/blocks/post-title/block.json b/src/wp-includes/blocks/post-title/block.json
index d17ad5cc0e93a..015896ff1bad0 100644
--- a/src/wp-includes/blocks/post-title/block.json
+++ b/src/wp-includes/blocks/post-title/block.json
@@ -42,7 +42,8 @@
}
},
"spacing": {
- "margin": true
+ "margin": true,
+ "padding": true
},
"typography": {
"fontSize": true,
@@ -51,6 +52,7 @@
"__experimentalFontWeight": true,
"__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
"__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true,
diff --git a/src/wp-includes/blocks/preformatted/block.json b/src/wp-includes/blocks/preformatted/block.json
index e19ddfce10805..bab40b94a7ec4 100644
--- a/src/wp-includes/blocks/preformatted/block.json
+++ b/src/wp-includes/blocks/preformatted/block.json
@@ -28,10 +28,12 @@
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/pullquote/block.json b/src/wp-includes/blocks/pullquote/block.json
index 1fa9770636ac4..0732bb52f66bf 100644
--- a/src/wp-includes/blocks/pullquote/block.json
+++ b/src/wp-includes/blocks/pullquote/block.json
@@ -10,8 +10,7 @@
"value": {
"type": "string",
"source": "html",
- "selector": "blockquote",
- "multiline": "p",
+ "selector": "p",
"__experimentalRole": "content"
},
"citation": {
@@ -40,10 +39,12 @@
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true,
"fontAppearance": true
@@ -60,6 +61,12 @@
"style": true,
"width": true
}
+ },
+ "__experimentalStyle": {
+ "typography": {
+ "fontSize": "1.5em",
+ "lineHeight": "1.6"
+ }
}
},
"editorStyle": "wp-block-pullquote-editor",
diff --git a/src/wp-includes/blocks/query-no-results/block.json b/src/wp-includes/blocks/query-no-results/block.json
index 09a03821625a9..f042223f36aec 100644
--- a/src/wp-includes/blocks/query-no-results/block.json
+++ b/src/wp-includes/blocks/query-no-results/block.json
@@ -15,6 +15,19 @@
"color": {
"gradients": true,
"link": true
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
}
}
}
diff --git a/src/wp-includes/blocks/query-pagination-next/block.json b/src/wp-includes/blocks/query-pagination-next/block.json
index 8bbef630e2f83..ad87d05b5ed99 100644
--- a/src/wp-includes/blocks/query-pagination-next/block.json
+++ b/src/wp-includes/blocks/query-pagination-next/block.json
@@ -26,10 +26,12 @@
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/query-pagination-numbers/block.json b/src/wp-includes/blocks/query-pagination-numbers/block.json
index 6084b6bfe43d4..fd28596581961 100644
--- a/src/wp-includes/blocks/query-pagination-numbers/block.json
+++ b/src/wp-includes/blocks/query-pagination-numbers/block.json
@@ -21,10 +21,12 @@
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/query-pagination-previous/block.json b/src/wp-includes/blocks/query-pagination-previous/block.json
index f1290952bbc6d..484cefe6bbd82 100644
--- a/src/wp-includes/blocks/query-pagination-previous/block.json
+++ b/src/wp-includes/blocks/query-pagination-previous/block.json
@@ -26,10 +26,12 @@
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true
}
diff --git a/src/wp-includes/blocks/query-pagination.php b/src/wp-includes/blocks/query-pagination.php
index b4fbc60079060..eaa784be08e7d 100644
--- a/src/wp-includes/blocks/query-pagination.php
+++ b/src/wp-includes/blocks/query-pagination.php
@@ -20,7 +20,6 @@ function render_block_core_query_pagination( $attributes, $content ) {
$wrapper_attributes = get_block_wrapper_attributes(
array(
- 'role' => 'navigation',
'aria-label' => __( 'Pagination' ),
)
);
diff --git a/src/wp-includes/blocks/query-pagination/block.json b/src/wp-includes/blocks/query-pagination/block.json
index 74636d7bec45e..f75f4077d4e13 100644
--- a/src/wp-includes/blocks/query-pagination/block.json
+++ b/src/wp-includes/blocks/query-pagination/block.json
@@ -36,6 +36,19 @@
"default": {
"type": "flex"
}
+ },
+ "typography": {
+ "fontSize": true,
+ "lineHeight": true,
+ "__experimentalFontFamily": true,
+ "__experimentalFontWeight": true,
+ "__experimentalFontStyle": true,
+ "__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
+ "__experimentalDefaultControls": {
+ "fontSize": true
+ }
}
},
"editorStyle": "wp-block-query-pagination-editor",
diff --git a/src/wp-includes/blocks/query-title.php b/src/wp-includes/blocks/query-title.php
index 065186dd60260..d781de3826b1d 100644
--- a/src/wp-includes/blocks/query-title.php
+++ b/src/wp-includes/blocks/query-title.php
@@ -17,13 +17,39 @@
function render_block_core_query_title( $attributes ) {
$type = isset( $attributes['type'] ) ? $attributes['type'] : null;
$is_archive = is_archive();
- if ( ! $type || ( 'archive' === $type && ! $is_archive ) ) {
+ $is_search = is_search();
+ if ( ! $type ||
+ ( 'archive' === $type && ! $is_archive ) ||
+ ( 'search' === $type && ! $is_search )
+ ) {
return '';
}
$title = '';
if ( $is_archive ) {
- $title = get_the_archive_title();
+ $show_prefix = isset( $attributes['showPrefix'] ) ? $attributes['showPrefix'] : true;
+ if ( ! $show_prefix ) {
+ $filter_title = function( $title, $original_title ) {
+ return $original_title;
+ };
+ add_filter( 'get_the_archive_title', $filter_title, 10, 2 );
+ $title = get_the_archive_title();
+ remove_filter( 'get_the_archive_title', $filter_title, 10, 2 );
+ } else {
+ $title = get_the_archive_title();
+ }
}
+ if ( $is_search ) {
+ $title = __( 'Search results' );
+
+ if ( isset( $attributes['showSearchTerm'] ) && $attributes['showSearchTerm'] ) {
+ $title = sprintf(
+ /* translators: %s is the search term. */
+ __( 'Search results for: "%s"' ),
+ get_search_query()
+ );
+ }
+ }
+
$tag_name = isset( $attributes['level'] ) ? 'h' . (int) $attributes['level'] : 'h1';
$align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json
index 3bcfa6482107c..33df75866bce0 100644
--- a/src/wp-includes/blocks/query-title/block.json
+++ b/src/wp-includes/blocks/query-title/block.json
@@ -16,6 +16,14 @@
"level": {
"type": "number",
"default": 1
+ },
+ "showPrefix": {
+ "type": "boolean",
+ "default": true
+ },
+ "showSearchTerm": {
+ "type": "boolean",
+ "default": true
}
},
"supports": {
@@ -29,7 +37,8 @@
}
},
"spacing": {
- "margin": true
+ "margin": true,
+ "padding": true
},
"typography": {
"fontSize": true,
@@ -39,6 +48,7 @@
"__experimentalFontWeight": true,
"__experimentalLetterSpacing": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
"__experimentalDefaultControls": {
"fontSize": true,
"fontAppearance": true,
@@ -46,5 +56,5 @@
}
}
},
- "editorStyle": "wp-block-query-title-editor"
+ "style": "wp-block-query-title"
}
diff --git a/src/wp-includes/blocks/query/block.json b/src/wp-includes/blocks/query/block.json
index 426283966f8d1..cd09e22ee57f7 100644
--- a/src/wp-includes/blocks/query/block.json
+++ b/src/wp-includes/blocks/query/block.json
@@ -24,7 +24,8 @@
"exclude": [],
"sticky": "",
"inherit": true,
- "taxQuery": null
+ "taxQuery": null,
+ "parents": []
}
},
"tagName": {
@@ -36,6 +37,9 @@
"default": {
"type": "list"
}
+ },
+ "namespace": {
+ "type": "string"
}
},
"providesContext": {
diff --git a/src/wp-includes/blocks/quote/block.json b/src/wp-includes/blocks/quote/block.json
index 74b72078c5c45..3ceaf0fcf3e03 100644
--- a/src/wp-includes/blocks/quote/block.json
+++ b/src/wp-includes/blocks/quote/block.json
@@ -30,13 +30,16 @@
"supports": {
"anchor": true,
"__experimentalSlashInserter": true,
+ "__experimentalOnEnter": true,
"typography": {
"fontSize": true,
"lineHeight": true,
- "__experimentalFontStyle": true,
+ "__experimentalFontFamily": true,
"__experimentalFontWeight": true,
- "__experimentalLetterSpacing": true,
+ "__experimentalFontStyle": true,
"__experimentalTextTransform": true,
+ "__experimentalTextDecoration": true,
+ "__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
"fontSize": true,
"fontAppearance": true
diff --git a/src/wp-includes/blocks/require-dynamic-blocks.php b/src/wp-includes/blocks/require-dynamic-blocks.php
index bcffcaafc0cc5..b9ad4fc06973c 100644
--- a/src/wp-includes/blocks/require-dynamic-blocks.php
+++ b/src/wp-includes/blocks/require-dynamic-blocks.php
@@ -13,10 +13,11 @@
require ABSPATH . WPINC . '/blocks/comment-edit-link.php';
require ABSPATH . WPINC . '/blocks/comment-reply-link.php';
require ABSPATH . WPINC . '/blocks/comment-template.php';
+require ABSPATH . WPINC . '/blocks/comments.php';
+require ABSPATH . WPINC . '/blocks/comments-pagination.php';
require ABSPATH . WPINC . '/blocks/comments-pagination-next.php';
require ABSPATH . WPINC . '/blocks/comments-pagination-numbers.php';
require ABSPATH . WPINC . '/blocks/comments-pagination-previous.php';
-require ABSPATH . WPINC . '/blocks/comments-pagination.php';
require ABSPATH . WPINC . '/blocks/comments-title.php';
require ABSPATH . WPINC . '/blocks/cover.php';
require ABSPATH . WPINC . '/blocks/file.php';
@@ -26,14 +27,13 @@
require ABSPATH . WPINC . '/blocks/latest-comments.php';
require ABSPATH . WPINC . '/blocks/latest-posts.php';
require ABSPATH . WPINC . '/blocks/loginout.php';
+require ABSPATH . WPINC . '/blocks/navigation.php';
require ABSPATH . WPINC . '/blocks/navigation-link.php';
require ABSPATH . WPINC . '/blocks/navigation-submenu.php';
-require ABSPATH . WPINC . '/blocks/navigation.php';
require ABSPATH . WPINC . '/blocks/page-list.php';
require ABSPATH . WPINC . '/blocks/pattern.php';
require ABSPATH . WPINC . '/blocks/post-author.php';
require ABSPATH . WPINC . '/blocks/post-author-biography.php';
-require ABSPATH . WPINC . '/blocks/post-comments.php';
require ABSPATH . WPINC . '/blocks/post-comments-form.php';
require ABSPATH . WPINC . '/blocks/post-content.php';
require ABSPATH . WPINC . '/blocks/post-date.php';
@@ -43,13 +43,13 @@
require ABSPATH . WPINC . '/blocks/post-template.php';
require ABSPATH . WPINC . '/blocks/post-terms.php';
require ABSPATH . WPINC . '/blocks/post-title.php';
+require ABSPATH . WPINC . '/blocks/query.php';
require ABSPATH . WPINC . '/blocks/query-no-results.php';
+require ABSPATH . WPINC . '/blocks/query-pagination.php';
require ABSPATH . WPINC . '/blocks/query-pagination-next.php';
require ABSPATH . WPINC . '/blocks/query-pagination-numbers.php';
require ABSPATH . WPINC . '/blocks/query-pagination-previous.php';
-require ABSPATH . WPINC . '/blocks/query-pagination.php';
require ABSPATH . WPINC . '/blocks/query-title.php';
-require ABSPATH . WPINC . '/blocks/query.php';
require ABSPATH . WPINC . '/blocks/read-more.php';
require ABSPATH . WPINC . '/blocks/rss.php';
require ABSPATH . WPINC . '/blocks/search.php';
diff --git a/src/wp-includes/blocks/require-static-blocks.php b/src/wp-includes/blocks/require-static-blocks.php
index 1247d8fe9435d..9a1884e9cf09b 100644
--- a/src/wp-includes/blocks/require-static-blocks.php
+++ b/src/wp-includes/blocks/require-static-blocks.php
@@ -9,13 +9,13 @@
'code',
'column',
'columns',
- 'comments-query-loop',
'embed',
'freeform',
'group',
'heading',
'html',
'list',
+ 'list-item',
'media-text',
'missing',
'more',
diff --git a/src/wp-includes/blocks/search.php b/src/wp-includes/blocks/search.php
index 94ec6fc4ac7f5..46e08134b384d 100644
--- a/src/wp-includes/blocks/search.php
+++ b/src/wp-includes/blocks/search.php
@@ -13,8 +13,6 @@
* @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 ``. Support these by defaulting an undefined label and
@@ -27,17 +25,20 @@ function render_block_core_search( $attributes ) {
)
);
- $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_input = ( ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'] ) ? false : true;
+ $show_button = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true;
+ $query_params = ( ! empty( $attributes['query'] ) ) ? $attributes['query'] : array();
+ $input_markup = '';
+ $button_markup = '';
+ $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 );
@@ -50,50 +51,80 @@ function render_block_core_search( $attributes ) {
$label_inner_html
);
if ( $show_label && ! empty( $attributes['label'] ) ) {
+ $label_classes = array( 'wp-block-search__label' );
+ if ( ! empty( $typography_classes ) ) {
+ $label_classes[] = $typography_classes;
+ }
$label_markup = sprintf(
- '
',
- $input_id,
+ '
',
+ esc_attr( $input_id ),
+ esc_attr( implode( ' ', $label_classes ) ),
+ $inline_styles['label'],
$label_inner_html
);
}
if ( $show_input ) {
- $input_classes = ! $is_button_inside ? $border_color_classes : '';
- $input_markup = sprintf(
+ $input_classes = array( 'wp-block-search__input' );
+ if ( $is_button_inside ) {
+ $input_classes[] = $border_color_classes;
+ }
+ if ( ! empty( $typography_classes ) ) {
+ $input_classes[] = $typography_classes;
+ }
+ $input_markup = sprintf(
'
',
$input_id,
- esc_attr( $input_classes ),
- esc_attr( get_search_query() ),
+ esc_attr( implode( ' ', $input_classes ) ),
+ get_search_query(),
esc_attr( $attributes['placeholder'] ),
$inline_styles['input']
);
}
+ if ( count( $query_params ) > 0 ) {
+ foreach ( $query_params as $param => $value ) {
+ $query_params_markup .= sprintf(
+ '
',
+ 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;
+ }
+ $aria_label = '';
- 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';
+ $aria_label = sprintf( 'aria-label="%s"', esc_attr( wp_strip_all_tags( $attributes['buttonText'] ) ) );
+ $button_classes[] = 'has-icon';
$button_internal_markup =
- '