Block Editor: Package updates for WordPress 5.8 beta 1 (batch2).
This includes the following fixes: - Fix inspector opening when clicking outside the widget areas - Assume light theme when a transparent background is used - Make Post blocks non editable inside Query block - Rename QueryLoop to PostTemplate block Props ntsekouras. See #52991. Built from https://develop.svn.wordpress.org/trunk@51101 git-svn-id: http://core.svn.wordpress.org/trunk@50710 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
@@ -21,8 +21,8 @@ require ABSPATH . WPINC . '/blocks/post-excerpt.php';
|
||||
require ABSPATH . WPINC . '/blocks/post-featured-image.php';
|
||||
require ABSPATH . WPINC . '/blocks/post-terms.php';
|
||||
require ABSPATH . WPINC . '/blocks/post-title.php';
|
||||
require ABSPATH . WPINC . '/blocks/post-template.php';
|
||||
require ABSPATH . WPINC . '/blocks/query.php';
|
||||
require ABSPATH . WPINC . '/blocks/query-loop.php';
|
||||
require ABSPATH . WPINC . '/blocks/query-pagination.php';
|
||||
require ABSPATH . WPINC . '/blocks/query-pagination-next.php';
|
||||
require ABSPATH . WPINC . '/blocks/query-pagination-numbers.php';
|
||||
|
||||
148
wp-includes/blocks/post-template.php
Normal file
148
wp-includes/blocks/post-template.php
Normal file
@@ -0,0 +1,148 @@
|
||||
<?php
|
||||
/**
|
||||
* Server-side rendering of the `core/post-template` block.
|
||||
*
|
||||
* @package WordPress
|
||||
*/
|
||||
|
||||
/**
|
||||
* Renders the `core/post-template` block on the server.
|
||||
*
|
||||
* @param array $attributes Block attributes.
|
||||
* @param string $content Block default content.
|
||||
* @param WP_Block $block Block instance.
|
||||
*
|
||||
* @return string Returns the output of the query, structured using the layout defined by the block's inner blocks.
|
||||
*/
|
||||
function render_block_core_post_template( $attributes, $content, $block ) {
|
||||
$page_key = isset( $block->context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
|
||||
$page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
|
||||
|
||||
$query_args = build_query_vars_from_query_block( $block, $page );
|
||||
// Override the custom query with the global query if needed.
|
||||
$use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] );
|
||||
if ( $use_global_query ) {
|
||||
global $wp_query;
|
||||
if ( $wp_query && isset( $wp_query->query_vars ) && is_array( $wp_query->query_vars ) ) {
|
||||
// Unset `offset` because if is set, $wp_query overrides/ignores the paged parameter and breaks pagination.
|
||||
unset( $query_args['offset'] );
|
||||
$query_args = wp_parse_args( $wp_query->query_vars, $query_args );
|
||||
|
||||
if ( empty( $query_args['post_type'] ) && is_singular() ) {
|
||||
$query_args['post_type'] = get_post_type( get_the_ID() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$query = new WP_Query( $query_args );
|
||||
|
||||
if ( ! $query->have_posts() ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$classnames = '';
|
||||
if ( isset( $block->context['displayLayout'] ) && isset( $block->context['query'] ) ) {
|
||||
if ( isset( $block->context['displayLayout']['type'] ) && 'flex' === $block->context['displayLayout']['type'] ) {
|
||||
$classnames = "is-flex-container columns-{$block->context['displayLayout']['columns']}";
|
||||
}
|
||||
}
|
||||
|
||||
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
|
||||
|
||||
$content = '';
|
||||
while ( $query->have_posts() ) {
|
||||
$query->the_post();
|
||||
$block_content = (
|
||||
new WP_Block(
|
||||
$block->parsed_block,
|
||||
array(
|
||||
'postType' => get_post_type(),
|
||||
'postId' => get_the_ID(),
|
||||
)
|
||||
)
|
||||
)->render( array( 'dynamic' => false ) );
|
||||
$content .= "<li>{$block_content}</li>";
|
||||
}
|
||||
|
||||
wp_reset_postdata();
|
||||
|
||||
return sprintf(
|
||||
'<ul %1$s>%2$s</ul>',
|
||||
$wrapper_attributes,
|
||||
$content
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers the `core/post-template` block on the server.
|
||||
*/
|
||||
function register_block_core_post_template() {
|
||||
register_block_type_from_metadata(
|
||||
__DIR__ . '/post-template',
|
||||
array(
|
||||
'render_callback' => 'render_block_core_post_template',
|
||||
'skip_inner_blocks' => true,
|
||||
)
|
||||
);
|
||||
}
|
||||
add_action( 'init', 'register_block_core_post_template' );
|
||||
|
||||
/**
|
||||
* Renders the legacy `core/query-loop` block on the server.
|
||||
* It triggers a developer warning and then calls the renamed
|
||||
* block's `render_callback` function output.
|
||||
*
|
||||
* This can be removed when WordPress 5.9 is released.
|
||||
*
|
||||
* @param array $attributes Block attributes.
|
||||
* @param string $content Block default content.
|
||||
* @param WP_Block $block Block instance.
|
||||
*
|
||||
* @return string Returns the output of the query, structured using the layout defined by the block's inner blocks.
|
||||
*/
|
||||
function render_legacy_query_loop_block( $attributes, $content, $block ) {
|
||||
trigger_error(
|
||||
/* translators: %1$s: Block type */
|
||||
sprintf( __( 'Block %1$s has been renamed to Post Template. %1$s will be supported until WordPress version 5.9.', 'gutenberg' ), $block->name ),
|
||||
headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
|
||||
);
|
||||
return render_block_core_post_template( $attributes, $content, $block );
|
||||
}
|
||||
|
||||
/**
|
||||
* Complements the renaming of `Query Loop` to `Post Template`.
|
||||
* This ensures backwards compatibility for any users running the Gutenberg
|
||||
* plugin who have used Query Loop prior to its renaming.
|
||||
*
|
||||
* This can be removed when WordPress 5.9 is released.
|
||||
*
|
||||
* @see https://github.com/WordPress/gutenberg/pull/32514
|
||||
*/
|
||||
function gutenberg_register_legacy_query_loop_block() {
|
||||
$registry = WP_Block_Type_Registry::get_instance();
|
||||
if ( $registry->is_registered( 'core/query-loop' ) ) {
|
||||
unregister_block_type( 'core/query-loop' );
|
||||
}
|
||||
register_block_type(
|
||||
'core/query-loop',
|
||||
array(
|
||||
'category' => 'design',
|
||||
'uses_context' => array(
|
||||
'queryId',
|
||||
'query',
|
||||
'queryContext',
|
||||
'displayLayout',
|
||||
'templateSlug',
|
||||
),
|
||||
'supports' => array(
|
||||
'reusable' => false,
|
||||
'html' => false,
|
||||
'align' => true,
|
||||
),
|
||||
'style' => 'wp-block-post-template',
|
||||
'render_callback' => 'render_legacy_query_loop_block',
|
||||
'skip_inner_blocks' => true,
|
||||
)
|
||||
);
|
||||
}
|
||||
add_action( 'init', 'gutenberg_register_legacy_query_loop_block' );
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"apiVersion": 2,
|
||||
"name": "core/query-loop",
|
||||
"title": "Query Loop",
|
||||
"name": "core/post-template",
|
||||
"title": "Post Template",
|
||||
"category": "design",
|
||||
"parent": [ "core/query" ],
|
||||
"description": "Query loop.",
|
||||
"description": "Post Template.",
|
||||
"textdomain": "default",
|
||||
"usesContext": [
|
||||
"queryId",
|
||||
@@ -18,6 +18,6 @@
|
||||
"html": false,
|
||||
"align": true
|
||||
},
|
||||
"style": "wp-block-query-loop",
|
||||
"editorStyle": "wp-block-query-loop-editor"
|
||||
"style": "wp-block-post-template",
|
||||
"editorStyle": "wp-block-post-template-editor"
|
||||
}
|
||||
@@ -68,7 +68,7 @@
|
||||
/**
|
||||
* Reset the WP Admin page styles for Gutenberg-like pages.
|
||||
*/
|
||||
.editor-styles-wrapper ul.wp-block-query-loop {
|
||||
.editor-styles-wrapper ul.wp-block-post-template {
|
||||
padding-right: 0;
|
||||
margin-right: 0;
|
||||
list-style: none;
|
||||
1
wp-includes/blocks/post-template/editor-rtl.min.css
vendored
Normal file
1
wp-includes/blocks/post-template/editor-rtl.min.css
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.editor-styles-wrapper ul.wp-block-post-template{padding-right:0;margin-right:0;list-style:none}
|
||||
@@ -68,7 +68,7 @@
|
||||
/**
|
||||
* Reset the WP Admin page styles for Gutenberg-like pages.
|
||||
*/
|
||||
.editor-styles-wrapper ul.wp-block-query-loop {
|
||||
.editor-styles-wrapper ul.wp-block-post-template {
|
||||
padding-left: 0;
|
||||
margin-left: 0;
|
||||
list-style: none;
|
||||
1
wp-includes/blocks/post-template/editor.min.css
vendored
Normal file
1
wp-includes/blocks/post-template/editor.min.css
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.editor-styles-wrapper ul.wp-block-post-template{padding-left:0;margin-left:0;list-style:none}
|
||||
@@ -68,55 +68,70 @@
|
||||
/**
|
||||
* Reset the WP Admin page styles for Gutenberg-like pages.
|
||||
*/
|
||||
.wp-block-post-template,
|
||||
.wp-block-query-loop {
|
||||
max-width: 100%;
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
}
|
||||
.wp-block-post-template li,
|
||||
.wp-block-query-loop li {
|
||||
clear: both;
|
||||
}
|
||||
.wp-block-post-template.is-flex-container,
|
||||
.wp-block-query-loop.is-flex-container {
|
||||
flex-direction: row;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.wp-block-post-template.is-flex-container li,
|
||||
.wp-block-query-loop.is-flex-container li {
|
||||
margin: 0 0 1.25em 0;
|
||||
width: 100%;
|
||||
}
|
||||
@media (min-width: 600px) {
|
||||
.wp-block-query-loop.is-flex-container li {
|
||||
.wp-block-post-template.is-flex-container li,
|
||||
.wp-block-query-loop.is-flex-container li {
|
||||
margin-left: 1.25em;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-2 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-2 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-2 > li {
|
||||
width: calc((100% / 2) - 1.25em + (1.25em / 2));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-2 > li:nth-child(2n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-2 > li:nth-child(2n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-2 > li:nth-child(2n) {
|
||||
margin-left: 0;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-3 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-3 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-3 > li {
|
||||
width: calc((100% / 3) - 1.25em + (1.25em / 3));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-3 > li:nth-child(3n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-3 > li:nth-child(3n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-3 > li:nth-child(3n) {
|
||||
margin-left: 0;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-4 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-4 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-4 > li {
|
||||
width: calc((100% / 4) - 1.25em + (1.25em / 4));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-4 > li:nth-child(4n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-4 > li:nth-child(4n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-4 > li:nth-child(4n) {
|
||||
margin-left: 0;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-5 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-5 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-5 > li {
|
||||
width: calc((100% / 5) - 1.25em + (1.25em / 5));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-5 > li:nth-child(5n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-5 > li:nth-child(5n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-5 > li:nth-child(5n) {
|
||||
margin-left: 0;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-6 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-6 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-6 > li {
|
||||
width: calc((100% / 6) - 1.25em + (1.25em / 6));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-6 > li:nth-child(6n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-6 > li:nth-child(6n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-6 > li:nth-child(6n) {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
1
wp-includes/blocks/post-template/style-rtl.min.css
vendored
Normal file
1
wp-includes/blocks/post-template/style-rtl.min.css
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.wp-block-post-template,.wp-block-query-loop{max-width:100%;list-style:none;padding:0}.wp-block-post-template li,.wp-block-query-loop li{clear:both}.wp-block-post-template.is-flex-container,.wp-block-query-loop.is-flex-container{flex-direction:row;display:flex;flex-wrap:wrap}.wp-block-post-template.is-flex-container li,.wp-block-query-loop.is-flex-container li{margin:0 0 1.25em;width:100%}@media (min-width:600px){.wp-block-post-template.is-flex-container li,.wp-block-query-loop.is-flex-container li{margin-left:1.25em}.wp-block-post-template.is-flex-container.is-flex-container.columns-2>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-2>li{width:calc(50% - .625em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-2>li:nth-child(2n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-2>li:nth-child(2n){margin-left:0}.wp-block-post-template.is-flex-container.is-flex-container.columns-3>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-3>li{width:calc(33.33333% - .83333em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-3>li:nth-child(3n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-3>li:nth-child(3n){margin-left:0}.wp-block-post-template.is-flex-container.is-flex-container.columns-4>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-4>li{width:calc(25% - .9375em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-4>li:nth-child(4n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-4>li:nth-child(4n){margin-left:0}.wp-block-post-template.is-flex-container.is-flex-container.columns-5>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-5>li{width:calc(20% - 1em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-5>li:nth-child(5n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-5>li:nth-child(5n){margin-left:0}.wp-block-post-template.is-flex-container.is-flex-container.columns-6>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-6>li{width:calc(16.66667% - 1.04167em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-6>li:nth-child(6n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-6>li:nth-child(6n){margin-left:0}}
|
||||
@@ -68,55 +68,70 @@
|
||||
/**
|
||||
* Reset the WP Admin page styles for Gutenberg-like pages.
|
||||
*/
|
||||
.wp-block-post-template,
|
||||
.wp-block-query-loop {
|
||||
max-width: 100%;
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
}
|
||||
.wp-block-post-template li,
|
||||
.wp-block-query-loop li {
|
||||
clear: both;
|
||||
}
|
||||
.wp-block-post-template.is-flex-container,
|
||||
.wp-block-query-loop.is-flex-container {
|
||||
flex-direction: row;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.wp-block-post-template.is-flex-container li,
|
||||
.wp-block-query-loop.is-flex-container li {
|
||||
margin: 0 0 1.25em 0;
|
||||
width: 100%;
|
||||
}
|
||||
@media (min-width: 600px) {
|
||||
.wp-block-query-loop.is-flex-container li {
|
||||
.wp-block-post-template.is-flex-container li,
|
||||
.wp-block-query-loop.is-flex-container li {
|
||||
margin-right: 1.25em;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-2 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-2 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-2 > li {
|
||||
width: calc((100% / 2) - 1.25em + (1.25em / 2));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-2 > li:nth-child(2n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-2 > li:nth-child(2n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-2 > li:nth-child(2n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-3 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-3 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-3 > li {
|
||||
width: calc((100% / 3) - 1.25em + (1.25em / 3));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-3 > li:nth-child(3n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-3 > li:nth-child(3n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-3 > li:nth-child(3n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-4 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-4 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-4 > li {
|
||||
width: calc((100% / 4) - 1.25em + (1.25em / 4));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-4 > li:nth-child(4n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-4 > li:nth-child(4n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-4 > li:nth-child(4n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-5 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-5 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-5 > li {
|
||||
width: calc((100% / 5) - 1.25em + (1.25em / 5));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-5 > li:nth-child(5n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-5 > li:nth-child(5n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-5 > li:nth-child(5n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-6 > li {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-6 > li,
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-6 > li {
|
||||
width: calc((100% / 6) - 1.25em + (1.25em / 6));
|
||||
}
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-6 > li:nth-child(6n) {
|
||||
.wp-block-post-template.is-flex-container.is-flex-container.columns-6 > li:nth-child(6n),
|
||||
.wp-block-query-loop.is-flex-container.is-flex-container.columns-6 > li:nth-child(6n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
1
wp-includes/blocks/post-template/style.min.css
vendored
Normal file
1
wp-includes/blocks/post-template/style.min.css
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.wp-block-post-template,.wp-block-query-loop{max-width:100%;list-style:none;padding:0}.wp-block-post-template li,.wp-block-query-loop li{clear:both}.wp-block-post-template.is-flex-container,.wp-block-query-loop.is-flex-container{flex-direction:row;display:flex;flex-wrap:wrap}.wp-block-post-template.is-flex-container li,.wp-block-query-loop.is-flex-container li{margin:0 0 1.25em;width:100%}@media (min-width:600px){.wp-block-post-template.is-flex-container li,.wp-block-query-loop.is-flex-container li{margin-right:1.25em}.wp-block-post-template.is-flex-container.is-flex-container.columns-2>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-2>li{width:calc(50% - .625em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-2>li:nth-child(2n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-2>li:nth-child(2n){margin-right:0}.wp-block-post-template.is-flex-container.is-flex-container.columns-3>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-3>li{width:calc(33.33333% - .83333em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-3>li:nth-child(3n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-3>li:nth-child(3n){margin-right:0}.wp-block-post-template.is-flex-container.is-flex-container.columns-4>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-4>li{width:calc(25% - .9375em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-4>li:nth-child(4n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-4>li:nth-child(4n){margin-right:0}.wp-block-post-template.is-flex-container.is-flex-container.columns-5>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-5>li{width:calc(20% - 1em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-5>li:nth-child(5n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-5>li:nth-child(5n){margin-right:0}.wp-block-post-template.is-flex-container.is-flex-container.columns-6>li,.wp-block-query-loop.is-flex-container.is-flex-container.columns-6>li{width:calc(16.66667% - 1.04167em)}.wp-block-post-template.is-flex-container.is-flex-container.columns-6>li:nth-child(6n),.wp-block-query-loop.is-flex-container.is-flex-container.columns-6>li:nth-child(6n){margin-right:0}}
|
||||
@@ -1,88 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Server-side rendering of the `core/query-loop` block.
|
||||
*
|
||||
* @package WordPress
|
||||
*/
|
||||
|
||||
/**
|
||||
* Renders the `core/query-loop` block on the server.
|
||||
*
|
||||
* @param array $attributes Block attributes.
|
||||
* @param string $content Block default content.
|
||||
* @param WP_Block $block Block instance.
|
||||
*
|
||||
* @return string Returns the output of the query, structured using the layout defined by the block's inner blocks.
|
||||
*/
|
||||
function render_block_core_query_loop( $attributes, $content, $block ) {
|
||||
$page_key = isset( $block->context['queryId'] ) ? 'query-' . $block->context['queryId'] . '-page' : 'query-page';
|
||||
$page = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
|
||||
|
||||
$query_args = build_query_vars_from_query_block( $block, $page );
|
||||
// Override the custom query with the global query if needed.
|
||||
$use_global_query = ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] );
|
||||
if ( $use_global_query ) {
|
||||
global $wp_query;
|
||||
if ( $wp_query && isset( $wp_query->query_vars ) && is_array( $wp_query->query_vars ) ) {
|
||||
// Unset `offset` because if is set, $wp_query overrides/ignores the paged parameter and breaks pagination.
|
||||
unset( $query_args['offset'] );
|
||||
$query_args = wp_parse_args( $wp_query->query_vars, $query_args );
|
||||
|
||||
if ( empty( $query_args['post_type'] ) && is_singular() ) {
|
||||
$query_args['post_type'] = get_post_type( get_the_ID() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$query = new WP_Query( $query_args );
|
||||
|
||||
if ( ! $query->have_posts() ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$classnames = '';
|
||||
if ( isset( $block->context['displayLayout'] ) && isset( $block->context['query'] ) ) {
|
||||
if ( isset( $block->context['displayLayout']['type'] ) && 'flex' === $block->context['displayLayout']['type'] ) {
|
||||
$classnames = "is-flex-container columns-{$block->context['displayLayout']['columns']}";
|
||||
}
|
||||
}
|
||||
|
||||
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
|
||||
|
||||
$content = '';
|
||||
while ( $query->have_posts() ) {
|
||||
$query->the_post();
|
||||
$block_content = (
|
||||
new WP_Block(
|
||||
$block->parsed_block,
|
||||
array(
|
||||
'postType' => get_post_type(),
|
||||
'postId' => get_the_ID(),
|
||||
)
|
||||
)
|
||||
)->render( array( 'dynamic' => false ) );
|
||||
$content .= "<li>{$block_content}</li>";
|
||||
}
|
||||
|
||||
wp_reset_postdata();
|
||||
|
||||
return sprintf(
|
||||
'<ul %1$s>%2$s</ul>',
|
||||
$wrapper_attributes,
|
||||
$content
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers the `core/query-loop` block on the server.
|
||||
*/
|
||||
function register_block_core_query_loop() {
|
||||
register_block_type_from_metadata(
|
||||
__DIR__ . '/query-loop',
|
||||
array(
|
||||
'render_callback' => 'render_block_core_query_loop',
|
||||
'skip_inner_blocks' => true,
|
||||
)
|
||||
);
|
||||
}
|
||||
add_action( 'init', 'register_block_core_query_loop' );
|
||||
@@ -1 +0,0 @@
|
||||
.editor-styles-wrapper ul.wp-block-query-loop{padding-right:0;margin-right:0;list-style:none}
|
||||
1
wp-includes/blocks/query-loop/editor.min.css
vendored
1
wp-includes/blocks/query-loop/editor.min.css
vendored
@@ -1 +0,0 @@
|
||||
.editor-styles-wrapper ul.wp-block-query-loop{padding-left:0;margin-left:0;list-style:none}
|
||||
@@ -1 +0,0 @@
|
||||
.wp-block-query-loop{max-width:100%;list-style:none;padding:0}.wp-block-query-loop li{clear:both}.wp-block-query-loop.is-flex-container{flex-direction:row;display:flex;flex-wrap:wrap}.wp-block-query-loop.is-flex-container li{margin:0 0 1.25em;width:100%}@media (min-width:600px){.wp-block-query-loop.is-flex-container li{margin-left:1.25em}.wp-block-query-loop.is-flex-container.is-flex-container.columns-2>li{width:calc(50% - .625em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-2>li:nth-child(2n){margin-left:0}.wp-block-query-loop.is-flex-container.is-flex-container.columns-3>li{width:calc(33.33333% - .83333em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-3>li:nth-child(3n){margin-left:0}.wp-block-query-loop.is-flex-container.is-flex-container.columns-4>li{width:calc(25% - .9375em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-4>li:nth-child(4n){margin-left:0}.wp-block-query-loop.is-flex-container.is-flex-container.columns-5>li{width:calc(20% - 1em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-5>li:nth-child(5n){margin-left:0}.wp-block-query-loop.is-flex-container.is-flex-container.columns-6>li{width:calc(16.66667% - 1.04167em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-6>li:nth-child(6n){margin-left:0}}
|
||||
1
wp-includes/blocks/query-loop/style.min.css
vendored
1
wp-includes/blocks/query-loop/style.min.css
vendored
@@ -1 +0,0 @@
|
||||
.wp-block-query-loop{max-width:100%;list-style:none;padding:0}.wp-block-query-loop li{clear:both}.wp-block-query-loop.is-flex-container{flex-direction:row;display:flex;flex-wrap:wrap}.wp-block-query-loop.is-flex-container li{margin:0 0 1.25em;width:100%}@media (min-width:600px){.wp-block-query-loop.is-flex-container li{margin-right:1.25em}.wp-block-query-loop.is-flex-container.is-flex-container.columns-2>li{width:calc(50% - .625em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-2>li:nth-child(2n){margin-right:0}.wp-block-query-loop.is-flex-container.is-flex-container.columns-3>li{width:calc(33.33333% - .83333em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-3>li:nth-child(3n){margin-right:0}.wp-block-query-loop.is-flex-container.is-flex-container.columns-4>li{width:calc(25% - .9375em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-4>li:nth-child(4n){margin-right:0}.wp-block-query-loop.is-flex-container.is-flex-container.columns-5>li{width:calc(20% - 1em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-5>li:nth-child(5n){margin-right:0}.wp-block-query-loop.is-flex-container.is-flex-container.columns-6>li{width:calc(16.66667% - 1.04167em)}.wp-block-query-loop.is-flex-container.is-flex-container.columns-6>li:nth-child(6n){margin-right:0}}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"apiVersion": 2,
|
||||
"name": "core/query",
|
||||
"title": "Query",
|
||||
"title": "Query Loop",
|
||||
"category": "design",
|
||||
"description": "Displays a list of posts as a result of a query.",
|
||||
"textdomain": "default",
|
||||
|
||||
Reference in New Issue
Block a user