@wordpress/block-library 9.2.0 → 9.4.0

package/src/post-excerpt/block.json

@@ -23,6 +23,9 @@
 		}
 	},
 	"usesContext": [ "postId", "postType", "queryId" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"html": false,
 		"color": {

package/src/post-excerpt/edit.js

@@ -231,6 +231,7 @@ export default function PostExcerptEditor( {
 						}
 					/>
 					<RangeControl
+						__nextHasNoMarginBottom
 						label={ __( 'Max number of words' ) }
 						value={ excerptLength }
 						onChange={ ( value ) => {

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

@@ -58,6 +58,9 @@
 		}
 	},
 	"usesContext": [ "postId", "postType", "queryId" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"align": [ "left", "right", "center", "wide", "full" ],
 		"color": {

package/src/post-terms/block.json

@@ -27,6 +27,9 @@
 		}
 	},
 	"usesContext": [ "postId", "postType" ],
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"html": false,
 		"color": {

package/src/post-title/block.json

@@ -29,6 +29,9 @@
 			"default": "_self"
 		}
 	},
+	"example": {
+		"viewportWidth": 350
+	},
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,

package/src/post-title/edit.js

@@ -42,11 +42,11 @@ export default function PostTitleEdit( {
 			if ( isDescendentOfQueryLoop ) {
 				return false;
 			}
-			return select( coreStore ).canUserEditEntityRecord(
-				'postType',
-				postType,
-				postId
-			);
+			return select( coreStore ).canUser( 'update', {
+				kind: 'postType',
+				name: postType,
+				id: postId,
+			} );
 		},
 		[ isDescendentOfQueryLoop, postType, postId ]
 	);

package/src/query/edit/inspector-controls/author-control.js

@@ -76,6 +76,8 @@ function AuthorControl( { value, onChange } ) {
 			suggestions={ authorsInfo.names }
 			onChange={ onAuthorChange }
 			__experimentalShowHowTo={ false }
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
 		/>
 	);
 }

package/src/query/edit/inspector-controls/index.js

@@ -7,6 +7,8 @@ import {
 	SelectControl,
 	RangeControl,
 	ToggleControl,
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	Notice,
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
@@ -34,7 +36,7 @@ import {
 	isControlAllowed,
 	useTaxonomies,
 } from '../../utils';
-import { TOOLSPANEL_DROPDOWNMENU_PROPS } from '../../../utils/constants';
+import { useToolsPanelDropdownMenuProps } from '../../../utils/hooks';
 
 const { BlockInfo } = unlock( blockEditorPrivateApis );
 
@@ -101,6 +103,10 @@ export default function QueryInspectorControls( props ) {
 	const showInheritControl = isControlAllowed( allowedControls, 'inherit' );
 	const showPostTypeControl =
 		! inherit && isControlAllowed( allowedControls, 'postType' );
+	const postTypeControlLabel = __( 'Content type' );
+	const postTypeControlHelp = __(
+		'WordPress contains different types of content you can filter by. Posts and pages are the default types, but plugins could add more.'
+	);
 	const showColumnsControl = false;
 	const showOrderControl =
 		! inherit && isControlAllowed( allowedControls, 'order' );
@@ -128,6 +134,7 @@ export default function QueryInspectorControls( props ) {
 		showAuthorControl ||
 		showSearchControl ||
 		showParentControl;
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 
 	return (
 		<>
@@ -143,7 +150,7 @@ export default function QueryInspectorControls( props ) {
 							__nextHasNoMarginBottom
 							label={ __( 'Inherit query from template' ) }
 							help={ __(
-								'Toggle to use the global query context that is set with the current template, such as an archive or search. Disable to customize the settings independently.'
+								'Enable to use the global query context that is set with the current template, such as an archive or search. Disable to customize the settings independently.'
 							) }
 							checked={ !! inherit }
 							onChange={ ( value ) =>
@@ -151,22 +158,42 @@ export default function QueryInspectorControls( props ) {
 							}
 						/>
 					) }
-					{ showPostTypeControl && (
-						<SelectControl
-							__nextHasNoMarginBottom
-							options={ postTypesSelectOptions }
-							value={ postType }
-							label={ __( 'Post type' ) }
-							onChange={ onPostTypeChange }
-							help={ __(
-								'WordPress contains different types of content and they are divided into collections called “Post types”. By default there are a few different ones such as blog posts and pages, but plugins could add more.'
-							) }
-						/>
-					) }
+					{ showPostTypeControl &&
+						( postTypesSelectOptions.length > 2 ? (
+							<SelectControl
+								__nextHasNoMarginBottom
+								__next40pxDefaultSize
+								options={ postTypesSelectOptions }
+								value={ postType }
+								label={ postTypeControlLabel }
+								onChange={ onPostTypeChange }
+								help={ postTypeControlHelp }
+							/>
+						) : (
+							<ToggleGroupControl
+								__nextHasNoMarginBottom
+								__next40pxDefaultSize
+								isBlock
+								value={ postType }
+								label={ postTypeControlLabel }
+								onChange={ onPostTypeChange }
+								help={ postTypeControlHelp }
+							>
+								{ postTypesSelectOptions.map( ( option ) => (
+									<ToggleGroupControlOption
+										key={ option.value }
+										value={ option.value }
+										label={ option.label }
+									/>
+								) ) }
+							</ToggleGroupControl>
+						) ) }
+
 					{ showColumnsControl && (
 						<>
 							<RangeControl
 								__nextHasNoMarginBottom
+								__next40pxDefaultSize
 								label={ __( 'Columns' ) }
 								value={ displayLayout.columns }
 								onChange={ ( value ) =>
@@ -212,7 +239,7 @@ export default function QueryInspectorControls( props ) {
 			) }
 			{ ! inherit && showFiltersPanel && (
 				<ToolsPanel
-					className="block-library-query-toolspanel__filters"
+					className="block-library-query-toolspanel__filters" // unused but kept for backward compatibility
 					label={ __( 'Filters' ) }
 					resetAll={ () => {
 						setQuery( {
@@ -223,7 +250,7 @@ export default function QueryInspectorControls( props ) {
 						} );
 						setQuerySearch( '' );
 					} }
-					dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
+					dropdownMenuProps={ dropdownMenuProps }
 				>
 					{ showTaxControl && (
 						<ToolsPanelItem
@@ -261,6 +288,7 @@ export default function QueryInspectorControls( props ) {
 						>
 							<TextControl
 								__nextHasNoMarginBottom
+								__next40pxDefaultSize
 								label={ __( 'Keyword' ) }
 								value={ querySearch }
 								onChange={ setQuerySearch }

package/src/query/edit/inspector-controls/order-control.js

@@ -28,6 +28,7 @@ function OrderControl( { order, orderBy, onChange } ) {
 	return (
 		<SelectControl
 			__nextHasNoMarginBottom
+			__next40pxDefaultSize
 			label={ __( 'Order by' ) }
 			value={ `${ orderBy }/${ order }` }
 			options={ orderOptions }

package/src/query/edit/inspector-controls/parent-control.js

@@ -138,6 +138,7 @@ function ParentControl( { parents, postType, onChange } ) {
 			suggestions={ suggestions }
 			onChange={ onParentChange }
 			__experimentalShowHowTo={ false }
+			__nextHasNoMarginBottom
 		/>
 	);
 }

package/src/query/edit/inspector-controls/sticky-control.js

@@ -14,6 +14,7 @@ export default function StickyControl( { value, onChange } ) {
 	return (
 		<SelectControl
 			__nextHasNoMarginBottom
+			__next40pxDefaultSize
 			label={ __( 'Sticky posts' ) }
 			options={ stickyOptions }
 			value={ value }

package/src/query/edit/inspector-controls/taxonomy-controls.js

@@ -1,7 +1,10 @@
 /**
  * WordPress dependencies
  */
-import { FormTokenField } from '@wordpress/components';
+import {
+	FormTokenField,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
 import { useState, useEffect } from '@wordpress/element';
@@ -53,7 +56,7 @@ export function TaxonomyControls( { onChange, query } ) {
 	}
 
 	return (
-		<>
+		<VStack spacing={ 4 }>
 			{ taxonomies.map( ( taxonomy ) => {
 				const termIds = taxQuery?.[ taxonomy.slug ] || [];
 				const handleChange = ( newTermIds ) =>
@@ -73,7 +76,7 @@ export function TaxonomyControls( { onChange, query } ) {
 					/>
 				);
 			} ) }
-		</>
+		</VStack>
 	);
 }
 
@@ -187,6 +190,8 @@ function TaxonomyItem( { taxonomy, termIds, onChange } ) {
 				displayTransform={ decodeEntities }
 				onChange={ onTermsChange }
 				__experimentalShowHowTo={ false }
+				__nextHasNoMarginBottom
+				__next40pxDefaultSize
 			/>
 		</div>
 	);

package/src/query/edit/query-content.js

@@ -48,12 +48,26 @@ export default function QueryContent( {
 	} );
 	const { postsPerPage } = useSelect( ( select ) => {
 		const { getSettings } = select( blockEditorStore );
-		const { getEntityRecord, canUser } = select( coreStore );
-		const settingPerPage = canUser( 'read', 'settings' )
+		const { getEntityRecord, getEntityRecordEdits, canUser } =
+			select( coreStore );
+		const settingPerPage = canUser( 'read', {
+			kind: 'root',
+			name: 'site',
+		} )
 			? +getEntityRecord( 'root', 'site' )?.posts_per_page
 			: +getSettings().postsPerPage;
+
+		// Gets changes made via the template area posts per page setting. These won't be saved
+		// until the page is saved, but we should reflect this setting within the query loops
+		// that inherit it.
+		const editedSettingPerPage = +getEntityRecordEdits( 'root', 'site' )
+			?.posts_per_page;
+
 		return {
-			postsPerPage: settingPerPage || DEFAULTS_POSTS_PER_PAGE,
+			postsPerPage:
+				editedSettingPerPage ||
+				settingPerPage ||
+				DEFAULTS_POSTS_PER_PAGE,
 		};
 	}, [] );
 	// There are some effects running where some initialization logic is

package/src/query/edit/query-placeholder.js

@@ -25,7 +25,6 @@ export default function QueryPlaceholder( {
 	clientId,
 	name,
 	openPatternSelectionModal,
-	setAttributes,
 } ) {
 	const [ isStartingBlank, setIsStartingBlank ] = useState( false );
 	const blockProps = useBlockProps();
@@ -64,7 +63,6 @@ export default function QueryPlaceholder( {
 			<QueryVariationPicker
 				clientId={ clientId }
 				attributes={ attributes }
-				setAttributes={ setAttributes }
 				icon={ icon }
 				label={ label }
 			/>
@@ -101,13 +99,7 @@ export default function QueryPlaceholder( {
 	);
 }
 
-function QueryVariationPicker( {
-	clientId,
-	attributes,
-	setAttributes,
-	icon,
-	label,
-} ) {
+function QueryVariationPicker( { clientId, attributes, icon, label } ) {
 	const scopeVariations = useScopedBlockVariations( attributes );
 	const { replaceInnerBlocks } = useDispatch( blockEditorStore );
 	const blockProps = useBlockProps();
@@ -118,18 +110,6 @@ function QueryVariationPicker( {
 				label={ label }
 				variations={ scopeVariations }
 				onSelect={ ( variation ) => {
-					if ( variation.attributes ) {
-						setAttributes( {
-							...variation.attributes,
-							query: {
-								...variation.attributes.query,
-								postType:
-									attributes.query.postType ||
-									variation.attributes.query.postType,
-							},
-							namespace: attributes.namespace,
-						} );
-					}
 					if ( variation.innerBlocks ) {
 						replaceInnerBlocks(
 							clientId,

package/src/query/edit/query-toolbar.js

@@ -5,10 +5,8 @@ import {
 	ToolbarGroup,
 	Dropdown,
 	ToolbarButton,
-	BaseControl,
 	__experimentalNumberControl as NumberControl,
 } from '@wordpress/components';
-import { useInstanceId } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
 import { settings } from '@wordpress/icons';
 
@@ -25,10 +23,6 @@ export default function QueryToolbar( {
 	clientId,
 } ) {
 	const hasPatterns = !! usePatterns( clientId, name ).length;
-	const maxPageInputId = useInstanceId(
-		QueryToolbar,
-		'blocks-query-pagination-max-page-input'
-	);
 
 	return (
 		<>
@@ -45,75 +39,69 @@ export default function QueryToolbar( {
 						) }
 						renderContent={ () => (
 							<>
-								<BaseControl>
-									<NumberControl
-										__unstableInputWidth="60px"
-										label={ __( 'Items per Page' ) }
-										labelPosition="edge"
-										min={ 1 }
-										max={ 100 }
-										onChange={ ( value ) => {
-											if (
-												isNaN( value ) ||
-												value < 1 ||
-												value > 100
-											) {
-												return;
-											}
-											setQuery( {
-												perPage: value,
-											} );
-										} }
-										step="1"
-										value={ query.perPage }
-										isDragEnabled={ false }
-									/>
-								</BaseControl>
-								<BaseControl>
-									<NumberControl
-										__unstableInputWidth="60px"
-										label={ __( 'Offset' ) }
-										labelPosition="edge"
-										min={ 0 }
-										max={ 100 }
-										onChange={ ( value ) => {
-											if (
-												isNaN( value ) ||
-												value < 0 ||
-												value > 100
-											) {
-												return;
-											}
-											setQuery( { offset: value } );
-										} }
-										step="1"
-										value={ query.offset }
-										isDragEnabled={ false }
-									/>
-								</BaseControl>
-								<BaseControl
-									id={ maxPageInputId }
+								<NumberControl
+									__unstableInputWidth="60px"
+									className="block-library-query-toolbar__popover-number-control"
+									label={ __( 'Items per Page' ) }
+									labelPosition="edge"
+									min={ 1 }
+									max={ 100 }
+									onChange={ ( value ) => {
+										if (
+											isNaN( value ) ||
+											value < 1 ||
+											value > 100
+										) {
+											return;
+										}
+										setQuery( {
+											perPage: value,
+										} );
+									} }
+									step="1"
+									value={ query.perPage }
+									isDragEnabled={ false }
+								/>
+								<NumberControl
+									__unstableInputWidth="60px"
+									className="block-library-query-toolbar__popover-number-control"
+									label={ __( 'Offset' ) }
+									labelPosition="edge"
+									min={ 0 }
+									max={ 100 }
+									onChange={ ( value ) => {
+										if (
+											isNaN( value ) ||
+											value < 0 ||
+											value > 100
+										) {
+											return;
+										}
+										setQuery( { offset: value } );
+									} }
+									step="1"
+									value={ query.offset }
+									isDragEnabled={ false }
+								/>
+								<NumberControl
+									__unstableInputWidth="60px"
+									className="block-library-query-toolbar__popover-number-control"
+									label={ __( 'Max pages to show' ) }
+									labelPosition="edge"
+									min={ 0 }
+									onChange={ ( value ) => {
+										if ( isNaN( value ) || value < 0 ) {
+											return;
+										}
+										setQuery( { pages: value } );
+									} }
+									step="1"
+									value={ query.pages }
+									isDragEnabled={ false }
 									help={ __(
 										'Limit the pages you want to show, even if the query has more results. To show all pages use 0 (zero).'
 									) }
-								>
-									<NumberControl
-										id={ maxPageInputId }
-										__unstableInputWidth="60px"
-										label={ __( 'Max page to show' ) }
-										labelPosition="edge"
-										min={ 0 }
-										onChange={ ( value ) => {
-											if ( isNaN( value ) || value < 0 ) {
-												return;
-											}
-											setQuery( { pages: value } );
-										} }
-										step="1"
-										value={ query.pages }
-										isDragEnabled={ false }
-									/>
-								</BaseControl>
+								/>
 							</>
 						) }
 					/>

package/src/query/editor.scss

@@ -1,5 +1,9 @@
 .block-library-query-toolbar__popover .components-popover__content {
 	min-width: 230px;
+
+	.block-library-query-toolbar__popover-number-control {
+		margin-bottom: $grid-unit-10;
+	}
 }
 
 .wp-block-query__create-new-link {
@@ -45,15 +49,6 @@
 	}
 }
 
-.block-library-query-toolspanel__filters {
-	.components-form-token-field__help {
-		margin-bottom: 0;
-	}
-	.block-library-query-inspector__taxonomy-control:not(:last-child) {
-		margin-bottom: $grid-unit-30;
-	}
-}
-
 .wp-block-query__enhanced-pagination-modal {
 	@include break-small() {
 		max-width: $break-mobile;

package/src/query/index.js

@@ -19,6 +19,46 @@ export { metadata, name };
 export const settings = {
 	icon,
 	edit,
+	example: {
+		viewportWidth: 650,
+		attributes: {
+			namespace: 'core/posts-list',
+			query: {
+				perPage: 4,
+				pages: 1,
+				offset: 0,
+				postType: 'post',
+				order: 'desc',
+				orderBy: 'date',
+				author: '',
+				search: '',
+				sticky: 'exclude',
+				inherit: false,
+			},
+		},
+		innerBlocks: [
+			{
+				name: 'core/post-template',
+				attributes: {
+					layout: {
+						type: 'grid',
+						columnCount: 2,
+					},
+				},
+				innerBlocks: [
+					{
+						name: 'core/post-title',
+					},
+					{
+						name: 'core/post-date',
+					},
+					{
+						name: 'core/post-excerpt',
+					},
+				],
+			},
+		],
+	},
 	save,
 	variations,
 	deprecated,

package/src/query/utils.js

@@ -213,6 +213,7 @@ export const getTransformedBlocksFromPattern = (
 ) => {
 	const {
 		query: { postType, inherit },
+		namespace,
 	} = queryBlockAttributes;
 	const clonedBlocks = blocks.map( ( block ) => cloneBlock( block ) );
 	const queryClientIds = [];
@@ -225,6 +226,9 @@ export const getTransformedBlocksFromPattern = (
 				postType,
 				inherit,
 			};
+			if ( namespace ) {
+				block.attributes.namespace = namespace;
+			}
 			queryClientIds.push( block.clientId );
 		}
 		block.innerBlocks?.forEach( ( innerBlock ) => {