@wordpress/block-library 8.19.12 → 8.19.14

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "8.19.12",
+	"version": "8.19.14",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -31,36 +31,36 @@
 	],
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.42.12",
-		"@wordpress/api-fetch": "^6.39.12",
-		"@wordpress/autop": "^3.42.12",
-		"@wordpress/blob": "^3.42.12",
-		"@wordpress/block-editor": "^12.10.12",
-		"@wordpress/blocks": "^12.19.12",
-		"@wordpress/components": "^25.8.12",
-		"@wordpress/compose": "^6.19.12",
-		"@wordpress/core-data": "^6.19.12",
-		"@wordpress/data": "^9.12.12",
-		"@wordpress/date": "^4.42.12",
-		"@wordpress/deprecated": "^3.42.12",
-		"@wordpress/dom": "^3.42.12",
-		"@wordpress/element": "^5.19.12",
-		"@wordpress/escape-html": "^2.42.12",
-		"@wordpress/hooks": "^3.42.12",
-		"@wordpress/html-entities": "^3.42.12",
-		"@wordpress/i18n": "^4.42.12",
-		"@wordpress/icons": "^9.33.12",
-		"@wordpress/interactivity": "^2.3.12",
-		"@wordpress/keycodes": "^3.42.12",
-		"@wordpress/notices": "^4.10.12",
-		"@wordpress/primitives": "^3.40.12",
-		"@wordpress/private-apis": "^0.24.12",
-		"@wordpress/reusable-blocks": "^4.19.12",
-		"@wordpress/rich-text": "^6.19.12",
-		"@wordpress/server-side-render": "^4.19.12",
-		"@wordpress/url": "^3.43.12",
-		"@wordpress/viewport": "^5.19.12",
-		"@wordpress/wordcount": "^3.42.12",
+		"@wordpress/a11y": "^3.42.13",
+		"@wordpress/api-fetch": "^6.39.13",
+		"@wordpress/autop": "^3.42.13",
+		"@wordpress/blob": "^3.42.13",
+		"@wordpress/block-editor": "^12.10.13",
+		"@wordpress/blocks": "^12.19.13",
+		"@wordpress/components": "^25.8.13",
+		"@wordpress/compose": "^6.19.13",
+		"@wordpress/core-data": "^6.19.13",
+		"@wordpress/data": "^9.12.13",
+		"@wordpress/date": "^4.42.13",
+		"@wordpress/deprecated": "^3.42.13",
+		"@wordpress/dom": "^3.42.13",
+		"@wordpress/element": "^5.19.13",
+		"@wordpress/escape-html": "^2.42.13",
+		"@wordpress/hooks": "^3.42.13",
+		"@wordpress/html-entities": "^3.42.13",
+		"@wordpress/i18n": "^4.42.13",
+		"@wordpress/icons": "^9.33.13",
+		"@wordpress/interactivity": "^2.3.13",
+		"@wordpress/keycodes": "^3.42.13",
+		"@wordpress/notices": "^4.10.13",
+		"@wordpress/primitives": "^3.40.13",
+		"@wordpress/private-apis": "^0.24.13",
+		"@wordpress/reusable-blocks": "^4.19.13",
+		"@wordpress/rich-text": "^6.19.13",
+		"@wordpress/server-side-render": "^4.19.13",
+		"@wordpress/url": "^3.43.13",
+		"@wordpress/viewport": "^5.19.13",
+		"@wordpress/wordcount": "^3.42.13",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.7.0",
@@ -78,5 +78,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "8447c60232efe04eb248a1c893bf3a1fc4e47ecc"
+	"gitHead": "4009590d0cb3b4de3e783fd1a76bfd0d290d1a80"
 }

package/src/image/deprecated.js

@@ -1047,6 +1047,14 @@ const v8 = {
 		},
 	},
 	migrate( { width, height, ...attributes } ) {
+		// We need to perform a check here because in cases
+		// where attributes are added dynamically to blocks,
+		// block invalidation overrides the isEligible() method
+		// and forces the migration to run, so it's not guaranteed
+		// that `behaviors` or `behaviors.lightbox` will be defined.
+		if ( ! attributes.behaviors?.lightbox ) {
+			return attributes;
+		}
 		const {
 			behaviors: {
 				lightbox: { enabled },

package/src/image/image.js

@@ -83,9 +83,29 @@ const scaleOptions = [
 	},
 ];
 
-const disabledClickProps = {
-	onClick: ( event ) => event.preventDefault(),
-	'aria-disabled': true,
+// If the image has a href, wrap in an <a /> tag to trigger any inherited link element styles.
+const ImageWrapper = ( { href, children } ) => {
+	if ( ! href ) {
+		return children;
+	}
+	return (
+		<a
+			href={ href }
+			onClick={ ( event ) => event.preventDefault() }
+			aria-disabled={ true }
+			style={ {
+				// When the Image block is linked,
+				// it's wrapped with a disabled <a /> tag.
+				// Restore cursor style so it doesn't appear 'clickable'
+				// and remove pointer events. Safari needs the display property.
+				pointerEvents: 'none',
+				cursor: 'default',
+				display: 'inline',
+			} }
+		>
+			{ children }
+		</a>
+	);
 };
 
 export default function Image( {
@@ -653,25 +673,31 @@ export default function Image( {
 
 	if ( canEditImage && isEditingImage ) {
 		img = (
-			<ImageEditor
-				id={ id }
-				url={ url }
-				width={ numericWidth }
-				height={ numericHeight }
-				clientWidth={ fallbackClientWidth }
-				naturalHeight={ naturalHeight }
-				naturalWidth={ naturalWidth }
-				onSaveImage={ ( imageAttributes ) =>
-					setAttributes( imageAttributes )
-				}
-				onFinishEditing={ () => {
-					setIsEditingImage( false );
-				} }
-				borderProps={ isRounded ? undefined : borderProps }
-			/>
+			<ImageWrapper href={ href }>
+				<ImageEditor
+					id={ id }
+					url={ url }
+					width={ numericWidth }
+					height={ numericHeight }
+					clientWidth={ fallbackClientWidth }
+					naturalHeight={ naturalHeight }
+					naturalWidth={ naturalWidth }
+					onSaveImage={ ( imageAttributes ) =>
+						setAttributes( imageAttributes )
+					}
+					onFinishEditing={ () => {
+						setIsEditingImage( false );
+					} }
+					borderProps={ isRounded ? undefined : borderProps }
+				/>
+			</ImageWrapper>
 		);
 	} else if ( ! isResizable ) {
-		img = <div style={ { width, height, aspectRatio } }>{ img }</div>;
+		img = (
+			<div style={ { width, height, aspectRatio } }>
+				<ImageWrapper href={ href }>{ img }</ImageWrapper>
+			</div>
+		);
 	} else {
 		const numericRatio = aspectRatio && evalAspectRatio( aspectRatio );
 		const customRatio = numericWidth / numericHeight;
@@ -774,7 +800,7 @@ export default function Image( {
 				} }
 				resizeRatio={ align === 'center' ? 2 : 1 }
 			>
-				{ img }
+				<ImageWrapper href={ href }>{ img }</ImageWrapper>
 			</ResizableBox>
 		);
 	}
@@ -788,14 +814,7 @@ export default function Image( {
 			{ /* Hide controls during upload to avoid component remount,
 				which causes duplicated image upload. */ }
 			{ ! temporaryURL && controls }
-			{ /* If the image has a href, wrap in an <a /> tag to trigger any inherited link element styles */ }
-			{ !! href ? (
-				<a href={ href } { ...disabledClickProps }>
-					{ img }
-				</a>
-			) : (
-				img
-			) }
+			{ img }
 			{ showCaption &&
 				( ! RichText.isEmpty( caption ) || isSelected ) && (
 					<RichText

package/src/query/index.php

@@ -44,11 +44,15 @@ function render_block_core_query( $attributes, $content, $block ) {
 			$block->block_type->supports['interactivity'] = true;
 
 			// Add a div to announce messages using `aria-live`.
-			$last_div_position = strripos( $content, '</div>' );
+			$html_tag = 'div';
+			if ( ! empty( $attributes['tagName'] ) ) {
+				$html_tag = esc_attr( $attributes['tagName'] );
+			}
+			$last_tag_position = strripos( $content, '</' . $html_tag . '>' );
 			$content           = substr_replace(
 				$content,
 				'<div
-					class="wp-block-query__enhanced-pagination-navigation-announce screen-reader-text"
+					class="screen-reader-text"
 					aria-live="polite"
 					data-wp-text="context.core.query.message"
 				></div>
@@ -57,7 +61,7 @@ function render_block_core_query( $attributes, $content, $block ) {
 					data-wp-class--start-animation="selectors.core.query.startAnimation"
 					data-wp-class--finish-animation="selectors.core.query.finishAnimation"
 				></div>',
-				$last_div_position,
+				$last_tag_position,
 				0
 			);
 		}