From d9f243ceae1c0c0aa068f3106d0f6b805fbb7158 Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Fri, 8 Nov 2024 16:06:20 +0530
Subject: [PATCH 1/5] Fix: Wrap link lists in <nav> for accessibility in
 listing blocks (#64051)

---
 packages/block-library/src/categories/edit.js   | 8 +++++---
 packages/block-library/src/categories/index.php | 2 +-
 packages/block-library/src/page-list/edit.js    | 6 +++++-
 packages/block-library/src/page-list/index.php  | 5 ++---
 packages/block-library/src/tag-cloud/index.php  | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/block-library/src/categories/edit.js b/packages/block-library/src/categories/edit.js
index 8bd2769b0ec71..de7403da0a2de 100644
--- a/packages/block-library/src/categories/edit.js
+++ b/packages/block-library/src/categories/edit.js
@@ -257,9 +257,11 @@ export default function CategoriesEdit( {
 			) }
 			{ ! isResolving &&
 				categories?.length > 0 &&
-				( displayAsDropdown
-					? renderCategoryDropdown()
-					: renderCategoryList() ) }
+				( displayAsDropdown ? (
+					renderCategoryDropdown()
+				) : (
+					<nav>{ renderCategoryList() }</nav>
+				) ) }
 		</TagName>
 	);
 }
diff --git a/packages/block-library/src/categories/index.php b/packages/block-library/src/categories/index.php
index 60a29713b4660..eca2824948ec2 100644
--- a/packages/block-library/src/categories/index.php
+++ b/packages/block-library/src/categories/index.php
@@ -66,7 +66,7 @@ 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>';
+		$wrapper_markup = '<nav><ul %1$s>%2$s</ul></nav>';
 		$items_markup   = wp_list_categories( $args );
 		$type           = 'list';
 
diff --git a/packages/block-library/src/page-list/edit.js b/packages/block-library/src/page-list/edit.js
index 8f1409f864f9b..518c8038a6edb 100644
--- a/packages/block-library/src/page-list/edit.js
+++ b/packages/block-library/src/page-list/edit.js
@@ -111,7 +111,11 @@ function BlockContent( {
 	}
 
 	if ( pages.length > 0 ) {
-		return <ul { ...innerBlocksProps }></ul>;
+		return (
+			<nav>
+				<ul { ...innerBlocksProps }></ul>
+			</nav>
+		);
 	}
 }
 
diff --git a/packages/block-library/src/page-list/index.php b/packages/block-library/src/page-list/index.php
index a574633d4ddf4..f77f24679c3d6 100644
--- a/packages/block-library/src/page-list/index.php
+++ b/packages/block-library/src/page-list/index.php
@@ -349,9 +349,8 @@ function render_block_core_page_list( $attributes, $content, $block ) {
 	);
 
 	return sprintf(
-		$wrapper_markup,
-		$wrapper_attributes,
-		$items_markup
+		'<nav>%s</nav>',
+		sprintf( $wrapper_markup, $wrapper_attributes, $items_markup )
 	);
 }
 
diff --git a/packages/block-library/src/tag-cloud/index.php b/packages/block-library/src/tag-cloud/index.php
index 8949dd8e5b11f..f42f2bfbf4253 100644
--- a/packages/block-library/src/tag-cloud/index.php
+++ b/packages/block-library/src/tag-cloud/index.php
@@ -41,7 +41,7 @@ function render_block_core_tag_cloud( $attributes ) {
 	$wrapper_attributes = get_block_wrapper_attributes();
 
 	return sprintf(
-		'<p %1$s>%2$s</p>',
+		'<nav %1$s>%2$s</nav>',
 		$wrapper_attributes,
 		$tag_cloud
 	);

From 41bfe901d4ebc12888766911636cef7737e79073 Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Thu, 28 Nov 2024 16:27:51 +0530
Subject: [PATCH 2/5] fix: Remove pagelist block nav changes

---
 packages/block-library/src/page-list/edit.js   | 6 +-----
 packages/block-library/src/page-list/index.php | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/block-library/src/page-list/edit.js b/packages/block-library/src/page-list/edit.js
index 518c8038a6edb..8f1409f864f9b 100644
--- a/packages/block-library/src/page-list/edit.js
+++ b/packages/block-library/src/page-list/edit.js
@@ -111,11 +111,7 @@ function BlockContent( {
 	}
 
 	if ( pages.length > 0 ) {
-		return (
-			<nav>
-				<ul { ...innerBlocksProps }></ul>
-			</nav>
-		);
+		return <ul { ...innerBlocksProps }></ul>;
 	}
 }
 
diff --git a/packages/block-library/src/page-list/index.php b/packages/block-library/src/page-list/index.php
index f77f24679c3d6..a574633d4ddf4 100644
--- a/packages/block-library/src/page-list/index.php
+++ b/packages/block-library/src/page-list/index.php
@@ -349,8 +349,9 @@ function render_block_core_page_list( $attributes, $content, $block ) {
 	);
 
 	return sprintf(
-		'<nav>%s</nav>',
-		sprintf( $wrapper_markup, $wrapper_attributes, $items_markup )
+		$wrapper_markup,
+		$wrapper_attributes,
+		$items_markup
 	);
 }
 

From 4fe8949db2dc6e9b3f1f486e27d3cfcbfb14d45d Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Thu, 28 Nov 2024 16:28:42 +0530
Subject: [PATCH 3/5] fix: Add props to outer element in categories list and
 fixed the html markup

---
 packages/block-library/src/categories/edit.js   | 4 ++--
 packages/block-library/src/categories/index.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/categories/edit.js b/packages/block-library/src/categories/edit.js
index de7403da0a2de..0bcf64948b7b4 100644
--- a/packages/block-library/src/categories/edit.js
+++ b/packages/block-library/src/categories/edit.js
@@ -167,7 +167,7 @@ export default function CategoriesEdit( {
 
 	const TagName =
 		!! categories?.length && ! displayAsDropdown && ! isResolving
-			? 'ul'
+			? 'nav'
 			: 'div';
 
 	const classes = clsx( className, {
@@ -260,7 +260,7 @@ export default function CategoriesEdit( {
 				( displayAsDropdown ? (
 					renderCategoryDropdown()
 				) : (
-					<nav>{ renderCategoryList() }</nav>
+					<ul>{ renderCategoryList() }</ul>
 				) ) }
 		</TagName>
 	);
diff --git a/packages/block-library/src/categories/index.php b/packages/block-library/src/categories/index.php
index eca2824948ec2..e491019bc9c97 100644
--- a/packages/block-library/src/categories/index.php
+++ b/packages/block-library/src/categories/index.php
@@ -66,7 +66,7 @@ function render_block_core_categories( $attributes, $content, $block ) {
 	} else {
 		$args['show_option_none'] = $taxonomy->labels->no_terms;
 
-		$wrapper_markup = '<nav><ul %1$s>%2$s</ul></nav>';
+		$wrapper_markup = '<nav %1$s><ul>%2$s</ul></nav>';
 		$items_markup   = wp_list_categories( $args );
 		$type           = 'list';
 

From 0c7e7f938f757c06bece8f95ea27a3e659e73fca Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Fri, 6 Dec 2024 16:22:00 +0530
Subject: [PATCH 4/5] feat: Add aria label textcontrol for tag cloud block in
 inspector controls

---
 docs/reference-guides/core-blocks.md          |   4 +-
 .../block-library/src/tag-cloud/block.json    |   5 +
 packages/block-library/src/tag-cloud/edit.js  | 244 ++++++++++--------
 .../block-library/src/tag-cloud/index.php     |   6 +-
 4 files changed, 145 insertions(+), 114 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 3b251813e41c0..13901006636ad 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -922,8 +922,8 @@ A cloud of popular keywords, each sized by how often it appears. ([Source](https
 
 -	**Name:** core/tag-cloud
 -	**Category:** widgets
--	**Supports:** align, interactivity (clientNavigation), spacing (margin, padding), typography (lineHeight), ~~html~~
--	**Attributes:** largestFontSize, numberOfTags, showTagCounts, smallestFontSize, taxonomy
+-	**Supports:** align, ariaLabel, interactivity (clientNavigation), spacing (margin, padding), typography (lineHeight), ~~html~~
+-	**Attributes:** ariaLabel, largestFontSize, numberOfTags, showTagCounts, smallestFontSize, taxonomy
 
 ## Template Part
 
diff --git a/packages/block-library/src/tag-cloud/block.json b/packages/block-library/src/tag-cloud/block.json
index 044bc0c533376..14c833dd8c485 100644
--- a/packages/block-library/src/tag-cloud/block.json
+++ b/packages/block-library/src/tag-cloud/block.json
@@ -28,6 +28,10 @@
 		"largestFontSize": {
 			"type": "string",
 			"default": "22pt"
+		},
+		"ariaLabel": {
+			"type": "string",
+			"default": "Tag Cloud"
 		}
 	},
 	"styles": [
@@ -52,6 +56,7 @@
 		"interactivity": {
 			"clientNavigation": true
 		},
+		"ariaLabel": true,
 		"__experimentalBorder": {
 			"radius": true,
 			"color": true,
diff --git a/packages/block-library/src/tag-cloud/edit.js b/packages/block-library/src/tag-cloud/edit.js
index 7e544d2474f04..ce806beedd925 100644
--- a/packages/block-library/src/tag-cloud/edit.js
+++ b/packages/block-library/src/tag-cloud/edit.js
@@ -13,6 +13,7 @@ import {
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 	Disabled,
+	TextControl,
 } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
@@ -53,6 +54,7 @@ function TagCloudEdit( { attributes, setAttributes } ) {
 		numberOfTags,
 		smallestFontSize,
 		largestFontSize,
+		ariaLabel,
 	} = attributes;
 
 	const [ availableUnits ] = useSettings( 'spacing.units' );
@@ -113,6 +115,10 @@ function TagCloudEdit( { attributes, setAttributes } ) {
 		setAttributes( updateObj );
 	};
 
+	const onChangeAriaLabel = ( value ) => {
+		setAttributes( { ariaLabel: value } );
+	};
+
 	// Remove border styles from the server-side attributes to prevent duplicate border.
 	const serverSideAttributes = {
 		...attributes,
@@ -123,125 +129,141 @@ function TagCloudEdit( { attributes, setAttributes } ) {
 	};
 
 	const inspectorControls = (
-		<InspectorControls>
-			<ToolsPanel
-				label={ __( 'Settings' ) }
-				resetAll={ () => {
-					setAttributes( {
-						taxonomy: 'post_tag',
-						showTagCounts: false,
-						numberOfTags: 45,
-						smallestFontSize: '8pt',
-						largestFontSize: '22pt',
-					} );
-				} }
-				dropdownMenuProps={ dropdownMenuProps }
-			>
-				<ToolsPanelItem
-					hasValue={ () => taxonomy !== 'post_tag' }
-					label={ __( 'Taxonomy' ) }
-					onDeselect={ () =>
-						setAttributes( { taxonomy: 'post_tag' } )
-					}
-					isShownByDefault
-				>
-					<SelectControl
-						__nextHasNoMarginBottom
-						__next40pxDefaultSize
-						label={ __( 'Taxonomy' ) }
-						options={ getTaxonomyOptions() }
-						value={ taxonomy }
-						onChange={ ( selectedTaxonomy ) =>
-							setAttributes( { taxonomy: selectedTaxonomy } )
-						}
-					/>
-				</ToolsPanelItem>
-				<ToolsPanelItem
-					hasValue={ () =>
-						smallestFontSize !== '8pt' || largestFontSize !== '22pt'
-					}
-					label={ __( 'Font size' ) }
-					onDeselect={ () =>
+		<>
+			<InspectorControls>
+				<ToolsPanel
+					label={ __( 'Settings' ) }
+					resetAll={ () => {
 						setAttributes( {
+							taxonomy: 'post_tag',
+							showTagCounts: false,
+							numberOfTags: 45,
 							smallestFontSize: '8pt',
 							largestFontSize: '22pt',
-						} )
-					}
-					isShownByDefault
-				>
-					<Flex gap={ 4 }>
-						<FlexItem isBlock>
-							<UnitControl
-								label={ __( 'Smallest size' ) }
-								value={ smallestFontSize }
-								onChange={ ( value ) => {
-									onFontSizeChange(
-										'smallestFontSize',
-										value
-									);
-								} }
-								units={ units }
-								min={ MIN_FONT_SIZE }
-								max={ MAX_FONT_SIZE }
-								size="__unstable-large"
-							/>
-						</FlexItem>
-						<FlexItem isBlock>
-							<UnitControl
-								label={ __( 'Largest size' ) }
-								value={ largestFontSize }
-								onChange={ ( value ) => {
-									onFontSizeChange(
-										'largestFontSize',
-										value
-									);
-								} }
-								units={ units }
-								min={ MIN_FONT_SIZE }
-								max={ MAX_FONT_SIZE }
-								size="__unstable-large"
-							/>
-						</FlexItem>
-					</Flex>
-				</ToolsPanelItem>
-				<ToolsPanelItem
-					hasValue={ () => numberOfTags !== 45 }
-					label={ __( 'Number of tags' ) }
-					onDeselect={ () => setAttributes( { numberOfTags: 45 } ) }
-					isShownByDefault
+						} );
+					} }
+					dropdownMenuProps={ dropdownMenuProps }
 				>
-					<RangeControl
-						__nextHasNoMarginBottom
-						__next40pxDefaultSize
+					<ToolsPanelItem
+						hasValue={ () => taxonomy !== 'post_tag' }
+						label={ __( 'Taxonomy' ) }
+						onDeselect={ () =>
+							setAttributes( { taxonomy: 'post_tag' } )
+						}
+						isShownByDefault
+					>
+						<SelectControl
+							__nextHasNoMarginBottom
+							__next40pxDefaultSize
+							label={ __( 'Taxonomy' ) }
+							options={ getTaxonomyOptions() }
+							value={ taxonomy }
+							onChange={ ( selectedTaxonomy ) =>
+								setAttributes( { taxonomy: selectedTaxonomy } )
+							}
+						/>
+					</ToolsPanelItem>
+					<ToolsPanelItem
+						hasValue={ () =>
+							smallestFontSize !== '8pt' ||
+							largestFontSize !== '22pt'
+						}
+						label={ __( 'Font size' ) }
+						onDeselect={ () =>
+							setAttributes( {
+								smallestFontSize: '8pt',
+								largestFontSize: '22pt',
+							} )
+						}
+						isShownByDefault
+					>
+						<Flex gap={ 4 }>
+							<FlexItem isBlock>
+								<UnitControl
+									label={ __( 'Smallest size' ) }
+									value={ smallestFontSize }
+									onChange={ ( value ) => {
+										onFontSizeChange(
+											'smallestFontSize',
+											value
+										);
+									} }
+									units={ units }
+									min={ MIN_FONT_SIZE }
+									max={ MAX_FONT_SIZE }
+									size="__unstable-large"
+								/>
+							</FlexItem>
+							<FlexItem isBlock>
+								<UnitControl
+									label={ __( 'Largest size' ) }
+									value={ largestFontSize }
+									onChange={ ( value ) => {
+										onFontSizeChange(
+											'largestFontSize',
+											value
+										);
+									} }
+									units={ units }
+									min={ MIN_FONT_SIZE }
+									max={ MAX_FONT_SIZE }
+									size="__unstable-large"
+								/>
+							</FlexItem>
+						</Flex>
+					</ToolsPanelItem>
+					<ToolsPanelItem
+						hasValue={ () => numberOfTags !== 45 }
 						label={ __( 'Number of tags' ) }
-						value={ numberOfTags }
-						onChange={ ( value ) =>
-							setAttributes( { numberOfTags: value } )
+						onDeselect={ () =>
+							setAttributes( { numberOfTags: 45 } )
 						}
-						min={ MIN_TAGS }
-						max={ MAX_TAGS }
-						required
-					/>
-				</ToolsPanelItem>
-				<ToolsPanelItem
-					hasValue={ () => showTagCounts !== false }
-					label={ __( 'Show tag counts' ) }
-					onDeselect={ () =>
-						setAttributes( { showTagCounts: false } )
-					}
-					isShownByDefault
-				>
-					<ToggleControl
-						__nextHasNoMarginBottom
+						isShownByDefault
+					>
+						<RangeControl
+							__nextHasNoMarginBottom
+							__next40pxDefaultSize
+							label={ __( 'Number of tags' ) }
+							value={ numberOfTags }
+							onChange={ ( value ) =>
+								setAttributes( { numberOfTags: value } )
+							}
+							min={ MIN_TAGS }
+							max={ MAX_TAGS }
+							required
+						/>
+					</ToolsPanelItem>
+					<ToolsPanelItem
+						hasValue={ () => showTagCounts !== false }
 						label={ __( 'Show tag counts' ) }
-						checked={ showTagCounts }
-						onChange={ () =>
-							setAttributes( { showTagCounts: ! showTagCounts } )
+						onDeselect={ () =>
+							setAttributes( { showTagCounts: false } )
 						}
-					/>
-				</ToolsPanelItem>
-			</ToolsPanel>
-		</InspectorControls>
+						isShownByDefault
+					>
+						<ToggleControl
+							__nextHasNoMarginBottom
+							label={ __( 'Show tag counts' ) }
+							checked={ showTagCounts }
+							onChange={ () =>
+								setAttributes( {
+									showTagCounts: ! showTagCounts,
+								} )
+							}
+						/>
+					</ToolsPanelItem>
+				</ToolsPanel>
+			</InspectorControls>
+			<InspectorControls group="advanced">
+				<TextControl
+					__next40pxDefaultSize
+					__nextHasNoMarginBottom
+					label={ __( 'Tag Cloud Name' ) }
+					value={ ariaLabel }
+					onChange={ onChangeAriaLabel }
+				/>
+			</InspectorControls>
+		</>
 	);
 
 	return (
diff --git a/packages/block-library/src/tag-cloud/index.php b/packages/block-library/src/tag-cloud/index.php
index f42f2bfbf4253..692dc3c309aee 100644
--- a/packages/block-library/src/tag-cloud/index.php
+++ b/packages/block-library/src/tag-cloud/index.php
@@ -17,6 +17,7 @@
 function render_block_core_tag_cloud( $attributes ) {
 	$smallest_font_size = $attributes['smallestFontSize'];
 	$unit               = ( preg_match( '/^[0-9.]+(?P<unit>[a-z%]+)$/i', $smallest_font_size, $m ) ? $m['unit'] : 'pt' );
+	$aria_label         = isset( $attributes['ariaLabel'] ) ? $attributes['ariaLabel'] : 'Tag Cloud';
 
 	$args      = array(
 		'echo'       => false,
@@ -40,9 +41,12 @@ function render_block_core_tag_cloud( $attributes ) {
 
 	$wrapper_attributes = get_block_wrapper_attributes();
 
+	$aria_label_attribute = 'aria-label="' . esc_attr( $aria_label ) . '" ';
+
 	return sprintf(
-		'<nav %1$s>%2$s</nav>',
+		'<nav %1$s %2$s>%3$s</nav>',
 		$wrapper_attributes,
+		$aria_label_attribute,
 		$tag_cloud
 	);
 }

From 05ead127f9b0c72893704c65dc119298ddbccb73 Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Wed, 8 Jan 2025 17:30:35 +0530
Subject: [PATCH 5/5] fix: Default tag cloud name in translation function

---
 packages/block-library/src/tag-cloud/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/tag-cloud/index.php b/packages/block-library/src/tag-cloud/index.php
index 692dc3c309aee..546571e072a7e 100644
--- a/packages/block-library/src/tag-cloud/index.php
+++ b/packages/block-library/src/tag-cloud/index.php
@@ -17,7 +17,7 @@
 function render_block_core_tag_cloud( $attributes ) {
 	$smallest_font_size = $attributes['smallestFontSize'];
 	$unit               = ( preg_match( '/^[0-9.]+(?P<unit>[a-z%]+)$/i', $smallest_font_size, $m ) ? $m['unit'] : 'pt' );
-	$aria_label         = isset( $attributes['ariaLabel'] ) ? $attributes['ariaLabel'] : 'Tag Cloud';
+	$aria_label         = isset( $attributes['ariaLabel'] ) ? $attributes['ariaLabel'] : __( 'Tag Cloud' );
 
 	$args      = array(
 		'echo'       => false,