@wordpress/block-library 6.0.17-next.33ec3857e2.0 → 6.0.20

package/src/post-comments-form/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-comments-form",
 	"title": "Post Comments Form",
@@ -30,9 +29,5 @@
 			}
 		}
 	},
-	"style": [
-		"wp-block-post-comments-form",
-		"wp-block-buttons",
-		"wp-block-button"
-	]
+	"style": [ "wp-block-post-comments-form", "wp-block-buttons", "wp-block-button" ]
 }

package/src/post-comments-link/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-comments-link",
 	"title": "Post Comments Link",

package/src/post-content/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-content",
 	"title": "Post Content",

package/src/post-content/edit.js

@@ -66,7 +66,7 @@ function EditableContent( { layout, context = {} } ) {
 
 function Content( props ) {
 	const { context: { queryId, postType, postId } = {} } = props;
-	const isDescendentOfQueryLoop = !! queryId;
+	const isDescendentOfQueryLoop = Number.isFinite( queryId );
 	const userCanEdit = useCanEditEntity( 'postType', postType, postId );
 	const isEditable = userCanEdit && ! isDescendentOfQueryLoop;
 

package/src/post-content/index.php

@@ -36,11 +36,21 @@ function render_block_core_post_content( $attributes, $content, $block ) {
 
 	$seen_ids[ $post_id ] = true;
 
+	// Check is needed for backward compatibility with third-party plugins
+	// that might rely on the `in_the_loop` check; calling `the_post` sets it to true.
 	if ( ! in_the_loop() && have_posts() ) {
 		the_post();
 	}
 
-	$content = get_the_content( null, false, $post_id );
+	// When inside the main loop, we want to use queried object
+	// so that `the_preview` for the current post can apply.
+	// We force this behavior by omitting the third argument (post ID) from the `get_the_content`.
+	$content = get_the_content( null, false );
+	// Check for nextpage to display page links for paginated posts.
+	if ( has_block( 'core/nextpage' ) ) {
+		$content .= wp_link_pages( array( 'echo' => 0 ) );
+	}
+
 	/** This filter is documented in wp-includes/post-template.php */
 	$content = apply_filters( 'the_content', str_replace( ']]>', ']]>', $content ) );
 	unset( $seen_ids[ $post_id ] );

package/src/post-date/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-date",
 	"title": "Post Date",

package/src/post-date/edit.js

@@ -33,7 +33,7 @@ export default function PostDateEdit( {
 	context: { postId, postType, queryId },
 	setAttributes,
 } ) {
-	const isDescendentOfQueryLoop = !! queryId;
+	const isDescendentOfQueryLoop = Number.isFinite( queryId );
 	const [ siteFormat ] = useEntityProp( 'root', 'site', 'date_format' );
 	const [ date, setDate ] = useEntityProp(
 		'postType',

package/src/post-excerpt/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-excerpt",
 	"title": "Post Excerpt",

package/src/post-excerpt/edit.js

@@ -30,7 +30,7 @@ export default function PostExcerptEditor( {
 	isSelected,
 	context: { postId, postType, queryId },
 } ) {
-	const isDescendentOfQueryLoop = !! queryId;
+	const isDescendentOfQueryLoop = Number.isFinite( queryId );
 	const userCanEdit = useCanEditEntity( 'postType', postType, postId );
 	const isEditable = userCanEdit && ! isDescendentOfQueryLoop;
 	const [

package/src/post-excerpt/index.php

@@ -18,7 +18,7 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$excerpt = get_the_excerpt( $block->context['postId'] );
+	$excerpt = get_the_excerpt();
 
 	if ( empty( $excerpt ) ) {
 		return '';

package/src/post-featured-image/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-featured-image",
 	"title": "Post Featured Image",

package/src/post-featured-image/dimension-controls.js

@@ -1,15 +1,22 @@
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+
 /**
  * WordPress dependencies
  */
 import { __, _x } from '@wordpress/i18n';
 import {
+	PanelBody,
 	__experimentalUnitControl as UnitControl,
+	Flex,
+	FlexItem,
 	__experimentalToggleGroupControl as ToggleGroupControl,
 	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	__experimentalUseCustomUnits as useCustomUnits,
-	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
-import { InspectorControls, useSetting } from '@wordpress/block-editor';
+import { useSetting } from '@wordpress/block-editor';
 
 const SCALE_OPTIONS = (
 	<>
@@ -31,8 +38,6 @@ const SCALE_OPTIONS = (
 	</>
 );
 
-const DEFAULT_SCALE = 'cover';
-
 const scaleHelp = {
 	cover: __(
 		'Image is scaled and cropped to fill the entire space without being distorted.'
@@ -46,7 +51,6 @@ const scaleHelp = {
 };
 
 const DimensionControls = ( {
-	clientId,
 	attributes: { width, height, scale },
 	setAttributes,
 } ) => {
@@ -68,82 +72,53 @@ const DimensionControls = ( {
 	};
 	const scaleLabel = _x( 'Scale', 'Image scaling options' );
 	return (
-		<InspectorControls __experimentalGroup="dimensions">
-			<ToolsPanelItem
-				className="single-column"
-				hasValue={ () => !! height }
-				label={ __( 'Height' ) }
-				onDeselect={ () => setAttributes( { height: undefined } ) }
-				resetAllFilter={ () => ( {
-					height: undefined,
-				} ) }
-				isShownByDefault={ true }
-				panelId={ clientId }
-			>
-				<UnitControl
-					label={ __( 'Height' ) }
-					labelPosition="top"
-					value={ height || '' }
-					min={ 0 }
-					onChange={ ( nextHeight ) =>
-						onDimensionChange( 'height', nextHeight )
-					}
-					units={ units }
-				/>
-			</ToolsPanelItem>
-			<ToolsPanelItem
-				className="single-column"
-				hasValue={ () => !! width }
-				label={ __( 'Width' ) }
-				onDeselect={ () => setAttributes( { width: undefined } ) }
-				resetAllFilter={ () => ( {
-					width: undefined,
-				} ) }
-				isShownByDefault={ true }
-				panelId={ clientId }
+		<PanelBody title={ __( 'Dimensions' ) }>
+			<Flex
+				justify="space-between"
+				className={ classNames(
+					'block-library-post-featured-image-dimension-controls',
+					{ 'scale-control-is-visible': !! height }
+				) }
 			>
-				<UnitControl
-					label={ __( 'Width' ) }
-					labelPosition="top"
-					value={ width || '' }
-					min={ 0 }
-					onChange={ ( nextWidth ) =>
-						onDimensionChange( 'width', nextWidth )
-					}
-					units={ units }
-				/>
-			</ToolsPanelItem>
+				<FlexItem>
+					<UnitControl
+						label={ __( 'Height' ) }
+						labelPosition="top"
+						value={ height || '' }
+						onChange={ ( nextHeight ) => {
+							onDimensionChange( 'height', nextHeight );
+						} }
+						units={ units }
+					/>
+				</FlexItem>
+				<FlexItem>
+					<UnitControl
+						label={ __( 'Width' ) }
+						labelPosition="top"
+						value={ width || '' }
+						onChange={ ( nextWidth ) => {
+							onDimensionChange( 'width', nextWidth );
+						} }
+						units={ units }
+					/>
+				</FlexItem>
+			</Flex>
 			{ !! height && (
-				<ToolsPanelItem
-					hasValue={ () => !! scale && scale !== DEFAULT_SCALE }
+				<ToggleGroupControl
 					label={ scaleLabel }
-					onDeselect={ () =>
+					value={ scale }
+					help={ scaleHelp[ scale ] }
+					onChange={ ( value ) => {
 						setAttributes( {
-							scale: DEFAULT_SCALE,
-						} )
-					}
-					resetAllFilter={ () => ( {
-						scale: DEFAULT_SCALE,
-					} ) }
-					isShownByDefault={ true }
-					panelId={ clientId }
+							scale: value,
+						} );
+					} }
+					isBlock
 				>
-					<ToggleGroupControl
-						label={ scaleLabel }
-						value={ scale }
-						help={ scaleHelp[ scale ] }
-						onChange={ ( value ) =>
-							setAttributes( {
-								scale: value,
-							} )
-						}
-						isBlock
-					>
-						{ SCALE_OPTIONS }
-					</ToggleGroupControl>
-				</ToolsPanelItem>
+					{ SCALE_OPTIONS }
+				</ToggleGroupControl>
 			) }
-		</InspectorControls>
+		</PanelBody>
 	);
 };
 

package/src/post-featured-image/edit.js

@@ -4,7 +4,6 @@
 import { useEntityProp, store as coreStore } from '@wordpress/core-data';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
-	MenuItem,
 	ToggleControl,
 	PanelBody,
 	Placeholder,
@@ -47,12 +46,11 @@ const placeholderChip = (
 );
 
 function PostFeaturedImageDisplay( {
-	clientId,
 	attributes,
 	setAttributes,
 	context: { postId, postType, queryId },
 } ) {
-	const isDescendentOfQueryLoop = !! queryId;
+	const isDescendentOfQueryLoop = Number.isFinite( queryId );
 	const { isLink, height, width, scale } = attributes;
 	const [ featuredImage, setFeaturedImage ] = useEntityProp(
 		'postType',
@@ -138,12 +136,11 @@ function PostFeaturedImageDisplay( {
 
 	return (
 		<>
-			<DimensionControls
-				clientId={ clientId }
-				attributes={ attributes }
-				setAttributes={ setAttributes }
-			/>
 			<InspectorControls>
+				<DimensionControls
+					attributes={ attributes }
+					setAttributes={ setAttributes }
+				/>
 				<PanelBody title={ __( 'Link settings' ) }>
 					<ToggleControl
 						label={ sprintf(
@@ -165,11 +162,7 @@ function PostFeaturedImageDisplay( {
 						accept="image/*"
 						onSelect={ onSelectImage }
 						onError={ onUploadError }
-					>
-						<MenuItem onClick={ () => setFeaturedImage( 0 ) }>
-							{ __( 'Reset' ) }
-						</MenuItem>
-					</MediaReplaceFlow>
+					/>
 				</BlockControls>
 			) }
 			<figure { ...blockProps }>{ image }</figure>

package/src/post-featured-image/editor.scss

@@ -128,3 +128,11 @@ div[data-type="core/post-featured-image"] {
 		display: block;
 	}
 }
+
+.block-library-post-featured-image-dimension-controls {
+	margin-bottom: $grid-unit-10;
+
+	&.scale-control-is-visible {
+		margin-bottom: $grid-unit-20;
+	}
+}

package/src/post-featured-image/style.scss

@@ -2,7 +2,7 @@
 	margin-left: 0;
 	margin-right: 0;
 	a {
-		display: block;
+		display: inline-block;
 	}
 	img {
 		max-width: 100%;

package/src/post-navigation-link/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-navigation-link",
 	"title": "Post Navigation Link",

package/src/post-template/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-template",
 	"title": "Post Template",

package/src/post-template/style.scss

@@ -11,32 +11,21 @@
 	list-style: none;
 	padding: 0;
 
-	li {
-		clear: both;
-	}
-
 	&.is-flex-container {
 		flex-direction: row;
 		display: flex;
 		flex-wrap: wrap;
+		gap: 1.25em;
 
 		li {
-			margin: 0 0 1.25em 0;
+			margin: 0;
 			width: 100%;
 		}
 
 		@include break-small {
-			li {
-				margin-right: 1.25em;
-			}
-
 			@for $i from 2 through 6 {
 				&.is-flex-container.columns-#{ $i } > li {
 					width: calc((100% / #{ $i }) - 1.25em + (1.25em / #{ $i }));
-
-					&:nth-child( #{ $i }n ) {
-						margin-right: 0;
-					}
 				}
 			}
 		}

package/src/post-terms/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-terms",
 	"title": "Post Terms",

package/src/post-title/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/post-title",
 	"title": "Post Title",

package/src/post-title/edit.js

@@ -30,7 +30,7 @@ export default function PostTitleEdit( {
 	context: { postType, postId, queryId },
 } ) {
 	const TagName = 0 === level ? 'p' : 'h' + level;
-	const isDescendentOfQueryLoop = !! queryId;
+	const isDescendentOfQueryLoop = Number.isFinite( queryId );
 	const userCanEdit = useCanEditEntity( 'postType', postType, postId );
 	const [ rawTitle = '', setTitle, fullTitle ] = useEntityProp(
 		'postType',

package/src/post-title/index.php

@@ -20,7 +20,7 @@ function render_block_core_post_title( $attributes, $content, $block ) {
 	}
 
 	$post_ID = $block->context['postId'];
-	$title   = get_the_title( $post_ID );
+	$title   = get_the_title();
 
 	if ( ! $title ) {
 		return '';

package/src/post-title/style.scss

@@ -1,7 +1,3 @@
-.wp-block-post-title {
-	word-break: break-word;
-
-	a {
-		display: inline-block;
-	}
+.wp-block-post-title a {
+	display: inline-block;
 }

package/src/preformatted/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/preformatted",
 	"title": "Preformatted",

package/src/preformatted/edit.native.js

@@ -28,12 +28,10 @@ export function PreformattedEdit( props ) {
 		...( style?.fontSize && { fontSize: style.fontSize } ),
 		...( style?.color && { color: style.color } ),
 	};
-	const hasBaseColors =
-		style?.baseColors && Object.entries( style.baseColors ).length !== 0;
 	const containerStyles = [
 		wpBlockPreformatted,
 		style?.backgroundColor && { backgroundColor: style.backgroundColor },
-		hasBaseColors &&
+		style?.baseColors &&
 			! style?.backgroundColor &&
 			styles[ 'wp-block-preformatted__no-background' ],
 	];

package/src/pullquote/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/pullquote",
 	"title": "Pullquote",
@@ -49,13 +48,7 @@
 			"color": true,
 			"radius": true,
 			"style": true,
-			"width": true,
-			"__experimentalDefaultControls": {
-				"color": true,
-				"radius": true,
-				"style": true,
-				"width": true
-			}
+			"width": true
 		}
 	},
 	"editorStyle": "wp-block-pullquote-editor",

package/src/pullquote/style.scss

@@ -3,7 +3,6 @@
 	padding: 3em 0;
 	text-align: center; // Default text-alignment where the `textAlign` attribute value isn't specified.
 	overflow-wrap: break-word; // Break long strings of text without spaces so they don't overflow the block.
-	box-sizing: border-box;
 
 	p,
 	blockquote,

package/src/query/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/query",
 	"title": "Query Loop",

package/src/query-pagination/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/query-pagination",
 	"title": "Pagination",

package/src/query-pagination/editor.scss

@@ -14,6 +14,10 @@ $pagination-margin: 0.5em;
 	}
 }
 
+.block-library-query-pagination-toolbar__popover .components-popover__content {
+	min-width: 230px;
+}
+
 .wp-block-query-pagination {
 	> .wp-block-query-pagination-next,
 	> .wp-block-query-pagination-previous,

package/src/query-pagination/style.scss

@@ -32,17 +32,7 @@ $pagination-margin: 0.5em;
 		}
 	}
 
-	// Non-clickeable previous and next elements are not visible
-	>span.wp-block-query-pagination-next,
-	>span.wp-block-query-pagination-previous {
-		visibility: hidden;
+	&.aligncenter {
+		justify-content: center;
 	}
-
-	&.wp-justify-left,
-	&.wp-justify-right {
-		> [aria-hidden="true"] {
-			display: none;
-		}
-	}
-
 }

package/src/query-pagination-next/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/query-pagination-next",
 	"title": "Next Page",

package/src/query-pagination-next/index.php

@@ -17,63 +17,41 @@
 function render_block_core_query_pagination_next( $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 ];
-	$paged    = ( get_query_var( 'paged' ) ) ? get_query_var( 'paged' ) : 1;
 	$max_page = isset( $block->context['query']['pages'] ) ? (int) $block->context['query']['pages'] : 0;
 
-	$wrapper_attributes        = get_block_wrapper_attributes();
-	$hidden_wrapper_attributes = get_block_wrapper_attributes( array( 'aria-hidden' => 'true' ) );
-	$default_label             = __( 'Next Page' );
-	$label                     = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label;
-	$pagination_arrow          = get_query_pagination_arrow( $block, true );
-	$content                   = '';
-
+	$wrapper_attributes = get_block_wrapper_attributes();
+	$default_label      = __( 'Next Page' );
+	$label              = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label;
+	$pagination_arrow   = get_query_pagination_arrow( $block, true );
 	if ( $pagination_arrow ) {
 		$label .= $pagination_arrow;
 	}
+	$content = '';
 
 	// Check if the pagination is for Query that inherits the global context.
 	if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
-		global $wp_query;
-		// Take into account if we have set a bigger `max page`
-		// than what the query has.
-		$max_page               = ! $max_page || $max_page > $wp_query->max_num_pages ? $wp_query->max_num_pages : $max_page;
 		$filter_link_attributes = function() use ( $wrapper_attributes ) {
 			return $wrapper_attributes;
 		};
 		add_filter( 'next_posts_link_attributes', $filter_link_attributes );
-
-		// If there are pages to paginate.
-		if ( 1 < $max_page ) {
-			if ( (int) $max_page !== $paged ) { // If we are NOT in the last one.
-				$content = get_next_posts_link( $label, $max_page );
-			} else { // If we are in the last one.
-				$content = sprintf(
-					'<span %1$s>%2$s</span>',
-					$hidden_wrapper_attributes,
-					$label
-				);
-			}
+		// Take into account if we have set a bigger `max page`
+		// than what the query has.
+		global $wp_query;
+		if ( $max_page > $wp_query->max_num_pages ) {
+			$max_page = $wp_query->max_num_pages;
 		}
+		$content = get_next_posts_link( $label, $max_page );
 		remove_filter( 'next_posts_link_attributes', $filter_link_attributes );
 	} elseif ( ! $max_page || $max_page > $page ) {
-		$custom_query  = new WP_Query( build_query_vars_from_query_block( $block, $page ) );
-		$max_num_pages = $custom_query->max_num_pages ? $custom_query->max_num_pages : 1;
-		// If there are pages to paginate.
-		if ( 1 < $max_num_pages ) {
-			if ( (int) $max_num_pages !== $page ) { // If we are NOT in the last one.
-				$content = sprintf(
-					'<a href="%1$s" %2$s>%3$s</a>',
-					esc_url( add_query_arg( $page_key, $page + 1 ) ),
-					$wrapper_attributes,
-					$label
-				);
-			} else { // If we are in the last one.
-				$content = sprintf(
-					'<span %1$s>%2$s</span>',
-					$hidden_wrapper_attributes,
-					$label
-				);
-			}
+		$custom_query           = new WP_Query( build_query_vars_from_query_block( $block, $page ) );
+		$custom_query_max_pages = (int) $custom_query->max_num_pages;
+		if ( $custom_query_max_pages && $custom_query_max_pages !== $page ) {
+			$content = sprintf(
+				'<a href="%1$s" %2$s>%3$s</a>',
+				esc_url( add_query_arg( $page_key, $page + 1 ) ),
+				$wrapper_attributes,
+				$label
+			);
 		}
 		wp_reset_postdata(); // Restore original Post Data.
 	}

package/src/query-pagination-numbers/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/query-pagination-numbers",
 	"title": "Page Numbers",

package/src/query-pagination-previous/block.json

@@ -1,5 +1,4 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/query-pagination-previous",
 	"title": "Previous Page",