@wordpress/block-library 9.7.1-next.1f6eadc42.0 → 9.8.0

package/build-style/site-title/style-rtl.css

@@ -92,27 +92,13 @@
 .wp-block-site-title {
   box-sizing: border-box;
 }
-.wp-block-site-title[style*=font-weight] :where(a) {
-  font-weight: inherit;
-}
-.wp-block-site-title[class*=-font-family] :where(a), .wp-block-site-title[style*=font-family] :where(a) {
+.wp-block-site-title :where(a) {
+  color: inherit;
   font-family: inherit;
-}
-.wp-block-site-title[class*=-font-size] :where(a), .wp-block-site-title[style*=font-size] :where(a) {
   font-size: inherit;
-}
-.wp-block-site-title[style*=line-height] :where(a) {
-  line-height: inherit;
-}
-.wp-block-site-title[style*=font-style] :where(a) {
   font-style: inherit;
-}
-.wp-block-site-title[style*=letter-spacing] :where(a) {
+  font-weight: inherit;
   letter-spacing: inherit;
-}
-.wp-block-site-title[style*=text-decoration] :where(a) {
+  line-height: inherit;
   text-decoration: inherit;
-}
-.wp-block-site-title :where(a) {
-  color: inherit;
 }

package/build-style/site-title/style.css

@@ -92,27 +92,13 @@
 .wp-block-site-title {
   box-sizing: border-box;
 }
-.wp-block-site-title[style*=font-weight] :where(a) {
-  font-weight: inherit;
-}
-.wp-block-site-title[class*=-font-family] :where(a), .wp-block-site-title[style*=font-family] :where(a) {
+.wp-block-site-title :where(a) {
+  color: inherit;
   font-family: inherit;
-}
-.wp-block-site-title[class*=-font-size] :where(a), .wp-block-site-title[style*=font-size] :where(a) {
   font-size: inherit;
-}
-.wp-block-site-title[style*=line-height] :where(a) {
-  line-height: inherit;
-}
-.wp-block-site-title[style*=font-style] :where(a) {
   font-style: inherit;
-}
-.wp-block-site-title[style*=letter-spacing] :where(a) {
+  font-weight: inherit;
   letter-spacing: inherit;
-}
-.wp-block-site-title[style*=text-decoration] :where(a) {
+  line-height: inherit;
   text-decoration: inherit;
-}
-.wp-block-site-title :where(a) {
-  color: inherit;
 }

package/build-style/style-rtl.css

@@ -3013,30 +3013,16 @@ p.has-text-align-left[style*="writing-mode:vertical-lr"] {
   word-break: break-word;
   box-sizing: border-box;
 }
-.wp-block-post-title[style*=font-weight] :where(a) {
-  font-weight: inherit;
-}
-.wp-block-post-title[class*=-font-family] :where(a), .wp-block-post-title[style*=font-family] :where(a) {
+.wp-block-post-title :where(a) {
+  display: inline-block;
   font-family: inherit;
-}
-.wp-block-post-title[class*=-font-size] :where(a), .wp-block-post-title[style*=font-size] :where(a) {
   font-size: inherit;
-}
-.wp-block-post-title[style*=line-height] :where(a) {
-  line-height: inherit;
-}
-.wp-block-post-title[style*=font-style] :where(a) {
   font-style: inherit;
-}
-.wp-block-post-title[style*=letter-spacing] :where(a) {
+  font-weight: inherit;
   letter-spacing: inherit;
-}
-.wp-block-post-title[style*=text-decoration] :where(a) {
+  line-height: inherit;
   text-decoration: inherit;
 }
-.wp-block-post-title a {
-  display: inline-block;
-}
 
 .wp-block-post-author-name {
   box-sizing: border-box;
@@ -3458,30 +3444,16 @@ ul.wp-block-rss.is-grid li {
 .wp-block-site-title {
   box-sizing: border-box;
 }
-.wp-block-site-title[style*=font-weight] :where(a) {
-  font-weight: inherit;
-}
-.wp-block-site-title[class*=-font-family] :where(a), .wp-block-site-title[style*=font-family] :where(a) {
+.wp-block-site-title :where(a) {
+  color: inherit;
   font-family: inherit;
-}
-.wp-block-site-title[class*=-font-size] :where(a), .wp-block-site-title[style*=font-size] :where(a) {
   font-size: inherit;
-}
-.wp-block-site-title[style*=line-height] :where(a) {
-  line-height: inherit;
-}
-.wp-block-site-title[style*=font-style] :where(a) {
   font-style: inherit;
-}
-.wp-block-site-title[style*=letter-spacing] :where(a) {
+  font-weight: inherit;
   letter-spacing: inherit;
-}
-.wp-block-site-title[style*=text-decoration] :where(a) {
+  line-height: inherit;
   text-decoration: inherit;
 }
-.wp-block-site-title :where(a) {
-  color: inherit;
-}
 
 .wp-block-social-links {
   box-sizing: border-box;

package/build-style/style.css

@@ -3043,30 +3043,16 @@ p.has-text-align-left[style*="writing-mode:vertical-lr"] {
   word-break: break-word;
   box-sizing: border-box;
 }
-.wp-block-post-title[style*=font-weight] :where(a) {
-  font-weight: inherit;
-}
-.wp-block-post-title[class*=-font-family] :where(a), .wp-block-post-title[style*=font-family] :where(a) {
+.wp-block-post-title :where(a) {
+  display: inline-block;
   font-family: inherit;
-}
-.wp-block-post-title[class*=-font-size] :where(a), .wp-block-post-title[style*=font-size] :where(a) {
   font-size: inherit;
-}
-.wp-block-post-title[style*=line-height] :where(a) {
-  line-height: inherit;
-}
-.wp-block-post-title[style*=font-style] :where(a) {
   font-style: inherit;
-}
-.wp-block-post-title[style*=letter-spacing] :where(a) {
+  font-weight: inherit;
   letter-spacing: inherit;
-}
-.wp-block-post-title[style*=text-decoration] :where(a) {
+  line-height: inherit;
   text-decoration: inherit;
 }
-.wp-block-post-title a {
-  display: inline-block;
-}
 
 .wp-block-post-author-name {
   box-sizing: border-box;
@@ -3491,30 +3477,16 @@ ul.wp-block-rss.is-grid li {
 .wp-block-site-title {
   box-sizing: border-box;
 }
-.wp-block-site-title[style*=font-weight] :where(a) {
-  font-weight: inherit;
-}
-.wp-block-site-title[class*=-font-family] :where(a), .wp-block-site-title[style*=font-family] :where(a) {
+.wp-block-site-title :where(a) {
+  color: inherit;
   font-family: inherit;
-}
-.wp-block-site-title[class*=-font-size] :where(a), .wp-block-site-title[style*=font-size] :where(a) {
   font-size: inherit;
-}
-.wp-block-site-title[style*=line-height] :where(a) {
-  line-height: inherit;
-}
-.wp-block-site-title[style*=font-style] :where(a) {
   font-style: inherit;
-}
-.wp-block-site-title[style*=letter-spacing] :where(a) {
+  font-weight: inherit;
   letter-spacing: inherit;
-}
-.wp-block-site-title[style*=text-decoration] :where(a) {
+  line-height: inherit;
   text-decoration: inherit;
 }
-.wp-block-site-title :where(a) {
-  color: inherit;
-}
 
 .wp-block-social-links {
   box-sizing: border-box;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "9.7.1-next.1f6eadc42.0",
+	"version": "9.8.0",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -39,39 +39,39 @@
 	},
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/api-fetch": "^7.7.1-next.1f6eadc42.0",
-		"@wordpress/autop": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/blob": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/block-editor": "^14.2.1-next.1f6eadc42.0",
-		"@wordpress/blocks": "^13.7.1-next.1f6eadc42.0",
-		"@wordpress/components": "^28.8.1-next.1f6eadc42.0",
-		"@wordpress/compose": "^7.8.1-next.1f6eadc42.0",
-		"@wordpress/core-data": "^7.7.1-next.1f6eadc42.0",
-		"@wordpress/data": "^10.7.1-next.1f6eadc42.0",
-		"@wordpress/date": "^5.7.1-next.1f6eadc42.0",
-		"@wordpress/deprecated": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/dom": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/element": "^6.7.1-next.1f6eadc42.0",
-		"@wordpress/escape-html": "^3.7.1-next.1f6eadc42.0",
-		"@wordpress/hooks": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/html-entities": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/i18n": "^5.7.1-next.1f6eadc42.0",
-		"@wordpress/icons": "^10.7.1-next.1f6eadc42.0",
-		"@wordpress/interactivity": "^6.7.2-next.1f6eadc42.0",
-		"@wordpress/interactivity-router": "^2.7.1-next.1f6eadc42.0",
-		"@wordpress/keyboard-shortcuts": "^5.7.1-next.1f6eadc42.0",
-		"@wordpress/keycodes": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/notices": "^5.7.1-next.1f6eadc42.0",
-		"@wordpress/patterns": "^2.7.1-next.1f6eadc42.0",
-		"@wordpress/primitives": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/private-apis": "^1.7.1-next.1f6eadc42.0",
-		"@wordpress/reusable-blocks": "^5.7.1-next.1f6eadc42.0",
-		"@wordpress/rich-text": "^7.7.1-next.1f6eadc42.0",
-		"@wordpress/server-side-render": "^5.7.1-next.1f6eadc42.0",
-		"@wordpress/url": "^4.7.1-next.1f6eadc42.0",
-		"@wordpress/viewport": "^6.7.1-next.1f6eadc42.0",
-		"@wordpress/wordcount": "^4.7.1-next.1f6eadc42.0",
+		"@wordpress/a11y": "^4.8.0",
+		"@wordpress/api-fetch": "^7.8.0",
+		"@wordpress/autop": "^4.8.0",
+		"@wordpress/blob": "^4.8.0",
+		"@wordpress/block-editor": "^14.3.0",
+		"@wordpress/blocks": "^13.8.0",
+		"@wordpress/components": "^28.8.0",
+		"@wordpress/compose": "^7.8.0",
+		"@wordpress/core-data": "^7.8.0",
+		"@wordpress/data": "^10.8.0",
+		"@wordpress/date": "^5.8.0",
+		"@wordpress/deprecated": "^4.8.0",
+		"@wordpress/dom": "^4.8.0",
+		"@wordpress/element": "^6.8.0",
+		"@wordpress/escape-html": "^3.8.0",
+		"@wordpress/hooks": "^4.8.0",
+		"@wordpress/html-entities": "^4.8.0",
+		"@wordpress/i18n": "^5.8.0",
+		"@wordpress/icons": "^10.8.0",
+		"@wordpress/interactivity": "^6.8.0",
+		"@wordpress/interactivity-router": "^2.8.0",
+		"@wordpress/keyboard-shortcuts": "^5.8.0",
+		"@wordpress/keycodes": "^4.8.0",
+		"@wordpress/notices": "^5.8.0",
+		"@wordpress/patterns": "^2.8.0",
+		"@wordpress/primitives": "^4.8.0",
+		"@wordpress/private-apis": "^1.8.0",
+		"@wordpress/reusable-blocks": "^5.8.0",
+		"@wordpress/rich-text": "^7.8.0",
+		"@wordpress/server-side-render": "^5.8.0",
+		"@wordpress/url": "^4.8.0",
+		"@wordpress/viewport": "^6.8.0",
+		"@wordpress/wordcount": "^4.8.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.7.0",
@@ -89,5 +89,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "960a22b909c9fdbc90e7435b7ba8947b9218837a"
+	"gitHead": "cecf5e14d317aa67407f77a7e5c8b6a43016bd42"
 }

package/src/categories/block.json

@@ -2,11 +2,16 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "core/categories",
-	"title": "Categories List",
+	"title": "Terms List",
 	"category": "widgets",
-	"description": "Display a list of all categories.",
+	"description": "Display a list of all terms of a given taxonomy.",
+	"keywords": [ "categories" ],
 	"textdomain": "default",
 	"attributes": {
+		"taxonomy": {
+			"type": "string",
+			"default": "category"
+		},
 		"displayAsDropdown": {
 			"type": "boolean",
 			"default": false

package/src/categories/edit.js

@@ -9,6 +9,7 @@ import clsx from 'clsx';
 import {
 	PanelBody,
 	Placeholder,
+	SelectControl,
 	Spinner,
 	ToggleControl,
 	VisuallyHidden,
@@ -20,7 +21,7 @@ import {
 	RichText,
 } from '@wordpress/block-editor';
 import { decodeEntities } from '@wordpress/html-entities';
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import { pin } from '@wordpress/icons';
 import { useEntityRecords } from '@wordpress/core-data';
 
@@ -33,19 +34,33 @@ export default function CategoriesEdit( {
 		showEmpty,
 		label,
 		showLabel,
+		taxonomy: taxonomySlug,
 	},
 	setAttributes,
 	className,
 } ) {
 	const selectId = useInstanceId( CategoriesEdit, 'blocks-category-select' );
+
+	const { records: allTaxonomies, isResolvingTaxonomies } = useEntityRecords(
+		'root',
+		'taxonomy'
+	);
+
+	const taxonomies = allTaxonomies?.filter( ( t ) => t.visibility.public );
+
+	const taxonomy = taxonomies?.find( ( t ) => t.slug === taxonomySlug );
+
+	const isHierarchicalTaxonomy =
+		! isResolvingTaxonomies && taxonomy?.hierarchical;
+
 	const query = { per_page: -1, hide_empty: ! showEmpty, context: 'view' };
-	if ( showOnlyTopLevel ) {
+	if ( isHierarchicalTaxonomy && showOnlyTopLevel ) {
 		query.parent = 0;
 	}
 
 	const { records: categories, isResolving } = useEntityRecords(
 		'taxonomy',
-		'category',
+		taxonomySlug,
 		query
 	);
 
@@ -66,7 +81,7 @@ export default function CategoriesEdit( {
 		! name ? __( '(Untitled)' ) : decodeEntities( name ).trim();
 
 	const renderCategoryList = () => {
-		const parentId = showHierarchy ? 0 : null;
+		const parentId = isHierarchicalTaxonomy && showHierarchy ? 0 : null;
 		const categoriesList = getCategoriesList( parentId );
 		return categoriesList.map( ( category ) =>
 			renderCategoryListItem( category )
@@ -82,19 +97,21 @@ export default function CategoriesEdit( {
 					{ renderCategoryName( name ) }
 				</a>
 				{ showPostCounts && ` (${ count })` }
-				{ showHierarchy && !! childCategories.length && (
-					<ul className="children">
-						{ childCategories.map( ( childCategory ) =>
-							renderCategoryListItem( childCategory )
-						) }
-					</ul>
-				) }
+				{ isHierarchicalTaxonomy &&
+					showHierarchy &&
+					!! childCategories.length && (
+						<ul className="children">
+							{ childCategories.map( ( childCategory ) =>
+								renderCategoryListItem( childCategory )
+							) }
+						</ul>
+					) }
 			</li>
 		);
 	};
 
 	const renderCategoryDropdown = () => {
-		const parentId = showHierarchy ? 0 : null;
+		const parentId = isHierarchicalTaxonomy && showHierarchy ? 0 : null;
 		const categoriesList = getCategoriesList( parentId );
 		return (
 			<>
@@ -102,7 +119,7 @@ export default function CategoriesEdit( {
 					<RichText
 						className="wp-block-categories__label"
 						aria-label={ __( 'Label text' ) }
-						placeholder={ __( 'Categories' ) }
+						placeholder={ taxonomy.name }
 						withoutInteractiveFormatting
 						value={ label }
 						onChange={ ( html ) =>
@@ -111,11 +128,17 @@ export default function CategoriesEdit( {
 					/>
 				) : (
 					<VisuallyHidden as="label" htmlFor={ selectId }>
-						{ label ? label : __( 'Categories' ) }
+						{ label ? label : taxonomy.name }
 					</VisuallyHidden>
 				) }
 				<select id={ selectId }>
-					<option>{ __( 'Select Category' ) }</option>
+					<option>
+						{ sprintf(
+							/* translators: %s: taxonomy's singular name */
+							__( 'Select %s' ),
+							taxonomy.labels.singular_name
+						) }
+					</option>
 					{ categoriesList.map( ( category ) =>
 						renderCategoryDropdownItem( category, 0 )
 					) }
@@ -133,7 +156,8 @@ export default function CategoriesEdit( {
 				{ renderCategoryName( name ) }
 				{ showPostCounts && ` (${ count })` }
 			</option>,
-			showHierarchy &&
+			isHierarchicalTaxonomy &&
+				showHierarchy &&
 				!! childCategories.length &&
 				childCategories.map( ( childCategory ) =>
 					renderCategoryDropdownItem( childCategory, level + 1 )
@@ -161,6 +185,23 @@ export default function CategoriesEdit( {
 		<TagName { ...blockProps }>
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
+					{ Array.isArray( taxonomies ) && (
+						<SelectControl
+							__nextHasNoMarginBottom
+							__next40pxDefaultSize
+							label={ __( 'Taxonomy' ) }
+							options={ taxonomies.map( ( t ) => ( {
+								label: t.name,
+								value: t.slug,
+							} ) ) }
+							value={ taxonomySlug }
+							onChange={ ( selectedTaxonomy ) =>
+								setAttributes( {
+									taxonomy: selectedTaxonomy,
+								} )
+							}
+						/>
+					) }
 					<ToggleControl
 						__nextHasNoMarginBottom
 						label={ __( 'Display as dropdown' ) }
@@ -182,19 +223,21 @@ export default function CategoriesEdit( {
 						checked={ showPostCounts }
 						onChange={ toggleAttribute( 'showPostCounts' ) }
 					/>
+					{ isHierarchicalTaxonomy && (
+						<ToggleControl
+							__nextHasNoMarginBottom
+							label={ __( 'Show only top level terms' ) }
+							checked={ showOnlyTopLevel }
+							onChange={ toggleAttribute( 'showOnlyTopLevel' ) }
+						/>
+					) }
 					<ToggleControl
 						__nextHasNoMarginBottom
-						label={ __( 'Show only top level categories' ) }
-						checked={ showOnlyTopLevel }
-						onChange={ toggleAttribute( 'showOnlyTopLevel' ) }
-					/>
-					<ToggleControl
-						__nextHasNoMarginBottom
-						label={ __( 'Show empty categories' ) }
+						label={ __( 'Show empty terms' ) }
 						checked={ showEmpty }
 						onChange={ toggleAttribute( 'showEmpty' ) }
 					/>
-					{ ! showOnlyTopLevel && (
+					{ isHierarchicalTaxonomy && ! showOnlyTopLevel && (
 						<ToggleControl
 							__nextHasNoMarginBottom
 							label={ __( 'Show hierarchy' ) }
@@ -205,16 +248,12 @@ export default function CategoriesEdit( {
 				</PanelBody>
 			</InspectorControls>
 			{ isResolving && (
-				<Placeholder icon={ pin } label={ __( 'Categories' ) }>
+				<Placeholder icon={ pin } label={ __( 'Terms' ) }>
 					<Spinner />
 				</Placeholder>
 			) }
 			{ ! isResolving && categories?.length === 0 && (
-				<p>
-					{ __(
-						'Your site does not have any posts, so there is nothing to display here at the moment.'
-					) }
-				</p>
+				<p>{ taxonomy.labels.no_terms }</p>
 			) }
 			{ ! isResolving &&
 				categories?.length > 0 &&

package/src/categories/index.js

@@ -9,6 +9,7 @@ import { category as icon } from '@wordpress/icons';
 import initBlock from '../utils/init-block';
 import metadata from './block.json';
 import edit from './edit';
+import variations from './variations';
 
 const { name } = metadata;
 
@@ -18,6 +19,7 @@ export const settings = {
 	icon,
 	example: {},
 	edit,
+	variations,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );

package/src/categories/index.php

@@ -21,11 +21,14 @@ function render_block_core_categories( $attributes, $content, $block ) {
 	static $block_id = 0;
 	++$block_id;
 
+	$taxonomy = get_taxonomy( $attributes['taxonomy'] );
+
 	$args = array(
 		'echo'         => false,
 		'hierarchical' => ! empty( $attributes['showHierarchy'] ),
 		'orderby'      => 'name',
 		'show_count'   => ! empty( $attributes['showPostCounts'] ),
+		'taxonomy'     => $attributes['taxonomy'],
 		'title_li'     => '',
 		'hide_empty'   => empty( $attributes['showEmpty'] ),
 	);
@@ -36,13 +39,20 @@ function render_block_core_categories( $attributes, $content, $block ) {
 	if ( ! empty( $attributes['displayAsDropdown'] ) ) {
 		$id                       = 'wp-block-categories-' . $block_id;
 		$args['id']               = $id;
-		$args['show_option_none'] = __( 'Select Category' );
-		$show_label               = empty( $attributes['showLabel'] ) ? ' screen-reader-text' : '';
-		$default_label            = __( 'Categories' );
-		$label_text               = ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label;
-		$wrapper_markup           = '<div %1$s><label class="wp-block-categories__label' . $show_label . '" for="' . esc_attr( $id ) . '">' . $label_text . '</label>%2$s</div>';
-		$items_markup             = wp_dropdown_categories( $args );
-		$type                     = 'dropdown';
+		$args['name']             = $taxonomy->query_var;
+		$args['value_field']      = 'slug';
+		$args['show_option_none'] = sprintf(
+			/* translators: %s: taxonomy's singular name */
+			__( 'Select %s' ),
+			$taxonomy->labels->singular_name
+		);
+
+		$show_label     = empty( $attributes['showLabel'] ) ? ' screen-reader-text' : '';
+		$default_label  = $taxonomy->label;
+		$label_text     = ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label;
+		$wrapper_markup = '<div %1$s><label class="wp-block-categories__label' . $show_label . '" for="' . esc_attr( $id ) . '">' . $label_text . '</label>%2$s</div>';
+		$items_markup   = wp_dropdown_categories( $args );
+		$type           = 'dropdown';
 
 		if ( ! is_admin() ) {
 			// Inject the dropdown script immediately after the select dropdown.
@@ -54,6 +64,8 @@ function render_block_core_categories( $attributes, $content, $block ) {
 			);
 		}
 	} else {
+		$args['show_option_none'] = $taxonomy->labels->no_terms;
+
 		$wrapper_markup = '<ul %1$s>%2$s</ul>';
 		$items_markup   = wp_list_categories( $args );
 		$type           = 'list';
@@ -92,8 +104,8 @@ function build_dropdown_script_block_core_categories( $dropdown_id ) {
 	( function() {
 		var dropdown = document.getElementById( '<?php echo esc_js( $dropdown_id ); ?>' );
 		function onCatChange() {
-			if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
-				location.href = "<?php echo esc_url( home_url() ); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
+			if ( dropdown.options[ dropdown.selectedIndex ].value !== -1 ) {
+				location.href = "<?php echo esc_url( home_url() ); ?>/?" + dropdown.name + '=' + dropdown.options[ dropdown.selectedIndex ].value;
 			}
 		}
 		dropdown.onchange = onCatChange;

package/src/categories/variations.js

@@ -0,0 +1,40 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { category as icon } from '@wordpress/icons';
+
+const variations = [
+	{
+		name: 'terms',
+		title: __( 'Terms List' ),
+		icon,
+		attributes: {
+			// We need to set an attribute here that will be set when inserting the block.
+			// We cannot leave this empty, as that would be interpreted as the default value,
+			// which is `category` -- for which we're defining a distinct variation below,
+			// for backwards compatibility reasons.
+			// The logical fallback is thus the only other built-in and public taxonomy: Tags.
+			taxonomy: 'post_tag',
+		},
+		isActive: ( blockAttributes ) =>
+			// This variation is used for any taxonomy other than `category`.
+			blockAttributes.taxonomy !== 'category',
+	},
+	{
+		name: 'categories',
+		title: __( 'Categories List' ),
+		description: __( 'Display a list of all categories.' ),
+		icon,
+		attributes: {
+			taxonomy: 'category',
+		},
+		isActive: [ 'taxonomy' ],
+		// The following is needed to prevent "Terms List" from showing up twice in the inserter
+		// (once for the block, once for the variation). Fortunately, it does not collide with
+		// `categories` being the default value of the `taxonomy` attribute.
+		isDefault: true,
+	},
+];
+
+export default variations;

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

@@ -37,7 +37,7 @@ function render_block_core_comments_pagination_next( $attributes, $content, $blo
 		$label .= $pagination_arrow;
 	}
 
-	$next_comments_link = get_next_comments_link( $label, $max_page );
+	$next_comments_link = get_next_comments_link( $label, $max_page, $comment_vars['paged'] ?? null );
 
 	remove_filter( 'next_posts_link_attributes', $filter_link_attributes );
 

package/src/comments-pagination-previous/index.php

@@ -29,7 +29,8 @@ function render_block_core_comments_pagination_previous( $attributes, $content,
 	};
 	add_filter( 'previous_comments_link_attributes', $filter_link_attributes );
 
-	$previous_comments_link = get_previous_comments_link( $label );
+	$comment_vars           = build_comment_query_vars_from_block( $block );
+	$previous_comments_link = get_previous_comments_link( $label, $comment_vars['paged'] ?? null );
 
 	remove_filter( 'previous_comments_link_attributes', $filter_link_attributes );