From d74dfb97f9a8e3afddb3567703d3194fbf09b9fd Mon Sep 17 00:00:00 2001
From: Karthick M <97787966+karthick-murugan@users.noreply.github.com>
Date: Wed, 8 Jan 2025 19:14:18 +0530
Subject: [PATCH 1/5] Fix Inconsistent Labels for Lightbox Feature (#68261)

* Image size fix in lightbox

* Revert "Image size fix in lightbox"

This reverts commit 63f81c1e9cbb3b0513abca2b8cb579fef374ed7b.

* Update the enlarge image icon label

* Capslock updated

* Feedback changes updated

* Feedback changes

* Feedback Changes

* Feedback Changes

* Feedback changes

Co-authored-by: karthick-murugan <karthickmurugan@git.wordpress.org>
Co-authored-by: afercia <afercia@git.wordpress.org>
---
 .../global-styles/image-settings-panel.js     |  4 ++--
 .../url-popover/image-url-input-ui.js         |  6 ++---
 packages/block-library/src/gallery/edit.js    |  2 +-
 packages/block-library/src/image/index.php    | 22 ++++++++-----------
 test/e2e/specs/editor/blocks/image.spec.js    | 12 +++++-----
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/packages/block-editor/src/components/global-styles/image-settings-panel.js b/packages/block-editor/src/components/global-styles/image-settings-panel.js
index 4ebc20ab201983..e6fa7a4414f6c8 100644
--- a/packages/block-editor/src/components/global-styles/image-settings-panel.js
+++ b/packages/block-editor/src/components/global-styles/image-settings-panel.js
@@ -61,14 +61,14 @@ export default function ImageSettingsPanel( {
 					// "RESET" button ONLY when the user has explicitly set a value in the
 					// Global Styles.
 					hasValue={ () => !! value?.lightbox }
-					label={ __( 'Expand on click' ) }
+					label={ __( 'Enlarge on click' ) }
 					onDeselect={ resetLightbox }
 					isShownByDefault
 					panelId={ panelId }
 				>
 					<ToggleControl
 						__nextHasNoMarginBottom
-						label={ __( 'Expand on click' ) }
+						label={ __( 'Enlarge on click' ) }
 						checked={ lightboxChecked }
 						onChange={ onChangeLightbox }
 					/>
diff --git a/packages/block-editor/src/components/url-popover/image-url-input-ui.js b/packages/block-editor/src/components/url-popover/image-url-input-ui.js
index c68cf5e58b9530..7a9414c1fd3c1a 100644
--- a/packages/block-editor/src/components/url-popover/image-url-input-ui.js
+++ b/packages/block-editor/src/components/url-popover/image-url-input-ui.js
@@ -265,14 +265,14 @@ const ImageURLInputUI = ( {
 				<div className="block-editor-url-popover__expand-on-click">
 					<Icon icon={ fullscreen } />
 					<div className="text">
-						<p>{ __( 'Expand on click' ) }</p>
+						<p>{ __( 'Enlarge on click' ) }</p>
 						<p className="description">
 							{ __( 'Scales the image with a lightbox effect' ) }
 						</p>
 					</div>
 					<Button
 						icon={ linkOff }
-						label={ __( 'Disable expand on click' ) }
+						label={ __( 'Disable enlarge on click' ) }
 						onClick={ () => {
 							onSetLightbox?.( false );
 						} }
@@ -372,7 +372,7 @@ const ImageURLInputUI = ( {
 											stopEditLink();
 										} }
 									>
-										{ __( 'Expand on click' ) }
+										{ __( 'Enlarge on click' ) }
 									</MenuItem>
 								) }
 							</NavigableMenu>
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 01e725cc16cde6..1936c02c468189 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -80,7 +80,7 @@ const LINK_OPTIONS = [
 	},
 	{
 		icon: fullscreen,
-		label: __( 'Expand on click' ),
+		label: __( 'Enlarge on click' ),
 		value: LINK_DESTINATION_LIGHTBOX,
 		noticeText: __( 'Lightbox effect' ),
 		infoText: __( 'Scale images with a lightbox effect' ),
diff --git a/packages/block-library/src/image/index.php b/packages/block-library/src/image/index.php
index ac03011d73f63a..697f67a927fc87 100644
--- a/packages/block-library/src/image/index.php
+++ b/packages/block-library/src/image/index.php
@@ -149,18 +149,14 @@ function block_core_image_render_lightbox( $block_content, $block ) {
 		return $block_content;
 	}
 
-	$alt              = $p->get_attribute( 'alt' );
-	$img_uploaded_src = $p->get_attribute( 'src' );
-	$img_class_names  = $p->get_attribute( 'class' );
-	$img_styles       = $p->get_attribute( 'style' );
-	$img_width        = 'none';
-	$img_height       = 'none';
-	$aria_label       = __( 'Enlarge image' );
-
-	if ( $alt ) {
-		/* translators: %s: Image alt text. */
-		$aria_label = sprintf( __( 'Enlarge image: %s' ), $alt );
-	}
+	$alt               = $p->get_attribute( 'alt' );
+	$img_uploaded_src  = $p->get_attribute( 'src' );
+	$img_class_names   = $p->get_attribute( 'class' );
+	$img_styles        = $p->get_attribute( 'style' );
+	$img_width         = 'none';
+	$img_height        = 'none';
+	$aria_label        = __( 'Enlarge' );
+	$dialog_aria_label = __( 'Enlarged image' );
 
 	if ( isset( $block['attrs']['id'] ) ) {
 		$img_uploaded_src = wp_get_attachment_url( $block['attrs']['id'] );
@@ -190,7 +186,7 @@ function block_core_image_render_lightbox( $block_content, $block ) {
 					'targetWidth'      => $img_width,
 					'targetHeight'     => $img_height,
 					'scaleAttr'        => $block['attrs']['scale'] ?? false,
-					'ariaLabel'        => $aria_label,
+					'ariaLabel'        => $dialog_aria_label,
 					'alt'              => $alt,
 				),
 			),
diff --git a/test/e2e/specs/editor/blocks/image.spec.js b/test/e2e/specs/editor/blocks/image.spec.js
index 79cb01038da23c..35c9340e9b923c 100644
--- a/test/e2e/specs/editor/blocks/image.spec.js
+++ b/test/e2e/specs/editor/blocks/image.spec.js
@@ -859,17 +859,17 @@ test.describe( 'Image', () => {
 			} )
 		).toBeFocused();
 
-		// Select "Expand on click", then remove it.
+		// Select "Enlarge on click", then remove it.
 		await pageUtils.pressKeys( 'Tab' );
 		await page.keyboard.press( 'Enter' );
 		await pageUtils.pressKeys( 'Tab', { times: 5 } );
 		await expect(
-			page.getByRole( 'menuitem', { name: 'Expand on click' } )
+			page.getByRole( 'menuitem', { name: 'Enlarge on click' } )
 		).toBeFocused();
 		await page.keyboard.press( 'Enter' );
 		await expect(
 			page.getByRole( 'button', {
-				name: 'Disable expand on click',
+				name: 'Disable enlarge on click',
 			} )
 		).toBeFocused();
 		await page.keyboard.press( 'Enter' );
@@ -933,7 +933,7 @@ test.describe( 'Image - lightbox', () => {
 
 				await expect(
 					page.getByRole( 'menuitem', {
-						name: 'Expand on click',
+						name: 'Enlarge on click',
 					} )
 				).toBeHidden();
 			} );
@@ -958,13 +958,13 @@ test.describe( 'Image - lightbox', () => {
 
 				await page
 					.getByRole( 'button', {
-						name: 'Disable expand on click',
+						name: 'Disable enlarge on click',
 					} )
 					.click();
 
 				await expect(
 					page.getByRole( 'menuitem', {
-						name: 'Expand on click',
+						name: 'Enlarge on click',
 					} )
 				).toBeHidden();
 			} );

From 0f18e117c2bb5ed6ff2cf80d91bdf519126515d3 Mon Sep 17 00:00:00 2001
From: Eshaan Dabasiya <76681468+im3dabasia@users.noreply.github.com>
Date: Wed, 8 Jan 2025 19:22:12 +0530
Subject: [PATCH 2/5] Add BlockIcon Storybook stories (#67186)

* doc: Add BlockIcon Storybook stories

- Demonstrate various icon rendering scenarios

* doc: Fix story with patterns

* feat: Add story for block icon component

* feat: Add table.type for each of the argTypes

* fix: Corrected description grammar and default args

Co-authored-by: im3dabasia <im3dabasia1@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
---
 .../block-icon/stories/index.story.js         | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 packages/block-editor/src/components/block-icon/stories/index.story.js

diff --git a/packages/block-editor/src/components/block-icon/stories/index.story.js b/packages/block-editor/src/components/block-icon/stories/index.story.js
new file mode 100644
index 00000000000000..e30a347005d774
--- /dev/null
+++ b/packages/block-editor/src/components/block-icon/stories/index.story.js
@@ -0,0 +1,69 @@
+/**
+ * WordPress dependencies
+ */
+import { box, button, cog, paragraph } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import BlockIcon from '../';
+
+const meta = {
+	title: 'BlockEditor/BlockIcon',
+	component: BlockIcon,
+	parameters: {
+		docs: {
+			description: {
+				component:
+					'The `BlockIcon` component allows to display an icon for a block.',
+			},
+			canvas: { sourceState: 'shown' },
+		},
+	},
+	argTypes: {
+		icon: {
+			control: 'select',
+			options: [ 'paragraph', 'cog', 'box', 'button' ],
+			mapping: {
+				paragraph,
+				cog,
+				box,
+				button,
+			},
+			description:
+				'The icon of the block. This can be any of [WordPress Dashicons](https://developer.wordpress.org/resource/dashicons/), or a custom `svg` element.',
+			table: {
+				type: { summary: 'string | object' },
+			},
+		},
+		showColors: {
+			control: 'boolean',
+			description: 'Whether to show background and foreground colors.',
+			table: {
+				type: { summary: 'boolean' },
+			},
+		},
+		className: {
+			control: 'text',
+			description: 'Additional CSS class for the icon.',
+			table: {
+				type: { summary: 'string' },
+			},
+		},
+		context: {
+			control: 'text',
+			description: 'Context where the icon is being used.',
+			table: {
+				type: { summary: 'string' },
+			},
+		},
+	},
+};
+
+export default meta;
+
+export const Default = {
+	args: {
+		icon: 'paragraph',
+	},
+};

From f91339e66b35b868b3956589a8db18856545cd45 Mon Sep 17 00:00:00 2001
From: Mitchell Austin <mr.fye@oneandthesame.net>
Date: Wed, 8 Jan 2025 10:21:29 -0800
Subject: [PATCH 3/5] Fix File block resize glitches (#68372)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix File block’s resize width glitch

* Fix stuck width from resize at prior align

Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 packages/block-library/src/file/edit.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/file/edit.js b/packages/block-library/src/file/edit.js
index 838b807507d314..cf2c9458176934 100644
--- a/packages/block-library/src/file/edit.js
+++ b/packages/block-library/src/file/edit.js
@@ -255,11 +255,12 @@ function FileEdit( { attributes, isSelected, setAttributes, clientId } ) {
 			<div { ...blockProps }>
 				{ displayPreviewInEditor && (
 					<ResizableBox
-						size={ { height: previewHeight } }
+						size={ { height: previewHeight, width: '100%' } }
 						minHeight={ MIN_PREVIEW_HEIGHT }
 						maxHeight={ MAX_PREVIEW_HEIGHT }
-						minWidth="100%"
-						grid={ [ 10, 10 ] }
+						// The horizontal grid value must be 1 or else the width may snap during a
+						// resize even though only vertical resizing is enabled.
+						grid={ [ 1, 10 ] }
 						enable={ {
 							top: false,
 							right: false,

From 85d9baddc0d3fcec492299ed52e08c09bcb72e24 Mon Sep 17 00:00:00 2001
From: Ankit Kumar Shah <ankit.shah@rtcamp.com>
Date: Thu, 9 Jan 2025 12:08:35 +0530
Subject: [PATCH 4/5] Remove storybook for internal BlockCard component
 (#68556)

Co-authored-by: Infinite-Null <ankitkumarshah@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
---
 .../block-card/stories/index.story.js         | 79 -------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 packages/block-editor/src/components/block-card/stories/index.story.js

diff --git a/packages/block-editor/src/components/block-card/stories/index.story.js b/packages/block-editor/src/components/block-card/stories/index.story.js
deleted file mode 100644
index 0fe68e2032d394..00000000000000
--- a/packages/block-editor/src/components/block-card/stories/index.story.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { box, button, cog, paragraph } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import BlockCard from '../';
-
-const meta = {
-	title: 'BlockEditor/BlockCard',
-	component: BlockCard,
-	parameters: {
-		docs: {
-			description: {
-				component:
-					'The `BlockCard` component allows to display a "card" which contains the title of a block, its icon and its description.',
-			},
-			canvas: { sourceState: 'shown' },
-		},
-	},
-	argTypes: {
-		title: {
-			control: 'text',
-			description: 'The title of the block.',
-			table: {
-				type: { summary: 'string' },
-			},
-		},
-		description: {
-			control: 'text',
-			description: 'A description of the block functionality.',
-			table: {
-				type: { summary: 'string' },
-			},
-		},
-		icon: {
-			control: 'select',
-			options: [ 'paragraph', 'cog', 'box', 'button' ],
-			mapping: {
-				paragraph,
-				cog,
-				box,
-				button,
-			},
-			description:
-				'The icon of the block. This can be any of [WordPress Dashicons](https://developer.wordpress.org/resource/dashicons/), or a custom `svg` element.',
-			table: {
-				type: { summary: 'string | object' },
-			},
-		},
-		name: {
-			control: 'text',
-			description: 'Optional custom name for the block.',
-			table: {
-				type: { summary: 'string' },
-			},
-		},
-		className: {
-			control: 'text',
-			description: 'Additional CSS class names.',
-			table: {
-				type: { summary: 'string' },
-			},
-		},
-	},
-};
-
-export default meta;
-
-export const Default = {
-	args: {
-		title: 'Paragraph',
-		icon: paragraph,
-		description: 'This is a paragraph block description.',
-		name: 'Paragraph Block',
-	},
-};

From e746a95613db3eade8340c940cedbbd2b10145d6 Mon Sep 17 00:00:00 2001
From: Eshaan Dabasiya <76681468+im3dabasia@users.noreply.github.com>
Date: Thu, 9 Jan 2025 15:00:33 +0530
Subject: [PATCH 5/5] fix: Update regex in valid-sprintf rule to handle '%%'
 (#68270)

Co-authored-by: im3dabasia <im3dabasia1@git.wordpress.org>
Co-authored-by: swissspidy <swissspidy@git.wordpress.org>
Co-authored-by: colorful-tones <colorful-tones@git.wordpress.org>
---
 .../eslint-plugin/rules/__tests__/valid-sprintf.js | 12 ++++++++++++
 packages/eslint-plugin/utils/constants.js          | 14 +++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/eslint-plugin/rules/__tests__/valid-sprintf.js b/packages/eslint-plugin/rules/__tests__/valid-sprintf.js
index 9b2b7de255d47b..8f5b77458fbaeb 100644
--- a/packages/eslint-plugin/rules/__tests__/valid-sprintf.js
+++ b/packages/eslint-plugin/rules/__tests__/valid-sprintf.js
@@ -71,6 +71,18 @@ sprintf(
 		{
 			code: `sprintf( '%(greeting)s %(toWhom)s', 'Hello', 'World' )`,
 		},
+		{
+			code: `sprintf( 'Rotated at %d %% degrees', 90 )`,
+		},
+		{
+			code: `sprintf( 'Rotated at %d%% degrees', 90 )`,
+		},
+		{
+			code: `sprintf( __( 'Rotated at %d%% degrees' ), 90 )`,
+		},
+		{
+			code: `sprintf( 'Rotated at %1$d %% degrees, %2$d %% angles', 90, 180 )`,
+		},
 	],
 	invalid: [
 		{
diff --git a/packages/eslint-plugin/utils/constants.js b/packages/eslint-plugin/utils/constants.js
index a19add74964c0e..44e881fb867c78 100644
--- a/packages/eslint-plugin/utils/constants.js
+++ b/packages/eslint-plugin/utils/constants.js
@@ -37,13 +37,13 @@ const TRANSLATION_FUNCTIONS = new Set( [ '__', '_x', '_n', '_nx' ] );
  * @type {RegExp}
  */
 const REGEXP_SPRINTF_PLACEHOLDER =
-	/%(((\d+)\$)|(\(([$_a-zA-Z][$_a-zA-Z0-9]*)\)))?[ +0#-]*\d*(\.(\d+|\*))?(ll|[lhqL])?([cduxXefgsp%])/g;
-//               ▲         ▲                    ▲       ▲  ▲            ▲           ▲ type
-//               │         │                    │       │  │            └ Length (unsupported)
-//               │         │                    │       │  └ Precision / max width
-//               │         │                    │       └ Min width (unsupported)
-//               │         │                    └ Flags (unsupported)
-//               └ Index   └ Name (for named arguments)
+	/(?<!%)%(((\d+)\$)|(\(([$_a-zA-Z][$_a-zA-Z0-9]*)\)))?[ +0#-]*\d*(\.(\d+|\*))?(ll|[lhqL])?([cduxXefgsp])/g;
+//               	  ▲         ▲                    ▲       ▲  ▲            ▲           ▲ type
+//               	  │         │                    │       │  │            └ Length (unsupported)
+//               	  │         │                    │       │  └ Precision / max width
+//               	  │         │                    │       └ Min width (unsupported)
+//               	  │         │                    └ Flags (unsupported)
+//               	  └ Index   └ Name (for named arguments)
 
 /**
  * "Unordered" means there's no position specifier: '%s', not '%2$s'.