@wordpress/block-library 9.28.1-next.0f6f9d12c.0 → 9.29.1-next.e256d081a.0

package/src/accordion-content/icon.js

@@ -0,0 +1,28 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+export default (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M19.5 9.5L9.5 9.5L9.5 8L19.5 8L19.5 9.5Z"
+			fill="currentColor"
+		/>
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M19.5 13L9.5 13L9.5 11.5L19.5 11.5L19.5 13Z"
+			fill="currentColor"
+		/>
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M19.5 16.3999L9.5 16.3999L9.5 14.8999L19.5 14.8999L19.5 16.3999Z"
+			fill="currentColor"
+		/>
+		<Path d="M4.5 6.25L8.5 8.75L4.5 11.25L4.5 6.25Z" fill="currentColor" />
+	</SVG>
+);

package/src/{accordions → accordion-content}/index.js

@@ -1,7 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { accordion } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
@@ -9,13 +5,14 @@ import edit from './edit';
 import save from './save';
 import metadata from './block.json';
 import initBlock from '../utils/init-block';
+import icon from './icon';
 
 const { name } = metadata;
 
 export { metadata, name };
 
 export const settings = {
-	icon: accordion,
+	icon,
 	example: {},
 	edit,
 	save,

package/src/{accordion-item → accordion-content}/index.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Server-side rendering of the `core/accordion-item` block.
+ * Server-side rendering of the `core/accordion-content` block.
  *
  * @package WordPress
  * @since 6.6.0
@@ -11,13 +11,13 @@
  *
  * @return string Returns the updated markup.
  */
-function block_core_accordion_item_render( $attributes, $content ) {
+function block_core_accordion_content_render( $attributes, $content ) {
 	if ( ! $content ) {
 		return $content;
 	}
 
 	$p         = new WP_HTML_Tag_Processor( $content );
-	$unique_id = wp_unique_id( 'accordion-item-' );
+	$unique_id = wp_unique_id( 'accordion-content-' );
 
 	// Initialize the state of the item on the server using a closure,
 	// since we need to get derived state based on the current context.
@@ -31,13 +31,13 @@ function block_core_accordion_item_render( $attributes, $content ) {
 		)
 	);
 
-	if ( $p->next_tag( array( 'class_name' => 'wp-block-accordion-item' ) ) ) {
+	if ( $p->next_tag( array( 'class_name' => 'wp-block-accordion-content' ) ) ) {
 		$open_by_default = $attributes['openByDefault'] ? 'true' : 'false';
 		$p->set_attribute( 'data-wp-context', '{ "id": "' . $unique_id . '", "openByDefault": ' . $open_by_default . ' }' );
 		$p->set_attribute( 'data-wp-class--is-open', 'state.isOpen' );
 		$p->set_attribute( 'data-wp-init', 'callbacks.initIsOpen' );
 
-		if ( $p->next_tag( array( 'class_name' => 'accordion-item__toggle' ) ) ) {
+		if ( $p->next_tag( array( 'class_name' => 'accordion-content__toggle' ) ) ) {
 			$p->set_attribute( 'data-wp-on--click', 'actions.toggle' );
 			$p->set_attribute( 'id', $unique_id );
 			$p->set_attribute( 'aria-controls', $unique_id . '-panel' );
@@ -58,16 +58,16 @@ function block_core_accordion_item_render( $attributes, $content ) {
 }
 
 /**
- * Registers the `core/accordion-item` block on server.
+ * Registers the `core/accordion-content` block on server.
  *
  * @since 6.6.0
  */
-function register_block_core_accordion_item() {
+function register_block_core_accordion_content() {
 	register_block_type_from_metadata(
-		__DIR__ . '/accordion-item',
+		__DIR__ . '/accordion-content',
 		array(
-			'render_callback' => 'block_core_accordion_item_render',
+			'render_callback' => 'block_core_accordion_content_render',
 		)
 	);
 }
-add_action( 'init', 'register_block_core_accordion_item' );
+add_action( 'init', 'register_block_core_accordion_content' );

package/src/accordion-header/block.json

@@ -5,10 +5,10 @@
 	"version": "0.1.0",
 	"title": "Accordion Header",
 	"category": "design",
-	"description": "Accordion header.",
+	"description": "Displays an accordion header.",
 	"example": {},
 	"__experimental": true,
-	"parent": [ "core/accordion-item" ],
+	"parent": [ "core/accordion-content" ],
 	"usesContext": [
 		"core/accordion-icon-position",
 		"core/accordion-show-icon"

package/src/accordion-header/edit.js

@@ -21,7 +21,7 @@ import { ToolbarGroup } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import { plus } from '../accordion-item/icons';
+import { plus } from '../accordion-content/icons';
 
 const ICONS = {
 	plus,
@@ -73,7 +73,7 @@ export default function Edit( { attributes, setAttributes, context } ) {
 					blockProps.className,
 					colorProps.className,
 					borderProps.className,
-					'accordion-item__heading',
+					'accordion-content__heading',
 					{
 						[ `has-custom-font-size` ]: blockProps.style.fontSize,
 						[ `icon-position-left` ]: iconPosition === 'left',
@@ -87,7 +87,7 @@ export default function Edit( { attributes, setAttributes, context } ) {
 				} }
 			>
 				<button
-					className={ clsx( 'accordion-item__toggle' ) }
+					className={ clsx( 'accordion-content__toggle' ) }
 					style={ {
 						...spacingProps.style,
 					} }
@@ -109,9 +109,12 @@ export default function Edit( { attributes, setAttributes, context } ) {
 					/>
 					{ shouldShowIcon && (
 						<span
-							className={ clsx( `accordion-item__toggle-icon`, {
-								'has-icon-plus': true,
-							} ) }
+							className={ clsx(
+								`accordion-content__toggle-icon`,
+								{
+									'has-icon-plus': true,
+								}
+							) }
 							style={ {
 								// TO-DO: make this configurable
 								width: `1.2em`,

package/src/accordion-header/icon.js

@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+export default (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M19.5 12.75L9.5 12.75L9.5 11.25L19.5 11.25L19.5 12.75Z"
+			fill="currentColor"
+		/>
+		<Path d="M4.5 9.5L8.5 12L4.5 14.5L4.5 9.5Z" fill="currentColor" />
+	</SVG>
+);

package/src/accordion-header/index.js

@@ -1,7 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { accordionHeader } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
@@ -9,13 +5,14 @@ import edit from './edit';
 import save from './save';
 import metadata from './block.json';
 import initBlock from '../utils/init-block';
+import icon from './icon';
 
 const { name } = metadata;
 
 export { metadata, name };
 
 export const settings = {
-	icon: accordionHeader,
+	icon,
 	example: {},
 	edit,
 	save,

package/src/accordion-header/save.js

@@ -16,7 +16,7 @@ import {
 /**
  * Internal dependencies
  */
-import { plus } from '../accordion-item/icons';
+import { plus } from '../accordion-content/icons';
 
 const ICONS = {
 	plus,
@@ -41,7 +41,7 @@ export default function save( { attributes } ) {
 				blockProps.className,
 				colorProps.className,
 				borderProps.className,
-				'accordion-item__heading',
+				'accordion-content__heading',
 				{
 					[ `has-custom-font-size` ]: blockProps?.style?.fontSize,
 					[ `icon-position-left` ]: iconPosition === 'left',
@@ -55,14 +55,14 @@ export default function save( { attributes } ) {
 			} }
 		>
 			<button
-				className={ clsx( 'accordion-item__toggle' ) }
+				className={ clsx( 'accordion-content__toggle' ) }
 				style={ {
 					...spacingProps.style,
 				} }
 			>
 				<RichText.Content tagName="span" value={ title } />
 				<span
-					className={ clsx( `accordion-item__toggle-icon`, {
+					className={ clsx( `accordion-content__toggle-icon`, {
 						'has-icon-plus': showIcon,
 					} ) }
 					style={ {

package/src/accordion-panel/block.json

@@ -5,10 +5,10 @@
 	"version": "0.1.0",
 	"title": "Accordion Panel",
 	"category": "design",
-	"description": "Accordion Panel",
+	"description": "Displays an accordion panel.",
 	"example": {},
 	"__experimental": true,
-	"parent": [ "core/accordion-item" ],
+	"parent": [ "core/accordion-content" ],
 	"supports": {
 		"color": {
 			"background": true,

package/src/accordion-panel/icon.js

@@ -0,0 +1,15 @@
+/**
+ * WordPress dependencies
+ */
+import { SVG, Path } from '@wordpress/primitives';
+
+export default (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path
+			fillRule="evenodd"
+			clipRule="evenodd"
+			d="M8.10417 6.00024H6.5C5.39543 6.00024 4.5 6.89567 4.5 8.00024V10.3336H6V8.00024C6 7.7241 6.22386 7.50024 6.5 7.50024H8.10417V6.00024ZM4.5 13.6669V16.0002C4.5 17.1048 5.39543 18.0002 6.5 18.0002H8.10417V16.5002H6.5C6.22386 16.5002 6 16.2764 6 16.0002V13.6669H4.5ZM10.3958 6.00024V7.50024H13.6042V6.00024H10.3958ZM15.8958 6.00024V7.50024H17.5C17.7761 7.50024 18 7.7241 18 8.00024V10.3336H19.5V8.00024C19.5 6.89567 18.6046 6.00024 17.5 6.00024H15.8958ZM19.5 13.6669H18V16.0002C18 16.2764 17.7761 16.5002 17.5 16.5002H15.8958V18.0002H17.5C18.6046 18.0002 19.5 17.1048 19.5 16.0002V13.6669ZM13.6042 18.0002V16.5002H10.3958V18.0002H13.6042Z"
+			fill="currentColor"
+		/>
+	</SVG>
+);

package/src/accordion-panel/index.js

@@ -1,7 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { accordionPanel } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
@@ -9,13 +5,14 @@ import edit from './edit';
 import save from './save';
 import metadata from './block.json';
 import initBlock from '../utils/init-block';
+import icon from './icon';
 
 const { name } = metadata;
 
 export { metadata, name };
 
 export const settings = {
-	icon: accordionPanel,
+	icon,
 	example: {},
 	edit,
 	save,

package/src/audio/edit.js

@@ -22,6 +22,7 @@ import {
 	MediaPlaceholder,
 	MediaReplaceFlow,
 	useBlockProps,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { __, _x } from '@wordpress/i18n';
 import { useDispatch } from '@wordpress/data';
@@ -51,6 +52,8 @@ function AudioEdit( {
 } ) {
 	const { id, autoplay, loop, preload, src } = attributes;
 	const [ temporaryURL, setTemporaryURL ] = useState( attributes.blob );
+	const blockEditingMode = useBlockEditingMode();
+	const hasNonContentControls = blockEditingMode === 'default';
 
 	useUploadMediaFromBlobURL( {
 		url: temporaryURL,
@@ -264,7 +267,9 @@ function AudioEdit( {
 					isSelected={ isSingleSelected }
 					insertBlocksAfter={ insertBlocksAfter }
 					label={ __( 'Audio caption text' ) }
-					showToolbarButton={ isSingleSelected }
+					showToolbarButton={
+						isSingleSelected && hasNonContentControls
+					}
 				/>
 			</figure>
 		</>

package/src/form/block.json

@@ -36,7 +36,6 @@
 	},
 	"supports": {
 		"anchor": true,
-		"className": false,
 		"color": {
 			"gradients": true,
 			"link": true,

package/src/form/deprecated.js

@@ -0,0 +1,96 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	InnerBlocks,
+	useBlockProps,
+	getTypographyClassesAndStyles,
+	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
+	__experimentalGetSpacingClassesAndStyles as getSpacingClassesAndStyles,
+} from '@wordpress/block-editor';
+
+const v1 = {
+	// The block supports here are deliberately empty despite this
+	// deprecated version of the block having adopted block supports.
+	// The attributes added by these supports have been manually
+	// added to this deprecated version's attributes definition so
+	// that the data isn't lost on migration. All this is so that the
+	// automatic application of block support classes doesn't occur
+	// as this version of the block had a bug that overrode those
+	// classes. If those block support classes are applied during the
+	// deprecation process, this deprecation doesn't match and won't
+	// run.
+	// @see https://github.com/WordPress/gutenberg/pull/55755
+	supports: {},
+	attributes: {
+		submissionMethod: {
+			type: 'string',
+			default: 'email',
+		},
+		method: {
+			type: 'string',
+			default: 'post',
+		},
+		action: {
+			type: 'string',
+		},
+		email: {
+			type: 'string',
+		},
+		// The following attributes have been added to match the block
+		// supports at the time of the deprecation. See above for details.
+		anchor: {
+			type: 'string',
+			source: 'attribute',
+			attribute: 'id',
+			selector: '*',
+		},
+		backgroundColor: {
+			type: 'string',
+		},
+		textColor: {
+			type: 'string',
+		},
+		gradient: {
+			type: 'string',
+		},
+		style: {
+			type: 'object',
+		},
+		fontFamily: {
+			type: 'string',
+		},
+		fontSize: {
+			type: 'string',
+		},
+	},
+	save( { attributes } ) {
+		const { submissionMethod } = attributes;
+		const colorProps = getColorClassesAndStyles( attributes );
+		const typographyProps = getTypographyClassesAndStyles( attributes );
+		const spacingProps = getSpacingClassesAndStyles( attributes );
+		const blockProps = useBlockProps.save( {
+			// In this deprecated version, the block support is deliberately empty.
+			// As a result, the useBlockProps.save() does not output style or id attributes,
+			// so we apply them explicitly here.
+			style: {
+				...colorProps.style,
+				...typographyProps.style,
+				...spacingProps.style,
+			},
+			id: attributes.anchor,
+		} );
+
+		return (
+			<form
+				{ ...blockProps }
+				className="wp-block-form"
+				encType={ submissionMethod === 'email' ? 'text/plain' : null }
+			>
+				<InnerBlocks.Content />
+			</form>
+		);
+	},
+};
+
+export default [ v1 ];

package/src/form/index.js

@@ -6,6 +6,7 @@ import edit from './edit';
 import metadata from './block.json';
 import save from './save';
 import variations from './variations';
+import deprecated from './deprecated';
 
 /**
  * WordPress dependencies
@@ -19,6 +20,7 @@ export { metadata, name };
 export const settings = {
 	edit,
 	save,
+	deprecated,
 	variations,
 	example: {},
 };

package/src/form/save.js

@@ -10,7 +10,6 @@ export default function save( { attributes } ) {
 	return (
 		<form
 			{ ...blockProps }
-			className="wp-block-form"
 			encType={ submissionMethod === 'email' ? 'text/plain' : null }
 		>
 			<InnerBlocks.Content />

package/src/gallery/edit.js

@@ -392,7 +392,9 @@ export default function GalleryEdit( props ) {
 				lightboxSetting
 			);
 		} );
-		updateBlockAttributes( blocks, changedAttributes, true );
+		updateBlockAttributes( blocks, changedAttributes, {
+			uniqueByBlock: true,
+		} );
 		const linkToText = [ ...linkOptions ].find(
 			( linkType ) => linkType.value === value
 		);
@@ -434,7 +436,9 @@ export default function GalleryEdit( props ) {
 				block.attributes
 			);
 		} );
-		updateBlockAttributes( blocks, changedAttributes, true );
+		updateBlockAttributes( blocks, changedAttributes, {
+			uniqueByBlock: true,
+		} );
 		const noticeText = openInNewTab
 			? __( 'All gallery images updated to open in new tab' )
 			: __( 'All gallery images updated to not open in new tab' );
@@ -458,7 +462,9 @@ export default function GalleryEdit( props ) {
 				newSizeSlug
 			);
 		} );
-		updateBlockAttributes( blocks, changedAttributes, true );
+		updateBlockAttributes( blocks, changedAttributes, {
+			uniqueByBlock: true,
+		} );
 		const imageSize = imageSizeOptions.find(
 			( size ) => size.value === newSizeSlug
 		);

package/src/image/edit.js

@@ -99,7 +99,6 @@ export function ImageEdit( {
 } ) {
 	const {
 		url = '',
-		alt,
 		caption,
 		id,
 		width,
@@ -127,11 +126,6 @@ export function ImageEdit( {
 
 	const isSmallContainer = placeholderWidth && placeholderWidth < 160;
 
-	const altRef = useRef();
-	useEffect( () => {
-		altRef.current = alt;
-	}, [ alt ] );
-
 	const captionRef = useRef();
 	useEffect( () => {
 		captionRef.current = caption;

package/src/image/image.js

@@ -706,7 +706,8 @@ export default function Image( {
 		! lockHrefControls &&
 		! lockUrlControls;
 
-	const showCoverControls = isSingleSelected && canInsertCover;
+	const showCoverControls =
+		isSingleSelected && canInsertCover && ! isContentOnlyMode;
 
 	const showBlockControls = showUrlInput || allowCrop || showCoverControls;
 

package/src/index.js

@@ -20,8 +20,8 @@ import {
 // production build to make the final bundle smaller.
 //
 // See https://github.com/WordPress/gutenberg/pull/40655 for more context.
-import * as accordions from './accordions';
-import * as accordionItem from './accordion-item';
+import * as accordion from './accordion';
+import * as accordionContent from './accordion-content';
 import * as accordionHeader from './accordion-header';
 import * as accordionPanel from './accordion-panel';
 import * as archives from './archives';
@@ -240,8 +240,8 @@ const getAllBlocks = () => {
 	];
 
 	if ( window?.__experimentalEnableBlockExperiments ) {
-		blocks.push( accordions );
-		blocks.push( accordionItem );
+		blocks.push( accordion );
+		blocks.push( accordionContent );
 		blocks.push( accordionHeader );
 		blocks.push( accordionPanel );
 	}

package/src/navigation/edit/test/navigation-menu-selector.js

@@ -295,7 +295,7 @@ describe( 'NavigationMenuSelector', () => {
 					screen.queryByRole( 'menuitem', {
 						name: 'Create new Menu',
 					} )
-				).toBeDisabled();
+				).toHaveAttribute( 'aria-disabled', 'true' );
 
 				// once the menu is created
 				// no more network activity to wait on
@@ -619,7 +619,7 @@ describe( 'NavigationMenuSelector', () => {
 				// Check all menu items are present but disabled.
 				screen.getAllByRole( 'menuitem' ).forEach( ( item ) => {
 					// // Check all menu items are present but disabled.
-					expect( item ).toBeDisabled();
+					expect( item ).toHaveAttribute( 'aria-disabled', 'true' );
 				} );
 
 				// once the menu is imported

package/src/post-comments-link/edit.js

@@ -60,7 +60,13 @@ function PostCommentsLinkEdit( { context, attributes, setAttributes } ) {
 	);
 
 	if ( ! post ) {
-		return null;
+		return (
+			<div { ...blockProps }>
+				<Warning>
+					{ __( 'Post Comments Link block: post not found.' ) }
+				</Warning>
+			</div>
+		);
 	}
 
 	const { link } = post;

package/src/query/edit/index.js

@@ -22,6 +22,7 @@ const QueryEdit = ( props ) => {
 		[ clientId ]
 	);
 	const Component = hasInnerBlocks ? QueryContent : QueryPlaceholder;
+
 	return (
 		<>
 			<Component

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

@@ -5,12 +5,12 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import { useInstanceId } from '@wordpress/compose';
 import { useEffect, useCallback } from '@wordpress/element';
 import {
-	BlockControls,
 	InspectorControls,
 	useBlockProps,
 	store as blockEditorStore,
 	useInnerBlocksProps,
 	privateApis as blockEditorPrivateApis,
+	BlockControls,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 import { store as coreStore } from '@wordpress/core-data';
@@ -130,6 +130,13 @@ export default function QueryContent( {
 
 	return (
 		<>
+			<BlockControls>
+				<QueryToolbar
+					clientId={ clientId }
+					attributes={ attributes }
+					hasInnerBlocks
+				/>
+			</BlockControls>
 			<EnhancedPaginationModal
 				attributes={ attributes }
 				setAttributes={ setAttributes }
@@ -145,9 +152,6 @@ export default function QueryContent( {
 					isSingular={ isSingular }
 				/>
 			</InspectorControls>
-			<BlockControls>
-				<QueryToolbar attributes={ attributes } clientId={ clientId } />
-			</BlockControls>
 			<InspectorControls group="advanced">
 				<HTMLElementControl
 					tagName={ TagName }