Merge pull request #4603 from bbc/conditional-aria-labelledby

Conditional aria-labelledby for StoryPromo - IndexAlsos
BBC-archive · Nov 25, 2021 · 77015fc · 77015fc
2 parents 59bce2a + 26ed9e6
commit 77015fc
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/packages/components/psammead-bulletin/CHANGELOG.md b/packages/components/psammead-bulletin/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 5.0.51 | [PR#4603](https://github.com/bbc/psammead/pull/4603) Bumps dependencies |
 | 5.0.50 | [PR#4602](https://github.com/bbc/psammead/pull/4602) Bumps dependencies |
 | 5.0.49 | [PR#4597](https://github.com/bbc/psammead/pull/4597) Bumps dependencies |
 | 5.0.48 | [PR#4588](https://github.com/bbc/psammead/pull/4588) Bumps dependencies |

diff --git a/packages/components/psammead-bulletin/package.json b/packages/components/psammead-bulletin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-bulletin",
-  "version": "5.0.50",
+  "version": "5.0.51",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,
@@ -22,7 +22,7 @@
     "@bbc/gel-foundations": "7.0.0",
     "@bbc/psammead-assets": "3.1.9",
     "@bbc/psammead-live-label": "2.0.32",
-    "@bbc/psammead-story-promo": "8.0.33",
+    "@bbc/psammead-story-promo": "8.0.34",
     "@bbc/psammead-styles": "8.0.1",
     "@bbc/psammead-visually-hidden-text": "2.0.7"
   },

diff --git a/packages/components/psammead-story-promo/CHANGELOG.md b/packages/components/psammead-story-promo/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 | ------- | ----------- |
+| 8.0.34 | [PR#4603](https://github.com/bbc/psammead/pull/4603) Conditionally add aria-labelledby attribute |
 | 8.0.33 | [PR#4602](https://github.com/bbc/psammead/pull/4602) Use 'children' value instead of 'URL' for aria-labelledby |
 | 8.0.32 | [PR#4588](https://github.com/bbc/psammead/pull/4588) Fix TalkBack reading nested spans incorrectly |
 | 8.0.31 | [PR#4578](https://github.com/bbc/psammead/pull/4578) Fix Firefox underline rendering bug |

diff --git a/packages/components/psammead-story-promo/package.json b/packages/components/psammead-story-promo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-story-promo",
-  "version": "8.0.33",
+  "version": "8.0.34",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,

diff --git a/packages/components/psammead-story-promo/src/IndexAlsos/__snapshots__/index.test.jsx.snap b/packages/components/psammead-story-promo/src/IndexAlsos/__snapshots__/index.test.jsx.snap
@@ -182,7 +182,6 @@ exports[`Index Alsos should render multiple correctly 1`] = `
         role="listitem"
       >
         <a
-          aria-labelledby="IndexAlsosLink-hausalabarai42837051"
           class="emotion-8 emotion-9"
           href="/hausa/labarai-42837051"
         >

diff --git a/packages/components/psammead-story-promo/src/IndexAlsos/index.jsx b/packages/components/psammead-story-promo/src/IndexAlsos/index.jsx
@@ -62,7 +62,9 @@ const IndexAlsosLink = ({
       script={script}
       service={service}
       // Line 63 and id={`IndexAlsosLink-${sanitisedUrl}`} in line 68 are temporary fix for the a11y nested span's bug experienced in TalkBack, refer to the following issue: https://github.com/bbc/simorgh/issues/9652
-      aria-labelledby={`IndexAlsosLink-${sanitisedUrl}`}
+      {...(mediaIndicator && {
+        'aria-labelledby': `IndexAlsosLink-${sanitisedUrl}`,
+      })}
     >
       {mediaIndicator ? (
         <>

diff --git a/packages/components/psammead-story-promo/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-story-promo/src/__snapshots__/index.test.jsx.snap
@@ -1568,7 +1568,6 @@ exports[`StoryPromo - Top Story should render with multiple Index Alsos correctl
             role="listitem"
           >
             <a
-              aria-labelledby="IndexAlsosLink-hausalabarai42837051"
               class="emotion-22 emotion-23"
               href="/hausa/labarai-42837051"
             >

diff --git a/yarn.lock b/yarn.lock
@@ -1693,7 +1693,7 @@ __metadata:
     "@bbc/gel-foundations": 7.0.0
     "@bbc/psammead-assets": 3.1.9
     "@bbc/psammead-live-label": 2.0.32
-    "@bbc/psammead-story-promo": 8.0.33
+    "@bbc/psammead-story-promo": 8.0.34
     "@bbc/psammead-styles": 8.0.1
     "@bbc/psammead-visually-hidden-text": 2.0.7
     "@emotion/styled": ^11.3.0
@@ -2092,7 +2092,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@bbc/[email protected].33, @bbc/psammead-story-promo@workspace:packages/components/psammead-story-promo":
+"@bbc/[email protected].34, @bbc/psammead-story-promo@workspace:packages/components/psammead-story-promo":
   version: 0.0.0-use.local
   resolution: "@bbc/psammead-story-promo@workspace:packages/components/psammead-story-promo"
   dependencies: