From 470b56bab5a9f5c2830e2055233233d412685274 Mon Sep 17 00:00:00 2001
From: Adam Wood <1017872+adamwoodnz@users.noreply.github.com>
Date: Thu, 12 Oct 2023 15:00:43 +1300
Subject: [PATCH] Use separate content for screen reader and visual layout

---
 .../src/site-meta-list/index.php              | 18 +++++---
 .../src/site-meta-list/style.scss             | 42 +++++++++----------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/source/wp-content/themes/wporg-showcase-2022/src/site-meta-list/index.php b/source/wp-content/themes/wporg-showcase-2022/src/site-meta-list/index.php
index e4955978..c38cbf83 100644
--- a/source/wp-content/themes/wporg-showcase-2022/src/site-meta-list/index.php
+++ b/source/wp-content/themes/wporg-showcase-2022/src/site-meta-list/index.php
@@ -96,15 +96,21 @@ function( $field ) use ( $attributes ) {
 	}
 
 	foreach ( $meta_fields as $field ) {
-		$value = get_value( $field['type'], $field['key'], $block->context['postId'] );
+		list('type' => $type, 'key' => $key, 'label' => $label) = $field;
+		$value = get_value( $type, $key, $block->context['postId'] );
 
 		if ( ! empty( $value ) ) {
+			$value = wp_kses_post( $value );
+
 			$list_items[] = sprintf(
-				'<li class="is-meta-%1$s"><strong%2$s>%3$s</strong> <span>%4$s</span></li>',
-				$field['key'],
-				$show_label ? '' : ' class="screen-reader-text"',
-				$field['label'],
-				wp_kses_post( $value )
+				'<li class="is-meta-%1$s">
+					<span class="screen-reader-text">%2$s: %3$s</span>
+					<span aria-hidden="true">%4$s</span>
+				</li>',
+				$key,
+				$label,
+				$value,
+				$show_label ? sprintf('<strong>%1$s</strong><span>%2$s</span>', $label, $value) : $value,
 			);
 		}
 	}
diff --git a/source/wp-content/themes/wporg-showcase-2022/src/site-meta-list/style.scss b/source/wp-content/themes/wporg-showcase-2022/src/site-meta-list/style.scss
index 2a405523..8788e4d6 100644
--- a/source/wp-content/themes/wporg-showcase-2022/src/site-meta-list/style.scss
+++ b/source/wp-content/themes/wporg-showcase-2022/src/site-meta-list/style.scss
@@ -10,8 +10,6 @@
 	}
 
 	li {
-		display: flex;
-		gap: var(--wp--preset--spacing--10);
 		padding: var(--wp--preset--spacing--10) var(--wp--preset--spacing--20);
 		border-bottom: 1px solid;
 		border-color: inherit;
@@ -20,24 +18,29 @@
 			border-bottom: none;
 		}
 
-		strong {
-			flex-shrink: 0;
-			font-weight: 400;
-		}
-
-		span {
-			margin-inline-start: auto;
-			text-align: right;
-			color: var(--wp--preset--color--charcoal-3);
-		}
+		span[aria-hidden="true"] {
+			display: flex;
+			gap: var(--wp--preset--spacing--10);
 
-		@media (max-width: 380px) {
-			flex-direction: column;
-			gap: 0;
+			strong {
+				flex-shrink: 0;
+				font-weight: 400;
+			}
 
 			span {
-				margin-inline-start: unset;
-				text-align: initial;
+				margin-inline-start: auto;
+				text-align: right;
+				color: var(--wp--preset--color--charcoal-3);
+			}
+
+			@media (max-width: 380px) {
+				flex-direction: column;
+				gap: 0;
+
+				span {
+					margin-inline-start: unset;
+					text-align: initial;
+				}
 			}
 		}
 	}
@@ -61,11 +64,6 @@
 	&.has-hidden-label {
 		li {
 			padding: clamp(10px, calc(1.7vw), 20px) clamp(20px, calc(1.7vw + 10px), 30px);
-
-			span {
-				margin-inline-start: unset;
-				text-align: left;
-			}
 		}
 	}
 }