@wordpress/block-library 10.0.1-next.v.202606191442.0 → 10.0.1

package/src/image/test/use-open-image-media-editor-modal.js

@@ -45,8 +45,7 @@ jest.mock( '../../lock-unlock', () => ( {
 
 function createRegistry( {
 	getEditedEntityRecord = () => false,
-	getEntityRecord = () => undefined,
-	resolveGetEntityRecord = getEntityRecord,
+	resolveGetEntityRecord = () => undefined,
 } = {} ) {
 	const actions = {
 		invalidateResolution: jest.fn(),
@@ -54,7 +53,6 @@ function createRegistry( {
 	return {
 		select: jest.fn( () => ( {
 			getEditedEntityRecord,
-			getEntityRecord,
 		} ) ),
 		dispatch: jest.fn( () => actions ),
 		resolveSelect: jest.fn( () => ( {
@@ -169,11 +167,8 @@ describe( 'useOpenImageMediaEditorModal', () => {
 				caption: 'Original caption',
 			},
 			registryOptions: {
-				getEntityRecord: () => originalAttachment,
-				resolveGetEntityRecord: ( kind, name, attachmentId, query ) =>
-					query?.context === 'edit'
-						? updatedAttachment
-						: originalAttachment,
+				getEditedEntityRecord: () => originalAttachment,
+				resolveGetEntityRecord: () => updatedAttachment,
 			},
 		} );
 
@@ -181,13 +176,15 @@ describe( 'useOpenImageMediaEditorModal', () => {
 			alt: 'Updated alt',
 			caption: 'Updated caption',
 		} );
-		expect( registry.actions.invalidateResolution ).toHaveBeenCalledWith(
-			'getEntityRecord',
-			[ 'postType', 'attachment', 1 ]
+		// A single, query-less resolution is invalidated: the hook reads,
+		// resolves, and invalidates the attachment through the entity's default
+		// (edit) context rather than an explicitly-keyed query.
+		expect( registry.actions.invalidateResolution ).toHaveBeenCalledTimes(
+			1
 		);
 		expect( registry.actions.invalidateResolution ).toHaveBeenCalledWith(
 			'getEntityRecord',
-			[ 'postType', 'attachment', 1, { context: 'edit' } ]
+			[ 'postType', 'attachment', 1 ]
 		);
 	} );
 
@@ -220,8 +217,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 			1,
 			'postType',
 			'attachment',
-			1,
-			{ context: 'edit' }
+			1
 		);
 		expect( openMediaEditorModal ).toHaveBeenCalledWith( {
 			id: 1,
@@ -263,8 +259,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 			1,
 			'postType',
 			'attachment',
-			1,
-			{ context: 'edit' }
+			1
 		);
 		expect( openMediaEditorModal ).toHaveBeenCalledWith( {
 			id: 1,
@@ -299,7 +294,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 				caption: undefined,
 			},
 			registryOptions: {
-				getEntityRecord: () => ( {
+				getEditedEntityRecord: () => ( {
 					id: 1,
 					alt_text: '',
 					caption: {
@@ -314,8 +309,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 			1,
 			'postType',
 			'attachment',
-			1,
-			{ context: 'edit' }
+			1
 		);
 		expect( setAttributes ).toHaveBeenCalledWith( {
 			caption: 'Updated attachment caption',
@@ -341,7 +335,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 				caption: '',
 			},
 			registryOptions: {
-				getEntityRecord: ( kind, name, attachmentId ) =>
+				getEditedEntityRecord: ( kind, name, attachmentId ) =>
 					attachmentId === 1 ? originalAttachment : undefined,
 				resolveGetEntityRecord: ( kind, name, attachmentId ) =>
 					attachmentId === 2 ? updatedAttachment : undefined,
@@ -371,7 +365,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 		};
 		const deferredAttachment = createDeferred();
 		const registry = createRegistry( {
-			getEntityRecord: ( kind, name, attachmentId ) =>
+			getEditedEntityRecord: ( kind, name, attachmentId ) =>
 				attachmentId === 1 ? originalAttachment : undefined,
 			resolveGetEntityRecord: ( kind, name, attachmentId ) =>
 				attachmentId === 2 ? deferredAttachment.promise : undefined,
@@ -437,7 +431,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 				caption: '',
 			},
 			registryOptions: {
-				getEntityRecord: ( kind, name, attachmentId ) =>
+				getEditedEntityRecord: ( kind, name, attachmentId ) =>
 					attachmentId === 1
 						? originalAttachment
 						: {
@@ -469,7 +463,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 				caption: undefined,
 			},
 			registryOptions: {
-				getEntityRecord: () => ( {
+				getEditedEntityRecord: () => ( {
 					id: 1,
 					alt_text: '',
 					caption: { raw: 'Existing caption' },
@@ -526,7 +520,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 				caption: undefined,
 			},
 			registryOptions: {
-				getEntityRecord: () => ( {
+				getEditedEntityRecord: () => ( {
 					id: 1,
 					alt_text: 'Original alt',
 					caption: { raw: 'Existing caption' },
@@ -556,7 +550,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 				caption: { toString: () => '' },
 			},
 			registryOptions: {
-				getEntityRecord: () => ( {
+				getEditedEntityRecord: () => ( {
 					id: 1,
 					alt_text: 'Original alt',
 					caption: { raw: 'Existing caption' },
@@ -603,7 +597,7 @@ describe( 'useOpenImageMediaEditorModal', () => {
 		};
 		const deferredAttachment = createDeferred();
 		const registry = createRegistry( {
-			getEntityRecord: () => ( {
+			getEditedEntityRecord: () => ( {
 				id: 1,
 				alt_text: '',
 				caption: { raw: '' },

package/src/image/use-open-image-media-editor-modal.js

@@ -104,9 +104,6 @@ export function getSyncedImageBlockAttributes(
 }
 
 const { openMediaEditorModalKey } = unlock( blockEditorPrivateApis );
-// Caption sync needs `caption.raw`; view/default attachment records can contain
-// only rendered caption data or be tied to an in-flight stale resolution.
-const ATTACHMENT_EDIT_QUERY = { context: 'edit' };
 
 function getAttachmentFallbackForEmptyBlockMetadata( { alt, caption } ) {
 	const attachment = {};
@@ -177,25 +174,23 @@ export function useOpenImageMediaEditorModal( {
 		};
 	}, [ alt, caption, id, url ] );
 
+	// Reads the cached attachment record. The `attachment` postType entity
+	// fetches with `context: 'edit'` by default, so `getEditedEntityRecord`
+	// returns the edit-context record — carrying `caption` as `{ raw }` and a
+	// usable `alt_text` — without us specifying a context. It is resolver-
+	// backed, so on a cold cache this also kicks off the fetch and returns a
+	// falsy value synchronously; that resolution shares its cache key with the
+	// `resolveAttachmentRecord` call below (both keyed on the no-query
+	// `getEntityRecord`), so the two dedupe into a single request.
 	const getCachedAttachmentRecord = useCallback(
-		( attachmentId ) => {
-			const { getEditedEntityRecord, getEntityRecord } =
-				registry.select( coreStore );
-			return (
-				getEditedEntityRecord(
+		( attachmentId ) =>
+			registry
+				.select( coreStore )
+				.getEditedEntityRecord(
 					'postType',
 					'attachment',
 					attachmentId
-				) ||
-				getEntityRecord(
-					'postType',
-					'attachment',
-					attachmentId,
-					ATTACHMENT_EDIT_QUERY
-				) ||
-				getEntityRecord( 'postType', 'attachment', attachmentId )
-			);
-		},
+				),
 		[ registry ]
 	);
 
@@ -204,18 +199,10 @@ export function useOpenImageMediaEditorModal( {
 			const resolveSelect = registry.resolveSelect( coreStore );
 
 			try {
-				return (
-					( await resolveSelect.getEntityRecord(
-						'postType',
-						'attachment',
-						attachmentId,
-						ATTACHMENT_EDIT_QUERY
-					) ) ||
-					( await resolveSelect.getEntityRecord(
-						'postType',
-						'attachment',
-						attachmentId
-					) )
+				return await resolveSelect.getEntityRecord(
+					'postType',
+					'attachment',
+					attachmentId
 				);
 			} catch {
 				return undefined;
@@ -226,8 +213,9 @@ export function useOpenImageMediaEditorModal( {
 
 	const resolveFreshAttachmentRecord = useCallback(
 		async ( attachmentId ) => {
-			// Bust cached records so resolveAttachmentRecord fetches the
-			// server state that reflects the media editor's saved changes.
+			// Invalidate the cached resolution so resolveAttachmentRecord
+			// re-fetches the server state that reflects the media editor's
+			// saved changes.
 			const { invalidateResolution } = registry.dispatch( coreStore );
 
 			invalidateResolution( 'getEntityRecord', [
@@ -235,12 +223,6 @@ export function useOpenImageMediaEditorModal( {
 				'attachment',
 				attachmentId,
 			] );
-			invalidateResolution( 'getEntityRecord', [
-				'postType',
-				'attachment',
-				attachmentId,
-				ATTACHMENT_EDIT_QUERY,
-			] );
 			return resolveAttachmentRecord( attachmentId );
 		},
 		[ registry, resolveAttachmentRecord ]
@@ -321,10 +303,10 @@ export function useOpenImageMediaEditorModal( {
 		}
 
 		// Snapshot the attachment's current metadata before the user makes
-		// any changes so handleMediaUpdate can compare against it later.
-		// Prefer a freshly resolved edit-context record for accuracy; fall
-		// back to whatever is in the cache, or a minimal object derived from
-		// the block's own attributes when nothing is cached yet.
+		// any changes so handleMediaUpdate can compare against it later. Use
+		// the cached record when it's already present; only resolve when
+		// nothing is cached yet, then fall back to a minimal object derived
+		// from the block's own attributes.
 		const cachedAttachmentRecord = getCachedAttachmentRecord( id );
 		const fallbackAttachmentRecord =
 			getAttachmentFallbackForEmptyBlockMetadata(

package/src/list/ordered-list-settings.js

@@ -86,7 +86,6 @@ const OrderedListSettings = ( { setAttributes, reversed, start, type } ) => {
 					}
 				>
 					<TextControl
-						__next40pxDefaultSize
 						label={ __( 'Start value' ) }
 						type="number"
 						onChange={ ( value ) => {

package/src/navigation/edit/index.js

@@ -362,27 +362,29 @@ function Navigation( {
 		innerBlocks,
 	} = useInnerBlocks( clientId );
 
+	const {
+		replaceInnerBlocks,
+		selectBlock,
+		__unstableMarkNextChangeAsNotPersistent,
+	} = useDispatch( blockEditorStore );
+
 	// Reset submenuVisibility to default if orientation changes to horizontal
 	// while "always" is selected, but only when the Navigation block or one
 	// of its inner blocks is being edited. Rendering related template parts
 	// should not mark them dirty.
 	useEffect( () => {
-		if (
-			( isSelected || isInnerBlockSelected ) &&
-			orientation === 'horizontal' &&
-			submenuVisibility === 'always'
-		) {
+		if ( orientation === 'horizontal' && submenuVisibility === 'always' ) {
+			__unstableMarkNextChangeAsNotPersistent();
 			setAttributes( {
 				submenuVisibility: 'hover',
 				showSubmenuIcon: true,
 			} );
 		}
 	}, [
-		isSelected,
-		isInnerBlockSelected,
 		orientation,
 		submenuVisibility,
 		setAttributes,
+		__unstableMarkNextChangeAsNotPersistent,
 	] );
 
 	// Use a ref to store whether we've confirmed a page-list has submenus.
@@ -442,12 +444,6 @@ function Navigation( {
 				templatePart.area === NAVIGATION_OVERLAY_TEMPLATE_PART_AREA
 		) ?? false;
 
-	const {
-		replaceInnerBlocks,
-		selectBlock,
-		__unstableMarkNextChangeAsNotPersistent,
-	} = useDispatch( blockEditorStore );
-
 	const [ isResponsiveMenuOpen, setResponsiveMenuVisibility ] =
 		useState( false );
 

package/src/navigation/edit/navigation-menu-name-control.js

@@ -14,7 +14,6 @@ export default function NavigationMenuNameControl() {
 
 	return (
 		<TextControl
-			__next40pxDefaultSize
 			label={ __( 'Menu name' ) }
 			value={ title }
 			onChange={ updateTitle }

package/src/navigation-link/README.md

@@ -74,7 +74,7 @@ _Defined via the [`usesContext` and `providesContext`](https://developer.wordpre
 _Defined via the [`selectors`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-selectors/) property in block.json._
 
 - **states**:
-  - @current: `.wp-block-navigation .current-menu-item`
+  - -current: `.wp-block-navigation .current-menu-item`
 
 ## Block Markup
 

package/src/navigation-link/block.json

@@ -87,7 +87,7 @@
 	},
 	"selectors": {
 		"states": {
-			"@current": ".wp-block-navigation .current-menu-item"
+			"-current": ".wp-block-navigation .current-menu-item"
 		}
 	},
 	"editorStyle": "wp-block-navigation-link-editor",

package/src/navigation-link/link-ui/page-creator.js

@@ -128,7 +128,6 @@ export function LinkUIPageCreator( {
 				<form onSubmit={ createPage }>
 					<VStack spacing={ 4 }>
 						<TextControl
-							__next40pxDefaultSize
 							label={ __( 'Title' ) }
 							onChange={ setTitle }
 							placeholder={ __( 'No title' ) }

package/src/navigation-link/shared/controls.js

@@ -178,7 +178,6 @@ export function Controls( {
 				isShownByDefault
 			>
 				<TextControl
-					__next40pxDefaultSize
 					label={ __( 'Text' ) }
 					value={ label ? stripHTML( label ) : '' }
 					onChange={ ( labelValue ) => {
@@ -292,7 +291,6 @@ export function Controls( {
 				isShownByDefault={ ! isContentOnly }
 			>
 				<TextControl
-					__next40pxDefaultSize
 					label={ __( 'Rel attribute' ) }
 					value={ rel || '' }
 					onChange={ ( relValue ) => {

package/src/navigation-link/test/__snapshots__/hooks.js.snap

@@ -9,6 +9,7 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
       "attributes": {},
       "description": "A link to a custom URL.",
       "icon": <SVG
+        fill="currentColor"
         viewBox="0 0 24 24"
         xmlns="http://www.w3.org/2000/svg"
       >
@@ -26,6 +27,7 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
       },
       "description": "A link to a post.",
       "icon": <SVG
+        fill="currentColor"
         viewBox="0 0 24 24"
         xmlns="http://www.w3.org/2000/svg"
       >
@@ -43,6 +45,7 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
       },
       "description": "A link to a page.",
       "icon": <SVG
+        fill="currentColor"
         viewBox="0 0 24 24"
         xmlns="http://www.w3.org/2000/svg"
       >
@@ -63,6 +66,7 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
       },
       "description": "A link to a category.",
       "icon": <SVG
+        fill="currentColor"
         viewBox="0 0 24 24"
         xmlns="http://www.w3.org/2000/svg"
       >
@@ -82,6 +86,7 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
       },
       "description": "A link to a tag.",
       "icon": <SVG
+        fill="currentColor"
         viewBox="0 0 24 24"
         xmlns="http://www.w3.org/2000/svg"
       >

package/src/playlist-track/edit.js

@@ -161,7 +161,6 @@ const PlaylistTrackEdit = ( { attributes, setAttributes, context } ) => {
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings' ) }>
 					<TextControl
-						__next40pxDefaultSize
 						label={ __( 'Artist' ) }
 						value={ artist ? stripHTML( artist ) : '' }
 						onChange={ ( artistValue ) => {
@@ -169,7 +168,6 @@ const PlaylistTrackEdit = ( { attributes, setAttributes, context } ) => {
 						} }
 					/>
 					<TextControl
-						__next40pxDefaultSize
 						label={ __( 'Album' ) }
 						value={ album ? stripHTML( album ) : '' }
 						onChange={ ( albumValue ) => {
@@ -177,7 +175,6 @@ const PlaylistTrackEdit = ( { attributes, setAttributes, context } ) => {
 						} }
 					/>
 					<TextControl
-						__next40pxDefaultSize
 						label={ __( 'Title' ) }
 						value={ title ? stripHTML( title ) : '' }
 						onChange={ ( titleValue ) => {

package/src/post-comment/edit.js

@@ -34,7 +34,6 @@ export default function Edit( { attributes: { commentId }, setAttributes } ) {
 					) }
 				>
 					<TextControl
-						__next40pxDefaultSize
 						value={ commentId }
 						onChange={ ( val ) =>
 							setCommentIdInput( parseInt( val ) )

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

@@ -356,7 +356,6 @@ export default function PostFeaturedImageEdit( {
 								}
 							>
 								<TextControl
-									__next40pxDefaultSize
 									label={ __( 'Link relation' ) }
 									help={ createInterpolateElement(
 										__(

package/src/post-terms/edit.js

@@ -65,7 +65,6 @@ export default function PostTermsEdit( {
 		<>
 			<InspectorControls group="advanced">
 				<TextControl
-					__next40pxDefaultSize
 					autoComplete="off"
 					label={ __( 'Separator' ) }
 					value={ separator || '' }

package/src/post-title/edit.js

@@ -203,7 +203,6 @@ export default function PostTitleEdit( {
 										}
 									>
 										<TextControl
-											__next40pxDefaultSize
 											label={ __( 'Link relation' ) }
 											help={ createInterpolateElement(
 												__(

package/src/query/edit/enhanced-pagination-modal.js

@@ -8,6 +8,8 @@ import {
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useState, useEffect } from '@wordpress/element';
+import { useDispatch } from '@wordpress/data';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -24,13 +26,21 @@ export default function EnhancedPaginationModal( {
 } ) {
 	const [ isOpen, setOpen ] = useState( false );
 	const hasUnsupportedBlocks = useUnsupportedBlocks( clientId );
+	const { __unstableMarkNextChangeAsNotPersistent } =
+		useDispatch( blockEditorStore );
 
 	useEffect( () => {
 		if ( enhancedPagination && hasUnsupportedBlocks ) {
+			__unstableMarkNextChangeAsNotPersistent();
 			setAttributes( { enhancedPagination: false } );
 			setOpen( true );
 		}
-	}, [ enhancedPagination, hasUnsupportedBlocks, setAttributes ] );
+	}, [
+		enhancedPagination,
+		hasUnsupportedBlocks,
+		setAttributes,
+		__unstableMarkNextChangeAsNotPersistent,
+	] );
 
 	const closeModal = () => {
 		setOpen( false );

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

@@ -432,7 +432,6 @@ export default function QueryInspectorControls( props ) {
 							} }
 						>
 							<TextControl
-								__next40pxDefaultSize
 								label={ __( 'Keyword' ) }
 								value={ querySearch }
 								onChange={ ( newQuerySearch ) => {

package/src/rss/edit.js

@@ -289,7 +289,6 @@ export default function RSSEdit( { attributes, setAttributes, name } ) {
 			</InspectorControls>
 			<InspectorControls group="advanced">
 				<TextControl
-					__next40pxDefaultSize
 					label={ __( 'Link relation' ) }
 					help={ createInterpolateElement(
 						__(

package/src/search/README.md

@@ -24,6 +24,7 @@ _Defined via the [`attributes`](https://developer.wordpress.org/block-editor/ref
 | `buttonPosition` | `string` | `"button-outside"` | — |
 | `buttonUseIcon` | `boolean` | `false` | — |
 | `query` | `object` | `{}` | — |
+| `tagName` | `string` | `""` | — |
 
 ## Supports
 

package/src/search/block.json

@@ -42,6 +42,10 @@
 		"query": {
 			"type": "object",
 			"default": {}
+		},
+		"tagName": {
+			"type": "string",
+			"default": ""
 		}
 	},
 	"supports": {